迁移后不报错了

DevelopmentPods/FUSCommon/FUSCommon/Classes/Foundation/DataShare/FUSSwiftCacheDataShare.swift

@@ -120,6 +120,11 @@ import RxSwift
         }
     }
     
+    /// 平台模版基础数据配置
+    public var oc_settingDataTemplateGetList: [String : Any] { FUSSwiftCacheDataShare.share.settingDataTemplateGetList.value }
+    /// 平台模版基础数据配置
+    public var settingDataTemplateGetList: BehaviorRelay<[String : Any]> = .init(value: .init())
+    
     
     // - common part
     
@@ -150,7 +155,15 @@ import RxSwift
             // 发送改变通知给oc
             NotificationCenter.default.post(name: .init(FUSUserNotificationKeys.fus_NOTIFICATION_BACKPACK_backpackAllUnreadBadgeShow()), object: self.backpackAllUnreadBadgeShow)
         }.disposed(by: disposeBag)
+        
+        settingDataTemplateGetList.skip(1).subscribe(onNext: { model in
+            FUSFormatContentHelper.sharedInstance().settingDataTemplateGetList = model
+        }).disposed(by: disposeBag)
+        
+        fus_requestGetOpenCheckIpaddr()
     }
+    
+    
     func fus_setupSocket(){
         //websocket监听背包最新的更新
         FUSSwiftSocketHelper.listenTo(cid: FUSSwiftCacheDataSocketCID.backpackGetTimeNotice)
@@ -206,6 +219,7 @@ import RxSwift
     /// 做登陆成功的动作
     @objc public func fus_dealLoginSuccess(){
         
+        self.fus_requestSettingDataTemplateGetList()
         self.fus_requestBackpackTypeList(from: .server)
         self.fus_requestBackpackTimeUpdateGet()
         self.isLogin.accept(true)
@@ -239,6 +253,30 @@ import RxSwift
             
         }
     }
