提交

QXLive/Other/AppDelegate.m

@@ -57,6 +57,7 @@
 #import "QXHomePageNetwork.h"
 #import "QXRoomNavigationController.h"
 #import "QXInvitePopView.h"
+#import "QGVAPLogger.h"
 #if DEBUG
 #import <LLDebugTool.h>
 #endif

QXLive/Other/Assets.xcassets/room/bar_room_cabin_heart.imageset/Contents.json

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

QXLive/Other/Assets.xcassets/room/room_set_room_type_bar.imageset/Contents.json

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

QXLive/Other/Assets.xcassets/room/酒吧房/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

QXLive/Other/Assets.xcassets/room/酒吧房/bar_cabin_room_bg.imageset/Contents.json

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

QXLive/Other/Assets.xcassets/room/酒吧房/bar_room_ask_ta.imageset/Contents.json

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

QXLive/Other/Assets.xcassets/room/酒吧房/bar_room_cabin_gift_bg.imageset/Contents.json

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

QXLive/Other/Assets.xcassets/room/酒吧房/bar_room_close_privite.imageset/Contents.json

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

QXLive/Other/Assets.xcassets/room/酒吧房/bar_room_custom_gift.imageset/Contents.json

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

QXLive/Other/Assets.xcassets/room/酒吧房/bar_room_open_privite.imageset/Contents.json

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

QXLive/Other/Assets.xcassets/room/酒吧房/bar_room_sea_king.imageset/Contents.json

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

QXLive/Other/Assets.xcassets/room/酒吧房/bar_room_seduction_all.imageset/Contents.json

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

QXLive/Other/Assets.xcassets/room/酒吧房/bar_room_seduction_ta.imageset/Contents.json

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

QXLive/Other/Assets.xcassets/room/酒吧房/bar_room_set_custom_gift.imageset/Contents.json

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

QXLive/Other/Assets.xcassets/room/酒吧房/bar_room_set_seat_time.imageset/Contents.json

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

QXLive/Other/Assets.xcassets/room/酒吧房/bar_room_time_icon.imageset/Contents.json

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

QXLive/Other/Assets.xcassets/room/酒吧房/room_bar_ask_bg.imageset/Contents.json

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

QXLive/Other/Assets.xcassets/room/酒吧房/room_bar_cabin_cover.imageset/Contents.json

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

QXLive/Other/NoitceAndKey.h

@@ -121,6 +121,8 @@ static NSString *const kIsCanChat = @"kIsCanChat";
 static NSString *const kIsCanChatMoney = @"kIsCanChatMoney";
 /// 是否开启隐身进入
 static NSString *const kIsCloseDrifNobility = @"kIsCloseDrifNobility";
+/// 撩人是否弹窗
+static NSString *const kIsCloseSeductionAlert = @"kIsCloseSeductionAlert";
 
 
 // 微信登录

QXLive/Other/QXApi.h

@@ -269,7 +269,7 @@ static NSString * QXGiftList = @"api/Gift/get_gift_list";
 /// 礼物标签列表
 static NSString * QXGiftLabel = @"api/Gift/get_gift_label";
 /// 直播间送礼
-static NSString * QXSendGift = @"api/Room/room_give_gift";
+static NSString * QXSendGift = @"api/SendGift/send_gift";
 /// 在线列表
 static NSString * QXOnlineList = @"api/Room/room_online_list";
 /// 用户头像
@@ -593,4 +593,25 @@ static NSString * QXShopDressList = @"api/Decorate/get_decorate_list";
 static NSString * QXShopDressDetail = @"api/Decorate/get_decorate_detail";
 /// 购买装扮
 static NSString * QXShopBuyDress = @"api/Decorate/pay_decorate";
+
+
+/// 酒吧房
+/// 新礼物列表
+static NSString * QXRoomNewGiftList = @"api/GiftNew/get_gift_list";
+/// 自定义礼物列表
+static NSString * QXRoomCustomGiftList = @"api/GiftNew/get_custom_gift_list";
+/// 设置自定义礼物
+static NSString * QXRoomSetCustom = @"api/GiftNew/set_custom_gift";
+/// 酒吧房麦位时长列表
+static NSString * QXRoomSeatTimeList = @"api/BarRoom/get_pit_time_list";
+///酒吧房麦位时长设置
+static NSString * QXRoomSetSeatTime = @"api/BarRoom/set_pit_time";
+/// 约她礼物详情
+static NSString * QXRoomGetSeatGift = @"api/BarRoom/get_gift_info_ta";
+/// 获取撩他所需金币
+static NSString * QXRoomGetSeductionCoin = @"api/BarRoom/get_liao_ta_coin";
+/// 撩他
+static NSString * QXRoomBarSeduction = @"api/BarRoom/liao_ta";
+/// 约他
+static NSString * QXRoomBarAsk = @"api/BarRoom/meeting_ta";
 #endif /* Api_h */