apple 5 jaren geleden
bovenliggende
commit
6677b63de3

+ 3 - 1
ios/JianYuIOS/JianYuIOS.xcodeproj/project.pbxproj

@@ -133,6 +133,7 @@
 /* Begin PBXFileReference section */
 /* Begin PBXFileReference section */
 		0CA962A24EED00910F83394E /* libPods-JianYuIOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-JianYuIOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		0CA962A24EED00910F83394E /* libPods-JianYuIOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-JianYuIOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		10D9BC27D00CB4DF3F791728 /* Pods-JianYuIOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JianYuIOS.release.xcconfig"; path = "Pods/Target Support Files/Pods-JianYuIOS/Pods-JianYuIOS.release.xcconfig"; sourceTree = "<group>"; };
 		10D9BC27D00CB4DF3F791728 /* Pods-JianYuIOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JianYuIOS.release.xcconfig"; path = "Pods/Target Support Files/Pods-JianYuIOS/Pods-JianYuIOS.release.xcconfig"; sourceTree = "<group>"; };
+		1800141B24CFC19200EEC1AF /* 剑鱼标讯Debug.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "剑鱼标讯Debug.entitlements"; sourceTree = "<group>"; };
 		181F89462472305A00CD0019 /* NJKWebViewProgress.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NJKWebViewProgress.m; sourceTree = "<group>"; };
 		181F89462472305A00CD0019 /* NJKWebViewProgress.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NJKWebViewProgress.m; sourceTree = "<group>"; };
 		181F89472472305A00CD0019 /* NJKWebViewProgressView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NJKWebViewProgressView.m; sourceTree = "<group>"; };
 		181F89472472305A00CD0019 /* NJKWebViewProgressView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NJKWebViewProgressView.m; sourceTree = "<group>"; };
 		181F89482472305B00CD0019 /* NJKWebViewProgress.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NJKWebViewProgress.h; sourceTree = "<group>"; };
 		181F89482472305B00CD0019 /* NJKWebViewProgress.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NJKWebViewProgress.h; sourceTree = "<group>"; };
@@ -549,6 +550,7 @@
 		C5BE6E392011D99100F28B36 /* JianYuIOS */ = {
 		C5BE6E392011D99100F28B36 /* JianYuIOS */ = {
 			isa = PBXGroup;
 			isa = PBXGroup;
 			children = (
 			children = (
+				1800141B24CFC19200EEC1AF /* 剑鱼标讯Debug.entitlements */,
 				183DDB6A24961EA400F58FB5 /* local */,
 				183DDB6A24961EA400F58FB5 /* local */,
 				184EC65D2435B9A300CA89F0 /* guide */,
 				184EC65D2435B9A300CA89F0 /* guide */,
 				18E05CEF22F11CDD001E5B44 /* Libs(第三方) */,
 				18E05CEF22F11CDD001E5B44 /* Libs(第三方) */,
@@ -1029,7 +1031,7 @@
 			baseConfigurationReference = 775098970477D1E68FB48E59 /* Pods-JianYuIOS.debug.xcconfig */;
 			baseConfigurationReference = 775098970477D1E68FB48E59 /* Pods-JianYuIOS.debug.xcconfig */;
 			buildSettings = {
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CODE_SIGN_ENTITLEMENTS = JianYuIOS/JianYuIOS.entitlements;
+				CODE_SIGN_ENTITLEMENTS = "JianYuIOS/剑鱼标讯Debug.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 55;
 				CURRENT_PROJECT_VERSION = 55;

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


+ 2 - 2
ios/JianYuIOS/JianYuIOS/AppDelegate.m

@@ -53,8 +53,8 @@
     }
     }
 
 
     NSLog(@"初始化");
     NSLog(@"初始化");
-    NSLog(@"%@",[[GlobalData shareInstance] getDocumentPath]);
-    NSLog(@"%@",[[GlobalData shareInstance] getfsCachedData]);
+//    NSLog(@"%@",[[GlobalData shareInstance] getDocumentPath]);
+//    NSLog(@"%@",[[GlobalData shareInstance] getfsCachedData]);
     [LXDataBaseManager shareDataBaseManager];//初始化单例
     [LXDataBaseManager shareDataBaseManager];//初始化单例
     [LXViewControllerManager shareViewControllerManager];
     [LXViewControllerManager shareViewControllerManager];
     [self initJPush:launchOptions];
     [self initJPush:launchOptions];

+ 3 - 1
ios/JianYuIOS/JianYuIOS/Classes(模块)/JYNewExpViewController.m

@@ -1257,7 +1257,9 @@ NSString *const new_AesKey_3 = @"mGlAgnIBB8bx2nch";
 // 收到通知消息
 // 收到通知消息
 -(void)afterReceiveNewMsg{
 -(void)afterReceiveNewMsg{
     NSLog(@"afterReceiveNewMsg");
     NSLog(@"afterReceiveNewMsg");
-    [self isExitCallToJS:@"afterReceiveNewMsg()" withMethodName:@"afterReceiveNewMsg"];
+    if(self.tabBarController.selectedIndex == 2) {
+        [self isExitCallToJS:@"afterReceiveNewMsg()" withMethodName:@"afterReceiveNewMsg"];
+    }
 }
 }
 
 
 // 再次加载页面
 // 再次加载页面

+ 3 - 1
ios/JianYuIOS/JianYuIOS/Classes(模块)/JYNewMineViewController.m

@@ -1278,7 +1278,9 @@ NSString *const new_AesKey_4 = @"mGlAgnIBB8bx2nch";
 // 收到通知消息
 // 收到通知消息
 -(void)afterReceiveNewMsg{
 -(void)afterReceiveNewMsg{
     NSLog(@"afterReceiveNewMsg");
     NSLog(@"afterReceiveNewMsg");
-    [self isExitCallToJS:@"afterReceiveNewMsg()" withMethodName:@"afterReceiveNewMsg"];
+    if(self.tabBarController.selectedIndex == 3) {
+        [self isExitCallToJS:@"afterReceiveNewMsg()" withMethodName:@"afterReceiveNewMsg"];
+    }
 }
 }
 
 
 // 再次加载页面
 // 再次加载页面

+ 4 - 1
ios/JianYuIOS/JianYuIOS/Classes(模块)/JYNewSearchViewController.m

@@ -1683,7 +1683,10 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
 // 收到通知消息
 // 收到通知消息
 -(void)afterReceiveNewMsg{
 -(void)afterReceiveNewMsg{
     NSLog(@"afterReceiveNewMsg");
     NSLog(@"afterReceiveNewMsg");
-    [self isExitCallToJS:@"afterReceiveNewMsg()" withMethodName:@"afterReceiveNewMsg"];
+    if(self.tabBarController.selectedIndex == 0) {
+         [self isExitCallToJS:@"afterReceiveNewMsg()" withMethodName:@"afterReceiveNewMsg"];
+    }
+   
 }
 }
 
 
 // 再次加载页面
 // 再次加载页面

+ 3 - 1
ios/JianYuIOS/JianYuIOS/Classes(模块)/JYNewSubViewController.m

@@ -1261,7 +1261,9 @@ NSString *const new_AesKey_2 = @"mGlAgnIBB8bx2nch";
 // 收到通知消息
 // 收到通知消息
 -(void)afterReceiveNewMsg{
 -(void)afterReceiveNewMsg{
     NSLog(@"afterReceiveNewMsg");
     NSLog(@"afterReceiveNewMsg");
-    [self isExitCallToJS:@"afterReceiveNewMsg()" withMethodName:@"afterReceiveNewMsg"];
+    if(self.tabBarController.selectedIndex == 1) {
+        [self isExitCallToJS:@"afterReceiveNewMsg()" withMethodName:@"afterReceiveNewMsg"];
+    }
 }
 }
 
 
 // 再次加载页面
 // 再次加载页面

+ 0 - 25
ios/JianYuIOS/JianYuIOS/JYTabBarController.m

@@ -8,10 +8,6 @@
 
 
 #import "JYTabBarController.h"
 #import "JYTabBarController.h"
 #import "JYNavigationController.h"
 #import "JYNavigationController.h"
-#import "JYSearchViewController.h"
-#import "JYSubViewController.h"
-#import "JYExpViewController.h"
-#import "JYMineViewController.h"
 #import "JYNewSearchViewController.h"
 #import "JYNewSearchViewController.h"
 #import "JYNewSubViewController.h"
 #import "JYNewSubViewController.h"
 #import "JYNewExpViewController.h"
 #import "JYNewExpViewController.h"
@@ -20,11 +16,6 @@
 
 
 @interface JYTabBarController ()<UITabBarControllerDelegate>
 @interface JYTabBarController ()<UITabBarControllerDelegate>
 
 
-@property (nonatomic,strong)JYSearchViewController *V1;
-@property (nonatomic,strong)JYSubViewController *V2;
-@property (nonatomic,strong)JYExpViewController *V3;
-@property (nonatomic,strong)JYMineViewController *V4;
-
 @property (nonatomic,strong)JYNewSearchViewController *VC1;
 @property (nonatomic,strong)JYNewSearchViewController *VC1;
 @property (nonatomic,strong)JYNewSubViewController *VC2;
 @property (nonatomic,strong)JYNewSubViewController *VC2;
 @property (nonatomic,strong)JYNewExpViewController *VC3;
 @property (nonatomic,strong)JYNewExpViewController *VC3;
@@ -102,7 +93,6 @@
 #pragma mark - -----------------------------------------
 #pragma mark - -----------------------------------------
 - (void)setUpAllChildVc
 - (void)setUpAllChildVc
 {
 {
-//    [self oldChildVC];
     [self newChildVC];
     [self newChildVC];
 }
 }
 
 
@@ -120,21 +110,6 @@
     [self setUpOneChildVcWithVc:self.VC4 Image:@"four_1" selectedImage:@"four" title:@"我的" tag:3];
     [self setUpOneChildVcWithVc:self.VC4 Image:@"four_1" selectedImage:@"four" title:@"我的" tag:3];
 }
 }
 
 
--(void)oldChildVC {
-    self.V1 = [[JYSearchViewController alloc] init];
-    [self setUpOneChildVcWithVc:self.V1 Image:@"one_1" selectedImage:@"one" title:@"首页" tag:0];
-
-    self.V2 = [[JYSubViewController alloc] init];
-    [self setUpOneChildVcWithVc:self.V2 Image:@"two_1" selectedImage:@"two" title:@"订阅" tag:1];
-
-    self.V3 = [[JYExpViewController alloc] init];
-    [self setUpOneChildVcWithVc:self.V3 Image:@"three_1" selectedImage:@"three" title:@"百宝箱" tag:2];
-
-
-    self.V4 = [[JYMineViewController alloc] init];
-    [self setUpOneChildVcWithVc:self.V4 Image:@"four_1" selectedImage:@"four" title:@"我的" tag:3];
-}
-
 #pragma mark - 初始化设置tabBar上面单个按钮的方法
 #pragma mark - 初始化设置tabBar上面单个按钮的方法
 
 
 /**
 /**

+ 0 - 2
ios/JianYuIOS/JianYuIOS/JianYuIOS.entitlements

@@ -2,8 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <plist version="1.0">
 <dict>
 <dict>
-	<key>aps-environment</key>
-	<string>development</string>
 	<key>com.apple.developer.associated-domains</key>
 	<key>com.apple.developer.associated-domains</key>
 	<array>
 	<array>
 		<string>applinks:www.jianyu360.com</string>
 		<string>applinks:www.jianyu360.com</string>

+ 12 - 0
ios/JianYuIOS/JianYuIOS/剑鱼标讯Debug.entitlements

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>aps-environment</key>
+	<string>development</string>
+	<key>com.apple.developer.associated-domains</key>
+	<array>
+		<string>applinks:www.jianyu360.com</string>
+	</array>
+</dict>
+</plist>