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

DevelopmentPods/FUSCommon/FUSCommon/Classes/Foundation/Http/FUSCommonURLs.m

@@ -27,7 +27,7 @@
 
 
 // FuSi帮助
 // FuSi帮助
 + (NSString *)fus_help {
 + (NSString *)fus_help {
-    return [FUSConfig.sharedInstanced.pathConfigs webUrl:@"/Nesting/help/index.html"];
+    return [FUSConfig.sharedInstanced.pathConfigs webUrl:@"/vestApp/help/index.html"];
 }
 }
 
 
 // 《直播 & 社区公约》
 // 《直播 & 社区公约》
@@ -37,7 +37,7 @@
 
 
 // 主播时长查询
 // 主播时长查询
 + (NSString *)fus_liveTime {
 + (NSString *)fus_liveTime {
-    return [FUSConfig.sharedInstanced.pathConfigs webUrl:@"/Nesting/queryTime/index.html"];
+    return [FUSConfig.sharedInstanced.pathConfigs webUrl:@"/vestApp/queryTime/index.html"];
 }
 }
 
 
 // iTunesStore
 // iTunesStore
@@ -52,17 +52,17 @@
 
 
 // 座驾商城
 // 座驾商城
 + (NSString *)fus_motorShop {
 + (NSString *)fus_motorShop {
-    return [FUSConfig.sharedInstanced.pathConfigs webUrl:@"/Nesting/car/carShop.html"];
+    return [FUSConfig.sharedInstanced.pathConfigs webUrl:@"/vestApp/car/carShop.html"];
 }
 }
 
 
 // 背包获得记录
 // 背包获得记录
 + (NSString *)fus_backpackReceivedRecord {
 + (NSString *)fus_backpackReceivedRecord {
-    return [FUSConfig.sharedInstanced.pathConfigs webUrl:@"/Nesting/backpack/receiver.html"];
+    return [FUSConfig.sharedInstanced.pathConfigs webUrl:@"/vestApp/backpack/receiver.html"];
 }
 }
 
 
 // 背包道具消耗记录
 // 背包道具消耗记录
 + (NSString *)fus_backpackConsumeRecord {
 + (NSString *)fus_backpackConsumeRecord {
-    return [FUSConfig.sharedInstanced.pathConfigs webUrl:@"/Nesting/backpack/consume.html"];
+    return [FUSConfig.sharedInstanced.pathConfigs webUrl:@"/vestApp/backpack/consume.html"];
 }
 }
 
 
 // 账号管理
 // 账号管理

DevelopmentPods/FUSCommon/FUSCommon/Classes/Payment/View/FUSBuyDewPopView.swift

