YUSHENG/featherVoice
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

修改提交

Browse Source
This commit is contained in:
启星
2025-12-04 23:35:49 +08:00
parent 1c5a908dda
commit 57975eafc1
38 changed files with 216 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
QXLive/Base/QXGlobal.h
View File

@@ -111,7 +111,7 @@ typedef void (^showFinishBlock)(void);
/**
退出房间
*/
-(void)quitRoomWithRoomId:(NSString*)roomId;
-(void)quitRoomWithRoomId:(NSString*)roomId removeListener:(BOOL)removeListener;
/// 去完成任务
-(void)finishTask;

9
QXLive/Base/QXGlobal.m
View File

@@ -242,6 +242,9 @@
}
if ([roomId isEqualToString:self.roomId]) {
if ([navagationController.viewControllers containsObject:self.roomVC]) {
if (![navagationController.visibleViewController isEqual:self.roomVC]) {
[navagationController popToViewController:self.roomVC animated:YES];
}
return;
}else{
[UIApplication sharedApplication].idleTimerDisabled = YES;
@@ -296,7 +299,7 @@
[[QXRoomMessageManager shared] joinGroupWithRoomId:roomId];
[QXMineNetwork joinRoomWithRoomId:roomId successBlock:^(QXRoomModel * _Nonnull roomModel) {
if (weakSelf.roomId && ![weakSelf.roomId isEqualToString:roomId]) {
[weakSelf quitRoomWithRoomId:weakSelf.roomId];
[weakSelf quitRoomWithRoomId:weakSelf.roomId removeListener:NO];
}
// hideLoadingInView(KEYWINDOW)
// roomModel.room_info.pk_room_id = @"33";
@@ -371,7 +374,7 @@
}
}
}
-(void)quitRoomWithRoomId:(NSString *)roomId{
-(void)quitRoomWithRoomId:(NSString *)roomId removeListener:(BOOL)removeListener{
[self stopKeepTimer];
[UIApplication sharedApplication].idleTimerDisabled = NO;
/// 移除所有红包
@@ -389,7 +392,7 @@
/// 销毁整个声网示例
[[QXAgoraEngine sharedEngine] destroyEngine];
/// 退出直播群
[[QXRoomMessageManager shared] quitGroupWithRoomId:roomId];
[[QXRoomMessageManager shared] quitGroupWithRoomId:roomId removeListener:removeListener];
[[QXGlobal shareGlobal].offLineDict removeAllObjects];
[[NSNotificationCenter defaultCenter] removeObserver:self];
if (_roomVC) {

13
QXLive/Dynamic(语圈)/View/QXSendGiftView.m
View File

@@ -511,7 +511,18 @@
self.giftModel = nil;
self.pitUserListView.isSingle = NO;
[self.pitUserListView.selectedArray removeAllObjects];
self.pitUserListView.users = pitUsers;
NSMutableArray *arr = [NSMutableArray array];
for (QXRoomPitModel *md in pitUsers) {
QXRoomPitModel *model = [QXRoomPitModel new];
model.user_id = md.user_id;
model.nickname = md.nickname;
model.pit_number = md.pit_number;
model.sex = md.sex;
model.avatar = md.avatar;
model.user_code = md.user_code;
[arr addObject:model];
}
self.pitUserListView.users = arr;
[self getMyWallet];
}
-(void)setUserModel:(QXRoomPitModel *)userModel{

2
QXLive/Login(登录)/Controlller/QXLoginViewController.m
View File

@@ -253,7 +253,7 @@
model.navIsHidden = YES;
model.preferredStatusBarStyle = UIStatusBarStyleDarkContent;
model.logoImage = [UIImage imageNamed:@"login_logo"];
model.logoImage = [UIImage imageNamed:@"app_one_login_icon"];
model.logoFrameBlock = ^CGRect(CGSize screenSize, CGSize superViewSize, CGRect frame) {
frame.origin = CGPointMake((SCREEN_WIDTH - 88) * .5, 150+ kSafeAreaTop);
frame.size = CGSizeMake(88, 88);

2
QXLive/Manager/QXRoomMessageManager.h
View File

@@ -324,7 +324,7 @@ NS_ASSUME_NONNULL_BEGIN
-(void)joinGroupWithRoomId:(NSString*)roomId;
/// 退出房间群组
-(void)quitGroupWithRoomId:(NSString*)roomId;
-(void)quitGroupWithRoomId:(NSString*)roomId removeListener:(BOOL)removeListener;
-(void)sendChatMessage:(NSString *)message messageType:(QXRoomMessageType)messageType needInsertMessage:(BOOL)needInsertMessage;
/// 发送表情

7
QXLive/Manager/QXRoomMessageManager.m
View File

@@ -42,7 +42,7 @@
-(void)joinGroupWithRoomId:(NSString *)roomId{
MJWeakSelf
if (self.groupId) {
[self quitGroupWithRoomId:self.groupId];
[self quitGroupWithRoomId:self.groupId removeListener:YES];
}
[[V2TIMManager sharedInstance] addGroupListener:self];
[[V2TIMManager sharedInstance] addAdvancedMsgListener:self];
@@ -56,12 +56,13 @@
QXLOG(@"腾讯IM加入聊天室失败-code%d-原因%@",code,desc);
}];
}
-(void)quitGroupWithRoomId:(NSString *)roomId{
MJWeakSelf
-(void)quitGroupWithRoomId:(NSString *)roomId removeListener:(BOOL)removeListener{
if (removeListener) {
self.groupId = nil;
self.roomId = nil;
[[V2TIMManager sharedInstance] removeGroupListener:self];
[[V2TIMManager sharedInstance] removeAdvancedMsgListener:self];
}
NSString *groupId = [NSString stringWithFormat:@"room%@",roomId];
[[V2TIMManager sharedInstance] quitGroup:groupId succ:^{

18
QXLive/Mine(音域)/Controller/QXMineViewController.m
View File

@@ -161,10 +161,26 @@
break;
case QXMineServiceTypeSingerAuth:{
QXLOG(@"点击了歌手认证");
MJWeakSelf
if (![QXGlobal shareGlobal].isRealName) {
QXLOG(@"未实名，弹出实名认证");
QXRealNamePopView *v = [[QXRealNamePopView alloc] init];
v.closeActionBlock = ^{
[[QXGlobal shareGlobal] hideViewBlock:^{}];
};
v.authActionBlock = ^{
[[QXGlobal shareGlobal] hideViewBlock:^{
QXRoomSingerAuthViewController *vc = [[QXRoomSingerAuthViewController alloc] init];
vc.singer_status = self.userModel.singer_status;
vc.singer_status = weakSelf.userModel.singer_status;
[weakSelf.navigationController pushViewController:vc animated:YES];
}];
};
[[QXGlobal shareGlobal] showView:v popType:(PopViewTypePopFromCenter) tapDismiss:NO finishBlock:^{}];
}else{
QXMyRoomViewController *vc = [[QXMyRoomViewController alloc] init];
[self.navigationController pushViewController:vc animated:YES];
}
}
break;
case QXMineServiceTypeSongList:{
QXLOG(@"我的歌单");

2
QXLive/Mine(音域)/Controller/个人主页/QXUserHomePageViewController.m
View File

@@ -70,7 +70,7 @@
self.categoryView.delegate = self;
self.categoryView.titleSelectedColor = QXConfig.textColor;
self.categoryView.titleColor = RGB16(0x666666);
self.categoryView.titleFont = [UIFont boldSystemFontOfSize:12];
self.categoryView.titleFont = [UIFont boldSystemFontOfSize:14];
self.categoryView.titleSelectedFont = [UIFont boldSystemFontOfSize:16];
self.categoryView.titleColorGradientEnabled = YES;
self.categoryView.titleLabelZoomEnabled = YES;

2
QXLive/Mine(音域)/Controller/亲密关系/QXIntimateViewController.m
View File

@@ -122,7 +122,7 @@
MJWeakSelf
QXIntimateMoreListCell *cell = [QXIntimateMoreListCell cellWithTableView:tableView];
cell.userId = self.userId;
QXRoomBestFriendListModel *md = self.dataArray.firstObject;
QXRoomBestFriendListModel *md = self.dataArray[indexPath.section-1];
cell.model = md.relation_list.firstObject;
cell.delegate = self;
cell.deleteSuccessBlock = ^(QXRelationshipListModel * _Nonnull model) {

5
QXLive/Mine(音域)/Controller/爵位/QXNobilityBuyViewController.m
View File

@@ -61,7 +61,10 @@
weakSelf.priceView.model = model;
[weakSelf.tableView reloadData];
} failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) {
showToast(msg);
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
[weakSelf.navigationController popViewControllerAnimated:YES];
});
}];
}

2
QXLive/Mine(音域)/View/亲密关系/QXIntimateMoreListCell.h
View File

@@ -24,6 +24,8 @@ NS_ASSUME_NONNULL_BEGIN
@property (weak, nonatomic) IBOutlet UILabel *timeLabel;
@property (nonatomic,strong)QXRelationshipListModel *model;
@property (nonatomic,strong)NSString *userId;
@property (weak, nonatomic) IBOutlet UIButton *deleteBtn;
@property (weak, nonatomic) IBOutlet UIButton *topBtn;
@property (nonatomic,copy)void(^topSuccessBlock)(QXRelationshipListModel*model);
@property (nonatomic,copy)void(^deleteSuccessBlock)(QXRelationshipListModel*model);
@property (nonatomic,weak)id<QXIntimateMoreListCellDelegate>delegate;

7
QXLive/Mine(音域)/View/亲密关系/QXIntimateMoreListCell.m
View File

@@ -103,6 +103,13 @@
self.rightNameLabel.text = model.nickname1;
self.rightSexImageView.image = [UIImage imageNamed:model.sex2.intValue == 1?@"user_sex_boy":@"user_sex_girl"];
}
if ([self.userId isEqualToString:QXGlobal.shareGlobal.loginModel.user_id]) {
self.topBtn.hidden = YES;
self.deleteBtn.hidden = YES;
}else{
self.topBtn.hidden = NO;
self.deleteBtn.hidden = NO;
}
NSTimeInterval currentTime = [[NSDate date] timeIntervalSince1970];
long long milliseconds = (long long)(currentTime);
NSInteger time = model.end_time.longLongValue - milliseconds;

2
QXLive/Mine(音域)/View/亲密关系/QXIntimateMoreListCell.xib
View File

@@ -166,6 +166,7 @@
</tableViewCellContentView>
<viewLayoutGuide key="safeArea" id="aW0-zy-SZf"/>
<connections>
<outlet property="deleteBtn" destination="52j-r4-V3h" id="a7Z-AB-PkR"/>
<outlet property="leftHeaderView" destination="pS6-S4-a2G" id="pIO-eN-du1"/>
<outlet property="leftNameLabel" destination="eAs-09-73J" id="3xn-sG-6Nz"/>
<outlet property="leftSexImageView" destination="fJj-mx-2yM" id="TSa-Nv-4tO"/>
@@ -173,6 +174,7 @@
<outlet property="rightNameLabel" destination="tuv-zg-sBW" id="unH-ct-gfv"/>
<outlet property="rightSexImageView" destination="6nc-bo-ejr" id="Xv0-nC-Nhq"/>
<outlet property="timeLabel" destination="8wc-ZY-rQa" id="BIS-Ab-0EB"/>
<outlet property="topBtn" destination="QZV-rH-5ej" id="HvG-Kr-kzY"/>
</connections>
<point key="canvasLocation" x="252.67175572519082" y="47.887323943661976"/>
</tableViewCell>

1
QXLive/Mine(音域)/View/家族/QXFamilyMemberCell.m
View File

@@ -47,6 +47,7 @@
[self.priceBtn setTitle:model.market_value forState:(UIControlStateNormal)];
self.onlineLabel.text = model.is_online==1?@"当前在线":@"当前离线";
self.continueBtn.hidden = model.is_show_sign.intValue==1?NO:YES;
self.continueBtn.hidden = NO;
}
- (IBAction)continueAction:(id)sender {

39
QXLive/Mine(音域)/View/家族/QXFamilyMemberCell.xib
View File

@@ -53,8 +53,8 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="张三张三张三" textAlignment="center" lineBreakMode="clip" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AEg-Tu-ye6">
<rect key="frame" x="8" y="88" width="72" height="19.333333333333329"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="16"/>
<rect key="frame" x="8" y="88" width="72" height="18"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
@@ -65,7 +65,7 @@
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="BVQ-z4-fHs">
<rect key="frame" x="26" y="111.33333333333333" width="36" height="19.999999999999986"/>
<rect key="frame" x="26" y="110" width="36" height="20"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
<state key="normal" title="10" image="mine_recharge_corn">
@@ -73,16 +73,16 @@
</state>
</button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="当前在线" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cha-OZ-i3U">
<rect key="frame" x="20" y="136.33333333333334" width="48" height="15"/>
<rect key="frame" x="20" y="135" width="48" height="15"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<color key="textColor" red="0.22745098039215686" green="0.73725490196078436" blue="0.42745098039215684" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="VGe-Cc-S6Q">
<rect key="frame" x="90" y="87.666666666666686" width="85" height="66.333333333333314"/>
<rect key="frame" x="90" y="87.666666666666686" width="116.66666666666669" height="66.333333333333314"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="今日" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fxt-Ok-e8L">
<rect key="frame" x="30.666666666666657" y="4" width="24" height="17"/>
<rect key="frame" x="46.333333333333343" y="4" width="24" height="17"/>
<constraints>
<constraint firstAttribute="height" constant="17" id="xrg-jZ-zdc"/>
</constraints>
@@ -91,7 +91,7 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="收礼盈利" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9wb-6a-aQt">
<rect key="frame" x="18.666666666666671" y="23" width="48" height="17"/>
<rect key="frame" x="34.333333333333343" y="23" width="48" height="17"/>
<constraints>
<constraint firstAttribute="height" constant="17" id="AoH-Ct-GM9"/>
</constraints>
@@ -100,7 +100,7 @@
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dpa-gV-fxG">
<rect key="frame" x="2" y="41.999999999999986" width="81" height="22.333333333333329"/>
<rect key="frame" x="2" y="41.999999999999986" width="112.66666666666667" height="22.333333333333329"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
<state key="normal" title="10" image="family_diamond">
@@ -111,7 +111,6 @@
<color key="backgroundColor" red="0.85490196078431369" green="1" blue="0.88627450980392153" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="fxt-Ok-e8L" firstAttribute="centerX" secondItem="VGe-Cc-S6Q" secondAttribute="centerX" id="2pr-cg-4QY"/>
<constraint firstAttribute="width" constant="85" id="FPA-42-3py"/>
<constraint firstItem="9wb-6a-aQt" firstAttribute="top" secondItem="fxt-Ok-e8L" secondAttribute="bottom" constant="2" id="RzV-mu-ufj"/>
<constraint firstAttribute="bottom" secondItem="dpa-gV-fxG" secondAttribute="bottom" constant="2" id="dtB-XL-hOC"/>
<constraint firstItem="fxt-Ok-e8L" firstAttribute="top" secondItem="VGe-Cc-S6Q" secondAttribute="top" constant="4" id="ef4-nR-Mji"/>
@@ -128,10 +127,10 @@
</userDefinedRuntimeAttributes>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="oGH-dJ-lZy">
<rect key="frame" x="179" y="87.666666666666686" width="85" height="66.333333333333314"/>
<rect key="frame" x="210.66666666666666" y="87.666666666666686" width="116.33333333333334" height="66.333333333333314"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="昨日" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KF6-Jg-pqn">
<rect key="frame" x="30.666666666666657" y="4" width="24" height="17"/>
<rect key="frame" x="46.000000000000028" y="4" width="24" height="17"/>
<constraints>
<constraint firstAttribute="height" constant="17" id="2Du-Vr-MGL"/>
</constraints>
@@ -140,7 +139,7 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="收礼盈利" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Rjt-H4-heD">
<rect key="frame" x="18.666666666666657" y="23" width="48" height="17"/>
<rect key="frame" x="34.000000000000028" y="23" width="48" height="17"/>
<constraints>
<constraint firstAttribute="height" constant="17" id="nAr-LR-mvb"/>
</constraints>
@@ -149,7 +148,7 @@
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3Ml-mg-Cxw">
<rect key="frame" x="2" y="41.999999999999986" width="81" height="22.333333333333329"/>
<rect key="frame" x="2" y="41.999999999999986" width="112.33333333333333" height="22.333333333333329"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
<state key="normal" title="10" image="family_diamond">
@@ -163,7 +162,6 @@
<constraint firstItem="Rjt-H4-heD" firstAttribute="top" secondItem="KF6-Jg-pqn" secondAttribute="bottom" constant="2" id="F2T-k5-Kgv"/>
<constraint firstAttribute="bottom" secondItem="3Ml-mg-Cxw" secondAttribute="bottom" constant="2" id="LJz-rW-T02"/>
<constraint firstItem="Rjt-H4-heD" firstAttribute="centerX" secondItem="oGH-dJ-lZy" secondAttribute="centerX" id="O15-tt-LOO"/>
<constraint firstAttribute="width" constant="85" id="bmv-lS-3aZ"/>
<constraint firstItem="3Ml-mg-Cxw" firstAttribute="leading" secondItem="oGH-dJ-lZy" secondAttribute="leading" constant="2" id="g7c-ng-N2i"/>
<constraint firstItem="3Ml-mg-Cxw" firstAttribute="top" secondItem="Rjt-H4-heD" secondAttribute="bottom" constant="2" id="jfG-L6-goi"/>
<constraint firstItem="KF6-Jg-pqn" firstAttribute="top" secondItem="oGH-dJ-lZy" secondAttribute="top" constant="4" id="udE-f7-Bn7"/>
@@ -177,11 +175,11 @@
</userDefinedRuntimeAttributes>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="v1E-D6-JeF">
<rect key="frame" x="278" y="126" width="60" height="28"/>
<rect key="frame" x="267" y="48" width="60" height="28"/>
<color key="backgroundColor" red="0.22745098039215686" green="0.73725490196078436" blue="0.42745098039215684" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="28" id="C6z-41-oB8"/>
<constraint firstAttribute="width" constant="60" id="Qmm-ha-usv"/>
<constraint firstAttribute="width" constant="60" id="9ui-aU-pgH"/>
<constraint firstAttribute="height" constant="28" id="qiP-BJ-VIF"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
@@ -198,12 +196,14 @@
</button>
</subviews>
<constraints>
<constraint firstItem="oGH-dJ-lZy" firstAttribute="width" secondItem="VGe-Cc-S6Q" secondAttribute="width" id="0Au-Of-wFk"/>
<constraint firstItem="VGe-Cc-S6Q" firstAttribute="top" secondItem="D6h-bE-tlh" secondAttribute="bottom" constant="8" id="0xl-vd-Eab"/>
<constraint firstItem="Xpt-NC-KbR" firstAttribute="top" secondItem="iH0-Pj-t8s" secondAttribute="top" constant="14" id="0yY-Uq-uIw"/>
<constraint firstItem="uXg-p7-J2S" firstAttribute="top" secondItem="iH0-Pj-t8s" secondAttribute="top" constant="12" id="3Up-H8-deH"/>
<constraint firstItem="BVQ-z4-fHs" firstAttribute="top" secondItem="AEg-Tu-ye6" secondAttribute="bottom" constant="4" id="45o-bc-VTo"/>
<constraint firstItem="3c8-yw-ZcY" firstAttribute="leading" secondItem="Xpt-NC-KbR" secondAttribute="leading" id="7he-6a-LQn"/>
<constraint firstAttribute="bottom" secondItem="VGe-Cc-S6Q" secondAttribute="bottom" constant="12" id="87e-jS-o6v"/>
<constraint firstItem="v1E-D6-JeF" firstAttribute="top" secondItem="3c8-yw-ZcY" secondAttribute="top" constant="5" id="DQb-bK-0gp"/>
<constraint firstItem="D6h-bE-tlh" firstAttribute="top" secondItem="3c8-yw-ZcY" secondAttribute="bottom" constant="8" id="GX3-ge-Kid"/>
<constraint firstItem="AEg-Tu-ye6" firstAttribute="leading" secondItem="uXg-p7-J2S" secondAttribute="leading" constant="-10" id="Ggr-Ur-BTo"/>
<constraint firstAttribute="trailing" secondItem="Xpt-NC-KbR" secondAttribute="trailing" constant="11" id="IrF-U1-Mro"/>
@@ -211,21 +211,22 @@
<constraint firstItem="VGe-Cc-S6Q" firstAttribute="leading" secondItem="Xpt-NC-KbR" secondAttribute="leading" id="Jsy-KK-zrr"/>
<constraint firstItem="Msn-nc-t9D" firstAttribute="top" secondItem="iH0-Pj-t8s" secondAttribute="top" id="Rk3-kc-29m"/>
<constraint firstItem="D6h-bE-tlh" firstAttribute="leading" secondItem="Xpt-NC-KbR" secondAttribute="leading" id="WX5-EF-GjZ"/>
<constraint firstItem="v1E-D6-JeF" firstAttribute="bottom" secondItem="VGe-Cc-S6Q" secondAttribute="bottom" id="Xhb-uf-REu"/>
<constraint firstItem="oGH-dJ-lZy" firstAttribute="top" secondItem="VGe-Cc-S6Q" secondAttribute="top" id="bvy-kk-VyI"/>
<constraint firstItem="oGH-dJ-lZy" firstAttribute="leading" secondItem="VGe-Cc-S6Q" secondAttribute="trailing" constant="4" id="c0s-Iv-yyJ"/>
<constraint firstItem="oGH-dJ-lZy" firstAttribute="bottom" secondItem="VGe-Cc-S6Q" secondAttribute="bottom" id="fer-eg-Q8u"/>
<constraint firstAttribute="trailing" secondItem="Msn-nc-t9D" secondAttribute="trailing" id="gQ1-bd-h8C"/>
<constraint firstItem="uXg-p7-J2S" firstAttribute="leading" secondItem="iH0-Pj-t8s" secondAttribute="leading" constant="18" id="jUx-NP-cQj"/>
<constraint firstItem="AEg-Tu-ye6" firstAttribute="trailing" secondItem="uXg-p7-J2S" secondAttribute="trailing" constant="10" id="nNH-Kq-QmX"/>
<constraint firstItem="Xpt-NC-KbR" firstAttribute="leading" secondItem="uXg-p7-J2S" secondAttribute="trailing" constant="20" id="p9M-CF-kU5"/>
<constraint firstAttribute="trailing" secondItem="oGH-dJ-lZy" secondAttribute="trailing" constant="16" id="pDS-1R-sPP"/>
<constraint firstItem="oGH-dJ-lZy" firstAttribute="leading" secondItem="VGe-Cc-S6Q" secondAttribute="trailing" constant="4" id="qvY-IN-Sh2"/>
<constraint firstItem="cha-OZ-i3U" firstAttribute="centerX" secondItem="uXg-p7-J2S" secondAttribute="centerX" id="r8z-sa-uZA"/>
<constraint firstItem="cha-OZ-i3U" firstAttribute="top" secondItem="BVQ-z4-fHs" secondAttribute="bottom" constant="5" id="ri0-KS-mht"/>
<constraint firstAttribute="trailing" secondItem="v1E-D6-JeF" secondAttribute="trailing" constant="5" id="t3Y-Ci-cqO"/>
<constraint firstAttribute="bottom" secondItem="Msn-nc-t9D" secondAttribute="bottom" id="vAB-on-UgX"/>
<constraint firstItem="3c8-yw-ZcY" firstAttribute="top" secondItem="Xpt-NC-KbR" secondAttribute="bottom" constant="10" id="vo1-0c-qqk"/>
<constraint firstItem="Msn-nc-t9D" firstAttribute="leading" secondItem="iH0-Pj-t8s" secondAttribute="leading" id="xki-e1-3Kn"/>
<constraint firstItem="BVQ-z4-fHs" firstAttribute="centerX" secondItem="uXg-p7-J2S" secondAttribute="centerX" id="zMn-Oa-xMf"/>
<constraint firstAttribute="trailing" secondItem="v1E-D6-JeF" secondAttribute="trailing" constant="16" id="zPq-Dt-tjP"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>

2
QXLive/Mine(音域)/View/设置/QXBlackListCell.h
View File

@@ -56,6 +56,8 @@ NS_ASSUME_NONNULL_BEGIN
@property (weak, nonatomic) IBOutlet UILabel *roleLabel;
@property (nonatomic,assign)BOOL isUpSeat;
/// 是否显示icon标签
@property (nonatomic,assign)BOOL isNoIcon;
@property (nonatomic,strong)QXRoomUserInfoModel *onlineUser;

8
QXLive/Mine(音域)/View/设置/QXBlackListCell.m
View File

@@ -174,7 +174,9 @@
}else{
self.sexImageView.hidden = YES;
}
if (self.isNoIcon) {
self.iconBgView.hidden = YES;
}else{
if (rankModel.icon.count > 0) {
self.iconBgView.hidden = NO;
for (int i = 0;i < rankModel.icon.count;i++) {
@@ -187,6 +189,7 @@
}else{
self.iconBgView.hidden = YES;
}
}
[self.removeBtn setTitle:[NSString stringWithFormat:@" %@",rankModel.total?rankModel.total:rankModel.gift_prices] forState:(UIControlStateNormal)];
}
@@ -271,6 +274,9 @@
break;
}
}
-(void)setIsNoIcon:(BOOL)isNoIcon{
_isNoIcon = isNoIcon;
}
- (void)awakeFromNib {
[super awakeFromNib];
// Initialization code

2
QXLive/Other/AppDelegate+Login.m
View File

@@ -113,7 +113,7 @@
}
-(void)takeOff{
if(QXGlobal.shareGlobal.roomId.length > 0){
[[QXGlobal shareGlobal] quitRoomWithRoomId:QXGlobal.shareGlobal.roomId];
[[QXGlobal shareGlobal] quitRoomWithRoomId:QXGlobal.shareGlobal.roomId removeListener:YES];
}
self.tabbarVC.selectedIndex = 3;
QXBaseNavigationController *tabbarNa = (QXBaseNavigationController *)self.tabbarVC.selectedViewController;

21
QXLive/Other/Assets.xcassets/app_one_login_icon.imageset/Contents.json vendored Normal file
View File

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

BIN
QXLive/Other/Assets.xcassets/app_one_login_icon.imageset/app_one_login_icon@2x.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 75 KiB

2
QXLive/Room(房间)/Controller/QXRoomViewController+Friend.m
View File

@@ -77,7 +77,7 @@
}
/// 有人退出交友房私密小屋
-(void)friendCabinRoomIsQuit{
[[QXGlobal shareGlobal] quitRoomWithRoomId:self.roomId];
[[QXGlobal shareGlobal] quitRoomWithRoomId:self.roomId removeListener:YES];
NSMutableArray *viewControllers = [NSMutableArray arrayWithArray:self.navigationController.viewControllers];
for (int i = 0; i < viewControllers.count; i++) {

8
QXLive/Room(房间)/Controller/QXRoomViewController.m
View File

@@ -319,7 +319,7 @@ QXRoomUserInfoViewDelegate
}failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) {
showToast(msg);
[[QXGlobal shareGlobal] quitRoomWithRoomId:self.roomId];
[[QXGlobal shareGlobal] quitRoomWithRoomId:self.roomId removeListener:YES];
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
[weakSelf.navigationController popViewControllerAnimated:YES];
});
@@ -655,8 +655,12 @@ QXRoomUserInfoViewDelegate
}
BOOL hasSong = NO;
if ((self.roomModel.room_info.type_id.intValue == 1) && self.roomModel.room_info.label_id.intValue == 2) {
if (self.roomModel.pk_info) {
hasSong = NO;
}else{
hasSong = YES;
}
}
/// 暂时不要pk
// hasPK = NO;
// /// 暂时不要ktv
@@ -906,7 +910,7 @@ QXRoomUserInfoViewDelegate
// 踢出房间
-(void)userDidTakeOffWithUserInfo:(QXUserHomeModel *)userInfo{
if ([userInfo.user_id isEqualToString:QXGlobal.shareGlobal.loginModel.user_id]) {
[[QXGlobal shareGlobal] quitRoomWithRoomId:self.roomId];
[[QXGlobal shareGlobal] quitRoomWithRoomId:self.roomId removeListener:YES];
// self.navigationController.interactivePopGestureRecognizer.enabled = YES;
[self.navigationController popViewControllerAnimated:YES];
}

2
QXLive/Room(房间)/View/QXMiniRoomView.m
View File

@@ -101,7 +101,7 @@
-(void)closeAction{
[self.layer removeAnimationForKey:@"rotationAnimation"];
[self removeFromSuperview];
[[QXGlobal shareGlobal] quitRoomWithRoomId:self.roomId];
[[QXGlobal shareGlobal] quitRoomWithRoomId:self.roomId removeListener:YES];
}
-(void)handlePan:(UIPanGestureRecognizer*)recognizer{

4
QXLive/Room(房间)/View/QXRoomTitleView.m
View File

@@ -405,7 +405,7 @@
}
-(void)leaveRoom{
if ([self.roomModel.room_info.type_id isEqualToString:@"6"] && [self.roomModel.room_info.label_id isEqualToString:@"5"]) {
[[QXGlobal shareGlobal]quitRoomWithRoomId:self.roomId];
[[QXGlobal shareGlobal]quitRoomWithRoomId:self.roomId removeListener:YES];
NSMutableArray *viewControllers = [NSMutableArray arrayWithArray:self.navigationController.viewControllers];
for (int i = 0; i < viewControllers.count; i++) {
UIViewController *vc = [viewControllers objectAtIndex:i];
@@ -420,7 +420,7 @@
[self.navigationController popViewControllerAnimated:YES];
QXGlobal.shareGlobal.superRoomId = @"";
}else{
[[QXGlobal shareGlobal]quitRoomWithRoomId:self.roomId];
[[QXGlobal shareGlobal]quitRoomWithRoomId:self.roomId removeListener:YES];
[self.navigationController popViewControllerAnimated:YES];
}
}

63
QXLive/Room(房间)/View/排行榜/QXRoomRankSubView.m
View File

@@ -233,6 +233,7 @@
cell.cellType = QXBlackListCellTypeRank;
cell.backgroundColor = [UIColor clearColor];
cell.titleLabel.text = [NSString stringWithFormat:@"%ld",indexPath.row+4];
cell.isNoIcon = YES;
cell.rankModel = self.dataArray[indexPath.row];
return cell;
}
@@ -318,36 +319,37 @@
self.nameLabel.text = md.nickname?md.nickname:@"";
[self.iconBgView removeAllSubviews];
[self.rankBtn setTitle:[NSString stringWithFormat:@" %@",md.total?md.total:md.gift_prices] forState:(UIControlStateNormal)];
CGFloat iconWidth = UserIconWidth;
CGFloat iconHeight = UserIconHeight;
CGFloat margin = 6;
for (int i = 0 ; i < md.icon.count; i++) {
UIImageView *iconImageView = [[UIImageView alloc] init];
[iconImageView sd_setImageWithURL:[NSURL URLWithString:md.icon[i]]];
[self.iconBgView addSubview:iconImageView];
if (md.icon.count == 1) {
[iconImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.mas_equalTo(iconWidth);
make.height.mas_equalTo(iconHeight);
make.centerY.centerX.equalTo(self.iconBgView);
}];
}else if(md.icon.count == 2){
[iconImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.mas_equalTo(iconWidth);
make.height.mas_equalTo(iconHeight);
make.centerY.equalTo(self.iconBgView);
make.centerX.equalTo(self.iconBgView).offset(-UserIconWidth/2+(margin+iconWidth)*i);
}];
}else{
[iconImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(i*(iconWidth+margin));
make.width.mas_equalTo(iconWidth);
make.height.mas_equalTo(iconHeight);
make.centerY.equalTo(self.iconBgView);
}];
}
}
// CGFloat iconWidth = UserIconWidth;
// CGFloat iconHeight = UserIconHeight;
// CGFloat margin = 6;
// for (int i = 0 ; i < md.icon.count; i++) {
// UIImageView *iconImageView = [[UIImageView alloc] init];
// [iconImageView sd_setImageWithURL:[NSURL URLWithString:md.icon[i]]];
// [self.iconBgView addSubview:iconImageView];
// if (md.icon.count == 1) {
// [iconImageView mas_makeConstraints:^(MASConstraintMaker *make) {
// make.width.mas_equalTo(iconWidth);
// make.height.mas_equalTo(iconHeight);
// make.centerY.centerX.equalTo(self.iconBgView);
// }];
// }else if(md.icon.count == 2){
// [iconImageView mas_makeConstraints:^(MASConstraintMaker *make) {
// make.width.mas_equalTo(iconWidth);
// make.height.mas_equalTo(iconHeight);
// make.centerY.equalTo(self.iconBgView);
// make.centerX.equalTo(self.iconBgView).offset(-UserIconWidth/2+(margin+iconWidth)*i);
// }];
// }else{
// [iconImageView mas_makeConstraints:^(MASConstraintMaker *make) {
// make.left.mas_equalTo(i*(iconWidth+margin));
// make.width.mas_equalTo(iconWidth);
// make.height.mas_equalTo(iconHeight);
// make.centerY.equalTo(self.iconBgView);
// }];
// }
//
// }
}
-(void)initSubviews{
self.headerImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"user_header_placehoulder"]];
@@ -404,6 +406,7 @@
}];
self.iconBgView = [[UIView alloc] init];
self.iconBgView.hidden = YES;
[self addSubview:self.iconBgView];
[self.iconBgView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.equalTo(self);
@@ -419,7 +422,7 @@
[self addSubview:self.rankBtn];
[self.rankBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.equalTo(self);
make.top.equalTo(self.iconBgView.mas_bottom);
make.top.equalTo(self.nameLabel.mas_bottom).offset(5);
make.height.mas_equalTo(16);
}];

