【代码优化】关注通知更改

LekangGuard.xcodeproj/project.pbxproj

@@ -16,8 +16,6 @@
 		6102BADD2989027A00DD35BC /* LKNotificationSerExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 6102BAD52989027900DD35BC /* LKNotificationSerExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		6102BAEF298A156200DD35BC /* PushKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6102BAEE298A156200DD35BC /* PushKit.framework */; };
 		6102BAF1298A157400DD35BC /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6102BAF0298A157400DD35BC /* Security.framework */; };
-		6110116929B075EE00F4DFDF /* LaunchScreenImg-English@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6110116729B075ED00F4DFDF /* LaunchScreenImg-English@2x.png */; };
-		6110116A29B075EE00F4DFDF /* LaunchScreenImg-English@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6110116829B075EE00F4DFDF /* LaunchScreenImg-English@3x.png */; };
 		6110117129B08A0800F4DFDF /* LaunchScreenImg@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6110117029B08A0800F4DFDF /* LaunchScreenImg@2x.png */; };
 		6110117729B08E7F00F4DFDF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6110117629B08E7F00F4DFDF /* LaunchScreen.storyboard */; };
 		6112D0612A53F1E700E5311B /* FeedbackModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 6112D0602A53F1E700E5311B /* FeedbackModel.m */; };
@@ -508,8 +506,6 @@
 		6102BADA2989027A00DD35BC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		6102BAEE298A156200DD35BC /* PushKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PushKit.framework; path = System/Library/Frameworks/PushKit.framework; sourceTree = SDKROOT; };
 		6102BAF0298A157400DD35BC /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
-		6110116729B075ED00F4DFDF /* LaunchScreenImg-English@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "LaunchScreenImg-English@2x.png"; sourceTree = "<group>"; };
-		6110116829B075EE00F4DFDF /* LaunchScreenImg-English@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "LaunchScreenImg-English@3x.png"; sourceTree = "<group>"; };
 		6110117029B08A0800F4DFDF /* LaunchScreenImg@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "LaunchScreenImg@2x.png"; sourceTree = "<group>"; };
 		6110117629B08E7F00F4DFDF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
 		6112D05F2A53F1E700E5311B /* FeedbackModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FeedbackModel.h; sourceTree = "<group>"; };
@@ -2220,8 +2216,6 @@
 				6110117629B08E7F00F4DFDF /* LaunchScreen.storyboard */,
 				6110117029B08A0800F4DFDF /* LaunchScreenImg@2x.png */,
 				6133638528F111BA00BF4A14 /* LaunchScreenImg@3x.png */,
-				6110116729B075ED00F4DFDF /* LaunchScreenImg-English@2x.png */,
-				6110116829B075EE00F4DFDF /* LaunchScreenImg-English@3x.png */,
 				6133637528E2EDA100BF4A14 /* LekangGuard.pch */,
 				6175598728DAE1C5008E5954 /* Info.plist */,
 				6196088C2994D039006F6540 /* InfoPlist.strings */,
@@ -3363,7 +3357,6 @@
 				615AD20C29309E8B0066E20C /* HAndTChartCell.xib in Resources */,
 				61D478B1295C32FD002FC2D4 /* MessageTableViewCell.xib in Resources */,
 				61AB7AC428F9463800EEAF3F /* KJBannerView.bundle in Resources */,
-				6110116929B075EE00F4DFDF /* LaunchScreenImg-English@2x.png in Resources */,
 				614F0D31296571F0007A912A /* RecordingBkg@2x.png in Resources */,
 				61B440F22928B4FE00BB9EC7 /* README.md in Resources */,
 				614F0D30296571F0007A912A /* msg_chat_voice_unread.png in Resources */,
@@ -3402,7 +3395,6 @@
 				614F0D41296571F0007A912A /* RecordingSignal002@2x.png in Resources */,
 				614F0D3B296571F0007A912A /* keyboard@2x.png in Resources */,
 				614F0D4D296571F0007A912A /* RecordCancel@2x.png in Resources */,
