yinmeng/yingmeng-ios-switf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复房间bug

Browse Source
This commit is contained in:
liyuhua
2024-03-13 20:49:51 +08:00
parent 9c8e892859
commit 7e663559c0
10 changed files with 33 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
yinmeng-ios.xcodeproj/project.pbxproj
View File

@@ -1401,7 +1401,7 @@
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = "yinmeng-ios/yinmeng-ios.entitlements"; CODE_SIGN_ENTITLEMENTS = "yinmeng-ios/yinmeng-ios.entitlements";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 14; CURRENT_PROJECT_VERSION = 1;
DEFINES_MODULE = YES; DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 48UCG35Q9W; DEVELOPMENT_TEAM = 48UCG35Q9W;
ENABLE_USER_SCRIPT_SANDBOXING = NO; ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -1423,7 +1423,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 1.0.0; MARKETING_VERSION = 1.0.3;
PRODUCT_BUNDLE_IDENTIFIER = "linyudan.yinmeng-ios"; PRODUCT_BUNDLE_IDENTIFIER = "linyudan.yinmeng-ios";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -1445,7 +1445,7 @@
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = "yinmeng-ios/yinmeng-ios.entitlements"; CODE_SIGN_ENTITLEMENTS = "yinmeng-ios/yinmeng-ios.entitlements";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 14; CURRENT_PROJECT_VERSION = 1;
DEFINES_MODULE = YES; DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 48UCG35Q9W; DEVELOPMENT_TEAM = 48UCG35Q9W;
ENABLE_USER_SCRIPT_SANDBOXING = NO; ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -1467,7 +1467,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 1.0.0; MARKETING_VERSION = 1.0.3;
PRODUCT_BUNDLE_IDENTIFIER = "linyudan.yinmeng-ios"; PRODUCT_BUNDLE_IDENTIFIER = "linyudan.yinmeng-ios";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";

1
yinmeng-ios/Modules/Room/Model/RoomDataModel.swift
View File

@@ -22,5 +22,6 @@ struct RoomDataModel : HandyJSON {
var avatar = "" var avatar = ""
var onlineNum:Int = 0 var onlineNum:Int = 0
var defUser = "" var defUser = ""
var type:Int = 3
} }

10
yinmeng-ios/Modules/Room/VC/RoomVC.swift
View File

