apple 6 년 전
부모
커밋
a72b4bf3f7

BIN
ios/JianYuIOS/JianYuIOS.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate


+ 48 - 0
ios/JianYuIOS/JianYuIOS.xcworkspace/xcuserdata/apple.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -13,5 +13,53 @@
             stopOnStyle = "0">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "JianYuIOS/Classes&#xff08;&#x6a21;&#x5757;&#xff09;/JYSearchViewController.m"
+            timestampString = "569750651.722723"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "490"
+            endingLineNumber = "490"
+            landmarkName = "-loginOut:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "JianYuIOS/Classes&#xff08;&#x6a21;&#x5757;&#xff09;/JYMineViewController.m"
+            timestampString = "569750817.325857"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "366"
+            endingLineNumber = "366"
+            landmarkName = "-loginOut:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "JianYuIOS/Classes&#xff08;&#x6a21;&#x5757;&#xff09;/JYExpViewController.m"
+            timestampString = "569750916.481297"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "456"
+            endingLineNumber = "456"
+            landmarkName = "-doSomeWithLoadUrl:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

+ 42 - 2
ios/JianYuIOS/JianYuIOS/Classes(模块)/JYExpViewController.m

@@ -53,6 +53,8 @@ JSExportAs(backUrl, -(void)jsBackUrl:(NSString*)str);
 
 JSExportAs(clearPushMessage, -(void)jsClearPushMessage:(NSString*)type);
 
+JSExportAs(hideRedSpotOnMenu, -(void)jsHideRedSpotOnMenu:(NSString*)str);
+JSExportAs(showRedSpotOnMenu, -(void)jsShowRedSpotOnMenu:(NSString*)str);
 
 
 @end
@@ -162,7 +164,7 @@ NSString *const AesKey_2 = @"mGlAgnIBB8bx2nch";
         return;
     }
     //    NSString *current_url = self.webView.request.URL.absoluteString;
-    if([current_url isEqualToString:[NSString stringWithFormat:@"%@jyapp/free/me",kHost]]||[current_url isEqualToString:[NSString stringWithFormat:@"%@jyapp/jylab/index",kHost]]||[current_url isEqualToString:[NSString stringWithFormat:@"%@jyapp/wxkeyset/keyset/index",kHost]]||[current_url isEqualToString:[NSString stringWithFormat:@"%@jyapp/jylab/mainSearch",kHost]]){
+    if([current_url isEqualToString:[NSString stringWithFormat:@"%@jyapp/free/me",kHost]]||[current_url isEqualToString:[NSString stringWithFormat:@"%@jyapp/jylab/index",kHost]]||[current_url isEqualToString:[NSString stringWithFormat:@"%@jyapp/swordfish/historypush",kHost]]||[current_url isEqualToString:[NSString stringWithFormat:@"%@jyapp/jylab/mainSearch",kHost]]){
         return;
     }
     
@@ -258,7 +260,7 @@ NSString *const AesKey_2 = @"mGlAgnIBB8bx2nch";
 
 -(void)requestWebTime:(NSDictionary *)infoDict
 {
-    NSString * urlStr = [NSString stringWithFormat:@"%@",infoDict[@"url"]];
+    NSString * urlStr = [NSString stringWithFormat:@"%@",infoDict[@"info"][@"url"]];
     
     if([infoDict[@"type"] isEqualToString:@"message"]) {
         NSString *url = [NSString stringWithFormat:@"%@",urlStr];
@@ -935,6 +937,44 @@ NSString *const AesKey_2 = @"mGlAgnIBB8bx2nch";
         
     }
 }
+
+
+-(void)jsHideRedSpotOnMenu:(NSString*)str
+{
+    NSLog(@"exp隐藏:%@",str);
+    if([str isEqualToString:@"subscribe"]) {
+        kMainQueue(^{
+            [self.tabBarController.tabBar hideBadgeOnItemIndex:1];
+        });
+    }
+    
+    
+    if([str isEqualToString:@"my"]) {
+        kMainQueue(^{
+            [self.tabBarController.tabBar hideBadgeOnItemIndex:3];
+        });
+    }
+}
+
+-(void)jsShowRedSpotOnMenu:(NSString*)str
+{
+    NSLog(@"exp展示:%@",str);
+    if([str isEqualToString:@"subscribe"]) {
+        kMainQueue(^{
+            [self.tabBarController.tabBar showBadgeOnItemIndex:1];
+        });
+    }
+    
+    
+    if([str isEqualToString:@"my"]) {
+        kMainQueue(^{
+            [self.tabBarController.tabBar showBadgeOnItemIndex:3];
+        });
+    }
+    
+}
+
+
 -(void)jsClearPushMessage:(NSString*)type
 {
     NSLog(@"清除通知栏");

+ 41 - 7
ios/JianYuIOS/JianYuIOS/Classes(模块)/JYMineViewController.m

@@ -52,10 +52,11 @@ JSExportAs(backUrl, -(void)jsBackUrl:(NSString*)str);
 //测试支付
 JSExportAs(payment, -(void)jsPayment:(NSString*)str);
 
-JSExportAs(hideRedSpotOnMenu, -(void)jsHideRedSpotOnMenu:(NSString*)str);
 
 JSExportAs(clearPushMessage, -(void)jsClearPushMessage:(NSString*)type);
 
+JSExportAs(hideRedSpotOnMenu, -(void)jsHideRedSpotOnMenu:(NSString*)str);
+JSExportAs(showRedSpotOnMenu, -(void)jsShowRedSpotOnMenu:(NSString*)str);
 
 
 @end
@@ -142,6 +143,13 @@ NSString *const AesKey_3 = @"mGlAgnIBB8bx2nch";
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(refreshAllVC:) name:@"refreshAllVC" object:nil];
     
     
+    
+    
+    /*
+     账号:centuo
+     密码:
+     
+     */
 }
 
 -(void)newsRedPoint:(NSNotification *)notificaition
