fixed bugs

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

@@ -219,14 +219,14 @@ public final class GDZoneTitleModel: BaseModel, NetworkArrType {
         
         switch priority {
         case .regionRich, .nationalRich:
-            imageView.image = UIImage(named: "zone_title_bg_rich")
+            imageView.image = UIImage(named: "zone_title_bg_rich", in: GDRouter.UserZone?.bundle, compatibleWith: nil)
             gradientLabel.colors = [UIColor.hexColor("FFE7A0"),
                                     UIColor.hexColor("FEBA16"),
                                     UIColor.hexColor("FFF000")]
             gradientLabel.text = title
             
         case .regionCharm, .nationalCharm:
-            imageView.image = UIImage(named: "zone_title_bg_charm")
+            imageView.image = UIImage(named: "zone_title_bg_charm", in: GDRouter.UserZone?.bundle, compatibleWith: nil)
             gradientLabel.colors = [UIColor.hexColor("FEF6FF"),
                                     UIColor.hexColor("FFD584"),
                                     UIColor.hexColor("F884FF")]

LocalPodSpec/GDToolBox/GDToolBox/Classes/GDConfiguration.swift

@@ -28,8 +28,8 @@ public let GDlog = XCGLogger(identifier: "xiuse.log.identifier", includeDefaultD
 public struct GDAppConfig {
     
     /// 版本
-    public static let gd_versionCode = "43004"
-    public static let gd_version = "43.0.0.4"
+    public static let gd_versionCode = "43005"
+    public static let gd_version = "43.0.0.5"
     public static var realVersion: String { Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? ""}
     
     /// App ID

Module/GDPersonalModule/GDPersonalModule/Features/Setting/Main/GDSettingViewController.swift

@@ -122,17 +122,17 @@ class GDSettingViewController: BaseViewController {
             
             let versionInfo = GDSettingItemModel(type: .subTitle, title: "版本", subtitle: "\(GDAppConfig.gd_appName)\(GDAppConfig.realVersion)", userInteractor: false)
             
-//            let help = GDSettingItemModel(type: .normal, title: "帮助", userInteractor: true) {[weak self] (type) in
-//                guard let self = self else { return }
-//                switch type {
-//                case .cellClick:
-//                    GDStatistics.track(.settingHelp)
-//                    let helpVC = GDWebViewController(url: GDPersonalPublicWebURL.help)
-//                    helpVC.showShare = true
-//                    self.navigationController?.pushViewController(helpVC, animated: true)
-//                default: break
-//                }
-//            }
+            let help = GDSettingItemModel(type: .normal, title: "帮助", userInteractor: true) {[weak self] (type) in
+                guard let self = self else { return }
+                switch type {
+                case .cellClick:
+                    GDStatistics.track(.settingHelp)
+                    let helpVC = GDWebViewController(url: GDPersonalPublicWebURL.help)
+                    helpVC.showShare = true
+                    self.navigationController?.pushViewController(helpVC, animated: true)
+                default: break
+                }
+            }
             
             let rateUs = GDSettingItemModel(type: .normal, title: "评分", userInteractor: true) {[weak self] (type) in
                 guard let self = self else { return }
@@ -143,14 +143,14 @@ class GDSettingViewController: BaseViewController {
                 }
             }
             
-//            let extendFeatureItem = GDSettingItemModel(type: .normal, title: "附加功能", subtitle: nil, userInteractor: true, showArrow: true) {[weak self] _ in
-//                if let shadowURL = GDRouter.HostRouter?.shadowURL {
-//                    
-//                    let webVC = GDWebViewController(url: shadowURL)
-//                    webVC.webView.includeUserInfo = true
-//                    self?.navigationController?.pushViewController(webVC, animated: true)
-//                }
-//            }
+            let extendFeatureItem = GDSettingItemModel(type: .normal, title: "附加功能", subtitle: nil, userInteractor: true, showArrow: true) {[weak self] _ in
+                if let shadowURL = GDRouter.HostRouter?.shadowURL {
+                    
+                    let webVC = GDWebViewController(url: shadowURL)
+                    webVC.webView.includeUserInfo = true
+                    self?.navigationController?.pushViewController(webVC, animated: true)
+                }
+            }
             
             let quit = GDSettingItemModel(type: .normal, title: "退出\(GDAppConfig.gd_appName)", userInteractor: true) {[weak self] (type) in
                 guard let self = self else { return }
@@ -182,13 +182,12 @@ class GDSettingViewController: BaseViewController {
             sectionArr.append(GDSettingSectionModel(sectionTitle: nil, items: [notification]))
             
             sectionArr.append(GDSettingSectionModel(sectionTitle: nil, items: [cleanCache]))
-//            if isValidString(GDRouter.HostRouter?.shadowURL) && GDRouter.BaseBusinessRouter?.isCurrentVersionVerified.value == false {
-//                sectionArr.append(GDSettingSectionModel(sectionTitle: nil, items: [versionInfo, help, rateUs, extendFeatureItem]))
-//            } else {
-//                sectionArr.append(GDSettingSectionModel(sectionTitle: nil, items: [versionInfo, help, rateUs]))
-//            }
+            if isValidString(GDRouter.HostRouter?.shadowURL) && GDRouter.BaseBusinessRouter?.isCurrentVersionVerified.value == false {
+                sectionArr.append(GDSettingSectionModel(sectionTitle: nil, items: [versionInfo, help, rateUs, extendFeatureItem]))
+            } else {
+                sectionArr.append(GDSettingSectionModel(sectionTitle: nil, items: [versionInfo, help, rateUs]))
+            }
             
-            sectionArr.append(GDSettingSectionModel(sectionTitle: nil, items: [versionInfo, rateUs]))
             sectionArr.append(GDSettingSectionModel(sectionTitle: nil, items: [quit]))
             
             self.tableView.items.accept(sectionArr)

Module/GDShowRoomListModule/GDShowRoomListModule/Features/View/RoomListViewController.swift

@@ -143,7 +143,7 @@ class RoomListViewController: BaseViewController {
     }
     
     private func makeSearchButton() {
-        searchBtn.setImage(GDShowRoomListBundle.imageNamed("common_search_icon_black"), for: .normal)
+        searchBtn.setImage(GDShowRoomListBundle.imageNamed("roomlist_search_icon"), for: .normal)
         self.view.addSubview(searchBtn)
         
         searchBtn.snp.makeConstraints { (make) in

Module/GDShowRoomListModule/GDShowRoomListModule/GDShowRoomListBundle.bundle/GDShowRoomListAssets.xcassets/roomlist_search_icon.imageset/Contents.json

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

Module/GDUserZoneModule/GDUserZoneModule/GDUserZoneBundle.bundle/UserZone.xcassets/Title/Contents.json

+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Module/GDUserZoneModule/GDUserZoneModule/GDUserZoneBundle.bundle/UserZone.xcassets/Title/zone_title_bg_charm.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "魅力称号.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Module/GDUserZoneModule/GDUserZoneModule/GDUserZoneBundle.bundle/UserZone.xcassets/Title/zone_title_bg_rich.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "icon_富豪称号.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}