修改完成

QXLive/Mine(音域)/Controller/QXMineViewController.m

@@ -27,6 +27,7 @@
 #import "QXMineNetwork.h"
 #import "QXHelpViewController.h"
 #import "QXInviteViewController.h"
+#import "QXChatViewController.h"
 
 @interface QXMineViewController ()<UITableViewDelegate,UITableViewDataSource,QXMineServiceCellDelegate,QXMainHeaderViewDelegate>
 @property (nonatomic,strong)QXMainHeaderView *tableHeaderView;
@@ -207,6 +208,14 @@
 -(void)gotoService{
     QXHelpViewController *webvc = [[QXHelpViewController alloc] init];
     [self.navigationController pushViewController:webvc animated:YES];
+
+//    QXChatViewController *vc = [[QXChatViewController alloc] init];
+//    TUIChatConversationModel *data = [[TUIChatConversationModel alloc] init];
+//    data.userID = @"@RBT#u88";
+//    data.title = @"小秘机器人";
+//    data.faceUrl = @"http://md.qxmier.com/data/avatar/head_pic.png";
+//    vc.data = data;
+//    [self.navigationController pushViewController:vc animated:YES];
 }
 
 

QXLive/Mine(音域)/Controller/道具商城/QXPropShopViewController.m

@@ -174,7 +174,7 @@ static void *WKWebBrowserContext = &WKWebBrowserContext;
         //自定义配置,一般用于 js调用oc方法(OC拦截URL中的数据做自定义操作)
         WKUserContentController * UserContentController = [[WKUserContentController alloc]init];
         // 是否支持记忆读取
-        configuration.suppressesIncrementalRendering = YES;
+        configuration.suppressesIncrementalRendering = NO;
         // 允许用户更改网页的设置
         [UserContentController addScriptMessageHandler:self name:@"login"];
         [UserContentController addScriptMessageHandler:self name:@"nativeHandler"];

QXLive/Mine(音域)/Services/QXMineNetwork.h

@@ -21,6 +21,7 @@
 #import "QXRechargeListModel.h"
 #import "QXPayTypeModel.h"
 #import "QXDayTaskModel.h"
+#import "QXRoomUserCharmModel.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -1014,6 +1015,26 @@ NS_ASSUME_NONNULL_BEGIN
 +(void)friendRoomQuitWithRoomid:(NSString*)room_id
                    successBlock:(void (^)(NSDictionary* dict))successBlock
                       failBlock:(void (^)(NSError * error, NSString * msg))failBlock;
+
+
+/**
+ 获取房间用户魅力列表
+ */
++(void)getRoomUserCharmListWithRoomId:(NSString*)roomId
+                               userId:(NSString*)userId
+                         successBlock:(void (^)(NSArray * list))successBlock
+                            failBlock:(void (^)(NSError * error, NSString * msg))failBlock;
+
+/**
+ 背包一键全清
+ */
++(void)roomBagGiftClearWithRoomId:(NSString*)roomId
+                           userId:(NSString*)userId
+                          heartId:(NSString*)heartId
+                     successBlock:(void (^)(NSDictionary* dict))successBlock
+                        failBlock:(void (^)(NSError * error, NSString * msg))failBlock;
+
+
 @end
 
 

QXLive/Mine(音域)/Services/QXMineNetwork.m

@@ -1999,4 +1999,38 @@
         failBlock(error,msg);
     }];
 }
+
++(void)getRoomUserCharmListWithRoomId:(NSString*)roomId
+                               userId:(NSString*)userId
+                         successBlock:(void (^)(NSArray * list))successBlock
+                            failBlock:(void (^)(NSError * error, NSString * msg))failBlock
+{
+    NSDictionary *parameters =@{
+        @"room_id":roomId?roomId:@"",
+        @"user_id":userId?userId:@""
+    };
+    [[QXRequset shareInstance] postWithUrl:QXRoomUserCharmList parameters:parameters needCache:NO success:^(id responseObject) {
+        if (successBlock) {
+            NSArray*list = [NSArray yy_modelArrayWithClass:[QXRoomUserCharmModel class] json:responseObject[@"data"]];
+            successBlock(list);
+        }
+    } fail:^(NSError *error, NSString *msg, NSURLSessionDataTask *task) {
+        failBlock(error,msg);
+    }];
+}
+
++(void)roomBagGiftClearWithRoomId:(NSString *)roomId userId:(NSString *)userId heartId:(NSString*)heartId successBlock:(void (^)(NSDictionary * _Nonnull))successBlock failBlock:(void (^)(NSError * _Nonnull, NSString * _Nonnull))failBlock{
+    NSDictionary *parameters =@{
+        @"room_id":roomId?roomId:@"",
+        @"to_uid":userId?userId:@"",
+        @"heart_id":heartId?heartId:@""
+    };
+    [[QXRequset shareInstance] postWithUrl:QXRoomGiftBagClear parameters:parameters needCache:NO success:^(id responseObject) {
+        if (successBlock) {
+            successBlock(responseObject[@"data"]);
+        }
+    } fail:^(NSError *error, NSString *msg, NSURLSessionDataTask *task) {
+        failBlock(error,msg);
+    }];
+}
 @end

QXLive/Mine(音域)/View/我的背包/QXBackpackRecordCell.m

@@ -13,7 +13,8 @@
     self.titleLabel.text = model.remarks;
     self.timeLabel.text = model.time;
     [self.giftImageView sd_setImageWithURL:[NSURL URLWithString:model.gift_image]];
-    self.recordLabel.text = [NSString stringWithFormat:@"X%@%@",model.gift_num,model.gift_name];
+//    self.recordLabel.text = [NSString stringWithFormat:@"X%@%@",model.gift_num,model.gift_name];
+    self.recordLabel.text = [NSString stringWithFormat:@"%@",model.gift_name];
 }
 - (void)awakeFromNib {
     [super awakeFromNib];