diff --git a/LekangGuard.xcodeproj/project.pbxproj b/LekangGuard.xcodeproj/project.pbxproj index 83d1e60..2bfd858 100644 --- a/LekangGuard.xcodeproj/project.pbxproj +++ b/LekangGuard.xcodeproj/project.pbxproj @@ -4009,7 +4009,7 @@ CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = Q4S877C83P; + DEVELOPMENT_TEAM = 2JS5UJW87D; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = LKNotificationSerExtension/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = LKNotificationSerExtension; @@ -4035,7 +4035,7 @@ CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = Q4S877C83P; + DEVELOPMENT_TEAM = 2JS5UJW87D; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = LKNotificationSerExtension/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = LKNotificationSerExtension; @@ -4106,7 +4106,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 16.0; + IPHONEOS_DEPLOYMENT_TARGET = 17.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -4159,7 +4159,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 16.0; + IPHONEOS_DEPLOYMENT_TARGET = 17.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; SDKROOT = iphoneos; @@ -4175,9 +4175,10 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CLANG_WARN_DOCUMENTATION_COMMENTS = NO; CODE_SIGN_ENTITLEMENTS = LekangGuard/LekangGuard.entitlements; + CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = Q4S877C83P; + DEVELOPMENT_TEAM = 2JS5UJW87D; EXCLUDED_ARCHS = "EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64=arm64 arm64e armv7 armv7s armv6 armv8 EXCLUDED_ARCHS=$(inherited) $(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_$(EFFECTIVE_PLATFORM_SUFFIX)__NATIVE_ARCH_64_BIT_$(NATIVE_ARCH_64_BIT))"; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; FRAMEWORK_SEARCH_PATHS = ( @@ -4237,7 +4238,7 @@ INFOPLIST_KEY_UIStatusBarHidden = YES; INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown"; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -4251,6 +4252,7 @@ ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = com.cct.studentcard.guard; PRODUCT_NAME = "ECell care"; + PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_EMIT_LOC_STRINGS = YES; TARGETED_DEVICE_FAMILY = 1; }; @@ -4264,9 +4266,10 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CLANG_WARN_DOCUMENTATION_COMMENTS = NO; CODE_SIGN_ENTITLEMENTS = LekangGuard/LekangGuard.entitlements; + CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = Q4S877C83P; + DEVELOPMENT_TEAM = 2JS5UJW87D; EXCLUDED_ARCHS = "EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64=arm64 arm64e armv7 armv7s armv6 armv8 EXCLUDED_ARCHS=$(inherited) $(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_$(EFFECTIVE_PLATFORM_SUFFIX)__NATIVE_ARCH_64_BIT_$(NATIVE_ARCH_64_BIT))"; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; FRAMEWORK_SEARCH_PATHS = ( @@ -4326,7 +4329,7 @@ INFOPLIST_KEY_UIStatusBarHidden = YES; INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown"; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -4340,6 +4343,7 @@ ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = com.cct.studentcard.guard; PRODUCT_NAME = "ECell care"; + PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_EMIT_LOC_STRINGS = YES; TARGETED_DEVICE_FAMILY = 1; }; diff --git a/LekangGuard.xcworkspace/xcuserdata/ecell.xcuserdatad/UserInterfaceState.xcuserstate b/LekangGuard.xcworkspace/xcuserdata/ecell.xcuserdatad/UserInterfaceState.xcuserstate index aa4ca5b..b1516af 100644 Binary files a/LekangGuard.xcworkspace/xcuserdata/ecell.xcuserdatad/UserInterfaceState.xcuserstate and b/LekangGuard.xcworkspace/xcuserdata/ecell.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/LekangGuard.xcworkspace/xcuserdata/ecell.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/LekangGuard.xcworkspace/xcuserdata/ecell.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index 976c777..040897a 100644 --- a/LekangGuard.xcworkspace/xcuserdata/ecell.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/LekangGuard.xcworkspace/xcuserdata/ecell.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -487,79 +487,47 @@ - - - - - - - - + startingLineNumber = "385" + endingLineNumber = "385" + offsetFromSymbolStart = "3756"> + startingLineNumber = "385" + endingLineNumber = "385" + offsetFromSymbolStart = "3840"> @@ -567,16 +535,32 @@ + + + + diff --git a/LekangGuard/AppDelegate.m b/LekangGuard/AppDelegate.m index 2767f2f..198110f 100644 --- a/LekangGuard/AppDelegate.m +++ b/LekangGuard/AppDelegate.m @@ -192,11 +192,11 @@ didReceiveNotificationResponse:(UNNotificationResponse *)response NSLog(@"Registfail%@",error); } -- (void)application:(UIApplication *)applicationdidRegisterForRemoteNotificationsWithDeviceToken:(NSData *)pToken -{ - NSLog(@"regisger success:%@",pToken); - //注册成功，将deviceToken保存到应用服务器[数据库](http://lib.csdn.net/base/14)中 -} +//- (void)application:(UIApplication *)applicationdidRegisterForRemoteNotificationsWithDeviceToken:(NSData *)pToken +//{ +// NSLog(@"regisger success:%@",pToken); +// //注册成功，将deviceToken保存到应用服务器[数据库](http://lib.csdn.net/base/14)中 +//} - (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo { // 处理推送消息 diff --git a/LekangGuard/Managers/APIManager.m b/LekangGuard/Managers/APIManager.m index 47ec8e6..b273f0f 100644 --- a/LekangGuard/Managers/APIManager.m +++ b/LekangGuard/Managers/APIManager.m @@ -16,7 +16,7 @@ NSString *const dHostUrl = @"http://lb-mi23utxo-em1lnrk4gizs2pu8.clb.ap-nanjing. //NSString *const dHostUrl = @"http://120.77.209.176:8822"; #else //正式环境 -NSString *const dHostUrl = @"http://api.oversea.ecellsz.com:9876"; +NSString *const dHostUrl = @"http://lb-mi23utxo-em1lnrk4gizs2pu8.clb.ap-nanjing.tencentclb.com:8822"; #endif diff --git a/LekangGuard/My/VC/MyViewController.m b/LekangGuard/My/VC/MyViewController.m index ec56301..e7a9258 100644 --- a/LekangGuard/My/VC/MyViewController.m +++ b/LekangGuard/My/VC/MyViewController.m @@ -59,6 +59,10 @@ [self.view addSubview:self.moreTableView]; + [[[NSNotificationCenter defaultCenter] rac_addObserverForName:@"XIAOHONGHUA" object:nil] subscribeNext:^(NSNotification *x) { + [self GetUnReadTotal]; + }]; + } diff --git a/LekangGuard/Protection(守护星)/VC/ms/TabMessageViewController.m b/LekangGuard/Protection(守护星)/VC/ms/TabMessageViewController.m index 7fe68c0..93e9cfd 100644 --- a/LekangGuard/Protection(守护星)/VC/ms/TabMessageViewController.m +++ b/LekangGuard/Protection(守护星)/VC/ms/TabMessageViewController.m @@ -40,10 +40,10 @@ make.bottom.equalTo(self.view); }]; - [[[NSNotificationCenter defaultCenter] rac_addObserverForName:@"XIAOHONGHUA" object:nil] subscribeNext:^(NSNotification *x) { - [self getHomeWorkCount]; - [self getReadFlowerCount]; - }]; +// [[[NSNotificationCenter defaultCenter] rac_addObserverForName:@"XIAOHONGHUA" object:nil] subscribeNext:^(NSNotification *x) { +// [self getHomeWorkCount]; +// [self getReadFlowerCount]; +// }]; } - (CommonTableView *)msgTable diff --git a/Pods/LGAlertView/LGAlertView/LGAlertView.m b/Pods/LGAlertView/LGAlertView/LGAlertView.m index e6f1210..2b0f643 100644 --- a/Pods/LGAlertView/LGAlertView/LGAlertView.m +++ b/Pods/LGAlertView/LGAlertView/LGAlertView.m @@ -776,14 +776,23 @@ LGAlertViewType; cancelButtonTitle:(nullable NSString *)cancelButtonTitle destructiveButtonTitle:(nullable NSString *)destructiveButtonTitle delegate:(nullable id)delegate { - return [[self alloc] alertViewWithTextFieldsAndTitle:title - message:message - numberOfTextFields:numberOfTextFields - textFieldsSetupHandler:textFieldsSetupHandler - buttonTitles:buttonTitles - cancelButtonTitle:cancelButtonTitle - destructiveButtonTitle:destructiveButtonTitle - delegate:delegate]; +// return [[self alloc] alertViewWithTextFieldsAndTitle:title +// message:message +// numberOfTextFields:numberOfTextFields +// textFieldsSetupHandler:textFieldsSetupHandler +// buttonTitles:buttonTitles +// cancelButtonTitle:cancelButtonTitle +// destructiveButtonTitle:destructiveButtonTitle +// delegate:delegate]; + + return [[self alloc] initWithTextFieldsAndTitle:title + message:message + numberOfTextFields:numberOfTextFields + textFieldsSetupHandler:textFieldsSetupHandler + buttonTitles:buttonTitles + cancelButtonTitle:cancelButtonTitle + destructiveButtonTitle:destructiveButtonTitle + delegate:delegate]; } #pragma mark -