Browse Source

appVersion 2.2.0

贺泌钦 3 years ago
parent
commit
08338811b0
100 changed files with 1535 additions and 337 deletions
  1. 16 0
      CertificateSigningRequest.certSigningRequest
  2. 1 1
      Pods/WHKit/WHKit/WHMacro.h
  3. 650 20
      ZhongJingLianMeng.xcodeproj/project.pbxproj
  4. 9 15
      ZhongJingLianMeng.xcodeproj/xcuserdata/youke.xcuserdatad/xcschemes/ZhongJingLianMeng.xcscheme
  5. BIN
      ZhongJingLianMeng.xcworkspace/xcuserdata/youke.xcuserdatad/UserInterfaceState.xcuserstate
  6. 663 214
      ZhongJingLianMeng.xcworkspace/xcuserdata/youke.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
  7. 1 2
      ZhongJingLianMeng/AppDelegate/AppDelegate.m
  8. BIN
      ZhongJingLianMeng/Assets.xcassets/LaunchImage.launchimage/1125-2436.png
  9. BIN
      ZhongJingLianMeng/Assets.xcassets/LaunchImage.launchimage/1242-2208.png
  10. BIN
      ZhongJingLianMeng/Assets.xcassets/LaunchImage.launchimage/21589455279_.pic_hd.jpg
  11. BIN
      ZhongJingLianMeng/Assets.xcassets/LaunchImage.launchimage/640-1136.png
  12. BIN
      ZhongJingLianMeng/Assets.xcassets/LaunchImage.launchimage/640-960.png
  13. BIN
      ZhongJingLianMeng/Assets.xcassets/LaunchImage.launchimage/750*1334.png
  14. 18 18
      ZhongJingLianMeng/Assets.xcassets/LaunchImage.launchimage/Contents.json
  15. BIN
      ZhongJingLianMeng/Assets.xcassets/LaunchImage.launchimage/启动页-1125_2436.png
  16. BIN
      ZhongJingLianMeng/Assets.xcassets/LaunchImage.launchimage/启动页-640_1136.png
  17. BIN
      ZhongJingLianMeng/Assets.xcassets/LaunchImage.launchimage/启动页-640_960.png
  18. BIN
      ZhongJingLianMeng/Assets.xcassets/LaunchImage.launchimage/启动页-750.png
  19. 5 5
      ZhongJingLianMeng/Assets.xcassets/我的/about.imageset/Contents.json
  20. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/about.imageset/about@2x.png
  21. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/about.imageset/about@3x.png
  22. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/about.imageset/设置@2x.png
  23. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/about.imageset/设置@3x.png
  24. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/backImg_icon.imageset/1@2x.png
  25. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/backImg_icon.imageset/1@3x.png
  26. 22 0
      ZhongJingLianMeng/Assets.xcassets/我的/backImg_icon.imageset/Contents.json
  27. 5 5
      ZhongJingLianMeng/Assets.xcassets/我的/banben.imageset/Contents.json
  28. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/banben.imageset/banben@2x.png
  29. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/banben.imageset/banben@3x.png
  30. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/banben.imageset/关于@2x.png
  31. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/banben.imageset/关于@3x.png
  32. 22 0
      ZhongJingLianMeng/Assets.xcassets/我的/cancleIcon.imageset/Contents.json
  33. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/cancleIcon.imageset/取消icon@2x.png
  34. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/cancleIcon.imageset/取消icon@3x.png
  35. 5 5
      ZhongJingLianMeng/Assets.xcassets/我的/daoqi.imageset/Contents.json
  36. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/daoqi.imageset/会员到期续费@2x.png
  37. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/daoqi.imageset/会员到期续费@3x.png
  38. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/daoqi.imageset/加入联盟@2x.png
  39. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/daoqi.imageset/加入联盟@3x.png
  40. 5 5
      ZhongJingLianMeng/Assets.xcassets/我的/headeBG.imageset/Contents.json
  41. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/headeBG.imageset/back@2x.png
  42. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/headeBG.imageset/back@3x.png
  43. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/headeBG.imageset/headeBG@2x.png
  44. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/headeBG.imageset/headeBG@3x.png
  45. 5 5
      ZhongJingLianMeng/Assets.xcassets/我的/huodong.imageset/Contents.json
  46. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/huodong.imageset/huodong@2x.png
  47. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/huodong.imageset/huodong@3x.png
  48. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/huodong.imageset/订单@2x.png
  49. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/huodong.imageset/订单@3x.png
  50. 22 0
      ZhongJingLianMeng/Assets.xcassets/我的/icon_headImg.imageset/Contents.json
  51. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/icon_headImg.imageset/默认头像@2x.png
  52. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/icon_headImg.imageset/默认头像@3x.png
  53. 22 0
      ZhongJingLianMeng/Assets.xcassets/我的/icon_photo.imageset/Contents.json
  54. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/icon_photo.imageset/上传图片@2x.png
  55. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/icon_photo.imageset/上传图片@3x.png
  56. 5 5
      ZhongJingLianMeng/Assets.xcassets/我的/jiameng.imageset/Contents.json
  57. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/jiameng.imageset/jiameng@2x.png
  58. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/jiameng.imageset/jiameng@3x.png
  59. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/jiameng.imageset/会员@2x.png
  60. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/jiameng.imageset/会员@3x.png
  61. 5 5
      ZhongJingLianMeng/Assets.xcassets/我的/jiarulianmeng.imageset/Contents.json
  62. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/jiarulianmeng.imageset/加入联盟@2x.png
  63. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/jiarulianmeng.imageset/加入联盟@3x.png
  64. 5 5
      ZhongJingLianMeng/Assets.xcassets/我的/lishi.imageset/Contents.json
  65. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/lishi.imageset/加入联盟@2x.png
  66. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/lishi.imageset/加入联盟@3x.png
  67. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/lishi.imageset/申请理事@2x.png
  68. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/lishi.imageset/申请理事@3x.png
  69. 5 5
      ZhongJingLianMeng/Assets.xcassets/我的/myClllect.imageset/Contents.json
  70. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/myClllect.imageset/myClllect@2x.png
  71. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/myClllect.imageset/myClllect@3x.png
  72. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/myClllect.imageset/收藏@2x.png
  73. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/myClllect.imageset/收藏@3x.png
  74. 5 5
      ZhongJingLianMeng/Assets.xcassets/我的/myVip.imageset/Contents.json
  75. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/myVip.imageset/myVip@2x.png
  76. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/myVip.imageset/myVip@3x.png
  77. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/myVip.imageset/需求@2x.png
  78. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/myVip.imageset/需求@3x.png
  79. 5 5
      ZhongJingLianMeng/Assets.xcassets/我的/news.imageset/Contents.json
  80. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/news.imageset/news@2x.png
  81. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/news.imageset/news@3x.png
  82. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/news.imageset/消息@2x.png
  83. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/news.imageset/消息@3x.png
  84. 5 5
      ZhongJingLianMeng/Assets.xcassets/我的/orderIcon.imageset/Contents.json
  85. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/orderIcon.imageset/orderIcon@2x.png
  86. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/orderIcon.imageset/orderIcon@3x.png
  87. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/orderIcon.imageset/活动@2x.png
  88. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/orderIcon.imageset/活动@3x.png
  89. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/searchEmptyImg.imageset/5968635769991@2x.png
  90. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/searchEmptyImg.imageset/5968635769991@3x.png
  91. 5 5
      ZhongJingLianMeng/Assets.xcassets/我的/searchEmptyImg.imageset/Contents.json
  92. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/searchEmptyImg.imageset/缺省q@2x.png
  93. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/searchEmptyImg.imageset/缺省q@3x.png
  94. 2 2
      ZhongJingLianMeng/Assets.xcassets/我的/zhaogongzuo.imageset/Contents.json
  95. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/zhaogongzuo.imageset/zhaogongzuo@2x.png
  96. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/zhaogongzuo.imageset/zhaogongzuo@3x.png
  97. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/zhaogongzuo.imageset/组 4@2x.png
  98. BIN
      ZhongJingLianMeng/Assets.xcassets/我的/zhaogongzuo.imageset/组 4@3x.png
  99. 22 0
      ZhongJingLianMeng/Assets.xcassets/我的/zhaoxiangmu-1.imageset/Contents.json
  100. 0 0
      ZhongJingLianMeng/Assets.xcassets/我的/zhaoxiangmu-1.imageset/组 2@2x.png

