Merge branch 'develop' into jiaofei

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -8156,7 +8156,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxyTestEnv.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -8302,7 +8302,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -8510,7 +8510,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxyDebug.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -8558,7 +8558,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (

galaxy/galaxy/Classes/Modules/Home(首页)/V/YHOrderTipsItemView.swift

@@ -46,6 +46,9 @@ class YHOrderTipsItemView: UIView {
             }  else if msg.type == YHMessageType.renewal.rawValue {
                 return "身份续签"
                 
+            }  else if msg.type == YHMessageType.business.rawValue {
+                return "银河商务"
+                
             } else {
                 return "--"
             }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/OrderList(服务订单)/V/YHSubmitAllInfoCheckView.swift

@@ -51,7 +51,7 @@ class YHSubmitAllInfoCheckView: UIView {
         centerView.snp.makeConstraints { make in
             make.center.equalToSuperview()
             make.width.equalTo(299)
-            make.height.equalTo(165)
+            make.height.equalTo(195)
         }
         
         messageLabel = {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/CustomerService(客服段)/Certificate(办证段)/VisaPayment(4电子签字缴费)/V/YHVisaPaymentTipsCell.swift

@@ -11,7 +11,7 @@ import UIKit
 class YHVisaPaymentTipsCell: UITableViewCell {
 
     static let cellReuseIdentifier = "YHVisaPaymentTipsCell"
-    static let cellH : CGFloat = 184.0 * (KScreenWidth - 16 * 2) / 343.0
+    static let cellH : CGFloat = 218.0 * (KScreenWidth - 16 * 2) / 343.0
 
     lazy var whiteContentView: UIView = {
         let view = UIView()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/Resign(续签)/ResignInfoConfirm(续签信息确认)/V/YHResignInfoValidTimeItemView.swift

@@ -67,7 +67,7 @@ class YHResignInfoValidTimeItemView: UIView {
         handleLabel.font = UIFont.PFSC_R(ofSize: 12)
         handleLabel.textColor = UIColor.brandMainColor
         handleLabel.textAlignment = .right
-        handleLabel.text = "去处理"
+        handleLabel.text = "去更新"
         view.addSubview(handleLabel)
         
         errorTipsLabel.snp.makeConstraints { make in

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/Education&Qualification(学历专业资格填写)/C/YHEducationDetailVC.swift

@@ -505,13 +505,20 @@ extension YHEducationDetailVC : UITableViewDelegate, UITableViewDataSource {
                 vc.orderId = self.orderId
                 vc.searchMajorName = detailInfo.major
                 vc.selectBlock = {
-                     [weak self] text in
+                     [weak self] fullName, chineseName in
                      guard let self = self else { return }
-                     if let text = text, !text.isEmpty  {
+                     if let text = fullName, !text.isEmpty  {
                          detailInfo.major = text
                      } else {
                          detailInfo.major = ""
                      }
+                    
+                     if let chineseName = chineseName, !chineseName.isEmpty  {
+                         detailInfo.tempMajor = chineseName
+                     } else {
+                         detailInfo.tempMajor = ""
+                     }
+                     
                      loadInfo()
                      saveInfoSilent()
                  }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/Education&Qualification(学历专业资格填写)/C/YHMajorSearchViewController.swift

@@ -12,13 +12,14 @@ class YHMajorSearchViewController: YHBaseViewController {
     
     var orderId:Int = 0
     var searchMajorName:String?
-    var selectBlock:((String?)->Void)?
+    var selectBlock:((String?, String?)->Void)?
     var majors:[YHMajorInfo] = []
     let educationRequest:YHEducationRequestViewModel = YHEducationRequestViewModel()
 
     lazy var searchBar: YHCollegeSearchBar = {
         let bar = YHCollegeSearchBar.createBar()
         bar.placeHolder = "请输入专业"
+        bar.textField.clearButtonMode = .whileEditing
         return bar
     }()
     
@@ -76,7 +77,7 @@ class YHMajorSearchViewController: YHBaseViewController {
             [weak self] in
             guard let self = self else { return }
             if let selectBlock = selectBlock {
-                selectBlock(searchBar.textField.text)
+                selectBlock(searchBar.textField.text, searchBar.textField.text)
                 self.navigationController?.popViewController(animated: true)
             }
         }
@@ -151,7 +152,7 @@ extension YHMajorSearchViewController: UITableViewDelegate, UITableViewDataSourc
         if let selectBlock = selectBlock {
             if indexPath.row < majors.count {
                 let major:YHMajorInfo = majors[indexPath.row]
-                selectBlock(major.getMajorName())
+                selectBlock(major.getMajorName(), major.ch_name)
                 self.navigationController?.popViewController(animated: true)
             }
         }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/Education&Qualification(学历专业资格填写)/M/YHEducationInfo.swift

@@ -110,6 +110,7 @@ class YHEducationDetailInfo: SmartCodable {
     var graduateTime: String = ""
     var degree: String = ""
     var major: String = ""
+    var tempMajor : String = "" //保存专业中文名称
     var degreeType: String = ""
     var schoolAddress: YHCollegeAddress = YHCollegeAddress()
     var isAboardSchool: Bool = false
@@ -142,6 +143,7 @@ class YHEducationDetailInfo: SmartCodable {
         case graduateTime = "graduate_time"
         case degree = "degree"
         case major = "major"
+        case tempMajor = "temp_major"
         case degreeType = "degree_type"
         case schoolAddress = "school_address"
         case isAboardSchool = "is_aboard_school"
@@ -275,11 +277,14 @@ class YHMajorInfo: SmartCodable {
     var en_name: String = ""
     
     func getMajorName() -> String {
-        
+        var result = ""
         if !ch_name.isEmpty {
-            return ch_name
+            result += ch_name
         }
-        return en_name
+        if !en_name.isEmpty {
+            result += en_name
+        }
+        return result
     }
     
     required init() {

galaxy/galaxy/Classes/Modules/Message(消息)/C/YHMessageListVC.swift

@@ -247,6 +247,10 @@ class YHMessageListVC: YHBaseViewController {
                         hasUnreadMsg = true
                     }
                     
+                    if !self.viewModel.msgList.business.lastMessage.isEmpty {
+                        hasUnreadMsg = true
+                    }
+                    
                     if hasUnreadMsg {
                         if !isHidden {
                             msgArr.append(self.viewModel.msgList.information)
@@ -259,6 +263,7 @@ class YHMessageListVC: YHBaseViewController {
                         msgArr.append(self.viewModel.msgList.approval)
                         msgArr.append(self.viewModel.msgList.goToHK)
                         msgArr.append(self.viewModel.msgList.renewal)
+                        msgArr.append(self.viewModel.msgList.business)
 
                     }
                 }

galaxy/galaxy/Classes/Modules/Message(消息)/M/YHMsgListModel.swift

@@ -19,6 +19,7 @@ enum YHMessageType: Int {
     case identityApproved = 6 // 身份获批
     case goToHK = 7 // 赴港办证
     case renewal = 8 // 身份续签
+    case business = 9 // 商务
     
     case yinheManager = 9527 // 银河管家
 }
@@ -68,6 +69,10 @@ class YHMessageInfoModel: SmartCodable {
             
         }  else if type == YHMessageType.renewal.rawValue {
             return "身份续签"
+            
+        }  else if type == YHMessageType.business.rawValue {
+            return "银河商务"
+            
         }
         return ""
     }
@@ -82,6 +87,7 @@ class YHMsgListModel: SmartCodable {
     var approval: YHMessageInfoModel = YHMessageInfoModel()
     var goToHK: YHMessageInfoModel = YHMessageInfoModel()
     var renewal: YHMessageInfoModel = YHMessageInfoModel()
+    var business: YHMessageInfoModel = YHMessageInfoModel()
     
     required init() {
         self.information.type = YHMessageType.infoFill.rawValue
@@ -92,10 +98,11 @@ class YHMsgListModel: SmartCodable {
         self.approval.type = YHMessageType.identityApproved.rawValue
         self.goToHK.type = YHMessageType.goToHK.rawValue
         self.renewal.type = YHMessageType.renewal.rawValue
+        self.business.type = YHMessageType.business.rawValue
     }
     
     enum CodingKeys: String, CodingKey {
-        case information, certificate, draft, signature, approval, renewal
+        case information, certificate, draft, signature, approval, renewal, business
         case dataSubmission = "data_submission"
         case goToHK = "go_to_hk"
     }

galaxy/galaxy/Classes/Modules/Message(消息)/V/YHDetailMessageCell.swift

@@ -38,6 +38,7 @@ class YHDetailMessageCell: UITableViewCell {
         detailLabel.text = model.content
         unreadPointView.isHidden = model.isRead
         timeLabel.text = formatTimestamp(Double(model.time))
+        lineView.isHidden = false
 
         if type == YHMessageType.infoFill.rawValue {
             bottomBtn.setTitle("去填写".local, for: .normal)
@@ -65,7 +66,18 @@ class YHDetailMessageCell: UITableViewCell {
         
         } else if type == YHMessageType.renewal.rawValue {
             bottomBtn.setTitle("去查看".local, for: .normal)
+            
+        } else if type == YHMessageType.business.rawValue {
+            bottomBtn.setTitle("".local, for: .normal)
+            lineView.isHidden = true
+        }
+        
+        var bottomBtnHeight = (type == YHMessageType.business.rawValue) ? 0.0 : 52.0
+        bottomBtn.snp.updateConstraints { make in
+            make.height.equalTo(bottomBtnHeight)
         }
+        self.setNeedsLayout()
+        self.layoutIfNeeded()
     }
 
     
@@ -191,17 +203,4 @@ class YHDetailMessageCell: UITableViewCell {
     @objc func didBottomBtnClicked() {
         
     }
-    
-    func updateModel() {
-        
-        let text1: ASAttributedString = .init("林先生，您好，您尚有20%内容未填写，请到", .font(UIFont.PFSC_R(ofSize: 14)), .foreground(UIColor.mainTextColor70))
-        
-        let text2: ASAttributedString = .init("服务中心-资料上传", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.brandMainColor), .action {
-            
-        })
-        let text3: ASAttributedString = .init("去填写，请您尽快完成～", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.mainTextColor70))
-        
-        detailLabel.attributed.text = text1 + text2 + text3
-    }
-
 }

galaxy/galaxy/Classes/Modules/Message(消息)/V/YHMessageSessionCell.swift

@@ -60,6 +60,9 @@ class YHMessageSessionCell: UITableViewCell {
         
         } else if model.type == YHMessageType.renewal.rawValue {
             self.iconImgView.image = UIImage(named: "msg_icon_renewal")
+            
+        } else if model.type == YHMessageType.business.rawValue {
+            self.iconImgView.image = UIImage(named: "msg_icon_business")
         }
         
         self.badgeLabel.isHidden = model.unreadCount <= 0

galaxy/galaxy/Classes/Modules/Message(消息)/VM/YHMsgViewModel.swift

@@ -39,7 +39,7 @@ class YHMsgViewModel: NSObject {
                 self.msgList.approval.type = YHMessageType.identityApproved.rawValue
                 self.msgList.goToHK.type = YHMessageType.goToHK.rawValue
                 self.msgList.renewal.type = YHMessageType.renewal.rawValue
-
+                self.msgList.business.type = YHMessageType.business.rawValue
                 callBackBlock(true, nil)
             } else {
                 let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)

galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMemberCenterViewController.swift

@@ -293,6 +293,10 @@ class YHMemberCenterViewController: YHBaseViewController {
     }
 
     @objc private func didHistoryButtonClicked() {
+        Self.goExchangeHistory()
+    }
+    
+    static func goExchangeHistory() {
         var url = YHBaseUrlManager.shared.curH5URL() + "superAppBridge.html#/vip/order"
         if YHLoginManager.shared.isLogin() {
             let token = YHLoginManager.shared.h5Token
@@ -313,7 +317,7 @@ class YHMemberCenterViewController: YHBaseViewController {
         let vc = YHH5WebViewVC()
         vc.url = tUrl
         vc.isFullScreenFlag = false
-        navigationController?.pushViewController(vc)
+        UIViewController.current?.navigationController?.pushViewController(vc)
     }
 
     @objc private func didShareButtonClicked() {
@@ -396,7 +400,7 @@ class YHMemberCenterViewController: YHBaseViewController {
             vc.title = "积分中心"
             vc.navTitle = "积分中心"
             vc.url = url
-            vc.isFullScreenFlag = false
+            vc.isFullScreenFlag = true
             vc.isSupportWebviewInterBackFlag = true
             navigationController?.pushViewController(vc)
         }

galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyNewViewController.swift

@@ -255,6 +255,11 @@ class YHMyNewViewController: YHBaseViewController {
             serviceGroupArr.append(item)
         }
         
+        do {
+            let item = PersonalModuleItem(icon: "mine_item_exchange_history", title: "兑换历史".local, type:.exchangeHistory)
+            serviceGroupArr.append(item)
+        }
+        
         // 其他功能
         do {
             let item = PersonalModuleItem(icon: "mine_item_msg", title: "我的消息".local, type:.myMessage)
@@ -648,7 +653,7 @@ extension YHMyNewViewController {
                 vc.title = "积分中心"
                 vc.navTitle = "积分中心"
                 vc.url = url
-                vc.isFullScreenFlag = false
+                vc.isFullScreenFlag = true
                 vc.isSupportWebviewInterBackFlag = true
                 self.navigationController?.pushViewController(vc)
             }
@@ -669,6 +674,8 @@ extension YHMyNewViewController {
             let vc = YHActivityListViewController()
             vc.type = 1
             self.navigationController?.pushViewController(vc)
+        case .exchangeHistory:
+            YHMemberCenterViewController.goExchangeHistory()
         case .aboutUs:
             let vc = YHAboutGalaxyViewController()
             self.navigationController?.pushViewController(vc)

galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyViewController.swift

@@ -23,6 +23,7 @@ enum YHPersonalModuleItemType: Int {
     case myPoster
     case myTestCode
     case appointGalaxyBay
+    case exchangeHistory
     
     case notifySettings
     case permissionSettings
@@ -440,7 +441,7 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
                 vc.title = "积分中心"
                 vc.navTitle = "积分中心"
                 vc.url = url
-                vc.isFullScreenFlag = false
+                vc.isFullScreenFlag = true
                 vc.isSupportWebviewInterBackFlag = true
                 self.navigationController?.pushViewController(vc)
             }

galaxy/galaxy/Classes/Modules/Mine（我的）/Model/YHMembershipLevel.swift

@@ -18,7 +18,7 @@ enum YHMembershipLevel: Int, CaseIterable {
     var description: String {
         switch self {
         case .normal:
-            return "大众会员"
+            return "普通会员"
         case .gold:
             return "黄金会员"
         case .platinum:

galaxy/galaxy/Classes/Modules/Mine（我的）/V/YHMyFunctionGroupItemCell.swift

@@ -60,7 +60,7 @@ class YHMyFunctionGroupItemCell: UICollectionViewCell {
 
         
         iconImgView.snp.makeConstraints { make in
-            make.top.equalTo(20)
+            make.top.equalTo(0)
             make.width.height.equalTo(24)
             make.centerX.equalToSuperview()
         }

galaxy/galaxy/Classes/Modules/Mine（我的）/V/YHMySectionGroupCell.swift

@@ -22,7 +22,7 @@ class YHMySectionGroupCell: UITableViewCell {
     var groupArr: [PersonalModuleItem] = [] {
         didSet {
             let countPerRow = 4
-            let rowHeight = 90.0
+            let rowHeight = 70.0
             var listHeight = rowHeight
             if groupArr.count%countPerRow == 0 {
                 listHeight = rowHeight * Double(groupArr.count/countPerRow)
@@ -101,7 +101,7 @@ class YHMySectionGroupCell: UITableViewCell {
             make.height.equalTo(20)
         }
         collectionView.snp.makeConstraints { make in
-            make.top.equalTo(titleLabel.snp.bottom).offset(0)
+            make.top.equalTo(titleLabel.snp.bottom).offset(20)
             make.bottom.left.right.equalToSuperview()
             make.height.equalTo(90)
         }
@@ -121,7 +121,7 @@ extension YHMySectionGroupCell: UICollectionViewDelegate, UICollectionViewDataSo
     func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {
         
         let width = floor((KScreenWidth-20.0*2.0)/4.0)
-        return CGSize(width: width, height: 90.0)
+        return CGSize(width: width, height: 70.0)
     }
     
     // 返回自定义单元格

galaxy/galaxy/Classes/Modules/Mine（我的）/V/YHUserVipInfoView.swift

@@ -116,7 +116,7 @@ class YHUserVipInfoView: UIView {
     
     lazy var titleLabel: UILabel = {
         let label = UILabel()
-        label.text = "大众会员"
+        label.text = "普通会员"
         label.textColor = .white
         label.textAlignment = .left
         label.font = UIFont.PFSC_B(ofSize: 17)
@@ -275,7 +275,7 @@ class YHUserVipInfoView: UIView {
             
         } else {
             self.bgImgView.image = UIImage(named: "mine_member_bg_vip_0")
-            self.titleLabel.text = "大众会员"
+            self.titleLabel.text = "普通会员"
             self.titleLabel.textColor = .white
             self.rightBtn.backgroundColor = UIColor(hex: 0x323849)
             self.rightBtn.setTitleColor(.white, for: .normal)

galaxy/galaxy/Classes/Modules/Mine（我的）/V/YHVipLevelRightHeaderView.swift

@@ -44,7 +44,7 @@ class YHVipLevelRightHeaderView: UIView, UIScrollViewDelegate {
     }
     let baseTag = 9527
     var arr:[YHVipLevelRightsModel] = [
-        YHVipLevelRightsModel(type: .none, title: "大众会员", num: 5, isLock: false),
+        YHVipLevelRightsModel(type: .none, title: "普通会员", num: 5, isLock: false),
         YHVipLevelRightsModel(type: .gold, title: "黄金会员", num: 7, isLock: true),
         YHVipLevelRightsModel(type: .platinum, title: "铂金会员", num: 8, isLock: true),
         YHVipLevelRightsModel(type: .diamond, title: "钻石会员", num: 13, isLock: true),

galaxy/galaxy/Res/Assets.xcassets/Mine/mine_item_exchange_history.imageset/Contents.json

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