去除警告

artimenring-iOS/Artimenring/ARMacros.h

@@ -12,7 +12,9 @@
 #endif
 
 
-
+#ifndef SK_DEBUG_GOOGLE_FACEBOOK
+//#define SK_DEBUG_GOOGLE_FACEBOOK
+#endif
 
 //====================== FUNCTION ======================//
 //使用手机号、邮箱登录

artimenring-iOS/Artimenring/AppDelegate+notification.m

@@ -34,8 +34,10 @@
 
     [application registerForRemoteNotifications];
     
+#ifdef SK_DEBUG_GOOGLE_FACEBOOK
     [FIRApp configure];
     [FIRMessaging messaging].delegate = self;
+#endif
 }
 
 - (void)applicationDidEnterBackground:(UIApplication *)application {
@@ -65,8 +67,10 @@
     [UserDataHelper setPushToken:hexToken];
     [[NSNotificationCenter defaultCenter] postNotificationName:@"onRefreshPushToken" object:nil];
     
+#ifdef SK_DEBUG_GOOGLE_FACEBOOK
     //方法：fcm
     [FIRMessaging messaging].APNSToken = deviceToken;
+#endif
 }
 
 - (void)messaging:(FIRMessaging *)messaging didReceiveRegistrationToken:(NSString *)fcmToken {

artimenring-iOS/Artimenring/AppDelegate+sdk.m

@@ -26,7 +26,7 @@
     
     [Bugly startWithAppId:@"b77c7f7dbd"];
     
-    
+#ifdef SK_DEBUG_GOOGLE_FACEBOOK
     //plist 中添加
     [[GIDSignIn sharedInstance] restorePreviousSignInWithCompletion:^(GIDGoogleUser * _Nullable user, NSError * _Nullable error) {
     }];
@@ -34,6 +34,7 @@
     //TMO 第三方登录
     [[FBSDKApplicationDelegate sharedInstance] application:application didFinishLaunchingWithOptions:launchOptions];
     [FBSDKProfile setIsUpdatedWithAccessTokenChange:YES];
+#endif
 }
 
 + (void)initIQKeyboard {

artimenring-iOS/Artimenring/AppDelegate.m

@@ -42,16 +42,21 @@
         return YES;
     }
     
+#ifdef SK_DEBUG_GOOGLE_FACEBOOK
     handled = [GIDSignIn.sharedInstance handleURL:url];
     if (handled) {
         return YES;
     }
+#endif
     
     return YES;
 }
 
 - (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary<NSString *, id> *)options {
+#ifdef SK_DEBUG_GOOGLE_FACEBOOK
     return [[GIDSignIn sharedInstance] handleURL:url];
+#endif
+    return YES;
 }
 
 - (void)applicationDidBecomeActive:(UIApplication *)application {

artimenring-iOS/Artimenring/Classes/ViewController/Watch/SKWatchViewController.m

@@ -283,7 +283,7 @@ static NSString * const HeaderReuseIdentifier = @"WatchHeaderID";
         NSString* temp = indexPath.section == 0 ? @"watch_banner" : imageKey;
         imageName = [NSString stringWithFormat:@"%@_%ld_%ld",temp, (long)indexPath.section, (long)cellTag];
     }
-    [cell.mIconImage setImage:[UIImage imageNamed:imageName]];
+    [cell.mIconImage setImage:imageName.length > 0 ? [UIImage imageNamed:imageName] : nil];
     [cell.mIconLabel setText:NSLocalizedString(titleName, nil)];
     [cell.mIconView setHidden:NO];
     return cell;

artimenring-iOS/Artimenring/Info.plist

@@ -96,9 +96,7 @@
 	<key>NSPhotoLibraryUsageDescription</key>
 	<string>请允许相册权限，这样您可以从相册中选取图片修改联系人头像。</string>
 	<key>UIAppFonts</key>
-	<array>
-		<string>FZYouHJW_Xian.TTF</string>
-	</array>
+	<array/>
 	<key>UIBackgroundModes</key>
 	<array>
 		<string>audio</string>