图片管理整合

ios/JianYuIOS/JianYuIOS.xcodeproj/project.pbxproj

@@ -57,7 +57,6 @@
 		761BCA63272A816900259676 /* JYNewMessViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 761BCA62272A816900259676 /* JYNewMessViewController.m */; };
 		761BCA72272AA0CE00259676 /* README.txt in Resources */ = {isa = PBXBuildFile; fileRef = 761BCA6F272AA0CE00259676 /* README.txt */; };
 		761BCA73272AA0CE00259676 /* libWeChatSDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 761BCA71272AA0CE00259676 /* libWeChatSDK.a */; };
-		764C7D212A8DBE7600530FBC /* qidongye@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 764C7D202A8DBE7600530FBC /* qidongye@2x.png */; };
 		76A2914D2A8B1DC00030E63A /* AppDelegateCopy.m in Sources */ = {isa = PBXBuildFile; fileRef = 76A2914C2A8B1DBF0030E63A /* AppDelegateCopy.m */; };
 		76A2914E2A8B423A0030E63A /* Network.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 76AAC3C92A8A203F002C1D4F /* Network.framework */; };
 		76AAC3C12A89D771002C1D4F /* JYBaseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 76AAC3C02A89D771002C1D4F /* JYBaseViewController.m */; };
@@ -87,14 +86,11 @@
 		C550BF342018590A00F0BC2A /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = C550BF332018590A00F0BC2A /* libsqlite3.tbd */; };
 		C550BF362018591400F0BC2A /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C550BF352018591400F0BC2A /* CoreGraphics.framework */; };
 		C555EC282047DC5E0084642F /* LXNetworkManager.m in Sources */ = {isa = PBXBuildFile; fileRef = C555EC262047DC5E0084642F /* LXNetworkManager.m */; };
-		C5B194D4202EA46D00F0AC76 /* arrowLeft@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C5B194D3202EA46C00F0AC76 /* arrowLeft@2x.png */; };
 		C5BE6E422011D99100F28B36 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C5BE6E402011D99100F28B36 /* Main.storyboard */; };
 		C5BE6E442011D99100F28B36 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C5BE6E432011D99100F28B36 /* Assets.xcassets */; };
 		C5BE6E472011D99100F28B36 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C5BE6E452011D99100F28B36 /* LaunchScreen.storyboard */; };
 		C5BE6E542011D99100F28B36 /* JianYuIOSTests.m in Sources */ = {isa = PBXBuildFile; fileRef = C5BE6E532011D99100F28B36 /* JianYuIOSTests.m */; };
 		C5BE6E5F2011D99100F28B36 /* JianYuIOSUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = C5BE6E5E2011D99100F28B36 /* JianYuIOSUITests.m */; };