+ 16 - 0
CertificateSigningRequest.certSigningRequest

@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICgzCCAWsCAQAwPjEfMB0GCSqGSIb3DQEJARYQNTI3ODE4NjcwQHFxLmNvbTEO
+MAwGA1UEAwwFeW91a2UxCzAJBgNVBAYTAkNOMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEAzSMvqc+XAp7GC9dpKGVGiauFpepOcxsYEMEpZ/aiWYzFNteu
+agJBFI/M93TZVsqSAI6wSSYnJ3n1lNgQQwHKFJ8BLhgaEWqUKzD8Kk/bxyeUuX+5
+9pudwnMVk0kK4R0d61FftiuaNg6obTJMrjyVmZEyzquT9Kc+BfcDyOKBFlFyTLQi
+8U/HDFZWb9zPVUCYU8CfGI/9L18sZXZVO5OcHglD0OmCj+NwQ28ZHHWDT4L3tuuZ
+Pgc3gTdMS52+BFbh+ylEaJMs/7n/cVXkuTX+nBlKOLZCctUb5rD9+gwtyP0xWG05
+yOqamqMiQstN5clB8ApIWnn6Os7u2qeamTKhiQIDAQABoAAwDQYJKoZIhvcNAQEL
+BQADggEBAE+yX70hYexYmgHAygwwVwTYZ+LTHVxXLvSORQ7wFm2VjXjnB2Jh+xlu
+PL7MVNnImKshrEB47t60IKgw/QP5ZI+WrxnutTYpVUse2wv6FKtn0a/D5qXgqEqw
+ATx6+ofS2y0qqlaQ5OpPzXnV4IS1XCyJleMVrjEOPY/Sxes719DGnIQpfBMH2/3v
+YLUPx/MZOgc0QLfXz09h0vQ1VambMUR4Cc+daSY40C73fpXKjJDSsOrKQVdmMkof
+pAl2eAlHpXlGkKQp2FFDOcHP918FEkhm7/D5AAvuE5AyJcmgJgX0FNoekN16fq2H
+qDucRQbzaA39CHdg+SM9az1NmMoY0dk=
+-----END CERTIFICATE REQUEST-----

