fixed bugs

DevelopmentPods/FUSCommon/FUSCommon/FUSRouter/Routers/LiveRouter/FUSLiveRouterProtocol.h

@@ -53,7 +53,7 @@ NS_ASSUME_NONNULL_BEGIN
 /**
 /**
  结束观看直播
  结束观看直播
  */
  */
-+ (void)fus_quitLiveWithCompletion:(void(^_Nullable)(void))completion  animated:(BOOL)animated;
+- (void)fus_quitLiveWithCompletion:(void(^_Nullable)(void))completion animated:(BOOL)animated;
 - (void)fus_pushLive;
 - (void)fus_pushLive;
 - (void)fus_closeLiveVideoSound;
 - (void)fus_closeLiveVideoSound;
 - (void)fus_openLiveVideoSound;
 - (void)fus_openLiveVideoSound;

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

@@ -122,10 +122,10 @@ NS_ASSUME_NONNULL_BEGIN
  @param success 成功回调
  @param success 成功回调
  @param failure 失败回调
  @param failure 失败回调
  */
  */
-+ (void)fus_setStrangerMessageSwitch:(BOOL)switchState success:(void(^)(NSInteger switchState))success failure:(void(^)(NSString *msg, int code))failure;
+- (void)fus_setStrangerMessageSwitch:(BOOL)switchState success:(void(^)(NSInteger switchState))success failure:(void(^)(NSString *msg, int code))failure;
 
 
 /// 拉黑或者取消拉黑
 /// 拉黑或者取消拉黑
-+ (void)fus_doFriendBlackUserOrCancelBlackUser:(NSString *)uid name:(NSString *)name success:(void (^__nullable)(id zoneModel))success failure:(void (^__nullable)(NSString *msg))failure;
+- (void)fus_doFriendBlackUserOrCancelBlackUser:(NSString *)uid name:(NSString *)name success:(void (^__nullable)(id zoneModel))success failure:(void (^__nullable)(NSString *msg))failure;
 
 
 #pragma mark - DB
 #pragma mark - DB
 
 
@@ -147,7 +147,7 @@ NS_ASSUME_NONNULL_BEGIN
  *
  *
  *  @return BOOL
  *  @return BOOL
  */
  */
-+ (BOOL)fus_writeDataToZoneInfosTableWithModel:(FUSZoneInfosModel *)zoneInfosModel;
+- (BOOL)fus_writeDataToZoneInfosTableWithModel:(FUSZoneInfosModel *)zoneInfosModel;
 
 
 #pragma mark - Other
 #pragma mark - Other
 - (void)fus_handlerUserModulePushEvent:(NSInteger)type infor:(NSDictionary *)info;
 - (void)fus_handlerUserModulePushEvent:(NSInteger)type infor:(NSDictionary *)info;

DevelopmentPods/FUSFoundation/FUSFoundation/Assets/Asset.xcassets/DailyCheckInSmallDew.imageset/Contents.json

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

DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FuSiTheme/Bundle/FUSFoundationBundle.m

@@ -135,7 +135,7 @@
 
 
 /// 露水图片
 /// 露水图片
 +(UIImage *)fus_dewIcon{
 +(UIImage *)fus_dewIcon{
-    return [UIImage imageNamed:@"DailyCheckInSmallDew"];
+    return [UIImage fus_ImageNamed:@"DailyCheckInSmallDew"];
 }
 }
 
 
 + (UIImage *)fus_rightArrowIcon {
 + (UIImage *)fus_rightArrowIcon {

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/AudienceListView/ContributeList/FUSMyContributeView.m

@@ -220,7 +220,7 @@
         
         
         self.sendGiftLabel.text = [NSString fus_localString:@"超越上一名"];
         self.sendGiftLabel.text = [NSString fus_localString:@"超越上一名"];
     } else {
     } else {
-        self.rankLabel.text = @"未上榜";
+        self.rankLabel.text = [NSString fus_localString:@"未上榜"];
         self.fireLabel.text = @"0";
         self.fireLabel.text = @"0";
         self.sendGiftLabel.text = [NSString fus_localString:@"上榜"];
         self.sendGiftLabel.text = [NSString fus_localString:@"上榜"];
     }
     }

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/LinkMicro/View/FUSLinkMicroUserListView.m

