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

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

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

Modules/FUSChatCenterModule/FUSChatCenterModule/FUSChatCenterBundle.bundle/FUSChatCenterAssets.xcassets/IMMessage/callCenter_freeTimeIsUp_title_img.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
       "scale" : "1x"
     },
     },
     {
     {
-      "filename" : "callCenter_freeTimeIsUp_title_img@2x.png",
+      "filename" : "组 62@2x.png",
       "idiom" : "universal",
       "idiom" : "universal",
       "scale" : "2x"
       "scale" : "2x"
     },
     },
     {
     {
-      "filename" : "callCenter_freeTimeIsUp_title_img@3x.png",
+      "filename" : "组 62@3x.png",
       "idiom" : "universal",
       "idiom" : "universal",
       "scale" : "3x"
       "scale" : "3x"
     }
     }

Modules/FUSChatCenterModule/FUSChatCenterModule/Features/InstantMessaging/View/ToolViews/VideoChat/CallView/FUSCallDiamondShortageAlertView.swift

@@ -168,7 +168,7 @@ extension FUSCallDiamondShortageAlertView {
                 make.image = .fus_diamonIcon()
                 make.image = .fus_diamonIcon()
                 make.alignment = .center
                 make.alignment = .center
             }
             }
-            make.append("\(diamond)").textColor(.fus_theme())
+            make.append("\(diamond)").textColor(.fus_diamondBlue())
             make.textColor(.fus_textColorMedium()).font(.fus_themeFont(14))
             make.textColor(.fus_textColorMedium()).font(.fus_themeFont(14))
         })
         })
     }
     }

Modules/FUSChatCenterModule/FUSChatCenterModule/Features/InstantMessaging/View/ToolViews/VideoChat/CallView/FUSCallFreeTimeIsUpAlertView.swift

@@ -283,6 +283,7 @@ extension FUSCallFreeTimeIsUpAlertView {
 //                make.bounds = CGRectMake(0, 0, 18, 18)
 //                make.bounds = CGRectMake(0, 0, 18, 18)
                 make.alignment = .center
                 make.alignment = .center
             }
             }
+            make.append(" ")
             make.append("\(priceNum)/" + .fus_localString("分钟")).textColor(.fus_diamondBlue())
             make.append("\(priceNum)/" + .fus_localString("分钟")).textColor(.fus_diamondBlue())
             make.font(.fus_themeFont(15))
             make.font(.fus_themeFont(15))
         })
         })
@@ -303,6 +304,7 @@ extension FUSCallFreeTimeIsUpAlertView {
 //                make.bounds = CGRectMake(0, 0, 18, 18)
 //                make.bounds = CGRectMake(0, 0, 18, 18)
                 make.alignment = .center
                 make.alignment = .center
             }
             }
+            make.append(" ")
             make.append("\(incomeModel.total)/" + .fus_localString("分钟"))
             make.append("\(incomeModel.total)/" + .fus_localString("分钟"))
             if incomeModel.currency == 3{
             if incomeModel.currency == 3{
                 make.textColor(.fus_diamondBlue())
                 make.textColor(.fus_diamondBlue())

Modules/FUSChatCenterModule/FUSChatCenterModule/Features/InstantMessaging/View/ToolViews/VideoChat/CallView/FUSChatCallConnectingView.swift

@@ -843,8 +843,10 @@ class FUSChatCallConnectingView: FUSBaseView {
                 self?.userCardIsLoading = false
                 self?.userCardIsLoading = false
                 guard let self = self else { return }
                 guard let self = self else { return }
                 if let dataDict = dataDict,
                 if let dataDict = dataDict,
+                   let userDict = dataDict["user"] as? [AnyHashable: Any],
                    let tempUserCardView = self.tempUserCardView{
                    let tempUserCardView = self.tempUserCardView{
-                    let userInfoModel = FUSRoomUserInfoModel.fus_model(withDict: dataDict)
+                    let userInfoModel = FUSRoomUserInfoModel.fus_model(withDict: userDict)
+                    userInfoModel.fus_setValue(withDict: dataDict)
                     userInfoModel.uid = fid
                     userInfoModel.uid = fid
                     self.addSubview(tempUserCardView)
                     self.addSubview(tempUserCardView)
                     tempUserCardView.fus_showUserInfoView(with: .videoChat, userInfoModel: userInfoModel, shouldRequestData: true)
                     tempUserCardView.fus_showUserInfoView(with: .videoChat, userInfoModel: userInfoModel, shouldRequestData: true)

Modules/FUSChatCenterModule/FUSChatCenterModule/Features/InstantMessaging/View/ToolViews/VideoChat/CallView/FUSChatCallView.swift

@@ -548,7 +548,7 @@ extension UILabel {
         self.layer.shadowColor = UIColor.init(hex: "#415E5E", alpha: 148.0/255.0).cgColor
         self.layer.shadowColor = UIColor.init(hex: "#415E5E", alpha: 148.0/255.0).cgColor
         self.layer.shadowOffset = CGSize(width: 1, height: 0)
         self.layer.shadowOffset = CGSize(width: 1, height: 0)
         self.layer.shadowOpacity = 1
         self.layer.shadowOpacity = 1
-        self.layer.shadowRadius = 3.0
+        self.layer.shadowRadius = 2.0
     }
     }
 }
 }
 
 
@@ -574,6 +574,7 @@ extension NSAttributedString {
                     make.image = .fus_diamonIcon()
                     make.image = .fus_diamonIcon()
                     make.alignment = .center
                     make.alignment = .center
                 }
                 }
+                make.append(" ")
                 make.append("\(price)" + "/\(String.fus_localString("分钟"))").textColor(.fus_diamondBlue())
                 make.append("\(price)" + "/\(String.fus_localString("分钟"))").textColor(.fus_diamondBlue())
                 make.font(.fus_themeFont(15))
                 make.font(.fus_themeFont(15))
             }
             }

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

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

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/UserInfoCard/FUSVideoChatUserInfoView.m

