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

* 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  //  消息

# Conflicts:
#	galaxy/galaxy/AppDelegate.swift

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -17,7 +17,7 @@
 		04174D752BCD5B74000BA46D /* YHMessageListModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04174D6B2BCD5B74000BA46D /* YHMessageListModel.swift */; };
 		04174D762BCD5B74000BA46D /* YHMsgListModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04174D6C2BCD5B74000BA46D /* YHMsgListModel.swift */; };
 		04174D772BCD5B74000BA46D /* YHMessageDetailListVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04174D6E2BCD5B74000BA46D /* YHMessageDetailListVC.swift */; };
-		04174D782BCD5B74000BA46D /* YHMsgViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04174D6F2BCD5B74000BA46D /* YHMsgViewController.swift */; };
+		04174D782BCD5B74000BA46D /* YHMessageListVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04174D6F2BCD5B74000BA46D /* YHMessageListVC.swift */; };
 		04174D792BCD5B74000BA46D /* YHMessageSessionCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04174D712BCD5B74000BA46D /* YHMessageSessionCell.swift */; };
 		04174D7A2BCD5B74000BA46D /* YHInformationFillCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04174D722BCD5B74000BA46D /* YHInformationFillCell.swift */; };
 		0425E63D2BA9345200A5E763 /* YHSchemeTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0425E63C2BA9345200A5E763 /* YHSchemeTableViewCell.swift */; };
@@ -462,7 +462,7 @@
 		04174D6B2BCD5B74000BA46D /* YHMessageListModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHMessageListModel.swift; sourceTree = "<group>"; };
 		04174D6C2BCD5B74000BA46D /* YHMsgListModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHMsgListModel.swift; sourceTree = "<group>"; };
 		04174D6E2BCD5B74000BA46D /* YHMessageDetailListVC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHMessageDetailListVC.swift; sourceTree = "<group>"; };
-		04174D6F2BCD5B74000BA46D /* YHMsgViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHMsgViewController.swift; sourceTree = "<group>"; };
+		04174D6F2BCD5B74000BA46D /* YHMessageListVC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHMessageListVC.swift; sourceTree = "<group>"; };
 		04174D712BCD5B74000BA46D /* YHMessageSessionCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHMessageSessionCell.swift; sourceTree = "<group>"; };
 		04174D722BCD5B74000BA46D /* YHInformationFillCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHInformationFillCell.swift; sourceTree = "<group>"; };
 		0425E63C2BA9345200A5E763 /* YHSchemeTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHSchemeTableViewCell.swift; sourceTree = "<group>"; };
@@ -952,7 +952,7 @@
 			isa = PBXGroup;
 			children = (
 				04174D6E2BCD5B74000BA46D /* YHMessageDetailListVC.swift */,
-				04174D6F2BCD5B74000BA46D /* YHMsgViewController.swift */,
+				04174D6F2BCD5B74000BA46D /* YHMessageListVC.swift */,
 			);
 			path = C;
 			sourceTree = "<group>";
@@ -2803,7 +2803,7 @@
 				044413F92BC279D200784A14 /* YHHomeWebBottomView.swift in Sources */,
 				045EEEC32B9F171A0022A143 /* YHOtherResidenceFillView.swift in Sources */,
 				045EEE792B9F171A0022A143 /* YHPreviewViewModel.swift in Sources */,
-				04174D782BCD5B74000BA46D /* YHMsgViewController.swift in Sources */,
+				04174D782BCD5B74000BA46D /* YHMessageListVC.swift in Sources */,
 				A517A4E12BB573EB000DEECD /* YHDocListCell.swift in Sources */,
 				A58037212BAD7B2A0031C312 /* YHMySchemeModel.swift in Sources */,
 				0493B3DE2BA80C2300AF9393 /* YHCertificateFilterButton.swift in Sources */,

galaxy/galaxy/AppDelegate.swift

