ios调试 新通知处理操作

ios/JianYuIOS/JianYuIOS.xcodeproj/xcuserdata/apple.xcuserdatad/xcschemes/JianYuIOS.xcscheme

@@ -85,7 +85,7 @@
          <EnvironmentVariable
             key = "OS_ACTIVITY_MODE"
             value = "disable"
-            isEnabled = "YES">
+            isEnabled = "NO">
          </EnvironmentVariable>
       </EnvironmentVariables>
       <AdditionalOptions>

ios/JianYuIOS/JianYuIOS/AppDelegate.m

@@ -229,6 +229,16 @@ didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
             
             // 跳转到该链接
             [[NSNotificationCenter defaultCenter] postNotificationName:kRequestWebViewWithUrl object:temp userInfo:nil];
+            
+            
+            if([info[@"type"] isEqualToString:@"message"]) {
+                NSDictionary *dic = @{@"mid":info[@"mid"],
+                                      @"rectype":@"C",
+                                      @"openid":info[@"openid"],
+                                      };
+                [[NSNotificationCenter defaultCenter] postNotificationName:@"messageAccept" object:dic];
+                
+            }
         }
     }
     
@@ -237,10 +247,25 @@ didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
 
 
 - (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo fetchCompletionHandler:(void (^)(UIBackgroundFetchResult))completionHandler {
+    NSLog(@"111");
+    NSLog(@"%@",userInfo);
     NSDictionary *info = userInfo[@"info"];
     if ([info isKindOfClass:[NSString class]]) {
         info = [[LXViewControllerManager shareViewControllerManager] dictionaryWithJsonString:userInfo[@"info"]];
     }
+    /*
+     {
+     descript = 5555;
+     extend =     {
+     linkType = external;
+     };
+     mid = 5b5bcd5d61fd00478411f0b1;
+     openid = "ocXeA0juxw7b7A_bjXVy0NSJF5f0";
+     title = "\U6d4b\U8bd5\U4e00";
+     url = "https://www.baidu.com";
+     }
+     */
+    NSLog(@"info--新消息%@",info);
     if (info ) {
         if (info[@"url"]) {
             NSString *pushTime = info[@"pushTime"];
@@ -265,6 +290,19 @@ didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
             }
             
             [[NSNotificationCenter defaultCenter] postNotificationName:kAfterReceiveNewMsg object:nil];
+            
+            
+            
+            if([info[@"type"] isEqualToString:@"message"]) {
+                NSDictionary *dic = @{@"mid":info[@"mid"],
+                                      @"rectype":@"D",
+                                      @"openid":info[@"openid"],
+                                     };
+                [[NSNotificationCenter defaultCenter] postNotificationName:@"messageAccept" object:dic];
+                
+            }
+            
+            
         }
     }
     // Required, iOS 7 Support

ios/JianYuIOS/JianYuIOS/BaseClass1/LXDataBaseManager.m

@@ -59,7 +59,7 @@ FMDatabase *db;
     if ([table isEqualToString:kNewsTable]) {
         NSDictionary *dic = (NSDictionary *)entity;
       BOOL result =  [db executeUpdate:@"INSERT INTO kNewsTable(id, openid, title,content, url, type, readed, comeintime, descript, extend, pushTime) VALUES (?,?,?,?,?,?,?,?,?,?,?)",[LXUserDefaults newsID] ,dic[@"openid"], dic[@"title"],dic[@"content"], dic[@"url"], dic[@"type"], @NO, [LXUserDefaults comeintime], dic[@"descript"], dic[@"extend"], dic[@"pushTime"]];
-        LXLog(@"%d", result);
+        NSLog(@"%d", result);
     }
     
     
@@ -254,6 +254,7 @@ FMDatabase *db;
             count ++;
         }
     }
+    NSLog(@"count_____%d",count);
     return count;
 }
 

ios/JianYuIOS/JianYuIOS/BaseClass1/PrefixHeader.pch

@@ -26,8 +26,8 @@
 #define kLoginOut @"kLoginOut"
 #define kNewsTable @"kNewsTable"
 