2
QXLive/Room(房间)/View/点唱/QXSingerSongListCell.m
View File

@@ -68,7 +68,7 @@
self.playingLabel.hidden = NO;
self.requestBtn.hidden = YES;
}else{
self.requestBtn.hidden = NO;
self.requestBtn.hidden = !self.isCompere;
self.playingLabel.hidden = YES;
}
}

2
QXLive/Room(房间)/View/点唱/QXSingerSongListContentView.h
View File

@@ -17,7 +17,7 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic,assign)NSInteger historyType;
@property (nonatomic,assign)QXRoomPitModel* pitModel;
@property (nonatomic,strong)NSString*roomId;
-(void)updateSongList;
@end
NS_ASSUME_NONNULL_END

15
QXLive/Room(房间)/View/点唱/QXSingerSongListContentView.m
View File

@@ -83,10 +83,11 @@
if (list.count == 0) {
weakSelf.tableView.mj_footer.state = MJRefreshStateNoMoreData;
}else{
[weakSelf.tableView.mj_header endRefreshing];
[weakSelf.tableView.mj_footer endRefreshing];
}
} failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) {
[weakSelf.tableView.mj_header endRefreshing];
[weakSelf.tableView.mj_footer endRefreshing];
}];
}else if (self.type == 1){
/// 已点歌曲
@@ -100,10 +101,11 @@
if (list.count == 0) {
weakSelf.tableView.mj_footer.state = MJRefreshStateNoMoreData;
}else{
[weakSelf.tableView.mj_header endRefreshing];
[weakSelf.tableView.mj_footer endRefreshing];
}
} failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) {
[weakSelf.tableView.mj_header endRefreshing];
[weakSelf.tableView.mj_footer endRefreshing];
}];
}else{
/// 历史歌曲
@@ -117,10 +119,11 @@
if (list.count == 0) {
weakSelf.tableView.mj_footer.state = MJRefreshStateNoMoreData;
}else{
[weakSelf.tableView.mj_header endRefreshing];
[weakSelf.tableView.mj_footer endRefreshing];
}
} failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) {
[weakSelf.tableView.mj_header endRefreshing];
[weakSelf.tableView.mj_footer endRefreshing];
}];
}
}