-		C5D01D7E20282543007F207E /* back_normal@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C5D01D7D20282543007F207E /* back_normal@2x.png */; };
-		C5FE4B5220468AED00CC8A2F /* noNet@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C5FE4B5120468AED00CC8A2F /* noNet@2x.png */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -201,7 +197,6 @@
 		761BCA6F272AA0CE00259676 /* README.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README.txt; sourceTree = "<group>"; };
 		761BCA70272AA0CE00259676 /* WechatAuthSDK.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WechatAuthSDK.h; sourceTree = "<group>"; };
 		761BCA71272AA0CE00259676 /* libWeChatSDK.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libWeChatSDK.a; sourceTree = "<group>"; };
-		764C7D202A8DBE7600530FBC /* qidongye@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "qidongye@2x.png"; sourceTree = "<group>"; };
 		76A2914B2A8B1DBF0030E63A /* AppDelegateCopy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegateCopy.h; sourceTree = "<group>"; };
 		76A2914C2A8B1DBF0030E63A /* AppDelegateCopy.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegateCopy.m; sourceTree = "<group>"; };
 		76AAC3BF2A89D771002C1D4F /* JYBaseViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JYBaseViewController.h; sourceTree = "<group>"; };
@@ -256,7 +251,6 @@
 		C550BF352018591400F0BC2A /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
 		C555EC262047DC5E0084642F /* LXNetworkManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LXNetworkManager.m; sourceTree = "<group>"; };
 		C555EC272047DC5E0084642F /* LXNetworkManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LXNetworkManager.h; sourceTree = "<group>"; };
-		C5B194D3202EA46C00F0AC76 /* arrowLeft@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "arrowLeft@2x.png"; sourceTree = "<group>"; };
 		C5BE6E372011D99100F28B36 /* 剑鱼标讯.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "剑鱼标讯.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		C5BE6E412011D99100F28B36 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		C5BE6E432011D99100F28B36 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -267,8 +261,6 @@
 		C5BE6E5A2011D99100F28B36 /* JianYuIOSUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = JianYuIOSUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		C5BE6E5E2011D99100F28B36 /* JianYuIOSUITests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JianYuIOSUITests.m; sourceTree = "<group>"; };
 		C5BE6E602011D99100F28B36 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		C5D01D7D20282543007F207E /* back_normal@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "back_normal@2x.png"; sourceTree = "<group>"; };
-		C5FE4B5120468AED00CC8A2F /* noNet@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "noNet@2x.png"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -681,17 +673,6 @@
 			path = BaseClass1;
 			sourceTree = "<group>";
 		};
-		C5493106201F04120080CD63 /* Image */ = {
-			isa = PBXGroup;
-			children = (
-				764C7D202A8DBE7600530FBC /* qidongye@2x.png */,
-				C5FE4B5120468AED00CC8A2F /* noNet@2x.png */,
-				C5B194D3202EA46C00F0AC76 /* arrowLeft@2x.png */,
-				C5D01D7D20282543007F207E /* back_normal@2x.png */,
-			);
-			path = Image;
-			sourceTree = "<group>";
-		};
 		C5BE6E2E2011D99100F28B36 = {
 			isa = PBXGroup;
 			children = (
@@ -725,7 +706,6 @@
 				18C78C0B24E240CE001208F2 /* tool */,
 				18E05CEF22F11CDD001E5B44 /* Libs(第三方) */,
 				C519972120202348007946E8 /* BaseClass1 */,
-				C5493106201F04120080CD63 /* Image */,
 				C550BEF420180AB700F0BC2A /* JianYuIOS.entitlements */,
 				188037092193EAD1006F9D7B /* Classes（模块） */,
 				76AAC3BE2A89D72A002C1D4F /* Classes(新模块) */,
@@ -887,14 +867,10 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				764C7D212A8DBE7600530FBC /* qidongye@2x.png in Resources */,
 				18C78C4624E24407001208F2 /* NoNetView.xib in Resources */,
 				761BCA72272AA0CE00259676 /* README.txt in Resources */,
-				C5D01D7E20282543007F207E /* back_normal@2x.png in Resources */,
 				18E05CFB22F11CDE001E5B44 /* AlipaySDK.bundle in Resources */,
 				76ED394C28813ACC00B211C9 /* JhtDocViewer.bundle in Resources */,
-				C5FE4B5220468AED00CC8A2F /* noNet@2x.png in Resources */,
-				C5B194D4202EA46D00F0AC76 /* arrowLeft@2x.png in Resources */,
 				C5BE6E472011D99100F28B36 /* LaunchScreen.storyboard in Resources */,
 				C5BE6E442011D99100F28B36 /* Assets.xcassets in Resources */,
 				C5BE6E422011D99100F28B36 /* Main.storyboard in Resources */,

ios/JianYuIOS/JianYuIOS/Assets.xcassets/otherImg/arrowLeft.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "arrowLeft@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ios/JianYuIOS/JianYuIOS/Assets.xcassets/otherImg/back_normal.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "back_normal@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ios/JianYuIOS/JianYuIOS/Assets.xcassets/otherImg/noNet.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "noNet@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ios/JianYuIOS/JianYuIOS/Assets.xcassets/otherImg/pyq.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "pyq@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ios/JianYuIOS/JianYuIOS/Assets.xcassets/otherImg/qidongye.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "qidongye@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ios/JianYuIOS/JianYuIOS/Assets.xcassets/otherImg/qq.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "qq@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ios/JianYuIOS/JianYuIOS/Assets.xcassets/otherImg/wx.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "wx@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ios/JianYuIOS/JianYuIOS/Classes(新模块)/JYBaseViewController.m

@@ -331,7 +331,7 @@ NSString *const new_AesKey = @"mGlAgnIBB8bx2nch";
     }else if ([message.name isEqualToString:@"loginSuccess"]) {
         [self jsLoginSuccess:message.body];
     }else if ([message.name isEqualToString:@"backUrl"]) {
-        //        [self jsBackUrl:message.body];
+        [self jsBackUrl:message.body];
     }else if ([message.name isEqualToString:@"clearPushMessage"]) {
         [self jsClearPushMessage:message.body];
     }else if ([message.name isEqualToString:@"hideRedSpotOnMenu"]) {
@@ -868,10 +868,7 @@ NSString *const new_AesKey = @"mGlAgnIBB8bx2nch";
 
 
 -(void)jsBackUrl:(NSDictionary *)dict {
-    NSString *status = [NSString stringWithFormat:@"%@",dict[@"status"]];
-    if([status isEqualToString:@"H"]) {
-        [self webViewFirstRequest];
-    }
+    [self webViewFirstRequest];
 }
 
 -(void)jsClearPushMessage:(NSDictionary *)dict {