@@ -131,7 +131,6 @@ class RoomVC: BaseViewController, HiddenNavigationBarProtocol {
} }
private func dealWithChatData(chatData:NIMChatroom){ private func dealWithChatData(chatData:NIMChatroom){
// self.roomInfo?.onlineNum = chatData.onlineUserCount
self.topView.roomData = self.roomInfo self.topView.roomData = self.roomInfo
self.micSeatView.roomData = self.roomInfo self.micSeatView.roomData = self.roomInfo
self.micSeatView.setTRTC() self.micSeatView.setTRTC()
@@ -145,7 +144,11 @@ class RoomVC: BaseViewController, HiddenNavigationBarProtocol {
if roomData.valid{ if roomData.valid{
UserViewModel.userVM.getUserInfo(uid: uid) UserViewModel.userVM.getUserInfo(uid: uid)
}else{ }else{
RoomVCViewModel.roomVM.openRoom(title: self.roomInfo?.title ?? "", type: 3, roomPwd: "", roomDesc: "", backPic: "") var text = self.roomInfo?.title
if self.roomInfo?.title.count == 0{
text = self.roomText
}
RoomVCViewModel.roomVM.openRoom(title: text ?? "", type: 3, roomPwd: "", roomDesc: "", backPic: "")
} }
} }
@objc func dissChatViewAction(){ @objc func dissChatViewAction(){
@@ -159,6 +162,7 @@ class RoomVC: BaseViewController, HiddenNavigationBarProtocol {
} }
var roomUid:String = "" var roomUid:String = ""
var roomText:String = ""
var roomInfo:RoomDataModel? var roomInfo:RoomDataModel?
//MARK: - 懒加载 //MARK: - 懒加载
private lazy var backgroundView:RoomBackgroundView = { private lazy var backgroundView:RoomBackgroundView = {
@@ -189,7 +193,7 @@ class RoomVC: BaseViewController, HiddenNavigationBarProtocol {
private lazy var bgChatView:UIButton = { private lazy var bgChatView:UIButton = {
let _bgChatView = UIButton() let _bgChatView = UIButton()
_bgChatView.addTarget(self, action: #selector(dissChatViewAction), for: .touchUpInside) _bgChatView.addTarget(self, action: #selector(dissChatViewAction), for: .touchUpInside)
_bgChatView.backgroundColor = UIColor.init(white: 0, alpha: 0.5)
return _bgChatView return _bgChatView
}() }()
private lazy var chatListVC:ChatListVC = { private lazy var chatListVC:ChatListVC = {

1
yinmeng-ios/Modules/Room/View/MicSeatView/View/MicSeatSuperView/NormalMicSeatSuperView.swift
View File

@@ -333,6 +333,7 @@ extension NormalMicSeatSuperView:UICollectionViewDelegate,UICollectionViewDataSo
} }
let params = ["uid":"\(AuthManager.userUid)","roomUid":roomUid] as [String : Any] let params = ["uid":"\(AuthManager.userUid)","roomUid":roomUid] as [String : Any]
RequestGet(path: "room/gift/value/get", parma: params) { data in RequestGet(path: "room/gift/value/get", parma: params) { data in
print(data)
if let info = Deserialized<MicSeatGiftValueModel>.toModel(with: data) { if let info = Deserialized<MicSeatGiftValueModel>.toModel(with: data) {
for model in info.giftValueVos{ for model in info.giftValueVos{
if var ownerUser = self.roomOwnerView.user{ if var ownerUser = self.roomOwnerView.user{

12
yinmeng-ios/Modules/Room/View/MicSeatView/View/MicSeatSuperView/SubView/NormalMicSeatView.swift
View File

@@ -58,11 +58,11 @@ class NormalMicSeatView: UIView {
nameStackView.addArrangedSubview(giftValueView) nameStackView.addArrangedSubview(giftValueView)
speakView.snp.makeConstraints { make in speakView.snp.makeConstraints { make in
make.width.height.equalTo(UIDevice.scaleWidth(width: 78)) make.width.height.equalTo(UIDevice.scaleWidth(width: 70))
make.center.equalTo(self.avatarView) make.center.equalTo(self.avatarView)
} }
avatarView.snp.makeConstraints { make in avatarView.snp.makeConstraints { make in
make.width.height.equalTo(UIDevice.scaleWidth(width: 58)) make.width.height.equalTo(UIDevice.scaleWidth(width: 50))
make.top.equalTo(UIDevice.scaleWidth(width: 5)) make.top.equalTo(UIDevice.scaleWidth(width: 5))
make.centerX.equalTo(self) make.centerX.equalTo(self)
} }
@@ -78,7 +78,7 @@ class NormalMicSeatView: UIView {
make.height.equalTo(UIDevice.scaleWidth(width: 16)) make.height.equalTo(UIDevice.scaleWidth(width: 16))
} }
avatarView.layer.cornerRadius = UIDevice.scaleWidth(width: 58) / 2 avatarView.layer.cornerRadius = UIDevice.scaleWidth(width: 50) / 2
genderView.isHidden = true genderView.isHidden = true
postionView.isHidden = true postionView.isHidden = true
@@ -102,12 +102,12 @@ class NormalMicSeatView: UIView {
nameStackView.addArrangedSubview(nameView) nameStackView.addArrangedSubview(nameView)
nameStackView.addArrangedSubview(genderView) nameStackView.addArrangedSubview(genderView)
speakView.snp.makeConstraints { make in speakView.snp.makeConstraints { make in
make.width.height.equalTo(UIDevice.scaleWidth(width: 75)) make.width.height.equalTo(UIDevice.scaleWidth(width: 70))
make.center.equalTo(self.avatarView) make.center.equalTo(self.avatarView)
} }
avatarView.snp.makeConstraints { make in avatarView.snp.makeConstraints { make in
make.top.equalTo(UIDevice.scaleWidth(width: 5)) make.top.equalTo(UIDevice.scaleWidth(width: 5))
make.width.height.equalTo(UIDevice.scaleWidth(width: 55)) make.width.height.equalTo(UIDevice.scaleWidth(width: 50))
make.centerX.equalTo(self) make.centerX.equalTo(self)
} }
nameStackView.snp.makeConstraints { make in nameStackView.snp.makeConstraints { make in
@@ -125,7 +125,7 @@ class NormalMicSeatView: UIView {
make.width.lessThanOrEqualTo(self) make.width.lessThanOrEqualTo(self)
} }
avatarView.layer.cornerRadius = UIDevice.scaleWidth(width: 55) / 2 avatarView.layer.cornerRadius = UIDevice.scaleWidth(width: 50) / 2
genderView.isHidden = true genderView.isHidden = true
postionView.isHidden = false postionView.isHidden = false
speakParser.parse(withNamed: "YinSpeak", in: Bundle.main) {[weak self] videoItem in speakParser.parse(withNamed: "YinSpeak", in: Bundle.main) {[weak self] videoItem in

2
yinmeng-ios/Modules/Room/View/RoomChatScreenView/View/RoomChatScreenUserChatCell.swift
View File

@@ -138,7 +138,7 @@ class RoomChatScreenUserChatCell: UITableViewCell {
}() }()
private lazy var textView:UILabel = { private lazy var textView:UILabel = {
let _textView = UILabel.getCustomLabel(text:"",font: UIFont.getScaleFont(ofSize: 12, weight: .regular),numberOfLines: 0) let _textView = UILabel.getCustomLabel( text:"",font: UIFont.getScaleFont(ofSize: 12, weight: .regular), color: .white,numberOfLines: 0)
_textView.isUserInteractionEnabled = true _textView.isUserInteractionEnabled = true
return _textView return _textView
}() }()

3
yinmeng-ios/Modules/Room/View/RoomChatScreenView/View/RoomChatScreenView.swift
View File

@@ -33,6 +33,7 @@ class RoomChatScreenView: UIView {
self.dealWithMsg(msg: msg ) self.dealWithMsg(msg: msg )
} }
self.chatTableView.reloadData() self.chatTableView.reloadData()
if self.msgList.count == 0 {return}
DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) { DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
self.chatTableView.scrollToRow(at: IndexPath(row:self.msgList.count - 1 , section:0 ), at: .bottom, animated: true) self.chatTableView.scrollToRow(at: IndexPath(row:self.msgList.count - 1 , section:0 ), at: .bottom, animated: true)
} }
@@ -42,7 +43,7 @@ class RoomChatScreenView: UIView {
func getTextMsg(msg:NIMMessage){ func getTextMsg(msg:NIMMessage){
dealWithMsg(msg: msg) dealWithMsg(msg: msg)
chatTableView.reloadData() chatTableView.reloadData()
if self.msgList.count == 0 {return}
DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) { DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
self.chatTableView.scrollToRow(at: IndexPath.init(row:self.msgList.count - 1 , section:0 ), at: .bottom, animated: true) self.chatTableView.scrollToRow(at: IndexPath.init(row:self.msgList.count - 1 , section:0 ), at: .bottom, animated: true)
} }

8
yinmeng-ios/Modules/Room/View/RoomMenuView/View/RoomMenuView.swift
View File

@@ -100,9 +100,12 @@ class RoomMenuView: UIView {
} }
if isHaveChange{
setBroadcast(isChange: isHaveChange) setBroadcast(isChange: isHaveChange)
} }
}
break break
default: default:
break break
@@ -160,4 +163,9 @@ class RoomMenuView: UIView {
_micBtn.isHidden = true _micBtn.isHidden = true
return _micBtn return _micBtn
}() }()
// private lazy var sendGiftBtn :UIButton = {
// let _sendGiftBtn = UIButton()
// _sendGiftBtn.setImage(UIImage(named: room_send_gift_icon), for: .normal)
// return _sendGiftBtn
// }()
} }

2
yinmeng-ios/Modules/Star/PlanetStarVC.swift
View File

@@ -23,7 +23,7 @@ class PlanetStarVC: BaseViewController,HiddenNavigationBarProtocol {
func requestData(){ func requestData(){
RequestGet(path: "home/recommendUsers", parma: ["pageNum":"\(self.page)","pageSize":"30"]) { data in RequestGet(path: "home/recommendUsers", parma: ["pageNum":"\(self.page)","pageSize":"60"]) { data in
if let list = Deserialized<PlanetStarModel>.toArray(with: data) { if let list = Deserialized<PlanetStarModel>.toArray(with: data) {
var dataList:[PlanetStarModel] = [] var dataList:[PlanetStarModel] = []
guard list.isEmpty else { guard list.isEmpty else {

1
yinmeng-ios/Modules/User/VC/UserInfoVC.swift
View File

@@ -183,6 +183,7 @@ extension UserInfoVC: UserFunctionViewProtocol{
case .myRoom: case .myRoom:
let vc = RoomVC(roomUid: "\(AuthManager.userUid)") let vc = RoomVC(roomUid: "\(AuthManager.userUid)")
vc.roomText = (self.info?.nick ?? "") + "的房间"
let nav = BaseNavigationViewController.init(rootViewController: vc) let nav = BaseNavigationViewController.init(rootViewController: vc)
nav.modalPresentationStyle = .fullScreen nav.modalPresentationStyle = .fullScreen
self.present(nav, animated: true, completion: nil) self.present(nav, animated: true, completion: nil)