Merge commit 'd3eee288' into xiezhaolin

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -2944,7 +2944,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -3145,7 +3145,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -3187,7 +3187,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;

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

@@ -157,10 +157,12 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
                 bottomView.isStar = model.is_collect
                 bottomView.isLike = model.is_like
                 
+                if operationFlag {
                     self.block?(model)
                 }
             }
         }
+    }
     
     // MARK: - WKNavigationDelegate
     func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {

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

@@ -36,7 +36,7 @@ private extension YHHomeSearchView {
         
         
         let lable = UILabel()
-        lable.text = "大家正在搜香港身份"
+        lable.text = "香港身份"
         lable.font = UIFont.PFSC_R(ofSize: 12)
         lable.textColor = UIColor(hex: 0x94A3B8, alpha: 1.0)
         addSubview(lable)

galaxy/galaxy/Classes/Modules/Home(首页)/VM/YHHomePageViewModel.swift

@@ -129,8 +129,8 @@ extension YHHomePageViewModel {
                         let model = YHBannerModel.localDefaultItem()
                         arrData = [model]
                         
-                    } else if arr.count > 6 {
-                        arrData = Array(arrData?[0...5] ?? [])
+                    } else if arr.count > 10 {
+                        arrData = Array(arrData?[0...9] ?? [])
                     }
                     
                 }

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

@@ -10,7 +10,7 @@ import UIKit
 
 class YHMsgViewController: YHBaseViewController {
     
-    var msgArr:[String] = ["","","",""]
+    var msgArr:[String] = ["","",""]
     lazy var tableView: UITableView = {
         
         let tableView = UITableView(frame:.zero, style:.grouped)
@@ -22,6 +22,7 @@ class YHMsgViewController: YHBaseViewController {
         tableView.dataSource = self
         tableView.backgroundColor = .white
         tableView.register(UITableViewCell.self, forCellReuseIdentifier: "UITableViewCell")
+        tableView.backgroundView = emptyDataTipsView
         tableView.register(YHMessageSessionCell.self, forCellReuseIdentifier: YHMessageSessionCell.cellReuseIdentifier)
         return tableView
     }()
@@ -46,6 +47,33 @@ class YHMsgViewController: YHBaseViewController {
         }
         return bar
     }()
+    
+    lazy var emptyDataTipsView:UIView = {
+        let view = UIView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: 124))
+        view.isHidden = true
+        let imgView = UIImageView(image: UIImage(named: "msg_no_data"))
+        view.addSubview(imgView)
+        
+        let label = UILabel()
+        label.textColor = UIColor(hex: 0x94A3B8)
+        label.font = UIFont.PFSC_R(ofSize: 14)
+        label.textAlignment = .center
+        label.text = "暂无新消息".local
+        view.addSubview(label)
+        
+        imgView.snp.makeConstraints { make in
+            make.top.equalToSuperview().offset(204)
+            make.width.height.equalTo(92)
+            make.centerX.equalTo(view)
+        }
+        
+        label.snp.makeConstraints { make in
+            make.top.equalTo(imgView.snp.bottom).offset(12)
+            make.centerX.equalTo(view)
+        }
+        return view
+    }()
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         setupUI()

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

@@ -63,7 +63,8 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
         
         let version = "app版本号：" + UIDevice.appVersion() + "_" + UIDevice.appBuild()
 
-        return [PersonalModuleItem(icon: "mine_item_msg", title: "我的消息".local, type:.myMessage),
+        return [
+                PersonalModuleItem(icon: "mine_item_msg", title: "我的消息".local, type:.myMessage),
                 PersonalModuleItem(icon: "mine_item_progress", title: "我的进度".local, type:.myProgress),
                 PersonalModuleItem(icon: "mine_item_scoreCenter", title: "积分中心".local, type:.scoreCenter),
                 PersonalModuleItem(icon: "mine_item_recommend", title: "推荐有礼".local, type:.recommend),

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

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