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

* 'youhua-dev' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  时间选择器细节修改
  //  静音相关

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/C/Certificates(证书上传和证书信息)/YHCertificateInfoController.swift

@@ -337,14 +337,17 @@ extension YHCertificateInfoController : UITableViewDelegate, UITableViewDataSour
                detailItem.type == .certificateSignDate { // 届满日期 签发日期
                 
                 var title = ""
+                var lastIsTaday = false
                 if detailItem.type == .certificateValidDate {
                     title = "选择届满日期"
+                    lastIsTaday = false
                 } else if detailItem.type == .certificateSignDate {
                     title = "选择签发日期"
+                    lastIsTaday = true
                 }
                 
                 self.view?.endEditing(true)
-                YHDatePickView.show(type: .yyyymmdd, title: title, lastIsTaday: true) {
+                YHDatePickView.show(type: .yyyymmdd, title: title, lastIsTaday: lastIsTaday) {
                     [weak self] dateStr  in
                     
                     print(dateStr)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/V/YHDatePickView.swift

@@ -42,13 +42,24 @@ class YHDatePickView: UIView {
                     pickerView.selectRow(self.currentDateCom.month! - 1, inComponent: 1, animated: true)
                     pickerView.selectRow(self.currentDateCom.day! - 1, inComponent: 2, animated: true)
                 case .yyyymm:
-                    pickerView.selectRow(self.currentDateCom.month! - 1, inComponent: 1, animated: true)
+                    pickerView.selectRow(0, inComponent: 0, animated: true)
                     pickerView.selectRow(self.currentDateCom.month! - 1, inComponent: 1, animated: true)
                 case .yyyy:
                     pickerView.selectRow(0, inComponent: 0, animated: true)
                 }
             } else {
-                pickerView.selectRow(100, inComponent: 0, animated: true)
+                guard let type = type else { return }
+                switch type {
+                case .yyyymmdd:
+                    pickerView.selectRow(100, inComponent: 0, animated: true)
+                    pickerView.selectRow(self.currentDateCom.month! - 1, inComponent: 1, animated: true)
+                    pickerView.selectRow(self.currentDateCom.day! - 1, inComponent: 2, animated: true)
+                case .yyyymm:
+                    pickerView.selectRow(100, inComponent: 0, animated: true)
+                    pickerView.selectRow(self.currentDateCom.month! - 1, inComponent: 1, animated: true)
+                case .yyyy:
+                    pickerView.selectRow(100, inComponent: 0, animated: true)
+                }
             }
         }
     }

galaxy/galaxy/Classes/Tools/VideoPlay/YHVideoPlayerControlView.swift

@@ -15,13 +15,16 @@ class YHVideoPlayerControlView: BMPlayerControlView {
     var isSilient = true {
         didSet {
             self.player?.avPlayer?.isMuted = isSilient
+            let imgName = isSilient ? "video_volume_disable" : "video_volume_enable"
+            self.volumeBtn.setImage(UIImage(named: imgName), for: .normal)
         }
     }
     
     lazy var volumeBtn = {
         let btn = UIButton()
-        btn.setImage(UIImage(named: "mine_btn_setting"), for: .normal)
+        btn.setImage(UIImage(named: "video_volume_disable"), for: .normal)
         btn.addTarget(self, action: #selector(didVolumeBtnClicked), for: .touchUpInside)
+        btn.YH_clickEdgeInsets = UIEdgeInsets(top: 20, left: 30, bottom: 20, right: 20)
         return btn
     }()
     
@@ -36,7 +39,7 @@ class YHVideoPlayerControlView: BMPlayerControlView {
         volumeBtn.snp.makeConstraints { make in
             make.width.height.equalTo(24)
             make.top.equalTo(20)
-            make.left.equalTo(15)
+            make.right.equalTo(-16)
         }
     }
     

galaxy/galaxy/Classes/Tools/VideoPlay/YHVideoPlayerVC.swift

@@ -25,6 +25,14 @@ class YHVideoPlayerVC: YHBaseViewController {
         return YHHomeWebViewModel()
     }()
     
+    // 默认静音
+    var isVolumeDisable = true
+    
+    lazy var videoControlView:YHVideoPlayerControlView = {
+        let view = YHVideoPlayerControlView()
+        return view
+    }()
+    
     lazy var player:BMPlayer = {
         // should print log, default false
         BMPlayerConf.allowLog = false
@@ -43,7 +51,7 @@ class YHVideoPlayerVC: YHBaseViewController {
         // enable setting the playtime by touch gesture in the player
         BMPlayerConf.enablePlaytimeGestures = false
         
-        let player = BMPlayer(customControlView: YHVideoPlayerControlView())
+        let player = BMPlayer(customControlView: videoControlView)
         return player
     }()
     
@@ -115,7 +123,7 @@ class YHVideoPlayerVC: YHBaseViewController {
         let asset = BMPlayerResource(url: videoURL)
         player.setVideo(resource: asset)
         // 默认静音
-        player.avPlayer?.isMuted = true
+        updateVolume(isVolumeDisable)
     }
     
     func setupLikeAndCollectUI() {
@@ -192,6 +200,12 @@ class YHVideoPlayerVC: YHBaseViewController {
         }()
         view.addSubview(bottomView)
     }
+    
+    // 静音更新
+    func updateVolume(_ disable:Bool) {
+        videoControlView.isSilient = disable
+        player.avPlayer?.isMuted = disable
+    }
 }
 
 extension YHVideoPlayerVC {

galaxy/galaxy/Res/Assets.xcassets/VidepPlay/video_volume_disable.imageset/Contents.json

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

galaxy/galaxy/Res/Assets.xcassets/VidepPlay/video_volume_enable.imageset/Contents.json

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