diff --git a/yinmeng-ios/Podfile.lock b/yinmeng-ios/Podfile.lock index 01f05a0..f380380 100644 --- a/yinmeng-ios/Podfile.lock +++ b/yinmeng-ios/Podfile.lock @@ -156,4 +156,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: cc88fa05da662ee682fc0eeb502faab221faa032 -COCOAPODS: 1.12.1 +COCOAPODS: 1.14.2 diff --git a/yinmeng-ios/yinmeng-ios.xcodeproj/project.pbxproj b/yinmeng-ios/yinmeng-ios.xcodeproj/project.pbxproj index 0b05151..612835b 100644 --- a/yinmeng-ios/yinmeng-ios.xcodeproj/project.pbxproj +++ b/yinmeng-ios/yinmeng-ios.xcodeproj/project.pbxproj @@ -54,13 +54,12 @@ 8C4D535C2AFD4CF700238AE6 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8C4D535B2AFD4CF700238AE6 /* Assets.xcassets */; }; 8C4D535F2AFD4CF700238AE6 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8C4D535D2AFD4CF700238AE6 /* LaunchScreen.storyboard */; }; 8C4D53622AFD4CF700238AE6 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C4D53612AFD4CF700238AE6 /* main.m */; }; - 8C92A8042B0EED72008F362C /* LoginBindPhoneResultViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C92A8032B0EED72008F362C /* LoginBindPhoneResultViewController.m */; }; - 8C92A8072B0EEDD0008F362C /* LoginVerifBindPhoneViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C92A8062B0EEDD0008F362C /* LoginVerifBindPhoneViewController.m */; }; - 8C92A80B2B0EEE73008F362C /* LoginVerifBindPhonePresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C92A80A2B0EEE73008F362C /* LoginVerifBindPhonePresenter.m */; }; - 8C92A80E2B0EEF3A008F362C /* LoginBindPhoneViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C92A80D2B0EEF3A008F362C /* LoginBindPhoneViewController.m */; }; - 8C92A8112B0EEFAE008F362C /* LoginBindPhonePresent.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C92A8102B0EEFAE008F362C /* LoginBindPhonePresent.m */; }; - 8C92A8142B0EF1D8008F362C /* MineLoginPasswordViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C92A8132B0EF1D8008F362C /* MineLoginPasswordViewController.m */; }; - 8C92A8182B0EF3E9008F362C /* MineModifPayPwdView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C92A8172B0EF3E9008F362C /* MineModifPayPwdView.m */; }; + 8C92A8072B0EEDD0008F362C /* MewLoginVerifBindPhoneViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C92A8062B0EEDD0008F362C /* MewLoginVerifBindPhoneViewController.m */; }; + 8C92A80B2B0EEE73008F362C /* MewLoginVerifBindPhonePresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C92A80A2B0EEE73008F362C /* MewLoginVerifBindPhonePresenter.m */; }; + 8C92A80E2B0EEF3A008F362C /* MewLoginBindPhoneViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C92A80D2B0EEF3A008F362C /* MewLoginBindPhoneViewController.m */; }; + 8C92A8112B0EEFAE008F362C /* MewLoginBindPhonePresent.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C92A8102B0EEFAE008F362C /* MewLoginBindPhonePresent.m */; }; + 8C92A8142B0EF1D8008F362C /* MewMineLoginPasswordViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C92A8132B0EF1D8008F362C /* MewMineLoginPasswordViewController.m */; }; + 8C92A8182B0EF3E9008F362C /* MewMineModifPayPwdView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C92A8172B0EF3E9008F362C /* MewMineModifPayPwdView.m */; }; 8C92A81C2B0EF449008F362C /* UIButton+EnlargeTouchArea.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C92A81B2B0EF449008F362C /* UIButton+EnlargeTouchArea.m */; }; 8C92A81F2B0EF4D2008F362C /* MineLoginPasswordPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C92A81E2B0EF4D2008F362C /* MineLoginPasswordPresenter.m */; }; 8C92A8232B0FE1DC008F362C /* MewHtmlUrl.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C92A8222B0FE1DC008F362C /* MewHtmlUrl.m */; }; @@ -115,35 +114,35 @@ 8C9C842A2B0C697A00A601BC /* Api+Room.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83212B0C697A00A601BC /* Api+Room.m */; }; 8C9C84302B0C697A00A601BC /* MewSessionListTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83342B0C697A00A601BC /* MewSessionListTableViewCell.m */; }; 8C9C84312B0C697A00A601BC /* MewSessionListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83352B0C697A00A601BC /* MewSessionListViewController.m */; }; - 8C9C843A2B0C697A00A601BC /* BaseRtcImpl.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83502B0C697A00A601BC /* BaseRtcImpl.m */; }; - 8C9C843B2B0C697A00A601BC /* TRTCRtcImpl.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83512B0C697A00A601BC /* TRTCRtcImpl.m */; }; - 8C9C843C2B0C697A00A601BC /* RtcManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83552B0C697A00A601BC /* RtcManager.m */; }; - 8C9C843D2B0C697A00A601BC /* YMMineCollectRoomPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C835A2B0C697A00A601BC /* YMMineCollectRoomPresenter.m */; }; - 8C9C843E2B0C697A00A601BC /* YMMineSettingPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C835B2B0C697A00A601BC /* YMMineSettingPresenter.m */; }; - 8C9C843F2B0C697A00A601BC /* FansInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83642B0C697A00A601BC /* FansInfoModel.m */; }; - 8C9C84402B0C697A00A601BC /* YMMineSettingItemModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83652B0C697A00A601BC /* YMMineSettingItemModel.m */; }; - 8C9C84412B0C697A00A601BC /* MineCollectRoomModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83662B0C697A00A601BC /* MineCollectRoomModel.m */; }; - 8C9C84422B0C697A00A601BC /* RechargeListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C836A2B0C697A00A601BC /* RechargeListModel.m */; }; - 8C9C84432B0C697A00A601BC /* WalletInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C836B2B0C697A00A601BC /* WalletInfoModel.m */; }; - 8C9C84442B0C697A00A601BC /* YMMineCollectRoomCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83722B0C697A00A601BC /* YMMineCollectRoomCell.m */; }; - 8C9C84452B0C697A00A601BC /* YMMineCollectRoomViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83742B0C697A00A601BC /* YMMineCollectRoomViewController.m */; }; - 8C9C84462B0C697A00A601BC /* YMMineSettingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83772B0C697A00A601BC /* YMMineSettingViewController.m */; }; + 8C9C843A2B0C697A00A601BC /* MewBaseRtcImpl.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83502B0C697A00A601BC /* MewBaseRtcImpl.m */; }; + 8C9C843B2B0C697A00A601BC /* MewTRTCRtcImpl.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83512B0C697A00A601BC /* MewTRTCRtcImpl.m */; }; + 8C9C843C2B0C697A00A601BC /* MewRtcManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83552B0C697A00A601BC /* MewRtcManager.m */; }; + 8C9C843D2B0C697A00A601BC /* MewMineCollectRoomPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C835A2B0C697A00A601BC /* MewMineCollectRoomPresenter.m */; }; + 8C9C843E2B0C697A00A601BC /* MewMineSettingPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C835B2B0C697A00A601BC /* MewMineSettingPresenter.m */; }; + 8C9C843F2B0C697A00A601BC /* MewFansInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83642B0C697A00A601BC /* MewFansInfoModel.m */; }; + 8C9C84402B0C697A00A601BC /* MewMineSettingItemModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83652B0C697A00A601BC /* MewMineSettingItemModel.m */; }; + 8C9C84412B0C697A00A601BC /* MewMineCollectRoomModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83662B0C697A00A601BC /* MewMineCollectRoomModel.m */; }; + 8C9C84422B0C697A00A601BC /* MewRechargeListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C836A2B0C697A00A601BC /* MewRechargeListModel.m */; }; + 8C9C84432B0C697A00A601BC /* MewWalletInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C836B2B0C697A00A601BC /* MewWalletInfoModel.m */; }; + 8C9C84442B0C697A00A601BC /* MewMineCollectRoomCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83722B0C697A00A601BC /* MewMineCollectRoomCell.m */; }; + 8C9C84452B0C697A00A601BC /* MewMineCollectRoomViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83742B0C697A00A601BC /* MewMineCollectRoomViewController.m */; }; + 8C9C84462B0C697A00A601BC /* MewMineSettingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83772B0C697A00A601BC /* MewMineSettingViewController.m */; }; 8C9C84472B0C697A00A601BC /* MewMineCollectionTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C837A2B0C697A00A601BC /* MewMineCollectionTableViewCell.m */; }; - 8C9C84482B0C697A00A601BC /* YMMineSettingTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C837B2B0C697A00A601BC /* YMMineSettingTableViewCell.m */; }; - 8C9C84492B0C697A00A601BC /* YMMineAboutUsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C837E2B0C697A00A601BC /* YMMineAboutUsViewController.m */; }; + 8C9C84482B0C697A00A601BC /* MewMineSettingTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C837B2B0C697A00A601BC /* MewMineSettingTableViewCell.m */; }; + 8C9C84492B0C697A00A601BC /* MewMineAboutUsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C837E2B0C697A00A601BC /* MewMineAboutUsViewController.m */; }; 8C9C844A2B0C697A00A601BC /* Api+Mine.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83802B0C697A00A601BC /* Api+Mine.m */; }; - 8C9C844B2B0C697A00A601BC /* AttachmentModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83852B0C697A00A601BC /* AttachmentModel.m */; }; - 8C9C844C2B0C697A00A601BC /* CustomAttachmentDecoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83882B0C697A00A601BC /* CustomAttachmentDecoder.m */; }; - 8C9C844D2B0C697A00A601BC /* LoginForgetPasswordPresent.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C838B2B0C697A00A601BC /* LoginForgetPasswordPresent.m */; }; - 8C9C844E2B0C697A00A601BC /* LoginPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C838F2B0C697A00A601BC /* LoginPresenter.m */; }; - 8C9C844F2B0C697A00A601BC /* LoginFullInfoPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83912B0C697A00A601BC /* LoginFullInfoPresenter.m */; }; - 8C9C84502B0C697A00A601BC /* LoginVerifCodePresent.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83922B0C697A00A601BC /* LoginVerifCodePresent.m */; }; - 8C9C84512B0C697A00A601BC /* LoginPasswordPresent.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83942B0C697A00A601BC /* LoginPasswordPresent.m */; }; - 8C9C84522B0C697A00A601BC /* ThirdUserInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C839D2B0C697A00A601BC /* ThirdUserInfo.m */; }; - 8C9C84532B0C697A00A601BC /* LoginForgetPasswordViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C839F2B0C697A00A601BC /* LoginForgetPasswordViewController.m */; }; - 8C9C84542B0C697A00A601BC /* LoginInputView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83A32B0C697A00A601BC /* LoginInputView.m */; }; - 8C9C84552B0C697A00A601BC /* LoginForgetEditView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83A62B0C697A00A601BC /* LoginForgetEditView.m */; }; - 8C9C84562B0C697A00A601BC /* LoginFullInfoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83A72B0C697A00A601BC /* LoginFullInfoViewController.m */; }; + 8C9C844B2B0C697A00A601BC /* MewAttachmentModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83852B0C697A00A601BC /* MewAttachmentModel.m */; }; + 8C9C844C2B0C697A00A601BC /* MewCustomAttachmentDecoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83882B0C697A00A601BC /* MewCustomAttachmentDecoder.m */; }; + 8C9C844D2B0C697A00A601BC /* MewLoginForgetPasswordPresent.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C838B2B0C697A00A601BC /* MewLoginForgetPasswordPresent.m */; }; + 8C9C844E2B0C697A00A601BC /* MewLoginPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C838F2B0C697A00A601BC /* MewLoginPresenter.m */; }; + 8C9C844F2B0C697A00A601BC /* MewLoginFullInfoPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83912B0C697A00A601BC /* MewLoginFullInfoPresenter.m */; }; + 8C9C84502B0C697A00A601BC /* MewLoginVerifCodePresent.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83922B0C697A00A601BC /* MewLoginVerifCodePresent.m */; }; + 8C9C84512B0C697A00A601BC /* MewLoginPasswordPresent.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83942B0C697A00A601BC /* MewLoginPasswordPresent.m */; }; + 8C9C84522B0C697A00A601BC /* MewThirdUserInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C839D2B0C697A00A601BC /* MewThirdUserInfo.m */; }; + 8C9C84532B0C697A00A601BC /* MewLoginForgetPasswordViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C839F2B0C697A00A601BC /* MewLoginForgetPasswordViewController.m */; }; + 8C9C84542B0C697A00A601BC /* MewLoginInputView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83A32B0C697A00A601BC /* MewLoginInputView.m */; }; + 8C9C84552B0C697A00A601BC /* MewLoginForgetEditView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83A62B0C697A00A601BC /* MewLoginForgetEditView.m */; }; + 8C9C84562B0C697A00A601BC /* MewLoginFullInfoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83A72B0C697A00A601BC /* MewLoginFullInfoViewController.m */; }; 8C9C84572B0C697A00A601BC /* Api+Login.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83AA2B0C697A00A601BC /* Api+Login.m */; }; 8C9C84582B0C697A00A601BC /* MainPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83AE2B0C697A00A601BC /* MainPresenter.m */; }; 8C9C84592B0C697A00A601BC /* TabbarViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83B42B0C697A00A601BC /* TabbarViewController.m */; }; @@ -190,7 +189,7 @@ 8C9C84AD2B0D9AB900A601BC /* MewRoomMessageHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C84AC2B0D9AB900A601BC /* MewRoomMessageHeaderView.m */; }; 8C9C84B12B0DEAE100A601BC /* YMIButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C84B02B0DEAE100A601BC /* YMIButton.m */; }; 8C9C84B42B0E951200A601BC /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8C9C84B32B0E951200A601BC /* StoreKit.framework */; }; - 8C9C84BA2B0ECD2100A601BC /* MineRechargePresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C84B92B0ECD2100A601BC /* MineRechargePresenter.m */; }; + 8C9C84BA2B0ECD2100A601BC /* MewMineRechargePresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C84B92B0ECD2100A601BC /* MewMineRechargePresenter.m */; }; 8CAB96F52B1AB15200ED8639 /* MewRoomAnimationGroup.m in Sources */ = {isa = PBXBuildFile; fileRef = 8CAB96F42B1AB15200ED8639 /* MewRoomAnimationGroup.m */; }; 8CAB97012B1FE16000ED8639 /* UITableView+NIMScrollToBottom.m in Sources */ = {isa = PBXBuildFile; fileRef = 8CAB97002B1FE16000ED8639 /* UITableView+NIMScrollToBottom.m */; }; FFDAAB800AD6BB4653B4427F /* Pods_yinmeng_ios.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1797344FB85F47F60D0CC2A0 /* Pods_yinmeng_ios.framework */; }; @@ -291,21 +290,19 @@ 8C4D535E2AFD4CF700238AE6 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 8C4D53602AFD4CF700238AE6 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 8C4D53612AFD4CF700238AE6 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; - 8C92A8022B0EED72008F362C /* LoginBindPhoneResultViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LoginBindPhoneResultViewController.h; sourceTree = ""; }; - 8C92A8032B0EED72008F362C /* LoginBindPhoneResultViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LoginBindPhoneResultViewController.m; sourceTree = ""; }; - 8C92A8052B0EEDD0008F362C /* LoginVerifBindPhoneViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LoginVerifBindPhoneViewController.h; sourceTree = ""; }; - 8C92A8062B0EEDD0008F362C /* LoginVerifBindPhoneViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LoginVerifBindPhoneViewController.m; sourceTree = ""; }; - 8C92A8082B0EEE3C008F362C /* LoginVerifBindPhoneProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LoginVerifBindPhoneProtocol.h; sourceTree = ""; }; - 8C92A8092B0EEE73008F362C /* LoginVerifBindPhonePresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LoginVerifBindPhonePresenter.h; sourceTree = ""; }; - 8C92A80A2B0EEE73008F362C /* LoginVerifBindPhonePresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LoginVerifBindPhonePresenter.m; sourceTree = ""; }; - 8C92A80C2B0EEF3A008F362C /* LoginBindPhoneViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LoginBindPhoneViewController.h; sourceTree = ""; }; - 8C92A80D2B0EEF3A008F362C /* LoginBindPhoneViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LoginBindPhoneViewController.m; sourceTree = ""; }; - 8C92A80F2B0EEFAE008F362C /* LoginBindPhonePresent.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LoginBindPhonePresent.h; sourceTree = ""; }; - 8C92A8102B0EEFAE008F362C /* LoginBindPhonePresent.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LoginBindPhonePresent.m; sourceTree = ""; }; - 8C92A8122B0EF1D8008F362C /* MineLoginPasswordViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MineLoginPasswordViewController.h; sourceTree = ""; }; - 8C92A8132B0EF1D8008F362C /* MineLoginPasswordViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MineLoginPasswordViewController.m; sourceTree = ""; }; - 8C92A8162B0EF3E9008F362C /* MineModifPayPwdView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MineModifPayPwdView.h; sourceTree = ""; }; - 8C92A8172B0EF3E9008F362C /* MineModifPayPwdView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MineModifPayPwdView.m; sourceTree = ""; }; + 8C92A8052B0EEDD0008F362C /* MewLoginVerifBindPhoneViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MewLoginVerifBindPhoneViewController.h; sourceTree = ""; }; + 8C92A8062B0EEDD0008F362C /* MewLoginVerifBindPhoneViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MewLoginVerifBindPhoneViewController.m; sourceTree = ""; }; + 8C92A8082B0EEE3C008F362C /* MewLoginVerifBindPhoneProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MewLoginVerifBindPhoneProtocol.h; sourceTree = ""; }; + 8C92A8092B0EEE73008F362C /* MewLoginVerifBindPhonePresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MewLoginVerifBindPhonePresenter.h; sourceTree = ""; }; + 8C92A80A2B0EEE73008F362C /* MewLoginVerifBindPhonePresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MewLoginVerifBindPhonePresenter.m; sourceTree = ""; }; + 8C92A80C2B0EEF3A008F362C /* MewLoginBindPhoneViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MewLoginBindPhoneViewController.h; sourceTree = ""; }; + 8C92A80D2B0EEF3A008F362C /* MewLoginBindPhoneViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MewLoginBindPhoneViewController.m; sourceTree = ""; }; + 8C92A80F2B0EEFAE008F362C /* MewLoginBindPhonePresent.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MewLoginBindPhonePresent.h; sourceTree = ""; }; + 8C92A8102B0EEFAE008F362C /* MewLoginBindPhonePresent.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MewLoginBindPhonePresent.m; sourceTree = ""; }; + 8C92A8122B0EF1D8008F362C /* MewMineLoginPasswordViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MewMineLoginPasswordViewController.h; sourceTree = ""; }; + 8C92A8132B0EF1D8008F362C /* MewMineLoginPasswordViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MewMineLoginPasswordViewController.m; sourceTree = ""; }; + 8C92A8162B0EF3E9008F362C /* MewMineModifPayPwdView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MewMineModifPayPwdView.h; sourceTree = ""; }; + 8C92A8172B0EF3E9008F362C /* MewMineModifPayPwdView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MewMineModifPayPwdView.m; sourceTree = ""; }; 8C92A81A2B0EF449008F362C /* UIButton+EnlargeTouchArea.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIButton+EnlargeTouchArea.h"; sourceTree = ""; }; 8C92A81B2B0EF449008F362C /* UIButton+EnlargeTouchArea.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIButton+EnlargeTouchArea.m"; sourceTree = ""; }; 8C92A81D2B0EF4D2008F362C /* MineLoginPasswordPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MineLoginPasswordPresenter.h; sourceTree = ""; }; @@ -428,74 +425,74 @@ 8C9C83352B0C697A00A601BC /* MewSessionListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewSessionListViewController.m; sourceTree = ""; }; 8C9C83362B0C697A00A601BC /* MewSessionListTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewSessionListTableViewCell.h; sourceTree = ""; }; 8C9C83372B0C697A00A601BC /* MewSessionListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewSessionListViewController.h; sourceTree = ""; }; - 8C9C834F2B0C697A00A601BC /* RtcInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RtcInterface.h; sourceTree = ""; }; - 8C9C83502B0C697A00A601BC /* BaseRtcImpl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BaseRtcImpl.m; sourceTree = ""; }; - 8C9C83512B0C697A00A601BC /* TRTCRtcImpl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TRTCRtcImpl.m; sourceTree = ""; }; - 8C9C83522B0C697A00A601BC /* RtcImplDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RtcImplDelegate.h; sourceTree = ""; }; - 8C9C83532B0C697A00A601BC /* TRTCRtcImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TRTCRtcImpl.h; sourceTree = ""; }; - 8C9C83542B0C697A00A601BC /* BaseRtcImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BaseRtcImpl.h; sourceTree = ""; }; - 8C9C83552B0C697A00A601BC /* RtcManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RtcManager.m; sourceTree = ""; }; - 8C9C83562B0C697A00A601BC /* RtcDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RtcDelegate.h; sourceTree = ""; }; - 8C9C83572B0C697A00A601BC /* RtcManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RtcManager.h; sourceTree = ""; }; - 8C9C835A2B0C697A00A601BC /* YMMineCollectRoomPresenter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YMMineCollectRoomPresenter.m; sourceTree = ""; }; - 8C9C835B2B0C697A00A601BC /* YMMineSettingPresenter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YMMineSettingPresenter.m; sourceTree = ""; }; - 8C9C835C2B0C697A00A601BC /* YMMineSettingPresenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YMMineSettingPresenter.h; sourceTree = ""; }; - 8C9C835D2B0C697A00A601BC /* YMMineCollectRoomPresenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YMMineCollectRoomPresenter.h; sourceTree = ""; }; - 8C9C835F2B0C697A00A601BC /* YMMineSettingProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YMMineSettingProtocol.h; sourceTree = ""; }; - 8C9C83602B0C697A00A601BC /* YMMineCollectRoomProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YMMineCollectRoomProtocol.h; sourceTree = ""; }; - 8C9C83632B0C697A00A601BC /* FansInfoModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FansInfoModel.h; sourceTree = ""; }; - 8C9C83642B0C697A00A601BC /* FansInfoModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FansInfoModel.m; sourceTree = ""; }; - 8C9C83652B0C697A00A601BC /* YMMineSettingItemModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YMMineSettingItemModel.m; sourceTree = ""; }; - 8C9C83662B0C697A00A601BC /* MineCollectRoomModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MineCollectRoomModel.m; sourceTree = ""; }; - 8C9C83682B0C697A00A601BC /* RechargeListModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RechargeListModel.h; sourceTree = ""; }; - 8C9C83692B0C697A00A601BC /* WalletInfoModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WalletInfoModel.h; sourceTree = ""; }; - 8C9C836A2B0C697A00A601BC /* RechargeListModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RechargeListModel.m; sourceTree = ""; }; - 8C9C836B2B0C697A00A601BC /* WalletInfoModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WalletInfoModel.m; sourceTree = ""; }; - 8C9C836C2B0C697A00A601BC /* YMMineSettingItemModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YMMineSettingItemModel.h; sourceTree = ""; }; - 8C9C836D2B0C697A00A601BC /* MineCollectRoomModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MineCollectRoomModel.h; sourceTree = ""; }; - 8C9C83702B0C697A00A601BC /* YMMineCollectRoomViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YMMineCollectRoomViewController.h; sourceTree = ""; }; - 8C9C83722B0C697A00A601BC /* YMMineCollectRoomCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YMMineCollectRoomCell.m; sourceTree = ""; }; - 8C9C83732B0C697A00A601BC /* YMMineCollectRoomCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YMMineCollectRoomCell.h; sourceTree = ""; }; - 8C9C83742B0C697A00A601BC /* YMMineCollectRoomViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YMMineCollectRoomViewController.m; sourceTree = ""; }; - 8C9C83762B0C697A00A601BC /* YMMineAboutUsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YMMineAboutUsViewController.h; sourceTree = ""; }; - 8C9C83772B0C697A00A601BC /* YMMineSettingViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YMMineSettingViewController.m; sourceTree = ""; }; - 8C9C83792B0C697A00A601BC /* YMMineSettingTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YMMineSettingTableViewCell.h; sourceTree = ""; }; + 8C9C834F2B0C697A00A601BC /* MewRtcInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewRtcInterface.h; sourceTree = ""; }; + 8C9C83502B0C697A00A601BC /* MewBaseRtcImpl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewBaseRtcImpl.m; sourceTree = ""; }; + 8C9C83512B0C697A00A601BC /* MewTRTCRtcImpl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewTRTCRtcImpl.m; sourceTree = ""; }; + 8C9C83522B0C697A00A601BC /* MewRtcImplDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewRtcImplDelegate.h; sourceTree = ""; }; + 8C9C83532B0C697A00A601BC /* MewTRTCRtcImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewTRTCRtcImpl.h; sourceTree = ""; }; + 8C9C83542B0C697A00A601BC /* MewBaseRtcImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewBaseRtcImpl.h; sourceTree = ""; }; + 8C9C83552B0C697A00A601BC /* MewRtcManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewRtcManager.m; sourceTree = ""; }; + 8C9C83562B0C697A00A601BC /* MewRtcDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewRtcDelegate.h; sourceTree = ""; }; + 8C9C83572B0C697A00A601BC /* MewRtcManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewRtcManager.h; sourceTree = ""; }; + 8C9C835A2B0C697A00A601BC /* MewMineCollectRoomPresenter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewMineCollectRoomPresenter.m; sourceTree = ""; }; + 8C9C835B2B0C697A00A601BC /* MewMineSettingPresenter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewMineSettingPresenter.m; sourceTree = ""; }; + 8C9C835C2B0C697A00A601BC /* MewMineSettingPresenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewMineSettingPresenter.h; sourceTree = ""; }; + 8C9C835D2B0C697A00A601BC /* MewMineCollectRoomPresenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewMineCollectRoomPresenter.h; sourceTree = ""; }; + 8C9C835F2B0C697A00A601BC /* MewMineSettingProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewMineSettingProtocol.h; sourceTree = ""; }; + 8C9C83602B0C697A00A601BC /* MewMineCollectRoomProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewMineCollectRoomProtocol.h; sourceTree = ""; }; + 8C9C83632B0C697A00A601BC /* MewFansInfoModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewFansInfoModel.h; sourceTree = ""; }; + 8C9C83642B0C697A00A601BC /* MewFansInfoModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewFansInfoModel.m; sourceTree = ""; }; + 8C9C83652B0C697A00A601BC /* MewMineSettingItemModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewMineSettingItemModel.m; sourceTree = ""; }; + 8C9C83662B0C697A00A601BC /* MewMineCollectRoomModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewMineCollectRoomModel.m; sourceTree = ""; }; + 8C9C83682B0C697A00A601BC /* MewRechargeListModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewRechargeListModel.h; sourceTree = ""; }; + 8C9C83692B0C697A00A601BC /* MewWalletInfoModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewWalletInfoModel.h; sourceTree = ""; }; + 8C9C836A2B0C697A00A601BC /* MewRechargeListModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewRechargeListModel.m; sourceTree = ""; }; + 8C9C836B2B0C697A00A601BC /* MewWalletInfoModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewWalletInfoModel.m; sourceTree = ""; }; + 8C9C836C2B0C697A00A601BC /* MewMineSettingItemModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewMineSettingItemModel.h; sourceTree = ""; }; + 8C9C836D2B0C697A00A601BC /* MewMineCollectRoomModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewMineCollectRoomModel.h; sourceTree = ""; }; + 8C9C83702B0C697A00A601BC /* MewMineCollectRoomViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewMineCollectRoomViewController.h; sourceTree = ""; }; + 8C9C83722B0C697A00A601BC /* MewMineCollectRoomCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewMineCollectRoomCell.m; sourceTree = ""; }; + 8C9C83732B0C697A00A601BC /* MewMineCollectRoomCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewMineCollectRoomCell.h; sourceTree = ""; }; + 8C9C83742B0C697A00A601BC /* MewMineCollectRoomViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewMineCollectRoomViewController.m; sourceTree = ""; }; + 8C9C83762B0C697A00A601BC /* MewMineAboutUsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewMineAboutUsViewController.h; sourceTree = ""; }; + 8C9C83772B0C697A00A601BC /* MewMineSettingViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewMineSettingViewController.m; sourceTree = ""; }; + 8C9C83792B0C697A00A601BC /* MewMineSettingTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewMineSettingTableViewCell.h; sourceTree = ""; }; 8C9C837A2B0C697A00A601BC /* MewMineCollectionTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewMineCollectionTableViewCell.m; sourceTree = ""; }; - 8C9C837B2B0C697A00A601BC /* YMMineSettingTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YMMineSettingTableViewCell.m; sourceTree = ""; }; + 8C9C837B2B0C697A00A601BC /* MewMineSettingTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewMineSettingTableViewCell.m; sourceTree = ""; }; 8C9C837C2B0C697A00A601BC /* MewMineCollectionTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewMineCollectionTableViewCell.h; sourceTree = ""; }; - 8C9C837D2B0C697A00A601BC /* YMMineSettingViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YMMineSettingViewController.h; sourceTree = ""; }; - 8C9C837E2B0C697A00A601BC /* YMMineAboutUsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YMMineAboutUsViewController.m; sourceTree = ""; }; + 8C9C837D2B0C697A00A601BC /* MewMineSettingViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewMineSettingViewController.h; sourceTree = ""; }; + 8C9C837E2B0C697A00A601BC /* MewMineAboutUsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewMineAboutUsViewController.m; sourceTree = ""; }; 8C9C83802B0C697A00A601BC /* Api+Mine.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "Api+Mine.m"; sourceTree = ""; }; 8C9C83812B0C697A00A601BC /* Api+Mine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Api+Mine.h"; sourceTree = ""; }; - 8C9C83842B0C697A00A601BC /* AttachmentModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AttachmentModel.h; sourceTree = ""; }; - 8C9C83852B0C697A00A601BC /* AttachmentModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AttachmentModel.m; sourceTree = ""; }; - 8C9C83872B0C697A00A601BC /* CustomAttachmentDecoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomAttachmentDecoder.h; sourceTree = ""; }; - 8C9C83882B0C697A00A601BC /* CustomAttachmentDecoder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CustomAttachmentDecoder.m; sourceTree = ""; }; - 8C9C838B2B0C697A00A601BC /* LoginForgetPasswordPresent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LoginForgetPasswordPresent.m; sourceTree = ""; }; - 8C9C838C2B0C697A00A601BC /* LoginFullInfoPresenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginFullInfoPresenter.h; sourceTree = ""; }; - 8C9C838D2B0C697A00A601BC /* LoginVerifCodePresent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginVerifCodePresent.h; sourceTree = ""; }; - 8C9C838E2B0C697A00A601BC /* LoginPasswordPresent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginPasswordPresent.h; sourceTree = ""; }; - 8C9C838F2B0C697A00A601BC /* LoginPresenter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LoginPresenter.m; sourceTree = ""; }; - 8C9C83902B0C697A00A601BC /* LoginForgetPasswordPresent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginForgetPasswordPresent.h; sourceTree = ""; }; - 8C9C83912B0C697A00A601BC /* LoginFullInfoPresenter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LoginFullInfoPresenter.m; sourceTree = ""; }; - 8C9C83922B0C697A00A601BC /* LoginVerifCodePresent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LoginVerifCodePresent.m; sourceTree = ""; }; - 8C9C83932B0C697A00A601BC /* LoginPresenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginPresenter.h; sourceTree = ""; }; - 8C9C83942B0C697A00A601BC /* LoginPasswordPresent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LoginPasswordPresent.m; sourceTree = ""; }; - 8C9C83962B0C697A00A601BC /* LoginForgetPasswordProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginForgetPasswordProtocol.h; sourceTree = ""; }; - 8C9C83972B0C697A00A601BC /* LoginProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginProtocol.h; sourceTree = ""; }; - 8C9C83982B0C697A00A601BC /* LoginPasswordProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginPasswordProtocol.h; sourceTree = ""; }; - 8C9C83992B0C697A00A601BC /* LoginFullInfoProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginFullInfoProtocol.h; sourceTree = ""; }; - 8C9C839A2B0C697A00A601BC /* LoginVerifCodeProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginVerifCodeProtocol.h; sourceTree = ""; }; - 8C9C839C2B0C697A00A601BC /* ThirdUserInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThirdUserInfo.h; sourceTree = ""; }; - 8C9C839D2B0C697A00A601BC /* ThirdUserInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ThirdUserInfo.m; sourceTree = ""; }; - 8C9C839F2B0C697A00A601BC /* LoginForgetPasswordViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LoginForgetPasswordViewController.m; sourceTree = ""; }; - 8C9C83A02B0C697A00A601BC /* LoginFullInfoViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginFullInfoViewController.h; sourceTree = ""; }; - 8C9C83A12B0C697A00A601BC /* LoginForgetPasswordViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginForgetPasswordViewController.h; sourceTree = ""; }; - 8C9C83A32B0C697A00A601BC /* LoginInputView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LoginInputView.m; sourceTree = ""; }; - 8C9C83A42B0C697A00A601BC /* LoginForgetEditView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginForgetEditView.h; sourceTree = ""; }; - 8C9C83A52B0C697A00A601BC /* LoginInputView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginInputView.h; sourceTree = ""; }; - 8C9C83A62B0C697A00A601BC /* LoginForgetEditView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LoginForgetEditView.m; sourceTree = ""; }; - 8C9C83A72B0C697A00A601BC /* LoginFullInfoViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LoginFullInfoViewController.m; sourceTree = ""; }; + 8C9C83842B0C697A00A601BC /* MewAttachmentModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewAttachmentModel.h; sourceTree = ""; }; + 8C9C83852B0C697A00A601BC /* MewAttachmentModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewAttachmentModel.m; sourceTree = ""; }; + 8C9C83872B0C697A00A601BC /* MewCustomAttachmentDecoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewCustomAttachmentDecoder.h; sourceTree = ""; }; + 8C9C83882B0C697A00A601BC /* MewCustomAttachmentDecoder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewCustomAttachmentDecoder.m; sourceTree = ""; }; + 8C9C838B2B0C697A00A601BC /* MewLoginForgetPasswordPresent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewLoginForgetPasswordPresent.m; sourceTree = ""; }; + 8C9C838C2B0C697A00A601BC /* MewLoginFullInfoPresenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewLoginFullInfoPresenter.h; sourceTree = ""; }; + 8C9C838D2B0C697A00A601BC /* MewLoginVerifCodePresent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewLoginVerifCodePresent.h; sourceTree = ""; }; + 8C9C838E2B0C697A00A601BC /* MewLoginPasswordPresent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewLoginPasswordPresent.h; sourceTree = ""; }; + 8C9C838F2B0C697A00A601BC /* MewLoginPresenter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewLoginPresenter.m; sourceTree = ""; }; + 8C9C83902B0C697A00A601BC /* MewLoginForgetPasswordPresent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewLoginForgetPasswordPresent.h; sourceTree = ""; }; + 8C9C83912B0C697A00A601BC /* MewLoginFullInfoPresenter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewLoginFullInfoPresenter.m; sourceTree = ""; }; + 8C9C83922B0C697A00A601BC /* MewLoginVerifCodePresent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewLoginVerifCodePresent.m; sourceTree = ""; }; + 8C9C83932B0C697A00A601BC /* MewLoginPresenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewLoginPresenter.h; sourceTree = ""; }; + 8C9C83942B0C697A00A601BC /* MewLoginPasswordPresent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewLoginPasswordPresent.m; sourceTree = ""; }; + 8C9C83962B0C697A00A601BC /* MewLoginForgetPasswordProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewLoginForgetPasswordProtocol.h; sourceTree = ""; }; + 8C9C83972B0C697A00A601BC /* MewLoginProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewLoginProtocol.h; sourceTree = ""; }; + 8C9C83982B0C697A00A601BC /* MewLoginPasswordProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewLoginPasswordProtocol.h; sourceTree = ""; }; + 8C9C83992B0C697A00A601BC /* MewLoginFullInfoProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewLoginFullInfoProtocol.h; sourceTree = ""; }; + 8C9C839A2B0C697A00A601BC /* MewLoginVerifCodeProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewLoginVerifCodeProtocol.h; sourceTree = ""; }; + 8C9C839C2B0C697A00A601BC /* MewThirdUserInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewThirdUserInfo.h; sourceTree = ""; }; + 8C9C839D2B0C697A00A601BC /* MewThirdUserInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewThirdUserInfo.m; sourceTree = ""; }; + 8C9C839F2B0C697A00A601BC /* MewLoginForgetPasswordViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewLoginForgetPasswordViewController.m; sourceTree = ""; }; + 8C9C83A02B0C697A00A601BC /* MewLoginFullInfoViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewLoginFullInfoViewController.h; sourceTree = ""; }; + 8C9C83A12B0C697A00A601BC /* MewLoginForgetPasswordViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewLoginForgetPasswordViewController.h; sourceTree = ""; }; + 8C9C83A32B0C697A00A601BC /* MewLoginInputView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewLoginInputView.m; sourceTree = ""; }; + 8C9C83A42B0C697A00A601BC /* MewLoginForgetEditView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewLoginForgetEditView.h; sourceTree = ""; }; + 8C9C83A52B0C697A00A601BC /* MewLoginInputView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewLoginInputView.h; sourceTree = ""; }; + 8C9C83A62B0C697A00A601BC /* MewLoginForgetEditView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewLoginForgetEditView.m; sourceTree = ""; }; + 8C9C83A72B0C697A00A601BC /* MewLoginFullInfoViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewLoginFullInfoViewController.m; sourceTree = ""; }; 8C9C83A92B0C697A00A601BC /* Api+Login.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Api+Login.h"; sourceTree = ""; }; 8C9C83AA2B0C697A00A601BC /* Api+Login.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "Api+Login.m"; sourceTree = ""; }; 8C9C83AD2B0C697A00A601BC /* MainPresenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MainPresenter.h; sourceTree = ""; }; @@ -590,9 +587,9 @@ 8C9C84B02B0DEAE100A601BC /* YMIButton.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = YMIButton.m; sourceTree = ""; }; 8C9C84B22B0E94FA00A601BC /* yinmeng-ios.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "yinmeng-ios.entitlements"; sourceTree = ""; }; 8C9C84B32B0E951200A601BC /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = System/Library/Frameworks/StoreKit.framework; sourceTree = SDKROOT; }; - 8C9C84B82B0ECD2100A601BC /* MineRechargePresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MineRechargePresenter.h; sourceTree = ""; }; - 8C9C84B92B0ECD2100A601BC /* MineRechargePresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MineRechargePresenter.m; sourceTree = ""; }; - 8C9C84BE2B0ED1D000A601BC /* MineRechargeProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MineRechargeProtocol.h; sourceTree = ""; }; + 8C9C84B82B0ECD2100A601BC /* MewMineRechargePresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MewMineRechargePresenter.h; sourceTree = ""; }; + 8C9C84B92B0ECD2100A601BC /* MewMineRechargePresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MewMineRechargePresenter.m; sourceTree = ""; }; + 8C9C84BE2B0ED1D000A601BC /* MewMineRechargeProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MewMineRechargeProtocol.h; sourceTree = ""; }; 8CAB96F22B1A729300ED8639 /* MewRoomHostDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MewRoomHostDelegate.h; sourceTree = ""; }; 8CAB96F32B1AB15200ED8639 /* MewRoomAnimationGroup.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MewRoomAnimationGroup.h; sourceTree = ""; }; 8CAB96F42B1AB15200ED8639 /* MewRoomAnimationGroup.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MewRoomAnimationGroup.m; sourceTree = ""; }; @@ -947,8 +944,8 @@ 8C92A8152B0EF3CE008F362C /* SubView */ = { isa = PBXGroup; children = ( - 8C92A8162B0EF3E9008F362C /* MineModifPayPwdView.h */, - 8C92A8172B0EF3E9008F362C /* MineModifPayPwdView.m */, + 8C92A8162B0EF3E9008F362C /* MewMineModifPayPwdView.h */, + 8C92A8172B0EF3E9008F362C /* MewMineModifPayPwdView.m */, ); path = SubView; sourceTree = ""; @@ -1423,9 +1420,9 @@ isa = PBXGroup; children = ( 8C9C834E2B0C697A00A601BC /* Impl */, - 8C9C83552B0C697A00A601BC /* RtcManager.m */, - 8C9C83562B0C697A00A601BC /* RtcDelegate.h */, - 8C9C83572B0C697A00A601BC /* RtcManager.h */, + 8C9C83572B0C697A00A601BC /* MewRtcManager.h */, + 8C9C83552B0C697A00A601BC /* MewRtcManager.m */, + 8C9C83562B0C697A00A601BC /* MewRtcDelegate.h */, ); path = RTC; sourceTree = ""; @@ -1433,12 +1430,12 @@ 8C9C834E2B0C697A00A601BC /* Impl */ = { isa = PBXGroup; children = ( - 8C9C834F2B0C697A00A601BC /* RtcInterface.h */, - 8C9C83502B0C697A00A601BC /* BaseRtcImpl.m */, - 8C9C83512B0C697A00A601BC /* TRTCRtcImpl.m */, - 8C9C83522B0C697A00A601BC /* RtcImplDelegate.h */, - 8C9C83532B0C697A00A601BC /* TRTCRtcImpl.h */, - 8C9C83542B0C697A00A601BC /* BaseRtcImpl.h */, + 8C9C83542B0C697A00A601BC /* MewBaseRtcImpl.h */, + 8C9C83502B0C697A00A601BC /* MewBaseRtcImpl.m */, + 8C9C83532B0C697A00A601BC /* MewTRTCRtcImpl.h */, + 8C9C83512B0C697A00A601BC /* MewTRTCRtcImpl.m */, + 8C9C834F2B0C697A00A601BC /* MewRtcInterface.h */, + 8C9C83522B0C697A00A601BC /* MewRtcImplDelegate.h */, ); path = Impl; sourceTree = ""; @@ -1458,12 +1455,12 @@ 8C9C83592B0C697A00A601BC /* Presenter */ = { isa = PBXGroup; children = ( - 8C9C835A2B0C697A00A601BC /* YMMineCollectRoomPresenter.m */, - 8C9C835B2B0C697A00A601BC /* YMMineSettingPresenter.m */, - 8C9C835C2B0C697A00A601BC /* YMMineSettingPresenter.h */, - 8C9C835D2B0C697A00A601BC /* YMMineCollectRoomPresenter.h */, - 8C9C84B82B0ECD2100A601BC /* MineRechargePresenter.h */, - 8C9C84B92B0ECD2100A601BC /* MineRechargePresenter.m */, + 8C9C835D2B0C697A00A601BC /* MewMineCollectRoomPresenter.h */, + 8C9C835A2B0C697A00A601BC /* MewMineCollectRoomPresenter.m */, + 8C9C835C2B0C697A00A601BC /* MewMineSettingPresenter.h */, + 8C9C835B2B0C697A00A601BC /* MewMineSettingPresenter.m */, + 8C9C84B82B0ECD2100A601BC /* MewMineRechargePresenter.h */, + 8C9C84B92B0ECD2100A601BC /* MewMineRechargePresenter.m */, ); path = Presenter; sourceTree = ""; @@ -1471,9 +1468,9 @@ 8C9C835E2B0C697A00A601BC /* Protocol */ = { isa = PBXGroup; children = ( - 8C9C835F2B0C697A00A601BC /* YMMineSettingProtocol.h */, - 8C9C83602B0C697A00A601BC /* YMMineCollectRoomProtocol.h */, - 8C9C84BE2B0ED1D000A601BC /* MineRechargeProtocol.h */, + 8C9C835F2B0C697A00A601BC /* MewMineSettingProtocol.h */, + 8C9C83602B0C697A00A601BC /* MewMineCollectRoomProtocol.h */, + 8C9C84BE2B0ED1D000A601BC /* MewMineRechargeProtocol.h */, ); path = Protocol; sourceTree = ""; @@ -1482,11 +1479,11 @@ isa = PBXGroup; children = ( 8C9C83622B0C697A00A601BC /* Friend */, - 8C9C83652B0C697A00A601BC /* YMMineSettingItemModel.m */, - 8C9C83662B0C697A00A601BC /* MineCollectRoomModel.m */, + 8C9C836C2B0C697A00A601BC /* MewMineSettingItemModel.h */, + 8C9C83652B0C697A00A601BC /* MewMineSettingItemModel.m */, + 8C9C836D2B0C697A00A601BC /* MewMineCollectRoomModel.h */, + 8C9C83662B0C697A00A601BC /* MewMineCollectRoomModel.m */, 8C9C83672B0C697A00A601BC /* Recharge */, - 8C9C836C2B0C697A00A601BC /* YMMineSettingItemModel.h */, - 8C9C836D2B0C697A00A601BC /* MineCollectRoomModel.h */, ); path = Model; sourceTree = ""; @@ -1494,8 +1491,8 @@ 8C9C83622B0C697A00A601BC /* Friend */ = { isa = PBXGroup; children = ( - 8C9C83632B0C697A00A601BC /* FansInfoModel.h */, - 8C9C83642B0C697A00A601BC /* FansInfoModel.m */, + 8C9C83632B0C697A00A601BC /* MewFansInfoModel.h */, + 8C9C83642B0C697A00A601BC /* MewFansInfoModel.m */, ); path = Friend; sourceTree = ""; @@ -1503,10 +1500,10 @@ 8C9C83672B0C697A00A601BC /* Recharge */ = { isa = PBXGroup; children = ( - 8C9C83682B0C697A00A601BC /* RechargeListModel.h */, - 8C9C83692B0C697A00A601BC /* WalletInfoModel.h */, - 8C9C836A2B0C697A00A601BC /* RechargeListModel.m */, - 8C9C836B2B0C697A00A601BC /* WalletInfoModel.m */, + 8C9C83682B0C697A00A601BC /* MewRechargeListModel.h */, + 8C9C836A2B0C697A00A601BC /* MewRechargeListModel.m */, + 8C9C83692B0C697A00A601BC /* MewWalletInfoModel.h */, + 8C9C836B2B0C697A00A601BC /* MewWalletInfoModel.m */, ); path = Recharge; sourceTree = ""; @@ -1524,9 +1521,9 @@ 8C9C836F2B0C697A00A601BC /* CollectRoom */ = { isa = PBXGroup; children = ( - 8C9C83702B0C697A00A601BC /* YMMineCollectRoomViewController.h */, 8C9C83712B0C697A00A601BC /* Cell */, - 8C9C83742B0C697A00A601BC /* YMMineCollectRoomViewController.m */, + 8C9C83702B0C697A00A601BC /* MewMineCollectRoomViewController.h */, + 8C9C83742B0C697A00A601BC /* MewMineCollectRoomViewController.m */, ); path = CollectRoom; sourceTree = ""; @@ -1534,8 +1531,8 @@ 8C9C83712B0C697A00A601BC /* Cell */ = { isa = PBXGroup; children = ( - 8C9C83722B0C697A00A601BC /* YMMineCollectRoomCell.m */, - 8C9C83732B0C697A00A601BC /* YMMineCollectRoomCell.h */, + 8C9C83722B0C697A00A601BC /* MewMineCollectRoomCell.m */, + 8C9C83732B0C697A00A601BC /* MewMineCollectRoomCell.h */, ); path = Cell; sourceTree = ""; @@ -1543,11 +1540,11 @@ 8C9C83752B0C697A00A601BC /* Setting */ = { isa = PBXGroup; children = ( - 8C9C83762B0C697A00A601BC /* YMMineAboutUsViewController.h */, - 8C9C83772B0C697A00A601BC /* YMMineSettingViewController.m */, + 8C9C83762B0C697A00A601BC /* MewMineAboutUsViewController.h */, + 8C9C837E2B0C697A00A601BC /* MewMineAboutUsViewController.m */, + 8C9C837D2B0C697A00A601BC /* MewMineSettingViewController.h */, + 8C9C83772B0C697A00A601BC /* MewMineSettingViewController.m */, 8C9C83782B0C697A00A601BC /* Cell */, - 8C9C837D2B0C697A00A601BC /* YMMineSettingViewController.h */, - 8C9C837E2B0C697A00A601BC /* YMMineAboutUsViewController.m */, ); path = Setting; sourceTree = ""; @@ -1555,10 +1552,10 @@ 8C9C83782B0C697A00A601BC /* Cell */ = { isa = PBXGroup; children = ( - 8C9C83792B0C697A00A601BC /* YMMineSettingTableViewCell.h */, - 8C9C837A2B0C697A00A601BC /* MewMineCollectionTableViewCell.m */, - 8C9C837B2B0C697A00A601BC /* YMMineSettingTableViewCell.m */, + 8C9C83792B0C697A00A601BC /* MewMineSettingTableViewCell.h */, + 8C9C837B2B0C697A00A601BC /* MewMineSettingTableViewCell.m */, 8C9C837C2B0C697A00A601BC /* MewMineCollectionTableViewCell.h */, + 8C9C837A2B0C697A00A601BC /* MewMineCollectionTableViewCell.m */, ); path = Cell; sourceTree = ""; @@ -1584,8 +1581,8 @@ 8C9C83832B0C697A00A601BC /* Model */ = { isa = PBXGroup; children = ( - 8C9C83842B0C697A00A601BC /* AttachmentModel.h */, - 8C9C83852B0C697A00A601BC /* AttachmentModel.m */, + 8C9C83842B0C697A00A601BC /* MewAttachmentModel.h */, + 8C9C83852B0C697A00A601BC /* MewAttachmentModel.m */, ); path = Model; sourceTree = ""; @@ -1593,8 +1590,8 @@ 8C9C83862B0C697A00A601BC /* Tool */ = { isa = PBXGroup; children = ( - 8C9C83872B0C697A00A601BC /* CustomAttachmentDecoder.h */, - 8C9C83882B0C697A00A601BC /* CustomAttachmentDecoder.m */, + 8C9C83872B0C697A00A601BC /* MewCustomAttachmentDecoder.h */, + 8C9C83882B0C697A00A601BC /* MewCustomAttachmentDecoder.m */, ); path = Tool; sourceTree = ""; @@ -1614,20 +1611,20 @@ 8C9C838A2B0C697A00A601BC /* Presenter */ = { isa = PBXGroup; children = ( - 8C9C838B2B0C697A00A601BC /* LoginForgetPasswordPresent.m */, - 8C9C838C2B0C697A00A601BC /* LoginFullInfoPresenter.h */, - 8C9C838D2B0C697A00A601BC /* LoginVerifCodePresent.h */, - 8C9C838E2B0C697A00A601BC /* LoginPasswordPresent.h */, - 8C9C838F2B0C697A00A601BC /* LoginPresenter.m */, - 8C9C83902B0C697A00A601BC /* LoginForgetPasswordPresent.h */, - 8C9C83912B0C697A00A601BC /* LoginFullInfoPresenter.m */, - 8C9C83922B0C697A00A601BC /* LoginVerifCodePresent.m */, - 8C9C83932B0C697A00A601BC /* LoginPresenter.h */, - 8C9C83942B0C697A00A601BC /* LoginPasswordPresent.m */, - 8C92A8092B0EEE73008F362C /* LoginVerifBindPhonePresenter.h */, - 8C92A80A2B0EEE73008F362C /* LoginVerifBindPhonePresenter.m */, - 8C92A80F2B0EEFAE008F362C /* LoginBindPhonePresent.h */, - 8C92A8102B0EEFAE008F362C /* LoginBindPhonePresent.m */, + 8C9C83902B0C697A00A601BC /* MewLoginForgetPasswordPresent.h */, + 8C9C838B2B0C697A00A601BC /* MewLoginForgetPasswordPresent.m */, + 8C9C838C2B0C697A00A601BC /* MewLoginFullInfoPresenter.h */, + 8C9C83912B0C697A00A601BC /* MewLoginFullInfoPresenter.m */, + 8C9C838D2B0C697A00A601BC /* MewLoginVerifCodePresent.h */, + 8C9C83922B0C697A00A601BC /* MewLoginVerifCodePresent.m */, + 8C9C838E2B0C697A00A601BC /* MewLoginPasswordPresent.h */, + 8C9C83942B0C697A00A601BC /* MewLoginPasswordPresent.m */, + 8C9C83932B0C697A00A601BC /* MewLoginPresenter.h */, + 8C9C838F2B0C697A00A601BC /* MewLoginPresenter.m */, + 8C92A8092B0EEE73008F362C /* MewLoginVerifBindPhonePresenter.h */, + 8C92A80A2B0EEE73008F362C /* MewLoginVerifBindPhonePresenter.m */, + 8C92A80F2B0EEFAE008F362C /* MewLoginBindPhonePresent.h */, + 8C92A8102B0EEFAE008F362C /* MewLoginBindPhonePresent.m */, 8C92A81D2B0EF4D2008F362C /* MineLoginPasswordPresenter.h */, 8C92A81E2B0EF4D2008F362C /* MineLoginPasswordPresenter.m */, ); @@ -1637,12 +1634,12 @@ 8C9C83952B0C697A00A601BC /* Protocol */ = { isa = PBXGroup; children = ( - 8C9C83962B0C697A00A601BC /* LoginForgetPasswordProtocol.h */, - 8C9C83972B0C697A00A601BC /* LoginProtocol.h */, - 8C9C83982B0C697A00A601BC /* LoginPasswordProtocol.h */, - 8C9C83992B0C697A00A601BC /* LoginFullInfoProtocol.h */, - 8C9C839A2B0C697A00A601BC /* LoginVerifCodeProtocol.h */, - 8C92A8082B0EEE3C008F362C /* LoginVerifBindPhoneProtocol.h */, + 8C9C83962B0C697A00A601BC /* MewLoginForgetPasswordProtocol.h */, + 8C9C83972B0C697A00A601BC /* MewLoginProtocol.h */, + 8C9C83982B0C697A00A601BC /* MewLoginPasswordProtocol.h */, + 8C9C83992B0C697A00A601BC /* MewLoginFullInfoProtocol.h */, + 8C9C839A2B0C697A00A601BC /* MewLoginVerifCodeProtocol.h */, + 8C92A8082B0EEE3C008F362C /* MewLoginVerifBindPhoneProtocol.h */, 8C92A8202B0EF500008F362C /* MineLoginPasswordProtocol.h */, ); path = Protocol; @@ -1651,8 +1648,8 @@ 8C9C839B2B0C697A00A601BC /* Model */ = { isa = PBXGroup; children = ( - 8C9C839C2B0C697A00A601BC /* ThirdUserInfo.h */, - 8C9C839D2B0C697A00A601BC /* ThirdUserInfo.m */, + 8C9C839C2B0C697A00A601BC /* MewThirdUserInfo.h */, + 8C9C839D2B0C697A00A601BC /* MewThirdUserInfo.m */, ); path = Model; sourceTree = ""; @@ -1660,19 +1657,17 @@ 8C9C839E2B0C697A00A601BC /* View */ = { isa = PBXGroup; children = ( - 8C9C839F2B0C697A00A601BC /* LoginForgetPasswordViewController.m */, - 8C9C83A02B0C697A00A601BC /* LoginFullInfoViewController.h */, - 8C9C83A12B0C697A00A601BC /* LoginForgetPasswordViewController.h */, + 8C9C83A12B0C697A00A601BC /* MewLoginForgetPasswordViewController.h */, + 8C9C839F2B0C697A00A601BC /* MewLoginForgetPasswordViewController.m */, + 8C9C83A02B0C697A00A601BC /* MewLoginFullInfoViewController.h */, + 8C9C83A72B0C697A00A601BC /* MewLoginFullInfoViewController.m */, 8C9C83A22B0C697A00A601BC /* CustomView */, - 8C9C83A72B0C697A00A601BC /* LoginFullInfoViewController.m */, - 8C92A8022B0EED72008F362C /* LoginBindPhoneResultViewController.h */, - 8C92A8032B0EED72008F362C /* LoginBindPhoneResultViewController.m */, - 8C92A8052B0EEDD0008F362C /* LoginVerifBindPhoneViewController.h */, - 8C92A8062B0EEDD0008F362C /* LoginVerifBindPhoneViewController.m */, - 8C92A80C2B0EEF3A008F362C /* LoginBindPhoneViewController.h */, - 8C92A80D2B0EEF3A008F362C /* LoginBindPhoneViewController.m */, - 8C92A8122B0EF1D8008F362C /* MineLoginPasswordViewController.h */, - 8C92A8132B0EF1D8008F362C /* MineLoginPasswordViewController.m */, + 8C92A8052B0EEDD0008F362C /* MewLoginVerifBindPhoneViewController.h */, + 8C92A8062B0EEDD0008F362C /* MewLoginVerifBindPhoneViewController.m */, + 8C92A80C2B0EEF3A008F362C /* MewLoginBindPhoneViewController.h */, + 8C92A80D2B0EEF3A008F362C /* MewLoginBindPhoneViewController.m */, + 8C92A8122B0EF1D8008F362C /* MewMineLoginPasswordViewController.h */, + 8C92A8132B0EF1D8008F362C /* MewMineLoginPasswordViewController.m */, ); path = View; sourceTree = ""; @@ -1680,10 +1675,10 @@ 8C9C83A22B0C697A00A601BC /* CustomView */ = { isa = PBXGroup; children = ( - 8C9C83A32B0C697A00A601BC /* LoginInputView.m */, - 8C9C83A42B0C697A00A601BC /* LoginForgetEditView.h */, - 8C9C83A52B0C697A00A601BC /* LoginInputView.h */, - 8C9C83A62B0C697A00A601BC /* LoginForgetEditView.m */, + 8C9C83A52B0C697A00A601BC /* MewLoginInputView.h */, + 8C9C83A32B0C697A00A601BC /* MewLoginInputView.m */, + 8C9C83A62B0C697A00A601BC /* MewLoginForgetEditView.m */, + 8C9C83A42B0C697A00A601BC /* MewLoginForgetEditView.h */, ); path = CustomView; sourceTree = ""; @@ -2280,15 +2275,15 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 8C9C84482B0C697A00A601BC /* YMMineSettingTableViewCell.m in Sources */, + 8C9C84482B0C697A00A601BC /* MewMineSettingTableViewCell.m in Sources */, 233757682B0CB577001D0B7F /* MewNIMMessageUtils.m in Sources */, 8C9C845C2B0C697A00A601BC /* ClientConfig.m in Sources */, - 8C9C843B2B0C697A00A601BC /* TRTCRtcImpl.m in Sources */, + 8C9C843B2B0C697A00A601BC /* MewTRTCRtcImpl.m in Sources */, 2337575C2B0CB577001D0B7F /* MewSessionMessageCell.m in Sources */, 8C9C821F2B0C694900A601BC /* AppDelegate.m in Sources */, - 8C92A8182B0EF3E9008F362C /* MineModifPayPwdView.m in Sources */, - 8C9C84462B0C697A00A601BC /* YMMineSettingViewController.m in Sources */, - 8C9C843D2B0C697A00A601BC /* YMMineCollectRoomPresenter.m in Sources */, + 8C92A8182B0EF3E9008F362C /* MewMineModifPayPwdView.m in Sources */, + 8C9C84462B0C697A00A601BC /* MewMineSettingViewController.m in Sources */, + 8C9C843D2B0C697A00A601BC /* MewMineCollectRoomPresenter.m in Sources */, 8C9C82A92B0C695600A601BC /* BaseNavigationController.m in Sources */, 8C9C82BC2B0C695600A601BC /* UserInfoModel.m in Sources */, 8C9C84602B0C697A00A601BC /* MewVoiceGuideView.m in Sources */, @@ -2299,27 +2294,29 @@ 8C9C84892B0D286F00A601BC /* Api+Gift.m in Sources */, 237051572B1D7CD500F5DE14 /* MewHUDTool.m in Sources */, 8C9C849E2B0D6A5C00A601BC /* MewGiftStorage.m in Sources */, - 8C9C843A2B0C697A00A601BC /* BaseRtcImpl.m in Sources */, + 8C9C843A2B0C697A00A601BC /* MewBaseRtcImpl.m in Sources */, 8C9C84672B0C697A00A601BC /* MewHeaderView.m in Sources */, 8C9C84662B0C697A00A601BC /* MewUserIntroductionView.m in Sources */, 8CAB96F52B1AB15200ED8639 /* MewRoomAnimationGroup.m in Sources */, 8C9C84172B0C697A00A601BC /* YMWebViewController.m in Sources */, 8C92A8232B0FE1DC008F362C /* MewHtmlUrl.m in Sources */, 237051552B1D7CD500F5DE14 /* DESEncrypt.m in Sources */, - 8C92A80E2B0EEF3A008F362C /* LoginBindPhoneViewController.m in Sources */, - 8C9C84432B0C697A00A601BC /* WalletInfoModel.m in Sources */, - 8C9C84552B0C697A00A601BC /* LoginForgetEditView.m in Sources */, + 8C92A80E2B0EEF3A008F362C /* MewLoginBindPhoneViewController.m in Sources */, + 8C9C84432B0C697A00A601BC /* MewWalletInfoModel.m in Sources */, + 8C9C84552B0C697A00A601BC /* MewLoginForgetEditView.m in Sources */, 8C9C82C02B0C695600A601BC /* MvpViewController.m in Sources */, 8C9C82B42B0C695600A601BC /* TTAlertView.m in Sources */, 8C9C84592B0C697A00A601BC /* TabbarViewController.m in Sources */, 8C9C82BE2B0C695600A601BC /* LoginTicketInfo.m in Sources */, - 8C9C84542B0C697A00A601BC /* LoginInputView.m in Sources */, + 8C9C84542B0C697A00A601BC /* MewLoginInputView.m in Sources */, 233757632B0CB577001D0B7F /* MewMessageContentUnSupportView.m in Sources */, 2337575E2B0CB577001D0B7F /* MewNIMMessageMaker.m in Sources */, 8C9C82B92B0C695600A601BC /* NSObject+AutoCoding.m in Sources */, 233757622B0CB577001D0B7F /* MewMessageContentImage.m in Sources */, 8C9C84772B0C697A00A601BC /* MewLoginPhoneView.m in Sources */, - 8C9C84532B0C697A00A601BC /* LoginForgetPasswordViewController.m in Sources */, + 8C9C84692B0C697A00A601BC /* YMHomeFilterView.m in Sources */, + 8C9C84532B0C697A00A601BC /* MewLoginForgetPasswordViewController.m in Sources */, + 8C9C84752B0C697A00A601BC /* MewMineCollectionViewController.m in Sources */, 8C9C82AF2B0C695600A601BC /* TTAlertConfig.m in Sources */, 8C9C82B02B0C695600A601BC /* TTAlertButtonConfig.m in Sources */, @@ -2327,7 +2324,7 @@ 8C9C841C2B0C697A00A601BC /* MewRoomInfoModel.m in Sources */, 2337575B2B0CB577001D0B7F /* UIView+NIM.m in Sources */, 2370515B2B1D7CD500F5DE14 /* MEWThemeColor.m in Sources */, - 8C9C843F2B0C697A00A601BC /* FansInfoModel.m in Sources */, + 8C9C843F2B0C697A00A601BC /* MewFansInfoModel.m in Sources */, 8C9C84712B0C697A00A601BC /* MewPartyModel.m in Sources */, 8C9C82BF2B0C695600A601BC /* AccountModel.m in Sources */, 237051512B1D7CD500F5DE14 /* NSArray+MewSafe.m in Sources */, @@ -2346,9 +2343,9 @@ 8C9C846D2B0C697A00A601BC /* MewRoomRightView.m in Sources */, 8C9C84582B0C697A00A601BC /* MainPresenter.m in Sources */, 233757562B0CB577001D0B7F /* MewMessagePresenter.m in Sources */, - 8C9C84512B0C697A00A601BC /* LoginPasswordPresent.m in Sources */, + 8C9C84512B0C697A00A601BC /* MewLoginPasswordPresent.m in Sources */, 8C9C841F2B0C697A00A601BC /* CHStageView.m in Sources */, - 8C9C844D2B0C697A00A601BC /* LoginForgetPasswordPresent.m in Sources */, + 8C9C844D2B0C697A00A601BC /* MewLoginForgetPasswordPresent.m in Sources */, 8C9C82C12B0C695600A601BC /* Api.m in Sources */, 23270C2C2B0E041300B9303B /* MewMessageAudioCenter.m in Sources */, 2370514F2B1D7CD500F5DE14 /* UIImage+RW.m in Sources */, @@ -2358,12 +2355,12 @@ 8C9C84622B0C697A00A601BC /* MewVoiceDiscView.m in Sources */, 8C9C82AE2B0C695600A601BC /* TTPopup.m in Sources */, 8C9C84AD2B0D9AB900A601BC /* MewRoomMessageHeaderView.m in Sources */, - 8C9C84442B0C697A00A601BC /* YMMineCollectRoomCell.m in Sources */, + 8C9C84442B0C697A00A601BC /* MewMineCollectRoomCell.m in Sources */, 8C9C82B52B0C695600A601BC /* TTActionSheetView.m in Sources */, 8C9C82B32B0C695600A601BC /* TTPopupManagerService.m in Sources */, 8C9C84762B0C697A00A601BC /* MewRechargeSubView.m in Sources */, 237051502B1D7CD500F5DE14 /* NSMutableDictionary+MEWSafe.m in Sources */, - 8C9C84402B0C697A00A601BC /* YMMineSettingItemModel.m in Sources */, + 8C9C84402B0C697A00A601BC /* MewMineSettingItemModel.m in Sources */, 8C9C84232B0C697A00A601BC /* MicroStateModel.m in Sources */, 8C9C84212B0C697A00A601BC /* MicroQueueModel.m in Sources */, 8C9C82DC2B0C696900A601BC /* YMConstant.m in Sources */, @@ -2371,13 +2368,13 @@ 8C9C846A2B0C697A00A601BC /* Api+MewHome.m in Sources */, 8C9C847A2B0C697A00A601BC /* MewLoginViewController.m in Sources */, 237051542B1D7CD500F5DE14 /* MewTimeIntervalUtils.m in Sources */, - 8C9C844F2B0C697A00A601BC /* LoginFullInfoPresenter.m in Sources */, + 8C9C844F2B0C697A00A601BC /* MewLoginFullInfoPresenter.m in Sources */, 8C9C84222B0C697A00A601BC /* MicroExtModel.m in Sources */, - 8C9C843C2B0C697A00A601BC /* RtcManager.m in Sources */, - 8C9C84BA2B0ECD2100A601BC /* MineRechargePresenter.m in Sources */, + 8C9C843C2B0C697A00A601BC /* MewRtcManager.m in Sources */, + 8C9C84BA2B0ECD2100A601BC /* MewMineRechargePresenter.m in Sources */, 8C9C84182B0C697A00A601BC /* MewPartyPresenter.m in Sources */, 8C9C841E2B0C697A00A601BC /* MewRoomSendTextView.m in Sources */, - 8C9C843E2B0C697A00A601BC /* YMMineSettingPresenter.m in Sources */, + 8C9C843E2B0C697A00A601BC /* MewMineSettingPresenter.m in Sources */, 8C9C84732B0C697A00A601BC /* MewPartyViewController.m in Sources */, 2370514C2B1D7CD500F5DE14 /* YYUtility+Device.m in Sources */, 8C4D53622AFD4CF700238AE6 /* main.m in Sources */, @@ -2391,11 +2388,14 @@ 233757582B0CB577001D0B7F /* MewChatLimitModel.m in Sources */, 8C9C82BA2B0C695600A601BC /* AccountInfoStorage.m in Sources */, 8C9C846E2B0C697A00A601BC /* MewRoomHeaderView.m in Sources */, - 8C9C84492B0C697A00A601BC /* YMMineAboutUsViewController.m in Sources */, + 8C9C84492B0C697A00A601BC /* MewMineAboutUsViewController.m in Sources */, 8C9C84632B0C697A00A601BC /* MewPlayVoiceView.m in Sources */, - 8C92A80B2B0EEE73008F362C /* LoginVerifBindPhonePresenter.m in Sources */, - 8C9C84502B0C697A00A601BC /* LoginVerifCodePresent.m in Sources */, - 8C9C844C2B0C697A00A601BC /* CustomAttachmentDecoder.m in Sources */, + + 8C92A80B2B0EEE73008F362C /* MewLoginVerifBindPhonePresenter.m in Sources */, + 8C9C84502B0C697A00A601BC /* MewLoginVerifCodePresent.m in Sources */, + 8C9C844C2B0C697A00A601BC /* MewCustomAttachmentDecoder.m in Sources */, + 8C9C845E2B0C697A00A601BC /* AudioPlayerManager.m in Sources */, + 8C9C848C2B0D2B8500A601BC /* MewGiftReceiveInfoModel.m in Sources */, 8C9C84572B0C697A00A601BC /* Api+Login.m in Sources */, 2337575D2B0CB577001D0B7F /* MewSessionToolbarView.m in Sources */, @@ -2409,27 +2409,26 @@ 8C9C841A2B0C697A00A601BC /* Api+Party.m in Sources */, 8C9C82AD2B0C695600A601BC /* YMEmptyTableViewCell.m in Sources */, 8C9C845F2B0C697A00A601BC /* MewHomeViewController.m in Sources */, - 8C9C84422B0C697A00A601BC /* RechargeListModel.m in Sources */, + 8C9C84422B0C697A00A601BC /* MewRechargeListModel.m in Sources */, 8C9C845A2B0C697A00A601BC /* ClientDataModel.m in Sources */, 8C9C84972B0D65E200A601BC /* MewRoomAnimationView.m in Sources */, 2370514E2B1D7CD500F5DE14 /* YYUtility+App.m in Sources */, 8C9C82202B0C694900A601BC /* AppDelegate+ThirdConfig.m in Sources */, 8C9C84202B0C697A00A601BC /* MicroView.m in Sources */, - 8C9C84522B0C697A00A601BC /* ThirdUserInfo.m in Sources */, + 8C9C84522B0C697A00A601BC /* MewThirdUserInfo.m in Sources */, 8C9C82BD2B0C695600A601BC /* UserVipInfoVo.m in Sources */, 2370515D2B1D7CD500F5DE14 /* YYReachability.m in Sources */, 8C92A81F2B0EF4D2008F362C /* MineLoginPasswordPresenter.m in Sources */, - 8C92A8042B0EED72008F362C /* LoginBindPhoneResultViewController.m in Sources */, 8C9C84472B0C697A00A601BC /* MewMineCollectionTableViewCell.m in Sources */, - 8C9C844E2B0C697A00A601BC /* LoginPresenter.m in Sources */, + 8C9C844E2B0C697A00A601BC /* MewLoginPresenter.m in Sources */, 8C9C84642B0C697A00A601BC /* MewRightFollowVoiceView.m in Sources */, 8C9C84842B0D25EF00A601BC /* MewGiftInfoModel.m in Sources */, 8C9C84742B0C697A00A601BC /* MewRechargeViewController.m in Sources */, 8C9C84272B0C697A00A601BC /* MewNetImageLabel.m in Sources */, 8C9C842A2B0C697A00A601BC /* Api+Room.m in Sources */, 8C9C84902B0D439800A601BC /* MewRoomMessageFilter.m in Sources */, - 8C92A8072B0EEDD0008F362C /* LoginVerifBindPhoneViewController.m in Sources */, - 8C9C84412B0C697A00A601BC /* MineCollectRoomModel.m in Sources */, + 8C92A8072B0EEDD0008F362C /* MewLoginVerifBindPhoneViewController.m in Sources */, + 8C9C84412B0C697A00A601BC /* MewMineCollectRoomModel.m in Sources */, 2337576B2B0CB630001D0B7F /* UIView+FilletCorner.m in Sources */, 8C92A81C2B0EF449008F362C /* UIButton+EnlargeTouchArea.m in Sources */, 8C9C82B72B0C695600A601BC /* HttpRequestHelper.m in Sources */, @@ -2442,19 +2441,19 @@ 8C9C846C2B0C697A00A601BC /* MewSocialStageView.m in Sources */, 8C9C84682B0C697A00A601BC /* MewRightFollowVoiceCollectionCell.m in Sources */, 2370514D2B1D7CD500F5DE14 /* YYUtility.m in Sources */, - 8C9C84452B0C697A00A601BC /* YMMineCollectRoomViewController.m in Sources */, + 8C9C84452B0C697A00A601BC /* MewMineCollectRoomViewController.m in Sources */, 8C9C82AC2B0C695600A601BC /* NetImageView.m in Sources */, 2337575F2B0CB577001D0B7F /* MewSessionInfoViewController.m in Sources */, 8C9C846B2B0C697A00A601BC /* MewSocialMicroView.m in Sources */, 233757572B0CB577001D0B7F /* MewMessageMenuModel.m in Sources */, - 8C9C844B2B0C697A00A601BC /* AttachmentModel.m in Sources */, + 8C9C844B2B0C697A00A601BC /* MewAttachmentModel.m in Sources */, 237051582B1D7CD500F5DE14 /* MEWTimer.m in Sources */, 237052C42B1F13AD00F5DE14 /* MewAudioPlayerManager.m in Sources */, 237051562B1D7CD500F5DE14 /* MEWBase64.m in Sources */, - 8C92A8112B0EEFAE008F362C /* LoginBindPhonePresent.m in Sources */, - 8C9C84562B0C697A00A601BC /* LoginFullInfoViewController.m in Sources */, + 8C92A8112B0EEFAE008F362C /* MewLoginBindPhonePresent.m in Sources */, + 8C9C84562B0C697A00A601BC /* MewLoginFullInfoViewController.m in Sources */, 8C9C84262B0C697A00A601BC /* MewMessageRemoteExtModel.m in Sources */, - 8C92A8142B0EF1D8008F362C /* MineLoginPasswordViewController.m in Sources */, + 8C92A8142B0EF1D8008F362C /* MewMineLoginPasswordViewController.m in Sources */, 8C9C82AA2B0C695600A601BC /* UIImageConstant.m in Sources */, 8C9C82BB2B0C695600A601BC /* BaseModel.m in Sources */, 8C9C84942B0D65C300A601BC /* MewRoomAnimationHitView.m in Sources */, diff --git a/yinmeng-ios/yinmeng-ios/AppDelegate/AppDelegate+ThirdConfig.m b/yinmeng-ios/yinmeng-ios/AppDelegate/AppDelegate+ThirdConfig.m index 81b900e..ec566ac 100644 --- a/yinmeng-ios/yinmeng-ios/AppDelegate/AppDelegate+ThirdConfig.m +++ b/yinmeng-ios/yinmeng-ios/AppDelegate/AppDelegate+ThirdConfig.m @@ -9,7 +9,7 @@ #import #import #import "YMConstant.h" -#import "CustomAttachmentDecoder.h" +#import "MewCustomAttachmentDecoder.h" @implementation AppDelegate (ThirdConfig) - (void)initThirdConfig { @@ -24,7 +24,7 @@ [[NIMSDK sharedSDK] registerWithOption:option]; // NIM SDK初始化 - [NIMCustomObject registerCustomDecoder:[[CustomAttachmentDecoder alloc] init]]; + [NIMCustomObject registerCustomDecoder:[[MewCustomAttachmentDecoder alloc] init]]; #ifdef DEBUG [NIMSDKConfig sharedConfig].enabledHttpsForInfo = NO; diff --git a/yinmeng-ios/yinmeng-ios/Base/MVP/Api/Api.h b/yinmeng-ios/yinmeng-ios/Base/MVP/Api/Api.h index 4dc4946..bd4352f 100644 --- a/yinmeng-ios/yinmeng-ios/Base/MVP/Api/Api.h +++ b/yinmeng-ios/yinmeng-ios/Base/MVP/Api/Api.h @@ -30,7 +30,7 @@ NS_ASSUME_NONNULL_BEGIN /// @param completion 请求完成 /// @param mobile 手机号 /// @param type 类型 请看XPEunm中的枚举 -+ (void)phoneSmsCode:(HttpRequestHelperCompletion)completion mobile:(NSString *)mobile type:(NSString *)type; ++ (void)mew_phoneSmsCode:(HttpRequestHelperCompletion)completion mobile:(NSString *)mobile type:(NSString *)type; /// 批量验证 /// @param complection 完成 @@ -48,7 +48,7 @@ NS_ASSUME_NONNULL_BEGIN /// @param complection 完成 /// @param uid 用户uid /// @param ticket ticketg -+ (void)getUserWalletInfo:(HttpRequestHelperCompletion)complection ++ (void)mew_getUserWalletInfo:(HttpRequestHelperCompletion)complection uid:(NSString *)uid ticket:(NSString *)ticket; diff --git a/yinmeng-ios/yinmeng-ios/Base/MVP/Api/Api.m b/yinmeng-ios/yinmeng-ios/Base/MVP/Api/Api.m index c6d3107..a814992 100644 --- a/yinmeng-ios/yinmeng-ios/Base/MVP/Api/Api.m +++ b/yinmeng-ios/yinmeng-ios/Base/MVP/Api/Api.m @@ -62,7 +62,7 @@ /// @param completion 请求完成 /// @param mobile 手机号 /// @param type 类型 请看XPEunm中的枚举 -+ (void)phoneSmsCode:(HttpRequestHelperCompletion)completion mobile:(NSString *)mobile type:(NSString *)type { ++ (void)mew_phoneSmsCode:(HttpRequestHelperCompletion)completion mobile:(NSString *)mobile type:(NSString *)type { NSString *getUrl = [NewEncryptTool MEW_aesDecrypt:@"2Hx71goXCYG6r1fVVkSHsA=="];///sms/getCode [self makeRequest:getUrl method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, mobile, type, nil]; } @@ -81,7 +81,7 @@ /// @param complection 完成 /// @param uid 用户uid /// @param ticket ticketg -+ (void)getUserWalletInfo:(HttpRequestHelperCompletion)complection ++ (void)mew_getUserWalletInfo:(HttpRequestHelperCompletion)complection uid:(NSString *)uid ticket:(NSString *)ticket { NSString *getUrl = [NewEncryptTool MEW_aesDecrypt:@"7xFYk5dOEOCLb2Sfp0mwZw=="];//purse/query diff --git a/yinmeng-ios/yinmeng-ios/Base/MVP/Model/AccountInfoStorage.h b/yinmeng-ios/yinmeng-ios/Base/MVP/Model/AccountInfoStorage.h index 8658482..b063f89 100644 --- a/yinmeng-ios/yinmeng-ios/Base/MVP/Model/AccountInfoStorage.h +++ b/yinmeng-ios/yinmeng-ios/Base/MVP/Model/AccountInfoStorage.h @@ -6,7 +6,7 @@ // #import -@class AccountModel, ThirdUserInfo; +@class AccountModel, MewThirdUserInfo; NS_ASSUME_NONNULL_BEGIN @@ -14,7 +14,7 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic, strong, readonly) AccountModel *accountModel; ///如果是第三方登录的话 保存一下用户信息 -@property (nonatomic,strong) ThirdUserInfo *thirdUserInfo; +@property (nonatomic,strong) MewThirdUserInfo *MewThirdUserInfo; + (instancetype)instance; - (instancetype)init NS_UNAVAILABLE; diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/Presenter/MewHomePresenter.m b/yinmeng-ios/yinmeng-ios/Main/Mew/Home/Presenter/MewHomePresenter.m index 6b9f1ea..1bce56b 100644 --- a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/Presenter/MewHomePresenter.m +++ b/yinmeng-ios/yinmeng-ios/Main/Mew/Home/Presenter/MewHomePresenter.m @@ -10,7 +10,7 @@ #import "Api+Mine.h" #import "MEWUploadFile.h" #import "UserInfoModel.h" -#import "FansInfoModel.h" +#import "MewFansInfoModel.h" /// Protocol #import "MewHomeProtocol.h" #import "TTAlertConfig.h" @@ -89,7 +89,7 @@ /// 获取两个人的关注状态 - (void)mew_getUserAttentionState:(NSString *)targetUid { NSString *uid = [[AccountInfoStorage instance] getUid]; - [Api attentionStatusCompletion:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [Api Mew_AttentionStatusCompletion:[self createHttpCompletion:^(BaseModel * _Nonnull data) { BOOL isLike = ((NSNumber *)data.data).boolValue; [[self getView] mew_getUserAttentionSuccess:isLike]; }] uid:uid isLikeUid:targetUid]; @@ -109,7 +109,7 @@ /// 获取用户详细信息 - (void)mew_getUserDetailInfoWithUid:(NSString *)uid { - [Api userDetailInfoCompletion:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [Api Mew_UserDetailInfoCompletion:[self createHttpCompletion:^(BaseModel * _Nonnull data) { UserInfoModel *infoModel = [UserInfoModel mewModelWithDictionary:data.data]; [[self getView] mew_getUserDetailInfoSuccess:infoModel]; @@ -123,7 +123,7 @@ NSString * uid= [AccountInfoStorage instance].getUid; NSString * pageStr = [NSString stringWithFormat:@"%d", page]; NSString * pageSizeStr = [NSString stringWithFormat:@"%d", pageSize]; - [Api getattentionListCompletion:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [Api Mew_GetAttentionListCompletion:[self createHttpCompletion:^(BaseModel * _Nonnull data) { NSArray * array = [UserInfoModel mewModelsWithArray:data.data]; [[self getView] mew_getUserAttentionListSuccess:array state:state]; }fail:^(NSInteger code, NSString * _Nullable msg) { @@ -148,7 +148,7 @@ NSString *uid = [[AccountInfoStorage instance] getUid]; NSString *ticket = [[AccountInfoStorage instance] getTicket]; NSString *type = state ? @"1" : @"2"; - [Api attentionCompletion:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [Api Mew_AttentionCompletion:[self createHttpCompletion:^(BaseModel * _Nonnull data) { [[self getView] mew_attentionUserSuccess:state]; }] uid:uid likedUid:targetUid ticket:ticket type:type]; diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/MewHomeViewController.m b/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/MewHomeViewController.m index 8eb0a6c..d07c8e7 100644 --- a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/MewHomeViewController.m +++ b/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/MewHomeViewController.m @@ -15,7 +15,7 @@ #import "MewUserIntroductionView.h" #import "MewHomeFilterView.h" #import "MewVoiceGuideView.h" -#import "YMMineSettingViewController.h" +#import "MewMineSettingViewController.h" #import "MewMineCollectionViewController.h" #import "MewRechargeViewController.h" #import "MewSessionViewController.h" @@ -28,7 +28,7 @@ #import "MewHomePresenter.h" #import "MewHomeProtocol.h" /// Model -#import "FansInfoModel.h" +#import "MewFansInfoModel.h" #import "UserInfoModel.h" #import @@ -276,7 +276,7 @@ [self.navigationController pushViewController:collectController animated:NO]; } else { //设置 - YMMineSettingViewController *setVc = [[YMMineSettingViewController alloc]init]; + MewMineSettingViewController *setVc = [[MewMineSettingViewController alloc]init]; [self.navigationController pushViewController:setVc animated:NO]; } } diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewRightFollowVoiceView.m b/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewRightFollowVoiceView.m index c51dc97..a841ff4 100644 --- a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewRightFollowVoiceView.m +++ b/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewRightFollowVoiceView.m @@ -13,7 +13,7 @@ /// Tool #import "YMMacro.h" #import "MEWThemeColor.h" -#import "FansInfoModel.h" +#import "MewFansInfoModel.h" #import "UserInfoModel.h" #import "NSArray+MewSafe.h" diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Login/View/MewLoginNumberViewController.m b/yinmeng-ios/yinmeng-ios/Main/Mew/Login/View/MewLoginNumberViewController.m index 85191de..b3ac85f 100644 --- a/yinmeng-ios/yinmeng-ios/Main/Mew/Login/View/MewLoginNumberViewController.m +++ b/yinmeng-ios/yinmeng-ios/Main/Mew/Login/View/MewLoginNumberViewController.m @@ -8,7 +8,7 @@ #import "MewLoginNumberViewController.h" #import "MewLoginPhoneView.h" #import "MewLoginPasswordView.h" -#import "LoginForgetPasswordViewController.h" +#import "MewLoginForgetPasswordViewController.h" /// Third #import /// Tool @@ -52,6 +52,7 @@ #pragma mark - MewLoginPhoneViewDelegate /// 手机登录成功 - (void)mew_loginWithPhoneSuccess { + [self mew_disMissWithVC]; } @@ -62,7 +63,7 @@ } /// 忘记密码 - (void)forgetPassword { - LoginForgetPasswordViewController *controller = [[LoginForgetPasswordViewController alloc] init]; + MewLoginForgetPasswordViewController *controller = [[MewLoginForgetPasswordViewController alloc] init]; [self.navigationController pushViewController:controller animated:NO]; } diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Login/View/MewLoginViewController.m b/yinmeng-ios/yinmeng-ios/Main/Mew/Login/View/MewLoginViewController.m index 6b90492..c24b8ef 100644 --- a/yinmeng-ios/yinmeng-ios/Main/Mew/Login/View/MewLoginViewController.m +++ b/yinmeng-ios/yinmeng-ios/Main/Mew/Login/View/MewLoginViewController.m @@ -28,9 +28,9 @@ #import "Api+Login.h" #import "MewHtmlUrl.h" ///Present -#import "LoginPresenter.h" -#import "LoginProtocol.h" -#import "ThirdUserInfo.h" +#import "MewLoginPresenter.h" +#import "MewLoginProtocol.h" +#import "MewThirdUserInfo.h" @@ -76,8 +76,8 @@ typedef NS_ENUM(NSUInteger, XYLoginType) { @implementation MewLoginViewController -- (LoginPresenter *)createPresenter { - return [[LoginPresenter alloc] init]; +- (MewLoginPresenter *)createPresenter { + return [[MewLoginPresenter alloc] init]; } #pragma mark - Life Cycle @@ -229,7 +229,7 @@ typedef NS_ENUM(NSUInteger, XYLoginType) { -#pragma mark - LoginProtocol +#pragma mark - MewLoginProtocol - (void)mew_loginSuccess { [self dismissViewControllerAnimated:YES completion:nil]; [self showSuccessToast:@"登录成功"]; @@ -320,7 +320,7 @@ typedef NS_ENUM(NSUInteger, XYLoginType) { - (void)authorizationController:(ASAuthorizationController *)controller didCompleteWithAuthorization:(ASAuthorization *)authorization API_AVAILABLE(ios(13.0)) { if ([authorization.credential isKindOfClass:[ASAuthorizationAppleIDCredential class]]) { - ThirdUserInfo *userInfo = [[ThirdUserInfo alloc] init]; + MewThirdUserInfo *userInfo = [[MewThirdUserInfo alloc] init]; ASAuthorizationAppleIDCredential * credential = (ASAuthorizationAppleIDCredential *)authorization.credential; @@ -343,9 +343,10 @@ typedef NS_ENUM(NSUInteger, XYLoginType) { userInfo.userName = [NSString stringWithFormat:@"%@%@",fullName.familyName, fullName.givenName]; } - [AccountInfoStorage instance].thirdUserInfo = userInfo; + [AccountInfoStorage instance].MewThirdUserInfo = userInfo; [MewHUDTool showLoadingWithMessage:@"正在登录中"]; - [self.presenter thirdmew_loginWithApple:identityToken unionId:userID]; + [self.presenter mew_thirdLoginWithApple:identityToken unionId:userID]; + // [Api loginWithThirdPart:^(BaseModel * _Nonnull data, NSInteger code, NSString * _Nonnull msg) { // // diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Login/View/SubView/MewLoginPasswordView.m b/yinmeng-ios/yinmeng-ios/Main/Mew/Login/View/SubView/MewLoginPasswordView.m index 6e28824..6fc3674 100644 --- a/yinmeng-ios/yinmeng-ios/Main/Mew/Login/View/SubView/MewLoginPasswordView.m +++ b/yinmeng-ios/yinmeng-ios/Main/Mew/Login/View/SubView/MewLoginPasswordView.m @@ -16,25 +16,25 @@ #import "YMConstant.h" #import "YMMacro.h" ///View -#import "LoginInputView.h" +#import "MewLoginInputView.h" ///present -#import "LoginPasswordPresent.h" +#import "MewLoginPasswordPresent.h" /// protocol -#import "LoginPasswordProtocol.h" +#import "MewLoginPasswordProtocol.h" -@interface MewLoginPasswordView() +@interface MewLoginPasswordView() ///手机号 -@property (nonatomic,strong) LoginInputView *phoneView; +@property (nonatomic,strong) MewLoginInputView *phoneView; ///密码 -@property (nonatomic,strong) LoginInputView *codeView; +@property (nonatomic,strong) MewLoginInputView *codeView; ///忘记密码 @property (nonatomic,strong) UIButton *forgetPasswordButton; ///下一步 @property (nonatomic,strong) UIButton *nextButton; /// present -@property (nonatomic, strong) LoginPasswordPresent *present; +@property (nonatomic, strong) MewLoginPasswordPresent *present; @end @@ -51,7 +51,7 @@ } -#pragma mark - LoginPasswordProtocol +#pragma mark - MewLoginPasswordProtocol - (void)mew_phoneAndPasswordLoginSuccess { [MewHUDTool showSuccessWithMessage:@"登录成功"]; if (self.delegate) { @@ -78,7 +78,7 @@ return; } - [self.present loginWithPhone:self.phoneView.textField.text password:self.codeView.textField.text]; + [self.present mew_loginWithPhone:self.phoneView.textField.text password:self.codeView.textField.text]; } @@ -165,9 +165,9 @@ return _forgetPasswordButton; } -- (LoginInputView *)phoneView { +- (MewLoginInputView *)phoneView { if (!_phoneView) { - _phoneView = [[LoginInputView alloc] init]; + _phoneView = [[MewLoginInputView alloc] init]; _phoneView.backgroundColor = UIColor.whiteColor; _phoneView.layer.masksToBounds = YES; _phoneView.layer.cornerRadius = 45/2; @@ -185,9 +185,9 @@ return _phoneView; } -- (LoginInputView *)codeView { +- (MewLoginInputView *)codeView { if (!_codeView) { - _codeView = [[LoginInputView alloc] init]; + _codeView = [[MewLoginInputView alloc] init]; _codeView.backgroundColor = UIColor.whiteColor; _codeView.layer.masksToBounds = YES; _codeView.layer.cornerRadius = 51.0/2; @@ -203,9 +203,9 @@ return _codeView; } -- (LoginPasswordPresent *)present { +- (MewLoginPasswordPresent *)present { if (!_present) { - _present = [[LoginPasswordPresent alloc] init]; + _present = [[MewLoginPasswordPresent alloc] init]; [_present attatchView:self]; } return _present; diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Login/View/SubView/MewLoginPhoneView.m b/yinmeng-ios/yinmeng-ios/Main/Mew/Login/View/SubView/MewLoginPhoneView.m index c309c21..258be79 100644 --- a/yinmeng-ios/yinmeng-ios/Main/Mew/Login/View/SubView/MewLoginPhoneView.m +++ b/yinmeng-ios/yinmeng-ios/Main/Mew/Login/View/SubView/MewLoginPhoneView.m @@ -10,20 +10,20 @@ #import #import ///Presenter -#import "LoginVerifCodePresent.h" +#import "MewLoginVerifCodePresent.h" ///Protocole -#import "LoginVerifCodeProtocol.h" +#import "MewLoginVerifCodeProtocol.h" /// Tool #import "MEWThemeColor.h" #import "YMMacro.h" #import "MewHUDTool.h" #import "UIImage+Utils.h" /// View -#import "LoginInputView.h" +#import "MewLoginInputView.h" -@interface MewLoginPhoneView() +@interface MewLoginPhoneView() /// 手机号码输入框 -@property (nonatomic, strong) LoginInputView *phoneInputView; +@property (nonatomic, strong) MewLoginInputView *phoneInputView; @property (nonatomic, strong) NSString *phone; ///验证码输入框 @@ -40,7 +40,7 @@ @property (nonatomic, strong) UIButton *confirmButton; /// present -@property (nonatomic, strong) LoginVerifCodePresent *present; +@property (nonatomic, strong) MewLoginVerifCodePresent *present; /// 计时器 @property (strong, nonatomic) dispatch_source_t timer; @end @@ -64,7 +64,7 @@ } -#pragma mark - LoginVerifCodeProtocol +#pragma mark - MewLoginVerifCodeProtocol /// 获取验证码成功 - (void)mew_phoneSmsCodeSuccess { [MewHUDTool showErrorWithMessage:[NSString stringWithFormat:@"验证码已发送\n+86 %@", self.phone]]; @@ -96,7 +96,7 @@ return; } - [self.present phoneSmsCode:self.phone type:GetSmsType_Regist]; + [self.present mew_phoneSmsCode:self.phone type:GetSmsType_Regist]; } - (void)textFieldDidChange:(UITextField *)text { @@ -109,7 +109,7 @@ /// 下一步 - (void)mew_confirmButtonAction { - [self.present loginWithPhone:self.phone code:self.codeTextField.text]; + [self.present mew_loginWithPhone:self.phone code:self.codeTextField.text]; } #pragma mark - Private Method @@ -244,9 +244,9 @@ } #pragma mark - Get -- (LoginInputView *)phoneInputView { +- (MewLoginInputView *)phoneInputView { if (!_phoneInputView) { - _phoneInputView = [[LoginInputView alloc] init]; + _phoneInputView = [[MewLoginInputView alloc] init]; _phoneInputView.backgroundColor = [MEWThemeColor mewColorWithHexString:@"#F8F8FB"]; _phoneInputView.layer.cornerRadius = 51.0/2; _phoneInputView.layer.masksToBounds = YES; @@ -323,9 +323,9 @@ } -- (LoginVerifCodePresent *)present { +- (MewLoginVerifCodePresent *)present { if (!_present) { - _present = [[LoginVerifCodePresent alloc] init]; + _present = [[MewLoginVerifCodePresent alloc] init]; [_present attatchView:self]; } return _present; diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Mine/View/MewMineCollectionViewController.m b/yinmeng-ios/yinmeng-ios/Main/Mew/Mine/View/MewMineCollectionViewController.m index 2b20138..0ea8bd4 100644 --- a/yinmeng-ios/yinmeng-ios/Main/Mew/Mine/View/MewMineCollectionViewController.m +++ b/yinmeng-ios/yinmeng-ios/Main/Mew/Mine/View/MewMineCollectionViewController.m @@ -15,18 +15,18 @@ #import #import "NSArray+MEWSafe.h" ///P -#import "YMMineCollectRoomProtocol.h" -#import "YMMineCollectRoomPresenter.h" +#import "MewMineCollectRoomProtocol.h" +#import "MewMineCollectRoomPresenter.h" #import "Api+Mine.h" /// Model -#import "MineCollectRoomModel.h" +#import "MewMineCollectRoomModel.h" -@interface MewMineCollectionViewController () +@interface MewMineCollectionViewController () @property (nonatomic, strong) UITableView *collectionTableView; /// 收藏数据 -@property (nonatomic, strong) NSMutableArray *collectionModels; +@property (nonatomic, strong) NSMutableArray *collectionModels; ///当前页数 @property (nonatomic,assign) int page; ///更多数据 @@ -36,8 +36,8 @@ @implementation MewMineCollectionViewController -- (YMMineCollectRoomPresenter *)createPresenter { - return [[YMMineCollectRoomPresenter alloc] init]; +- (MewMineCollectRoomPresenter *)createPresenter { + return [[MewMineCollectRoomPresenter alloc] init]; } #pragma mark - Life Cycle @@ -93,7 +93,7 @@ /// 头部开始刷新 - (void)mew_headerRefresh { self.page = 1; - [self.presenter getCollectRoomList:self.page pageSize:20 state:0 type:@"1"]; + [self.presenter mew_getCollectRoomList:self.page pageSize:20 state:0 type:@"1"]; } // 底部加载更多 @@ -104,11 +104,11 @@ } self.page++; - [self.presenter getCollectRoomList:self.page pageSize:20 state:1 type:@"1"]; + [self.presenter mew_getCollectRoomList:self.page pageSize:20 state:1 type:@"1"]; } -#pragma mark - YMMineCollectRoomProtocol +#pragma mark - MewMineCollectRoomProtocol // 获取收藏房间成功 - (void)mew_fonGetCollectRoomListSuccess:(NSArray *)array state:(int)state { if (state == 0) { @@ -149,7 +149,7 @@ return _collectionTableView; } -- (NSMutableArray *)collectionModels { +- (NSMutableArray *)collectionModels { if (!_collectionModels) { _collectionModels = [NSMutableArray array]; } diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Mine/View/MewRechargeSubView.h b/yinmeng-ios/yinmeng-ios/Main/Mew/Mine/View/MewRechargeSubView.h index c59ba90..31249b5 100644 --- a/yinmeng-ios/yinmeng-ios/Main/Mew/Mine/View/MewRechargeSubView.h +++ b/yinmeng-ios/yinmeng-ios/Main/Mew/Mine/View/MewRechargeSubView.h @@ -6,7 +6,7 @@ // #import -@class RechargeListModel, WalletInfoModel; +@class MewRechargeListModel, MewWalletInfoModel; NS_ASSUME_NONNULL_BEGIN @@ -20,9 +20,9 @@ NS_ASSUME_NONNULL_BEGIN @interface MewRechargeSubView : UIView // 充值模型 -@property (nonatomic, copy) NSArray *rechargeModels; +@property (nonatomic, copy) NSArray *rechargeModels; // 钱包 -@property (nonatomic, strong) WalletInfoModel *walletModel; +@property (nonatomic, strong) MewWalletInfoModel *walletModel; @property (nonatomic, weak) id delegate; @end diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Mine/View/MewRechargeSubView.m b/yinmeng-ios/yinmeng-ios/Main/Mew/Mine/View/MewRechargeSubView.m index b38baca..1b0f53c 100644 --- a/yinmeng-ios/yinmeng-ios/Main/Mew/Mine/View/MewRechargeSubView.m +++ b/yinmeng-ios/yinmeng-ios/Main/Mew/Mine/View/MewRechargeSubView.m @@ -7,8 +7,8 @@ #import "MewRechargeSubView.h" /// Model -#import "RechargeListModel.h" -#import "WalletInfoModel.h" +#import "MewRechargeListModel.h" +#import "MewWalletInfoModel.h" /// Third #import #import @@ -33,7 +33,7 @@ @property (nonatomic,strong) YYLabel *rechargePrivacyLabel; //@property (nonatomic, strong) UIStackView *rechargeStackView; @property (nonatomic, strong) UIButton *rechargeButton; -@property (nonatomic, strong) RechargeListModel *selectModel; +@property (nonatomic, strong) MewRechargeListModel *selectModel; @property (nonatomic, assign) NSInteger index; @end @@ -82,12 +82,12 @@ } #pragma mark - Set -- (void)setWalletModel:(WalletInfoModel *)walletModel { +- (void)setWalletModel:(MewWalletInfoModel *)walletModel { _walletModel = walletModel; self.balanceMoneyLabel.text = _walletModel.diamonds; } -- (void)setRechargeModels:(NSArray *)rechargeModels { +- (void)setRechargeModels:(NSArray *)rechargeModels { _rechargeModels = rechargeModels; [self mew_initRechargeViewWithModels:_rechargeModels]; } @@ -105,14 +105,14 @@ [self mew_initLayout]; } -- (void)mew_initRechargeViewWithModels:(NSArray *)rechargeModel { +- (void)mew_initRechargeViewWithModels:(NSArray *)rechargeModel { CGFloat viewWidth = 144.0; CGFloat viewHeight = 83; CGFloat marginX = 23.0; CGFloat marginLeft = (KScreenWidth - 2*viewWidth - marginX)/2.0; CGFloat marginTop = 20.0; for (int i = 0; i < rechargeModel.count; i++) { - RechargeListModel *model = rechargeModel[i]; + MewRechargeListModel *model = rechargeModel[i]; UIView *rechargeBgView = [[UIView alloc] init]; rechargeBgView.frame = CGRectMake((i%2 * (viewWidth + marginX)) + marginLeft, i/2 * (viewHeight + marginTop), viewWidth, viewHeight); diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Mine/View/MewRechargeViewController.m b/yinmeng-ios/yinmeng-ios/Main/Mew/Mine/View/MewRechargeViewController.m index 8770e5f..cb49004 100644 --- a/yinmeng-ios/yinmeng-ios/Main/Mew/Mine/View/MewRechargeViewController.m +++ b/yinmeng-ios/yinmeng-ios/Main/Mew/Mine/View/MewRechargeViewController.m @@ -14,16 +14,16 @@ #import "YMMacro.h" #import "AccountInfoStorage.h" -#import "RechargeListModel.h" +#import "MewRechargeListModel.h" /// P -#import "MineRechargeProtocol.h" -#import "MineRechargePresenter.h" +#import "MewMineRechargeProtocol.h" +#import "MewMineRechargePresenter.h" #import "MewHUDTool.h" #import "yinmeng_ios-Swift.h" #import "MEWRechargeStorage.h" #import "NewEncryptTool.h" -@interface MewRechargeViewController () +@interface MewRechargeViewController () @property (nonatomic, strong) UIImageView *rechargeBgImageView; @property (nonatomic, strong) UIButton *backButton; @property (nonatomic, strong) MewRechargeSubView *rechageView; @@ -39,8 +39,8 @@ } -- (MineRechargePresenter *)createPresenter { - return [[MineRechargePresenter alloc] init]; +- (MewMineRechargePresenter *)createPresenter { + return [[MewMineRechargePresenter alloc] init]; } - (void)dealloc { @@ -59,16 +59,16 @@ #pragma mark - Load Data - (void)mew_loadData { - [self.presenter requestRechargeListWithChannel:@"8"]; - [self.presenter getUserWalletInfo]; + [self.presenter mew_requestRechargeListWithChannel:@"8"]; + [self.presenter mew_getUserWalletInfo]; } -#pragma mark - MineRechargeProtocol -- (void)getUserWalletInfo:(WalletInfoModel *)balanceInfo { +#pragma mark - MewMineRechargeProtocol +- (void)mew_getUserWalletInfo:(MewWalletInfoModel *)balanceInfo { self.rechageView.walletModel = balanceInfo; } -- (void)requestRechargeListSucccess:(NSArray *)list { +- (void)mew_requestRechargeListSucccess:(NSArray *)list { self.rechageView.rechargeModels = list; } @@ -143,7 +143,7 @@ ///保存唯一凭证 [self mew_saveRechageReciptWithTransactionIdentifier:transactionIdentifier]; ///二次验证 - [self.presenter checkReceiptWithOrderId:self.orderId transcationId:transactionIdentifier errorToast:YES]; + [self.presenter mew_checkReceiptWithOrderId:self.orderId transcationId:transactionIdentifier errorToast:YES]; } ///二次校验成功 - (void)mew_checkReceiptSuccess:(NSString *)transcationId { @@ -163,7 +163,7 @@ [MewHUDTool hideHUD]; ///刷新一下用户的信息 - [self.presenter getUserWalletInfo]; + [self.presenter mew_getUserWalletInfo]; }); } @@ -214,7 +214,7 @@ - (void)mew_didSelectMewRechargeChargeProdId:(NSInteger )index { [MewHUDTool showLoadingInView:kWindow]; NSString *prodId = self.rechageView.rechargeModels[index].chargeProdId; - [self.presenter requestIAPRechargeOrderWithChargeProdId:[NSString stringWithFormat:@"%@",prodId]]; + [self.presenter mew_requestIAPRechargeOrderWithChargeProdId:[NSString stringWithFormat:@"%@",prodId]]; } /// 选中用户协议 - (void)didSelectMewRechargeProtocol { diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Party/View/MewPartyListCollectionViewCell.m b/yinmeng-ios/yinmeng-ios/Main/Mew/Party/View/MewPartyListCollectionViewCell.m index cd0a152..2bc7d02 100644 --- a/yinmeng-ios/yinmeng-ios/Main/Mew/Party/View/MewPartyListCollectionViewCell.m +++ b/yinmeng-ios/yinmeng-ios/Main/Mew/Party/View/MewPartyListCollectionViewCell.m @@ -129,6 +129,7 @@ _lookBgView.backgroundColor = UIColorMewRGBAlpha(0xFFFFFF, 0.6); _lookBgView.layer.cornerRadius = 4; _lookBgView.layer.masksToBounds = YES; + _lookBgView.hidden = YES; } return _lookBgView; } diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Room/View/MewRoomViewController.m b/yinmeng-ios/yinmeng-ios/Main/Mew/Room/View/MewRoomViewController.m index 5455c65..02f2678 100644 --- a/yinmeng-ios/yinmeng-ios/Main/Mew/Room/View/MewRoomViewController.m +++ b/yinmeng-ios/yinmeng-ios/Main/Mew/Room/View/MewRoomViewController.m @@ -19,7 +19,7 @@ #import "UserInfoModel.h" #import "MewRoomInfoModel.h" #import "MewMessageInfoModel.h" -#import "AttachmentModel.h" +#import "MewAttachmentModel.h" #import "MicroQueueModel.h" #import "MewGiftInfoModel.h" #import "MewGiftReceiveInfoModel.h" @@ -29,7 +29,7 @@ #import "MEWHUDTool.h" #import "YMMacro.h" #import "NSArray+MEWSafe.h" -#import "RtcManager.h" +#import "MewRtcManager.h" ///P #import "MewRoomPresenter.h" #import "MewRoomProtocol.h" @@ -169,7 +169,7 @@ [self.roomMessageView mew_handleNIMNotificationMessage:message]; } else if (message.messageType == NIMMessageTypeCustom) { NIMCustomObject *obj = (NIMCustomObject *)message.messageObject; - if (obj.attachment != nil && [obj.attachment isKindOfClass:[AttachmentModel class]]) { + if (obj.attachment != nil && [obj.attachment isKindOfClass:[MewAttachmentModel class]]) { [self.roomStageView mew_handleNIMCustomMessage:message]; [self.roomAnimationView mew_handleNIMCustomMessage:message]; @@ -201,7 +201,7 @@ if (message.messageType == NIMMessageTypeCustom) { NIMCustomObject *obj = (NIMCustomObject *)message.messageObject; - if (obj.attachment != nil && [obj.attachment isKindOfClass:[AttachmentModel class]]) { + if (obj.attachment != nil && [obj.attachment isKindOfClass:[MewAttachmentModel class]]) { [self.roomStageView mew_handleNIMCustomMessage:message]; [self.roomAnimationView mew_handleNIMCustomMessage:message]; [self.roomMessageView mew_handleNIMCustomMessage:message]; @@ -240,7 +240,7 @@ [self.roomAnimationView mew_resumeAnimationTimer]; // 默认模式下 [self.presenter mew_exitNIMCurrentRoom:[NSString stringWithFormat:@"%ld", self.roomInfo.roomId]]; - [[RtcManager instance] exitRoom]; + [[MewRtcManager instance] mew_exitRoom]; [self.presenter mew_reportUserOutRoom:[NSString stringWithFormat:@"%ld",self.roomInfo.uid]]; [self dismissViewControllerAnimated:YES completion:nil]; @@ -250,7 +250,7 @@ return self.navigationController; } -- (void)microQueueUpdate:(NSMutableDictionary *)queue { +- (void)mew_microQueueUpdate:(NSMutableDictionary *)queue { BOOL isOnMic = false; for (MicroQueueModel * info in queue.allValues) { if (info.userInfo.uid > 0 && [AccountInfoStorage instance].getUid.integerValue == info.userInfo.uid) { @@ -347,8 +347,8 @@ ///单人 NSMutableDictionary *data = [NSMutableDictionary dictionary]; [data addEntriesFromDictionary:originDic]; - AttachmentModel *attchment = [[AttachmentModel alloc] init]; - attchment.first = CustomMessageType_Gift; + MewAttachmentModel *attchment = [[MewAttachmentModel alloc] init]; + attchment.first = Mew_CustomMessageType_Gift; attchment.second = Custom_Message_Sub_Gift_Send; NSDictionary *targetUsers = ((NSArray *)[data objectForKey:@"targetUsers"]).firstObject; [data setObject:[targetUsers valueForKeyPath:@"uid"] forKey:@"targetUid"]; @@ -358,7 +358,7 @@ [self sendCustomMessage:attchment]; } -- (void)sendCustomMessage:(AttachmentModel *)attachment { +- (void)sendCustomMessage:(MewAttachmentModel *)attachment { NSString *sessionID = [NSString stringWithFormat:@"%ld", [self mew_getRoomInformation].roomId]; NIMMessage *message = [[NIMMessage alloc] init]; NIMCustomObject *object = [[NIMCustomObject alloc] init]; diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Room/View/RoomHeaderView/MewRoomHeaderView.m b/yinmeng-ios/yinmeng-ios/Main/Mew/Room/View/RoomHeaderView/MewRoomHeaderView.m index 1dc2f2d..4758bf7 100644 --- a/yinmeng-ios/yinmeng-ios/Main/Mew/Room/View/RoomHeaderView/MewRoomHeaderView.m +++ b/yinmeng-ios/yinmeng-ios/Main/Mew/Room/View/RoomHeaderView/MewRoomHeaderView.m @@ -12,7 +12,7 @@ #import "AccountInfoStorage.h" #import "Api+Room.h" #import "NSMutableDictionary+MewSafe.h" -#import "AttachmentModel.h" +#import "MewAttachmentModel.h" #import "UserInfoModel.h" #import "MEWHUDTool.h" diff --git a/yinmeng-ios/yinmeng-ios/Main/Tabbar/View/TabbarViewController.m b/yinmeng-ios/yinmeng-ios/Main/Tabbar/View/TabbarViewController.m index 3e162ec..95166ed 100644 --- a/yinmeng-ios/yinmeng-ios/Main/Tabbar/View/TabbarViewController.m +++ b/yinmeng-ios/yinmeng-ios/Main/Tabbar/View/TabbarViewController.m @@ -23,7 +23,7 @@ #import "BaseNavigationController.h" #import "BaseViewController.h" #import "MewLoginViewController.h" -#import "LoginFullInfoViewController.h" +#import "MewLoginFullInfoViewController.h" #import "MewPartyViewController.h" #import "MewSessionListViewController.h" #import "MewHomeViewController.h" @@ -178,7 +178,7 @@ NSString * const kNetworkReachabilityKey = @"kNetworkReachabilityKey"; //补充用户信息 - (void)completeUserInfo { - LoginFullInfoViewController * bindPhoneVC = [[LoginFullInfoViewController alloc] init]; + MewLoginFullInfoViewController * bindPhoneVC = [[MewLoginFullInfoViewController alloc] init]; BaseNavigationController * nav = [[BaseNavigationController alloc] initWithRootViewController:bindPhoneVC]; nav.modalPresentationStyle = UIModalPresentationFullScreen; [self.navigationController presentViewController:nav animated:YES completion:nil]; diff --git a/yinmeng-ios/yinmeng-ios/Main/YMWebViewController.m b/yinmeng-ios/yinmeng-ios/Main/YMWebViewController.m index d473ccb..cb6f7da 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YMWebViewController.m +++ b/yinmeng-ios/yinmeng-ios/Main/YMWebViewController.m @@ -152,7 +152,7 @@ NSString * const kCancelAccount = @"cancelAccount"; } else if ([message.name isEqualToString:kCancelAccount]) { [MewHUDTool showLoadingWithMessage:@"正在注销中，请稍等"]; AccountModel *model = [[AccountInfoStorage instance] accountModel]; - [Api logoutCurrentAccount:^(BaseModel * _Nonnull data, NSInteger code, NSString * _Nonnull msg) { + [Api Mew_LogoutCurrentAccount:^(BaseModel * _Nonnull data, NSInteger code, NSString * _Nonnull msg) { [MewHUDTool showSuccessWithMessage:@"注销成功"]; dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ [self.navigationController popToRootViewControllerAnimated:NO]; @@ -180,7 +180,7 @@ NSString * const kCancelAccount = @"cancelAccount"; return; } if (![_url hasPrefix:@"http"] && ![_url hasPrefix:@"https"]){ - _url = [NSString stringWithFormat:@"%@/%@", [NewEncryptTool MEW_aesDecrypt:API_HOST_H5_URL], _url]; + _url = [NSString stringWithFormat:@"%@/%@", API_HOST_H5_URL, _url]; } _url = [NSString stringWithFormat:@"%@?platform=%@", _url, [YYUtility appName]]; diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/IM/Model/AttachmentModel.h b/yinmeng-ios/yinmeng-ios/Main/YinMeng/IM/Model/MewAttachmentModel.h similarity index 68% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/IM/Model/AttachmentModel.h rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/IM/Model/MewAttachmentModel.h index 317db47..c336d60 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/IM/Model/AttachmentModel.h +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/IM/Model/MewAttachmentModel.h @@ -1,5 +1,5 @@ // -// AttachmentModel.h +// MewAttachmentModel.h // mew-ios // // Created by 触海 on 2023/11/20. @@ -9,35 +9,35 @@ #import NS_ASSUME_NONNULL_BEGIN -typedef NS_ENUM(NSUInteger, CustomMessageType) { +typedef NS_ENUM(NSUInteger, Mew_CustomMessageType) { ///房间提示 - CustomMessageType_Room_Tip = 2, + Mew_CustomMessageType_Room_Tip = 2, ///送礼物的接口 - CustomMessageType_Gift = 3, + Mew_CustomMessageType_Gift = 3, ///队列操作 - CustomMessageType_Queue = 8, + Mew_CustomMessageType_Queue = 8, ///表情 - CustomMessageType_Face = 9, + Mew_CustomMessageType_Face = 9, ///全麦送 - CustomMessageType_AllMicroSend = 12, + Mew_CustomMessageType_AllMicroSend = 12, ///踢出房间 - CustomMessageType_Kick_User = 18, + Mew_CustomMessageType_Kick_User = 18, ///小秘书消息 - CustomMessageType_Secretary = 19, + Mew_CustomMessageType_Secretary = 19, ///房间礼物值 - CustomMessageType_Room_GiftValue = 42, + Mew_CustomMessageType_Room_GiftValue = 42, }; -///first = CustomMessageType_Room_Tip -typedef NS_ENUM(NSUInteger, CustomMessageSubRoomTip) { +///first = Mew_CustomMessageType_Room_Tip +typedef NS_ENUM(NSUInteger, MewCustomMessageSubRoomTip) { ///分享房间 Custom_Message_Sub_Room_Tip_ShareRoom = 21, ///关注房主 Custom_Message_Sub_Room_Tip_Attention_Owner = 22, }; -///first = CustomMessageType_Gift +///first = Mew_CustomMessageType_Gift typedef NS_ENUM(NSUInteger, CustomMessageSubGift) { ///发送礼物 Custom_Message_Sub_Gift_Send = 31, @@ -47,19 +47,19 @@ typedef NS_ENUM(NSUInteger, CustomMessageSubGift) { Custom_Message_Sub_Gift_LuckySend = 34, }; -///first = CustomMessageType_Queue +///first = Mew_CustomMessageType_Queue typedef NS_ENUM(NSInteger, CustomMessageSubQueue) { ///踢下麦 Custom_Message_Sub_Queue_Kick = 82, }; -//first = CustomMessageType_Face +//first = Mew_CustomMessageType_Face typedef NS_ENUM(NSUInteger, CustomMessageSubFace) { ///发送 Custom_Message_Sub_Face_Send = 91, }; -///first = CustomMessageType_ALLMicroSend +///first = Mew_CustomMessageType_ALLMicroSend typedef NS_ENUM(NSUInteger, CustomMessageSubAllMicroSend) { ///全麦送礼物 Custom_Message_Sub_AllMicroSend = 121, @@ -72,7 +72,7 @@ typedef NS_ENUM(NSUInteger, CustomMessageSubAllMicroSend) { }; -///first = CustomMessageType_Kick_User +///first = Mew_CustomMessageType_Kick_User typedef NS_ENUM(NSUInteger, CustomNotificationSubKick) { ///拉黑 Custom_Message_Sub_Kick_BlackList = 182, @@ -81,13 +81,13 @@ typedef NS_ENUM(NSUInteger, CustomNotificationSubKick) { }; -///first = CustomMessageType_Room_GiftValue +///first = Mew_CustomMessageType_Room_GiftValue typedef NS_ENUM(NSUInteger, CustomMessageSubRoomGiftValue) { ///礼物值同步 Custom_Message_Sub_Room_GiftValue_Sync = 421 }; -@interface AttachmentModel : NSObject +@interface MewAttachmentModel : NSObject @property (nonatomic,assign) int first; @property (nonatomic,assign) int second; @property (nonatomic, strong) id data; diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/IM/Model/AttachmentModel.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/IM/Model/MewAttachmentModel.m similarity index 65% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/IM/Model/AttachmentModel.m rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/IM/Model/MewAttachmentModel.m index ba907dd..9631c77 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/IM/Model/AttachmentModel.m +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/IM/Model/MewAttachmentModel.m @@ -1,14 +1,14 @@ // -// AttachmentModel.m +// MewAttachmentModel.m // mew-ios // // Created by 触海 on 2023/11/20. // -#import "AttachmentModel.h" +#import "MewAttachmentModel.h" #import "NSObject+MEWExtension.h" -@implementation AttachmentModel +@implementation MewAttachmentModel - (NSString *)encodeAttachment { return [self mewToJSONString]; } diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/IM/Tool/CustomAttachmentDecoder.h b/yinmeng-ios/yinmeng-ios/Main/YinMeng/IM/Tool/MewCustomAttachmentDecoder.h similarity index 61% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/IM/Tool/CustomAttachmentDecoder.h rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/IM/Tool/MewCustomAttachmentDecoder.h index cb0c68b..5b4d500 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/IM/Tool/CustomAttachmentDecoder.h +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/IM/Tool/MewCustomAttachmentDecoder.h @@ -1,5 +1,5 @@ // -// CustomAttachmentDecoder.h +// MewCustomAttachmentDecoder.h // mew-ios // // Created by 触海 on 2023/11/20. @@ -10,7 +10,7 @@ NS_ASSUME_NONNULL_BEGIN -@interface CustomAttachmentDecoder : NSObject +@interface MewCustomAttachmentDecoder : NSObject @end diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/IM/Tool/CustomAttachmentDecoder.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/IM/Tool/MewCustomAttachmentDecoder.m similarity index 87% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/IM/Tool/CustomAttachmentDecoder.m rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/IM/Tool/MewCustomAttachmentDecoder.m index 67ad371..3d22c84 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/IM/Tool/CustomAttachmentDecoder.m +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/IM/Tool/MewCustomAttachmentDecoder.m @@ -1,15 +1,15 @@ // -// CustomAttachmentDecoder.m +// MewCustomAttachmentDecoder.m // mew-ios // // Created by 触海 on 2023/11/20. // -#import "CustomAttachmentDecoder.h" +#import "MewCustomAttachmentDecoder.h" #import "NSObject+MEWExtension.h" -#import "AttachmentModel.h" +#import "MewAttachmentModel.h" -@implementation CustomAttachmentDecoder +@implementation MewCustomAttachmentDecoder - (id)decodeAttachment:(NSString *)content { id attachment; @@ -24,7 +24,7 @@ data = [self dictionaryWithJsonString:(NSString *)data]; } if ([data isKindOfClass:[NSDictionary class]]) { - AttachmentModel *attachment = [[AttachmentModel alloc]init]; + MewAttachmentModel *attachment = [[MewAttachmentModel alloc]init]; attachment.first = (short)first; attachment.second = (short)second; attachment.data = data; diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Api/Api+Login.h b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Api/Api+Login.h index cfd100d..393f61f 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Api/Api+Login.h +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Api/Api+Login.h @@ -15,14 +15,14 @@ NS_ASSUME_NONNULL_BEGIN /// @param completion 完成 /// @param accessToken accessToken /// @param token token -+ (void)phoneQuickLogin:(HttpRequestHelperCompletion)completion ++ (void)Mew_PhoneQuickLogin:(HttpRequestHelperCompletion)completion accessToken:(NSString *)accessToken token:(NSString *)token; /// 手机验证码登录 /// @param completion 完成 /// @param phone 手机号 /// @param code 验证码 -+ (void)loginWithCode:(HttpRequestHelperCompletion)completion ++ (void)Mew_LoginWithCode:(HttpRequestHelperCompletion)completion phone:(NSString *)phone code:(NSString *)code client_secret:(NSString *)client_secret @@ -34,7 +34,7 @@ NS_ASSUME_NONNULL_BEGIN /// @param completion 完成 /// @param phone 手机号 /// @param password 验证码 -+ (void)loginWithPassword:(HttpRequestHelperCompletion)completion ++ (void)Mew_LoginWithPassword:(HttpRequestHelperCompletion)completion phone:(NSString *)phone password:(NSString *)password client_secret:(NSString *)client_secret @@ -47,7 +47,7 @@ NS_ASSUME_NONNULL_BEGIN /// @param phone 手机号 /// @param newPwd 新的密码 /// @param smsCode 验证码 -+ (void)resetPasswordWithPhone:(HttpRequestHelperCompletion)complction ++ (void)Mew_ResetPasswordWithPhone:(HttpRequestHelperCompletion)complction phone:(NSString *)phone newPwd:(NSString *)newPwd smsCode:(NSString *)smsCode; @@ -58,7 +58,7 @@ NS_ASSUME_NONNULL_BEGIN /// @param unionid unionid /// @param access_token access_token /// @param type 第三方登录的类型 -+ (void)loginWithThirdPart:(HttpRequestHelperCompletion)complction ++ (void)Mew_LoginWithThirdPart:(HttpRequestHelperCompletion)complction openid:(NSString *)openid unionid:(NSString *)unionid access_token:(NSString *)access_token @@ -66,14 +66,14 @@ NS_ASSUME_NONNULL_BEGIN /// 随机获取一个昵称 /// @param completion 完成 -+ (void)randomNick:(HttpRequestHelperCompletion)completion; ++ (void)Mew_RandomNick:(HttpRequestHelperCompletion)completion; /// 绑定手机号码 /// @param complection 完成 /// @param phone 手机号 /// @param code 验证码 /// @param ticket ticket -+ (void)bindMoblieCode:(HttpRequestHelperCompletion)complection ++ (void)Mew_BindMoblieCode:(HttpRequestHelperCompletion)complection phone:(NSString *)phone code:(NSString *)code ticket:(NSString *)ticket; diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Api/Api+Login.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Api/Api+Login.m index be7ff6b..5967c6b 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Api/Api+Login.m +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Api/Api+Login.m @@ -9,7 +9,7 @@ #import "NewEncryptTool.h" @implementation Api (Login) /// 一键登录 -+ (void)phoneQuickLogin:(HttpRequestHelperCompletion)completion accessToken:(NSString *)accessToken token:(NSString *)token { ++ (void)Mew_PhoneQuickLogin:(HttpRequestHelperCompletion)completion accessToken:(NSString *)accessToken token:(NSString *)token { NSString *getUrl = [NewEncryptTool MEW_aesDecrypt:@"5OuUEI/lxBioS84/A1+LB6USUuyY1yofu3VeNn4bGRA="];///acc/oneclick/login [self makeRequest:getUrl method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, accessToken, token, nil]; } @@ -18,7 +18,7 @@ /// @param completion 完成 /// @param phone 手机号 /// @param code 验证码 -+ (void)loginWithCode:(HttpRequestHelperCompletion)completion phone:(NSString *)phone code:(NSString *)code client_secret:(NSString *)client_secret version:(NSString *)version client_id:(NSString *)client_id grant_type:(NSString *)grant_type { ++ (void)Mew_LoginWithCode:(HttpRequestHelperCompletion)completion phone:(NSString *)phone code:(NSString *)code client_secret:(NSString *)client_secret version:(NSString *)version client_id:(NSString *)client_id grant_type:(NSString *)grant_type { NSString *getUrl = [NewEncryptTool MEW_aesDecrypt:@"QFgInRYQSkXdbIyvBsVUvA=="];////oauth/token [self makeRequest:getUrl method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__,phone,code,client_secret,version, client_id, grant_type, nil]; } @@ -27,7 +27,7 @@ /// @param completion 完成 /// @param phone 手机号 /// @param password 验证码 -+ (void)loginWithPassword:(HttpRequestHelperCompletion)completion phone:(NSString *)phone password:(NSString *)password client_secret:(NSString *)client_secret version:(NSString *)version client_id:(NSString *)client_id grant_type:(NSString *)grant_type { ++ (void)Mew_LoginWithPassword:(HttpRequestHelperCompletion)completion phone:(NSString *)phone password:(NSString *)password client_secret:(NSString *)client_secret version:(NSString *)version client_id:(NSString *)client_id grant_type:(NSString *)grant_type { NSString *getUrl = [NewEncryptTool MEW_aesDecrypt:@"QFgInRYQSkXdbIyvBsVUvA=="];///oauth/token [self makeRequest:getUrl method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__,phone,password,client_secret,version, client_id, grant_type, nil]; } @@ -37,7 +37,7 @@ /// @param phone 手机号 /// @param newPwd 新的密码 /// @param smsCode 验证码 -+ (void)resetPasswordWithPhone:(HttpRequestHelperCompletion)completion phone:(NSString *)phone newPwd:(NSString *)newPwd smsCode:(NSString *)smsCode { ++ (void)Mew_ResetPasswordWithPhone:(HttpRequestHelperCompletion)completion phone:(NSString *)phone newPwd:(NSString *)newPwd smsCode:(NSString *)smsCode { NSString *getUrl = [NewEncryptTool MEW_aesDecrypt:@"ZstXKg9XrXuRUPW6jNgkzQ=="];///acc/pwd/reset [self makeRequest:getUrl method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, phone, newPwd, smsCode, nil]; } @@ -49,14 +49,14 @@ /// @param unionid unionid /// @param access_token access_token /// @param type 第三方登录的类型 -+ (void)loginWithThirdPart:(HttpRequestHelperCompletion)completion openid:(NSString *)openid unionid:(NSString *)unionid access_token:(NSString *)access_token type:(NSString *)type { ++ (void)Mew_LoginWithThirdPart:(HttpRequestHelperCompletion)completion openid:(NSString *)openid unionid:(NSString *)unionid access_token:(NSString *)access_token type:(NSString *)type { NSString *getUrl = [NewEncryptTool MEW_aesDecrypt:@"jenVNOO6MbwSC77wnPIMng=="];///acc/third/login [self makeRequest:getUrl method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, openid, unionid, access_token, type, nil]; } /// 随机获取一个昵称 /// @param completion 完成 -+ (void)randomNick:(HttpRequestHelperCompletion)completion { ++ (void)Mew_RandomNick:(HttpRequestHelperCompletion)completion { NSString *getUrl = [NewEncryptTool MEW_aesDecrypt:@"7oWMT+wxmM3FF/aCDKLrRw=="];////random/nick/get [self makeRequest:getUrl method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, nil]; } @@ -66,7 +66,7 @@ /// @param phone 手机号 /// @param code 验证码 /// @param ticket ticket -+ (void)bindMoblieCode:(HttpRequestHelperCompletion)complection ++ (void)Mew_BindMoblieCode:(HttpRequestHelperCompletion)complection phone:(NSString *)phone code:(NSString *)code ticket:(NSString *)ticket { diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Model/ThirdUserInfo.h b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Model/MewThirdUserInfo.h similarity index 81% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Model/ThirdUserInfo.h rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Model/MewThirdUserInfo.h index 313d9d7..34453c2 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Model/ThirdUserInfo.h +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Model/MewThirdUserInfo.h @@ -1,5 +1,5 @@ // -// ThirdUserInfo.h +// MewThirdUserInfo.h // mew-ios // // Created by 触海 on 2023/11/6. @@ -9,7 +9,7 @@ NS_ASSUME_NONNULL_BEGIN -@interface ThirdUserInfo : NSObject +@interface MewThirdUserInfo : NSObject ///用户名 @property (nonatomic,copy) NSString *userName; diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Model/MewThirdUserInfo.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Model/MewThirdUserInfo.m new file mode 100644 index 0000000..63d68e0 --- /dev/null +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Model/MewThirdUserInfo.m @@ -0,0 +1,12 @@ +// +// MewThirdUserInfo.m +// mew-ios +// +// Created by 触海 on 2023/11/6. +// + +#import "MewThirdUserInfo.h" + +@implementation MewThirdUserInfo + +@end diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Model/ThirdUserInfo.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Model/ThirdUserInfo.m deleted file mode 100644 index de19ea0..0000000 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Model/ThirdUserInfo.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// ThirdUserInfo.m -// mew-ios -// -// Created by 触海 on 2023/11/6. -// - -#import "ThirdUserInfo.h" - -@implementation ThirdUserInfo - -@end diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/LoginBindPhonePresent.h b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginBindPhonePresent.h similarity index 63% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/LoginBindPhonePresent.h rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginBindPhonePresent.h index 797faf8..a699597 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/LoginBindPhonePresent.h +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginBindPhonePresent.h @@ -1,5 +1,5 @@ // -// LoginBindPhonePresent.h +// MewLoginBindPhonePresent.h // yinmeng-ios // // Created by 触海 on 2023/11/22. @@ -9,7 +9,7 @@ NS_ASSUME_NONNULL_BEGIN -@interface LoginBindPhonePresent : BaseMvpPresenter +@interface MewLoginBindPhonePresent : BaseMvpPresenter @end diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/LoginBindPhonePresent.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginBindPhonePresent.m similarity index 59% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/LoginBindPhonePresent.m rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginBindPhonePresent.m index cf92cdc..f5edfb1 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/LoginBindPhonePresent.m +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginBindPhonePresent.m @@ -1,13 +1,13 @@ // -// LoginBindPhonePresent.m +// MewLoginBindPhonePresent.m // yinmeng-ios // // Created by 触海 on 2023/11/22. // -#import "LoginBindPhonePresent.h" +#import "MewLoginBindPhonePresent.h" -@implementation LoginBindPhonePresent +@implementation MewLoginBindPhonePresent - (id)getView { return ((id) [super getView]); } diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/LoginForgetPasswordPresent.h b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginForgetPasswordPresent.h similarity index 58% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/LoginForgetPasswordPresent.h rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginForgetPasswordPresent.h index fc75ced..3acdbe7 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/LoginForgetPasswordPresent.h +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginForgetPasswordPresent.h @@ -1,5 +1,5 @@ // -// LoginForgetPasswordPresent.h +// MewLoginForgetPasswordPresent.h // mew-ios // // Created by 触海 on 2023/11/9. @@ -10,17 +10,17 @@ NS_ASSUME_NONNULL_BEGIN -@interface LoginForgetPasswordPresent : BaseMvpPresenter +@interface MewLoginForgetPasswordPresent : BaseMvpPresenter /// 获取手机的验证码 /// @param phone 手机号 /// @param type 类型 -- (void)phoneSmsCode:(NSString *)phone type:(GetSmsType)type; +- (void)mew_phoneSmsCode:(NSString *)phone type:(GetSmsType)type; /// 没有登录的时候 重置密码 /// @param phone 手机号 /// @param newPwd 新的密码 /// @param smsCode 验证码 -- (void)resetPassword:(NSString *)phone newPwd:(NSString *)newPwd smsCode:(NSString *)smsCode; +- (void)mew_resetPassword:(NSString *)phone newPwd:(NSString *)newPwd smsCode:(NSString *)smsCode; @end NS_ASSUME_NONNULL_END diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/LoginForgetPasswordPresent.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginForgetPasswordPresent.m similarity index 57% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/LoginForgetPasswordPresent.m rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginForgetPasswordPresent.m index 9a746af..6cf69a9 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/LoginForgetPasswordPresent.m +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginForgetPasswordPresent.m @@ -1,32 +1,32 @@ // -// LoginForgetPasswordPresent.m +// MewLoginForgetPasswordPresent.m // mew-ios // // Created by 触海 on 2023/11/9. // -#import "LoginForgetPasswordPresent.h" +#import "MewLoginForgetPasswordPresent.h" ///Tool #import "AccountInfoStorage.h" #import "DESEncrypt.h" #import "YMConstant.h" ///Protocol -#import "LoginForgetPasswordProtocol.h" +#import "MewLoginForgetPasswordProtocol.h" ///Api #import "Api+Login.h" -@implementation LoginForgetPasswordPresent -- (id)getView { - return (id)[super getView]; +@implementation MewLoginForgetPasswordPresent +- (id)getView { + return (id)[super getView]; } /// 获取手机的验证码 /// @param phone 手机号 /// @param type 类型 -- (void)phoneSmsCode:(NSString *)phone type:(GetSmsType)type { +- (void)mew_phoneSmsCode:(NSString *)phone type:(GetSmsType)type { NSString * desPhone = [DESEncrypt encryptUseDES:phone key:KeyWithType(KeyType_PasswordEncode)]; - [Api phoneSmsCode:[self createHttpCompletion:^(id _Nonnull data) { + [Api mew_phoneSmsCode:[self createHttpCompletion:^(id _Nonnull data) { [[self getView] mew_phoneSmsCodeSuccess]; }] mobile:desPhone type:[NSString stringWithFormat:@"%lu", (unsigned long)type]]; } @@ -35,11 +35,11 @@ /// @param phone 手机号 /// @param newPwd 新的密码 /// @param smsCode 验证码 -- (void)resetPassword:(NSString *)phone newPwd:(NSString *)newPwd smsCode:(NSString *)smsCode { +- (void)mew_resetPassword:(NSString *)phone newPwd:(NSString *)newPwd smsCode:(NSString *)smsCode { NSString * desPassword = [DESEncrypt encryptUseDES:newPwd key:KeyWithType(KeyType_PasswordEncode)]; NSString * desPhone = [DESEncrypt encryptUseDES:phone key:KeyWithType(KeyType_PasswordEncode)]; - [Api resetPasswordWithPhone:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] resetPasswrodSuccess]; + [Api Mew_ResetPasswordWithPhone:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [[self getView] mew_resetPasswrodSuccess]; } showLoading:YES] phone:desPhone newPwd:desPassword smsCode:smsCode]; } diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/LoginFullInfoPresenter.h b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginFullInfoPresenter.h similarity index 77% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/LoginFullInfoPresenter.h rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginFullInfoPresenter.h index 84e6234..19f4f4e 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/LoginFullInfoPresenter.h +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginFullInfoPresenter.h @@ -1,22 +1,22 @@ // -// LoginFullInfoPresenter.h +// MewLoginFullInfoPresenter.h // mew-ios // // Created by 触海 on 2023/11/6. // #import "BaseMvpPresenter.h" -@class ThirdUserInfo; +@class MewThirdUserInfo; NS_ASSUME_NONNULL_BEGIN -@interface LoginFullInfoPresenter : BaseMvpPresenter +@interface MewLoginFullInfoPresenter : BaseMvpPresenter /// 获取保存的第三方的数据模型 -- (ThirdUserInfo *)getThirdUserInfo; +- (MewThirdUserInfo *)mew_getMewThirdUserInfo; /// 随机获取昵称 -- (void)randomRequestNick; +- (void)mew_randomRequestNick; /// 补全资料 /// @param avatar 头像 @@ -26,7 +26,7 @@ NS_ASSUME_NONNULL_BEGIN /// @param roomUid 邀请的那个房间的uid /// @param shareUid 邀请人的uid /// @param shareChannel 邀请的渠道 -- (void)complectionInfoWithAvatar:(NSString *)avatar +- (void)mew_complectionInfoWithAvatar:(NSString *)avatar gender:(NSString *)gender nick:(NSString *)nick inviteCode:(NSString * __nullable)inviteCode diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/LoginFullInfoPresenter.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginFullInfoPresenter.m similarity index 72% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/LoginFullInfoPresenter.m rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginFullInfoPresenter.m index 8aa6441..55f9a56 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/LoginFullInfoPresenter.m +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginFullInfoPresenter.m @@ -1,40 +1,40 @@ // -// LoginFullInfoPresenter.m +// MewLoginFullInfoPresenter.m // mew-ios // // Created by 触海 on 2023/11/6. // -#import "LoginFullInfoPresenter.h" +#import "MewLoginFullInfoPresenter.h" #import "Api+Login.h" ///Tool #import "AccountInfoStorage.h" #import "NSMutableDictionary+MEWSafe.h" ///Api -#import "LoginFullInfoProtocol.h" +#import "MewLoginFullInfoProtocol.h" ///Model -#import "ThirdUserInfo.h" +#import "MewThirdUserInfo.h" -@implementation LoginFullInfoPresenter +@implementation MewLoginFullInfoPresenter #pragma mark - Super -- (id)getView { - return (id)[super getView]; +- (id)getView { + return (id)[super getView]; } #pragma mark - Public Method /// 获取保存的第三方的数据模型 -- (ThirdUserInfo *)getThirdUserInfo { - if ([AccountInfoStorage instance].thirdUserInfo) { - return [AccountInfoStorage instance].thirdUserInfo; +- (MewThirdUserInfo *)mew_getMewThirdUserInfo { + if ([AccountInfoStorage instance].MewThirdUserInfo) { + return [AccountInfoStorage instance].MewThirdUserInfo; } return nil; } /// 随机获取昵称 -- (void)randomRequestNick { - [Api randomNick:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] requestRandomNickSuccess:data.data]; +- (void)mew_randomRequestNick { + [Api Mew_RandomNick:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [[self getView] mew_requestRandomNickSuccess:data.data]; }]]; } @@ -46,7 +46,7 @@ /// @param roomUid 邀请的那个房间的uid /// @param shareUid 邀请人的uid /// @param shareChannel 邀请的渠道 -- (void)complectionInfoWithAvatar:(NSString *)avatar +- (void)mew_complectionInfoWithAvatar:(NSString *)avatar gender:(NSString *)gender nick:(NSString *)nick inviteCode:(NSString * __nullable)inviteCode @@ -78,7 +78,7 @@ } [Api completeUserInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] complementInfoSuccess]; + [[self getView] mew_complementInfoSuccess]; }] userInfo:params]; } diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/LoginPasswordPresent.h b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginPasswordPresent.h similarity index 66% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/LoginPasswordPresent.h rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginPasswordPresent.h index c36ce78..6b81842 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/LoginPasswordPresent.h +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginPasswordPresent.h @@ -9,12 +9,12 @@ NS_ASSUME_NONNULL_BEGIN -@interface LoginPasswordPresent : BaseMvpPresenter +@interface MewLoginPasswordPresent : BaseMvpPresenter /// 使用手机号和密码登录 /// @param phone 手机号 /// @param password 验证码 -- (void)loginWithPhone:(NSString *)phone password:(NSString *)password; +- (void)mew_loginWithPhone:(NSString *)phone password:(NSString *)password; @end diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/LoginPasswordPresent.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginPasswordPresent.m similarity index 72% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/LoginPasswordPresent.m rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginPasswordPresent.m index 50c3dd3..8545d6f 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/LoginPasswordPresent.m +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginPasswordPresent.m @@ -5,7 +5,7 @@ // Created by 触海 on 2023/11/8. // -#import "LoginPasswordPresent.h" +#import "MewLoginPasswordPresent.h" #import "Api+Login.h" ///Tool #import "AccountInfoStorage.h" @@ -14,18 +14,18 @@ ///Model #import "AccountModel.h" ///Protocol -#import "LoginPasswordProtocol.h" +#import "MewLoginPasswordProtocol.h" -@implementation LoginPasswordPresent -- (id)getView { - return (id)[super getView]; +@implementation MewLoginPasswordPresent +- (id)getView { + return (id)[super getView]; } /// 手机密码登录 -- (void)loginWithPhone:(NSString *)phone password:(NSString *)password { +- (void)mew_loginWithPhone:(NSString *)phone password:(NSString *)password { NSString * desPassword = [DESEncrypt encryptUseDES:password key:KeyWithType(KeyType_PasswordEncode)]; NSString * desPhone = [DESEncrypt encryptUseDES:phone key:KeyWithType(KeyType_PasswordEncode)]; - [Api loginWithPassword:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [Api Mew_LoginWithPassword:[self createHttpCompletion:^(BaseModel * _Nonnull data) { AccountModel *model = [AccountModel mewModelWithDictionary:data.data]; if (model && model.access_token.length > 0){ [[AccountInfoStorage instance] saveAccountInfo:model]; diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginPresenter.h b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginPresenter.h new file mode 100644 index 0000000..563737b --- /dev/null +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginPresenter.h @@ -0,0 +1,24 @@ +// +// MewLoginPresenter.h +// mew-ios +// +// Created by 触海 on 2023/11/6. +// + +#import "BaseMvpPresenter.h" +#import "YMEnum.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface MewLoginPresenter : BaseMvpPresenter + +/// 一键登录 +- (void)mew_phoneQuickLogin:(NSString *)accessToken token:(NSString*) token; + + + +- (void)mew_thirdLoginWithApple:(NSString *)token unionId:(NSString *)unionId; + +@end + +NS_ASSUME_NONNULL_END diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/LoginPresenter.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginPresenter.m similarity index 55% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/LoginPresenter.m rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginPresenter.m index f8d54d6..2e41f7b 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/LoginPresenter.m +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginPresenter.m @@ -1,41 +1,37 @@ // -// LoginPresenter.m +// MewLoginPresenter.m // mew-ios // // Created by 触海 on 2023/11/6. // -#import "LoginPresenter.h" +#import "MewLoginPresenter.h" ///Tool #import "AccountInfoStorage.h" ///APi #import "Api+Login.h" ///P -#import "LoginProtocol.h" +#import "MewLoginProtocol.h" #import "AccountModel.h" -@implementation LoginPresenter +@implementation MewLoginPresenter #pragma mark - Super -- (id)getView { - return (id)[super getView]; +- (id)getView { + return (id)[super getView]; } #pragma mark - Public Method /// 一键登录 -- (void)phoneQuickLogin:(NSString *)accessToken token:(NSString *)token { - [Api phoneQuickLogin:[self createHttpCompletion:^(BaseModel * _Nonnull data) { +- (void)Mew_PhoneQuickLogin:(NSString *)accessToken token:(NSString *)token { + [Api Mew_PhoneQuickLogin:[self createHttpCompletion:^(BaseModel * _Nonnull data) { }] accessToken:accessToken token:token]; } -/// 第三方登录 -- (void)thirdLoginWithType:(ThirdLoginType)type { - -} -- (void)thirdmew_loginWithApple:(NSString *)token unionId:(NSString *)unionId { - [Api loginWithThirdPart:[self createHttpCompletion:^(BaseModel * _Nonnull data) { +- (void)mew_thirdLoginWithApple:(NSString *)token unionId:(NSString *)unionId { + [Api Mew_LoginWithThirdPart:[self createHttpCompletion:^(BaseModel * _Nonnull data) { AccountModel *model = [AccountModel mewModelWithDictionary:data.data]; if (model != nil) { [[AccountInfoStorage instance] saveAccountInfo:model]; diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/LoginVerifBindPhonePresenter.h b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginVerifBindPhonePresenter.h similarity index 56% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/LoginVerifBindPhonePresenter.h rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginVerifBindPhonePresenter.h index d669924..ce67dd9 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/LoginVerifBindPhonePresenter.h +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginVerifBindPhonePresenter.h @@ -1,5 +1,5 @@ // -// LoginVerifBindPhonePresenter.h +// MewLoginVerifBindPhonePresenter.h // yinmeng-ios // // Created by 触海 on 2023/11/22. @@ -11,21 +11,21 @@ NS_ASSUME_NONNULL_BEGIN -@interface LoginVerifBindPhonePresenter : MainPresenter +@interface MewLoginVerifBindPhonePresenter : MainPresenter /// 获取手机的验证码 /// @param phone 手机号 /// @param type 类型 -- (void)phoneSmsCode:(NSString *)phone type:(GetSmsType)type; +- (void)mew_phoneSmsCode:(NSString *)phone type:(GetSmsType)type; /// 校验手机验证码接口 /// @param moblieNum 手机号码 /// @param code 验证码 -- (void)checkMoblieCodeWithMoblie:(NSString *)moblieNum code:(NSString *)code; +- (void)mew_checkMoblieCodeWithMoblie:(NSString *)moblieNum code:(NSString *)code; /// 绑定手机验证码接口 /// @param moblieNum 手机号码 /// @param code 验证码 -- (void)bindkMoblieCodeWithMoblie:(NSString *)moblieNum code:(NSString *)code; +- (void)mew_bindkMoblieCodeWithMoblie:(NSString *)moblieNum code:(NSString *)code; @end NS_ASSUME_NONNULL_END diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/LoginVerifBindPhonePresenter.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginVerifBindPhonePresenter.m similarity index 65% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/LoginVerifBindPhonePresenter.m rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginVerifBindPhonePresenter.m index 7bac5cd..e658f8c 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/LoginVerifBindPhonePresenter.m +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginVerifBindPhonePresenter.m @@ -1,28 +1,29 @@ // -// LoginVerifBindPhonePresenter.m +// MewLoginVerifBindPhonePresenter.m // yinmeng-ios // // Created by 触海 on 2023/11/22. // -#import "LoginVerifBindPhonePresenter.h" +#import "MewLoginVerifBindPhonePresenter.h" #import "Api+Login.h" ///Tool #import "AccountInfoStorage.h" #import "DESEncrypt.h" #import "YMConstant.h" ///P -#import "LoginVerifBindPhoneProtocol.h" +#import "MewLoginVerifBindPhoneProtocol.h" -@implementation LoginVerifBindPhonePresenter +@implementation MewLoginVerifBindPhonePresenter /// 获取手机的验证码 /// @param phone 手机号 /// @param type 类型 -- (void)phoneSmsCode:(NSString *)phone type:(GetSmsType)type { +- (void)mew_phoneSmsCode:(NSString *)phone type:(GetSmsType)type { NSString * typeStr = [NSString stringWithFormat:@"%lu", (unsigned long)type]; NSString * desPhone = [DESEncrypt encryptUseDES:phone key:KeyWithType(KeyType_PasswordEncode)]; - [Api phoneSmsCode:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [Api mew_phoneSmsCode:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [[self getView] mew_phoneSmsCodeSuccess]; }] mobile:desPhone type:typeStr]; } @@ -31,23 +32,23 @@ /// 校验手机验证码接口 /// @param moblieNum 手机号码 /// @param code 验证码 -- (void)checkMoblieCodeWithMoblie:(NSString *)moblieNum code:(NSString *)code { +- (void)mew_checkMoblieCodeWithMoblie:(NSString *)moblieNum code:(NSString *)code { NSString * uid = [[AccountInfoStorage instance] getUid]; NSString * ticket = [[AccountInfoStorage instance] getTicket]; NSString * desPhone = [DESEncrypt encryptUseDES:moblieNum key:KeyWithType(KeyType_PasswordEncode)]; // [Api checkMoblieCode:[self createHttpCompletion:^(BaseModel * _Nonnull data) { -// [[self getView] checkMoblieCodeWithMoblieSuccess]; +// [[self getView] mew_checkMoblieCodeWithMoblieSuccess]; // }] mobile:desPhone code:code uid:uid ticket:ticket]; } /// 绑定手机验证码接口 /// @param moblieNum 手机号码 /// @param code 验证码 -- (void)bindkMoblieCodeWithMoblie:(NSString *)moblieNum code:(NSString *)code { +- (void)mew_bindkMoblieCodeWithMoblie:(NSString *)moblieNum code:(NSString *)code { NSString * ticket = [[AccountInfoStorage instance] getTicket]; NSString * desPhone = [DESEncrypt encryptUseDES:moblieNum key:KeyWithType(KeyType_PasswordEncode)]; - [Api bindMoblieCode:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] bindMoblieCodeWithMoblieSuccess]; + [Api Mew_BindMoblieCode:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [[self getView] mew_bindMoblieCodeWithMoblieSuccess]; }] phone:desPhone code:code ticket:ticket]; } @end diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/LoginVerifCodePresent.h b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginVerifCodePresent.h similarity index 58% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/LoginVerifCodePresent.h rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginVerifCodePresent.h index da82193..40df63d 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/LoginVerifCodePresent.h +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginVerifCodePresent.h @@ -1,5 +1,5 @@ // -// LoginVerifCodePresent.h +// MewLoginVerifCodePresent.h // mew-ios // // Created by 触海 on 2023/11/8. @@ -10,22 +10,22 @@ NS_ASSUME_NONNULL_BEGIN -@interface LoginVerifCodePresent : BaseMvpPresenter +@interface MewLoginVerifCodePresent : BaseMvpPresenter /// 获取手机的验证码 /// @param phone 手机号 /// @param type 类型 -- (void)phoneSmsCode:(NSString *)phone type:(GetSmsType)type; +- (void)mew_phoneSmsCode:(NSString *)phone type:(GetSmsType)type; /// 使用手机号和验证码登录 /// @param phone 手机号 /// @param code 验证码 -- (void)loginWithPhone:(NSString *)phone code:(NSString *)code; +- (void)mew_loginWithPhone:(NSString *)phone code:(NSString *)code; /// 绑定手机号 /// @param phone 手机号 /// @param code 验证码 -- (void)bindWithPhone:(NSString *)phone code:(NSString *)code; +- (void)mew_bindWithPhone:(NSString *)phone code:(NSString *)code; diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/LoginVerifCodePresent.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginVerifCodePresent.m similarity index 70% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/LoginVerifCodePresent.m rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginVerifCodePresent.m index 02e3743..019170c 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/LoginVerifCodePresent.m +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginVerifCodePresent.m @@ -1,36 +1,36 @@ // -// LoginVerifCodePresent.m +// MewLoginVerifCodePresent.m // mew-ios // // Created by 触海 on 2023/11/8. // -#import "LoginVerifCodePresent.h" +#import "MewLoginVerifCodePresent.h" ///Tool #import "AccountInfoStorage.h" #import "Api+Login.h" #import "DESEncrypt.h" #import "YMConstant.h" ///Protocol -#import "LoginVerifCodeProtocol.h" +#import "MewLoginVerifCodeProtocol.h" ///Model #import "AccountModel.h" -@implementation LoginVerifCodePresent +@implementation MewLoginVerifCodePresent #pragma mark - Super - (id)getView { - return (id)[super getView]; + return (id)[super getView]; } /// 获取手机的验证码 /// @param phone 手机号 /// @param type 类型 -- (void)phoneSmsCode:(NSString *)phone type:(GetSmsType)type { +- (void)mew_phoneSmsCode:(NSString *)phone type:(GetSmsType)type { NSString *desPhone = [DESEncrypt encryptUseDES:phone key:KeyWithType(KeyType_PasswordEncode)]; - [Api phoneSmsCode:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [Api mew_phoneSmsCode:[self createHttpCompletion:^(BaseModel * _Nonnull data) { [[self getView] mew_phoneSmsCodeSuccess]; }] mobile:desPhone type:[NSString stringWithFormat:@"%lu", (unsigned long)type]]; } @@ -38,9 +38,9 @@ /// 使用手机号和验证码登录 /// @param phone 手机号 /// @param code 验证码 -- (void)loginWithPhone:(NSString *)phone code:(NSString *)code { +- (void)mew_loginWithPhone:(NSString *)phone code:(NSString *)code { NSString *desPhone = [DESEncrypt encryptUseDES:phone key:KeyWithType(KeyType_PasswordEncode)]; - [Api loginWithCode:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [Api Mew_LoginWithCode:[self createHttpCompletion:^(BaseModel * _Nonnull data) { AccountModel *accountModel = [AccountModel mewModelWithDictionary:data.data]; if (accountModel && accountModel.access_token.length > 0) { [[AccountInfoStorage instance] saveAccountInfo:accountModel]; @@ -54,10 +54,10 @@ /// 绑定手机号 /// @param phone 手机号 /// @param code 验证码 -- (void)bindWithPhone:(NSString *)phone code:(NSString *)code { +- (void)mew_bindWithPhone:(NSString *)phone code:(NSString *)code { NSString *ticket = [[AccountInfoStorage instance] getTicket]; NSString * desPhone = [DESEncrypt encryptUseDES:phone key:KeyWithType(KeyType_PasswordEncode)]; - [Api bindMoblieCode:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [Api Mew_BindMoblieCode:[self createHttpCompletion:^(BaseModel * _Nonnull data) { [[self getView] mew_bindWithPhoneSuccess]; } showLoading:YES] phone:desPhone code:code ticket:ticket]; diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MineLoginPasswordPresenter.h b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MineLoginPasswordPresenter.h index 1a91b2c..fae3f99 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MineLoginPasswordPresenter.h +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MineLoginPasswordPresenter.h @@ -13,13 +13,13 @@ NS_ASSUME_NONNULL_BEGIN /// 设置登录密码 /// @param phone 手机号 /// @param newPwd 密码 -- (void)setLoginPassword:(NSString *)phone newPwd:(NSString *)newPwd; +- (void)mew_setLoginPassword:(NSString *)phone newPwd:(NSString *)newPwd; /// 修改登录密码 /// @param phone 手机号 /// @param newPwd 新密码 /// @param pwd 旧密码 -- (void)modifyLoginPassword:(NSString *)phone newPwd:(NSString *)newPwd pwd:(NSString *)pwd; +- (void)mew_modifyLoginPassword:(NSString *)phone newPwd:(NSString *)newPwd pwd:(NSString *)pwd; @end NS_ASSUME_NONNULL_END diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MineLoginPasswordPresenter.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MineLoginPasswordPresenter.m index fc3766c..0292006 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MineLoginPasswordPresenter.m +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MineLoginPasswordPresenter.m @@ -17,11 +17,11 @@ /// 设置登录密码 /// @param phone 手机号 /// @param newPwd 密码 -- (void)setLoginPassword:(NSString *)phone newPwd:(NSString *)newPwd { +- (void)mew_setLoginPassword:(NSString *)phone newPwd:(NSString *)newPwd { NSString * desNewPwd = [DESEncrypt encryptUseDES:newPwd key:KeyWithType(KeyType_PasswordEncode)]; NSString * desPhone = [DESEncrypt encryptUseDES:phone key:KeyWithType(KeyType_PasswordEncode)]; - [Api setLoingPassword:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] setLoginPasswordSuccess]; + [Api Mew_SetLoingPassword:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [[self getView] mew_setLoginPasswordSuccess]; } showLoading:YES] phone:desPhone newPwd:desNewPwd]; } @@ -30,12 +30,12 @@ /// @param phone 手机号 /// @param newPwd 新密码 /// @param pwd 旧密码 -- (void)modifyLoginPassword:(NSString *)phone newPwd:(NSString *)newPwd pwd:(NSString *)pwd{ +- (void)mew_modifyLoginPassword:(NSString *)phone newPwd:(NSString *)newPwd pwd:(NSString *)pwd{ NSString * desNewPwd = [DESEncrypt encryptUseDES:newPwd key:KeyWithType(KeyType_PasswordEncode)]; NSString * desPhone = [DESEncrypt encryptUseDES:phone key:KeyWithType(KeyType_PasswordEncode)]; NSString * desPwd = [DESEncrypt encryptUseDES:pwd key:KeyWithType(KeyType_PasswordEncode)]; - [Api modifyLoingPassword:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] modifyLoginPasswordSuccess]; + [Api Mew_ModifyLoingPassword:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [[self getView] mew_modifyLoginPasswordSuccess]; }] phone:desPhone newPwd:desNewPwd pwd:desPwd]; } diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Protocol/LoginForgetPasswordProtocol.h b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Protocol/MewLoginForgetPasswordProtocol.h similarity index 66% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Protocol/LoginForgetPasswordProtocol.h rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Protocol/MewLoginForgetPasswordProtocol.h index 3328fda..d80aae4 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Protocol/LoginForgetPasswordProtocol.h +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Protocol/MewLoginForgetPasswordProtocol.h @@ -1,5 +1,5 @@ // -// LoginForgetPasswordProtocol.h +// MewLoginForgetPasswordProtocol.h // mew-ios // // Created by 触海 on 2023/11/9. @@ -9,12 +9,12 @@ NS_ASSUME_NONNULL_BEGIN -@protocol LoginForgetPasswordProtocol +@protocol MewLoginForgetPasswordProtocol ///请求手机号的验证码成功 - (void)mew_phoneSmsCodeSuccess; ///重置密码成功 -- (void)resetPasswrodSuccess; +- (void)mew_resetPasswrodSuccess; @end diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Protocol/LoginFullInfoProtocol.h b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Protocol/MewLoginFullInfoProtocol.h similarity index 54% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Protocol/LoginFullInfoProtocol.h rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Protocol/MewLoginFullInfoProtocol.h index 00c70e4..a273f7d 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Protocol/LoginFullInfoProtocol.h +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Protocol/MewLoginFullInfoProtocol.h @@ -1,5 +1,5 @@ // -// LoginFullInfoProtocol.h +// MewLoginFullInfoProtocol.h // mew-ios // // Created by 触海 on 2023/11/6. @@ -9,12 +9,12 @@ NS_ASSUME_NONNULL_BEGIN -@protocol LoginFullInfoProtocol +@protocol MewLoginFullInfoProtocol ///随机请求一个昵称 -- (void)requestRandomNickSuccess:(NSString *)nick; +- (void)mew_requestRandomNickSuccess:(NSString *)nick; ///补全资料成功 -- (void)complementInfoSuccess; +- (void)mew_complementInfoSuccess; @end diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Protocol/LoginPasswordProtocol.h b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Protocol/MewLoginPasswordProtocol.h similarity index 87% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Protocol/LoginPasswordProtocol.h rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Protocol/MewLoginPasswordProtocol.h index f3d6e9e..3fbad72 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Protocol/LoginPasswordProtocol.h +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Protocol/MewLoginPasswordProtocol.h @@ -9,7 +9,7 @@ NS_ASSUME_NONNULL_BEGIN -@protocol LoginPasswordProtocol +@protocol MewLoginPasswordProtocol ///手机号密码登录成功 - (void)mew_phoneAndPasswordLoginSuccess; ///手机号密码登录失败 diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Protocol/LoginProtocol.h b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Protocol/MewLoginProtocol.h similarity index 74% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Protocol/LoginProtocol.h rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Protocol/MewLoginProtocol.h index 9973f3d..8e14b16 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Protocol/LoginProtocol.h +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Protocol/MewLoginProtocol.h @@ -1,5 +1,5 @@ // -// LoginProtocol.h +// MewLoginProtocol.h // mew-ios // // Created by 触海 on 2023/11/6. @@ -9,7 +9,7 @@ NS_ASSUME_NONNULL_BEGIN -@protocol LoginProtocol +@protocol MewLoginProtocol - (void)mew_loginSuccess; diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Protocol/LoginVerifBindPhoneProtocol.h b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Protocol/MewLoginVerifBindPhoneProtocol.h similarity index 60% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Protocol/LoginVerifBindPhoneProtocol.h rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Protocol/MewLoginVerifBindPhoneProtocol.h index 08e20c7..5ece517 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Protocol/LoginVerifBindPhoneProtocol.h +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Protocol/MewLoginVerifBindPhoneProtocol.h @@ -1,5 +1,5 @@ // -// LoginVerifBindPhoneProtocol.h +// MewLoginVerifBindPhoneProtocol.h // yinmeng-ios // // Created by 触海 on 2023/11/22. @@ -9,13 +9,13 @@ NS_ASSUME_NONNULL_BEGIN -@protocol LoginVerifBindPhoneProtocol +@protocol MewLoginVerifBindPhoneProtocol ///请求手机号的验证码成功 - (void)mew_phoneSmsCodeSuccess; ///绑定手机号成功 -- (void)bindMoblieCodeWithMoblieSuccess; +- (void)mew_bindMoblieCodeWithMoblieSuccess; ///验证绑定手机成功 -- (void)checkMoblieCodeWithMoblieSuccess; +- (void)mew_checkMoblieCodeWithMoblieSuccess; @end NS_ASSUME_NONNULL_END diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Protocol/LoginVerifCodeProtocol.h b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Protocol/MewLoginVerifCodeProtocol.h similarity index 81% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Protocol/LoginVerifCodeProtocol.h rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Protocol/MewLoginVerifCodeProtocol.h index 4dc8bdc..1f47fd9 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Protocol/LoginVerifCodeProtocol.h +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Protocol/MewLoginVerifCodeProtocol.h @@ -1,5 +1,5 @@ // -// LoginVerifCodeProtocol.h +// MewLoginVerifCodeProtocol.h // mew-ios // // Created by 触海 on 2023/11/8. @@ -9,7 +9,7 @@ NS_ASSUME_NONNULL_BEGIN -@protocol LoginVerifCodeProtocol +@protocol MewLoginVerifCodeProtocol /// 获取手机验证码成功 - (void)mew_phoneSmsCodeSuccess; diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Protocol/MineLoginPasswordProtocol.h b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Protocol/MineLoginPasswordProtocol.h index 8a4700c..e5031b3 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Protocol/MineLoginPasswordProtocol.h +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Protocol/MineLoginPasswordProtocol.h @@ -1,5 +1,5 @@ // -// MineLoginPasswordProtocol.h +// MineMewLoginPasswordProtocol.h // yinmeng-ios // // Created by 触海 on 2023/11/22. @@ -11,8 +11,8 @@ NS_ASSUME_NONNULL_BEGIN @protocol MineLoginPasswordProtocol -- (void)modifyLoginPasswordSuccess; -- (void)setLoginPasswordSuccess; +- (void)mew_modifyLoginPasswordSuccess; +- (void)mew_setLoginPasswordSuccess; @end diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/CustomView/LoginForgetEditView.h b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/CustomView/MewLoginForgetEditView.h similarity index 59% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/CustomView/LoginForgetEditView.h rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/CustomView/MewLoginForgetEditView.h index 098c8c6..d99c578 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/CustomView/LoginForgetEditView.h +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/CustomView/MewLoginForgetEditView.h @@ -1,5 +1,5 @@ // -// LoginForgetEditView.h +// MewLoginForgetEditView.h // mew-ios // // Created by 触海 on 2023/11/9. @@ -10,12 +10,12 @@ NS_ASSUME_NONNULL_BEGIN typedef enum : NSUInteger { - LoginForgetEditViewTypeNormal, // 普通类型 - LoginForgetEditViewTypeSms, // 短信验证码类型 - LoginForgetEditViewTypePassword, ///密码 -} LoginForgetEditViewType; + MewLoginForgetEditViewTypeNormal, // 普通类型 + MewLoginForgetEditViewTypeSms, // 短信验证码类型 + MewLoginForgetEditViewTypePassword, ///密码 +} MewLoginForgetEditViewType; -@interface LoginForgetEditView : UIView +@interface MewLoginForgetEditView : UIView /** textField */ @property (nonatomic, strong, readonly) UITextField *textField; @@ -24,7 +24,7 @@ typedef enum : NSUInteger { /** 验证码 */ @property (nonatomic, strong, readonly) UIButton *authCodeButton; ///类型 -@property (nonatomic, assign) LoginForgetEditViewType type; +@property (nonatomic, assign) MewLoginForgetEditViewType type; ///展位图 @property (nonatomic,copy) NSString *placeholder; diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/CustomView/LoginForgetEditView.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/CustomView/MewLoginForgetEditView.m similarity index 93% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/CustomView/LoginForgetEditView.m rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/CustomView/MewLoginForgetEditView.m index 3ca20e3..bfc0377 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/CustomView/LoginForgetEditView.m +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/CustomView/MewLoginForgetEditView.m @@ -1,17 +1,17 @@ // -// LoginForgetEditView.m +// MewLoginForgetEditView.m // mew-ios // // Created by 触海 on 2023/11/9. // -#import "LoginForgetEditView.h" +#import "MewLoginForgetEditView.h" ///第三方 #import ///Tool #import "MEWThemeColor.h" -@interface LoginForgetEditView() +@interface MewLoginForgetEditView() /// @property (nonatomic,strong) UIStackView *stackView; /** textField */ @@ -24,7 +24,7 @@ @property (nonatomic, strong) UIButton *authCodeButton; @end -@implementation LoginForgetEditView +@implementation MewLoginForgetEditView #pragma mark - life cycle - (instancetype)initWithFrame:(CGRect)frame { @@ -62,17 +62,17 @@ } #pragma mark - getters and setters -- (void)setType:(LoginForgetEditViewType)type { +- (void)setType:(MewLoginForgetEditViewType)type { switch (type) { - case LoginForgetEditViewTypeNormal: + case MewLoginForgetEditViewTypeNormal: self.rightButton.hidden = YES; self.authCodeButton.hidden = YES; break; - case LoginForgetEditViewTypeSms: + case MewLoginForgetEditViewTypeSms: self.authCodeButton.hidden = NO; self.rightButton.hidden = YES; break; - case LoginForgetEditViewTypePassword: + case MewLoginForgetEditViewTypePassword: self.authCodeButton.hidden = YES; self.rightButton.hidden = NO; break; diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/CustomView/LoginInputView.h b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/CustomView/MewLoginInputView.h similarity index 90% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/CustomView/LoginInputView.h rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/CustomView/MewLoginInputView.h index 0eb2d83..aa97d30 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/CustomView/LoginInputView.h +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/CustomView/MewLoginInputView.h @@ -1,5 +1,5 @@ // -// LoginInputView.h +// MewLoginInputView.h // mew-ios // // Created by 触海 on 2023/11/7. @@ -10,7 +10,7 @@ NS_ASSUME_NONNULL_BEGIN -@interface LoginInputView : UIView +@interface MewLoginInputView : UIView ///输入框 @property (nonatomic,strong, readonly) UITextField *textField; ///分割线 diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/CustomView/LoginInputView.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/CustomView/MewLoginInputView.m similarity index 96% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/CustomView/LoginInputView.m rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/CustomView/MewLoginInputView.m index ac56a25..343a00f 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/CustomView/LoginInputView.m +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/CustomView/MewLoginInputView.m @@ -1,18 +1,18 @@ // -// LoginInputView.m +// MewLoginInputView.m // mew-ios // // Created by 触海 on 2023/11/7. // -#import "LoginInputView.h" +#import "MewLoginInputView.h" ///Third #import ///Tool #import "MEWThemeColor.h" -@interface LoginInputView() +@interface MewLoginInputView() ///容器 @property (nonatomic,strong) UIStackView *stackView; ///分割线 @@ -23,7 +23,7 @@ @property (nonatomic,strong) UITextField *textField; @end -@implementation LoginInputView +@implementation MewLoginInputView - (instancetype)initWithFrame:(CGRect)frame { self = [super initWithFrame:frame]; if (self) { diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/LoginBindPhoneResultViewController.h b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/LoginBindPhoneResultViewController.h deleted file mode 100644 index 2f74ae9..0000000 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/LoginBindPhoneResultViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// LoginBindPhoneResultViewController.h -// yinmeng-ios -// -// Created by 触海 on 2023/11/22. -// - -#import "BaseViewController.h" -@class UserInfoModel; -NS_ASSUME_NONNULL_BEGIN - -@interface LoginBindPhoneResultViewController : BaseViewController -@property (nonatomic, strong) UserInfoModel *userInfo; -@end - -NS_ASSUME_NONNULL_END diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/LoginVerifBindPhoneViewController.h b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/LoginVerifBindPhoneViewController.h deleted file mode 100644 index ef2d877..0000000 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/LoginVerifBindPhoneViewController.h +++ /dev/null @@ -1,29 +0,0 @@ -// -// LoginVerifBindPhoneViewController.h -// yinmeng-ios -// -// Created by 触海 on 2023/11/22. -// - -#import "MvpViewController.h" -@class UserInfoModel; -/** - 手机号绑定的类型 - - TTBindingPhoneNumTypeNormal: 普通状态，首次绑定 - - TTBindingPhoneNumTypeConfirm : 验证状态：验证已绑定的手机 - */ -typedef NS_ENUM(NSUInteger, TTBindingPhoneNumType) { - XPBindingPhoneNumTypeNormal = 0, - XPBindingPhoneNumTypeEdit = 1, - XPBindingPhoneNumTypeConfirm = 2, -}; - -NS_ASSUME_NONNULL_BEGIN - -@interface LoginVerifBindPhoneViewController : MvpViewController -@property (nonatomic, assign) TTBindingPhoneNumType bindingPhoneNumType; -///用户信息 -@property (nonatomic, strong) UserInfoModel *userInfo; -@end - -NS_ASSUME_NONNULL_END diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/LoginBindPhoneViewController.h b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MewLoginBindPhoneViewController.h similarity index 59% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/LoginBindPhoneViewController.h rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MewLoginBindPhoneViewController.h index 99a76d8..5f4c20b 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/LoginBindPhoneViewController.h +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MewLoginBindPhoneViewController.h @@ -1,5 +1,5 @@ // -// LoginBindPhoneViewController.h +// MewLoginBindPhoneViewController.h // yinmeng-ios // // Created by 触海 on 2023/11/22. @@ -9,7 +9,7 @@ NS_ASSUME_NONNULL_BEGIN -@interface LoginBindPhoneViewController : MvpViewController +@interface MewLoginBindPhoneViewController : MvpViewController @end diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/LoginBindPhoneViewController.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MewLoginBindPhoneViewController.m similarity index 80% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/LoginBindPhoneViewController.m rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MewLoginBindPhoneViewController.m index 151fc2c..9f59444 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/LoginBindPhoneViewController.m +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MewLoginBindPhoneViewController.m @@ -1,11 +1,11 @@ // -// LoginBindPhoneViewController.m +// MewLoginBindPhoneViewController.m // yinmeng-ios // // Created by 触海 on 2023/11/22. // -#import "LoginBindPhoneViewController.h" +#import "MewLoginBindPhoneViewController.h" ///Third #import #import @@ -15,11 +15,11 @@ //#import "NSString+Utils.h" ///Tool -#import "LoginBindPhonePresent.h" +#import "MewLoginBindPhonePresent.h" ///VC //#import "LoginVerifCodeViewController.h" -@interface LoginBindPhoneViewController () +@interface MewLoginBindPhoneViewController () ///提示Label @property (nonatomic, strong) UILabel *titleLabel; /// 手机号输入框背景 @@ -34,13 +34,13 @@ @property (nonatomic,strong) UIButton *backButton; @end -@implementation LoginBindPhoneViewController +@implementation MewLoginBindPhoneViewController - (BOOL)mew_isHiddenNavBar { return YES; } #pragma mark - life cycle -- (LoginBindPhonePresent *)createPresenter { - return [[LoginBindPhonePresent alloc] init]; +- (MewLoginBindPhonePresent *)createPresenter { + return [[MewLoginBindPhonePresent alloc] init]; } - (void)viewDidLoad { @@ -115,33 +115,6 @@ self.loginBtn.enabled = [enable boolValue]; }]; - -// [[[[self.loginBtn rac_signalForControlEvents:UIControlEventTouchUpInside] doNext:^(id x) { -// @strongify(self) -// self.loginBtn.enabled = NO; -// }] flattenMap:^id (id value) { -// return [RACSignal createSignal:^RACDisposable *(id subscriber) { -// if (!self.phoneTextField.text.isPhoneNumber) { -// [self showErrorToast:@"手机格式不正确"]; -// [subscriber sendNext:@(NO)]; -// }else { -// [subscriber sendNext:@(YES)]; -// } -// [subscriber sendCompleted]; -// return nil; -// }]; -// }] subscribeNext:^(NSNumber *signedIn) { -// @strongify(self) -// self.loginBtn.enabled = YES; -// BOOL success = [signedIn boolValue]; -// if (success) { -// //跳转去验证码页面 -// LoginVerifCodeViewController *codeVC = [[LoginVerifCodeViewController alloc] init]; -// codeVC.phone = self.phoneTextField.text; -// codeVC.type = VerifCodeType_BindPhone; -// [self.navigationController pushViewController:codeVC animated:YES]; -// } -// }]; } #pragma mark - Event Response diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/LoginForgetPasswordViewController.h b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MewLoginForgetPasswordViewController.h similarity index 56% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/LoginForgetPasswordViewController.h rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MewLoginForgetPasswordViewController.h index 10a2c87..ba40678 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/LoginForgetPasswordViewController.h +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MewLoginForgetPasswordViewController.h @@ -1,5 +1,5 @@ // -// LoginForgetPasswordViewController.h +// MewLoginForgetPasswordViewController.h // mew-ios // // Created by 触海 on 2023/11/9. @@ -9,7 +9,7 @@ NS_ASSUME_NONNULL_BEGIN -@interface LoginForgetPasswordViewController : MvpViewController +@interface MewLoginForgetPasswordViewController : MvpViewController @end diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/LoginForgetPasswordViewController.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MewLoginForgetPasswordViewController.m similarity index 72% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/LoginForgetPasswordViewController.m rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MewLoginForgetPasswordViewController.m index 58f130b..7b680e0 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/LoginForgetPasswordViewController.m +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MewLoginForgetPasswordViewController.m @@ -1,16 +1,16 @@ // -// LoginForgetPasswordViewController.m +// MewLoginForgetPasswordViewController.m // mew-ios // // Created by 触海 on 2023/11/9. // -#import "LoginForgetPasswordViewController.h" +#import "MewLoginForgetPasswordViewController.h" ///View -#import "LoginForgetEditView.h" +#import "MewLoginForgetEditView.h" ///Presenter -#import "LoginForgetPasswordPresent.h" -#import "LoginForgetPasswordProtocol.h" +#import "MewLoginForgetPasswordPresent.h" +#import "MewLoginForgetPasswordProtocol.h" ///第三方 #import #import @@ -21,16 +21,16 @@ #import "UIImage+Utils.h" -@interface LoginForgetPasswordViewController () +@interface MewLoginForgetPasswordViewController () @property (nonatomic, strong) UIImageView *bgImageView; ///容器 @property (nonatomic,strong) UIStackView *stackView; ///手机号 -@property (nonatomic,strong) LoginForgetEditView *phoneView; +@property (nonatomic,strong) MewLoginForgetEditView *phoneView; ///验证码 -@property (nonatomic,strong) LoginForgetEditView *codeView; +@property (nonatomic,strong) MewLoginForgetEditView *codeView; ///密码 -@property (nonatomic,strong) LoginForgetEditView *passwordView; +@property (nonatomic,strong) MewLoginForgetEditView *passwordView; ///完成 @property (nonatomic,strong) UIButton *finishButton; @property (nonatomic, strong) UILabel *titleLabel; @@ -39,10 +39,10 @@ @end -@implementation LoginForgetPasswordViewController +@implementation MewLoginForgetPasswordViewController -- (LoginForgetPasswordPresent *)createPresenter { - return [[LoginForgetPasswordPresent alloc] init]; +- (MewLoginForgetPasswordPresent *)createPresenter { + return [[MewLoginForgetPasswordPresent alloc] init]; } - (void)dealloc { @@ -58,7 +58,7 @@ [super viewDidLoad]; [self mew_initSubViews]; [self mew_initSubViewConstraints]; - [self mew_initEvents]; +// [self mew_initEvents]; } - (void)viewDidDisappear:(BOOL)animated { @@ -67,7 +67,7 @@ } -#pragma mark - LoginForgetPasswordProtocol +#pragma mark - MewLoginForgetPasswordProtocol ///请求手机号的验证码成功 - (void)mew_phoneSmsCodeSuccess { self.codeView.authCodeButton.enabled= NO; @@ -75,7 +75,7 @@ [[MEWCountDownHelper shareHelper] mewOpenCountdownWithTime:60]; } ///重置密码成功 -- (void)resetPasswrodSuccess { +- (void)mew_resetPasswrodSuccess { [[MEWCountDownHelper shareHelper] mewStopCountDown]; [self showSuccessToast:@"重置密码成功"]; [self.navigationController popViewControllerAnimated:YES]; @@ -92,15 +92,15 @@ [self.codeView.authCodeButton setTitle:@"重新发送" forState:UIControlStateNormal]; } #pragma mark - Event Response -- (void)finishButtonAction:(UIButton *)sender { - [self.presenter resetPassword:self.phoneView.textField.text newPwd:self.passwordView.textField.text smsCode:self.codeView.textField.text]; +- (void)mew_finishButtonAction:(UIButton *)sender { + [self.presenter mew_resetPassword:self.phoneView.textField.text newPwd:self.passwordView.textField.text smsCode:self.codeView.textField.text]; } -- (void)authCodeButtonAction:(UIButton *)sender { +- (void)mew_authCodeButtonAction:(UIButton *)sender { if (self.phoneView.textField.text.length != 11) { [self showErrorToast:@"请输入正确的手机号码"]; } else { - [self.presenter phoneSmsCode:self.phoneView.textField.text type:GetSmsType_Reset_Password]; + [self.presenter mew_phoneSmsCode:self.phoneView.textField.text type:GetSmsType_Reset_Password]; } } @@ -112,7 +112,6 @@ #pragma mark - Private Method - (void)mew_initSubViews { -// self.titleLabel.text = @"忘记密码"; [MEWCountDownHelper shareHelper].delegate = self; [self.view addSubview:self.bgImageView]; [self.view addSubview:self.backButton]; @@ -153,23 +152,6 @@ make.top.mas_equalTo(self.stackView.mas_bottom).offset(20); }]; -// [self.phoneView mas_makeConstraints:^(MASConstraintMaker *make) { -// make.height.mas_equalTo(52); -// make.width.mas_equalTo(KScreenWidth - 2 * 36); -// make.centerX.equalTo(self.view); -// make.top.mas_equalTo(60); -// }]; -// -// [self.codeView mas_makeConstraints:^(MASConstraintMaker *make) { -// make.height.width.centerX.mas_equalTo(self.phoneView); -// make.top.equalTo(self.phoneView.mas_bottom).offset(20); -// }]; -// -// [self.passwordView mas_makeConstraints:^(MASConstraintMaker *make) { -// make.height.width.centerX.mas_equalTo(self.phoneView); -// make.top.equalTo(self.codeView.mas_bottom).offset(20); -// }]; - [self.phoneView mas_makeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(52); }]; @@ -183,12 +165,6 @@ }]; } -- (void)mew_initEvents { -// @weakify(self); -// RAC(self.finishButton, enabled) = [RACSignal combineLatest:@[self.phoneView.textField.rac_textSignal, self.codeView.textField.rac_textSignal, self.passwordView.textField.rac_textSignal] reduce:^id _Nonnull(NSString *phone, NSString *code, NSString *password){ -// return @(phone.length == 11 && code.length > 0 && password.length >= 6 && password.length <= 16); -// }]; -} #pragma mark - Getters And Setters @@ -228,7 +204,7 @@ [_finishButton setTitleColor:UIColor.blackColor forState:UIControlStateNormal]; UIImage *image = [UIImage gradientColorImageFromColors:@[[MEWThemeColor mewColorWithHexString:@"#FF60FD"], [MEWThemeColor mewColorWithHexString:@"#8974FF"],[MEWThemeColor mewColorWithHexString:@"#69EBFF"]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(KScreenWidth - 2*36, 52)]; _finishButton.backgroundColor = [UIColor colorWithPatternImage:image]; - [_finishButton addTarget:self action:@selector(finishButtonAction:) forControlEvents:UIControlEventTouchUpInside]; + [_finishButton addTarget:self action:@selector(mew_finishButtonAction:) forControlEvents:UIControlEventTouchUpInside]; } return _finishButton; } @@ -245,11 +221,11 @@ return _stackView; } -- (LoginForgetEditView *)phoneView { +- (MewLoginForgetEditView *)phoneView { if (!_phoneView) { - _phoneView = [[LoginForgetEditView alloc] init]; + _phoneView = [[MewLoginForgetEditView alloc] init]; _phoneView.placeholder = @"请输入手机号"; - _phoneView.type = LoginForgetEditViewTypeNormal; + _phoneView.type = MewLoginForgetEditViewTypeNormal; _phoneView.backgroundColor = UIColor.whiteColor; _phoneView.layer.cornerRadius = 52/2.f; _phoneView.layer.masksToBounds = YES; @@ -257,26 +233,26 @@ return _phoneView; } -- (LoginForgetEditView *)codeView { +- (MewLoginForgetEditView *)codeView { if (!_codeView) { - _codeView = [[LoginForgetEditView alloc] init]; + _codeView = [[MewLoginForgetEditView alloc] init]; _codeView.placeholder = @"请输入验证码"; - _codeView.type = LoginForgetEditViewTypeSms; + _codeView.type = MewLoginForgetEditViewTypeSms; _codeView.backgroundColor = UIColor.whiteColor; [_codeView.authCodeButton setTitleColor:[MEWThemeColor mewColorWithHexString:@"#9552FF"] forState:UIControlStateNormal]; _codeView.layer.cornerRadius = 52/2.f; _codeView.layer.masksToBounds = YES; - [_codeView.authCodeButton addTarget:self action:@selector(authCodeButtonAction:) forControlEvents:UIControlEventTouchUpInside]; + [_codeView.authCodeButton addTarget:self action:@selector(mew_authCodeButtonAction:) forControlEvents:UIControlEventTouchUpInside]; } return _codeView; } -- (LoginForgetEditView *)passwordView { +- (MewLoginForgetEditView *)passwordView { if (!_passwordView) { - _passwordView = [[LoginForgetEditView alloc] init]; + _passwordView = [[MewLoginForgetEditView alloc] init]; _passwordView.placeholder = @"请输入密码（6-16个字符）"; - _passwordView.type = LoginForgetEditViewTypePassword; + _passwordView.type = MewLoginForgetEditViewTypePassword; _passwordView.textField.keyboardType = UIKeyboardTypeASCIICapable; _passwordView.textField.secureTextEntry = YES; _passwordView.textField.clearButtonMode = UITextFieldViewModeAlways; diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/LoginFullInfoViewController.h b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MewLoginFullInfoViewController.h similarity index 59% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/LoginFullInfoViewController.h rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MewLoginFullInfoViewController.h index e615292..28579ac 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/LoginFullInfoViewController.h +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MewLoginFullInfoViewController.h @@ -1,5 +1,5 @@ // -// LoginFullInfoViewController.h +// MewLoginFullInfoViewController.h // mew-ios // // Created by 触海 on 2023/11/6. @@ -9,9 +9,7 @@ NS_ASSUME_NONNULL_BEGIN -@interface LoginFullInfoViewController : MvpViewController - - +@interface MewLoginFullInfoViewController : MvpViewController @end diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/LoginFullInfoViewController.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MewLoginFullInfoViewController.m similarity index 82% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/LoginFullInfoViewController.m rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MewLoginFullInfoViewController.m index e51a2f3..7effe3b 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/LoginFullInfoViewController.m +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MewLoginFullInfoViewController.m @@ -1,11 +1,11 @@ // -// LoginFullInfoViewController.m +// MewLoginFullInfoViewController.m // mew-ios // // Created by 触海 on 2023/11/6. // -#import "LoginFullInfoViewController.h" +#import "MewLoginFullInfoViewController.h" /// Third #import #import @@ -17,12 +17,12 @@ #import "MewHUDTool.h" #import "NewEncryptTool.h" ///Model -#import "ThirdUserInfo.h" +#import "MewThirdUserInfo.h" /// presenter -#import "LoginFullInfoPresenter.h" -#import "LoginFullInfoProtocol.h" +#import "MewLoginFullInfoPresenter.h" +#import "MewLoginFullInfoProtocol.h" -@interface LoginFullInfoViewController () +@interface MewLoginFullInfoViewController () @property (nonatomic, strong) UIImageView *bgImageView; @property (nonatomic, strong) UILabel *titleLabel; /// 返回按钮 @@ -43,46 +43,44 @@ @property (nonatomic, copy) NSString *sexString; @end -@implementation LoginFullInfoViewController +@implementation MewLoginFullInfoViewController - (BOOL)mew_isHiddenNavBar { return YES; } -- (LoginFullInfoPresenter *)createPresenter { - return [[LoginFullInfoPresenter alloc] init]; +- (MewLoginFullInfoPresenter *)createPresenter { + return [[MewLoginFullInfoPresenter alloc] init]; } #pragma mark - Life Cycle - (void)viewDidLoad { [super viewDidLoad]; -// self.title = @"填写资料"; self.sexString = @""; [self mew_initSubViews]; [self mew_initSubViewConstraints]; -// [self mew_initEvents]; } -#pragma mark - LoginFullInfoProtocol +#pragma mark - MewLoginFullInfoProtocol /// 填写资料成功 -- (void)complementInfoSuccess { - [self dissMissVC]; +- (void)mew_complementInfoSuccess { + [self mew_dissMissVC]; } -- (void)requestRandomNickSuccess:(NSString *)nick { +- (void)mew_requestRandomNickSuccess:(NSString *)nick { self.textField.text = nick; } #pragma mark - Action Event /// 男 -- (void)maleButtonAction { +- (void)mew_maleButtonAction { self.femaleButton.selected = NO; self.maleButton.selected = YES; self.sexString = @"1"; } /// 女 -- (void)femaleButtonAction { +- (void)mew_femaleButtonAction { self.femaleButton.selected = YES; self.maleButton.selected = NO; self.sexString = @"2"; @@ -101,7 +99,7 @@ } - [self updateUserInfo]; + [self mew_updateUserInfo]; } @@ -110,41 +108,38 @@ } #pragma mark - Private Method -- (void)updateUserInfo { - [self.presenter complectionInfoWithAvatar:[self getAvatarUrl] gender:self.maleButton.selected ? @"1":@"2" nick:self.textField.text inviteCode:@"" roomUid:nil shareUid:nil shareChannel:nil]; +- (void)mew_updateUserInfo { + [self.presenter mew_complectionInfoWithAvatar:[self mew_getAvatarUrl] gender:self.maleButton.selected ? @"1":@"2" nick:self.textField.text inviteCode:@"" roomUid:nil shareUid:nil shareChannel:nil]; } ///获取头像 可能是从第三方获取的头像 -- (NSString *)getAvatarUrl { +- (NSString *)mew_getAvatarUrl { NSString * avatar; - if ([self.presenter getThirdUserInfo] && [self.presenter getThirdUserInfo].avatarUrl.length > 0) { - avatar = [self.presenter getThirdUserInfo].avatarUrl; + if ([self.presenter mew_getMewThirdUserInfo] && [self.presenter mew_getMewThirdUserInfo].avatarUrl.length > 0) { + avatar = [self.presenter mew_getMewThirdUserInfo].avatarUrl; } else { avatar = [NewEncryptTool MEW_aesDecrypt:@"xdPnNelVD/RTlTKFqgSrESDPcNF6Diqb8sLg+HEvxpvjDdTLom1euQUOAOppjx15"]; } return avatar; } -- (void)updateNextButton { +- (void)mew_updateNextButton { if (self.textField.text.length > 0 && self.sexString.length > 0) { self.nextButton.enabled = YES; } else { -// [MewHUDTool showErrorWithMessage:@"请填写资料"]; self.nextButton.enabled = NO; } } -- (void)dissMissVC { +- (void)mew_dissMissVC { [[AccountInfoStorage instance] saveTicket:nil]; UIViewController *vc = self.presentingViewController; while (vc.presentingViewController) { vc = vc.presentingViewController; } [vc dismissViewControllerAnimated:YES completion:nil]; -// NSString * inviteCode = @""; -// [[NSNotificationCenter defaultCenter] postNotificationName:kUserCompleteInfoFinishKey object:inviteCode]; } @@ -160,10 +155,10 @@ [self.sexStackView addArrangedSubview:self.femaleButton]; [self.view addSubview:self.nextButton]; [self mew_initSubViewConstraints]; - if ([self.presenter getThirdUserInfo] && [self.presenter getThirdUserInfo].userName.length > 0) { - self.textField.text = [self.presenter getThirdUserInfo].userName; + if ([self.presenter mew_getMewThirdUserInfo] && [self.presenter mew_getMewThirdUserInfo].userName.length > 0) { + self.textField.text = [self.presenter mew_getMewThirdUserInfo].userName; } else { - [self.presenter randomRequestNick]; + [self.presenter mew_randomRequestNick]; } } @@ -219,7 +214,7 @@ }] subscribeNext:^(id _Nullable x) { @strongify(self); self.textField.text = x; - [self updateNextButton]; + [self mew_updateNextButton]; }]; } @@ -229,14 +224,7 @@ [self dismissViewControllerAnimated:NO completion:nil]; } - - - #pragma mark - Set -//- (void)setSexString:(NSString *)sexString { -// _sexString = sexString; -// [self updateNextButton]; -//} #pragma mark - Get @@ -303,7 +291,7 @@ _maleButton = [UIButton buttonWithType:UIButtonTypeCustom]; [_maleButton setImage:[UIImage imageNamed:@"mew_login_full_man_normal"] forState:UIControlStateNormal]; [_maleButton setImage:[UIImage imageNamed:@"mew_login_full_man_select"] forState:UIControlStateSelected]; - [_maleButton addTarget:self action:@selector(maleButtonAction) forControlEvents:UIControlEventTouchUpInside]; + [_maleButton addTarget:self action:@selector(mew_maleButtonAction) forControlEvents:UIControlEventTouchUpInside]; } return _maleButton; } @@ -313,7 +301,7 @@ _femaleButton = [UIButton buttonWithType:UIButtonTypeCustom]; [_femaleButton setImage:[UIImage imageNamed:@"mew_login_full_waman_normal"] forState:UIControlStateNormal]; [_femaleButton setImage:[UIImage imageNamed:@"mew_login_full_waman_select"] forState:UIControlStateSelected]; - [_femaleButton addTarget:self action:@selector(femaleButtonAction) forControlEvents:UIControlEventTouchUpInside]; + [_femaleButton addTarget:self action:@selector(mew_femaleButtonAction) forControlEvents:UIControlEventTouchUpInside]; } return _femaleButton; } diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MewLoginVerifBindPhoneViewController.h b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MewLoginVerifBindPhoneViewController.h new file mode 100644 index 0000000..d89f6cc --- /dev/null +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MewLoginVerifBindPhoneViewController.h @@ -0,0 +1,29 @@ +// +// MewLoginVerifBindPhoneViewController.h +// yinmeng-ios +// +// Created by 触海 on 2023/11/22. +// + +#import "MvpViewController.h" +@class UserInfoModel; +/** + 手机号绑定的类型 + - MewBindingPhoneNumTypeNormal: 普通状态，首次绑定 + - MewBindingPhoneNumTypeConfirm : 验证状态：验证已绑定的手机 + */ +typedef NS_ENUM(NSUInteger, MewBindingPhoneNumType) { + MewBindingPhoneNumTypeNormal = 0, + MewBindingPhoneNumTypeEdit = 1, + MewBindingPhoneNumTypeConfirm = 2, +}; + +NS_ASSUME_NONNULL_BEGIN + +@interface MewLoginVerifBindPhoneViewController : MvpViewController +@property (nonatomic, assign) MewBindingPhoneNumType bindingPhoneNumType; +///用户信息 +@property (nonatomic, strong) UserInfoModel *userInfo; +@end + +NS_ASSUME_NONNULL_END diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/LoginVerifBindPhoneViewController.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MewLoginVerifBindPhoneViewController.m similarity index 83% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/LoginVerifBindPhoneViewController.m rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MewLoginVerifBindPhoneViewController.m index 107998b..cae3682 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/LoginVerifBindPhoneViewController.m +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MewLoginVerifBindPhoneViewController.m @@ -1,11 +1,11 @@ // -// LoginVerifBindPhoneViewController.m +// MewLoginVerifBindPhoneViewController.m // yinmeng-ios // // Created by 触海 on 2023/11/22. // -#import "LoginVerifBindPhoneViewController.h" +#import "MewLoginVerifBindPhoneViewController.h" ///Third #import #import @@ -19,13 +19,12 @@ ///Model #import "UserInfoModel.h" ///P -#import "LoginVerifBindPhoneProtocol.h" -#import "LoginVerifBindPhonePresenter.h" +#import "MewLoginVerifBindPhoneProtocol.h" +#import "MewLoginVerifBindPhonePresenter.h" ///VC -#import "LoginBindPhoneViewController.h" -//#import "MineSettingViewController.h" +#import "MewLoginBindPhoneViewController.h" -@interface LoginVerifBindPhoneViewController () +@interface MewLoginVerifBindPhoneViewController () @property (nonatomic, strong) UIView *containerView; @property (nonatomic, strong) UIImageView *bgImageView; @@ -43,11 +42,10 @@ @property (nonatomic, strong) UIButton *confirmBtn; // 确认按钮 -//@property (nonatomic, strong) UILabel *tipsLabel; // 手机号丢失 -//@property (nonatomic, assign) BOOL isResetPhone; // 重新绑定手机 @end -@implementation LoginVerifBindPhoneViewController + +@implementation MewLoginVerifBindPhoneViewController - (BOOL)mew_isHiddenNavBar { return YES; } @@ -56,8 +54,8 @@ [[MEWCountDownHelper shareHelper] mewStopCountDown]; } -- (LoginVerifBindPhonePresenter *)createPresenter { - return [[LoginVerifBindPhonePresenter alloc] init]; +- (MewLoginVerifBindPhonePresenter *)createPresenter { + return [[MewLoginVerifBindPhonePresenter alloc] init]; } - (void)viewDidLoad { @@ -114,22 +112,6 @@ make.centerX.equalTo(self.view); }]; -// [self.areaLabel mas_makeConstraints:^(MASConstraintMaker *make) { -// make.left.mas_equalTo(32); -// make.top.mas_equalTo(20); -// }]; -// -// [self.countryBtn mas_makeConstraints:^(MASConstraintMaker *make) { -// make.right.mas_equalTo(-32); -// make.centerY.mas_equalTo(self.areaLabel); -// }]; -// -// [self.areaLineView mas_makeConstraints:^(MASConstraintMaker *make) { -// make.top.mas_equalTo(20); -// make.left.right.mas_equalTo(0).inset(32); -// make.height.mas_equalTo(1); -// }]; - [self.phoneBgView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(60); make.left.mas_equalTo(32); @@ -139,7 +121,6 @@ [self.areaCodeLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.equalTo(self.phoneBgView); -// make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(60); make.left.mas_equalTo(self.phoneBgView).offset(10); }]; @@ -154,13 +135,6 @@ make.right.mas_equalTo(self.authCodeBtn.mas_left).offset(-20); }]; - - -// [self.phoneLineView mas_makeConstraints:^(MASConstraintMaker *make) { -// make.left.right.height.mas_equalTo(self.areaLineView); -// make.top.mas_equalTo(self.areaCodeLabel.mas_bottom).offset(18); -// }]; - [self.authCodeBgView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.phoneBgView.mas_bottom).offset(20); make.left.height.width.mas_equalTo(self.phoneBgView); @@ -184,16 +158,15 @@ #pragma mark -配置 - (void)setConfigs { switch (self.bindingPhoneNumType) { - case XPBindingPhoneNumTypeEdit:{ + case MewBindingPhoneNumTypeEdit:{ self.navigationItem.title = @"更改绑定手机"; } break; - case XPBindingPhoneNumTypeNormal:{ + case MewBindingPhoneNumTypeNormal:{ self.navigationItem.title = @"绑定手机号"; } break; - case XPBindingPhoneNumTypeConfirm:{ -// self.tipsLabel.hidden = NO; + case MewBindingPhoneNumTypeConfirm:{ self.navigationItem.title = @"验证已绑定的手机号码"; [self.confirmBtn setTitle:@"验证" forState:UIControlStateNormal]; if (self.userInfo.isBindPhone) { @@ -230,7 +203,7 @@ } }] subscribeNext:^(id _Nullable x) { @strongify(self); - [self.presenter phoneSmsCode:self.phoneNumTextField.text type:self.bindingPhoneNumType == XPBindingPhoneNumTypeConfirm ? GetSmsType_Unbind_Phone : GetSmsType_Bind_Phone]; + [self.presenter mew_phoneSmsCode:self.phoneNumTextField.text type:self.bindingPhoneNumType == MewBindingPhoneNumTypeConfirm ? GetSmsType_Unbind_Phone : GetSmsType_Bind_Phone]; }]; @@ -249,10 +222,10 @@ } }] subscribeNext:^(id _Nullable x) { @strongify(self) - if (self.bindingPhoneNumType == XPBindingPhoneNumTypeConfirm) { - [self.presenter checkMoblieCodeWithMoblie:self.phoneNumTextField.text code:self.authCodeTextField.text]; + if (self.bindingPhoneNumType == MewBindingPhoneNumTypeConfirm) { + [self.presenter mew_checkMoblieCodeWithMoblie:self.phoneNumTextField.text code:self.authCodeTextField.text]; } else { - [self.presenter bindkMoblieCodeWithMoblie:self.phoneNumTextField.text code:self.authCodeTextField.text]; + [self.presenter mew_bindkMoblieCodeWithMoblie:self.phoneNumTextField.text code:self.authCodeTextField.text]; } } error:^(NSError * _Nullable error) { @@ -264,28 +237,25 @@ [self.navigationController popViewControllerAnimated:NO]; } -#pragma mark - LoginVerifBindPhoneProtocol + +#pragma mark - MewLoginVerifBindPhoneProtocol - (void)mew_phoneSmsCodeSuccess { self.authCodeBtn.enabled = NO; [self showSuccessToast:@"验证码发送成功"]; [[MEWCountDownHelper shareHelper] mewOpenCountdownWithTime:60]; } -- (void)checkMoblieCodeWithMoblieSuccess { +- (void)mew_checkMoblieCodeWithMoblieSuccess { [self showSuccessToast:@"验证成功"]; [[MEWCountDownHelper shareHelper] mewStopCountDown]; -// LoginVerifBindPhoneViewController *vc = [[LoginVerifBindPhoneViewController alloc] init]; -// vc.bindingPhoneNumType = XPBindingPhoneNumTypeEdit; -// vc.userInfo = self.userInfo; -// [self.navigationController pushViewController:vc animated:YES]; } -- (void)bindMoblieCodeWithMoblieSuccess { +- (void)mew_bindMoblieCodeWithMoblieSuccess { [[MEWCountDownHelper shareHelper] mewStopCountDown]; // 修改绑定信息 - if (self.bindingPhoneNumType == XPBindingPhoneNumTypeEdit) { + if (self.bindingPhoneNumType == MewBindingPhoneNumTypeEdit) { - } else if (self.bindingPhoneNumType == XPBindingPhoneNumTypeNormal) { + } else if (self.bindingPhoneNumType == MewBindingPhoneNumTypeNormal) { // @weakify(self); [MewHUDTool showSuccessWithMessage:@"绑定成功"]; [self.navigationController popViewControllerAnimated:YES]; diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MineLoginPasswordViewController.h b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MewMineLoginPasswordViewController.h similarity index 73% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MineLoginPasswordViewController.h rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MewMineLoginPasswordViewController.h index 71ff7b6..7a2e170 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MineLoginPasswordViewController.h +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MewMineLoginPasswordViewController.h @@ -1,5 +1,5 @@ // -// MineLoginPasswordViewController.h +// MewMineLoginPasswordViewController.h // yinmeng-ios // // Created by 触海 on 2023/11/22. @@ -10,7 +10,7 @@ NS_ASSUME_NONNULL_BEGIN -@interface MineLoginPasswordViewController : MvpViewController +@interface MewMineLoginPasswordViewController : MvpViewController @property (nonatomic,strong) UserInfoModel *userInfo; ///是否是修改密码 @property (nonatomic,assign) BOOL isModifiPwd; diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MineLoginPasswordViewController.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MewMineLoginPasswordViewController.m similarity index 84% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MineLoginPasswordViewController.m rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MewMineLoginPasswordViewController.m index 20af274..7b5b0f5 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MineLoginPasswordViewController.m +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MewMineLoginPasswordViewController.m @@ -1,13 +1,13 @@ // -// MineLoginPasswordViewController.m +// MewMineLoginPasswordViewController.m // yinmeng-ios // // Created by 触海 on 2023/11/22. // -#import "MineLoginPasswordViewController.h" -#import "MineModifPayPwdView.h" -#import "LoginForgetPasswordViewController.h" +#import "MewMineLoginPasswordViewController.h" +#import "MewMineModifPayPwdView.h" +#import "MewLoginForgetPasswordViewController.h" ///Third #import #import @@ -23,18 +23,18 @@ #import "MineLoginPasswordProtocol.h" -@interface MineLoginPasswordViewController () +@interface MewMineLoginPasswordViewController () @property (nonatomic, strong) UILabel *titleLabel; /// 返回按钮 @property (nonatomic, strong) UIButton *backButton; ///容器 @property (nonatomic,strong) UIStackView *stackView; ///当前的密码 -@property (nonatomic,strong) MineModifPayPwdView *currentPwdView; +@property (nonatomic,strong) MewMineModifPayPwdView *currentPwdView; ///新密码 -@property (nonatomic,strong) MineModifPayPwdView *newsPwdView; +@property (nonatomic,strong) MewMineModifPayPwdView *newsPwdView; ///检查密码 -@property (nonatomic,strong) MineModifPayPwdView *checkPwdView; +@property (nonatomic,strong) MewMineModifPayPwdView *checkPwdView; ///忘记密码 @property (nonatomic, strong) UIButton *forgetButton; ///提交 @@ -50,7 +50,7 @@ @end -@implementation MineLoginPasswordViewController +@implementation MewMineLoginPasswordViewController - (BOOL)mew_isHiddenNavBar { return YES; } @@ -115,36 +115,33 @@ }]; } -#pragma mark - XPMineLoginPasswordProtocol -- (void)setLoginPasswordSuccess { +#pragma mark - MineMewLoginPasswordProtocol +- (void)mew_setLoginPasswordSuccess { [self showSuccessToast:@"设置成功"]; [self.navigationController popViewControllerAnimated:YES]; } -- (void)modifyLoginPasswordSuccess { +- (void)mew_modifyLoginPasswordSuccess { [self showSuccessToast:@"修改成功"]; [self.navigationController popViewControllerAnimated:YES]; } #pragma mark - Event Response -- (void)forgetButtonAction:(UIButton *)sender { - LoginForgetPasswordViewController *controller = [[LoginForgetPasswordViewController alloc] init]; +- (void)mew_forgetButtonAction:(UIButton *)sender { + MewLoginForgetPasswordViewController *controller = [[MewLoginForgetPasswordViewController alloc] init]; [self.navigationController pushViewController:controller animated:YES]; -// XPMineResetLoginPwdViewController * VC = [[XPMineResetLoginPwdViewController alloc] init]; -// VC.userInfo = self.userInfo; -// [self.navigationController pushViewController:VC animated:YES]; } -- (void)submitButtonAction:(UIButton *)sender { +- (void)mew_submitButtonAction:(UIButton *)sender { if (![self.newsPwdView.contentTextField.text isEqualToString:self.checkPwdView.contentTextField.text]) { [self showErrorToast:@"两次输入的新密码不一致哦"]; return; } if (self.isModifiPwd) { - [self.presenter modifyLoginPassword:self.userInfo.phone newPwd:self.newsPwd pwd:self.currentPwd]; + [self.presenter mew_modifyLoginPassword:self.userInfo.phone newPwd:self.newsPwd pwd:self.currentPwd]; } else { - [self.presenter setLoginPassword:self.userInfo.phone newPwd:self.newsPwd]; + [self.presenter mew_setLoginPassword:self.userInfo.phone newPwd:self.newsPwd]; } } @@ -208,9 +205,9 @@ return _stackView; } -- (MineModifPayPwdView *)currentPwdView { +- (MewMineModifPayPwdView *)currentPwdView { if (!_currentPwdView) { - _currentPwdView = [[MineModifPayPwdView alloc] init]; + _currentPwdView = [[MewMineModifPayPwdView alloc] init]; [_currentPwdView.contentTextField addTarget:self action:@selector(textFieldDidChange:) forControlEvents:UIControlEventEditingChanged]; _currentPwdView.backgroundColor = UIColor.whiteColor; _currentPwdView.hidden = YES; @@ -220,9 +217,9 @@ return _currentPwdView; } -- (MineModifPayPwdView *)newsPwdView { +- (MewMineModifPayPwdView *)newsPwdView { if (!_newsPwdView) { - _newsPwdView = [[MineModifPayPwdView alloc] init]; + _newsPwdView = [[MewMineModifPayPwdView alloc] init]; _newsPwdView.backgroundColor = UIColor.whiteColor; [_newsPwdView.contentTextField addTarget:self action:@selector(textFieldDidChange:) forControlEvents:UIControlEventEditingChanged]; _newsPwdView.layer.cornerRadius = 50/2.f; @@ -231,9 +228,9 @@ return _newsPwdView; } -- (MineModifPayPwdView *)checkPwdView { +- (MewMineModifPayPwdView *)checkPwdView { if (!_checkPwdView) { - _checkPwdView = [[MineModifPayPwdView alloc] init]; + _checkPwdView = [[MewMineModifPayPwdView alloc] init]; _checkPwdView.backgroundColor = UIColor.whiteColor; [_checkPwdView.contentTextField addTarget:self action:@selector(textFieldDidChange:) forControlEvents:UIControlEventEditingChanged]; _checkPwdView.layer.cornerRadius = 50/2.f; @@ -253,7 +250,7 @@ _submitButton.enabled = YES; UIImage *image = [UIImage gradientColorImageFromColors:@[[MEWThemeColor mewColorWithHexString:@"#FF60FD"], [MEWThemeColor mewColorWithHexString:@"#8974FF"],[MEWThemeColor mewColorWithHexString:@"#69EBFF"]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(KScreenWidth - 2*36, 52)]; _submitButton.backgroundColor = [UIColor colorWithPatternImage:image]; - [_submitButton addTarget:self action:@selector(submitButtonAction:) forControlEvents:UIControlEventTouchUpInside]; + [_submitButton addTarget:self action:@selector(mew_submitButtonAction:) forControlEvents:UIControlEventTouchUpInside]; } return _submitButton; } @@ -265,7 +262,7 @@ [_forgetButton setTitleColor:UIColor.whiteColor forState:UIControlStateNormal]; [_forgetButton setTitle:@"忘记密码？" forState:UIControlStateNormal]; _forgetButton.titleLabel.font = [UIFont systemFontOfSize:13]; - [_forgetButton addTarget:self action:@selector(forgetButtonAction:) forControlEvents:UIControlEventTouchUpInside]; + [_forgetButton addTarget:self action:@selector(mew_forgetButtonAction:) forControlEvents:UIControlEventTouchUpInside]; } return _forgetButton; } diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/Presenter/MewMessagePresenter.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/Presenter/MewMessagePresenter.m index d9301b1..2eb2705 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/Presenter/MewMessagePresenter.m +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/Presenter/MewMessagePresenter.m @@ -26,7 +26,7 @@ /// 获取用户信息 /// @param uid 用户uid - (void)mew_getMessageUserInfo:(NSString *)uid { - [Api userDetailInfoCompletion:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [Api Mew_UserDetailInfoCompletion:[self createHttpCompletion:^(BaseModel * _Nonnull data) { UserInfoModel * infoModel = [UserInfoModel mewModelWithDictionary:data.data]; [[self getView] mew_onGetSessionUserInfoSuccess:infoModel]; }fail:^(NSInteger code, NSString * _Nullable msg) { @@ -37,7 +37,7 @@ ///是否关注当前用户 - (void)mew_getFansLike:(NSString *)likeUid { NSString * uid = [AccountInfoStorage instance].getUid; - [Api attentionStatusCompletion:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [Api Mew_AttentionStatusCompletion:[self createHttpCompletion:^(BaseModel * _Nonnull data) { BOOL isLike = [data.data boolValue]; [[self getView] mew_getFansLikeSuccess:isLike]; }] uid:uid isLikeUid:likeUid]; @@ -49,7 +49,7 @@ NSString * uid = [[AccountInfoStorage instance] getUid]; NSString * ticket = [[AccountInfoStorage instance] getTicket]; NSString * type = @"1"; - [Api attentionCompletion:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [Api Mew_AttentionCompletion:[self createHttpCompletion:^(BaseModel * _Nonnull data) { [[self getView] mew_attentionUserSuccess:targetUid]; [[NSNotificationCenter defaultCenter]postNotificationName:@"kAttentionUserNotification" object:nil]; } showLoading:YES] uid:uid likedUid:targetUid ticket:ticket type:type]; diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/MewSessionMessageCell.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/MewSessionMessageCell.m index d9897b7..be1e286 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/MewSessionMessageCell.m +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/MewSessionMessageCell.m @@ -22,7 +22,7 @@ /// P #import "MewMessageContentProtocol.h" ///Model -//#import "AttachmentModel.h" +//#import "MewAttachmentModel.h" @interface MewSessionMessageCell() diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Api/Api+Mine.h b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Api/Api+Mine.h index c928ff7..673cd74 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Api/Api+Mine.h +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Api/Api+Mine.h @@ -16,19 +16,19 @@ NS_ASSUME_NONNULL_BEGIN /// @param page 当前页数 /// @param pageSize 一页多少个 /// @param roomType 类型：4：个播房；其他：派对房；不传：所有房间 -+ (void)requestMineCollectRoomList:(HttpRequestHelperCompletion)completion uid:(NSString *)uid page:(NSString *)page pageSize:(NSString *)pageSize roomType:(NSString *)roomType; ++ (void)Mew_RequestMineCollectRoomList:(HttpRequestHelperCompletion)completion uid:(NSString *)uid page:(NSString *)page pageSize:(NSString *)pageSize roomType:(NSString *)roomType; /// 退出当前账号 /// @param completion 完成 /// @param access_token token -+ (void)logoutCurrentAccount:(HttpRequestHelperCompletion)completion access_token:(NSString *)access_token; ++ (void)Mew_LogoutCurrentAccount:(HttpRequestHelperCompletion)completion access_token:(NSString *)access_token; /// 获取用户详情 /// @param completion 完成 /// @param uid 发起关注的人 /// @param page page /// @param pageSize pagesize -+ (void)userDetailInfoCompletion:(HttpRequestHelperCompletion)completion uid:(NSString *)uid page:(NSString *)page pageSize:(NSString *)pageSize; ++ (void)Mew_UserDetailInfoCompletion:(HttpRequestHelperCompletion)completion uid:(NSString *)uid page:(NSString *)page pageSize:(NSString *)pageSize; /// 关注某人 /// @param completion 完成 @@ -36,13 +36,13 @@ NS_ASSUME_NONNULL_BEGIN /// @param likedUid 被关注的人 /// @param ticket ticket /// @param type 1 关注 2取消关注 -+ (void)attentionCompletion:(HttpRequestHelperCompletion)completion uid:(NSString *)uid likedUid:(NSString *)likedUid ticket:(NSString *)ticket type:(NSString *)type; ++ (void)Mew_AttentionCompletion:(HttpRequestHelperCompletion)completion uid:(NSString *)uid likedUid:(NSString *)likedUid ticket:(NSString *)ticket type:(NSString *)type; /// 查询两个人的关注状态 /// @param completion 完成 /// @param uid 自己的uid /// @param isLikeUid 要查询的那个人的uid -+ (void)attentionStatusCompletion:(HttpRequestHelperCompletion)completion uid:(NSString *)uid isLikeUid:(NSString *)isLikeUid; ++ (void)Mew_AttentionStatusCompletion:(HttpRequestHelperCompletion)completion uid:(NSString *)uid isLikeUid:(NSString *)isLikeUid; /// 获取关注列表 @@ -50,13 +50,13 @@ NS_ASSUME_NONNULL_BEGIN /// @param uid 用户的uid /// @param pageNo 当前页数 /// @param pageSize 一页多少个 -+ (void)getattentionListCompletion:(HttpRequestHelperCompletion)completion uid:(NSString *)uid pageNo:(NSString *)pageNo pageSize:(NSString *)pageSize; ++ (void)Mew_GetAttentionListCompletion:(HttpRequestHelperCompletion)completion uid:(NSString *)uid pageNo:(NSString *)pageNo pageSize:(NSString *)pageSize; /// 请求充值列表 /// @param complection 完成 /// @param channelType channel -+ (void)getRechargeList:(HttpRequestHelperCompletion)complection ++ (void)Mew_GetRechargeList:(HttpRequestHelperCompletion)complection channelType:(NSString *)channelType; /// 苹果下单 @@ -66,7 +66,7 @@ NS_ASSUME_NONNULL_BEGIN /// @param ticket ticket /// @param deviceInfo uuid /// @param clientIp ip地址 -+ (void)requestIAPRecharge:(HttpRequestHelperCompletion)complection ++ (void)Mew_RequestIAPRecharge:(HttpRequestHelperCompletion)complection chargeProdId:(NSString *)chargeProdId uid:(NSString *)uid ticket:(NSString *)ticket @@ -81,7 +81,7 @@ NS_ASSUME_NONNULL_BEGIN /// @param transcationId 内购的唯一标识符 /// @param uid 用户uid /// @param ticket ticket -+ (void)checkReceipt:(HttpRequestHelperCompletion)complection ++ (void)Mew_CheckReceipt:(HttpRequestHelperCompletion)complection receipt:(NSString *)receipt chooseEnv:(NSString *)chooseEnv chargeRecordId:(NSString *)chargeRecordId @@ -96,21 +96,21 @@ NS_ASSUME_NONNULL_BEGIN /// @param transcationId 内购的唯一标识符 /// @param uid 用户uid /// @param ticket ticket -+ (void)checkReceipt:(HttpRequestHelperCompletion)completion chooseEnv:(NSString *)chooseEnv chargeRecordId:(NSString *)chargeRecordId transcationId:(NSString *)transcationId uid:(NSString *)uid ticket:(NSString *)ticket; ++ (void)Mew_CheckReceipt:(HttpRequestHelperCompletion)completion chooseEnv:(NSString *)chooseEnv chargeRecordId:(NSString *)chargeRecordId transcationId:(NSString *)transcationId uid:(NSString *)uid ticket:(NSString *)ticket; /// 设置登录密码 /// @param completion 完成 /// @param phone 手机号 /// @param newPwd 新的密码 -+ (void)setLoingPassword:(HttpRequestHelperCompletion)completion phone:(NSString *)phone newPwd:(NSString *)newPwd; ++ (void)Mew_SetLoingPassword:(HttpRequestHelperCompletion)completion phone:(NSString *)phone newPwd:(NSString *)newPwd; /// 修改 登录密码 /// @param completion 完成 /// @param phone 手机号 /// @param newPwd 新的密码 /// @param pwd 旧密码 -+ (void)modifyLoingPassword:(HttpRequestHelperCompletion)completion phone:(NSString *)phone newPwd:(NSString *)newPwd pwd:(NSString *)pwd; ++ (void)Mew_ModifyLoingPassword:(HttpRequestHelperCompletion)completion phone:(NSString *)phone newPwd:(NSString *)newPwd pwd:(NSString *)pwd; @end diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Api/Api+Mine.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Api/Api+Mine.m index f3ea611..a403ac9 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Api/Api+Mine.m +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Api/Api+Mine.m @@ -15,7 +15,7 @@ /// @param page 当前页数 /// @param pageSize 一页多少个 /// @param roomType 类型：4：个播房；其他：派对房；不传：所有房间 -+ (void)requestMineCollectRoomList:(HttpRequestHelperCompletion)completion uid:(NSString *)uid page:(NSString *)page pageSize:(NSString *)pageSize roomType:(NSString *)roomType { ++ (void)Mew_RequestMineCollectRoomList:(HttpRequestHelperCompletion)completion uid:(NSString *)uid page:(NSString *)page pageSize:(NSString *)pageSize roomType:(NSString *)roomType { NSString *getUrl = [NewEncryptTool MEW_aesDecrypt:@"xbrIaF3tjG37mRyRC97ZrffhHg2YaksxPephr1wGtYI="];//fans/fansRoomList [self makeRequest:getUrl method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__,uid , page, pageSize, roomType, nil]; } @@ -23,7 +23,7 @@ /// 退出当前账号 /// @param completion 完成 /// @param access_token token -+ (void)logoutCurrentAccount:(HttpRequestHelperCompletion)completion access_token:(NSString *)access_token { ++ (void)Mew_LogoutCurrentAccount:(HttpRequestHelperCompletion)completion access_token:(NSString *)access_token { NSString *getUrl = [NewEncryptTool MEW_aesDecrypt:@"73cfDtRGGthZvJUN7DktoA=="];///acc/logout [self makeRequest:getUrl method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, access_token, nil]; } @@ -34,7 +34,7 @@ /// @param uid 发起关注的人 /// @param page page /// @param pageSize pagesize -+ (void)userDetailInfoCompletion:(HttpRequestHelperCompletion)completion uid:(NSString *)uid page:(NSString *)page pageSize:(NSString *)pageSize { ++ (void)Mew_UserDetailInfoCompletion:(HttpRequestHelperCompletion)completion uid:(NSString *)uid page:(NSString *)page pageSize:(NSString *)pageSize { NSString *getUrl = [NewEncryptTool MEW_aesDecrypt:@"W7uzbHnGUU1RiDHmTvViGQ=="];///user/detail/get [self makeRequest:getUrl method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, uid, page, pageSize, nil]; } @@ -46,7 +46,7 @@ /// @param likedUid 被关注的人 /// @param ticket ticket /// @param type 1 关注 2取消关注 -+ (void)attentionCompletion:(HttpRequestHelperCompletion)completion uid:(NSString *)uid likedUid:(NSString *)likedUid ticket:(NSString *)ticket type:(NSString *)type { ++ (void)Mew_AttentionCompletion:(HttpRequestHelperCompletion)completion uid:(NSString *)uid likedUid:(NSString *)likedUid ticket:(NSString *)ticket type:(NSString *)type { NSString *getUrl = [NewEncryptTool MEW_aesDecrypt:@"atxkzRc+U9YS4UOIpECXlw=="];///fans/like [self makeRequest:getUrl method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, uid, likedUid, ticket, type, nil]; } @@ -55,7 +55,7 @@ /// @param completion 完成 /// @param uid 自己的uid /// @param isLikeUid 要查询的那个人的uid -+ (void)attentionStatusCompletion:(HttpRequestHelperCompletion)completion uid:(NSString *)uid isLikeUid:(NSString *)isLikeUid { ++ (void)Mew_AttentionStatusCompletion:(HttpRequestHelperCompletion)completion uid:(NSString *)uid isLikeUid:(NSString *)isLikeUid { NSString *getUrl = [NewEncryptTool MEW_aesDecrypt:@"2D8AkLpUg8cU9aQTxO+Mmw=="];///fans/islike [self makeRequest:getUrl method:HttpRequestHelperMethodGET completion:completion,__FUNCTION__, uid, isLikeUid, nil]; } @@ -65,7 +65,7 @@ /// @param uid 用户的uid /// @param pageNo 当前页数 /// @param pageSize 一页多少个 -+ (void)getattentionListCompletion:(HttpRequestHelperCompletion)completion uid:(NSString *)uid pageNo:(NSString *)pageNo pageSize:(NSString *)pageSize { ++ (void)Mew_GetAttentionListCompletion:(HttpRequestHelperCompletion)completion uid:(NSString *)uid pageNo:(NSString *)pageNo pageSize:(NSString *)pageSize { NSString *getUrl = [NewEncryptTool MEW_aesDecrypt:@"INF19c+8RN4ef4v8DIWwJQ=="];///fans/following [self makeRequest:getUrl method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, uid, pageNo, pageSize, nil]; } @@ -75,7 +75,7 @@ /// 请求充值列表 /// @param completion 完成 /// @param channelType channel -+ (void)getRechargeList:(HttpRequestHelperCompletion)completion channelType:(NSString *)channelType { ++ (void)Mew_GetRechargeList:(HttpRequestHelperCompletion)completion channelType:(NSString *)channelType { NSString *getUrl = [NewEncryptTool MEW_aesDecrypt:@"tJGng+8YSnwgwk5S0i5New=="];////chargeprod/list [self makeRequest:getUrl method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__,channelType, nil]; } @@ -87,7 +87,7 @@ /// @param ticket ticket /// @param deviceInfo uuid /// @param clientIp ip地址 -+ (void)requestIAPRecharge:(HttpRequestHelperCompletion)completion chargeProdId:(NSString *)chargeProdId uid:(NSString *)uid ticket:(NSString *)ticket deviceInfo:(NSString *)deviceInfo clientIp:(NSString *)clientIp { ++ (void)Mew_RequestIAPRecharge:(HttpRequestHelperCompletion)completion chargeProdId:(NSString *)chargeProdId uid:(NSString *)uid ticket:(NSString *)ticket deviceInfo:(NSString *)deviceInfo clientIp:(NSString *)clientIp { NSString *getUrl = [NewEncryptTool MEW_aesDecrypt:@"bwrNIwSuCtX9ebT29xed93rJaaaSsuxrTFso6OAppms="];//storeKitV/placeOrder [self makeRequest:getUrl method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__,chargeProdId, uid, ticket, deviceInfo, clientIp, nil]; } @@ -101,7 +101,7 @@ /// @param transcationId 内购的唯一标识符 /// @param uid 用户uid /// @param ticket ticket -+ (void)checkReceipt:(HttpRequestHelperCompletion)completion receipt:(NSString *)receipt chooseEnv:(NSString *)chooseEnv chargeRecordId:(NSString *)chargeRecordId transcationId:(NSString *)transcationId uid:(NSString *)uid ticket:(NSString *)ticket { ++ (void)Mew_CheckReceipt:(HttpRequestHelperCompletion)completion receipt:(NSString *)receipt chooseEnv:(NSString *)chooseEnv chargeRecordId:(NSString *)chargeRecordId transcationId:(NSString *)transcationId uid:(NSString *)uid ticket:(NSString *)ticket { NSString *getUrl = [NewEncryptTool MEW_aesDecrypt:@"/sdsv2QZR4mbqOhGOocSTQ=="];////verify/setiap [self makeRequest:getUrl method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__,receipt, chooseEnv, chargeRecordId, transcationId, uid, ticket, nil]; } @@ -112,7 +112,7 @@ /// @param transcationId 内购的唯一标识符 /// @param uid 用户uid /// @param ticket ticket -+ (void)checkReceipt:(HttpRequestHelperCompletion)completion chooseEnv:(NSString *)chooseEnv chargeRecordId:(NSString *)chargeRecordId transcationId:(NSString *)transcationId uid:(NSString *)uid ticket:(NSString *)ticket { ++ (void)Mew_CheckReceipt:(HttpRequestHelperCompletion)completion chooseEnv:(NSString *)chooseEnv chargeRecordId:(NSString *)chargeRecordId transcationId:(NSString *)transcationId uid:(NSString *)uid ticket:(NSString *)ticket { NSString *getUrl = [NewEncryptTool MEW_aesDecrypt:@"10iACYRNJ/Q7R019Q4DRNFPf0nODacTzggh6x9bvmOw="];//storeKitV2/verifyOrder [self makeRequest:getUrl method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, chooseEnv, chargeRecordId, transcationId, uid, ticket, nil]; } @@ -121,7 +121,7 @@ /// @param completion 完成 /// @param phone 手机号 /// @param newPwd 新的密码 -+ (void)setLoingPassword:(HttpRequestHelperCompletion)completion phone:(NSString *)phone newPwd:(NSString *)newPwd { ++ (void)Mew_SetLoingPassword:(HttpRequestHelperCompletion)completion phone:(NSString *)phone newPwd:(NSString *)newPwd { [self makeRequest:@"acc/pwd/set" method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, phone, newPwd, nil]; } @@ -130,7 +130,7 @@ /// @param phone 手机号 /// @param newPwd 新的密码 /// @param pwd 旧密码 -+ (void)modifyLoingPassword:(HttpRequestHelperCompletion)completion phone:(NSString *)phone newPwd:(NSString *)newPwd pwd:(NSString *)pwd { ++ (void)Mew_ModifyLoingPassword:(HttpRequestHelperCompletion)completion phone:(NSString *)phone newPwd:(NSString *)newPwd pwd:(NSString *)pwd { [self makeRequest:@"acc/pwd/modify" method:HttpRequestHelperMethodPOST completion:completion,__FUNCTION__, phone, newPwd, pwd, nil]; } diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/Friend/FansInfoModel.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/Friend/FansInfoModel.m deleted file mode 100644 index f32b163..0000000 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/Friend/FansInfoModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// FansInfoModel.m -// mew-ios -// -// Created by 触海 on 2023/11/18. -// - -#import "FansInfoModel.h" - -@implementation FansInfoModel - -@end diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/Friend/FansInfoModel.h b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/Friend/MewFansInfoModel.h similarity index 92% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/Friend/FansInfoModel.h rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/Friend/MewFansInfoModel.h index 616bf4f..583b904 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/Friend/FansInfoModel.h +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/Friend/MewFansInfoModel.h @@ -1,5 +1,5 @@ // -// FansInfoModel.h +// MewFansInfoModel.h // mew-ios // // Created by 触海 on 2023/11/18. @@ -10,7 +10,7 @@ NS_ASSUME_NONNULL_BEGIN -@interface FansInfoModel : NSObject +@interface MewFansInfoModel : NSObject ///头像 @property (nonatomic,copy) NSString *avatar; ///姓名 diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/Friend/MewFansInfoModel.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/Friend/MewFansInfoModel.m new file mode 100644 index 0000000..95bfb0b --- /dev/null +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/Friend/MewFansInfoModel.m @@ -0,0 +1,12 @@ +// +// MewFansInfoModel.m +// mew-ios +// +// Created by 触海 on 2023/11/18. +// + +#import "MewFansInfoModel.h" + +@implementation MewFansInfoModel + +@end diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/MineCollectRoomModel.h b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/MewMineCollectRoomModel.h similarity index 91% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/MineCollectRoomModel.h rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/MewMineCollectRoomModel.h index a972027..879a274 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/MineCollectRoomModel.h +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/MewMineCollectRoomModel.h @@ -1,5 +1,5 @@ // -// MineCollectRoomModel.h +// MewMineCollectRoomModel.h // mew-ios // // Created by 触海 on 2023/11/9. @@ -9,7 +9,7 @@ NS_ASSUME_NONNULL_BEGIN -@interface MineCollectRoomModel : NSObject +@interface MewMineCollectRoomModel : NSObject ///昵称 @property (nonatomic,copy) NSString *nick; ///头像 diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/MewMineCollectRoomModel.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/MewMineCollectRoomModel.m new file mode 100644 index 0000000..f083f65 --- /dev/null +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/MewMineCollectRoomModel.m @@ -0,0 +1,12 @@ +// +// MewMineCollectRoomModel.m +// mew-ios +// +// Created by 触海 on 2023/11/9. +// + +#import "MewMineCollectRoomModel.h" + +@implementation MewMineCollectRoomModel + +@end diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/MewMineSettingItemModel.h b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/MewMineSettingItemModel.h new file mode 100644 index 0000000..139a0f4 --- /dev/null +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/MewMineSettingItemModel.h @@ -0,0 +1,29 @@ +// +// MewMineSettingItemModel.h +// mew-ios +// +// Created by 触海 on 2023/11/9. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +typedef NS_ENUM(NSInteger, MewMineSettingItemType){ + MewMineSettingItemType_Phone, ///手机号 + MewMineSettingItemType_Login_Password,///登录密码 + MewMineSettingItemType_About_Us,///关于我们 + MewMineSettingItemType_Cancel_Account ///注销账号 +}; + +@interface MewMineSettingItemModel : NSObject +///标题 +@property (nonatomic,copy) NSString *title; +///副标题 +@property (nonatomic,copy,) NSString * __nullable subTitle; +///类型 +@property (nonatomic,assign) MewMineSettingItemType type; + +@end + +NS_ASSUME_NONNULL_END diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/MewMineSettingItemModel.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/MewMineSettingItemModel.m new file mode 100644 index 0000000..e5651c7 --- /dev/null +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/MewMineSettingItemModel.m @@ -0,0 +1,12 @@ +// +// MewMineSettingItemModel.m +// mew-ios +// +// Created by 触海 on 2023/11/9. +// + +#import "MewMineSettingItemModel.h" + +@implementation MewMineSettingItemModel + +@end diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/MineCollectRoomModel.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/MineCollectRoomModel.m deleted file mode 100644 index a98ece7..0000000 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/MineCollectRoomModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// MineCollectRoomModel.m -// mew-ios -// -// Created by 触海 on 2023/11/9. -// - -#import "MineCollectRoomModel.h" - -@implementation MineCollectRoomModel - -@end diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/Recharge/RechargeListModel.h b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/Recharge/MewRechargeListModel.h similarity index 86% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/Recharge/RechargeListModel.h rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/Recharge/MewRechargeListModel.h index 67e7688..0399147 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/Recharge/RechargeListModel.h +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/Recharge/MewRechargeListModel.h @@ -1,5 +1,5 @@ // -// RechargeListModel.h +// MewRechargeListModel.h // mew-ios // // Created by 触海 on 2023/11/17. @@ -9,7 +9,7 @@ NS_ASSUME_NONNULL_BEGIN -@interface RechargeListModel : NSObject +@interface MewRechargeListModel : NSObject ///充值的id @property(nonatomic, strong) NSString *chargeProdId; @property(nonatomic, strong) NSString *prodName; diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/Recharge/MewRechargeListModel.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/Recharge/MewRechargeListModel.m new file mode 100644 index 0000000..910d8a7 --- /dev/null +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/Recharge/MewRechargeListModel.m @@ -0,0 +1,12 @@ +// +// MewRechargeListModel.m +// mew-ios +// +// Created by 触海 on 2023/11/17. +// + +#import "MewRechargeListModel.h" + +@implementation MewRechargeListModel + +@end diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/Recharge/WalletInfoModel.h b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/Recharge/MewWalletInfoModel.h similarity index 90% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/Recharge/WalletInfoModel.h rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/Recharge/MewWalletInfoModel.h index ad8ec5f..6a1adeb 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/Recharge/WalletInfoModel.h +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/Recharge/MewWalletInfoModel.h @@ -1,5 +1,5 @@ // -// WalletInfoModel.h +// MewWalletInfoModel.h // mew-ios // // Created by 触海 on 2023/11/17. @@ -9,7 +9,7 @@ NS_ASSUME_NONNULL_BEGIN -@interface WalletInfoModel : NSObject +@interface MewWalletInfoModel : NSObject /// 用户 uid @property(nonatomic, assign) NSInteger uid; /// 钻石数量 diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/Recharge/MewWalletInfoModel.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/Recharge/MewWalletInfoModel.m new file mode 100644 index 0000000..500747e --- /dev/null +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/Recharge/MewWalletInfoModel.m @@ -0,0 +1,12 @@ +// +// MewWalletInfoModel.m +// mew-ios +// +// Created by 触海 on 2023/11/17. +// + +#import "MewWalletInfoModel.h" + +@implementation MewWalletInfoModel + +@end diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/Recharge/RechargeListModel.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/Recharge/RechargeListModel.m deleted file mode 100644 index a38ba85..0000000 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/Recharge/RechargeListModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// RechargeListModel.m -// mew-ios -// -// Created by 触海 on 2023/11/17. -// - -#import "RechargeListModel.h" - -@implementation RechargeListModel - -@end diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/Recharge/WalletInfoModel.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/Recharge/WalletInfoModel.m deleted file mode 100644 index 80b5c89..0000000 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/Recharge/WalletInfoModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// WalletInfoModel.m -// mew-ios -// -// Created by 触海 on 2023/11/17. -// - -#import "WalletInfoModel.h" - -@implementation WalletInfoModel - -@end diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/YMMineSettingItemModel.h b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/YMMineSettingItemModel.h deleted file mode 100644 index a94dd4d..0000000 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/YMMineSettingItemModel.h +++ /dev/null @@ -1,29 +0,0 @@ -// -// YMMineSettingItemModel.h -// mew-ios -// -// Created by 触海 on 2023/11/9. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -typedef NS_ENUM(NSInteger, YMMineSettingItemType){ - YMMineSettingItemType_Phone, ///手机号 - YMMineSettingItemType_Login_Password,///登录密码 - YMMineSettingItemType_About_Us,///关于我们 - YMMineSettingItemType_Cancel_Account ///注销账号 -}; - -@interface YMMineSettingItemModel : NSObject -///标题 -@property (nonatomic,copy) NSString *title; -///副标题 -@property (nonatomic,copy,) NSString * __nullable subTitle; -///类型 -@property (nonatomic,assign) YMMineSettingItemType type; - -@end - -NS_ASSUME_NONNULL_END diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/YMMineSettingItemModel.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/YMMineSettingItemModel.m deleted file mode 100644 index 202efcf..0000000 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/YMMineSettingItemModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// YMMineSettingItemModel.m -// mew-ios -// -// Created by 触海 on 2023/11/9. -// - -#import "YMMineSettingItemModel.h" - -@implementation YMMineSettingItemModel - -@end diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Presenter/YMMineCollectRoomPresenter.h b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Presenter/MewMineCollectRoomPresenter.h similarity index 62% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Presenter/YMMineCollectRoomPresenter.h rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Presenter/MewMineCollectRoomPresenter.h index 260a88d..492ff59 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Presenter/YMMineCollectRoomPresenter.h +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Presenter/MewMineCollectRoomPresenter.h @@ -1,5 +1,5 @@ // -// YMMineCollectRoomPresenter.h +// MewMineCollectRoomPresenter.h // mew-ios // // Created by 触海 on 2023/11/9. @@ -9,13 +9,13 @@ NS_ASSUME_NONNULL_BEGIN -@interface YMMineCollectRoomPresenter : BaseMvpPresenter +@interface MewMineCollectRoomPresenter : BaseMvpPresenter /// 获取收藏房间列表 /// @param page 当前的页数 /// @param pageSize 一页多少个 /// @param type 类型：4：个播房；其他：派对房；不传：所有房间 -- (void)getCollectRoomList:(int)page pageSize:(int)pageSize state:(int)state type:(NSString *)type; +- (void)mew_getCollectRoomList:(int)page pageSize:(int)pageSize state:(int)state type:(NSString *)type; @end diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Presenter/MewMineCollectRoomPresenter.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Presenter/MewMineCollectRoomPresenter.m new file mode 100644 index 0000000..526d925 --- /dev/null +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Presenter/MewMineCollectRoomPresenter.m @@ -0,0 +1,31 @@ +// +// MewMineCollectRoomPresenter.m +// mew-ios +// +// Created by 触海 on 2023/11/9. +// + +#import "MewMineCollectRoomPresenter.h" +#import "AccountInfoStorage.h" +#import "Api+Mine.h" +#import "MewMineCollectRoomModel.h" +#import "MewMineCollectRoomProtocol.h" +#import "NSArray+MEWSafe.h" +#import "NSObject+MEWExtension.h" +@implementation MewMineCollectRoomPresenter + +/// 获取收藏房间列表 +/// @param page 当前的页数 +/// @param pageSize 一页多少个 +/// @param type 类型：4：个播房；其他：派对房；不传：所有房间 +- (void)mew_getCollectRoomList:(int)page pageSize:(int)pageSize state:(int)state type:(NSString *)type { + NSString * uid = [AccountInfoStorage instance].getUid; + [Api Mew_RequestMineCollectRoomList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + NSArray * array = [MewMineCollectRoomModel mewModelsWithArray:data.data[@"fansRoomList"]]; + [[self getView] mew_fonGetCollectRoomListSuccess:array state:state]; + } fail:^(NSInteger code, NSString * _Nullable msg) { + [[self getView] mew_getCollectRoomListFail:state]; + }] uid:uid page:[NSString stringWithFormat:@"%d", page] pageSize:[NSString stringWithFormat:@"%d", pageSize] roomType:type.length ? type : NULL]; +} + +@end diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Presenter/MineRechargePresenter.h b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Presenter/MewMineRechargePresenter.h similarity index 51% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Presenter/MineRechargePresenter.h rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Presenter/MewMineRechargePresenter.h index 89bccc5..47dc8c3 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Presenter/MineRechargePresenter.h +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Presenter/MewMineRechargePresenter.h @@ -1,5 +1,5 @@ // -// MineRechargePresenter.h +// MewMineRechargePresenter.h // yinmeng-ios // // Created by 触海 on 2023/11/22. @@ -9,31 +9,31 @@ NS_ASSUME_NONNULL_BEGIN -@interface MineRechargePresenter : BaseMvpPresenter +@interface MewMineRechargePresenter : BaseMvpPresenter /// 获取钱包信息 -- (void)getUserWalletInfo; +- (void)mew_getUserWalletInfo; /// 请求内购列表 /// @param channel 目前是8 -- (void)requestRechargeListWithChannel:(NSString *)channel; +- (void)mew_requestRechargeListWithChannel:(NSString *)channel; /// 获取充值的订单编号 /// @param chargeProdId 苹果服务器的充值 的id -- (void)requestIAPRechargeOrderWithChargeProdId:(NSString *)chargeProdId; +- (void)mew_requestIAPRechargeOrderWithChargeProdId:(NSString *)chargeProdId; /// 充值成功二次验证 /// @param receipt 凭据 /// @param orderId 订单编号 /// @param transcationId 商品id -- (void)checkReceiptWithData:(NSString *)receipt orderId:(NSString *)orderId transcationId:(NSString *)transcationId; +- (void)mew_checkReceiptWithData:(NSString *)receipt orderId:(NSString *)orderId transcationId:(NSString *)transcationId; /// 批量验证内购掉单 /// @param transcations 凭据的数组 -- (void)checkTranscationIds:(NSArray *)transcations; +- (void)mew_checkTranscationIds:(NSArray *)transcations; /// 充值成功二次验证 /// @param orderId 订单编号 /// @param transcationId 商品id -- (void)checkReceiptWithOrderId:(NSString *)orderId transcationId:(NSString *)transcationId errorToast:(BOOL)errorToast; +- (void)mew_checkReceiptWithOrderId:(NSString *)orderId transcationId:(NSString *)transcationId errorToast:(BOOL)errorToast; @end NS_ASSUME_NONNULL_END diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Presenter/MineRechargePresenter.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Presenter/MewMineRechargePresenter.m similarity index 64% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Presenter/MineRechargePresenter.m rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Presenter/MewMineRechargePresenter.m index eb8805a..3f99404 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Presenter/MineRechargePresenter.m +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Presenter/MewMineRechargePresenter.m @@ -1,52 +1,52 @@ // -// MineRechargePresenter.m +// MewMineRechargePresenter.m // yinmeng-ios // // Created by 触海 on 2023/11/22. // -#import "MineRechargePresenter.h" +#import "MewMineRechargePresenter.h" /// Tool #import "AccountInfoStorage.h" #import "YYUtility.h" #import "NSObject+MEWExtension.h" ///Api #import "Api+Mine.h" -#import "RechargeListModel.h" -#import "WalletInfoModel.h" -#import "MineRechargeProtocol.h" +#import "MewRechargeListModel.h" +#import "MewWalletInfoModel.h" +#import "MewMineRechargeProtocol.h" -@implementation MineRechargePresenter +@implementation MewMineRechargePresenter /// 获取钱包信息 -- (void)getUserWalletInfo { +- (void)mew_getUserWalletInfo { NSString * uid = [AccountInfoStorage instance].getUid; NSString * ticket = [AccountInfoStorage instance].getTicket; - [Api getUserWalletInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - WalletInfoModel * model = [WalletInfoModel mewModelWithDictionary:data.data]; - [[self getView] getUserWalletInfo:model]; + [Api mew_getUserWalletInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + MewWalletInfoModel * model = [MewWalletInfoModel mewModelWithDictionary:data.data]; + [[self getView] mew_getUserWalletInfo:model]; }] uid:uid ticket:ticket]; } /// 请求内购列表 /// @param channel 目前是8 -- (void)requestRechargeListWithChannel:(NSString *)channel { - [Api getRechargeList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - NSArray * array = [RechargeListModel mewModelsWithArray:data.data]; - [[self getView] requestRechargeListSucccess:array]; +- (void)mew_requestRechargeListWithChannel:(NSString *)channel { + [Api Mew_GetRechargeList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + NSArray * array = [MewRechargeListModel mewModelsWithArray:data.data]; + [[self getView] mew_requestRechargeListSucccess:array]; }] channelType:channel]; } /// 获取充值的订单编号 /// @param chargeProdId 苹果服务器的充值 的id -- (void)requestIAPRechargeOrderWithChargeProdId:(NSString *)chargeProdId { +- (void)mew_requestIAPRechargeOrderWithChargeProdId:(NSString *)chargeProdId { NSString * uid = [AccountInfoStorage instance].getUid; NSString * ticket = [AccountInfoStorage instance].getTicket; NSString * deviceInfo = [YYUtility deviceID]; NSString * clientIp= [YYUtility ipAddress]; - [Api requestIAPRecharge:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [Api Mew_RequestIAPRecharge:[self createHttpCompletion:^(BaseModel * _Nonnull data) { NSString *orderId = (NSString *)data.data[@"recordId"]; NSString *mew_uuid = (NSString *)data.data[@"appAccountToken"]; [[self getView] mew_requestIAPRechargeOrderSuccess:orderId chargeProdId:chargeProdId uuid:mew_uuid]; @@ -61,10 +61,10 @@ /// 充值成功二次验证 /// @param orderId 订单编号 /// @param transcationId 商品id -- (void)checkReceiptWithOrderId:(NSString *)orderId transcationId:(NSString *)transcationId errorToast:(BOOL)errorToast{ +- (void)mew_checkReceiptWithOrderId:(NSString *)orderId transcationId:(NSString *)transcationId errorToast:(BOOL)errorToast{ NSString * uid = [AccountInfoStorage instance].getUid; NSString * ticket = [AccountInfoStorage instance].getTicket; - [Api checkReceipt:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [Api Mew_CheckReceipt:[self createHttpCompletion:^(BaseModel * _Nonnull data) { [[self getView] mew_checkReceiptSuccess:transcationId]; }fail:^(NSInteger code, NSString * _Nullable msg) { [[self getView]mew_checkReceiptFailWithCode:code transcationId:transcationId]; @@ -75,10 +75,10 @@ /// @param receipt 凭据 /// @param orderId 订单编号 /// @param transcationId 商品id -- (void)checkReceiptWithData:(NSString *)receipt orderId:(NSString *)orderId transcationId:(NSString *)transcationId { +- (void)mew_checkReceiptWithData:(NSString *)receipt orderId:(NSString *)orderId transcationId:(NSString *)transcationId { NSString * uid = [AccountInfoStorage instance].getUid; NSString * ticket = [AccountInfoStorage instance].getTicket; - [Api checkReceipt:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [Api Mew_CheckReceipt:[self createHttpCompletion:^(BaseModel * _Nonnull data) { [[self getView] mew_checkReceiptSuccess:transcationId]; } showLoading:YES] receipt:receipt chooseEnv:@"true" chargeRecordId:orderId transcationId:transcationId uid:uid ticket:ticket]; } @@ -86,10 +86,10 @@ /// 批量验证内购掉单 /// @param transcations 凭据的数组 -- (void)checkTranscationIds:(NSArray *)transcations { +- (void)mew_checkTranscationIds:(NSArray *)transcations { NSString * transcationIdStr = [transcations mewToJSONString]; [Api requestCheckTranscationIds:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] checkTranscationIdsSuccess]; + [[self getView] mew_checkTranscationIdsSuccess]; }] transcationIdStr:transcationIdStr]; } diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Presenter/YMMineSettingPresenter.h b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Presenter/MewMineSettingPresenter.h similarity index 56% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Presenter/YMMineSettingPresenter.h rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Presenter/MewMineSettingPresenter.h index c22551c..e3121c0 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Presenter/YMMineSettingPresenter.h +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Presenter/MewMineSettingPresenter.h @@ -1,5 +1,5 @@ // -// YMMineSettingPresenter.h +// MewMineSettingPresenter.h // mew-ios // // Created by 触海 on 2023/11/9. @@ -10,16 +10,16 @@ NS_ASSUME_NONNULL_BEGIN -@interface YMMineSettingPresenter : BaseMvpPresenter +@interface MewMineSettingPresenter : BaseMvpPresenter /// 获取用户信息 -- (void)getUserInfo; +- (void)mew_getUserInfo; /// 获取数据源 /// @param userinfo 当前的用户信息 -- (void)getMineSettingDataSourceWith:(UserInfoModel *)userinfo; +- (void)mew_getMineSettingDataSourceWith:(UserInfoModel *)userinfo; /// 退出当前账号 -- (void)logoutCurrentAccount; +- (void)mew_logoutCurrentAccount; @end diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Presenter/YMMineSettingPresenter.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Presenter/MewMineSettingPresenter.m similarity index 53% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Presenter/YMMineSettingPresenter.m rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Presenter/MewMineSettingPresenter.m index 19bb0a9..34ca88e 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Presenter/YMMineSettingPresenter.m +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Presenter/MewMineSettingPresenter.m @@ -1,55 +1,55 @@ // -// YMMineSettingPresenter.m +// MewMineSettingPresenter.m // mew-ios // // Created by 触海 on 2023/11/9. // -#import "YMMineSettingPresenter.h" +#import "MewMineSettingPresenter.h" #import "AccountInfoStorage.h" #import "Api+Mine.h" ///Model #import "UserInfoModel.h" #import "AccountModel.h" -#import "YMMineSettingItemModel.h" +#import "MewMineSettingItemModel.h" /// protocol -#import "YMMineSettingProtocol.h" +#import "MewMineSettingProtocol.h" /// Tool #import "Base.h" -@implementation YMMineSettingPresenter -- (id)getView { - return (id)[super getView]; +@implementation MewMineSettingPresenter +- (id)getView { + return (id)[super getView]; } /// 审核模式下的数据源 -- (void)getMineSettingDataSourceWith:(UserInfoModel *)userinfo { +- (void)mew_getMineSettingDataSourceWith:(UserInfoModel *)userinfo { - YMMineSettingItemModel *phoneItem = [[YMMineSettingItemModel alloc] init]; + MewMineSettingItemModel *phoneItem = [[MewMineSettingItemModel alloc] init]; phoneItem.title = @"手机号码"; phoneItem.subTitle = userinfo.isBindPhone ? userinfo.phone : @"设置"; - phoneItem.type = YMMineSettingItemType_Phone; + phoneItem.type = MewMineSettingItemType_Phone; - YMMineSettingItemModel * loginItem = [[YMMineSettingItemModel alloc] init]; + MewMineSettingItemModel * loginItem = [[MewMineSettingItemModel alloc] init]; loginItem.title = userinfo.isBindPasswd ? @"重置密码" : @"设置密码"; loginItem.subTitle = @"设置"; - loginItem.type = YMMineSettingItemType_Login_Password; + loginItem.type = MewMineSettingItemType_Login_Password; - YMMineSettingItemModel * aboutusItem = [[YMMineSettingItemModel alloc] init]; + MewMineSettingItemModel * aboutusItem = [[MewMineSettingItemModel alloc] init]; aboutusItem.title = [NSString stringWithFormat:@"关于"]; aboutusItem.subTitle = @""; - aboutusItem.type = YMMineSettingItemType_About_Us; + aboutusItem.type = MewMineSettingItemType_About_Us; - YMMineSettingItemModel * cancelItem = [[YMMineSettingItemModel alloc] init]; + MewMineSettingItemModel * cancelItem = [[MewMineSettingItemModel alloc] init]; cancelItem.title = @"注销账号"; cancelItem.subTitle = @""; - cancelItem.type = YMMineSettingItemType_Cancel_Account; + cancelItem.type = MewMineSettingItemType_Cancel_Account; NSArray *dataModel = @[phoneItem, loginItem, aboutusItem, cancelItem]; - [[self getView] getMineSettingDatasourceSuccess:dataModel]; + [[self getView] mew_getMineSettingDatasourceSuccess:dataModel]; } /// 获取用户信息 -- (void)getUserInfo { +- (void)mew_getUserInfo { NSString *uid = [[AccountInfoStorage instance] getUid]; [Api getUserInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { UserInfoModel *userInfo = [UserInfoModel mewModelWithDictionary:data.data]; @@ -58,12 +58,11 @@ } /// 退出当前账号 -- (void)logoutCurrentAccount { +- (void)mew_logoutCurrentAccount { /// 判断是否最小化房间 - AccountModel *model = [[AccountInfoStorage instance] accountModel]; - [Api logoutCurrentAccount:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] logoutCurrentAccountSuccess]; + [Api Mew_LogoutCurrentAccount:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [[self getView] mew_logoutCurrentAccountSuccess]; [self logout]; }] access_token:model.access_token]; } diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Protocol/YMMineCollectRoomProtocol.h b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Protocol/MewMineCollectRoomProtocol.h similarity index 80% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Protocol/YMMineCollectRoomProtocol.h rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Protocol/MewMineCollectRoomProtocol.h index 023ddd6..4e47465 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Protocol/YMMineCollectRoomProtocol.h +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Protocol/MewMineCollectRoomProtocol.h @@ -1,5 +1,5 @@ // -// YMMineCollectRoomProtocol.h +// MewMineCollectRoomProtocol.h // mew-ios // // Created by 触海 on 2023/11/9. @@ -9,7 +9,7 @@ NS_ASSUME_NONNULL_BEGIN -@protocol YMMineCollectRoomProtocol +@protocol MewMineCollectRoomProtocol ///获取收藏房间列表成功 - (void)mew_fonGetCollectRoomListSuccess:(NSArray *)array state:(int)state; diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Protocol/MewMineRechargeProtocol.h b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Protocol/MewMineRechargeProtocol.h new file mode 100644 index 0000000..e4dfa02 --- /dev/null +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Protocol/MewMineRechargeProtocol.h @@ -0,0 +1,31 @@ +// +// MewMineRechargeProtocol.h +// yinmeng-ios +// +// Created by 触海 on 2023/11/22. +// + +#import +@class MewRechargeListModel; + +NS_ASSUME_NONNULL_BEGIN + +@protocol MewMineRechargeProtocol +@optional +///请求钱包余额信息 +- (void)mew_getUserWalletInfo:(MewWalletInfoModel *)balanceInfo; +///请求充值列表成功 +- (void)mew_requestRechargeListSucccess:(NSArray *)list; +///请求充值id的状态成功 +- (void)mew_requestIAPRechargeOrderSuccess:(NSString *)orderId chargeProdId:(NSString *)chargeProdId uuid:(NSString *)uuid; +///请求充值账单失败 +- (void)mew_requestIAPRechargeOrderFail; +///二次校验成功 +- (void)mew_checkReceiptSuccess:(NSString *)transcationId; +///批量验证凭据成功 +- (void)mew_checkTranscationIdsSuccess; +///二次校验失败 +- (void)mew_checkReceiptFailWithCode:(NSInteger)code transcationId:(NSString *)transcationId; +@end + +NS_ASSUME_NONNULL_END diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Protocol/YMMineSettingProtocol.h b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Protocol/MewMineSettingProtocol.h similarity index 63% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Protocol/YMMineSettingProtocol.h rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Protocol/MewMineSettingProtocol.h index 7b6084e..d985c8a 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Protocol/YMMineSettingProtocol.h +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Protocol/MewMineSettingProtocol.h @@ -1,5 +1,5 @@ // -// YMMineSettingProtocol.h +// MewMineSettingProtocol.h // mew-ios // // Created by 触海 on 2023/11/9. @@ -10,14 +10,14 @@ NS_ASSUME_NONNULL_BEGIN -@protocol YMMineSettingProtocol +@protocol MewMineSettingProtocol /// 获取数据成功 -- (void)getMineSettingDatasourceSuccess:(NSArray *)array; +- (void)mew_getMineSettingDatasourceSuccess:(NSArray *)array; ///获取用户信息成功 - (void)mew_onGetUserInfoSuccess:(UserInfoModel *)userInfo; ///退出当前账号成功 -- (void)logoutCurrentAccountSuccess; +- (void)mew_logoutCurrentAccountSuccess; @end diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/CollectRoom/Cell/MewMineCollectRoomCell.h b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/CollectRoom/Cell/MewMineCollectRoomCell.h new file mode 100644 index 0000000..7195493 --- /dev/null +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/CollectRoom/Cell/MewMineCollectRoomCell.h @@ -0,0 +1,17 @@ +// +// MewMineCollectRoomCell.h +// mew-ios +// +// Created by 触海 on 2023/11/9. +// + +#import +@class MewMineCollectRoomModel; + +NS_ASSUME_NONNULL_BEGIN + +@interface MewMineCollectRoomCell : UITableViewCell +@property (nonatomic,strong) MewMineCollectRoomModel *roomInfo; +@end + +NS_ASSUME_NONNULL_END diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/CollectRoom/Cell/YMMineCollectRoomCell.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/CollectRoom/Cell/MewMineCollectRoomCell.m similarity index 92% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/CollectRoom/Cell/YMMineCollectRoomCell.m rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/CollectRoom/Cell/MewMineCollectRoomCell.m index 941deee..7343d76 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/CollectRoom/Cell/YMMineCollectRoomCell.m +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/CollectRoom/Cell/MewMineCollectRoomCell.m @@ -1,20 +1,20 @@ // -// YMMineCollectRoomCell.m +// MewMineCollectRoomCell.m // mew-ios // // Created by 触海 on 2023/11/9. // -#import "YMMineCollectRoomCell.h" +#import "MewMineCollectRoomCell.h" ///Third #import ///Model -#import "MineCollectRoomModel.h" +#import "MewMineCollectRoomModel.h" /// Tool #import "NetImageView.h" #import "MEWThemeColor.h" -@interface YMMineCollectRoomCell() +@interface MewMineCollectRoomCell() ///显示头像 @property (nonatomic,strong) NetImageView *avatarImageView; ///显示名字 @@ -23,7 +23,7 @@ @property (nonatomic, strong) UIView *devideView; @end -@implementation YMMineCollectRoomCell +@implementation MewMineCollectRoomCell #pragma mark - Init - (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { @@ -65,7 +65,7 @@ } #pragma mark - Getters And Setters -- (void)setRoomInfo:(MineCollectRoomModel *)roomInfo { +- (void)setRoomInfo:(MewMineCollectRoomModel *)roomInfo { _roomInfo = roomInfo; if (_roomInfo) { self.avatarImageView.imageUrl = _roomInfo.roomAvatar; diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/CollectRoom/Cell/YMMineCollectRoomCell.h b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/CollectRoom/Cell/YMMineCollectRoomCell.h deleted file mode 100644 index 7c065bc..0000000 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/CollectRoom/Cell/YMMineCollectRoomCell.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// YMMineCollectRoomCell.h -// mew-ios -// -// Created by 触海 on 2023/11/9. -// - -#import -@class MineCollectRoomModel; - -NS_ASSUME_NONNULL_BEGIN - -@interface YMMineCollectRoomCell : UITableViewCell -@property (nonatomic,strong) MineCollectRoomModel *roomInfo; -@end - -NS_ASSUME_NONNULL_END diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/CollectRoom/YMMineCollectRoomViewController.h b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/CollectRoom/MewMineCollectRoomViewController.h similarity index 58% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/CollectRoom/YMMineCollectRoomViewController.h rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/CollectRoom/MewMineCollectRoomViewController.h index 4e2ff45..e442e38 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/CollectRoom/YMMineCollectRoomViewController.h +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/CollectRoom/MewMineCollectRoomViewController.h @@ -1,5 +1,5 @@ // -// YMMineCollectRoomViewController.h +// MewMineCollectRoomViewController.h // mew-ios // // Created by 触海 on 2023/11/9. @@ -9,7 +9,7 @@ NS_ASSUME_NONNULL_BEGIN -@interface YMMineCollectRoomViewController : MvpViewController +@interface MewMineCollectRoomViewController : MvpViewController @end diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/CollectRoom/YMMineCollectRoomViewController.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/CollectRoom/MewMineCollectRoomViewController.m similarity index 80% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/CollectRoom/YMMineCollectRoomViewController.m rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/CollectRoom/MewMineCollectRoomViewController.m index 8ba95ee..0f6e47a 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/CollectRoom/YMMineCollectRoomViewController.m +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/CollectRoom/MewMineCollectRoomViewController.m @@ -1,11 +1,11 @@ // -// YMMineCollectRoomViewController.m +// MewMineCollectRoomViewController.m // mew-ios // // Created by 触海 on 2023/11/9. // -#import "YMMineCollectRoomViewController.h" +#import "MewMineCollectRoomViewController.h" ///Third #import #import @@ -13,13 +13,13 @@ #import "MEWThemeColor.h" #import "NSArray+MewSafe.h" ///P -#import "YMMineCollectRoomPresenter.h" -#import "YMMineCollectRoomProtocol.h" +#import "MewMineCollectRoomPresenter.h" +#import "MewMineCollectRoomProtocol.h" ///View -#import "YMMineCollectRoomCell.h" +#import "MewMineCollectRoomCell.h" #import "YMEmptyTableViewCell.h" -@interface YMMineCollectRoomViewController () +@interface MewMineCollectRoomViewController () ///列表 @property (nonatomic,strong) UITableView *tableView; @@ -32,10 +32,10 @@ @end -@implementation YMMineCollectRoomViewController +@implementation MewMineCollectRoomViewController -- (YMMineCollectRoomPresenter *)createPresenter { - return [[YMMineCollectRoomPresenter alloc] init]; +- (MewMineCollectRoomPresenter *)createPresenter { + return [[MewMineCollectRoomPresenter alloc] init]; } #pragma mark - Life Cycle @@ -45,7 +45,7 @@ [self mew_initSubViews]; } -#pragma mark - YMMineCollectRoomProtocol +#pragma mark - MewMineCollectRoomProtocol /// 获取收藏列表成功 - (void)mew_fonGetCollectRoomListSuccess:(NSArray *)array state:(int)state { if (state == 0) { @@ -79,7 +79,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { if (self.datasource.count > 0) { - YMMineCollectRoomCell *cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([YMMineCollectRoomCell class])]; + MewMineCollectRoomCell *cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([MewMineCollectRoomCell class])]; cell.roomInfo = [self.datasource mewSafeObjectAtIndex:indexPath.row]; return cell; } @@ -125,7 +125,7 @@ #pragma mark - 刷新数据 - (void)mew_headerRefresh { self.page = 1; - [self.presenter getCollectRoomList:self.page pageSize:20 state:0 type: @"1"]; + [self.presenter mew_getCollectRoomList:self.page pageSize:20 state:0 type: @"1"]; } - (void)mew_footerRefresh { @@ -134,7 +134,7 @@ return; } self.page++; - [self.presenter getCollectRoomList:self.page pageSize:20 state:1 type: @"1"]; + [self.presenter mew_getCollectRoomList:self.page pageSize:20 state:1 type: @"1"]; } @@ -153,8 +153,7 @@ } _tableView.contentInset = UIEdgeInsetsMake(8, 0, 0, 0); [_tableView registerClass:[YMEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([YMEmptyTableViewCell class])]; - [_tableView registerClass:[YMMineCollectRoomCell class] forCellReuseIdentifier:NSStringFromClass([YMMineCollectRoomCell class])]; - // [_tableView registerClass:[XPMineCollectRoomEditCell class] forCellReuseIdentifier:NSStringFromClass([XPMineCollectRoomEditCell class])]; + [_tableView registerClass:[MewMineCollectRoomCell class] forCellReuseIdentifier:NSStringFromClass([MewMineCollectRoomCell class])]; } return _tableView; } diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/Cell/MewMineCollectionTableViewCell.h b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/Cell/MewMineCollectionTableViewCell.h index 637f53b..08d57cb 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/Cell/MewMineCollectionTableViewCell.h +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/Cell/MewMineCollectionTableViewCell.h @@ -6,14 +6,14 @@ // #import -@class MineCollectRoomModel; +@class MewMineCollectRoomModel; NS_ASSUME_NONNULL_BEGIN @interface MewMineCollectionTableViewCell : UITableViewCell /// 收藏房间 -@property (nonatomic,strong) MineCollectRoomModel *roomInfo; +@property (nonatomic,strong) MewMineCollectRoomModel *roomInfo; @end NS_ASSUME_NONNULL_END diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/Cell/MewMineCollectionTableViewCell.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/Cell/MewMineCollectionTableViewCell.m index d9cb9d3..47702fa 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/Cell/MewMineCollectionTableViewCell.m +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/Cell/MewMineCollectionTableViewCell.m @@ -7,7 +7,7 @@ #import "MewMineCollectionTableViewCell.h" #import "NetImageView.h" -#import "MineCollectRoomModel.h" +#import "MewMineCollectRoomModel.h" #import #import "YMMacro.h" #import "MEWThemeColor.h" @@ -60,7 +60,7 @@ } #pragma mark - Set -- (void)setRoomInfo:(MineCollectRoomModel *)roomInfo { +- (void)setRoomInfo:(MewMineCollectRoomModel *)roomInfo { _roomInfo = roomInfo; if (_roomInfo) { self.avaterImageView.imageUrl = _roomInfo.roomAvatar; @@ -72,7 +72,6 @@ - (NetImageView *)avaterImageView { if (!_avaterImageView) { _avaterImageView = [[NetImageView alloc] init]; -// _avaterImageView.backgroundColor = UIColor.redColor; } return _avaterImageView; } diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/Cell/MewMineSettingTableViewCell.h b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/Cell/MewMineSettingTableViewCell.h new file mode 100644 index 0000000..a3995ac --- /dev/null +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/Cell/MewMineSettingTableViewCell.h @@ -0,0 +1,18 @@ +// +// MewMineSettingTableViewCell.h +// mew-ios +// +// Created by 触海 on 2023/11/9. +// + +#import +@class MewMineSettingItemModel; + +NS_ASSUME_NONNULL_BEGIN + +@interface MewMineSettingTableViewCell : UITableViewCell +///数据源 +@property (nonatomic,strong) MewMineSettingItemModel *itemModel; +@end + +NS_ASSUME_NONNULL_END diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/Cell/YMMineSettingTableViewCell.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/Cell/MewMineSettingTableViewCell.m similarity index 92% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/Cell/YMMineSettingTableViewCell.m rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/Cell/MewMineSettingTableViewCell.m index 5b2b6d6..a322dcc 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/Cell/YMMineSettingTableViewCell.m +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/Cell/MewMineSettingTableViewCell.m @@ -1,20 +1,20 @@ // -// YMMineSettingTableViewCell.m +// MewMineSettingTableViewCell.m // mew-ios // // Created by 触海 on 2023/11/9. // -#import "YMMineSettingTableViewCell.h" +#import "MewMineSettingTableViewCell.h" /// Model -#import "YMMineSettingItemModel.h" +#import "MewMineSettingItemModel.h" /// Third #import ///Tool #import "MEWThemeColor.h" #import "YMMacro.h" -@interface YMMineSettingTableViewCell() +@interface MewMineSettingTableViewCell() ///容器 @property (nonatomic,strong) UIStackView *stackView; ///标题 @@ -26,7 +26,7 @@ @end -@implementation YMMineSettingTableViewCell +@implementation MewMineSettingTableViewCell #pragma mark - Init - (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { @@ -57,7 +57,7 @@ } #pragma mark - Getters And Setters -- (void)setItemModel:(YMMineSettingItemModel *)itemModel { +- (void)setItemModel:(MewMineSettingItemModel *)itemModel { _itemModel = itemModel; self.titleLabel.text = _itemModel.title; self.subTitleLabel.text = _itemModel.subTitle; diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/Cell/YMMineSettingTableViewCell.h b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/Cell/YMMineSettingTableViewCell.h deleted file mode 100644 index fe85614..0000000 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/Cell/YMMineSettingTableViewCell.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// YMMineSettingTableViewCell.h -// mew-ios -// -// Created by 触海 on 2023/11/9. -// - -#import -@class YMMineSettingItemModel; - -NS_ASSUME_NONNULL_BEGIN - -@interface YMMineSettingTableViewCell : UITableViewCell -///数据源 -@property (nonatomic,strong) YMMineSettingItemModel *itemModel; -@end - -NS_ASSUME_NONNULL_END diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/YMMineAboutUsViewController.h b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/MewMineAboutUsViewController.h similarity index 60% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/YMMineAboutUsViewController.h rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/MewMineAboutUsViewController.h index 3fc9f93..b7e8843 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/YMMineAboutUsViewController.h +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/MewMineAboutUsViewController.h @@ -1,5 +1,5 @@ // -// YMMineAboutUsViewController.h +// MewMineAboutUsViewController.h // mew-ios // // Created by 触海 on 2023/11/9. @@ -9,7 +9,7 @@ NS_ASSUME_NONNULL_BEGIN -@interface YMMineAboutUsViewController : BaseViewController +@interface MewMineAboutUsViewController : BaseViewController @end diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/YMMineAboutUsViewController.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/MewMineAboutUsViewController.m similarity index 94% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/YMMineAboutUsViewController.m rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/MewMineAboutUsViewController.m index 7aeb595..24957f3 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/YMMineAboutUsViewController.m +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/MewMineAboutUsViewController.m @@ -1,11 +1,11 @@ // -// YMMineAboutUsViewController.m +// MewMineAboutUsViewController.m // mew-ios // // Created by 触海 on 2023/11/9. // -#import "YMMineAboutUsViewController.h" +#import "MewMineAboutUsViewController.h" #import "YMWebViewController.h" ///Third #import @@ -16,7 +16,7 @@ #import "YYUtility.h" #import "MewHtmlUrl.h" -@interface YMMineAboutUsViewController () +@interface MewMineAboutUsViewController () @property (nonatomic, strong) UIButton *backButton; @property (nonatomic, strong) UILabel *titleLabel; @@ -29,7 +29,7 @@ @property (nonatomic, strong) UIImageView *privacyImageView; @end -@implementation YMMineAboutUsViewController +@implementation MewMineAboutUsViewController - (BOOL)mew_isHiddenNavBar { return YES; @@ -46,7 +46,7 @@ #pragma mark - Action Event /// 跳转到隐私协议 -- (void)pushPrivacyView:(UITapGestureRecognizer *)tap { +- (void)mew_pushPrivacyView:(UITapGestureRecognizer *)tap { YMWebViewController *controller = [[YMWebViewController alloc] init]; controller.url = URLWithType(kPrivacyURL); [self.navigationController pushViewController:controller animated:NO]; @@ -110,7 +110,6 @@ [self.privacyImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.right.equalTo(self.privacyView).offset(-24); make.centerY.equalTo(self.privacyView); -// make.width.height.mas_equalTo(24); }]; } @@ -152,7 +151,7 @@ if(!_privacyView) { _privacyView = [[UIView alloc] init]; _privacyView.backgroundColor = [MEWThemeColor mewColorWithHexString:@"#5E6175"]; - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(pushPrivacyView:)]; + UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(mew_pushPrivacyView:)]; [_privacyView addGestureRecognizer:tap]; } return _privacyView; diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/YMMineSettingViewController.h b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/MewMineSettingViewController.h similarity index 71% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/YMMineSettingViewController.h rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/MewMineSettingViewController.h index fa20356..5c466ad 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/YMMineSettingViewController.h +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/MewMineSettingViewController.h @@ -1,5 +1,5 @@ // -// YMMineSettingViewController.h +// MewMineSettingViewController.h // mew-ios // // Created by 触海 on 2023/11/9. @@ -10,7 +10,7 @@ NS_ASSUME_NONNULL_BEGIN -@interface YMMineSettingViewController : MvpViewController +@interface MewMineSettingViewController : MvpViewController ///用户信息 @property (nonatomic,strong) UserInfoModel *userInfo; diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/YMMineSettingViewController.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/MewMineSettingViewController.m similarity index 75% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/YMMineSettingViewController.m rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/MewMineSettingViewController.m index 664a086..9361103 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/YMMineSettingViewController.m +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/MewMineSettingViewController.m @@ -1,22 +1,22 @@ // -// YMMineSettingViewController.m +// MewMineSettingViewController.m // mew-ios // // Created by 触海 on 2023/11/9. // -#import "YMMineSettingViewController.h" +#import "MewMineSettingViewController.h" #import "YMWebViewController.h" -#import "YMMineAboutUsViewController.h" -#import "LoginVerifBindPhoneViewController.h" -#import "MineLoginPasswordViewController.h" +#import "MewMineAboutUsViewController.h" +#import "MewLoginVerifBindPhoneViewController.h" +#import "MewMineLoginPasswordViewController.h" // Presenter -#import "YMMineSettingProtocol.h" -#import "YMMineSettingPresenter.h" +#import "MewMineSettingProtocol.h" +#import "MewMineSettingPresenter.h" //Model -#import "YMMineSettingItemModel.h" +#import "MewMineSettingItemModel.h" //View -#import "YMMineSettingTableViewCell.h" +#import "MewMineSettingTableViewCell.h" ///Third #import ///Tool @@ -27,14 +27,14 @@ #import "MewHUDTool.h" #import "MewHtmlUrl.h" -@interface YMMineSettingViewController () +@interface MewMineSettingViewController () @property (nonatomic, strong) UIButton *backButton; @property (nonatomic, strong) UILabel *titleLabel; @property (nonatomic,strong) UITableView *tableView; -@property (nonatomic, strong) NSArray *models; +@property (nonatomic, strong) NSArray *models; ///退出登录 @property (nonatomic,strong) UIButton *logoutButton; ///底部的试图 @@ -42,14 +42,14 @@ @end -@implementation YMMineSettingViewController +@implementation MewMineSettingViewController - (BOOL)mew_isHiddenNavBar { return YES; } -- (YMMineSettingPresenter *)createPresenter { - return [[YMMineSettingPresenter alloc] init]; +- (MewMineSettingPresenter *)createPresenter { + return [[MewMineSettingPresenter alloc] init]; } @@ -58,18 +58,18 @@ [super viewDidLoad]; self.view.backgroundColor = [MEWThemeColor mewColorWithHexString:@"#14171B"]; [self mew_initSubViews]; - [self.presenter getMineSettingDataSourceWith:self.userInfo]; + [self.presenter mew_getMineSettingDataSourceWith:self.userInfo]; } - (void)viewWillAppear:(BOOL)animated { [super viewWillAppear:animated]; ///每次都需要刷新一个userinfo - [self.presenter getUserInfo]; + [self.presenter mew_getUserInfo]; } -#pragma mark - YMMineSettingProtocol +#pragma mark - MewMineSettingProtocol /// 获取数据源成功 -- (void)getMineSettingDatasourceSuccess:(NSArray *)array { +- (void)mew_getMineSettingDatasourceSuccess:(NSArray *)array { self.models = array; [self.tableView reloadData]; } @@ -77,11 +77,11 @@ /// 获取用户成功 - (void)mew_onGetUserInfoSuccess:(UserInfoModel *)userInfo { self.userInfo = userInfo; - [self.presenter getMineSettingDataSourceWith:userInfo]; + [self.presenter mew_getMineSettingDataSourceWith:userInfo]; } /// 退出账号成功 -- (void)logoutCurrentAccountSuccess { +- (void)mew_logoutCurrentAccountSuccess { // [self.navigationController popToRootViewControllerAnimated:NO]; } @@ -91,24 +91,24 @@ return self.models.count; } - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - YMMineSettingTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([YMMineSettingTableViewCell class])]; + MewMineSettingTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([MewMineSettingTableViewCell class])]; cell.itemModel = [self.models mewSafeObjectAtIndex:indexPath.row]; return cell; } - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - YMMineSettingItemModel * model = [self.models mewSafeObjectAtIndex:indexPath.row]; + MewMineSettingItemModel * model = [self.models mewSafeObjectAtIndex:indexPath.row]; [self pushViewControllerWithType:model.type]; } #pragma mark - Action Event -- (void)pushViewControllerWithType:(YMMineSettingItemType)type { +- (void)pushViewControllerWithType:(MewMineSettingItemType)type { switch (type) { // 绑定手机 - case YMMineSettingItemType_Phone: + case MewMineSettingItemType_Phone: { if (!self.userInfo.isBindPhone) { //没有绑定 - LoginVerifBindPhoneViewController *controller = [[LoginVerifBindPhoneViewController alloc] init]; + MewLoginVerifBindPhoneViewController *controller = [[MewLoginVerifBindPhoneViewController alloc] init]; [self.navigationController pushViewController:controller animated:NO]; } else { [MewHUDTool showErrorWithMessage:@"您已绑定手机号码"]; @@ -116,32 +116,32 @@ } break; // 账号密码 - case YMMineSettingItemType_Login_Password: + case MewMineSettingItemType_Login_Password: { if (!self.userInfo.isBindPhone) { - LoginVerifBindPhoneViewController *controller = [[LoginVerifBindPhoneViewController alloc] init]; - controller.bindingPhoneNumType = XPBindingPhoneNumTypeNormal; + MewLoginVerifBindPhoneViewController *controller = [[MewLoginVerifBindPhoneViewController alloc] init]; + controller.bindingPhoneNumType = MewBindingPhoneNumTypeNormal; controller.userInfo = _userInfo; [self.navigationController pushViewController:controller animated:NO]; return; } - MineLoginPasswordViewController *vc = [[MineLoginPasswordViewController alloc] init]; + MewMineLoginPasswordViewController *vc = [[MewMineLoginPasswordViewController alloc] init]; vc.userInfo = self.userInfo; vc.isModifiPwd = self.userInfo.isBindPhone; [self.navigationController pushViewController:vc animated:YES]; } break; //关于我的 - case YMMineSettingItemType_About_Us: + case MewMineSettingItemType_About_Us: { - YMMineAboutUsViewController *controller = [[YMMineAboutUsViewController alloc] init]; + MewMineAboutUsViewController *controller = [[MewMineAboutUsViewController alloc] init]; [self.navigationController pushViewController:controller animated:NO]; } break; // 注销账号 - case YMMineSettingItemType_Cancel_Account: + case MewMineSettingItemType_Cancel_Account: { YMWebViewController *controller = [[YMWebViewController alloc] init]; @@ -160,7 +160,7 @@ /// 退出账号 - (void)logoutButtonAction:(UIButton *)sender { - [self.presenter logoutCurrentAccount]; + [self.presenter mew_logoutCurrentAccount]; } @@ -210,7 +210,7 @@ _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; _tableView.backgroundColor = [UIColor clearColor]; _tableView.rowHeight = 60; - [_tableView registerClass:[YMMineSettingTableViewCell class] forCellReuseIdentifier:NSStringFromClass([YMMineSettingTableViewCell class])]; + [_tableView registerClass:[MewMineSettingTableViewCell class] forCellReuseIdentifier:NSStringFromClass([MewMineSettingTableViewCell class])]; } return _tableView; } diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/SubView/MineModifPayPwdView.h b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/SubView/MewMineModifPayPwdView.h similarity index 79% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/SubView/MineModifPayPwdView.h rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/SubView/MewMineModifPayPwdView.h index 8bdf76b..065f860 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/SubView/MineModifPayPwdView.h +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/SubView/MewMineModifPayPwdView.h @@ -1,5 +1,5 @@ // -// MineModifPayPwdView.h +// MewMineModifPayPwdView.h // yinmeng-ios // // Created by 触海 on 2023/11/22. @@ -9,7 +9,7 @@ NS_ASSUME_NONNULL_BEGIN -@interface MineModifPayPwdView : UIView +@interface MewMineModifPayPwdView : UIView ///输入框 @property (nonatomic,strong, readonly) UITextField *contentTextField; diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/SubView/MineModifPayPwdView.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/SubView/MewMineModifPayPwdView.m similarity index 96% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/SubView/MineModifPayPwdView.m rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/SubView/MewMineModifPayPwdView.m index 95f0acb..eeb3977 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/SubView/MineModifPayPwdView.m +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/SubView/MewMineModifPayPwdView.m @@ -1,18 +1,18 @@ // -// MineModifPayPwdView.m +// MewMineModifPayPwdView.m // yinmeng-ios // // Created by 触海 on 2023/11/22. // -#import "MineModifPayPwdView.h" +#import "MewMineModifPayPwdView.h" ///Third #import ///Tool #import "MEWThemeColor.h" #import "UIButton+EnlargeTouchArea.h" -@interface MineModifPayPwdView() +@interface MewMineModifPayPwdView() ///输入框 @property (nonatomic,strong) UITextField *contentTextField; @@ -23,7 +23,7 @@ @end -@implementation MineModifPayPwdView +@implementation MewMineModifPayPwdView - (instancetype)initWithFrame:(CGRect)frame { diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/Impl/BaseRtcImpl.h b/yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/Impl/BaseRtcImpl.h deleted file mode 100644 index 9918055..0000000 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/Impl/BaseRtcImpl.h +++ /dev/null @@ -1,23 +0,0 @@ -// -// BaseRtcImpl.h -// mew-ios -// -// Created by 触海 on 2023/11/7. -// - -#import -#import "RtcInterface.h" -#import "RtcImplDelegate.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface BaseRtcImpl : NSObject - -@property (nonatomic, weak) id delegate; - -- (instancetype)initWithDelegate:(id)delegate; - - -@end - -NS_ASSUME_NONNULL_END diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/Impl/BaseRtcImpl.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/Impl/BaseRtcImpl.m deleted file mode 100644 index 73ece0a..0000000 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/Impl/BaseRtcImpl.m +++ /dev/null @@ -1,44 +0,0 @@ -// -// BaseRtcImpl.m -// mew-ios -// -// Created by 触海 on 2023/11/7. -// - -#import "BaseRtcImpl.h" - -@implementation BaseRtcImpl - -- (instancetype)initWithDelegate:(id)delegate { - self = [super init]; - if (self) { - self.delegate = delegate; - } - return self; -} - -- (BOOL)joinChannel:(NSString *)channelId sign:(NSString *)sign completion:(void (^)(void))completion { - return NO; -} - -- (BOOL)muteRemote:(BOOL)mute { - return NO; -} - -- (void)broadcast:(BOOL)on { - -} - -- (BOOL)muteLocal:(BOOL)mute { - return NO; -} - -- (void)exitChannel:(void (^)(void))completion { - -} - -- (void)destory { - -} - -@end diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/Impl/MewBaseRtcImpl.h b/yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/Impl/MewBaseRtcImpl.h new file mode 100644 index 0000000..8407326 --- /dev/null +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/Impl/MewBaseRtcImpl.h @@ -0,0 +1,23 @@ +// +// MewBaseRtcImpl.h +// mew-ios +// +// Created by 触海 on 2023/11/7. +// + +#import +#import "MewRtcInterface.h" +#import "MewRtcImplDelegate.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface MewBaseRtcImpl : NSObject + +@property (nonatomic, weak) id delegate; + +- (instancetype)initWithDelegate:(id)delegate; + + +@end + +NS_ASSUME_NONNULL_END diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/Impl/MewBaseRtcImpl.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/Impl/MewBaseRtcImpl.m new file mode 100644 index 0000000..5035efe --- /dev/null +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/Impl/MewBaseRtcImpl.m @@ -0,0 +1,44 @@ +// +// MewBaseRtcImpl.m +// mew-ios +// +// Created by 触海 on 2023/11/7. +// + +#import "MewBaseRtcImpl.h" + +@implementation MewBaseRtcImpl + +- (instancetype)initWithDelegate:(id)delegate { + self = [super init]; + if (self) { + self.delegate = delegate; + } + return self; +} + +- (BOOL)mew_joinChannel:(NSString *)channelId sign:(NSString *)sign completion:(void (^)(void))completion { + return NO; +} + +- (BOOL)mew_muteRemote:(BOOL)mute { + return NO; +} + +- (void)mew_broadcast:(BOOL)on { + +} + +- (BOOL)mew_muteLocal:(BOOL)mute { + return NO; +} + +- (void)mew_exitChannel:(void (^)(void))completion { + +} + +- (void)mew_destory { + +} + +@end diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/Impl/RtcImplDelegate.h b/yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/Impl/MewRtcImplDelegate.h similarity index 60% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/Impl/RtcImplDelegate.h rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/Impl/MewRtcImplDelegate.h index 0b2b87b..22000d6 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/Impl/RtcImplDelegate.h +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/Impl/MewRtcImplDelegate.h @@ -1,5 +1,5 @@ // -// RtcImplDelegate.h +// MewRtcImplDelegate.h // mew-ios // // Created by 触海 on 2023/11/7. @@ -9,10 +9,10 @@ NS_ASSUME_NONNULL_BEGIN -@protocol RtcImplDelegate +@protocol MewRtcImplDelegate /// 用户正在讲话回调 -- (void)usersSpeaking:(NSMutableArray *)uids; +- (void)mew_usersSpeaking:(NSMutableArray *)uids; @end NS_ASSUME_NONNULL_END diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/Impl/MewRtcInterface.h b/yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/Impl/MewRtcInterface.h new file mode 100644 index 0000000..a897f37 --- /dev/null +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/Impl/MewRtcInterface.h @@ -0,0 +1,54 @@ +// +// MewRtcInterface.h +// mew-ios +// +// Created by 触海 on 2023/11/7. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@protocol MewRtcInterface + +/** + 静音 + */ +- (BOOL)mew_muteRemote:(BOOL)mute; + +/** + 静音某个用户 + userId: 用户ID + */ +- (BOOL)mew_muteRemote:(BOOL)mute userId:(NSString *)userId; + +/** + 上下麦（说话） + */ +- (void)mew_broadcast:(BOOL)on; + +/** + 闭麦 + */ +- (BOOL)mew_muteLocal:(BOOL)mute; + +/** + 退出频道 + */ +- (void)mew_exitChannel:(void(^ __nullable)(void))completion; + +/** + 销毁引擎 + */ +- (void)mew_destory; + +@optional +/** + 加入频道（房间），TRTC 进房需要动态签名。 + */ +- (BOOL)mew_joinChannel:(NSString *)channelId sign:(NSString *)sign completion:(void(^ __nullable)(void))completion; + + +@end + +NS_ASSUME_NONNULL_END diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/Impl/TRTCRtcImpl.h b/yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/Impl/MewTRTCRtcImpl.h similarity index 55% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/Impl/TRTCRtcImpl.h rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/Impl/MewTRTCRtcImpl.h index 2f75984..b98cf38 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/Impl/TRTCRtcImpl.h +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/Impl/MewTRTCRtcImpl.h @@ -1,15 +1,15 @@ // -// TRTCRtcImpl.h +// MewTRTCRtcImpl.h // mew-ios // // Created by 触海 on 2023/11/7. // -#import "BaseRtcImpl.h" +#import "MewBaseRtcImpl.h" NS_ASSUME_NONNULL_BEGIN -@interface TRTCRtcImpl : BaseRtcImpl +@interface MewTRTCRtcImpl : MewBaseRtcImpl @end diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/Impl/TRTCRtcImpl.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/Impl/MewTRTCRtcImpl.m similarity index 78% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/Impl/TRTCRtcImpl.m rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/Impl/MewTRTCRtcImpl.m index 684adf1..df1c6ba 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/Impl/TRTCRtcImpl.m +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/Impl/MewTRTCRtcImpl.m @@ -1,26 +1,26 @@ // -// TRTCRtcImpl.m +// MewTRTCRtcImpl.m // mew-ios // // Created by 触海 on 2023/11/7. // -#import "TRTCRtcImpl.h" +#import "MewTRTCRtcImpl.h" #import #import "AccountInfoStorage.h" ///Tool #import "YMConstant.h" -@interface TRTCRtcImpl() +@interface MewTRTCRtcImpl() @property (nonatomic, strong) TRTCCloud *engine; @end -@implementation TRTCRtcImpl +@implementation MewTRTCRtcImpl #pragma mark - Init -- (instancetype)initWithDelegate:(id)delegate { +- (instancetype)initWithDelegate:(id)delegate { self = [super initWithDelegate:delegate]; if (self) { _engine = [TRTCCloud sharedInstance]; @@ -32,8 +32,8 @@ } -#pragma mark - RtcInterface -- (BOOL)joinChannel:(NSString *)channelId sign:(NSString *)sign completion:(void (^)(void))completion { +#pragma mark - MewRtcInterface +- (BOOL)mew_joinChannel:(NSString *)channelId sign:(NSString *)sign completion:(void (^)(void))completion { [self.engine enableAudioVolumeEvaluation:900 enable_vad:YES]; TRTCParams *params = [[TRTCParams alloc] init]; UInt32 appId; @@ -58,19 +58,19 @@ } /// 静音 -- (BOOL)muteRemote:(BOOL)mute { +- (BOOL)mew_muteRemote:(BOOL)mute { [self.engine muteAllRemoteAudio:mute]; return YES; } /// 静音某个用户 -- (BOOL)muteRemote:(BOOL)mute userId:(NSString *)userId { +- (BOOL)mew_muteRemote:(BOOL)mute userId:(NSString *)userId { [self.engine muteRemoteAudio:userId mute:mute]; return YES; } /// 上下麦（说话） -- (void)broadcast:(BOOL)on { +- (void)mew_broadcast:(BOOL)on { [self.engine switchRole: on ? TRTCRoleAnchor : TRTCRoleAudience]; if (on) { NSString *jsonString = @"{\"api\":\"setAudioQualityEx\",\"params\":{\"sampleRate\":48000,\"channel\":2,\"bitrate\":192,\"encodeMode\":1,\"systemVolumeType\":1}}"; @@ -84,20 +84,20 @@ } /// 闭麦 -- (BOOL)muteLocal:(BOOL)mute { +- (BOOL)mew_muteLocal:(BOOL)mute { [self.engine muteLocalAudio:mute]; return YES; } /// 退出频道 -- (void)exitChannel:(void (^)(void))completion { +- (void)mew_exitChannel:(void (^)(void))completion { /** * 1.2 离开房间 * - * 调用 exitRoom() 接口会执行退出房间的相关逻辑，例如释放音视频设备资源和编解码器资源等。 - * 待资源释放完毕，SDK 会通过 TRTCCloudDelegate 中的 onExitRoom() 回调通知到您。 + * 调用 mew_exitRoom() 接口会执行退出房间的相关逻辑，例如释放音视频设备资源和编解码器资源等。 + * 待资源释放完毕，SDK 会通过 TRTCCloudDelegate 中的 onmew_exitRoom() 回调通知到您。 * - * 如果您要再次调用 enterRoom() 或者切换到其他的音视频 SDK，请等待 onExitRoom() 回调到来之后再执行相关操作。 + * 如果您要再次调用 enterRoom() 或者切换到其他的音视频 SDK，请等待 onmew_exitRoom() 回调到来之后再执行相关操作。 * 否则可能会遇到摄像头或麦克风（例如 iOS 里的 AudioSession）被占用等各种异常问题。 */ [self.engine exitRoom]; @@ -107,7 +107,7 @@ } /// 销毁 -- (void)destory { +- (void)mew_destory { [TRTCCloud destroySharedIntance]; } @@ -129,6 +129,6 @@ } } - [self.delegate usersSpeaking:uids]; + [self.delegate mew_usersSpeaking:uids]; } @end diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/Impl/RtcInterface.h b/yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/Impl/RtcInterface.h deleted file mode 100644 index 4c5c4b6..0000000 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/Impl/RtcInterface.h +++ /dev/null @@ -1,54 +0,0 @@ -// -// RtcInterface.h -// mew-ios -// -// Created by 触海 on 2023/11/7. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@protocol RtcInterface - -/** - 静音 - */ -- (BOOL)muteRemote:(BOOL)mute; - -/** - 静音某个用户 - userId: 用户ID - */ -- (BOOL)muteRemote:(BOOL)mute userId:(NSString *)userId; - -/** - 上下麦（说话） - */ -- (void)broadcast:(BOOL)on; - -/** - 闭麦 - */ -- (BOOL)muteLocal:(BOOL)mute; - -/** - 退出频道 - */ -- (void)exitChannel:(void(^ __nullable)(void))completion; - -/** - 销毁引擎 - */ -- (void)destory; - -@optional -/** - 加入频道（房间），TRTC 进房需要动态签名。 - */ -- (BOOL)joinChannel:(NSString *)channelId sign:(NSString *)sign completion:(void(^ __nullable)(void))completion; - - -@end - -NS_ASSUME_NONNULL_END diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/RtcDelegate.h b/yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/MewRtcDelegate.h similarity index 62% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/RtcDelegate.h rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/MewRtcDelegate.h index e9a38e1..d3a007c 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/RtcDelegate.h +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/MewRtcDelegate.h @@ -1,5 +1,5 @@ // -// RtcDelegate.h +// MewRtcDelegate.h // mew-ios // // Created by 触海 on 2023/11/7. @@ -9,10 +9,10 @@ NS_ASSUME_NONNULL_BEGIN -@protocol RtcDelegate +@protocol MewRtcDelegate /// 用户正在讲话回调 -- (void)usersSpeaking:(NSMutableArray *)uids; +- (void)mew_usersSpeaking:(NSMutableArray *)uids; @end diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/RtcManager.h b/yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/MewRtcManager.h similarity index 59% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/RtcManager.h rename to yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/MewRtcManager.h index 2402b4b..c17ccd4 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/RtcManager.h +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/MewRtcManager.h @@ -1,27 +1,27 @@ // -// RtcManager.h +// MewRtcManager.h // mew-ios // // Created by 触海 on 2023/11/7. // #import -#import "RtcDelegate.h" +#import "MewRtcDelegate.h" NS_ASSUME_NONNULL_BEGIN typedef enum : NSUInteger { - RtcEngineType_TRTC, // 腾讯TRTC -} RtcEngineType; + Mew_RtcEngineType_TRTC, // 腾讯TRTC +} MewRtcEngineType; /** 音频服务管理单例，对所有音频服务 SDK 的封装。 **Note:** - - ✅ 外部调用者只需要调用 RtcManager 。 - - ✅ RtcManager 对房间业务逻辑有封装。 + - ✅ 外部调用者只需要调用 MewRtcManager 。 + - ✅ MewRtcManager 对房间业务逻辑有封装。 - ❌ 业务逻辑不要侵入 RctImpl 。 */ -@interface RtcManager : NSObject +@interface MewRtcManager : NSObject /** * 是否静音（静别人） @@ -38,28 +38,28 @@ typedef enum : NSUInteger { @property(nonatomic,getter=isLocalMuted) BOOL localMuted; -/** 初始化/重新初始化 RtcManager 实例，设置音频服务类型和 RtcDelegate。 +/** 初始化/重新初始化 MewRtcManager 实例，设置音频服务类型和 MewRtcDelegate。 * **Note:** * - 切换音频服务或者更换 delegate 必须先调用该方法。 - - RtcManager 是单例，[RtcManager instance] 也可以获取到 RtcManager 实例。 + - MewRtcManager 是单例，[MewRtcManager instance] 也可以获取到 MewRtcManager 实例。 @param type 使用的音频服务 RtcEngineType。 - @param delegate RtcDelegate。 + @param delegate MewRtcDelegate。 - @return - RtcManager instance + @return - MewRtcManager instance */ -+ (instancetype)initEngineWithType:(RtcEngineType)type delegate:(id)delegate; ++ (instancetype)initEngineWithType:(MewRtcEngineType)type delegate:(id)delegate; -/** 获取 RtcManager instance。 +/** 获取 MewRtcManager instance。 **Note:** - - 务必先 [RtcManager initEngineWithType:delegate:] 设置 RtcEngineType 和 RtcDelegate，否则默认使用声网服务。 + - 务必先 [MewRtcManager initEngineWithType:delegate:] 设置 RtcEngineType 和 MewRtcDelegate，否则默认使用声网服务。 - @return - RtcManager instance + @return - MewRtcManager instance */ + (instancetype _Nonnull)instance; - (instancetype)init NS_UNAVAILABLE; @@ -81,20 +81,18 @@ typedef enum : NSUInteger { /** * 上下麦（说话） */ -- (void)broadcast:(BOOL)on; +- (void)mew_broadcast:(BOOL)on; /// 静音某个人 /// @param userId 用户id -- (void)muteOne:(BOOL)mute userId:(NSString *)userId; +- (void)mew_muteOne:(BOOL)mute userId:(NSString *)userId; /** * 退出频道 */ -- (void)exitRoom; - - +- (void)mew_exitRoom; @end diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/MewRtcManager.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/MewRtcManager.m new file mode 100644 index 0000000..97a2efa --- /dev/null +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/MewRtcManager.m @@ -0,0 +1,140 @@ +// +// MewRtcManager.m +// mew-ios +// +// Created by 触海 on 2023/11/7. +// + +#import "MewRtcManager.h" +#import "MewTRTCRtcImpl.h" + +@interface MewRtcManager() +@property (nonatomic, strong) id engine; +@property (nonatomic, strong) id engineDelegate; +@property (nonatomic, assign) MewRtcEngineType engineType; + +/** + * 当前 Rtc 所在的房间 roomUid 。 + */ +@property(nonatomic, strong) NSString * enterdRoomUid; +@end + +@implementation MewRtcManager + +#pragma mark - Init +- (instancetype)init { + self = [super init]; + if (self) { + _localMuted = NO; + _remoteMuted = NO; + _engineType = Mew_RtcEngineType_TRTC; + } + return self; +} + ++ (instancetype)instance { + static dispatch_once_t onceToken; + static MewRtcManager *instance = nil; + dispatch_once(&onceToken, ^{ + instance = [[self alloc] init]; + }); + return instance; +} + ++ (instancetype)initEngineWithType:(MewRtcEngineType)type delegate:(id)delegate { + MewRtcManager *MewRtcManager = [self instance]; + [MewRtcManager setEngineType:type]; + [MewRtcManager setEngineDelegate:delegate]; + return MewRtcManager; +} + + +#pragma mark - Public Method +- (BOOL)enterRoom:(NSString *)roomUid trtcSign:(NSString *)sign { + if (self.enterdRoomUid && [self.enterdRoomUid isEqualToString:roomUid]) { + return YES; + } + + // 进入房间，加入频道 + return [self.engine mew_joinChannel:roomUid sign:sign completion:^{ + [self mew_muteRemote:NO]; + [self mew_muteLocal:NO]; + self.enterdRoomUid = roomUid; + }]; +} + +// 上下麦说话 +- (void)mew_broadcast:(BOOL)on { + [self.engine mew_broadcast:on]; + if (on) { //上麦 + [self.engine mew_muteLocal:self.isLocalMuted]; + } +} + +// 静音某个人 +- (void)mew_muteOne:(BOOL)mute userId:(NSString *)userId { + [self.engine mew_muteRemote:mute userId:userId]; +} + +// 退出房间 +- (void)mew_exitRoom { + [self.engine mew_exitChannel:^{ + [self mew_muteRemote:NO]; + [self mew_muteLocal:NO]; + self.enterdRoomUid = nil; + }]; +} + +#pragma mark - Private Method +// 是否静音 +- (BOOL)mew_muteRemote:(BOOL)mute { + return [self.engine mew_muteRemote:mute]; +} + +// 是否闭麦 +- (BOOL)mew_muteLocal:(BOOL)mute { + return [self.engine mew_muteLocal:mute]; +} + + + +#pragma mark - MewRtcImplDelegate +/// 用户正在说话 +- (void)mew_usersSpeaking:(NSMutableArray *)uids { + if (self.engineDelegate) { + [self.engineDelegate mew_usersSpeaking:uids]; + } +} + +#pragma mark - Set +- (void)setRemoteMuted:(BOOL)remoteMuted { + if ([self.engine mew_muteRemote:remoteMuted]) { + _remoteMuted = remoteMuted; + } +} + +- (void)setLocalMuted:(BOOL)localMuted { + if ([self.engine mew_muteLocal:localMuted]) { + _localMuted = localMuted; + } +} + +- (void)setEngineType:(MewRtcEngineType)type { + if (_engine && type != _engineType) { //切换频道 + [_engine mew_exitChannel:nil]; + [_engine mew_destory]; + _engine = nil; + _enterdRoomUid = nil; + } + _engineType = type; +} + +#pragma mark - Get +- (id)engine { + if (!_engine) { + _engine = [[MewTRTCRtcImpl alloc] initWithDelegate:self]; + } + return _engine; +} + +@end diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/RtcManager.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/RtcManager.m deleted file mode 100644 index 0e655ea..0000000 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/RtcManager.m +++ /dev/null @@ -1,140 +0,0 @@ -// -// RtcManager.m -// mew-ios -// -// Created by 触海 on 2023/11/7. -// - -#import "RtcManager.h" -#import "TRTCRtcImpl.h" - -@interface RtcManager() -@property (nonatomic, strong) id engine; -@property (nonatomic, strong) id engineDelegate; -@property (nonatomic, assign) RtcEngineType engineType; - -/** - * 当前 Rtc 所在的房间 roomUid 。 - */ -@property(nonatomic, strong) NSString * enterdRoomUid; -@end - -@implementation RtcManager - -#pragma mark - Init -- (instancetype)init { - self = [super init]; - if (self) { - _localMuted = NO; - _remoteMuted = NO; - _engineType = RtcEngineType_TRTC; - } - return self; -} - -+ (instancetype)instance { - static dispatch_once_t onceToken; - static RtcManager *instance = nil; - dispatch_once(&onceToken, ^{ - instance = [[self alloc] init]; - }); - return instance; -} - -+ (instancetype)initEngineWithType:(RtcEngineType)type delegate:(id)delegate { - RtcManager *rtcManager = [self instance]; - [rtcManager setEngineType:type]; - [rtcManager setEngineDelegate:delegate]; - return rtcManager; -} - - -#pragma mark - Public Method -- (BOOL)enterRoom:(NSString *)roomUid trtcSign:(NSString *)sign { - if (self.enterdRoomUid && [self.enterdRoomUid isEqualToString:roomUid]) { - return YES; - } - - // 进入房间，加入频道 - return [self.engine joinChannel:roomUid sign:sign completion:^{ - [self muteRemote:NO]; - [self muteLocal:NO]; - self.enterdRoomUid = roomUid; - }]; -} - -// 上下麦说话 -- (void)broadcast:(BOOL)on { - [self.engine broadcast:on]; - if (on) { //上麦 - [self.engine muteLocal:self.isLocalMuted]; - } -} - -// 静音某个人 -- (void)muteOne:(BOOL)mute userId:(NSString *)userId { - [self.engine muteRemote:mute userId:userId]; -} - -// 退出房间 -- (void)exitRoom { - [self.engine exitChannel:^{ - [self muteRemote:NO]; - [self muteLocal:NO]; - self.enterdRoomUid = nil; - }]; -} - -#pragma mark - Private Method -// 是否静音 -- (BOOL)muteRemote:(BOOL)mute { - return [self.engine muteRemote:mute]; -} - -// 是否闭麦 -- (BOOL)muteLocal:(BOOL)mute { - return [self.engine muteLocal:mute]; -} - - - -#pragma mark - RtcImplDelegate -/// 用户正在说话 -- (void)usersSpeaking:(NSMutableArray *)uids { - if (self.engineDelegate) { - [self.engineDelegate usersSpeaking:uids]; - } -} - -#pragma mark - Set -- (void)setRemoteMuted:(BOOL)remoteMuted { - if ([self.engine muteRemote:remoteMuted]) { - _remoteMuted = remoteMuted; - } -} - -- (void)setLocalMuted:(BOOL)localMuted { - if ([self.engine muteLocal:localMuted]) { - _localMuted = localMuted; - } -} - -- (void)setEngineType:(RtcEngineType)type { - if (_engine && type != _engineType) { //切换频道 - [_engine exitChannel:nil]; - [_engine destory]; - _engine = nil; - _enterdRoomUid = nil; - } - _engineType = type; -} - -#pragma mark - Get -- (id)engine { - if (!_engine) { - _engine = [[TRTCRtcImpl alloc] initWithDelegate:self]; - } - return _engine; -} - -@end diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/AnimationView/MewRoomAnimationView.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/AnimationView/MewRoomAnimationView.m index de821f8..f59546f 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/AnimationView/MewRoomAnimationView.m +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/AnimationView/MewRoomAnimationView.m @@ -17,7 +17,7 @@ #import ///Model #import "MewGiftReceiveInfoModel.h" -#import "AttachmentModel.h" +#import "MewAttachmentModel.h" #import "MewRoomInfoModel.h" #import "MewGiftInfoModel.h" /// Tool @@ -88,11 +88,11 @@ } #pragma mark - MewRoomGuestDelegate -- (void)handleNIMCustomMessage:(NIMMessage *)message { +- (void)mew_handleNIMCustomMessage:(NIMMessage *)message { NIMCustomObject *obj = (NIMCustomObject *)message.messageObject; - if (obj.attachment != nil && [obj.attachment isKindOfClass:[AttachmentModel class]]) { - AttachmentModel *attachment = (AttachmentModel *)obj.attachment; - if (attachment.first == CustomMessageType_Gift) { + if (obj.attachment != nil && [obj.attachment isKindOfClass:[MewAttachmentModel class]]) { + MewAttachmentModel *attachment = (MewAttachmentModel *)obj.attachment; + if (attachment.first == Mew_CustomMessageType_Gift) { MewGiftReceiveInfoModel * receiveInfo = [MewGiftReceiveInfoModel mewModelWithJSON:attachment.data]; [self mew_receiveGiftHandleSendGiftAnimation:attachment]; @@ -101,7 +101,7 @@ } } -- (void)handleNIMNotificationMessage:(NIMMessage *)message { +- (void)mew_handleNIMNotificationMessage:(NIMMessage *)message { NIMNotificationObject *notiMsg = (NIMNotificationObject *)message.messageObject; NIMChatroomNotificationContent *content = (NIMChatroomNotificationContent *)notiMsg.content; if (content.eventType == NIMChatroomEventTypeEnter) { @@ -176,7 +176,7 @@ } #pragma mark - 收到礼物展示动画 -- (void)mew_receiveGiftHandleSendGiftAnimation:(AttachmentModel *)attachment { +- (void)mew_receiveGiftHandleSendGiftAnimation:(MewAttachmentModel *)attachment { if (!self.delegate.mew_getRoomInformation.hasAnimationEffect) {return;} MewGiftReceiveInfoModel * receiveInfo = [MewGiftReceiveInfoModel mewModelWithJSON:attachment.data]; MewGiftInfoModel * giftInfo = receiveInfo.gift ? receiveInfo.gift : receiveInfo.giftInfo; diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MessageContainerView/MewRoomMessageContainerView.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MessageContainerView/MewRoomMessageContainerView.m index ad902a8..e2de81b 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MessageContainerView/MewRoomMessageContainerView.m +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MessageContainerView/MewRoomMessageContainerView.m @@ -11,7 +11,7 @@ #import "MewRoomMessageHeaderView.h" /// Model #import "MewMessageInfoModel.h" -#import "AttachmentModel.h" +#import "MewAttachmentModel.h" #import "MewRoomInfoModel.h" /// Tool #import "NSArray+MewSafe.h" @@ -177,8 +177,8 @@ ///自定义消息 是否可以加到 公屏 需要自己维护 - (BOOL)isCanDisplayMessage:(NIMMessage *)message { NIMCustomObject *obj = (NIMCustomObject *)message.messageObject; - if (obj.attachment != nil && [obj.attachment isKindOfClass:[AttachmentModel class]]) { - AttachmentModel *attachment = (AttachmentModel *)obj.attachment; + if (obj.attachment != nil && [obj.attachment isKindOfClass:[MewAttachmentModel class]]) { + MewAttachmentModel *attachment = (MewAttachmentModel *)obj.attachment; return [[[MewRoomMessageFilter mew_supportMessageDic] objectForKey:@(attachment.first)] containsObject:@(attachment.second)]; } return NO; diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MessageContainerView/Tool/MewRoomMessageFilter.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MessageContainerView/Tool/MewRoomMessageFilter.m index 3d4960e..6c3e526 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MessageContainerView/Tool/MewRoomMessageFilter.m +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MessageContainerView/Tool/MewRoomMessageFilter.m @@ -6,39 +6,39 @@ // #import "MewRoomMessageFilter.h" -#import "AttachmentModel.h" +#import "MewAttachmentModel.h" @implementation MewRoomMessageFilter + (NSDictionary *)mew_supportMessageDic { return @{ - @(CustomMessageType_AllMicroSend): + @(Mew_CustomMessageType_AllMicroSend): [NSSet setWithObjects: @(Custom_Message_Sub_AllMicroSend), @(Custom_Message_Sub_AllMicroLuckySend), @(Custom_Message_Sub_AllBatchSend), @(Custom_Message_Sub_AllBatchMicroLuckySend), nil], - @(CustomMessageType_Gift): + @(Mew_CustomMessageType_Gift): [NSSet setWithObjects: @(Custom_Message_Sub_Gift_Send), @(Custom_Message_Sub_Gift_LuckySend), nil], - @(CustomMessageType_Room_Tip): + @(Mew_CustomMessageType_Room_Tip): [NSSet setWithObjects: @(Custom_Message_Sub_Room_Tip_ShareRoom), @(Custom_Message_Sub_Room_Tip_Attention_Owner), nil], - @(CustomMessageType_Kick_User): + @(Mew_CustomMessageType_Kick_User): [NSSet setWithObjects: @(Custom_Message_Sub_Kick_BeKicked), @(Custom_Message_Sub_Kick_BlackList), nil], - @(CustomMessageType_Queue): + @(Mew_CustomMessageType_Queue): [NSSet setWithObjects: @(Custom_Message_Sub_Queue_Kick), nil], - @(CustomMessageType_Face): + @(Mew_CustomMessageType_Face): [NSSet setWithObjects: @(Custom_Message_Sub_Face_Send), nil], diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MessageContainerView/Tool/MewRoomMessageParser.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MessageContainerView/Tool/MewRoomMessageParser.m index 3d89725..9c794ba 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MessageContainerView/Tool/MewRoomMessageParser.m +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MessageContainerView/Tool/MewRoomMessageParser.m @@ -13,7 +13,7 @@ /// Model #import "MewMessageInfoModel.h" #import "MewMessageRemoteExtModel.h" -#import "AttachmentModel.h" +#import "MewAttachmentModel.h" #import "MewGiftReceiveInfoModel.h" #import "MewGiftInfoModel.h" /// Tool @@ -74,10 +74,10 @@ /// 用户公屏聊天 - (MewMessageInfoModel *)mew_makeCustomAttribute:(NIMMessage *)message messageInfo:(MewMessageInfoModel*)messageInfo{ NIMCustomObject *obj = (NIMCustomObject *)message.messageObject; - AttachmentModel *attachment = (AttachmentModel *)obj.attachment; + MewAttachmentModel *attachment = (MewAttachmentModel *)obj.attachment; MewMessageRemoteExtModel * model = [MewMessageRemoteExtModel mewModelWithJSON:message.remoteExt[message.from]]; int first = attachment.first; - if (first == CustomMessageType_Gift) {///单人送 + if (first == Mew_CustomMessageType_Gift) {///单人送 return [self mew_createSendGiftAttribute:attachment sendInfo:model messageInfo:messageInfo]; } return nil; @@ -85,7 +85,7 @@ } -- (MewMessageInfoModel *)mew_createSendGiftAttribute:(AttachmentModel *)attachment sendInfo:(MewMessageRemoteExtModel *)sendInfo messageInfo:(MewMessageInfoModel *)messageInfo{ +- (MewMessageInfoModel *)mew_createSendGiftAttribute:(MewAttachmentModel *)attachment sendInfo:(MewMessageRemoteExtModel *)sendInfo messageInfo:(MewMessageInfoModel *)messageInfo{ NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] init]; MewGiftReceiveInfoModel *info = [MewGiftReceiveInfoModel mewModelWithJSON:attachment.data]; MewGiftInfoModel *giftInfo = info.gift == nil ? info.giftInfo : info.gift; diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/StageView/CHStageView.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/StageView/CHStageView.m index cd044d8..8f9c7a3 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/StageView/CHStageView.m +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/StageView/CHStageView.m @@ -8,7 +8,7 @@ #import "CHStageView.h" /// Tool #import "NSArray+MEWSafe.h" -#import "RtcManager.h" +#import "MewRtcManager.h" #import "AccountInfoStorage.h" #import "TTPopup.h" @@ -17,7 +17,7 @@ #import "MicroQueueModel.h" #import "UserInfoModel.h" #import "MewRoomInfoModel.h" -#import "AttachmentModel.h" +#import "MewAttachmentModel.h" #import "MicroExtModel.h" #import "MewHUDTool.h" ///Third @@ -25,7 +25,7 @@ #import -@interface CHStageView() +@interface CHStageView() /**云信麦序的 position 和本类 index 的关系 * 网易云信返回的麦序（position）从 -1 开始 * - 使用者：MicroStateModel、self.micQueue. @@ -102,8 +102,8 @@ MewRoomInfoModel *roomInfo = self.hostDelegate.mew_getRoomInformation; // RTRC的初始化， 进入房间 NSInteger roomId = roomInfo.roomId > INT_MAX ? roomInfo.uid : roomInfo.roomId; - [RtcManager initEngineWithType:RtcEngineType_TRTC delegate:self]; - [[RtcManager instance] enterRoom:[NSString stringWithFormat:@"%ld",roomId] trtcSign:roomInfo.trtcSig]; + [MewRtcManager initEngineWithType:Mew_RtcEngineType_TRTC delegate:self]; + [[MewRtcManager instance] enterRoom:[NSString stringWithFormat:@"%ld",roomId] trtcSign:roomInfo.trtcSig]; } /// 获取云信麦位信息 @@ -149,7 +149,7 @@ } -- (void)handleNIMNotificationMessage:(NIMMessage *)message { +- (void)mew_handleNIMNotificationMessage:(NIMMessage *)message { NIMNotificationObject *notiMsg = (NIMNotificationObject *)message.messageObject; NIMChatroomNotificationContent *content = (NIMChatroomNotificationContent *)notiMsg.content; BOOL microQueueChanged = NO; @@ -199,7 +199,7 @@ sequence.userInfo = userInfo; //如果是当前用户上麦，关闭自己的麦克风 if (sequence && sequence.userInfo.uid == [AccountInfoStorage instance].getUid.integerValue ) { - [RtcManager instance].localMuted = NO; + [MewRtcManager instance].localMuted = NO; } } @@ -246,10 +246,10 @@ } } -- (void)handleNIMCustomMessage:(NIMMessage *)message { +- (void)mew_handleNIMCustomMessage:(NIMMessage *)message { NIMCustomObject *obj = (NIMCustomObject *)message.messageObject; - if (obj.attachment != nil && [obj.attachment isKindOfClass:[AttachmentModel class]]) { - AttachmentModel *attachment = (AttachmentModel *)obj.attachment; + if (obj.attachment != nil && [obj.attachment isKindOfClass:[MewAttachmentModel class]]) { + MewAttachmentModel *attachment = (MewAttachmentModel *)obj.attachment; } } @@ -281,7 +281,7 @@ selfNeedBroadcast = model.microState.micState == MicroMicStateType_Open; } if (model.microState.micState == MicroMicStateType_Close) { - [RtcManager instance].localMuted = YES; + [MewRtcManager instance].localMuted = YES; } } @@ -289,7 +289,7 @@ if (!isHandleRTC) { return; } - [[RtcManager instance] broadcast:selfNeedBroadcast]; + [[MewRtcManager instance] mew_broadcast:selfNeedBroadcast]; } @@ -434,13 +434,13 @@ } -#pragma mark - RtcDelegate - 讲话的波纹回调 -- (void)usersSpeaking:(NSMutableArray *)uids { - if ([RtcManager instance].isRemoteMuted) { +#pragma mark - MewRtcDelegate - 讲话的波纹回调 +- (void)mew_usersSpeaking:(NSMutableArray *)uids { + if ([MewRtcManager instance].isRemoteMuted) { return; } for (NSString* uid in uids) { - if ([RtcManager instance].isLocalMuted && uid.integerValue == self.hostDelegate.mew_getUserInformation.uid) { + if ([MewRtcManager instance].isLocalMuted && uid.integerValue == self.hostDelegate.mew_getUserInformation.uid) { continue; } UIView* microView = [self findMicroViewByUid:uid];