Merge branch 'yinhe-live-1212' of...

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

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -882,6 +882,7 @@
 		04FD85742C219CFD00BEF9C5 /* YHMatchResultListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04FD85732C219CFD00BEF9C5 /* YHMatchResultListViewController.swift */; };
 		04FEDCFA2D08237F00D24FE2 /* tab_ai.json in Resources */ = {isa = PBXBuildFile; fileRef = 04FEDCF92D08237F00D24FE2 /* tab_ai.json */; };
 		04FEDCFD2D08274D00D24FE2 /* gangxiaobao_logo.json in Resources */ = {isa = PBXBuildFile; fileRef = 04FEDCFC2D08274D00D24FE2 /* gangxiaobao_logo.json */; };
+		04FEDCFF2D093CA900D24FE2 /* AlibabaPuHuiTi-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 04FEDCFE2D093CA900D24FE2 /* AlibabaPuHuiTi-Bold.ttf */; };
 		6203A87EDC96313BBE789D9C /* Pods_galaxy.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 987C69D43AE8D85DC1930DCF /* Pods_galaxy.framework */; };
 		A5000F512C3BC28B00843452 /* YHHomeHoldViewPageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5000F502C3BC28B00843452 /* YHHomeHoldViewPageViewController.swift */; };
 		A51044182B493675006B60BB /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = A51044172B493675006B60BB /* README.md */; };
