diff --git a/ShenQi.xcodeproj/project.pbxproj b/ShenQi.xcodeproj/project.pbxproj index a6af32b..7db265e 100644 --- a/ShenQi.xcodeproj/project.pbxproj +++ b/ShenQi.xcodeproj/project.pbxproj @@ -649,7 +649,7 @@ ); GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = ShenQi/Info.plist; - INFOPLIST_KEY_CFBundleDisplayName = Bintang918; + INFOPLIST_KEY_CFBundleDisplayName = BBJ; INFOPLIST_KEY_NSAppleMusicUsageDescription = "需要访问相册权限用于照片上传,应用不会上传和存储您的照片"; INFOPLIST_KEY_NSCameraUsageDescription = "需要相机权限用于拍照上传,应用不会上传和存储您的照片"; INFOPLIST_KEY_NSContactsUsageDescription = "用于匹配您的好友"; @@ -671,8 +671,8 @@ "$(inherited)", "$(PROJECT_DIR)/ShenQi", ); - MARKETING_VERSION = 1.1; - PRODUCT_BUNDLE_IDENTIFIER = noti.Bintang918; + MARKETING_VERSION = 3.0; + PRODUCT_BUNDLE_IDENTIFIER = noti.bigbossjudi; PRODUCT_NAME = TESTAPP; PROVISIONING_PROFILE_SPECIFIER = ""; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -700,7 +700,7 @@ ); GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = ShenQi/Info.plist; - INFOPLIST_KEY_CFBundleDisplayName = Bintang918; + INFOPLIST_KEY_CFBundleDisplayName = BBJ; INFOPLIST_KEY_NSAppleMusicUsageDescription = "需要访问相册权限用于照片上传,应用不会上传和存储您的照片"; INFOPLIST_KEY_NSCameraUsageDescription = "需要相机权限用于拍照上传,应用不会上传和存储您的照片"; INFOPLIST_KEY_NSContactsUsageDescription = "用于匹配您的好友"; @@ -722,8 +722,8 @@ "$(inherited)", "$(PROJECT_DIR)/ShenQi", ); - MARKETING_VERSION = 1.1; - PRODUCT_BUNDLE_IDENTIFIER = noti.Bintang918; + MARKETING_VERSION = 3.0; + PRODUCT_BUNDLE_IDENTIFIER = noti.bigbossjudi; PRODUCT_NAME = TESTAPP; PROVISIONING_PROFILE_SPECIFIER = ""; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; diff --git a/ShenQi.xcworkspace/xcuserdata/quuuu.xcuserdatad/UserInterfaceState.xcuserstate b/ShenQi.xcworkspace/xcuserdata/quuuu.xcuserdatad/UserInterfaceState.xcuserstate index 56de83f..3ca39ff 100644 Binary files a/ShenQi.xcworkspace/xcuserdata/quuuu.xcuserdatad/UserInterfaceState.xcuserstate and b/ShenQi.xcworkspace/xcuserdata/quuuu.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/ShenQi/AppDelegate.m b/ShenQi/AppDelegate.m index 769f04c..03cf2bd 100644 --- a/ShenQi/AppDelegate.m +++ b/ShenQi/AppDelegate.m @@ -63,7 +63,7 @@ request.HTTPMethod = @"PUT"; [request setValue:@"application/json" forHTTPHeaderField:@"Content-Type"]; - NSDictionary *parmas = @{@"userId":[NSNumber numberWithInteger:[Bintang918UserID integerValue]]}; + NSDictionary *parmas = @{@"userId":[NSNumber numberWithInteger:[NowUserId integerValue]]}; NSData *jsonData = [NSJSONSerialization dataWithJSONObject:parmas options:NSJSONWritingPrettyPrinted error:nil]; request.HTTPBody = jsonData; diff --git a/ShenQi/Assets.xcassets/AppIcon.appiconset/Bintang918Logo.png b/ShenQi/Assets.xcassets/AppIcon.appiconset/Bintang918Logo.png deleted file mode 100644 index 312b81d..0000000 Binary files a/ShenQi/Assets.xcassets/AppIcon.appiconset/Bintang918Logo.png and /dev/null differ diff --git a/ShenQi/Assets.xcassets/AppIcon.appiconset/Contents.json b/ShenQi/Assets.xcassets/AppIcon.appiconset/Contents.json index 9f15803..2a8bf76 100644 --- a/ShenQi/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/ShenQi/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "Bintang918Logo.png", + "filename" : "bbj.png", "idiom" : "universal", "platform" : "ios", "size" : "1024x1024" diff --git a/ShenQi/Assets.xcassets/AppIcon.appiconset/bbj.png b/ShenQi/Assets.xcassets/AppIcon.appiconset/bbj.png new file mode 100644 index 0000000..996f008 Binary files /dev/null and b/ShenQi/Assets.xcassets/AppIcon.appiconset/bbj.png differ diff --git a/ShenQi/Assets.xcassets/appLogo.imageset/Bintang918Logo.png b/ShenQi/Assets.xcassets/appLogo.imageset/Bintang918Logo.png deleted file mode 100644 index 312b81d..0000000 Binary files a/ShenQi/Assets.xcassets/appLogo.imageset/Bintang918Logo.png and /dev/null differ diff --git a/ShenQi/Assets.xcassets/appLogo.imageset/Contents.json b/ShenQi/Assets.xcassets/appLogo.imageset/Contents.json index 5feaf56..ca040d2 100644 --- a/ShenQi/Assets.xcassets/appLogo.imageset/Contents.json +++ b/ShenQi/Assets.xcassets/appLogo.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "Bintang918Logo.png", + "filename" : "bbj.png", "idiom" : "universal", "scale" : "1x" }, diff --git a/ShenQi/GoogleService-Info.plist b/ShenQi/GoogleService-Info.plist index 0cbd389..d4cd406 100644 --- a/ShenQi/GoogleService-Info.plist +++ b/ShenQi/GoogleService-Info.plist @@ -3,17 +3,17 @@ API_KEY - AIzaSyAZPxgeSf0O103AyxRPRHi5j-zVMMl5dxA + AIzaSyAsBobTKlvRXB1FEIugnIF3pbXcjuB-1Sk GCM_SENDER_ID - 985316013410 + 689386681720 PLIST_VERSION 1 BUNDLE_ID - noti.Bintang918 + noti.bigbossjudi PROJECT_ID - bintang918-ios + bbj1-283eb STORAGE_BUCKET - bintang918-ios.firebasestorage.app + bbj1-283eb.firebasestorage.app IS_ADS_ENABLED IS_ANALYTICS_ENABLED @@ -25,6 +25,6 @@ IS_SIGNIN_ENABLED GOOGLE_APP_ID - 1:985316013410:ios:6b0f6339b6811559c6e83b + 1:689386681720:ios:3d969bcdda6401a1e5848d \ No newline at end of file diff --git a/ShenQi/LaunchViewController.m b/ShenQi/LaunchViewController.m index 1db4032..fde3344 100644 --- a/ShenQi/LaunchViewController.m +++ b/ShenQi/LaunchViewController.m @@ -29,7 +29,7 @@ - (void)viewDidLoad { [super viewDidLoad]; - self.mainUserId = Bintang918UserID; + self.mainUserId = NowUserId; [self setupGameURLData]; } diff --git a/ShenQi/MacroDefine.h b/ShenQi/MacroDefine.h index acb9bf0..fc49ec2 100644 --- a/ShenQi/MacroDefine.h +++ b/ShenQi/MacroDefine.h @@ -89,6 +89,7 @@ #define pokiesUserID @"110" #define dmcslotUserID @"111" #define Bintang918UserID @"112" +#define OngcuciUserID @"113" // 旧 #define WinwayUserID @"4" @@ -147,5 +148,6 @@ #define SCREEN_WIDTH [UIScreen mainScreen].bounds.size.width #define SCREEN_HEIGHT [UIScreen mainScreen].bounds.size.height +#define NowUserId BBJUserID #endif /* MacroDefine_h */ diff --git a/ShenQi/MainOldViewController.m b/ShenQi/MainOldViewController.m index 252e519..a9a3eab 100644 --- a/ShenQi/MainOldViewController.m +++ b/ShenQi/MainOldViewController.m @@ -47,7 +47,7 @@ - (void)viewDidLoad { [super viewDidLoad]; - self.mainUserId = Bintang918UserID; + self.mainUserId = NowUserId; WKWebViewConfiguration *wkWebConfig = [[WKWebViewConfiguration alloc] init]; wkWebConfig.preferences.javaScriptCanOpenWindowsAutomatically = YES; diff --git a/ShenQi/NotiCenterViewController.m b/ShenQi/NotiCenterViewController.m index 0fe40c0..c343411 100644 --- a/ShenQi/NotiCenterViewController.m +++ b/ShenQi/NotiCenterViewController.m @@ -47,7 +47,7 @@ static NSString *linkidentifier = @"NotiCenterJumpLinkTableViewCell"; - (void)viewDidLoad { [super viewDidLoad]; - self.mainUserId = Bintang918UserID; + self.mainUserId = NowUserId; self.tableView.delegate = self; self.tableView.dataSource = self;