Merge branch 'feature/私讯+座驾体系' of http://git.yabolive.net:88/pidan/FuSiLive into feature/私讯+座驾体系

DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/WebView/FUSWebMorePopListView.m

@@ -45,6 +45,7 @@ static const NSInteger FUSWebMoreListViewModuleSpace = 10;
         [self.bgBtn mas_makeConstraints:^(MASConstraintMaker *make) {
             make.edges.equalTo(self);
         }];
+        [self.bgBtn addTarget:self action:@selector(fus_hidWithAniantion) forControlEvents:UIControlEventTouchUpInside];
         
         self.contentView = [[UIView alloc] init];
         [self addSubview:self.contentView];

Modules/FUSChatCenterModule/FUSChatCenterModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,12 +7,12 @@
 		<key>FUSChatCenterBundle.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>72</integer>
+			<integer>74</integer>
 		</dict>
 		<key>FUSChatCenterModule.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>77</integer>
+			<integer>76</integer>
 		</dict>
 	</dict>
 </dict>

Modules/FUSShowRoomModule/FUSShowRoomModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,12 +7,12 @@
 		<key>FUSShowRoomBundle.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>75</integer>
+			<integer>78</integer>
 		</dict>
 		<key>FUSShowRoomModule.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>73</integer>
+			<integer>75</integer>
 		</dict>
 	</dict>
 </dict>

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/FFLiveAgreementAlertView/FUSLiveAgreementAlertView.m

@@ -319,10 +319,11 @@
     NSString *protocolStr = [NSString stringWithFormat:@"%ld、%@%@", responsibilityContentTextList.count + 1, text1, text2];
     NSMutableAttributedString *protocolAttriStr = [[NSMutableAttributedString alloc] initWithString:protocolStr];
     protocolAttriStr.alignment = NSTextAlignmentLeft;
-    protocolAttriStr.font = [UIFont fus_themeMediumFont:15];
-    protocolAttriStr.color = [UIColor fus_textColorMedium];
+    protocolAttriStr.font = [UIFont fus_themeFont:15];
+    protocolAttriStr.color = [UIColor fus_textColorRich];
     NSRange range = [protocolStr rangeOfString:text2];
     [protocolAttriStr setColor:[UIColor fus_textColorDeep] range:range];
+    [protocolAttriStr setFont:[UIFont fus_themeMediumFont:15] range:range];
     
     MJWeakSelf
     [protocolAttriStr setTextHighlightRange:range color:[UIColor fus_textColorDeep] backgroundColor:[UIColor clearColor] tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) {

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/TreasureBox/View/FUSLiveBoxNumSettingCollectionViewCell.m

@@ -69,6 +69,7 @@
     _optionModel = optionModel;
     
     [_msgView fus_setIcon:UIImage.fus_diamonIcon title:optionModel.amount];
+    _msgView.msgLb.shadowColor = [UIColor clearColor];
     _profileLabel.text = optionModel.describe;
     
     [_tipsImgView setWebImageWithSubURLString:optionModel.sub placeholder:[UIImage imageWithColor:[UIColor clearColor] size:CGSizeMake(1, 1)]];

Modules/FUSUserCenterModule/FUSUserCenterModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,12 +7,12 @@
 		<key>FUSUserCenterModule.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>74</integer>
+			<integer>73</integer>
 		</dict>
 		<key>FUSUserCenterModuleBundle.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>78</integer>
+			<integer>77</integer>
 		</dict>
 	</dict>
 </dict>

Pods/Pods.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -392,7 +392,7 @@
 		<key>SSZipArchive.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>76</integer>
+			<integer>72</integer>
 		</dict>
 		<key>SnapKit-SnapKit_Privacy.xcscheme</key>
 		<dict>