Commit 3250a594 by pierce

UI修改

parent 02d3bd18
Showing with 49 additions and 47 deletions
...@@ -113,6 +113,7 @@ public let kMyPageFunctionStore = "PROPSTORE" ...@@ -113,6 +113,7 @@ public let kMyPageFunctionStore = "PROPSTORE"
//public let kMyPageFunctionDailySign = "local_dailySign" //public let kMyPageFunctionDailySign = "local_dailySign"
public let kMyPageFunctionMyPreorder = "MYSUBSCRIBE" public let kMyPageFunctionMyPreorder = "MYSUBSCRIBE"
public let kMyPageFunctionInviteCode = "INVITECODE" public let kMyPageFunctionInviteCode = "INVITECODE"
public let kMyPageFunctionSetting = "SETTING"
//public let kMyPageFunctionLiveReward = "LIVEREWARD" //public let kMyPageFunctionLiveReward = "LIVEREWARD"
public var supportedFunction: [String]{ public var supportedFunction: [String]{
...@@ -126,7 +127,8 @@ public var supportedFunction: [String]{ ...@@ -126,7 +127,8 @@ public var supportedFunction: [String]{
// kMyPageFunctionShareInvite, // kMyPageFunctionShareInvite,
// kMyPageFunctionFightTeam, // kMyPageFunctionFightTeam,
// kMyPageFunctionMyPreorder, // kMyPageFunctionMyPreorder,
kMyPageFunctionInviteCode]//, kMyPageFunctionInviteCode,
kMyPageFunctionSetting]//,
// kMyPageFunctionLiveReward] // kMyPageFunctionLiveReward]
} else { } else {
return [ return [
...@@ -140,7 +142,8 @@ public var supportedFunction: [String]{ ...@@ -140,7 +142,8 @@ public var supportedFunction: [String]{
// kMyPageFunctionStore, // kMyPageFunctionStore,
// kMyPageFunctionFightTeam, // kMyPageFunctionFightTeam,
// kMyPageFunctionMyPreorder, // kMyPageFunctionMyPreorder,
kMyPageFunctionInviteCode]//, kMyPageFunctionInviteCode,
kMyPageFunctionSetting]//,
// kMyPageFunctionLiveReward] // kMyPageFunctionLiveReward]
} }
} }
......
...@@ -10,4 +10,5 @@ import Foundation ...@@ -10,4 +10,5 @@ import Foundation
@objc public protocol GDRouterProtocol { @objc public protocol GDRouterProtocol {
@objc func loginSuccessSetup() @objc func loginSuccessSetup()
@objc func loginOut() @objc func loginOut()
@objc var bundle: Bundle { get }
} }
...@@ -51,13 +51,12 @@ public enum GDPersonalAuthType { ...@@ -51,13 +51,12 @@ public enum GDPersonalAuthType {
public var icon: UIImage? { public var icon: UIImage? {
switch self { switch self {
//TODO:图片设置,放在baseBussiness里面: added By Pidan
case .phone: case .phone:
return UIImage(named: "user_auth_phone_auth") return UIImage(named: "user_auth_phone_auth", in: GDRouter.MyModule?.bundle, compatibleWith: nil)
case .idCard: case .idCard:
return UIImage(named: "user_auth_idcard_auth") return UIImage(named: "user_auth_idcard_auth", in: GDRouter.MyModule?.bundle, compatibleWith: nil)
case .wechat: case .wechat:
return UIImage(named: "user_auto_wechat_auth") return UIImage(named: "user_auto_wechat_auth", in: GDRouter.MyModule?.bundle, compatibleWith: nil)
// case .video: // case .video:
// return UIImage(named: "user_auth_video_auth") // return UIImage(named: "user_auth_video_auth")
default: default:
...@@ -67,13 +66,12 @@ public enum GDPersonalAuthType { ...@@ -67,13 +66,12 @@ public enum GDPersonalAuthType {
public var unauthIcon: UIImage? { public var unauthIcon: UIImage? {
switch self { switch self {
//TODO:图片设置,放在baseBussiness里面: added By Pidan
case .phone: case .phone:
return UIImage(named: "user_auth_phone_unauth") return UIImage(named: "user_auth_phone_unauth", in: GDRouter.MyModule?.bundle, compatibleWith: nil)
case .idCard: case .idCard:
return UIImage(named: "user_auth_idcard_unauth") return UIImage(named: "user_auth_idcard_unauth", in: GDRouter.MyModule?.bundle, compatibleWith: nil)
case .wechat: case .wechat:
return UIImage(named: "user_auto_wechat_unauth") return UIImage(named: "user_auto_wechat_unauth", in: GDRouter.MyModule?.bundle, compatibleWith: nil)
// case .video: // case .video:
// return UIImage(named: "user_auth_video_unauth") // return UIImage(named: "user_auth_video_unauth")
default: default:
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "qq(点击状态).png", "filename" : "refresh_gray_head_0@2x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "refresh_gray_head_@2x1.png", "filename" : "refresh_gray_head_1@2x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "refresh_gray_head_@2x10.png", "filename" : "refresh_gray_head_10@2x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "refresh_gray_head_@2x11.png", "filename" : "refresh_gray_head_11@2x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "refresh_gray_head_@2x12.png", "filename" : "refresh_gray_head_12@2x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "refresh_gray_head_@2x13.png", "filename" : "refresh_gray_head_13@2x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "refresh_gray_head_@2x14.png", "filename" : "refresh_gray_head_14@2x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "refresh_gray_head_@2x15.png", "filename" : "refresh_gray_head_15@2x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "refresh_gray_head_@2x16.png", "filename" : "refresh_gray_head_16@2x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "refresh_gray_head_@2x17.png", "filename" : "refresh_gray_head_17@2x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "refresh_gray_head_@2x18.png", "filename" : "refresh_gray_head_18@2x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "refresh_gray_head_@2x19.png", "filename" : "refresh_gray_head_19@2x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "refresh_gray_head_@2x2.png", "filename" : "refresh_gray_head_2@2x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "refresh_gray_head_@2x20.png", "filename" : "refresh_gray_head_20@2x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "refresh_gray_head_@2x21.png", "filename" : "refresh_gray_head_21@2x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "refresh_gray_head_@2x22.png", "filename" : "refresh_gray_head_22@2x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "refresh_gray_head_@2x23.png", "filename" : "refresh_gray_head_23@2x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "refresh_gray_head_@2x24.png", "filename" : "refresh_gray_head_24@2x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "qq(未点击状态).png", "filename" : "refresh_gray_head_25@2x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "朋友圈(点击状态).png", "filename" : "refresh_gray_head_26@2x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "朋友圈(未点击状态透明度70%).png", "filename" : "refresh_gray_head_27@2x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "微信(点击状态).png", "filename" : "refresh_gray_head_28@2x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "微信(未点击状态).png", "filename" : "refresh_gray_head_29@2x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "refresh_gray_head_@2x3.png", "filename" : "refresh_gray_head_3@2x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "apple.png", "filename" : "refresh_gray_head_30@2x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "icon_朋友圈.png", "filename" : "refresh_gray_head_31@2x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "icon_qq.png", "filename" : "refresh_gray_head_32@2x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "icon_二维码.png", "filename" : "refresh_gray_head_33@2x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "icon_微信.png", "filename" : "refresh_gray_head_34@2x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "1.png", "filename" : "refresh_gray_head_35@2x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "3.png", "filename" : "refresh_gray_head_36@2x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "wechat.png", "filename" : "refresh_gray_head_37@2x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "icon_预约通知.png", "filename" : "refresh_gray_head_38@2x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "user_login_AppIcon_@2x1.png", "filename" : "refresh_gray_head_39@2x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "refresh_gray_head_@2x4.png", "filename" : "refresh_gray_head_4@2x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "refresh_gray_head_@2x5.png", "filename" : "refresh_gray_head_5@2x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "refresh_gray_head_@2x6.png", "filename" : "refresh_gray_head_6@2x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment