Merge branch 'plan' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into plan

galaxy/fastlane/Fastfile

@@ -33,10 +33,10 @@ platform :ios do
   sc_105_branch = "sc-1.0.5"
   main_fix = "main-fix"
   jiaofei = "jiaofei"
-  lint = "swiftLint-develop"
+  plan = "plan"
 
   #打包正使用的分支
-  myPack_branch = lint
+  myPack_branch = plan
 
 
 

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -8497,7 +8497,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.1.8;
+				MARKETING_VERSION = 2.1.10;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -8643,7 +8643,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.1.8;
+				MARKETING_VERSION = 2.1.10;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -8851,7 +8851,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.1.8;
+				MARKETING_VERSION = 2.1.10;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -8899,7 +8899,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.1.8;
+				MARKETING_VERSION = 2.1.10;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

galaxy/galaxy/AppDelegate.swift

@@ -146,7 +146,29 @@ class AppDelegate: UIResponder, UIApplicationDelegate, WXApiDelegate {
                                             UIViewController.current?.navigationController?.pushViewController(vc, animated: true)
                                         }
                                     }
-                                } else {
+                                } else if iType == 5 {
+                                    // 跳转商品详情
+                                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.25) {
+                                        if !YHLoginManager.shared.isLogin() {
+                                            printLog("需要登录")
+                                            return
+                                        }
+                                        // 跳转分析
+                                        
+                                    }
+                                }  else if iType == 6 {
+                                    // 跳转方案商品
+                                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.25) {
+                                        // - 获取它对应的参数
+                                        if !YHLoginManager.shared.isLogin() {
+                                            printLog("需要登录")
+                                            return
+                                        }
+                                        
+                                        let vc = YHMakePlanViewController()
+                                        UIViewController.current?.navigationController?.pushViewController(vc, animated: true)
+                                    }
+                                }  else {
                                     printLog("未处理的类型 \(iType)")
                                 }
                             }

galaxy/galaxy/Classes/Modules/Plan(方案)/MakePlan/V/YHMakePlanTopView.swift

@@ -13,10 +13,10 @@ class YHMakePlanTopView: UIView {
     var dataSource: YHMakePlanScoreModel? {
         didSet {
             let a: ASAttributedString = .init("预计可续期(年) ", .font(UIFont.PFSC_M(ofSize: 14)), .foreground(UIColor(hex: 0x6a7586)))
-            let b: ASAttributedString = .init("\(dataSource?.year)", .font(UIFont.PFSC_M(ofSize: 24)), .foreground(UIColor.mainTextColor))
+            let b: ASAttributedString = .init("\(String(describing: dataSource?.year))", .font(UIFont.PFSC_M(ofSize: 24)), .foreground(UIColor.mainTextColor))
             yearsLabel.attributed.text = a + b
             let aa: ASAttributedString = .init("续签综合通过率 ", .font(UIFont.PFSC_M(ofSize: 14)), .foreground(UIColor(hex: 0x6a7586)))
-            let bb: ASAttributedString = .init("\(dataSource?.pass_rate)", .font(UIFont.PFSC_M(ofSize: 24)), .foreground(UIColor.mainTextColor))
+            let bb: ASAttributedString = .init("\(String(describing: dataSource?.pass_rate))", .font(UIFont.PFSC_M(ofSize: 24)), .foreground(UIColor.mainTextColor))
 //            let c: ASAttributedString = .init("%", .font(UIFont.PFSC_M(ofSize: 16)), .foreground(UIColor.mainTextColor))
             percentageLabel.attributed.text = aa + bb
         }