-#define kHost @"https://www.jianyu360.com/"
-
+//#define kHost @"https://www.jianyu360.com/"
+#define kHost @"http://webws.qmx.top/"
 //#define kHost @"http://webwcj.qmx.top/"
 //#define kHost @"http://w2blmjy.qmx.top/"
 //#define kHost @"123.56.103.12/"

ios/JianYuIOS/JianYuIOS/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.4</string>
+	<string>1.0.5</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -56,7 +56,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>6</string>
+	<string>8</string>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>wechat</string>

ios/JianYuIOS/JianYuIOS/ViewController.m

@@ -105,6 +105,10 @@ JSExportAs(isInstallWeixin, -(int)jsIsInstallWeixin:(NSString *)str);// 是否
     [[AFNetworkReachabilityManager sharedManager] startMonitoring];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(netReachChanged:) name:AFNetworkingReachabilityDidChangeNotification object:nil];
     
+    
+    //2018 7 28修改新增js
+     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(messageAccept:) name:@"messageAccept" object:nil];
+    
 //    [self clearWeb];
 
     UIPanGestureRecognizer *recognizer = [[UIPanGestureRecognizer alloc]initWithTarget:self action:@selector(paningGestureReceive:)];
@@ -233,20 +237,45 @@ JSExportAs(isInstallWeixin, -(int)jsIsInstallWeixin:(NSString *)str);// 是否
         return;
     }
     NSString * urlStr = [NSString stringWithFormat:@"%@",infoDict[@"url"]];
+
     if (urlStr) {
         [[LXViewControllerManager shareViewControllerManager] showHudText:nil];
         self.afterOpenPushMessage = YES;
-        NSString *url = [NSString stringWithFormat:@"%@%@", kHost, urlStr];
-        url =  [url stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
-         [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:url]]];
-        [[NSNotificationCenter defaultCenter] postNotificationName:@"kNewWebControllerDismiss" object:nil];
+        
+        
+        if([infoDict[@"type"] isEqualToString:@"message"]) {
+            NSString *url = [NSString stringWithFormat:@"%@",urlStr];
+            url =  [url stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
+            [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:url]]];
+            [[NSNotificationCenter defaultCenter] postNotificationName:@"kNewWebControllerDismiss" object:nil];
+        }else {
+            NSString *url = [NSString stringWithFormat:@"%@%@", kHost, urlStr];
+            url =  [url stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
+            [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:url]]];
+            [[NSNotificationCenter defaultCenter] postNotificationName:@"kNewWebControllerDismiss" object:nil];
+        }
+        
+        
     }
 
     
+}
+
+
+-(void)messageAccept:(NSNotification *)userInfo
+{
+    NSDictionary * infoDic = [userInfo object];
+
+    NSString *textJS =  [NSString stringWithFormat:@"messageAccept('%@','%@','%@')",infoDic[@"mid"],infoDic[@"rectype"],infoDic[@"openid"]];
+    JSContext *context = [self.webView valueForKeyPath:@"documentView.webView.mainFrame.javaScriptContext"];
+    [context evaluateScript:textJS];
+    
+
 }
 
 // 收到通知消息
 -(void)afterReceiveNewMsg{
+    NSLog(@"afterReceiveNewMsg");
     JSContext *context = [self.webView valueForKeyPath:@"documentView.webView.mainFrame.javaScriptContext"];
     [context evaluateScript:@"afterReceiveNewMsg()"];
 }
@@ -555,6 +584,8 @@ JSExportAs(isInstallWeixin, -(int)jsIsInstallWeixin:(NSString *)str);// 是否
 }
 // 取未读消息总数
 -(int)jsGetUnReadMessageCount:(NSString *)openid{
+    NSLog(@"openid=%@",openid);
+//    NSLog(@"%d",[[LXDataBaseManager shareDataBaseManager] getUnReadMessageCount:openid]);
     return [[LXDataBaseManager shareDataBaseManager] getUnReadMessageCount:openid];
 }