@@ -222,28 +222,28 @@ if (@available(iOS 11.0, *)) {height = 80 + UIView.fus_SafeBottom;}\
         }
         }
     }
     }
     
     
-    switch (type) {
-        case FUSUserInfoViewTypeLive:
-        {
-            // 判断是否是点开自己的资料卡
-            if ([_currentModel.realUid isEqualToString:[FUSCacheDataShare shareStore].userDetailInfo.uid]) {
-                _reportBtn.hidden = YES;
-            } else {
-                _reportBtn.hidden = NO;
-            }
-        }
-            break;
-        case FUSUserInfoViewTypeVideoChat:
-        {
-        }
-            break;
-        default:
-            break;
-    }
+//    switch (type) {
+//        case FUSUserInfoViewTypeLive:
+//        {
+//            // 判断是否是点开自己的资料卡
+//            if ([_currentModel.realUid isEqualToString:[FUSCacheDataShare shareStore].userDetailInfo.uid]) {
+//                _reportBtn.hidden = YES;
+//            } else {
+//                _reportBtn.hidden = NO;
+//            }
+//        }
+//            break;
+//        case FUSUserInfoViewTypeVideoChat:
+//        {
+//        }
+//            break;
+//        default:
+//            break;
+//    }
 
 
     self.clearBgView.y = UIView.fus_screenH;
     self.clearBgView.y = UIView.fus_screenH;
     [UIView animateWithDuration:.1 delay:0 options:UIViewAnimationOptionCurveEaseOut animations:^{
     [UIView animateWithDuration:.1 delay:0 options:UIViewAnimationOptionCurveEaseOut animations:^{
-        self.clearBgView.y = UIView.fus_screenH - self.clearBgView.height;
+        self.clearBgView.y = self.height - self.clearBgView.height;
     } completion:nil];
     } completion:nil];
 }
 }
 
 