@@ -123,32 +123,10 @@ extension AppDelegate {
     
     //1.设置主窗口
     private func setupRootVC() {
-//        let tabBarController = YHTabBarViewController()
-        
-//        let homeVC = YHHomePageViewController()
-//        tabBarController.delegate = homeVC
-//        let v0 = YHNavigationController(rootVC:homeVC)
-//        let v1 = YHNavigationController(rootVC:YHServiceCenterMainViewController())
-//        let v2 = YHNavigationController(rootVC:YHMsgViewController())
-//        let v3 = YHNavigationController(rootVC:YHMyViewController())
-//        
-//        v0.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "首页", image: UIImage(named: "home"), selectedImage: UIImage(named: "home_1"))
-//        
-//        v1.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "服务", image: UIImage(named: "service"), selectedImage: UIImage(named: "service_1"))
-//        
-//        v2.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "消息", image: UIImage(named: "msg"), selectedImage: UIImage(named: "msg_1"))
-//        
-//        v3.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "我的", image: UIImage(named: "me"), selectedImage: UIImage(named: "me_1"))
-//        
-//        tabBarController.viewControllers = [v0,v1,v2,v3]
-//        tabBarController.tabBar.backgroundColor = .white
-        
-        
         let nav = YHNavigationController(rootVC:YHStartPageViewController())
         window = UIWindow(frame: UIScreen.main.bounds)
         window?.rootViewController = nav
         window?.makeKeyAndVisible()
-        
     }
 }
 

galaxy/galaxy/Classes/Modules/Home(首页)/C/YHStartPageViewController.swift

@@ -102,7 +102,7 @@ private extension YHStartPageViewController {
         tabBarController.delegate = homeVC
         let v0 = YHNavigationController(rootVC:homeVC)
         let v1 = YHNavigationController(rootVC:YHServiceCenterMainViewController())
-        let v2 = YHNavigationController(rootVC:YHMsgViewController())
+        let v2 = YHNavigationController(rootVC:YHMessageListVC())
         let v3 = YHNavigationController(rootVC:YHMyViewController())
         
         v0.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "首页", image: UIImage(named: "home"), selectedImage: UIImage(named: "home_1"))

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

@@ -8,7 +8,7 @@
 
 import UIKit
 
-class YHMsgViewController: YHBaseViewController {
+class YHMessageListVC: YHBaseViewController {
     
     var msgArr:[YHMessageInfoModel] = []
     lazy var viewModel = {
@@ -171,18 +171,23 @@ class YHMsgViewController: YHBaseViewController {
     }
 }
 
-extension YHMsgViewController {
+extension YHMessageListVC {
     
-    @objc func clean() {
-        
+    @objc func didEnableNotifyBtnClicked() {
+        self.goToSettingPage()
     }
     
-    @objc func didEnableNotifyBtnClicked() {
-        
+    func goToSettingPage() {
+        let url = URL(string: UIApplication.openSettingsURLString)
+        if let url = url, UIApplication .shared.canOpenURL(url) {
+            UIApplication .shared.open(url, options: [:], completionHandler: {
+                (success) in
+            })
+        }
     }
 }
 
-extension YHMsgViewController: UITableViewDelegate, UITableViewDataSource {
+extension YHMessageListVC: UITableViewDelegate, UITableViewDataSource {
 
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         return msgArr.count

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

@@ -34,15 +34,19 @@ class YHMessageSessionCell: UITableViewCell {
         
         if model.customType == .infoFill {
             self.nameLabel.text = "资料填写"
+            self.iconImgView.image = UIImage(named: "msg_icon_info_fill")
             
         } else if model.customType == .cerUpload {
             self.nameLabel.text = "证件上传"
+            self.iconImgView.image = UIImage(named: "msg_icon_cer_upload")
             
         } else if model.customType == .draft {
             self.nameLabel.text = "文书定稿"
+            self.iconImgView.image = UIImage(named: "msg_icon_draft")
             
         } else if model.customType == .fileSign {
             self.nameLabel.text = "文件签字"
+            self.iconImgView.image = UIImage(named: "msg_icon_file_sign")
             
         } else {
             self.nameLabel.text = ""
@@ -103,7 +107,6 @@ class YHMessageSessionCell: UITableViewCell {
         contentView.addSubview(iconContentView)
         
         iconImgView = UIImageView()
-        iconImgView.backgroundColor = .red
         iconContentView.addSubview(iconImgView)
         
         badgeLabel = UILabel()
@@ -183,5 +186,4 @@ class YHMessageSessionCell: UITableViewCell {
             make.bottom.equalToSuperview()
         }
     }
-
 }

galaxy/galaxy/Res/Assets.xcassets/Message/msg_icon_cer_upload.imageset/Contents.json

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

galaxy/galaxy/Res/Assets.xcassets/Message/msg_icon_draft.imageset/Contents.json

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

galaxy/galaxy/Res/Assets.xcassets/Message/msg_icon_file_sign.imageset/Contents.json

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

galaxy/galaxy/Res/Assets.xcassets/Message/msg_icon_info_fill.imageset/Contents.json

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