1
QXLive/Room(房间)/View/点唱/QXSingerSongListView.m
View File

@@ -99,6 +99,7 @@
[self.titles replaceObjectAtIndex:1 withObject:self.alreadySongTitle];
self.categoryView.titles = self.titles;
[self.categoryView reloadDataWithoutListContainer];
[self.alreadySongView updateSongList];
}
-(BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceiveTouch:(UITouch *)touch{

6
QXLive/Room(房间)/View/用户信息/QXRoomUserInfoView.m
View File

@@ -681,8 +681,12 @@
[weakSelf.collectionView reloadData];
weakSelf.idLabel.text = [NSString stringWithFormat:@"%@ ID:%@",model.sex.intValue==1?@"男":@"女",model.user_code];
weakSelf.guildLabel.text = [NSString stringWithFormat:@"所属公会:%@",[model.guild isExist]?model.guild:@"无"];
if (![model.guild isExist] && ![weakSelf.userId isEqualToString:QXGlobal.shareGlobal.loginModel.user_id]) {
if ([model.guild isExist]) {
if ([weakSelf.userId isEqualToString:QXGlobal.shareGlobal.loginModel.user_id]) {
weakSelf.joinGuildBtn.hidden = YES;
}else{
weakSelf.joinGuildBtn.hidden = NO;
}
}else{
weakSelf.joinGuildBtn.hidden = YES;
}

6
QXLive/Room(房间)/View/签约房/QXSignCoinListView.m
View File

@@ -210,9 +210,9 @@
[weakSelf.collectionView reloadData];
} failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) {
showToast(msg);
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
[weakSelf getCoinList];
});
// dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
// [weakSelf getCoinList];
// });
}];
}