@@ -251,7 +251,7 @@ if (@available(iOS 11.0, *)) {height = 80 + UIView.fus_SafeBottom;}\
 {
 {
     if (animate) {
     if (animate) {
         [UIView animateWithDuration:0.25 animations:^{
         [UIView animateWithDuration:0.25 animations:^{
-            self.clearBgView.y = UIView.fus_screenH;
+            self.clearBgView.y = self.height;
         } completion:^(BOOL finished) {
         } completion:^(BOOL finished) {
             self.hidden = YES;
             self.hidden = YES;
             if (self.dimissBlock) self.dimissBlock();
             if (self.dimissBlock) self.dimissBlock();
@@ -508,9 +508,9 @@ if (@available(iOS 11.0, *)) {height = 80 + UIView.fus_SafeBottom;}\
 }
 }
 
 
 - (void)fus_initSignLabel {
 - (void)fus_initSignLabel {
-    _signLabel = [[UILabel alloc] initWithFrame:CGRectMake(15, CGRectGetMaxY(_fusiIDLabel.frame) + 55, self.bgView.width - 30, 15)];
+    _signLabel = [[UILabel alloc] initWithFrame:CGRectMake(15, CGRectGetMaxY(_fusiIDLabel.frame) + 55, self.bgView.width - 30, 18)];
     _signLabel.textColor = [UIColor fus_textColorRich];
     _signLabel.textColor = [UIColor fus_textColorRich];
-    _signLabel.font = [UIFont fus_themeFont:15];
+    _signLabel.font = [UIFont fus_themeFont:14];
 //    _signLabel.adjustsFontSizeToFitWidth = YES;
 //    _signLabel.adjustsFontSizeToFitWidth = YES;
     _signLabel.textAlignment = NSTextAlignmentCenter;
     _signLabel.textAlignment = NSTextAlignmentCenter;
     [self.bgView addSubview:_signLabel];
     [self.bgView addSubview:_signLabel];
@@ -620,6 +620,15 @@ if (@available(iOS 11.0, *)) {height = 80 + UIView.fus_SafeBottom;}\
         return;
         return;
     }
     }
     
     
+    if (self.type == FUSUserInfoViewTypeLive) {
+        // 判断是否是点开自己的资料卡
+        if ([_currentModel.realUid isEqualToString:[FUSCacheDataShare shareStore].userDetailInfo.uid]) {
+            _reportBtn.hidden = YES;
+        } else {
+            _reportBtn.hidden = NO;
+        }
+    }
+    
     if (model.isHide.boolValue) {
     if (model.isHide.boolValue) {
 
 
         _secrectBgImgView.hidden = NO;
         _secrectBgImgView.hidden = NO;
@@ -992,12 +1001,15 @@ if (@available(iOS 11.0, *)) {height = 80 + UIView.fus_SafeBottom;}\
 
 
 - (void)fus_updateBtnsWithModel:(FUSRoomUserInfoModel *)model {
 - (void)fus_updateBtnsWithModel:(FUSRoomUserInfoModel *)model {
     [_zoneBtn setTitle:nil forState:UIControlStateNormal];
     [_zoneBtn setTitle:nil forState:UIControlStateNormal];
-    if ([[FUSCacheDataShare shareStore].userDetailInfo.uid isEqualToString:model.realUid]) {
+    if ([[FUSCacheDataShare shareStore].userDetailInfo.uid isEqualToString:model.realUid]
+        || self.type == FUSUserInfoViewTypeVideoChat) {
         _atBtn.hidden = YES;
         _atBtn.hidden = YES;
         _followBtn.hidden = YES;
         _followBtn.hidden = YES;
         _chatBtn.hidden = YES;
         _chatBtn.hidden = YES;
-        if (model.isHide.boolValue) {
+        if (model.isHide.boolValue
+            || self.type == FUSUserInfoViewTypeVideoChat) {
             _zoneBtn.hidden = YES;
             _zoneBtn.hidden = YES;
+            _buttomBtnBgView.hidden = YES;
         } else {
         } else {
             // 如果是自己的资料卡，则只显示一个主页按钮
             // 如果是自己的资料卡，则只显示一个主页按钮
             _zoneBtn.hidden = NO;
             _zoneBtn.hidden = NO;

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

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

Modules/FUSUserCenterModule/FUSUserCenterModule/Features/CompleteUserInfo/View/FUSCompleteUserInfoAvatarView.swift

@@ -72,10 +72,10 @@ class FUSCompleteUserInfoAvatarView: FUSBaseView {
         let uploadBtnTitleSize = uploadBtnTitle.size(with: .fus_themeFont(17), maxWidth: 414, maxHeight: 20)
         let uploadBtnTitleSize = uploadBtnTitle.size(with: .fus_themeFont(17), maxWidth: 414, maxHeight: 20)
         
         
         uploadBtn.layer.cornerRadius = 36.0 / 2.0
         uploadBtn.layer.cornerRadius = 36.0 / 2.0
-        uploadBtn.layer.borderColor = UIColor.fus_theme().cgColor
+        uploadBtn.layer.borderColor = UIColor.fus_diamondBlue().cgColor
         uploadBtn.layer.borderWidth = 1;
         uploadBtn.layer.borderWidth = 1;
         uploadBtn.setTitle(.fus_localString("上传头像"), for: .normal)
         uploadBtn.setTitle(.fus_localString("上传头像"), for: .normal)
-        uploadBtn.setTitleColor(.fus_theme(), for: .normal)
+        uploadBtn.setTitleColor(.fus_diamondBlue(), for: .normal)
         uploadBtn.titleLabel?.font = .fus_themeFont(17)
         uploadBtn.titleLabel?.font = .fus_themeFont(17)
         contentView.addSubview(uploadBtn)
         contentView.addSubview(uploadBtn)
         uploadBtn.snp.makeConstraints { make in
         uploadBtn.snp.makeConstraints { make in

Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Setting/View/FUSChatSettingPriceCell.m

@@ -32,6 +32,7 @@
     self.layer.cornerRadius = 4;
     self.layer.cornerRadius = 4;
     self.layer.masksToBounds = YES;
     self.layer.masksToBounds = YES;
     self.layer.borderColor = [UIColor colorWithHex:@"#02F2F2"].CGColor;
     self.layer.borderColor = [UIColor colorWithHex:@"#02F2F2"].CGColor;
+    self.backgroundColor = [UIColor colorWithHex:@"#EEEDED"];
 }
 }
 
 
 @end
 @end

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

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