+ 1 - 1
Pods/WHKit/WHKit/WHMacro.h

@@ -7,7 +7,7 @@
 //  http://www.jianshu.com/p/c935314b078e
 
 //NSLog
-#ifdef DEBUG
+#ifdef DEGUG
 #define NSLog(...) NSLog(@"%s 第%d行: %@\n\n",__func__,__LINE__,[NSString stringWithFormat:__VA_ARGS__])
 #else
 #define NSLog(...)

File diff suppressed because it is too large
+ 650 - 20
ZhongJingLianMeng.xcodeproj/project.pbxproj


+ 9 - 15
ZhongJingLianMeng.xcodeproj/xcuserdata/youke.xcuserdatad/xcschemes/ZhongJingLianMeng.xcscheme

@@ -26,8 +26,16 @@
       buildConfiguration = "Release"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "CC1CE923219BB579004F8F79"
+            BuildableName = "ZhongJingLianMeng.app"
+            BlueprintName = "ZhongJingLianMeng"
+            ReferencedContainer = "container:ZhongJingLianMeng.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -50,23 +58,11 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "CC1CE923219BB579004F8F79"
-            BuildableName = "ZhongJingLianMeng.app"
-            BlueprintName = "ZhongJingLianMeng"
-            ReferencedContainer = "container:ZhongJingLianMeng.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
@@ -83,8 +79,6 @@
             ReferencedContainer = "container:ZhongJingLianMeng.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