@@ -2001,6 +2002,7 @@
 		04FD85732C219CFD00BEF9C5 /* YHMatchResultListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMatchResultListViewController.swift; sourceTree = "<group>"; };
 		04FEDCF92D08237F00D24FE2 /* tab_ai.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = tab_ai.json; sourceTree = "<group>"; };
 		04FEDCFC2D08274D00D24FE2 /* gangxiaobao_logo.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = gangxiaobao_logo.json; sourceTree = "<group>"; };
+		04FEDCFE2D093CA900D24FE2 /* AlibabaPuHuiTi-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "AlibabaPuHuiTi-Bold.ttf"; sourceTree = "<group>"; };
 		19B28612265782F9DC1BE0B0 /* Pods-galaxy.testenv.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-galaxy.testenv.xcconfig"; path = "Target Support Files/Pods-galaxy/Pods-galaxy.testenv.xcconfig"; sourceTree = "<group>"; };
 		58C2405158A4A6632D0E7460 /* Pods-galaxy.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-galaxy.debug.xcconfig"; path = "Target Support Files/Pods-galaxy/Pods-galaxy.debug.xcconfig"; sourceTree = "<group>"; };
 		987C69D43AE8D85DC1930DCF /* Pods_galaxy.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_galaxy.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -5748,6 +5750,7 @@
 		A5E69D4F2BA304D400411932 /* Font */ = {
 			isa = PBXGroup;
 			children = (
+				04FEDCFE2D093CA900D24FE2 /* AlibabaPuHuiTi-Bold.ttf */,
 				04BD83442CCA2009003A88DF /* AlimamaShuHeiTi-Bold.ttf */,
 				A5E69D502BA304D400411932 /* DIN Alternate Bold.ttf */,
 			);
@@ -5966,6 +5969,7 @@
 				A51044182B493675006B60BB /* README.md in Resources */,
 				A5EE42012C216C78005BBA5D /* img_0.png in Resources */,
 				04F0ABF32C364F9400518C30 /* home.json in Resources */,
+				04FEDCFF2D093CA900D24FE2 /* AlibabaPuHuiTi-Bold.ttf in Resources */,
 				04013E3E2CF87F3A001A8E40 /* zhibo.json in Resources */,
 				04FEDCFA2D08237F00D24FE2 /* tab_ai.json in Resources */,
 				04943BE82CF0A0B500BF2255 /* submit_page_scroll.gif in Resources */,

galaxy/galaxy/Classes/Modules/AI/AI-Dialogue(AI对话)/V/YHAIGreetCollectionReusableView.swift

@@ -23,22 +23,34 @@ class YHAIGreetCollectionReusableView: UICollectionReusableView {
         return lottieView
     }()
     
+    lazy var quoteImgView: UIImageView = {
+        let v = UIImageView(image: UIImage(named: "ai_product_list_head_quate"))
+        return v
+    }()
+    
     lazy var titleLabel:UILabel = {
         let lable = UILabel()
         lable.textColor = UIColor.mainTextColor
         lable.textAlignment = .left
-        lable.font = UIFont(name: "AlimamaShuHeiTi-Bold", size: 30)
+        lable.font = UIFont(name: "AlibabaPuHuiTi_3_95_ExtraBold", size: 30)
         lable.text = "Hi, 早上好!"
         return lable
     }()
     
     lazy var subtitleLabel:UILabel = {
         let lable = UILabel()
-        lable.textColor = UIColor.init(hex:0x6D788A)
         lable.textAlignment = .left
-        lable.font = UIFont.PFSC_R(ofSize:14)
         lable.numberOfLines = 0
-        lable.text = "港小宝来啦！超懂香港身份规划，畅聊香港生活，快来和我一起欢乐探索香港！"
+        lable.lineBreakMode = .byCharWrapping
+        let paragraphStyle = NSMutableParagraphStyle()
+        paragraphStyle.lineSpacing = 4.0
+        let attributedText = NSAttributedString(
+            string: "港小宝来啦！超懂香港身份规划，畅聊香港生活，快来和我一起欢乐探索香港！",
+            attributes: [NSAttributedString.Key.paragraphStyle: paragraphStyle,
+                         NSAttributedString.Key.foregroundColor: UIColor.mainTextColor(alpha: 0.6),
+                         NSAttributedString.Key.font: UIFont.PFSC_R(ofSize:14)]
+        )
+        lable.attributedText = attributedText
         return lable
     }()
     
@@ -60,6 +72,7 @@ class YHAIGreetCollectionReusableView: UICollectionReusableView {
         self.addSubview(iconImgView)
         self.addSubview(titleLabel)
         self.addSubview(subtitleLabel)
+        self.addSubview(quoteImgView)
      
         iconImgView.snp.makeConstraints { make in
             make.right.equalTo(-20+horizonalGap)
@@ -79,7 +92,13 @@ class YHAIGreetCollectionReusableView: UICollectionReusableView {
             make.right.equalTo(-24+horizonalGap)
             make.top.equalTo(titleLabel.snp.bottom).offset(8)
         }
-
+        
+        quoteImgView.snp.makeConstraints { make in
+            make.width.equalTo(27)
+            make.height.equalTo(18)
+            make.right.equalTo(subtitleLabel)
+            make.bottom.equalTo(subtitleLabel.snp.bottom).offset(10)
+        }
     }
     
     func greetingBasedOnTime() -> String {

galaxy/galaxy/Classes/Modules/AI/AI-Dialogue(AI对话)/V/YHAIProductCell.swift

@@ -38,7 +38,7 @@ class YHAIProductCell: UICollectionViewCell {
         let lable = UILabel()
         lable.textColor = UIColor.mainTextColor
         lable.textAlignment = .left
-        lable.font = UIFont.PFSC_B(ofSize:14)
+        lable.font = UIFont.PFSC_B(ofSize:15)
         lable.text = "产品智能体"
         return lable
     }()

galaxy/galaxy/Res/Assets.xcassets/AI-Chat/ai_product_list_head_quate.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/Info.plist

@@ -119,6 +119,7 @@
 	<array>
 		<string>DIN Alternate Bold</string>
 		<string>AlimamaShuHeiTi-Bold.ttf</string>
+		<string>AlibabaPuHuiTi-Bold.ttf</string>
 	</array>
 	<key>UIBackgroundModes</key>
 	<array>