@@ -182,7 +190,7 @@ NSString *const AesKey_3 = @"mGlAgnIBB8bx2nch";
     }
     
     //    NSString *current_url = self.webView.request.URL.absoluteString;
-    if([current_url isEqualToString:[NSString stringWithFormat:@"%@jyapp/free/me",kHost]]||[current_url isEqualToString:[NSString stringWithFormat:@"%@jyapp/jylab/index",kHost]]||[current_url isEqualToString:[NSString stringWithFormat:@"%@jyapp/wxkeyset/keyset/index",kHost]]||[current_url isEqualToString:[NSString stringWithFormat:@"%@jyapp/jylab/mainSearch",kHost]]){
+    if([current_url isEqualToString:[NSString stringWithFormat:@"%@jyapp/free/me",kHost]]||[current_url isEqualToString:[NSString stringWithFormat:@"%@jyapp/jylab/index",kHost]]||[current_url isEqualToString:[NSString stringWithFormat:@"%@jyapp/swordfish/historypush",kHost]]||[current_url isEqualToString:[NSString stringWithFormat:@"%@jyapp/jylab/mainSearch",kHost]]){
         return;
     }
     
@@ -279,7 +287,7 @@ NSString *const AesKey_3 = @"mGlAgnIBB8bx2nch";
 
 -(void)requestWebTime:(NSDictionary *)infoDict
 {
-    NSString * urlStr = [NSString stringWithFormat:@"%@",infoDict[@"url"]];
+    NSString * urlStr = [NSString stringWithFormat:@"%@",infoDict[@"info"][@"url"]];
     
     if([infoDict[@"type"] isEqualToString:@"message"]) {
         NSString *url = [NSString stringWithFormat:@"%@",urlStr];
@@ -1007,10 +1015,36 @@ NSString *const AesKey_3 = @"mGlAgnIBB8bx2nch";
 
 -(void)jsHideRedSpotOnMenu:(NSString*)str
 {
-    NSLog(@"wd:%@",str);
-    kMainQueue(^{
-        [self.tabBarController.tabBar hideBadgeOnItemIndex:3];
-    });
+    NSLog(@"wd隐藏:%@",str);
+    if([str isEqualToString:@"subscribe"]) {
+        kMainQueue(^{
+            [self.tabBarController.tabBar hideBadgeOnItemIndex:1];
+        });
+    }
+    
+    
+    if([str isEqualToString:@"my"]) {
+        kMainQueue(^{
+            [self.tabBarController.tabBar hideBadgeOnItemIndex:3];
+        });
+    }
+}
+
+-(void)jsShowRedSpotOnMenu:(NSString*)str
+{
+    NSLog(@"wd展示:%@",str);
+    if([str isEqualToString:@"subscribe"]) {
+        kMainQueue(^{
+            [self.tabBarController.tabBar showBadgeOnItemIndex:1];
+        });
+    }
+    
+    
+    if([str isEqualToString:@"my"]) {
+        kMainQueue(^{
+            [self.tabBarController.tabBar showBadgeOnItemIndex:3];
+        });
+    }
 }
 
 

+ 42 - 1
ios/JianYuIOS/JianYuIOS/Classes(模块)/JYSearchViewController.m

@@ -53,6 +53,10 @@ JSExportAs(redirectKeyset, -(void)jsRedirectKeyset:(NSString*)str);
 
 JSExportAs(clearPushMessage, -(void)jsClearPushMessage:(NSString*)type);
 
+
+JSExportAs(hideRedSpotOnMenu, -(void)jsHideRedSpotOnMenu:(NSString*)str);
+JSExportAs(showRedSpotOnMenu, -(void)jsShowRedSpotOnMenu:(NSString*)str);
+
 @end
 
 
@@ -294,7 +298,7 @@ NSString *const AesKey_0 = @"mGlAgnIBB8bx2nch";
     }
     
     //    NSString *current_url = self.webView.request.URL.absoluteString;
-    if([current_url isEqualToString:[NSString stringWithFormat:@"%@jyapp/free/me",kHost]]||[current_url isEqualToString:[NSString stringWithFormat:@"%@jyapp/jylab/index",kHost]]||[current_url isEqualToString:[NSString stringWithFormat:@"%@jyapp/wxkeyset/keyset/index",kHost]]||[current_url isEqualToString:[NSString stringWithFormat:@"%@jyapp/jylab/mainSearch",kHost]]){
+    if([current_url isEqualToString:[NSString stringWithFormat:@"%@jyapp/free/me",kHost]]||[current_url isEqualToString:[NSString stringWithFormat:@"%@jyapp/jylab/index",kHost]]||[current_url isEqualToString:[NSString stringWithFormat:@"%@jyapp/swordfish/historypush",kHost]]||[current_url isEqualToString:[NSString stringWithFormat:@"%@jyapp/jylab/mainSearch",kHost]]){
         return;
     }
     
@@ -1196,6 +1200,43 @@ NSString *const AesKey_0 = @"mGlAgnIBB8bx2nch";
     [self webViewFirstRequest];
 }
 
+
+
+-(void)jsHideRedSpotOnMenu:(NSString*)str
+{
+    NSLog(@"search隐藏:%@",str);
+    if([str isEqualToString:@"subscribe"]) {
+        kMainQueue(^{
+            [self.tabBarController.tabBar hideBadgeOnItemIndex:1];
+        });
+    }
+    
+    
+    if([str isEqualToString:@"my"]) {
+        kMainQueue(^{
+            [self.tabBarController.tabBar hideBadgeOnItemIndex:3];
+        });
+    }
+}
+
+-(void)jsShowRedSpotOnMenu:(NSString*)str
+{
+    NSLog(@"search展示:%@",str);
+    if([str isEqualToString:@"subscribe"]) {
+        kMainQueue(^{
+            [self.tabBarController.tabBar showBadgeOnItemIndex:1];
+        });
+    }
+    
+    
+    if([str isEqualToString:@"my"]) {
+        kMainQueue(^{
+            [self.tabBarController.tabBar showBadgeOnItemIndex:3];
+        });
+    }
+    
+}
+
 -(void)jsClearPushMessage:(NSString*)type
 {
     NSLog(@"清除通知栏");

+ 37 - 5
ios/JianYuIOS/JianYuIOS/Classes(模块)/JYSubViewController.m

@@ -42,6 +42,10 @@ JSExportAs(loginSuccess, -(void)jsLoginSuccess:(NSString*)status);
 JSExportAs(backUrl, -(void)jsBackUrl:(NSString*)str);
 
 JSExportAs(hideRedSpotOnMenu, -(void)jsHideRedSpotOnMenu:(NSString*)str);
+JSExportAs(showRedSpotOnMenu, -(void)jsShowRedSpotOnMenu:(NSString*)str);
+
+
+
 
 JSExportAs(clearPushMessage, -(void)jsClearPushMessage:(NSString*)type);
 
@@ -255,7 +259,7 @@ NSString *const AesKey_1 = @"mGlAgnIBB8bx2nch";
 
 -(void)requestWebTime:(NSDictionary *)infoDict
 {
-    NSString * urlStr = [NSString stringWithFormat:@"%@",infoDict[@"url"]];
+    NSString * urlStr = [NSString stringWithFormat:@"%@",infoDict[@"info"][@"url"]];
     
     if([infoDict[@"type"] isEqualToString:@"message"]) {
         NSString *url = [NSString stringWithFormat:@"%@",urlStr];
@@ -919,11 +923,39 @@ NSString *const AesKey_1 = @"mGlAgnIBB8bx2nch";
 
 -(void)jsHideRedSpotOnMenu:(NSString*)str
 {
-    NSLog(@"dy:%@",str);
-    kMainQueue(^{
-        [self.tabBarController.tabBar hideBadgeOnItemIndex:1];
-    });
+    NSLog(@"sub隐藏:%@",str);
+    if([str isEqualToString:@"subscribe"]) {
+        kMainQueue(^{
+            [self.tabBarController.tabBar hideBadgeOnItemIndex:1];
+        });
+    }
+    
+    
+    if([str isEqualToString:@"my"]) {
+        kMainQueue(^{
+            [self.tabBarController.tabBar hideBadgeOnItemIndex:3];
+        });
+    }
+}
+
+-(void)jsShowRedSpotOnMenu:(NSString*)str
+{
+    NSLog(@"sub展示:%@",str);
+    if([str isEqualToString:@"subscribe"]) {
+        kMainQueue(^{
+            [self.tabBarController.tabBar showBadgeOnItemIndex:1];
+        });
+    }
+    
+    
+    if([str isEqualToString:@"my"]) {
+        kMainQueue(^{
+            [self.tabBarController.tabBar showBadgeOnItemIndex:3];
+        });
+    }
+    
 }
+
 -(void)jsClearPushMessage:(NSString*)type
 {
     NSLog(@"清除通知栏");