BIN
ZhongJingLianMeng.xcworkspace/xcuserdata/youke.xcuserdatad/UserInterfaceState.xcuserstate


File diff suppressed because it is too large
+ 663 - 214
ZhongJingLianMeng.xcworkspace/xcuserdata/youke.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist


+ 1 - 2
ZhongJingLianMeng/AppDelegate/AppDelegate.m

@@ -5,7 +5,6 @@
 //  Created by youke on 2018/11/14.
 //  Copyright © 2018 youke. All rights reserved.
 //
-
 #import "AppDelegate.h"
 #import "HWTabBarViewController.h"
 #import "newsDetailVController.h"
@@ -361,7 +360,7 @@
             _alertView = [[XWAlertView alloc]initWithimage:[UIImage imageNamed:@"huojian"] message:str1 versionId:[NSString stringWithFormat:@"V%@",serverVersion] isForcedUpdating:[NSString stringWithFormat:@"%@",response[@"data"][@"forcedUpdating"]]];
             _alertView.resultIndex = ^(NSInteger index) {
                 
-                [[UIApplication sharedApplication]openURL:[NSURL URLWithString:@"https://itunes.apple.com/us/app/中经联盟官方手机应用/id1102697591?mt=8"]];
+                [[UIApplication sharedApplication]openURL:[NSURL URLWithString:@"https://apps.apple.com/cn/app/%E4%B8%AD%E7%BB%8F%E8%81%94%E7%9B%9F%E5%AE%98%E6%96%B9%E6%89%8B%E6%9C%BA%E5%BA%94%E7%94%A8/id1102697591"]];
                 _isClick = YES;
             };
             [_alertView showAlertView];

BIN
ZhongJingLianMeng/Assets.xcassets/LaunchImage.launchimage/1125-2436.png


BIN
ZhongJingLianMeng/Assets.xcassets/LaunchImage.launchimage/1242-2208.png


BIN
ZhongJingLianMeng/Assets.xcassets/LaunchImage.launchimage/21589455279_.pic_hd.jpg


BIN
ZhongJingLianMeng/Assets.xcassets/LaunchImage.launchimage/640-1136.png


BIN
ZhongJingLianMeng/Assets.xcassets/LaunchImage.launchimage/640-960.png


BIN
ZhongJingLianMeng/Assets.xcassets/LaunchImage.launchimage/750*1334.png


+ 18 - 18
ZhongJingLianMeng/Assets.xcassets/LaunchImage.launchimage/Contents.json