-				6110116A29B075EE00F4DFDF /* LaunchScreenImg-English@3x.png in Resources */,
 				614F0D49296571F0007A912A /* RecordingSignal008@2x.png in Resources */,
 				614F0D46296571F0007A912A /* SenderVoiceNodePlaying001@2x.png in Resources */,
 				614F0D2A296571F0007A912A /* RecordingSignal003@2x.png in Resources */,

LekangGuard.xcworkspace/xcuserdata/ecell.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -532,5 +532,21 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "A902442A-3438-42C9-9CFB-87FAD7D7C89E"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "LekangGuard/Common/BaseViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "384"
+            endingLineNumber = "384"
+            landmarkName = "-pusMessage"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

LekangGuard/AppDelegate.m

@@ -368,7 +368,7 @@ didReceiveNotificationResponse:(UNNotificationResponse *)response
             {
                 UIViewController *viewController = navVC.viewControllers.lastObject;
                 MemberManagementViewController *tempVC = (MemberManagementViewController*)viewController;
-                tempVC.selectedIndex = 1;
+                [tempVC applicationRrecord];
             }
             else
             {

LekangGuard/Common/BaseViewController.m

@@ -14,6 +14,7 @@
 #import "JCManager.h"
 #import "BRManager.h"
 #import "TihuManager.h"
+#import "MemberManagementViewController.h"
 
 @interface BaseViewController ()<DZNEmptyDataSetSource,DZNEmptyDataSetDelegate>
 /// 定制返回按钮
@@ -375,16 +376,30 @@
                 app.stopVibration = YES;
             }
         }
-        if([viewController isKindOfClass:[MessageViewController class]])
-        {
-            //在消息中心
-            MessageViewController *tempVC = (MessageViewController*)viewController;
         if([msgType isEqualToString:@"applicationRrecord"]
            || [msgType isEqualToString:@"checkedResults"])
         {
+            /// 关注消息需要前往成员管理查看
+            if ([viewController isKindOfClass:[MemberManagementViewController class]])
+            {
+                MemberManagementViewController *tempVC = (MemberManagementViewController*)viewController;
                 [tempVC applicationRrecord];
             }
-            else if ([msgType isEqualToString:@"identityTransfer"]
+            else
+            {
+                MemberManagementViewController *vc = [MemberManagementViewController new];
+                vc.selectedIndex = 1;
+                [[UICommon currentVC].navigationController pushViewController:vc animated:YES];
+            }
+            return;
+        }
+        
+        if([viewController isKindOfClass:[MessageViewController class]])
+        {
+            //在消息中心
+            MessageViewController *tempVC = (MessageViewController*)viewController;
+           
+            if ([msgType isEqualToString:@"identityTransfer"]
                       || [msgType isEqualToString:@"identityTransfered"]
                       || [msgType isEqualToString:@"systemUpdate"])
             {
@@ -396,7 +411,7 @@
         if([msgType isEqualToString:@"systemUpdate"])
         {
             content = GJText(@"有新的系统消息，是否前往查看");
-            selectIndex = 2;
+            selectIndex = 1;
         }
         else if([msgType isEqualToString:@"applicationRrecord"])
         {

LekangGuard/Protection(守护星)/VC/MemberManagementViewController.h

@@ -16,6 +16,9 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @property (assign , nonatomic)NSInteger selectedIndex;
 
+
+/// 申请关注
+- (void)applicationRrecord;
 @end
 
 NS_ASSUME_NONNULL_END

LekangGuard/Protection(守护星)/VC/MemberManagementViewController.m

@@ -59,6 +59,13 @@
     self.selectedIndex = Index;
 }
 
+/// 申请关注
+- (void)applicationRrecord
+{
+    AttentionMessageViewController *vc = self.controllers[1];
+    [vc GetQueryFollowInfo:TableisReload_h];
+}
+
 
 /*
 #pragma mark - Navigation