+    /// 平台模版基础数据配置
+    func fus_requestSettingDataTemplateGetList(){
+        FUSHttpHelper.postRequestBinary(withUrl: FUSCommonURLs.fus_URL_settingDataTemplateGetList(), params: nil) {[weak self] dataDict, code in
+            guard let dataDict = dataDict else { return }
+            if let dataMaps = dataDict["dataMaps"] as? [String: Any] {
+                self?.settingDataTemplateGetList.accept(dataMaps)
+            }
+        } failure: { dataDict, code in
+            
+        }
+    }
+    /// 检测ip
+    func fus_requestGetOpenCheckIpaddr(){
+        FUSHttpHelper.postRequestBinary(withUrl: FUSCommonURLs.fus_URL_openCheckIpaddr(), params: nil, retryTimes: 3) { dataDict, code in
+            guard let dataDict = dataDict else { return }
+            if let checkResult = dataDict["checkResult"] as? Int {
+                FUSSwiftLocalizationHelper.share.ipCheckResult = checkResult
+            }
+        } failure: { dataDict, code in
+            
+        }
+
+    }
+    
     /// 获取更新储值点数据 ,其实是从oc那边获取的，索引出给oc倒入数据的接口
     @objc public func fus_handlerRechargeData(dataList: [Any]){
         guard let dataList = dataList as? [FUSPaymentRechargeModel] else { return }
@@ -290,6 +328,8 @@ import RxSwift
     public static let backpackGetCarExperienceCardNotice: Int = 2051
     /// 全局提示跳转弹出框
     @objc public static let gobalJumpMessageAlert: Int = 2222
+    /// 使者邀请实时socket通知
+    @objc public static let inviteUserInfo: Int = 11033
 }
 /// 本地存储的key
 class FUSSwiftCacheDataStoreKey{
@@ -298,3 +338,54 @@ class FUSSwiftCacheDataStoreKey{
     ///用户提示有新座驾的显示提示那个时间
     static let showUseCarTipsDateKey = "CacheData_store_showUseCarTipsDateKey"
 }
+
+
+
+// MARK: temp 先写这，有空分类
+extension SocialSharePlatform {
+    public var shareIcon: UIImage? {
+        switch self {
+        case .FacebookPlatform:
+            return UIImage.com_ImageNamed("Share_live_facebook_new")
+        case .TwitterPlatform:
+            return UIImage.com_ImageNamed("Share_Live_twitter")
+        case .WechatFriendPlatform:
+            return UIImage.com_ImageNamed("Share_Live_Wechat")
+        case .WechatCirclePaltform:
+            return UIImage.com_ImageNamed("Share_Live_Circle")
+        case .CopyLink:
+            return UIImage.com_ImageNamed("Share_icon_link")
+        case .LineSharePlatform:
+            return .com_ImageNamed("Share_Live_line")
+        case .WhatsAppPlatform:
+            return .com_ImageNamed("Share_Live_whatsapp")
+        case .FriendChatShare:
+            return .com_ImageNamed("Share_icon_chat")
+        default:
+            return .init()
+        }
+    }
+    
+    public var shareName: String {
+        switch self {
+        case .FacebookPlatform:
+            return "Facebook"
+        case .TwitterPlatform:
+            return "X"
+        case .LineSharePlatform:
+            return "LINE"
+        case .WechatFriendPlatform:
+            return .fus_localString("微信好友")
+        case .WechatCirclePaltform:
+            return .fus_localString("朋友圈")
+        case .CopyLink:
+            return .fus_localString("复制链接")
+        case .FriendChatShare:
+            return .fus_localString("好友")
+        case .WhatsAppPlatform:
+            return "WhatsApp"
+        default:
+            return ""
+        }
+    }
+}

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

@@ -60,6 +60,18 @@ NS_ASSUME_NONNULL_BEGIN
 
 + (NSString *)fus_newsfeedInput;
 
+/// 邀请有奖-下载帮助页地址
++(NSString *)fus_inviteDownloadHelpUrl;
+
+/// 邀请有奖-绑定帮助页地址
++(NSString *)fus_inviteBindHelpUrl;
+
+/// 使者奖励地址
++(NSString *)fus_inviteEmissaryRewardUrl;
+
+/// 我的族人地址
++(NSString *)fus_inviteMyClansmanUrl;
+
 @end
 
 @interface FUSCommonURLs : NSObject
@@ -187,6 +199,12 @@ NS_ASSUME_NONNULL_BEGIN
 // 用户点击个推消息-记录
 + (NSString *)fus_URL_UploadPushClickLog;
 
+/// 平台模版基础数据配置
++(NSString *)fus_URL_settingDataTemplateGetList;
+
+/// 检查验证IP地址
++(NSString *)fus_URL_openCheckIpaddr;
+
 @end
 
 NS_ASSUME_NONNULL_END

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

@@ -84,6 +84,26 @@
     return [FUSConfig.sharedInstanced.pathConfigs webUrl:@"/fusi/moving/news.html"];
 }
 
+/// 邀请有奖-下载帮助页地址
++(NSString *)fus_inviteDownloadHelpUrl {
+    return [FUSConfig.sharedInstanced.pathConfigs webUrl:@"/Nesting/newShare/helpDownload.html"];
+}
+
+/// 邀请有奖-绑定帮助页地址
++(NSString *)fus_inviteBindHelpUrl {
+    return [FUSConfig.sharedInstanced.pathConfigs webUrl:@"/Nesting/newShare/helpBind.html"];
+}
+
+/// 使者奖励地址
++(NSString *)fus_inviteEmissaryRewardUrl {
+    return [FUSConfig.sharedInstanced.pathConfigs webUrl:@"/Nesting/newShare/inviteReward.html"];
+}
+
+/// 我的族人地址
++(NSString *)fus_inviteMyClansmanUrl {
+    return [FUSConfig.sharedInstanced.pathConfigs webUrl:@"/Nesting/newShare/inviteNum.html"];
+}
+
 @end
 
 @implementation FUSCommonURLs
@@ -292,5 +312,14 @@
 + (NSString *)fus_URL_UploadPushClickLog {
     return [FUSConfig.sharedInstanced.pathConfigs apiUrl:@"/stat/clickPushMsg/log"];
 }