@@ -2,51 +2,51 @@
   "images" : [
     {
       "extent" : "full-screen",
+      "filename" : "启动页-1125_2436.png",
       "idiom" : "iphone",
-      "subtype" : "2436h",
-      "filename" : "1125-2436.png",
       "minimum-system-version" : "11.0",
       "orientation" : "portrait",
-      "scale" : "3x"
+      "scale" : "3x",
+      "subtype" : "2436h"
     },
     {
       "extent" : "full-screen",
+      "filename" : "21589455279_.pic_hd.jpg",
       "idiom" : "iphone",
-      "subtype" : "736h",
-      "filename" : "1242-2208.png",
       "minimum-system-version" : "8.0",
       "orientation" : "portrait",
-      "scale" : "3x"
+      "scale" : "3x",
+      "subtype" : "736h"
     },
     {
       "extent" : "full-screen",
+      "filename" : "启动页-750.png",
       "idiom" : "iphone",
-      "subtype" : "667h",
-      "filename" : "750*1334.png",
       "minimum-system-version" : "8.0",
       "orientation" : "portrait",
-      "scale" : "2x"
+      "scale" : "2x",
+      "subtype" : "667h"
     },
     {
-      "orientation" : "portrait",
-      "idiom" : "iphone",
-      "filename" : "640-960.png",
       "extent" : "full-screen",
+      "filename" : "启动页-640_960.png",
+      "idiom" : "iphone",
       "minimum-system-version" : "7.0",
+      "orientation" : "portrait",
       "scale" : "2x"
     },
     {
       "extent" : "full-screen",
+      "filename" : "启动页-640_1136.png",
       "idiom" : "iphone",
-      "subtype" : "retina4",
-      "filename" : "640-1136.png",
       "minimum-system-version" : "7.0",
       "orientation" : "portrait",
-      "scale" : "2x"
+      "scale" : "2x",
+      "subtype" : "retina4"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

BIN
ZhongJingLianMeng/Assets.xcassets/LaunchImage.launchimage/启动页-1125_2436.png


BIN
ZhongJingLianMeng/Assets.xcassets/LaunchImage.launchimage/启动页-640_1136.png


BIN
ZhongJingLianMeng/Assets.xcassets/LaunchImage.launchimage/启动页-640_960.png


BIN
ZhongJingLianMeng/Assets.xcassets/LaunchImage.launchimage/启动页-750.png


+ 5 - 5
ZhongJingLianMeng/Assets.xcassets/我的/about.imageset/Contents.json

@@ -5,18 +5,18 @@
       "scale" : "1x"
     },
     {
+      "filename" : "设置@2x.png",
       "idiom" : "universal",
-      "filename" : "about@2x.png",
       "scale" : "2x"
     },
     {
+      "filename" : "设置@3x.png",
       "idiom" : "universal",
-      "filename" : "about@3x.png",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

BIN
ZhongJingLianMeng/Assets.xcassets/我的/about.imageset/about@2x.png


BIN
ZhongJingLianMeng/Assets.xcassets/我的/about.imageset/about@3x.png


BIN
ZhongJingLianMeng/Assets.xcassets/我的/about.imageset/设置@2x.png


BIN
ZhongJingLianMeng/Assets.xcassets/我的/about.imageset/设置@3x.png


BIN
ZhongJingLianMeng/Assets.xcassets/我的/backImg_icon.imageset/1@2x.png


BIN
ZhongJingLianMeng/Assets.xcassets/我的/backImg_icon.imageset/1@3x.png


+ 22 - 0
ZhongJingLianMeng/Assets.xcassets/我的/backImg_icon.imageset/Contents.json

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

+ 5 - 5
ZhongJingLianMeng/Assets.xcassets/我的/banben.imageset/Contents.json

@@ -5,18 +5,18 @@
       "scale" : "1x"
     },
     {
+      "filename" : "关于@2x.png",
       "idiom" : "universal",
-      "filename" : "banben@2x.png",
       "scale" : "2x"
     },
     {
+      "filename" : "关于@3x.png",
       "idiom" : "universal",
-      "filename" : "banben@3x.png",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

BIN
ZhongJingLianMeng/Assets.xcassets/我的/banben.imageset/banben@2x.png


BIN
ZhongJingLianMeng/Assets.xcassets/我的/banben.imageset/banben@3x.png


BIN
ZhongJingLianMeng/Assets.xcassets/我的/banben.imageset/关于@2x.png


BIN
ZhongJingLianMeng/Assets.xcassets/我的/banben.imageset/关于@3x.png


+ 22 - 0
ZhongJingLianMeng/Assets.xcassets/我的/cancleIcon.imageset/Contents.json

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

BIN
ZhongJingLianMeng/Assets.xcassets/我的/cancleIcon.imageset/取消icon@2x.png


BIN
ZhongJingLianMeng/Assets.xcassets/我的/cancleIcon.imageset/取消icon@3x.png


+ 5 - 5
ZhongJingLianMeng/Assets.xcassets/我的/daoqi.imageset/Contents.json

@@ -5,18 +5,18 @@
       "scale" : "1x"
     },
     {
+      "filename" : "加入联盟@2x.png",
       "idiom" : "universal",
-      "filename" : "会员到期续费@2x.png",
       "scale" : "2x"
     },
     {
+      "filename" : "加入联盟@3x.png",
       "idiom" : "universal",
-      "filename" : "会员到期续费@3x.png",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

BIN
ZhongJingLianMeng/Assets.xcassets/我的/daoqi.imageset/会员到期续费@2x.png


BIN
ZhongJingLianMeng/Assets.xcassets/我的/daoqi.imageset/会员到期续费@3x.png


BIN
ZhongJingLianMeng/Assets.xcassets/我的/daoqi.imageset/加入联盟@2x.png


BIN
ZhongJingLianMeng/Assets.xcassets/我的/daoqi.imageset/加入联盟@3x.png


+ 5 - 5
ZhongJingLianMeng/Assets.xcassets/我的/headeBG.imageset/Contents.json

@@ -5,18 +5,18 @@
       "scale" : "1x"
     },
     {
+      "filename" : "back@2x.png",
       "idiom" : "universal",
-      "filename" : "headeBG@2x.png",
       "scale" : "2x"
     },
     {
+      "filename" : "back@3x.png",
       "idiom" : "universal",
-      "filename" : "headeBG@3x.png",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

BIN
ZhongJingLianMeng/Assets.xcassets/我的/headeBG.imageset/back@2x.png


BIN
ZhongJingLianMeng/Assets.xcassets/我的/headeBG.imageset/back@3x.png


BIN
ZhongJingLianMeng/Assets.xcassets/我的/headeBG.imageset/headeBG@2x.png


BIN
ZhongJingLianMeng/Assets.xcassets/我的/headeBG.imageset/headeBG@3x.png


+ 5 - 5
ZhongJingLianMeng/Assets.xcassets/我的/huodong.imageset/Contents.json

@@ -5,18 +5,18 @@
       "scale" : "1x"
     },
     {
+      "filename" : "订单@2x.png",
       "idiom" : "universal",
-      "filename" : "huodong@2x.png",
       "scale" : "2x"
     },
     {
+      "filename" : "订单@3x.png",
       "idiom" : "universal",
-      "filename" : "huodong@3x.png",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

BIN
ZhongJingLianMeng/Assets.xcassets/我的/huodong.imageset/huodong@2x.png


BIN
ZhongJingLianMeng/Assets.xcassets/我的/huodong.imageset/huodong@3x.png


BIN
ZhongJingLianMeng/Assets.xcassets/我的/huodong.imageset/订单@2x.png


BIN
ZhongJingLianMeng/Assets.xcassets/我的/huodong.imageset/订单@3x.png


+ 22 - 0
ZhongJingLianMeng/Assets.xcassets/我的/icon_headImg.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "默认头像@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "默认头像@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

BIN
ZhongJingLianMeng/Assets.xcassets/我的/icon_headImg.imageset/默认头像@2x.png


BIN
ZhongJingLianMeng/Assets.xcassets/我的/icon_headImg.imageset/默认头像@3x.png


+ 22 - 0
ZhongJingLianMeng/Assets.xcassets/我的/icon_photo.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "上传图片@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "上传图片@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

BIN
ZhongJingLianMeng/Assets.xcassets/我的/icon_photo.imageset/上传图片@2x.png


BIN
ZhongJingLianMeng/Assets.xcassets/我的/icon_photo.imageset/上传图片@3x.png


+ 5 - 5
ZhongJingLianMeng/Assets.xcassets/我的/jiameng.imageset/Contents.json

@@ -5,18 +5,18 @@
       "scale" : "1x"
     },
     {
+      "filename" : "会员@2x.png",
       "idiom" : "universal",
-      "filename" : "jiameng@2x.png",
       "scale" : "2x"
     },
     {
+      "filename" : "会员@3x.png",
       "idiom" : "universal",
-      "filename" : "jiameng@3x.png",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

BIN
ZhongJingLianMeng/Assets.xcassets/我的/jiameng.imageset/jiameng@2x.png


BIN
ZhongJingLianMeng/Assets.xcassets/我的/jiameng.imageset/jiameng@3x.png


BIN
ZhongJingLianMeng/Assets.xcassets/我的/jiameng.imageset/会员@2x.png


BIN
ZhongJingLianMeng/Assets.xcassets/我的/jiameng.imageset/会员@3x.png


+ 5 - 5
ZhongJingLianMeng/Assets.xcassets/我的/jiarulianmeng.imageset/Contents.json

@@ -5,18 +5,18 @@
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
       "filename" : "加入联盟@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "idiom" : "universal",
       "filename" : "加入联盟@3x.png",
+      "idiom" : "universal",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

BIN
ZhongJingLianMeng/Assets.xcassets/我的/jiarulianmeng.imageset/加入联盟@2x.png


BIN
ZhongJingLianMeng/Assets.xcassets/我的/jiarulianmeng.imageset/加入联盟@3x.png


+ 5 - 5
ZhongJingLianMeng/Assets.xcassets/我的/lishi.imageset/Contents.json

@@ -5,18 +5,18 @@
       "scale" : "1x"
     },
     {
+      "filename" : "加入联盟@2x.png",
       "idiom" : "universal",
-      "filename" : "申请理事@2x.png",
       "scale" : "2x"
     },
     {
+      "filename" : "加入联盟@3x.png",
       "idiom" : "universal",
-      "filename" : "申请理事@3x.png",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

BIN
ZhongJingLianMeng/Assets.xcassets/我的/lishi.imageset/加入联盟@2x.png


BIN
ZhongJingLianMeng/Assets.xcassets/我的/lishi.imageset/加入联盟@3x.png


BIN
ZhongJingLianMeng/Assets.xcassets/我的/lishi.imageset/申请理事@2x.png


BIN
ZhongJingLianMeng/Assets.xcassets/我的/lishi.imageset/申请理事@3x.png


+ 5 - 5
ZhongJingLianMeng/Assets.xcassets/我的/myClllect.imageset/Contents.json

@@ -5,18 +5,18 @@
       "scale" : "1x"
     },
     {
+      "filename" : "收藏@2x.png",
       "idiom" : "universal",
-      "filename" : "myClllect@2x.png",
       "scale" : "2x"
     },
     {
+      "filename" : "收藏@3x.png",
       "idiom" : "universal",
-      "filename" : "myClllect@3x.png",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

BIN
ZhongJingLianMeng/Assets.xcassets/我的/myClllect.imageset/myClllect@2x.png


BIN
ZhongJingLianMeng/Assets.xcassets/我的/myClllect.imageset/myClllect@3x.png


BIN
ZhongJingLianMeng/Assets.xcassets/我的/myClllect.imageset/收藏@2x.png


BIN
ZhongJingLianMeng/Assets.xcassets/我的/myClllect.imageset/收藏@3x.png


+ 5 - 5
ZhongJingLianMeng/Assets.xcassets/我的/myVip.imageset/Contents.json

@@ -5,18 +5,18 @@
       "scale" : "1x"
     },
     {
+      "filename" : "需求@2x.png",
       "idiom" : "universal",
-      "filename" : "myVip@2x.png",
       "scale" : "2x"
     },
     {
+      "filename" : "需求@3x.png",
       "idiom" : "universal",
-      "filename" : "myVip@3x.png",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

BIN
ZhongJingLianMeng/Assets.xcassets/我的/myVip.imageset/myVip@2x.png


BIN
ZhongJingLianMeng/Assets.xcassets/我的/myVip.imageset/myVip@3x.png


BIN
ZhongJingLianMeng/Assets.xcassets/我的/myVip.imageset/需求@2x.png


BIN
ZhongJingLianMeng/Assets.xcassets/我的/myVip.imageset/需求@3x.png


+ 5 - 5
ZhongJingLianMeng/Assets.xcassets/我的/news.imageset/Contents.json

@@ -5,18 +5,18 @@
       "scale" : "1x"
     },
     {
+      "filename" : "消息@2x.png",
       "idiom" : "universal",
-      "filename" : "news@2x.png",
       "scale" : "2x"
     },
     {
+      "filename" : "消息@3x.png",
       "idiom" : "universal",
-      "filename" : "news@3x.png",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

BIN
ZhongJingLianMeng/Assets.xcassets/我的/news.imageset/news@2x.png


BIN
ZhongJingLianMeng/Assets.xcassets/我的/news.imageset/news@3x.png


BIN
ZhongJingLianMeng/Assets.xcassets/我的/news.imageset/消息@2x.png


BIN
ZhongJingLianMeng/Assets.xcassets/我的/news.imageset/消息@3x.png


+ 5 - 5
ZhongJingLianMeng/Assets.xcassets/我的/orderIcon.imageset/Contents.json

@@ -5,18 +5,18 @@
       "scale" : "1x"
     },
     {
+      "filename" : "活动@2x.png",
       "idiom" : "universal",
-      "filename" : "orderIcon@2x.png",
       "scale" : "2x"
     },
     {
+      "filename" : "活动@3x.png",
       "idiom" : "universal",
-      "filename" : "orderIcon@3x.png",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

BIN
ZhongJingLianMeng/Assets.xcassets/我的/orderIcon.imageset/orderIcon@2x.png


BIN
ZhongJingLianMeng/Assets.xcassets/我的/orderIcon.imageset/orderIcon@3x.png


BIN
ZhongJingLianMeng/Assets.xcassets/我的/orderIcon.imageset/活动@2x.png


BIN
ZhongJingLianMeng/Assets.xcassets/我的/orderIcon.imageset/活动@3x.png


BIN
ZhongJingLianMeng/Assets.xcassets/我的/searchEmptyImg.imageset/5968635769991@2x.png


BIN
ZhongJingLianMeng/Assets.xcassets/我的/searchEmptyImg.imageset/5968635769991@3x.png


+ 5 - 5
ZhongJingLianMeng/Assets.xcassets/我的/searchEmptyImg.imageset/Contents.json

@@ -5,18 +5,18 @@
       "scale" : "1x"
     },
     {
+      "filename" : "缺省q@2x.png",
       "idiom" : "universal",
-      "filename" : "5968635769991@2x.png",
       "scale" : "2x"
     },
     {
+      "filename" : "缺省q@3x.png",
       "idiom" : "universal",
-      "filename" : "5968635769991@3x.png",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

BIN
ZhongJingLianMeng/Assets.xcassets/我的/searchEmptyImg.imageset/缺省q@2x.png


BIN
ZhongJingLianMeng/Assets.xcassets/我的/searchEmptyImg.imageset/缺省q@3x.png


+ 2 - 2
ZhongJingLianMeng/Assets.xcassets/我的/zhaogongzuo.imageset/Contents.json

@@ -6,12 +6,12 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "zhaogongzuo@2x.png",
+      "filename" : "组 4@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "zhaogongzuo@3x.png",
+      "filename" : "组 4@3x.png",
       "scale" : "3x"
     }
   ],

BIN
ZhongJingLianMeng/Assets.xcassets/我的/zhaogongzuo.imageset/zhaogongzuo@2x.png


BIN
ZhongJingLianMeng/Assets.xcassets/我的/zhaogongzuo.imageset/zhaogongzuo@3x.png


BIN
ZhongJingLianMeng/Assets.xcassets/我的/zhaogongzuo.imageset/组 4@2x.png


BIN
ZhongJingLianMeng/Assets.xcassets/我的/zhaogongzuo.imageset/组 4@3x.png


+ 22 - 0
ZhongJingLianMeng/Assets.xcassets/我的/zhaoxiangmu-1.imageset/Contents.json

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

+ 0 - 0
ZhongJingLianMeng/Assets.xcassets/我的/zhaoxiangmu-1.imageset/组 2@2x.png


Some files were not shown because too many files changed in this diff