@@ -10,7 +10,7 @@ import UIKit
 
 
 public class FUSBuyDewPopView: UIView {
 public class FUSBuyDewPopView: UIView {
 
 
-    let URL_WEB_BUY_DEW = "/Nesting/dew/dewMask.html"
+    let URL_WEB_BUY_DEW = "/vestApp/dew/dewMask.html"
     
     
     //MARK: -- Class Method
     //MARK: -- Class Method
     @objc static public func fus_showBuyDewPopView() {
     @objc static public func fus_showBuyDewPopView() {

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

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

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

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

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

@@ -46,7 +46,7 @@
     [self addSubview:label];
     [self addSubview:label];
     
     
     FUSWKWebView *helpWebView = [[FUSWKWebView alloc] initWithFrame:CGRectMake(0, backBtn.height, self.width, self.height - backBtn.height)];
     FUSWKWebView *helpWebView = [[FUSWKWebView alloc] initWithFrame:CGRectMake(0, backBtn.height, self.width, self.height - backBtn.height)];
-    [helpWebView configWebViewWithWebUrl: [FUSConfig.sharedInstanced.pathConfigs webUrl:@"/Nesting/box/boxExplan.html"]];
+    [helpWebView configWebViewWithWebUrl: [FUSConfig.sharedInstanced.pathConfigs webUrl:@"/vestApp/box/boxExplan.html"]];
     helpWebView.shouldIncludeIdentifyInfo = YES;
     helpWebView.shouldIncludeIdentifyInfo = YES;
     [self addSubview:helpWebView];
     [self addSubview:helpWebView];
     
     

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

@@ -78,7 +78,7 @@
     
     
     _sendRecordWebView = [[FUSWKWebView alloc] initWithFrame:CGRectMake(_scrView.width, 0, _scrView.width, _scrView.height)];
     _sendRecordWebView = [[FUSWKWebView alloc] initWithFrame:CGRectMake(_scrView.width, 0, _scrView.width, _scrView.height)];
     
     
-    [_sendRecordWebView configWebViewWithWebUrl: [FUSConfig.sharedInstanced.pathConfigs webUrl:@"/Nesting/box/hairBox.html"]];
+    [_sendRecordWebView configWebViewWithWebUrl: [FUSConfig.sharedInstanced.pathConfigs webUrl:@"/vestApp/box/hairBox.html"]];
     _sendRecordWebView.shouldIncludeIdentifyInfo = YES;
     _sendRecordWebView.shouldIncludeIdentifyInfo = YES;
     [_scrView addSubview:_sendRecordWebView];
     [_scrView addSubview:_sendRecordWebView];
     
     

Modules/FUSShowRoomModule/FUSShowRoomModule/Others/FUSShowRoomURLs.h

@@ -429,15 +429,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 
 @interface FUSShowRoomWebURLs : NSObject
 @interface FUSShowRoomWebURLs : NSObject
 
 
-// 热力榜榜单说明
-+ (NSString *)fus_BOARD_README_HEATING_POWER;
-
 /// 社区公约
 /// 社区公约
 + (NSString *)fus_liveAndCommunityAgreementUrl;
 + (NSString *)fus_liveAndCommunityAgreementUrl;
 
 
-/// 直播管理条例
-+ (NSString *)fus_liveRuleAdminRuleUrl;
-
 /// 主播评分介绍
 /// 主播评分介绍
 + (NSString *)fus_liveAnchorAssessIntroURL;
 + (NSString *)fus_liveAnchorAssessIntroURL;
 
 

Modules/FUSShowRoomModule/FUSShowRoomModule/Others/FUSShowRoomURLs.m

@@ -687,10 +687,6 @@
 
 
 @implementation FUSShowRoomWebURLs
 @implementation FUSShowRoomWebURLs
 
 
-// 热力榜榜单说明
-+ (NSString *)fus_BOARD_README_HEATING_POWER {
-    return [FUSConfig.sharedInstanced.pathConfigs webUrl:@"/Nesting/help/hot.html"];
-}
 /// 社区公约
 /// 社区公约
 + (NSString *)fus_liveAndCommunityAgreementUrl {
 + (NSString *)fus_liveAndCommunityAgreementUrl {
 //    return [FUSConfig.sharedInstanced.pathConfigs webUrl:@"/Nesting/liveCommunity/index.html"];
 //    return [FUSConfig.sharedInstanced.pathConfigs webUrl:@"/Nesting/liveCommunity/index.html"];
@@ -698,12 +694,7 @@
 }
 }
 /// 主播评分介绍
 /// 主播评分介绍
 + (NSString *)fus_liveAnchorAssessIntroURL{
 + (NSString *)fus_liveAnchorAssessIntroURL{
-    return [FUSConfig.sharedInstanced.pathConfigs webUrl:@"/Nesting/liveScoreIntro/index.html"];
-}
-
-/// 直播管理条例
-+ (NSString *)fus_liveRuleAdminRuleUrl {
-    return [FUSConfig.sharedInstanced.pathConfigs webUrl:@"/Nesting/rule/adminRule.html"];
+    return [FUSConfig.sharedInstanced.pathConfigs webUrl:@"/vestApp/liveScoreIntro/index.html"];
 }
 }
 
 
 
 

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>73</integer>
+			<integer>77</integer>
 		</dict>
 		</dict>
 		<key>FUSUserCenterModuleBundle.xcscheme_^#shared#^_</key>
 		<key>FUSUserCenterModuleBundle.xcscheme_^#shared#^_</key>
 		<dict>
 		<dict>
 			<key>orderHint</key>
 			<key>orderHint</key>
-			<integer>77</integer>
+			<integer>76</integer>
 		</dict>
 		</dict>
 	</dict>
 	</dict>
 </dict>
 </dict>

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>72</integer>
+			<integer>78</integer>
 		</dict>
 		</dict>
 		<key>SnapKit-SnapKit_Privacy.xcscheme</key>
 		<key>SnapKit-SnapKit_Privacy.xcscheme</key>
 		<dict>
 		<dict>