+/// 平台模版基础数据配置
++(NSString *)fus_URL_settingDataTemplateGetList{
+    return [FUSConfig.sharedInstanced.pathConfigs apiUrl:@"/setting/data/template/getList"];
+}
+
+/// 检查验证IP地址
++(NSString *)fus_URL_openCheckIpaddr{
+    return [FUSConfig.sharedInstanced.pathConfigs apiUrl:@"/open/check/ipaddr"];
+}
 
 @end

DevelopmentPods/FUSCommon/FUSCommon/FUSRouter/Routers/UserRouter/FUSUserRouterProtocol.h

@@ -290,6 +290,15 @@ NS_ASSUME_NONNULL_BEGIN
 /// 显示绑定成功页面
 /// @param success 1
 -(void)fus_showBindAgentSuccessPopViewWithSuccess:(void(^)(void))success;
+
+/// 更新绑定使者的状态
+/// @param isBind 是否绑定
+/// @param bindagenttime 绑定使者剩余时间 分钟 一般是返回的bindagenttime字段记录
+/// @param getResultDate 记录这个时间的时 YYYY-MM-dd HH:mm
+-(void)fus_updataBindAgentStateWithIsBind:(BOOL)isBind
+                            bindagenttime:(NSString *)bindagenttime
+                            getResultDate:(NSString *)getResultDate;
+
 @end
 
 NS_ASSUME_NONNULL_END

DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_Chinese_Traditional.strings

@@ -3025,3 +3025,5 @@
 "暂无数据" = "暫無數據";
 
 "邀请有奖" = "邀請有獎";
+
+"使者邀请" = "使者邀請";

DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Tools/Categories/NSString/NSStringSwiftExt.swift

@@ -62,6 +62,25 @@ public func isEmptyDict(_ dict: [AnyHashable: Any]?) -> Bool {
         }
         return base64 as NSString
     }
+    
+    /// 计算文本高度
+    /// - Parameters:
+    ///   - font: 字体
+    ///   - maxWidth: 最大宽度
+    ///   - maxHeight: 最大高度
+    /// - Returns: size
+    @objc public func size(for font: UIFont, maxWidth: Double = .infinity, maxHeight: Double = .infinity) -> CGSize {
+        let str = NSString(string: self)
+        return str.boundingRect(with: .init(width: maxWidth, height: maxHeight), options: [.usesLineFragmentOrigin], attributes: [.font: font], context: nil).size
+    }
+    
+    /// 大图用下载地址
+    var fus_bigCdn : NSString {
+        if self.contains("http") {
+            return self
+        }
+        return FUSConfig.sharedInstanced().pathConfigs.bigDownloadPath(self as String) as NSString
+    }
 }
 
 public extension String {
@@ -149,6 +168,25 @@ public extension String {
         let encode = String.Encoding.init(rawValue: encodeValue)
         return self.lengthOfBytes(using: encode)
     }
+    
+    /// 计算文本高度
+    /// - Parameters:
+    ///   - font: 字体
+    ///   - maxWidth: 最大宽度
+    ///   - maxHeight: 最大高度
+    /// - Returns: size
+    func size(for font: UIFont, maxWidth: Double = .infinity, maxHeight: Double = .infinity) -> CGSize {
+        let str = NSString(string: self)
+        return str.boundingRect(with: .init(width: maxWidth, height: maxHeight), options: [.usesLineFragmentOrigin], attributes: [.font: font], context: nil).size
+    }
+    
+    /// 大图用下载地址
+    var fus_bigCdn : String {
+        if self.contains("http") {
+            return self
+        }
+        return FUSConfig.sharedInstanced().pathConfigs.bigDownloadPath(self)
+    }
 }
 
 public extension [String: Any] {

DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Tools/Categories/UIButton/UIButton+WebImage.h

@@ -22,6 +22,8 @@
 
 - (void)setWebImageWithSubURLString:(NSString *)urlString controlState:(UIControlState)state placeholder:(UIImage *)placeholder;
 
+- (void)setWebImageWithSubURLString:(NSString *)urlString controlState:(UIControlState)state placeholder:(UIImage *)placeholder completion:(void(^)(BOOL isSuccess, UIImage * __nullable image))completion;
+
 - (void)setWebBackgroundImageWithSubURLString:(NSString *)urlString;
 
 - (void)setWebBackgroundImageWithSubURLString:(NSString *)urlString placeholder:(UIImage *)placeholder;

DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Tools/Categories/UIButton/UIButton+WebImage.m

@@ -87,6 +87,35 @@
     [self setImageWithURL:url forState:state placeholder:placeholder];
 }
 