@@ -286,8 +286,8 @@
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(receiveLinkMicDeleteSelf:) name:FUSLiveNotificationKeys.fus_FUS_LINKMIC_DELE_SELF object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(receiveLinkMicDeleteSelf:) name:FUSLiveNotificationKeys.fus_FUS_LINKMIC_DELE_SELF object:nil];
     
     
     // 进入前台和后台
     // 进入前台和后台
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(changeSelfMicStatus:) name:UIApplicationWillEnterForegroundNotification object:nil];
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(changeSelfMicStatus:) name:UIApplicationDidEnterBackgroundNotification object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(enterForeground:) name:UIApplicationWillEnterForegroundNotification object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(enterBackground:) name:UIApplicationDidEnterBackgroundNotification object:nil];
 }
 }
 
 
 - (void)fus_setChannelId:(NSString *)channelId roomId:(NSString *)roomId{
 - (void)fus_setChannelId:(NSString *)channelId roomId:(NSString *)roomId{
@@ -824,9 +824,15 @@
     }
     }
 }
 }
 
 
-- (void)changeSelfMicStatus:(NSNotification *)noti{
+- (void)enterForeground:(NSNotification *)noti {
+    [self changeSelfMicStatus:YES];
+}
+
+- (void)enterBackground:(NSNotification *)noti {
+    [self changeSelfMicStatus:NO];
+}
 
 
-    BOOL open = [noti.object[@"status"] boolValue];
+- (void)changeSelfMicStatus:(BOOL)open{
     
     
     if (_selfCloseMic) {
     if (_selfCloseMic) {
         return;
         return;

Modules/FUSShowRoomModule/FUSShowRoomModule/Router/FUSShowRoomRouter.m

@@ -139,7 +139,7 @@
 /**
 /**
  结束观看直播
  结束观看直播
  */
  */
-+ (void)fus_quitLiveWithCompletion:(void(^_Nullable)(void))completion  animated:(BOOL)animated {
+- (void)fus_quitLiveWithCompletion:(void(^_Nullable)(void))completion animated:(BOOL)animated {
     [FUSLiveHelper fus_quitLiveWithCompletion:completion animated:animated];
     [FUSLiveHelper fus_quitLiveWithCompletion:completion animated:animated];
 }
 }
 
 

Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Login/View/FUSBoundAgentInfoView.m

@@ -197,7 +197,7 @@
 - (void)fus_getAgentName {
 - (void)fus_getAgentName {
     [FUSLoginHttpHelper fus_getAgentNameWithID:_agentIdTextfield.text success:^(NSString *name) {
     [FUSLoginHttpHelper fus_getAgentNameWithID:_agentIdTextfield.text success:^(NSString *name) {
         self.agentName = name;
         self.agentName = name;
-        self.agentNameLabel.textColor = [UIColor whiteColor];
+        self.agentNameLabel.textColor = [UIColor fus_textColorRich];
         self.agentNameLabel.text = [NSString stringWithFormat:@"%@：%@",[NSString fus_localString:@"邀请人昵称"],name];
         self.agentNameLabel.text = [NSString stringWithFormat:@"%@：%@",[NSString fus_localString:@"邀请人昵称"],name];
         //        _agentResultSuccess = YES;
         //        _agentResultSuccess = YES;
     } failure:^(NSString *msg, int code) {
     } failure:^(NSString *msg, int code) {
@@ -217,7 +217,7 @@
 - (void)fus_requestAgentInfoSuccess:(void (^)(NSString *name))success  failure:(void (^)(NSString *msg, int code))failure{
 - (void)fus_requestAgentInfoSuccess:(void (^)(NSString *name))success  failure:(void (^)(NSString *msg, int code))failure{
     [FUSLoginHttpHelper fus_getAgentNameWithID:_agentIdTextfield.text success:^(NSString *name) {
     [FUSLoginHttpHelper fus_getAgentNameWithID:_agentIdTextfield.text success:^(NSString *name) {
         self.agentName = name;
         self.agentName = name;
-        self.agentNameLabel.textColor = [UIColor whiteColor];
+        self.agentNameLabel.textColor = [UIColor fus_textColorRich];
         self.agentNameLabel.text = [NSString stringWithFormat:@"%@：%@",[NSString fus_localString:@"邀请人昵称"],name];
         self.agentNameLabel.text = [NSString stringWithFormat:@"%@：%@",[NSString fus_localString:@"邀请人昵称"],name];
         if (success) success(name);
         if (success) success(name);
     } failure:^(NSString *msg, int code) {
     } failure:^(NSString *msg, int code) {

Modules/FUSUserCenterModule/FUSUserCenterModule/Features/NewsFeed/Views/FUSNewsFeedUnlockAlert.m

@@ -170,15 +170,19 @@
     NSMutableAttributedString *att = [NSMutableAttributedString sj_UIKitText:^(id<SJUIKitTextMakerProtocol>  _Nonnull make) {
     NSMutableAttributedString *att = [NSMutableAttributedString sj_UIKitText:^(id<SJUIKitTextMakerProtocol>  _Nonnull make) {
         make.append(title);
         make.append(title);
         make.regex(regexStr).replaceWithText(^(id<SJUIKitTextMakerProtocol>  _Nonnull make) {
         make.regex(regexStr).replaceWithText(^(id<SJUIKitTextMakerProtocol>  _Nonnull make) {
-            make.appendImage(^(id<SJUTImageAttachment>  _Nonnull make) {
-                if (model.currency == 3) {
-                    make.image = [UIImage fus_diamonIcon];
-                }else {
-                    make.image = [UIImage fus_dewIcon];
-                }
-                make.alignment = SJUTVerticalAlignmentCenter;
-            });
-            make.append(model.price).textColor(model.currency == 3 ? [UIColor fus_diamondBlue] : [UIColor fus_dewBlue]);
+//            make.appendImage(^(id<SJUTImageAttachment>  _Nonnull make) {
+//                if (model.currency == 3) {
+//                    make.image = [UIImage fus_diamonIcon];
+//                }else {
+//                    make.image = [UIImage fus_dewIcon];
+//                }
+//                make.alignment = SJUTVerticalAlignmentCenter;
+//            });
+            UIColor *textColor = model.currency == 3 ? [UIColor fus_diamondBlue] : [UIColor fus_dewBlue];
+            NSString *currency = model.currency == 3 ? [NSString fus_localString:@"宝石"] : [NSString fus_localString:@"露水"];
+
+            make.append(model.price).textColor(textColor);
+            make.append(currency).textColor(textColor);
         });
         });
         make.font([UIFont fus_themeFont:13]).textColor([UIColor fus_textColorMedium]);
         make.font([UIFont fus_themeFont:13]).textColor([UIColor fus_textColorMedium]);
         make.alignment(NSTextAlignmentCenter);
         make.alignment(NSTextAlignmentCenter);

Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Zone/View/DailyCheckIn/View/FUSSingleDailyCheckInView.m

@@ -40,6 +40,7 @@
 @property (weak, nonatomic) IBOutlet UIImageView *getAwardImageView;
 @property (weak, nonatomic) IBOutlet UIImageView *getAwardImageView;
 // 获得奖励描述
 // 获得奖励描述
 @property (weak, nonatomic) IBOutlet UILabel *getAwardDesLabel;
 @property (weak, nonatomic) IBOutlet UILabel *getAwardDesLabel;
+@property (strong, nonatomic) IBOutlet UIButton *closeBtn;
 
 
 @end
 @end
 
 
@@ -54,6 +55,8 @@
     
     
     self.titleLabel.textColor = [UIColor fus_textColorRich];
     self.titleLabel.textColor = [UIColor fus_textColorRich];
     
     
+    [self.closeBtn setImage:[UIImage fus_ImageNamed:@"common_icon_update_view_close"] forState:UIControlStateNormal];
+    
     self.contentBgView.backgroundColor = [UIColor whiteColor];
     self.contentBgView.backgroundColor = [UIColor whiteColor];
     self.contentBgView.layer.cornerRadius = 14;
     self.contentBgView.layer.cornerRadius = 14;
     
     

Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Zone/View/DailyCheckIn/View/FUSSingleDailyCheckInView.xib

@@ -3,7 +3,7 @@
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
     <dependencies>
         <deployment identifier="iOS"/>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     </dependencies>
@@ -167,6 +167,7 @@
                 <outlet property="checkInSuccessAnimationImageView" destination="hUu-Be-4aY" id="uev-wC-oW1"/>
                 <outlet property="checkInSuccessAnimationImageView" destination="hUu-Be-4aY" id="uev-wC-oW1"/>
                 <outlet property="checkInSuccessBgView" destination="lmg-0l-jri" id="nRJ-V0-NBH"/>
                 <outlet property="checkInSuccessBgView" destination="lmg-0l-jri" id="nRJ-V0-NBH"/>
                 <outlet property="checkInView" destination="6ga-LE-F7L" id="w3Z-JH-07V"/>
                 <outlet property="checkInView" destination="6ga-LE-F7L" id="w3Z-JH-07V"/>
+                <outlet property="closeBtn" destination="ZKw-mW-Goa" id="9fI-4R-LKw"/>
                 <outlet property="contentBgView" destination="B2Q-Kv-Z7j" id="pVQ-l8-Dwe"/>
                 <outlet property="contentBgView" destination="B2Q-Kv-Z7j" id="pVQ-l8-Dwe"/>
                 <outlet property="getAwardDesLabel" destination="65T-h4-B1H" id="OBf-xm-lpg"/>
                 <outlet property="getAwardDesLabel" destination="65T-h4-B1H" id="OBf-xm-lpg"/>
                 <outlet property="getAwardImageView" destination="llF-5Q-IPF" id="iXP-hX-5aT"/>
                 <outlet property="getAwardImageView" destination="llF-5Q-IPF" id="iXP-hX-5aT"/>

Modules/FUSUserCenterModule/FUSUserCenterModule/Router/FUSUserCenterRouter.m

@@ -422,13 +422,13 @@
  @param success 成功回调
  @param success 成功回调
  @param failure 失败回调
  @param failure 失败回调
  */
  */
-+ (void)fus_setStrangerMessageSwitch:(BOOL)switchState success:(void(^)(NSInteger switchState))success failure:(void(^)(NSString *msg, int code))failure {
+- (void)fus_setStrangerMessageSwitch:(BOOL)switchState success:(void(^)(NSInteger switchState))success failure:(void(^)(NSString *msg, int code))failure {
     [FUSSettingHttpRequest fus_setStrangerMessageSwitch:switchState success:success failure:failure];
     [FUSSettingHttpRequest fus_setStrangerMessageSwitch:switchState success:success failure:failure];
 }
 }
 
 
 
 
 /// 拉黑或者取消拉黑
 /// 拉黑或者取消拉黑
-+ (void)fus_doFriendBlackUserOrCancelBlackUser:(NSString *)uid name:(NSString *)name success:(void (^__nullable)(id zoneModel))success failure:(void (^)(NSString *msg))failure {
+- (void)fus_doFriendBlackUserOrCancelBlackUser:(NSString *)uid name:(NSString *)name success:(void (^__nullable)(id zoneModel))success failure:(void (^)(NSString *msg))failure {
     [FUSZoneCacheOperate fus_doFriendBlackUserOrCancelBlackUser:uid name:name success:success failure:failure];
     [FUSZoneCacheOperate fus_doFriendBlackUserOrCancelBlackUser:uid name:name success:success failure:failure];
 }
 }
 
 
@@ -462,7 +462,7 @@
  *
  *
  *  @return BOOL
  *  @return BOOL
  */
  */
-+ (BOOL)fus_writeDataToZoneInfosTableWithModel:(FUSZoneInfosModel *)zoneInfosModel {
+- (BOOL)fus_writeDataToZoneInfosTableWithModel:(FUSZoneInfosModel *)zoneInfosModel {
     return [FUSZoneDBOperate fus_writeDataToZoneInfosTableWithModel:zoneInfosModel];
     return [FUSZoneDBOperate fus_writeDataToZoneInfosTableWithModel:zoneInfosModel];
 }
 }