diff --git a/ShenQi.xcodeproj/project.pbxproj b/ShenQi.xcodeproj/project.pbxproj index 04786b0..daef818 100644 --- a/ShenQi.xcodeproj/project.pbxproj +++ b/ShenQi.xcodeproj/project.pbxproj @@ -699,7 +699,7 @@ ); GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = ShenQi/Info.plist; - INFOPLIST_KEY_CFBundleDisplayName = Nova9; + INFOPLIST_KEY_CFBundleDisplayName = pantas33; INFOPLIST_KEY_NSAppleMusicUsageDescription = "需要访问相册权限用于照片上传,应用不会上传和存储您的照片"; INFOPLIST_KEY_NSCameraUsageDescription = "需要相机权限用于拍照上传,应用不会上传和存储您的照片"; INFOPLIST_KEY_NSContactsUsageDescription = "用于匹配您的好友"; @@ -721,8 +721,8 @@ "$(inherited)", "$(PROJECT_DIR)/ShenQi", ); - MARKETING_VERSION = 1.5; - PRODUCT_BUNDLE_IDENTIFIER = noti.NO1VA9SG4; + MARKETING_VERSION = 4.2; + PRODUCT_BUNDLE_IDENTIFIER = noti.pantas3342; PRODUCT_NAME = TESTAPP; PROVISIONING_PROFILE_SPECIFIER = ""; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -753,7 +753,7 @@ ); GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = ShenQi/Info.plist; - INFOPLIST_KEY_CFBundleDisplayName = Nova9; + INFOPLIST_KEY_CFBundleDisplayName = pantas33; INFOPLIST_KEY_NSAppleMusicUsageDescription = "需要访问相册权限用于照片上传,应用不会上传和存储您的照片"; INFOPLIST_KEY_NSCameraUsageDescription = "需要相机权限用于拍照上传,应用不会上传和存储您的照片"; INFOPLIST_KEY_NSContactsUsageDescription = "用于匹配您的好友"; @@ -775,8 +775,8 @@ "$(inherited)", "$(PROJECT_DIR)/ShenQi", ); - MARKETING_VERSION = 1.5; - PRODUCT_BUNDLE_IDENTIFIER = noti.NO1VA9SG4; + MARKETING_VERSION = 4.2; + PRODUCT_BUNDLE_IDENTIFIER = noti.pantas3342; 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 d500e0d..2fab32f 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/Assets.xcassets/AppIcon.appiconset/app_logo.png b/ShenQi/Assets.xcassets/AppIcon.appiconset/app_logo.png index e9a3035..9475367 100644 Binary files a/ShenQi/Assets.xcassets/AppIcon.appiconset/app_logo.png and b/ShenQi/Assets.xcassets/AppIcon.appiconset/app_logo.png differ diff --git a/ShenQi/Assets.xcassets/appLogo.imageset/app_logo.png b/ShenQi/Assets.xcassets/appLogo.imageset/app_logo.png index e9a3035..9475367 100644 Binary files a/ShenQi/Assets.xcassets/appLogo.imageset/app_logo.png and b/ShenQi/Assets.xcassets/appLogo.imageset/app_logo.png differ diff --git a/ShenQi/GoogleService-Info.plist b/ShenQi/GoogleService-Info.plist index fd4b2f8..2be4502 100644 --- a/ShenQi/GoogleService-Info.plist +++ b/ShenQi/GoogleService-Info.plist @@ -3,17 +3,17 @@ API_KEY - AIzaSyCRrTj7LNAjqb7mT8VAiF2SzvsSUwKjVB4 + AIzaSyAf2aoBSP5qZE6A4XVkCTGL_LayRqAnhCY GCM_SENDER_ID - 875434561984 + 541726336017 PLIST_VERSION 1 BUNDLE_ID - noti.NO1VA9SG4 + noti.pantas3342 PROJECT_ID - nosgs-409e1 + pantas3342 STORAGE_BUCKET - nosgs-409e1.firebasestorage.app + pantas3342.firebasestorage.app IS_ADS_ENABLED IS_ANALYTICS_ENABLED @@ -25,6 +25,6 @@ IS_SIGNIN_ENABLED GOOGLE_APP_ID - 1:875434561984:ios:7a5199d245be0be58d3825 + 1:541726336017:ios:4df0bdf58876ea8e7b7db0 \ No newline at end of file diff --git a/ShenQi/MacroDefine.h b/ShenQi/MacroDefine.h index c4ff0b3..bd53bbd 100644 --- a/ShenQi/MacroDefine.h +++ b/ShenQi/MacroDefine.h @@ -228,7 +228,7 @@ #define SCREEN_WIDTH [UIScreen mainScreen].bounds.size.width #define SCREEN_HEIGHT [UIScreen mainScreen].bounds.size.height -#define NowUserId @"220" +#define NowUserId @"142" #endif /* MacroDefine_h */ diff --git a/ShenQi/MainOldViewController.m b/ShenQi/MainOldViewController.m index 23084df..873b4f1 100644 --- a/ShenQi/MainOldViewController.m +++ b/ShenQi/MainOldViewController.m @@ -160,8 +160,10 @@ [self intoMainWebView]; }else{ [self intoMainWebView]; - - [self setupAddContactData]; + AppDelegate *appDelegate = (AppDelegate *)[UIApplication sharedApplication].delegate; + if (appDelegate.data.contactApplyMode == 1) { + [self setupAddContactData]; + } // 判断是否第一次安装 NSUserDefaults *userfault = [NSUserDefaults standardUserDefaults];