+- (void)setWebImageWithSubURLString:(NSString *)urlString controlState:(UIControlState)state placeholder:(UIImage *)placeholder completion:(void (BOOL, UIImage * _Nullable))completion{
+    
+    if ([urlString containsString:@"boy"] || [urlString containsString:@"girl"]) {
+        [self setImage:UIImage.fus_defaultIcon forState:UIControlStateNormal];
+        return;
+    }
+    
+    //链接以LocalimageUrl开头的默认为本地图片
+    if ([urlString hasPrefix:@"LocalimageUrl"]) {
+        [self setImage:[UIImage fus_ImageNamed:urlString] forState:UIControlStateNormal];
+        return;
+    }
+    
+    NSURL *url = nil;
+    if ([urlString containsString:@"http"]) {
+        url = [NSURL URLWithString:urlString];
+    }else{
+        url = [NSURL URLWithString:[FUSConfig.sharedInstanced.pathConfigs webImagePath:urlString]];
+    }
+    
+    [self setImageWithURL:url forState:state placeholder:placeholder options:kNilOptions completion:^(UIImage * _Nullable image, NSURL * _Nonnull url, YYWebImageFromType from, YYWebImageStage stage, NSError * _Nullable error) {
+        if (error == nil && image != nil) {
+            completion(YES, image);
+        }else {
+            completion(NO, nil);
+        }
+    }];
+}
+
 - (void)setWebBackgroundImageWithSubURLString:(NSString *)urlString
 {
     [self setWebBackgroundImageWithSubURLString:urlString controlState:UIControlStateNormal placeholder:nil];

DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Tools/FormatContent/FUSFormatContentHelper.h

@@ -13,6 +13,12 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface FUSFormatContentHelper : NSObject
 
+/// 记录一些基础替换的东西
+@property (nonatomic, copy) NSDictionary *settingDataTemplateGetList;
+
+
++ (instancetype)sharedInstance;
+
 /**
  根据给定数据生成 NSAttributedString
  

DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Tools/FormatContent/FUSFormatContentHelper.m

@@ -18,6 +18,17 @@
 
 @implementation FUSFormatContentHelper
 
++ (instancetype)sharedInstance {
+    
+    static id shared = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        shared = [[super alloc] init];
+    });
+    
+    return shared;
+}
+
 /**
  根据给定数据生成 NSAttributedString
 
@@ -33,6 +44,22 @@
 
     if (![NSString isNullWithString:model.languageContent]) {
         
+        // 替换针对版本性的东西
+        NSString *languageContentString = model.languageContent;
+        NSDictionary *dataTemplateDict = [FUSFormatContentHelper sharedInstance].settingDataTemplateGetList;
+        if (dataTemplateDict != nil && dataTemplateDict.allKeys.count > 0) {
+            for (NSString *dataTemplateKey in dataTemplateDict.allKeys) {
+                if ([dataTemplateDict[dataTemplateKey] isKindOfClass:[NSString class]]) {
+                    if ([languageContentString rangeOfString:dataTemplateKey].location != NSNotFound) {
+                        NSString *tempValue = dataTemplateDict[dataTemplateKey];
+                        if (tempValue.length > 0) {
+                            languageContentString = [languageContentString stringByReplacingOccurrencesOfString:dataTemplateKey withString:[NSString stringWithFormat:@"\"%@\"",dataTemplateDict[dataTemplateKey]]];
+                        }
+                    }
+                }
+            }
+        }
+        
         NSMutableAttributedString *attr = [NSMutableAttributedString fus_attributeStringWithHTMLString:model.languageContent baseColor:@"ffffff" font:font imgHeight:levelSize.height imgWidth:levelSize.width];
         
         if (![FUSDeviceHelper fus_checkOldIPhoneDeviceHandler:nil]) {

DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Tools/Localization/FUSLocalizationHelper.h

@@ -14,10 +14,11 @@ extern NSString *const FUSI_LANGUAGE_SYSTEM;
 
 typedef NS_ENUM(NSInteger, FUSLanguageType) {
     FUSLanguageTypeEnglish = 1,
-    FUSLanguageTypeChinese = 2,
-    FUSLanguageTypeThai = 3,
-    FUSLanguageTypeJanpanese = 4,
-    FUSLanguageTypeIndonesian = 5,
+    FUSLanguageTypeChineseTranditional = 2,
+    FUSLanguageTypeChinese = 3,
+    FUSLanguageTypeThai = 4,
+    FUSLanguageTypeJanpanese = 5,
+    FUSLanguageTypeIndonesian = 6,
     FUSLanguageTypeArbic = 7,
     FUSLanguageTypeVietnamese = 8,
 };
@@ -74,6 +75,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 + (NSString *)fus_systemLanguage;
 
++ (BOOL)fus_isCNStatus;
+
 @end
 
 @interface NSString (FUSLocalization)

DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Tools/Localization/FUSLocalizationHelper.m

@@ -13,6 +13,7 @@
 #import "NSObject+Check.h"
 #import "FUSConfig.h"
 #import "FUSFoundationBundle.h"
+#import <FUSFoundation/FUSFoundation-Swift.h>
 
 static NSString *const kAPP_CURRENT_LANGUAGE_SETTING_KEY = @"kAPP_CURRENT_LANGUAGE_SETTING_KEY";
 
@@ -76,7 +77,7 @@ static NSString *const FUSArbicLangArea = @"1001";
                           @{@"name":@"简体中文",@"key":FUSI_LANGUAGE_CHINESE},
                           @{@"name":@"English",@"key":FUSI_LANGUAGE_ENGLISH},
                           @{@"name":@"日本語",@"key":FUSI_LANGUAGE_JAPANESE},
-                          @{@"name":@"ไทย",@"key":FUSI_LANGUAGE_THAI},\
+                          @{@"name":@"ไทย",@"key":FUSI_LANGUAGE_THAI},
                           @{@"name":@"Tiếng Việt",@"key":FUSI_LANGUAGE_VIETNAMESE},
     ];
 }
@@ -211,6 +212,10 @@ static NSString *const FUSArbicLangArea = @"1001";
     };;
 }
 
++ (BOOL)fus_isCNStatus{
+    return FUSSwiftLocalizationHelper.share.isCNStatus;
+}
+
 @end
 
 @implementation FUSLanguageModel
@@ -230,6 +235,8 @@ static NSString *const FUSArbicLangArea = @"1001";
     if ([languageKey isEqualToString:FUSI_LANGUAGE_CHINESE]) {
         return FUSLanguageTypeChinese;
     }else if ([languageKey isEqualToString:FUSI_LANGUAGE_CHINESE_TRAD]){
+        return FUSLanguageTypeChineseTranditional;
+    }else if ([languageKey isEqualToString:FUSI_LANGUAGE_CHINESE]){
         return FUSLanguageTypeChinese;
     }else if ([languageKey isEqualToString:FUSI_LANGUAGE_ENGLISH]){
         return FUSLanguageTypeEnglish;

DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Tools/Localization/FUSSwiftLocalizationHelper.swift

@@ -7,8 +7,35 @@
 
 import UIKit
 
-class FUSSwiftLocalizationHelper: NSObject {
+@objcMembers public class FUSSwiftLocalizationHelper: NSObject {
     
+    static public let share = FUSSwiftLocalizationHelper()
+    
+    /// 是否为中国大陆IP：0否 1是
+    public var ipCheckResult: Int = 1
+    
+    /// 是否是cn大陆逻辑
+    @objc public var isCNStatus: Bool{
+        get{
+            if let regionCode = Locale.current.regionCode,
+               regionCode != "CN"{
+                // 地区并不是cn
+                if FUSSwiftLocalizationHelper.share.ipCheckResult == 0{
+                    // ip不是cn
+                    return false
+                }else {
+                    return true
+                }
+            }
+            return true
+        }
+    }
+}
+
+@objc public extension NSString {
+    @objc func fus_addressCheck() -> NSString {
+        String(self).fus_addressTransfromCheck() as NSString
+    }
 }
 
 public extension String {
@@ -24,4 +51,71 @@ public extension String {
     static func fus_versionLocalString(_ key: String) -> String{
         return self.fus_localString(key)
     }
+    
+    /// 地址信息检测
+    func fus_addressCheck() -> String {
+        return self.fus_addressTransfromCheck()
+    }
+    /// 判定是否修改
+    fileprivate func fus_addressTransfromCheck() -> String {
+        if FUSSwiftLocalizationHelper.share.isCNStatus == false {
+            return self
+        }else {
+            return self.fus_handleAddressTransFrom()
+        }
+    }
+    // 修改地区
+    private func fus_handleAddressTransFrom() -> String{
+        var rltStr = self
+        if rltStr.contains("台灣"){
+            rltStr = rltStr.replacingOccurrences(of: "中國台灣", with: "台灣")
+            rltStr = rltStr.replacingOccurrences(of: "台灣", with: "中國台灣")
+        }
+        if rltStr.contains("台\u{200C}灣"){
+            rltStr = rltStr.replacingOccurrences(of: "台\u{200C}灣", with: "中國台灣")
+        }
+        if rltStr.contains("臺灣"){
+            rltStr = rltStr.replacingOccurrences(of: "中國臺灣", with: "臺灣")
+            rltStr = rltStr.replacingOccurrences(of: "臺灣", with: "中國臺灣")
+        }
+        if rltStr.contains("臺\u{200C}灣"){
+            rltStr = rltStr.replacingOccurrences(of: "臺\u{200C}灣", with: "中國臺灣")
+        }
+        if rltStr.contains("臺湾"){
+            rltStr = rltStr.replacingOccurrences(of: "中國臺湾", with: "臺湾")
+            rltStr = rltStr.replacingOccurrences(of: "臺湾", with: "中國臺湾")
+        }
+        if rltStr.contains("臺\u{200C}湾"){
+            rltStr = rltStr.replacingOccurrences(of: "臺\u{200C}湾", with: "中國臺湾")
+        }
+        if rltStr.contains("台湾"){
+            rltStr = rltStr.replacingOccurrences(of: "中国台湾", with: "台湾")
+            rltStr = rltStr.replacingOccurrences(of: "台湾", with: "中国台湾")
+        }
+        if rltStr.contains("台\u{200C}湾"){
+            rltStr = rltStr.replacingOccurrences(of: "台\u{200C}湾", with: "中国台湾")
+        }
+        if rltStr.contains("香港"){
+            rltStr = rltStr.replacingOccurrences(of: "中國香港", with: "香港")
+            rltStr = rltStr.replacingOccurrences(of: "香港", with: "中國香港")
+        }
+        if rltStr.contains("香\u{200C}港"){
+            rltStr = rltStr.replacingOccurrences(of: "香\u{200C}港", with: "中國香港")
+        }
+        if rltStr.contains("澳门"){
+            rltStr = rltStr.replacingOccurrences(of: "中國澳门", with: "澳门")
+            rltStr = rltStr.replacingOccurrences(of: "澳门", with: "中國澳门")
+        }
+        if rltStr.contains("澳\u{200C}门"){
+            rltStr = rltStr.replacingOccurrences(of: "澳\u{200C}门", with: "中國澳门")
+        }
+        if rltStr.contains("澳門"){
+            rltStr = rltStr.replacingOccurrences(of: "中國澳門", with: "澳門")
+            rltStr = rltStr.replacingOccurrences(of: "澳門", with: "中國澳門")
+        }
+        if rltStr.contains("澳\u{200C}門"){
+            rltStr = rltStr.replacingOccurrences(of: "澳\u{200C}門", with: "中國澳門")
+        }
+        return rltStr
+    }
 }

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>76</integer>
 		</dict>
 		<key>FUSChatCenterModule.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>74</integer>
+			<integer>73</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>73</integer>
+			<integer>77</integer>
 		</dict>
 		<key>FUSShowRoomModule.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>78</integer>
+			<integer>75</integer>
 		</dict>
 	</dict>
 </dict>

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FUSVideoEndView/FUSVideoEndV2CustomCell.swift

@@ -34,8 +34,8 @@ class FUSVideoEndV2CustomCell: UITableViewCell {
         self.contentView.backgroundColor = .clear
         self.selectionStyle = .none
         
-//        self.infoView.frame = .init(x: 26, y: 0, width: YAScreen.width - 52, height: YAScreen.width / 375.0 * 38)
-//        self.infoView.frame = CGRectMake(0, 0, YAScreen.width - infoViewMarginLeft*2, YAScreen.width / 375.0 * 42)
+//        self.infoView.frame = .init(x: 26, y: 0, width: UIView.fus_screenW() - 52, height: UIView.fus_screenW() / 375.0 * 38)
+//        self.infoView.frame = CGRectMake(0, 0, UIView.fus_screenW() - infoViewMarginLeft*2, UIView.fus_screenW() / 375.0 * 42)
         self.contentView.addSubview(self.infoView)
         self.infoView.snp.makeConstraints { make in
             make.left.right.equalToSuperview().inset(infoViewMarginLeft)

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FUSVideoEndView/FUSVideoEndV2DetailAlertView.swift

@@ -233,7 +233,7 @@ class FUSVideoEndV2DetailAlertView: FUSBaseView {
 //            }
 //            
 //            if let chatSendVc = Mediator.SingleChat?.fus_showMultiChatSendViewController(for: transList) {
-//                UIViewController.topViewController()?.navigationController?.pushViewController(chatSendVc, animated: true)
+//                UIViewController.fus_top()?.navigationController?.pushViewController(chatSendVc, animated: true)
 //            }
         }
         

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FUSVideoEndView/FUSVideoEndV2View.swift

@@ -205,7 +205,7 @@ extension FUSVideoEndV2View: UITableViewDelegate, UITableViewDataSource {
         return self.sectionList[section].count
     }
     public func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-//        return ceil(YAScreen.width / 375.0 * 42)
+//        return ceil(UIView.fus_screenW() / 375.0 * 42)
         let type = sectionList[indexPath.section][indexPath.row]
         return type.fus_cellHeight()
     }

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/ChatInputView/FUSShareView/Model/FUSShareToolSheetModel.swift

@@ -18,51 +18,3 @@ struct FUSShareToolSheetViewCellModel {
     let tapAction: (() -> Void)?
 }
  
-extension SocialSharePlatform {
-    var shareIcon: UIImage? {
-        switch self {
-        case .FacebookPlatform:
-            return UIImage.com_ImageNamed("Share_live_facebook_new")
-        case .TwitterPlatform:
-            return UIImage.com_ImageNamed("Share_Live_twitter")
-        case .WechatFriendPlatform:
-            return UIImage.com_ImageNamed("Share_Live_Wechat")
-        case .WechatCirclePaltform:
-            return UIImage.com_ImageNamed("Share_Live_Circle")
-        case .CopyLink:
-            return UIImage.com_ImageNamed("Share_icon_link")
-        case .LineSharePlatform:
-            return .com_ImageNamed("Share_Live_line")
-        case .WhatsAppPlatform:
-            return .com_ImageNamed("Share_Live_whatsapp")
-        case .FriendChatShare:
-            return .com_ImageNamed("Share_icon_chat")
-        default:
-            return .init()
-        }
-    }
-    
-    var shareName: String {
-        switch self {
-        case .FacebookPlatform:
-            return "Facebook"
-        case .TwitterPlatform:
-            return "X"
-        case .LineSharePlatform:
-            return "LINE"
-        case .WechatFriendPlatform:
-            return .fus_localString("微信好友")
-        case .WechatCirclePaltform:
-            return .fus_localString("朋友圈")
-        case .CopyLink:
-            return .fus_localString("复制链接")
-        case .FriendChatShare:
-            return .fus_localString("好友")
-        case .WhatsAppPlatform:
-            return "WhatsApp"
-        default:
-            return ""
-        }
-    }
-}
- 

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/FFGiftView/FUSLiveGiftSendCountdownView.m

@@ -51,7 +51,7 @@
     self = [super initWithFrame:frame];
     if (self) {
         // 判断是否为中文区
-        if ([FUSLocalizationHelper fus_currentLanguage].languageType == FUSLanguageTypeChinese) {
+        if ([FUSLocalizationHelper fus_currentLanguage].languageType == FUSLanguageTypeChinese || [FUSLocalizationHelper fus_currentLanguage].languageType == FUSLanguageTypeChineseTranditional) {
             _defaultBgImageName = @"live_chat_gift_send_bg_cn";
         }else {
             _defaultBgImageName = @"live_chat_gift_send_bg_en";

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

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

Modules/FUSUserCenterModule/FUSUserCenterModule/FUSUserCenterModuleBundle.bundle/FUSUserCenterAssets.xcassets/inviteReward/InviteReward_common_section_header_line.imageset/Contents.json

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

Modules/FUSUserCenterModule/FUSUserCenterModule/FUSUserCenterModuleBundle.bundle/FUSUserCenterAssets.xcassets/inviteReward/InviteReward_invite_emissary_condition_tick_select.imageset/Contents.json

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

Modules/FUSUserCenterModule/FUSUserCenterModule/FUSUserCenterModuleBundle.bundle/FUSUserCenterAssets.xcassets/inviteReward/InviteReward_invite_emissary_condition_tick_unselect.imageset/Contents.json

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

Modules/FUSUserCenterModule/FUSUserCenterModule/FUSUserCenterModuleBundle.bundle/FUSUserCenterAssets.xcassets/inviteReward/InviteReward_invite_function_QRCode.imageset/Contents.json

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

Modules/FUSUserCenterModule/FUSUserCenterModule/FUSUserCenterModuleBundle.bundle/FUSUserCenterAssets.xcassets/inviteReward/InviteReward_invite_function_appStore.imageset/Contents.json

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

Modules/FUSUserCenterModule/FUSUserCenterModule/FUSUserCenterModuleBundle.bundle/FUSUserCenterAssets.xcassets/inviteReward/InviteReward_invite_function_media.imageset/Contents.json

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

Modules/FUSUserCenterModule/FUSUserCenterModule/FUSUserCenterModuleBundle.bundle/FUSUserCenterAssets.xcassets/inviteReward/InviteReward_invite_function_step1.imageset/Contents.json

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

Modules/FUSUserCenterModule/FUSUserCenterModule/FUSUserCenterModuleBundle.bundle/FUSUserCenterAssets.xcassets/inviteReward/InviteReward_invite_function_step2.imageset/Contents.json

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

Modules/FUSUserCenterModule/FUSUserCenterModule/FUSUserCenterModuleBundle.bundle/FUSUserCenterAssets.xcassets/inviteReward/InviteReward_invite_function_step3.imageset/Contents.json

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

Modules/FUSUserCenterModule/FUSUserCenterModule/FUSUserCenterModuleBundle.bundle/FUSUserCenterAssets.xcassets/inviteReward/InviteReward_invite_function_web.imageset/Contents.json

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

Modules/FUSUserCenterModule/FUSUserCenterModule/FUSUserCenterModuleBundle.bundle/FUSUserCenterAssets.xcassets/inviteReward/InviteReward_invite_plan_HLine.imageset/Contents.json

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

Modules/FUSUserCenterModule/FUSUserCenterModule/FUSUserCenterModuleBundle.bundle/FUSUserCenterAssets.xcassets/inviteReward/InviteReward_invite_plan_bg.imageset/Contents.json

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

Modules/FUSUserCenterModule/FUSUserCenterModule/FUSUserCenterModuleBundle.bundle/FUSUserCenterAssets.xcassets/inviteReward/InviteReward_invite_plan_btn.imageset/Contents.json

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