diff --git a/ShenQi.xcodeproj/project.pbxproj b/ShenQi.xcodeproj/project.pbxproj index fd39d15..a6af32b 100644 --- a/ShenQi.xcodeproj/project.pbxproj +++ b/ShenQi.xcodeproj/project.pbxproj @@ -28,6 +28,8 @@ 20CC02D32D150A1C0001B529 /* DSAvatarCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 20CC02D12D150A1C0001B529 /* DSAvatarCollectionViewCell.xib */; }; 20DA04E42CD32AEF003530CA /* DSWebDragView.m in Sources */ = {isa = PBXBuildFile; fileRef = 20DA04E02CD32AEF003530CA /* DSWebDragView.m */; }; 20DA04E52CD32AEF003530CA /* WMDragView.m in Sources */ = {isa = PBXBuildFile; fileRef = 20DA04E12CD32AEF003530CA /* WMDragView.m */; }; + 896EC2172D4081AE00732103 /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 896EC2162D4081AE00732103 /* CoreTelephony.framework */; }; + 89A55AD72D4210CF0000FE0F /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 89A55AD62D4210CF0000FE0F /* GoogleService-Info.plist */; }; 9D06CD612B70B72500A5CDF7 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 9D06CD602B70B72500A5CDF7 /* libc++.tbd */; }; 9D06CD632B70B72E00A5CDF7 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9D06CD622B70B72E00A5CDF7 /* SystemConfiguration.framework */; }; 9D06CD652B70B73B00A5CDF7 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 9D06CD642B70B73B00A5CDF7 /* libz.tbd */; }; @@ -48,7 +50,6 @@ 9D834BA62D3214C3005B7327 /* PushRecordList.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D834BA12D3214C2005B7327 /* PushRecordList.m */; }; 9D834BA72D3214C3005B7327 /* PushRecordData.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D834BA22D3214C2005B7327 /* PushRecordData.m */; }; 9D834BAC2D321722005B7327 /* UIButton+DSButtonBlock.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D834BAA2D321722005B7327 /* UIButton+DSButtonBlock.m */; }; - 9DC1C8652D1D522900C84B8E /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 9DC1C8642D1D522900C84B8E /* GoogleService-Info.plist */; }; D63304C43F2FB8749E12DFA2 /* Pods_ShenQi.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D459646A78B941E3EF67B34A /* Pods_ShenQi.framework */; }; /* End PBXBuildFile section */ @@ -122,6 +123,8 @@ 20DA04E32CD32AEF003530CA /* WMDragView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WMDragView.h; sourceTree = ""; }; 2770952325ADBC033AEA844E /* Pods_SQNoti.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_SQNoti.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 30D1D837206E6AC5F27F4CB4 /* Pods-ShenQi.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ShenQi.release.xcconfig"; path = "Target Support Files/Pods-ShenQi/Pods-ShenQi.release.xcconfig"; sourceTree = ""; }; + 896EC2162D4081AE00732103 /* CoreTelephony.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = System/Library/Frameworks/CoreTelephony.framework; sourceTree = SDKROOT; }; + 89A55AD62D4210CF0000FE0F /* GoogleService-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; 9D06CD602B70B72500A5CDF7 /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; }; 9D06CD622B70B72E00A5CDF7 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; }; 9D06CD642B70B73B00A5CDF7 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; @@ -154,7 +157,6 @@ 9D834BAA2D321722005B7327 /* UIButton+DSButtonBlock.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIButton+DSButtonBlock.m"; sourceTree = ""; }; 9DB760732BB16BB50037094A /* ShenQiDebug.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = ShenQiDebug.entitlements; sourceTree = ""; }; 9DB760742BB16BBC0037094A /* ShenQiRelease.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = ShenQiRelease.entitlements; sourceTree = ""; }; - 9DC1C8642D1D522900C84B8E /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; A8EA1203791342D075AF53E3 /* Pods-ShenQi.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ShenQi.debug.xcconfig"; path = "Target Support Files/Pods-ShenQi/Pods-ShenQi.debug.xcconfig"; sourceTree = ""; }; D459646A78B941E3EF67B34A /* Pods_ShenQi.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ShenQi.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ @@ -166,6 +168,7 @@ files = ( 2087138D2CB4FE9B00CE4E72 /* WebKit.framework in Frameworks */, 9D06CD6B2B70B7E900A5CDF7 /* libresolv.tbd in Frameworks */, + 896EC2172D4081AE00732103 /* CoreTelephony.framework in Frameworks */, 9D06CD692B70B74F00A5CDF7 /* UserNotifications.framework in Frameworks */, 9D06CD672B70B74100A5CDF7 /* Security.framework in Frameworks */, 9D06CD652B70B73B00A5CDF7 /* libz.tbd in Frameworks */, @@ -182,6 +185,7 @@ 20848DC82ACEB763007ED869 /* Frameworks */ = { isa = PBXGroup; children = ( + 896EC2162D4081AE00732103 /* CoreTelephony.framework */, 2087138C2CB4FE9B00CE4E72 /* WebKit.framework */, 9D06CD6A2B70B7E900A5CDF7 /* libresolv.tbd */, 9D06CD682B70B74F00A5CDF7 /* UserNotifications.framework */, @@ -267,7 +271,7 @@ 9D834BA22D3214C2005B7327 /* PushRecordData.m */, 9D834BA42D3214C3005B7327 /* PushRecordList.h */, 9D834BA12D3214C2005B7327 /* PushRecordList.m */, - 9DC1C8642D1D522900C84B8E /* GoogleService-Info.plist */, + 89A55AD62D4210CF0000FE0F /* GoogleService-Info.plist */, 20B317F32CD4BA6700B29987 /* YYModel */, 20DA04DF2CD32AEF003530CA /* WMDragView */, 9D834BAB2D321722005B7327 /* UIButton+DSButtonBlock */, @@ -387,10 +391,10 @@ 20B61C8B29DC008800CE7946 /* LaunchScreen.storyboard in Resources */, 20CC02CB2D141B650001B529 /* LaunchViewController.xib in Resources */, 20B61C8829DC008800CE7946 /* Assets.xcassets in Resources */, + 89A55AD72D4210CF0000FE0F /* GoogleService-Info.plist in Resources */, 20B61C8629DC008500CE7946 /* Main.storyboard in Resources */, 20CC02D32D150A1C0001B529 /* DSAvatarCollectionViewCell.xib in Resources */, 9D834B932D32110D005B7327 /* NotiCenterContentTableViewCell.xib in Resources */, - 9DC1C8652D1D522900C84B8E /* GoogleService-Info.plist in Resources */, 9D834B982D32121F005B7327 /* NotiCenterImageTableViewCell.xib in Resources */, 9D834B8E2D320BC2005B7327 /* NotiCenterTableViewCell.xib in Resources */, 9D834B892D320969005B7327 /* NotiCenterViewController.xib in Resources */, @@ -645,7 +649,7 @@ ); GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = ShenQi/Info.plist; - INFOPLIST_KEY_CFBundleDisplayName = Pokies; + INFOPLIST_KEY_CFBundleDisplayName = Bintang918; INFOPLIST_KEY_NSAppleMusicUsageDescription = "需要访问相册权限用于照片上传,应用不会上传和存储您的照片"; INFOPLIST_KEY_NSCameraUsageDescription = "需要相机权限用于拍照上传,应用不会上传和存储您的照片"; INFOPLIST_KEY_NSContactsUsageDescription = "用于匹配您的好友"; @@ -668,7 +672,7 @@ "$(PROJECT_DIR)/ShenQi", ); MARKETING_VERSION = 1.1; - PRODUCT_BUNDLE_IDENTIFIER = noti.pokies; + PRODUCT_BUNDLE_IDENTIFIER = noti.Bintang918; PRODUCT_NAME = TESTAPP; PROVISIONING_PROFILE_SPECIFIER = ""; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -696,7 +700,7 @@ ); GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = ShenQi/Info.plist; - INFOPLIST_KEY_CFBundleDisplayName = Pokies; + INFOPLIST_KEY_CFBundleDisplayName = Bintang918; INFOPLIST_KEY_NSAppleMusicUsageDescription = "需要访问相册权限用于照片上传,应用不会上传和存储您的照片"; INFOPLIST_KEY_NSCameraUsageDescription = "需要相机权限用于拍照上传,应用不会上传和存储您的照片"; INFOPLIST_KEY_NSContactsUsageDescription = "用于匹配您的好友"; @@ -719,7 +723,7 @@ "$(PROJECT_DIR)/ShenQi", ); MARKETING_VERSION = 1.1; - PRODUCT_BUNDLE_IDENTIFIER = noti.pokies; + PRODUCT_BUNDLE_IDENTIFIER = noti.Bintang918; 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 aa95205..56de83f 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 89a0efa..769f04c 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:[pokiesUserID integerValue]]}; + NSDictionary *parmas = @{@"userId":[NSNumber numberWithInteger:[Bintang918UserID 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 new file mode 100644 index 0000000..312b81d Binary files /dev/null and b/ShenQi/Assets.xcassets/AppIcon.appiconset/Bintang918Logo.png differ diff --git a/ShenQi/Assets.xcassets/AppIcon.appiconset/Contents.json b/ShenQi/Assets.xcassets/AppIcon.appiconset/Contents.json index 7b494b3..9f15803 100644 --- a/ShenQi/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/ShenQi/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "pokiesLogo.png", + "filename" : "Bintang918Logo.png", "idiom" : "universal", "platform" : "ios", "size" : "1024x1024" diff --git a/ShenQi/Assets.xcassets/AppIcon.appiconset/pokiesLogo.png b/ShenQi/Assets.xcassets/AppIcon.appiconset/pokiesLogo.png deleted file mode 100644 index 984a52d..0000000 Binary files a/ShenQi/Assets.xcassets/AppIcon.appiconset/pokiesLogo.png and /dev/null differ diff --git a/ShenQi/Assets.xcassets/appLogo.imageset/Bintang918Logo.png b/ShenQi/Assets.xcassets/appLogo.imageset/Bintang918Logo.png new file mode 100644 index 0000000..312b81d Binary files /dev/null and b/ShenQi/Assets.xcassets/appLogo.imageset/Bintang918Logo.png differ diff --git a/ShenQi/Assets.xcassets/appLogo.imageset/Contents.json b/ShenQi/Assets.xcassets/appLogo.imageset/Contents.json index 8f3c2b0..5feaf56 100644 --- a/ShenQi/Assets.xcassets/appLogo.imageset/Contents.json +++ b/ShenQi/Assets.xcassets/appLogo.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "pokiesLogo.png", + "filename" : "Bintang918Logo.png", "idiom" : "universal", "scale" : "1x" }, diff --git a/ShenQi/Assets.xcassets/appLogo.imageset/pokiesLogo.png b/ShenQi/Assets.xcassets/appLogo.imageset/pokiesLogo.png deleted file mode 100644 index 984a52d..0000000 Binary files a/ShenQi/Assets.xcassets/appLogo.imageset/pokiesLogo.png and /dev/null differ diff --git a/ShenQi/GoogleService-Info.plist b/ShenQi/GoogleService-Info.plist index ee7ce12..0cbd389 100644 --- a/ShenQi/GoogleService-Info.plist +++ b/ShenQi/GoogleService-Info.plist @@ -3,17 +3,17 @@ API_KEY - AIzaSyCpseXszC4WOXv_u9AgaoO-326kfUzq3Hw + AIzaSyAZPxgeSf0O103AyxRPRHi5j-zVMMl5dxA GCM_SENDER_ID - 531595109600 + 985316013410 PLIST_VERSION 1 BUNDLE_ID - noti.pokies + noti.Bintang918 PROJECT_ID - dmcslot-ios + bintang918-ios STORAGE_BUCKET - dmcslot-ios.firebasestorage.app + bintang918-ios.firebasestorage.app IS_ADS_ENABLED IS_ANALYTICS_ENABLED @@ -25,6 +25,6 @@ IS_SIGNIN_ENABLED GOOGLE_APP_ID - 1:531595109600:ios:09a179c65cc44028b5dc85 + 1:985316013410:ios:6b0f6339b6811559c6e83b \ No newline at end of file diff --git a/ShenQi/LaunchViewController.m b/ShenQi/LaunchViewController.m index c2cfcac..1db4032 100644 --- a/ShenQi/LaunchViewController.m +++ b/ShenQi/LaunchViewController.m @@ -29,7 +29,7 @@ - (void)viewDidLoad { [super viewDidLoad]; - self.mainUserId = pokiesUserID; + self.mainUserId = Bintang918UserID; [self setupGameURLData]; } diff --git a/ShenQi/MacroDefine.h b/ShenQi/MacroDefine.h index 9cbcd62..acb9bf0 100644 --- a/ShenQi/MacroDefine.h +++ b/ShenQi/MacroDefine.h @@ -88,6 +88,7 @@ #define MR88UserID @"107" #define pokiesUserID @"110" #define dmcslotUserID @"111" +#define Bintang918UserID @"112" // 旧 #define WinwayUserID @"4" @@ -134,23 +135,6 @@ #define Play33UserID @"75" #define Boss96UserID @"76" -// 新 -#define AMB88URL @"https://amb88.cc/" -#define BK8AUSURL @"https://bk8aus.com/" -#define BODA8AUURL @"https://boda8au.com/" -#define CERGASURL @"https://cergas.online" -#define CROWNBETURL @"https://crowncasinosau.com/" -#define PPN88URL @"https://ppn88a.com/" -#define DW88URL @"https://dw88.co/" -#define M88OZURL @"https://www.m88oz.com" -#define MAXIM88AUURL @"https://maxim88au.com/" -#define Mee88AUURL @"https://www.mee88aus.com/" -#define MK88AUURL @"https://mk88au.net/" -#define PLY88AUURL @"https://www.ply88.com" -#define U88AUDURL @"https://u88aud.net" -#define UWIN33AUURL @"https://uwin33au.com/" -#define VV88AUDURL @"https://vv88aud.com" - #define ISNULLARRAY(arr) (arr == nil || (NSObject *)arr == [NSNull null] || arr.count == 0) #define ISNULLSTR(str) (str == nil || (NSObject *)str == [NSNull null] || str.length == 0) #define ISNULL(obj) (obj == nil || (NSObject *)obj == [NSNull null]) diff --git a/ShenQi/MainOldViewController.m b/ShenQi/MainOldViewController.m index e2ff5cc..252e519 100644 --- a/ShenQi/MainOldViewController.m +++ b/ShenQi/MainOldViewController.m @@ -47,7 +47,7 @@ - (void)viewDidLoad { [super viewDidLoad]; - self.mainUserId = pokiesUserID; + self.mainUserId = Bintang918UserID; WKWebViewConfiguration *wkWebConfig = [[WKWebViewConfiguration alloc] init]; wkWebConfig.preferences.javaScriptCanOpenWindowsAutomatically = YES; diff --git a/ShenQi/NotiCenterViewController.m b/ShenQi/NotiCenterViewController.m index b8b399b..0fe40c0 100644 --- a/ShenQi/NotiCenterViewController.m +++ b/ShenQi/NotiCenterViewController.m @@ -47,7 +47,7 @@ static NSString *linkidentifier = @"NotiCenterJumpLinkTableViewCell"; - (void)viewDidLoad { [super viewDidLoad]; - self.mainUserId = pokiesUserID; + self.mainUserId = Bintang918UserID; self.tableView.delegate = self; self.tableView.dataSource = self;