2
QXLive/Room(房间)/View/设置/QXRoomSettingView.m
View File

@@ -308,7 +308,7 @@
}
if (model.type == QXRoomSettingTypeRoomLeave) {
[self.navigationController popViewControllerAnimated:YES];
[[QXGlobal shareGlobal] quitRoomWithRoomId:self.roomModel.room_info.room_id];
[[QXGlobal shareGlobal] quitRoomWithRoomId:self.roomModel.room_info.room_id removeListener:YES];
return;
}
if (model.type == QXRoomSettingTypeRoomCompere) {

2
QXLive/Room(房间)/View/麦位视图/QXRoomSeatContentView.h
View File

@@ -26,6 +26,8 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic,strong)QXRoomPitModel *pitModel;
@property (nonatomic,assign)BOOL onlyShowHeader;
@property (nonatomic,assign) BOOL isSeatSpeaking;
/// 不显示麦圈
@property (nonatomic,assign) BOOL noMicCycle;
@property (nonatomic,strong)NSString *is_lock;
@property (nonatomic,strong)UIImageView *noUserImageView;

6
QXLive/Room(房间)/View/麦位视图/QXRoomSeatContentView.m
View File

@@ -218,6 +218,9 @@
QXLOG(@"在线状态%@",QXGlobal.shareGlobal.offLineDict);
}
-(void)speakInfo:(NSNotification*)notice{
if (self.noMicCycle) {
return;
}
id object = notice.object;
if ([object isKindOfClass:[AgoraRtcAudioVolumeInfo class]]) {
AgoraRtcAudioVolumeInfo *info = (AgoraRtcAudioVolumeInfo*)object;
@@ -241,6 +244,9 @@
-(void)setNoOffLine:(BOOL)noOffLine{
_noOffLine = noOffLine;
}
-(void)setNoMicCycle:(BOOL)noMicCycle{
_noMicCycle = noMicCycle;
}
-(void)setIsPK:(BOOL)isPK{
_isPK = isPK;
self.nameLabel.font = [UIFont systemFontOfSize:10];

4
QXLive/Room(房间)/View/麦位视图/QXRoomSeatTypeCabinView.m
View File

@@ -330,7 +330,7 @@
-(void)leaveRoom{
UINavigationController *na = (UINavigationController *)KEYWINDOW.rootViewController;
if ([self.roomModel.room_info.type_id isEqualToString:@"6"] && [self.roomModel.room_info.label_id isEqualToString:@"5"]) {
[[QXGlobal shareGlobal] quitRoomWithRoomId:self.roomModel.room_info.room_id];
[[QXGlobal shareGlobal] quitRoomWithRoomId:self.roomModel.room_info.room_id removeListener:YES];
NSMutableArray *viewControllers = [NSMutableArray arrayWithArray:na.viewControllers];
for (int i = 0; i < viewControllers.count; i++) {
UIViewController *vc = [viewControllers objectAtIndex:i];
@@ -346,7 +346,7 @@
[na popViewControllerAnimated:YES];
QXGlobal.shareGlobal.superRoomId = @"";
}else{
[[QXGlobal shareGlobal]quitRoomWithRoomId:self.roomModel.room_info.room_id];
[[QXGlobal shareGlobal]quitRoomWithRoomId:self.roomModel.room_info.room_id removeListener:YES];
// self.navigationController.interactivePopGestureRecognizer.enabled = YES;
[na popViewControllerAnimated:YES];
}

2
QXLive/Room(房间)/View/麦位视图/QXRoomSeatTypeFrientView.m
View File

@@ -1180,7 +1180,7 @@
if ([model.room_id isExist]) {
QXGlobal.shareGlobal.superRoomId = self.roomModel.room_info.room_id;
if ([model.user1_id isEqualToString:QXGlobal.shareGlobal.loginModel.user_id] || [model.user2_id isEqualToString:QXGlobal.shareGlobal.loginModel.user_id]) {
[[QXGlobal shareGlobal] quitRoomWithRoomId:self.roomModel.room_info.room_id];
[[QXGlobal shareGlobal] quitRoomWithRoomId:self.roomModel.room_info.room_id removeListener:YES];
[[QXGlobal shareGlobal] joinRoomWithRoomId:model.room_id isRejoin:NO navagationController:self.viewController.navigationController];
}
}

6
QXLive/Room(房间)/View/麦位视图/QXRoomSeatTypeNormalView.m
View File

@@ -74,7 +74,7 @@ static NSInteger maxSeat = 8;
for (int i = 0 ; i < maxSeat ; i++) {
QXRoomSeatContentView *contentView = [[QXRoomSeatContentView alloc] init];
contentView.number = i+1;
contentView.noOffLine = YES;
// contentView.noOffLine = YES;
// [contentView addTapBlock:^(id _Nonnull obj) {
// [weakSelf didClickSeatView:obj];
// }];
@@ -89,8 +89,8 @@ static NSInteger maxSeat = 8;
}
[self.seatArray addObject:self.compereView];
[self.seatArray addObject:self.guestView];
self.compereView.noOffLine = YES;
self.guestView.noOffLine = YES;
// self.compereView.noOffLine = YES;
// self.guestView.noOffLine = YES;
}
-(void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event{

11
QXLive/Room(房间)/View/麦位视图/QXRoomSeatTypeSingerView.m
View File

@@ -82,6 +82,7 @@
}];
self.bossView = [[QXRoomSeatContentView alloc] init];
self.bossView.noMicCycle = YES;
self.bossView.tagString = @"老板";
self.bossView.delegate = self;
self.bossView.number = 10;
@@ -259,6 +260,9 @@
[self.delegate didClickUserHeaderWithPitModel:seatView.pitModel userModel:nil isPkRoom:NO pkRoomId:@"" isNoTakeOff:NO];
}
}else{
if (seatView == self.singerView) {
return;
}
if (seatView.number == 9) {
/// 麦位没人时点9号麦直接请求上麦
[self upseatCompere];
@@ -391,10 +395,11 @@
if (toPitNumber == 9) {
self.compereView.contentView.hidden = NO;
self.compereView.contentViewNoBodyBtn.hidden = YES;
}else{
self.compereView.contentView.hidden = YES;
self.compereView.contentViewNoBodyBtn.hidden = NO;
}
// else{
// self.compereView.contentView.hidden = YES;
// self.compereView.contentViewNoBodyBtn.hidden = NO;
// }
NSString* tmpPitNum = [NSString stringWithFormat:@"%@",fromPitModel.pit_number];
fromPitModel.pit_number = totModel.pit_number;
totModel.pit_number = tmpPitNum;