UI修改

LocalPodSpec/GDRouter/GDRouter/Classes/Service/Module/Base/GDDataManagerRouter.swift

@@ -113,6 +113,7 @@ public let kMyPageFunctionStore = "PROPSTORE"
 //public let kMyPageFunctionDailySign = "local_dailySign"
 public let kMyPageFunctionMyPreorder = "MYSUBSCRIBE"
 public let kMyPageFunctionInviteCode = "INVITECODE"
+public let kMyPageFunctionSetting = "SETTING"
 //public let kMyPageFunctionLiveReward = "LIVEREWARD"
 
 public var supportedFunction: [String]{
@@ -126,7 +127,8 @@ public var supportedFunction: [String]{
 //                kMyPageFunctionShareInvite,
 //                kMyPageFunctionFightTeam,
 //                kMyPageFunctionMyPreorder,
-                kMyPageFunctionInviteCode]//,
+                kMyPageFunctionInviteCode,
+                kMyPageFunctionSetting]//,
 //                kMyPageFunctionLiveReward]
     } else {
         return [
@@ -140,7 +142,8 @@ public var supportedFunction: [String]{
 //                kMyPageFunctionStore,
 //                kMyPageFunctionFightTeam,
 //                kMyPageFunctionMyPreorder,
-                kMyPageFunctionInviteCode]//,
+                kMyPageFunctionInviteCode,
+                kMyPageFunctionSetting]//,
 //                kMyPageFunctionLiveReward]
     }
 }

LocalPodSpec/GDRouter/GDRouter/Classes/Service/Module/Base/GDRouterProtocol.swift

@@ -10,4 +10,5 @@ import Foundation
 @objc public protocol GDRouterProtocol {
     @objc func loginSuccessSetup()
     @objc func loginOut()
+    @objc var bundle: Bundle { get }
 }

LocalPodSpec/GDRouter/GDRouter/Classes/Service/Module/GDMyModuleRouter.swift

@@ -51,13 +51,12 @@ public enum GDPersonalAuthType {
     
     public var icon: UIImage? {
         switch self {
-            //TODO:图片设置，放在baseBussiness里面: added By Pidan
         case .phone:
-            return UIImage(named: "user_auth_phone_auth")
+            return UIImage(named: "user_auth_phone_auth", in: GDRouter.MyModule?.bundle, compatibleWith: nil)
         case .idCard:
-            return UIImage(named: "user_auth_idcard_auth")
+            return UIImage(named: "user_auth_idcard_auth", in: GDRouter.MyModule?.bundle, compatibleWith: nil)
         case .wechat:
-            return UIImage(named: "user_auto_wechat_auth")
+            return UIImage(named: "user_auto_wechat_auth", in: GDRouter.MyModule?.bundle, compatibleWith: nil)
 //        case .video:
 //            return UIImage(named: "user_auth_video_auth")
         default:
@@ -67,13 +66,12 @@ public enum GDPersonalAuthType {
     
     public var unauthIcon: UIImage? {
         switch self {
-            //TODO:图片设置，放在baseBussiness里面: added By Pidan
         case .phone:
-            return UIImage(named: "user_auth_phone_unauth")
+            return UIImage(named: "user_auth_phone_unauth", in: GDRouter.MyModule?.bundle, compatibleWith: nil)
         case .idCard:
-            return UIImage(named: "user_auth_idcard_unauth")
+            return UIImage(named: "user_auth_idcard_unauth", in: GDRouter.MyModule?.bundle, compatibleWith: nil)
         case .wechat:
-            return UIImage(named: "user_auto_wechat_unauth")
+            return UIImage(named: "user_auto_wechat_unauth", in: GDRouter.MyModule?.bundle, compatibleWith: nil)
 //        case .video:
 //            return UIImage(named: "user_auth_video_unauth")
         default:

LocalPodSpec/GDToolBox/GDToolBox/Assets/Asset.xcassets/SocialPlatform/plat_icon_qq_friend.imageset/Contents.json → LocalPodSpec/GDToolBox/GDToolBox/Assets/Asset.xcassets/RefreshGray/refresh_gray_head_0.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "qq(点击状态）.png",
+      "filename" : "refresh_gray_head_0@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

LocalPodSpec/GDToolBox/GDToolBox/Assets/Asset.xcassets/RefreshGray/refresh_gray_head_1.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "refresh_gray_head_@2x1.png",
+      "filename" : "refresh_gray_head_1@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

LocalPodSpec/GDToolBox/GDToolBox/Assets/Asset.xcassets/RefreshGray/refresh_gray_head_10.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "refresh_gray_head_@2x10.png",
+      "filename" : "refresh_gray_head_10@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

LocalPodSpec/GDToolBox/GDToolBox/Assets/Asset.xcassets/RefreshGray/refresh_gray_head_11.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "refresh_gray_head_@2x11.png",
+      "filename" : "refresh_gray_head_11@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

LocalPodSpec/GDToolBox/GDToolBox/Assets/Asset.xcassets/RefreshGray/refresh_gray_head_12.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "refresh_gray_head_@2x12.png",
+      "filename" : "refresh_gray_head_12@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

LocalPodSpec/GDToolBox/GDToolBox/Assets/Asset.xcassets/RefreshGray/refresh_gray_head_13.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "refresh_gray_head_@2x13.png",
+      "filename" : "refresh_gray_head_13@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

LocalPodSpec/GDToolBox/GDToolBox/Assets/Asset.xcassets/RefreshGray/refresh_gray_head_14.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "refresh_gray_head_@2x14.png",
+      "filename" : "refresh_gray_head_14@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

LocalPodSpec/GDToolBox/GDToolBox/Assets/Asset.xcassets/RefreshGray/refresh_gray_head_15.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "refresh_gray_head_@2x15.png",
+      "filename" : "refresh_gray_head_15@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

LocalPodSpec/GDToolBox/GDToolBox/Assets/Asset.xcassets/RefreshGray/refresh_gray_head_16.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "refresh_gray_head_@2x16.png",
+      "filename" : "refresh_gray_head_16@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

LocalPodSpec/GDToolBox/GDToolBox/Assets/Asset.xcassets/RefreshGray/refresh_gray_head_17.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "refresh_gray_head_@2x17.png",
+      "filename" : "refresh_gray_head_17@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

LocalPodSpec/GDToolBox/GDToolBox/Assets/Asset.xcassets/RefreshGray/refresh_gray_head_18.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "refresh_gray_head_@2x18.png",
+      "filename" : "refresh_gray_head_18@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

LocalPodSpec/GDToolBox/GDToolBox/Assets/Asset.xcassets/RefreshGray/refresh_gray_head_19.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "refresh_gray_head_@2x19.png",
+      "filename" : "refresh_gray_head_19@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

LocalPodSpec/GDToolBox/GDToolBox/Assets/Asset.xcassets/RefreshGray/refresh_gray_head_2.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "refresh_gray_head_@2x2.png",
+      "filename" : "refresh_gray_head_2@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

LocalPodSpec/GDToolBox/GDToolBox/Assets/Asset.xcassets/RefreshGray/refresh_gray_head_20.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "refresh_gray_head_@2x20.png",
+      "filename" : "refresh_gray_head_20@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

LocalPodSpec/GDToolBox/GDToolBox/Assets/Asset.xcassets/RefreshGray/refresh_gray_head_21.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "refresh_gray_head_@2x21.png",
+      "filename" : "refresh_gray_head_21@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

LocalPodSpec/GDToolBox/GDToolBox/Assets/Asset.xcassets/RefreshGray/refresh_gray_head_22.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "refresh_gray_head_@2x22.png",
+      "filename" : "refresh_gray_head_22@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

LocalPodSpec/GDToolBox/GDToolBox/Assets/Asset.xcassets/RefreshGray/refresh_gray_head_23.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "refresh_gray_head_@2x23.png",
+      "filename" : "refresh_gray_head_23@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

LocalPodSpec/GDToolBox/GDToolBox/Assets/Asset.xcassets/RefreshGray/refresh_gray_head_24.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "refresh_gray_head_@2x24.png",
+      "filename" : "refresh_gray_head_24@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

LocalPodSpec/GDToolBox/GDToolBox/Assets/Asset.xcassets/SocialPlatform/plat_icon_qq_friend_unselected.imageset/Contents.json → LocalPodSpec/GDToolBox/GDToolBox/Assets/Asset.xcassets/RefreshGray/refresh_gray_head_25.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "qq(未点击状态）.png",
+      "filename" : "refresh_gray_head_25@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

LocalPodSpec/GDToolBox/GDToolBox/Assets/Asset.xcassets/SocialPlatform/plat_icon_wechat_circle.imageset/Contents.json → LocalPodSpec/GDToolBox/GDToolBox/Assets/Asset.xcassets/RefreshGray/refresh_gray_head_26.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "朋友圈(点击状态）.png",
+      "filename" : "refresh_gray_head_26@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

LocalPodSpec/GDToolBox/GDToolBox/Assets/Asset.xcassets/SocialPlatform/plat_icon_wechat_circle_unselected.imageset/Contents.json → LocalPodSpec/GDToolBox/GDToolBox/Assets/Asset.xcassets/RefreshGray/refresh_gray_head_27.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "朋友圈(未点击状态透明度70%）.png",
+      "filename" : "refresh_gray_head_27@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

LocalPodSpec/GDToolBox/GDToolBox/Assets/Asset.xcassets/SocialPlatform/plat_icon_wechat_friend.imageset/Contents.json → LocalPodSpec/GDToolBox/GDToolBox/Assets/Asset.xcassets/RefreshGray/refresh_gray_head_28.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "微信(点击状态）.png",
+      "filename" : "refresh_gray_head_28@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

LocalPodSpec/GDToolBox/GDToolBox/Assets/Asset.xcassets/SocialPlatform/plat_icon_wechat_friend_unselected.imageset/Contents.json → LocalPodSpec/GDToolBox/GDToolBox/Assets/Asset.xcassets/RefreshGray/refresh_gray_head_29.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "微信(未点击状态）.png",
+      "filename" : "refresh_gray_head_29@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

LocalPodSpec/GDToolBox/GDToolBox/Assets/Asset.xcassets/RefreshGray/refresh_gray_head_3.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "refresh_gray_head_@2x3.png",
+      "filename" : "refresh_gray_head_3@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

LocalPodSpec/GDToolBox/GDToolBox/Assets/Asset.xcassets/SocialPlatform/share_invite_apple_icon.imageset/Contents.json → LocalPodSpec/GDToolBox/GDToolBox/Assets/Asset.xcassets/RefreshGray/refresh_gray_head_30.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "apple.png",
+      "filename" : "refresh_gray_head_30@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

LocalPodSpec/GDToolBox/GDToolBox/Assets/Asset.xcassets/SocialPlatform/share_invite_circle_icon.imageset/Contents.json → LocalPodSpec/GDToolBox/GDToolBox/Assets/Asset.xcassets/RefreshGray/refresh_gray_head_31.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "icon_朋友圈.png",
+      "filename" : "refresh_gray_head_31@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

LocalPodSpec/GDToolBox/GDToolBox/Assets/Asset.xcassets/SocialPlatform/share_invite_qq_icon.imageset/Contents.json → LocalPodSpec/GDToolBox/GDToolBox/Assets/Asset.xcassets/RefreshGray/refresh_gray_head_32.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "icon_qq.png",
+      "filename" : "refresh_gray_head_32@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

LocalPodSpec/GDToolBox/GDToolBox/Assets/Asset.xcassets/SocialPlatform/share_invite_qrcode_icon.imageset/Contents.json → LocalPodSpec/GDToolBox/GDToolBox/Assets/Asset.xcassets/RefreshGray/refresh_gray_head_33.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "icon_二维码.png",
+      "filename" : "refresh_gray_head_33@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

LocalPodSpec/GDToolBox/GDToolBox/Assets/Asset.xcassets/SocialPlatform/share_invite_wechat_icon.imageset/Contents.json → LocalPodSpec/GDToolBox/GDToolBox/Assets/Asset.xcassets/RefreshGray/refresh_gray_head_34.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "icon_微信.png",
+      "filename" : "refresh_gray_head_34@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

LocalPodSpec/GDToolBox/GDToolBox/Assets/Asset.xcassets/SocialPlatform/share_small_icon_apple.imageset/Contents.json → LocalPodSpec/GDToolBox/GDToolBox/Assets/Asset.xcassets/RefreshGray/refresh_gray_head_35.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "1.png",
+      "filename" : "refresh_gray_head_35@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

LocalPodSpec/GDToolBox/GDToolBox/Assets/Asset.xcassets/SocialPlatform/share_small_icon_qq.imageset/Contents.json → LocalPodSpec/GDToolBox/GDToolBox/Assets/Asset.xcassets/RefreshGray/refresh_gray_head_36.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "3.png",
+      "filename" : "refresh_gray_head_36@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

LocalPodSpec/GDToolBox/GDToolBox/Assets/Asset.xcassets/SocialPlatform/share_small_icon_wechat.imageset/Contents.json → LocalPodSpec/GDToolBox/GDToolBox/Assets/Asset.xcassets/RefreshGray/refresh_gray_head_37.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "wechat.png",
+      "filename" : "refresh_gray_head_37@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

Module/GDChatMessage/GDChatMessage/GDChatMessageBundle.bundle/GDChatMessage.xcassets/Message/message_list_icon_preorder.imageset/Contents.json → LocalPodSpec/GDToolBox/GDToolBox/Assets/Asset.xcassets/RefreshGray/refresh_gray_head_38.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "icon_预约通知.png",
+      "filename" : "refresh_gray_head_38@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

Module/GDLoginAndRegistModule/GDLoginAndRegistModule/GDLoginBundle.bundle/LoginAndRegist.xcassets/LoginIcon/user_login_AppIcon_1.imageset/Contents.json → LocalPodSpec/GDToolBox/GDToolBox/Assets/Asset.xcassets/RefreshGray/refresh_gray_head_39.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "user_login_AppIcon_@2x1.png",
+      "filename" : "refresh_gray_head_39@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

LocalPodSpec/GDToolBox/GDToolBox/Assets/Asset.xcassets/RefreshGray/refresh_gray_head_4.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "refresh_gray_head_@2x4.png",
+      "filename" : "refresh_gray_head_4@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

LocalPodSpec/GDToolBox/GDToolBox/Assets/Asset.xcassets/RefreshGray/refresh_gray_head_5.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "refresh_gray_head_@2x5.png",
+      "filename" : "refresh_gray_head_5@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

LocalPodSpec/GDToolBox/GDToolBox/Assets/Asset.xcassets/RefreshGray/refresh_gray_head_6.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "refresh_gray_head_@2x6.png",
+      "filename" : "refresh_gray_head_6@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },