From 153f297ea7d7a1be549397be5345f91bd9323bdf Mon Sep 17 00:00:00 2001 From: linyudan <1031378945@qq.com> Date: Fri, 8 Dec 2023 14:55:52 -0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=9B=AE=E5=BD=95=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=8C=E9=83=A8=E5=88=86=E6=9E=9A=E4=B8=BE=E5=8A=A0?= =?UTF-8?q?mew=E5=89=8D=E7=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yinmeng-ios/Podfile.lock | 2 +- .../yinmeng-ios.xcodeproj/project.pbxproj | 316 +++++++----------- .../Contents.json | 22 ++ .../mine_setting_modif_pay_pwd_hidden@2x.png | Bin 0 -> 385 bytes .../mine_setting_modif_pay_pwd_hidden@3x.png | Bin 0 -> 610 bytes .../Contents.json | 22 ++ .../mine_setting_modif_pay_pwd_show@2x.png | Bin 0 -> 288 bytes .../mine_setting_modif_pay_pwd_show@3x.png | Bin 0 -> 486 bytes yinmeng-ios/yinmeng-ios/Base/MVP/Api/Api.h | 10 +- yinmeng-ios/yinmeng-ios/Base/MVP/Api/Api.m | 22 +- .../Base/MVP/Model/MewAccountInfoStorage.h | 2 +- .../Base/MVP/Model/MewAccountInfoStorage.m | 2 +- .../Base/Net/MewHttpRequestHelper.m | 6 +- .../{NewEncryptTool.h => MewEncryptTool.h} | 4 +- .../{NewEncryptTool.m => MewEncryptTool.m} | 6 +- .../{MEWGCDHelper.h => MewGCDHelper.h} | 2 +- .../{MEWGCDHelper.m => MewGCDHelper.m} | 4 +- ...RechargeStorage.h => MewRechargeStorage.h} | 4 +- ...RechargeStorage.m => MewRechargeStorage.m} | 6 +- .../yinmeng-ios/Base/Tool/MewHUDTool.m | 2 +- .../{MEWThemeColor.h => MewThemeColor.h} | 4 +- .../{MEWThemeColor.m => MewThemeColor.m} | 14 +- .../yinmeng-ios/Base/Tool/Timer/MEWTimer.h | 21 -- .../yinmeng-ios/Base/Tool/Timer/MewTimer.h | 21 ++ .../Tool/Timer/{MEWTimer.m => MewTimer.m} | 22 +- .../Tool/YYUtility/MewUtility+MewDevice.m | 2 +- ...ableViewCell.h => MewEmptyTableViewCell.h} | 4 +- ...ableViewCell.m => MewEmptyTableViewCell.m} | 12 +- .../Base/UI/MewBaseNavigationController.m | 14 +- .../UI/TTPopup/Config/TTActionSheetConfig.m | 4 +- .../Base/UI/TTPopup/Config/TTAlertConfig.m | 16 +- .../Base/UI/TTPopup/View/TTActionSheetView.m | 6 +- .../Base/UI/TTPopup/View/TTAlertView.m | 14 +- .../{Main => }/ClientConfig/Api/Api+MewMain.h | 0 .../{Main => }/ClientConfig/Api/Api+MewMain.m | 8 +- .../{Main => }/ClientConfig/MewClientConfig.h | 0 .../{Main => }/ClientConfig/MewClientConfig.m | 4 +- .../ClientConfig/Model/MewClientDataModel.h | 0 .../ClientConfig/Model/MewClientDataModel.m | 0 yinmeng-ios/yinmeng-ios/Global/MewConstant.m | 4 +- yinmeng-ios/yinmeng-ios/Global/MewHtmlUrl.m | 8 +- .../Main/{Mew => }/Home/Api/Api+MewHome.h | 0 .../Main/{Mew => }/Home/Api/Api+MewHome.m | 8 +- .../Home/Manager/MewAudioPlayerManager.h | 0 .../Home/Manager/MewAudioPlayerManager.m | 0 .../Home/Presenter/MewHomePresenter.h | 0 .../Home/Presenter/MewHomePresenter.m | 8 +- .../{Mew => }/Home/Protocol/MewHomeProtocol.h | 0 .../Home/View/MewHomeViewController.h | 0 .../Home/View/MewHomeViewController.m | 6 +- .../Home/View/SubView/MewHeaderView.h | 0 .../Home/View/SubView/MewHeaderView.m | 10 +- .../Home/View/SubView/MewHomeFilterView.h | 0 .../Home/View/SubView/MewHomeFilterView.m | 6 +- .../Home/View/SubView/MewPlayVoiceView.h | 0 .../Home/View/SubView/MewPlayVoiceView.m | 8 +- .../View/SubView/MewPushExclusiveVoiceView.h | 0 .../View/SubView/MewPushExclusiveVoiceView.m | 24 +- .../MewRightFollowVoiceCollectionCell.h | 0 .../MewRightFollowVoiceCollectionCell.m | 0 .../View/SubView/MewRightFollowVoiceView.h | 0 .../View/SubView/MewRightFollowVoiceView.m | 8 +- .../Home/View/SubView/MewShowVoiceView.h | 0 .../Home/View/SubView/MewShowVoiceView.m | 0 .../View/SubView/MewUserIntroductionView.h | 0 .../View/SubView/MewUserIntroductionView.m | 14 +- .../Home/View/SubView/MewVoiceDiscView.h | 0 .../Home/View/SubView/MewVoiceDiscView.m | 0 .../Home/View/SubView/MewVoiceGuideView.h | 0 .../Home/View/SubView/MewVoiceGuideView.m | 4 +- .../IM/Model/MewAttachmentModel.h | 40 +-- .../IM/Model/MewAttachmentModel.m | 0 .../IM/Tool/MewCustomAttachmentDecoder.h | 0 .../IM/Tool/MewCustomAttachmentDecoder.m | 0 .../Main/{YinMeng => }/Login/Api/Api+Login.h | 0 .../Main/{YinMeng => }/Login/Api/Api+Login.m | 16 +- .../Login/Model/MewThirdUserInfo.h | 0 .../Login/Model/MewThirdUserInfo.m | 0 .../Login/Presenter/LoginPresenter.h | 0 .../Presenter/MewLoginBindPhonePresent.h | 0 .../Presenter/MewLoginBindPhonePresent.m | 0 .../Presenter/MewLoginForgetPasswordPresent.h | 0 .../Presenter/MewLoginForgetPasswordPresent.m | 6 +- .../Presenter/MewLoginFullInfoPresenter.h | 0 .../Presenter/MewLoginFullInfoPresenter.m | 10 +- .../Login/Presenter/MewLoginPasswordPresent.h | 0 .../Login/Presenter/MewLoginPasswordPresent.m | 0 .../Login/Presenter/MewLoginPresenter.h | 0 .../Login/Presenter/MewLoginPresenter.m | 2 +- .../MewLoginVerifBindPhonePresenter.h | 0 .../MewLoginVerifBindPhonePresenter.m | 4 +- .../Presenter/MewLoginVerifCodePresent.h | 0 .../Presenter/MewLoginVerifCodePresent.m | 2 +- .../Presenter/MineLoginPasswordPresenter.h | 0 .../Presenter/MineLoginPasswordPresenter.m | 0 .../Protocol/MewLoginForgetPasswordProtocol.h | 0 .../Login/Protocol/MewLoginFullInfoProtocol.h | 0 .../Login/Protocol/MewLoginPasswordProtocol.h | 0 .../Login/Protocol/MewLoginProtocol.h | 0 .../Protocol/MewLoginVerifBindPhoneProtocol.h | 0 .../Protocol/MewLoginVerifCodeProtocol.h | 0 .../Protocol/MineLoginPasswordProtocol.h | 0 .../View/CustomView/MewLoginForgetEditView.h | 0 .../View/CustomView/MewLoginForgetEditView.m | 16 +- .../Login/View/CustomView/MewLoginInputView.h | 0 .../Login/View/CustomView/MewLoginInputView.m | 12 +- .../View/LoginBindPhoneResultViewController.h | 0 .../View/LoginBindPhoneResultViewController.m | 0 .../View/MewLoginBindPhoneViewController.h | 0 .../View/MewLoginBindPhoneViewController.m | 20 +- .../MewLoginForgetPasswordViewController.h | 0 .../MewLoginForgetPasswordViewController.m | 6 +- .../View/MewLoginFullInfoViewController.h | 0 .../View/MewLoginFullInfoViewController.m | 10 +- .../MewLoginVerifBindPhoneViewController.h | 0 .../MewLoginVerifBindPhoneViewController.m | 34 +- .../View/MewMineLoginPasswordViewController.h | 0 .../View/MewMineLoginPasswordViewController.m | 6 +- .../MewView}/MewLoginNumberViewController.h | 0 .../MewView}/MewLoginNumberViewController.m | 0 .../View/MewView}/MewLoginViewController.h | 0 .../View/MewView}/MewLoginViewController.m | 12 +- .../MewView}/SubView/MewLoginPasswordView.h | 0 .../MewView}/SubView/MewLoginPasswordView.m | 4 +- .../View/MewView}/SubView/MewLoginPhoneView.h | 0 .../View/MewView}/SubView/MewLoginPhoneView.m | 16 +- .../{YinMeng => }/Message/Api/Api+Message.h | 0 .../{YinMeng => }/Message/Api/Api+Message.m | 4 +- .../Message/Model/MewChatLimitModel.h | 0 .../Message/Model/MewChatLimitModel.m | 0 .../Message/Model/MewMessageMenuModel.h | 0 .../Message/Model/MewMessageMenuModel.m | 0 .../Message/Presenter/CHMessagePresenter.h | 0 .../Message/Presenter/MewMessagePresenter.h | 0 .../Message/Presenter/MewMessagePresenter.m | 4 +- .../Message/Protocol/CHMessageProtocol.h | 0 .../Message/Protocol/MewMessageProtocol.h | 0 .../Message/Tool/MewNIMMessageUtils.h | 0 .../Message/Tool/MewNIMMessageUtils.m | 0 .../MewSessionListTableViewCell.h | 0 .../MewSessionListTableViewCell.m | 6 +- .../MewSessionListViewController.h | 0 .../MewSessionListViewController.m | 0 .../Message/View/NIMViews/MewNIMBadgeView.h | 0 .../Message/View/NIMViews/MewNIMBadgeView.m | 0 .../NIMViews/UITableView+NIMScrollToBottom.h | 0 .../NIMViews/UITableView+NIMScrollToBottom.m | 0 .../Message/View/NIMViews/UIView+NIM.h | 0 .../Message/View/NIMViews/UIView+NIM.m | 0 .../Session/Content/MewMessageContentImage.h | 0 .../Session/Content/MewMessageContentImage.m | 2 +- .../Content/MewMessageContentProtocol.h | 2 +- .../Session/Content/MewMessageContentText.h | 0 .../Session/Content/MewMessageContentText.m | 12 +- .../Content/MewMessageContentUnSupportView.h | 0 .../Content/MewMessageContentUnSupportView.m | 6 +- .../MewMessageToolMenuCollectionCell.h | 0 .../MewMessageToolMenuCollectionCell.m | 8 +- .../MewMessageToolMenuCollectionViewCell.m | 0 .../View/Session/MewMessageAudioCenter.h | 0 .../View/Session/MewMessageAudioCenter.m | 8 +- .../View/Session/MewMessageConentAudioView.h | 0 .../View/Session/MewMessageConentAudioView.m | 4 +- .../Message/View/Session/MewNIMMessageMaker.h | 0 .../Message/View/Session/MewNIMMessageMaker.m | 16 +- .../View/Session/MewSessionAudioRecordView.h | 0 .../View/Session/MewSessionAudioRecordView.m | 0 .../Session/MewSessionInfoViewController.h | 0 .../Session/MewSessionInfoViewController.m | 24 +- .../View/Session/MewSessionMessageCell.h | 2 +- .../View/Session/MewSessionMessageCell.m | 20 +- .../Message/View/Session/MewSessionNavView.h | 0 .../Message/View/Session/MewSessionNavView.m | 8 +- .../View/Session/MewSessionToolbarView.h | 0 .../View/Session/MewSessionToolbarView.m | 24 +- .../View/Session/MewSessionViewController.h | 0 .../View/Session/MewSessionViewController.m | 14 +- .../Main/{YinMeng => }/Mine/Api/Api+Mine.h | 0 .../Main/{YinMeng => }/Mine/Api/Api+Mine.m | 22 +- .../Mine/Model/Friend/MewFansInfoModel.h | 0 .../Mine/Model/Friend/MewFansInfoModel.m | 0 .../Mine/Model/MewMineCollectRoomModel.h | 0 .../Mine/Model/MewMineCollectRoomModel.m | 0 .../Mine/Model/MewMineSettingItemModel.h | 0 .../Mine/Model/MewMineSettingItemModel.m | 0 .../Model/Recharge/MewRechargeListModel.h | 0 .../Model/Recharge/MewRechargeListModel.m | 0 .../Mine/Model/Recharge/MewWalletInfoModel.h | 0 .../Mine/Model/Recharge/MewWalletInfoModel.m | 0 .../Presenter/MewMineCollectRoomPresenter.h | 0 .../Presenter/MewMineCollectRoomPresenter.m | 2 +- .../Mine/Presenter/MewMineRechargePresenter.h | 0 .../Mine/Presenter/MewMineRechargePresenter.m | 12 +- .../Mine/Presenter/MewMineSettingPresenter.h | 0 .../Mine/Presenter/MewMineSettingPresenter.m | 4 +- .../Presenter/YMMineCollectRoomPresenter.m | 0 .../Protocol/MewMineCollectRoomProtocol.h | 0 .../Mine/Protocol/MewMineRechargeProtocol.h | 0 .../Mine/Protocol/MewMineSettingProtocol.h | 0 .../Mine/Protocol/MineRechargeProtocol.h | 0 .../CollectRoom/Cell/MewMineCollectRoomCell.h | 0 .../CollectRoom/Cell/MewMineCollectRoomCell.m | 4 +- .../MewMineCollectRoomViewController.h | 0 .../MewMineCollectRoomViewController.m | 14 +- .../MewMineCollectionViewController.h | 0 .../MewMineCollectionViewController.m | 14 +- .../View/MiewMineView}/MewRechargeSubView.h | 0 .../View/MiewMineView}/MewRechargeSubView.m | 16 +- .../MiewMineView}/MewRechargeViewController.h | 0 .../MiewMineView}/MewRechargeViewController.m | 14 +- .../Cell/MewMineCollectionTableViewCell.h | 0 .../Cell/MewMineCollectionTableViewCell.m | 4 +- .../Cell/MewMineSettingTableViewCell.h | 0 .../Cell/MewMineSettingTableViewCell.m | 2 +- .../Setting/MewMineAboutUsViewController.h | 0 .../Setting/MewMineAboutUsViewController.m | 6 +- .../Setting/MewMineSettingViewController.h | 0 .../Setting/MewMineSettingViewController.m | 8 +- .../View/SubView/MewMineModifPayPwdView.h | 0 .../View/SubView/MewMineModifPayPwdView.m | 12 +- .../ModuleKit/MewGiftView/Api/Api+Gift.h | 0 .../ModuleKit/MewGiftView/Api/Api+Gift.m | 4 +- .../MewGiftView/Model/MewGiftInfoModel.h | 0 .../MewGiftView/Model/MewGiftInfoModel.m | 0 .../Model/MewGiftReceiveInfoModel.h | 0 .../Model/MewGiftReceiveInfoModel.m | 0 .../MewGiftView/Presenter/MewGiftStorage.h | 0 .../MewGiftView/Presenter/MewGiftStorage.m | 0 .../Main/{Mew => }/Party/Api/Api+MewParty.h | 0 .../Main/{Mew => }/Party/Api/Api+MewParty.m | 4 +- .../Party/Model/MewHomeRecommendRoomModel.h | 0 .../Party/Model/MewHomeRecommendRoomModel.m | 0 .../{Mew => }/Party/Model/MewPartyModel.h | 0 .../{Mew => }/Party/Model/MewPartyModel.m | 0 .../Party/Presenter/MewPartyPresenter.h | 0 .../Party/Presenter/MewPartyPresenter.m | 2 +- .../Party/Protocol/MewPartyProtocol.h | 0 .../View/MewPartyListCollectionViewCell.h | 0 .../View/MewPartyListCollectionViewCell.m | 6 +- .../Party/View/MewPartyViewController.h | 0 .../Party/View/MewPartyViewController.m | 6 +- .../Main/{YinMeng => }/Room/Api/Api+Room.h | 2 +- .../Main/{YinMeng => }/Room/Api/Api+Room.m | 18 +- .../Room/Model/MewRoomInfoModel.h | 10 +- .../Room/Model/MewRoomInfoModel.m | 0 .../Room/Presenter/MewRoomPresenter.h | 2 +- .../Room/Presenter/MewRoomPresenter.m | 22 +- .../Room/Protocol/MewRoomProtocol.h | 6 +- .../RTC/Impl/MewBaseRtcImpl.h | 0 .../RTC/Impl/MewBaseRtcImpl.m | 0 .../RTC/Impl/MewRtcImplDelegate.h | 0 .../RTC/Impl/MewRtcInterface.h | 0 .../RTC/Impl/MewTRTCRtcImpl.h | 0 .../RTC/Impl/MewTRTCRtcImpl.m | 6 +- .../{YinMeng => Room}/RTC/MewRtcDelegate.h | 0 .../{YinMeng => Room}/RTC/MewRtcManager.h | 2 +- .../{YinMeng => Room}/RTC/MewRtcManager.m | 2 +- .../AnimationView/MewRoomAnimationGroup.h | 0 .../AnimationView/MewRoomAnimationGroup.m | 0 .../AnimationView/MewRoomAnimationHitView.h | 0 .../AnimationView/MewRoomAnimationHitView.m | 0 .../View/AnimationView/MewRoomAnimationView.h | 0 .../View/AnimationView/MewRoomAnimationView.m | 7 +- .../AnimationView/YMRoomGiftAnimationParser.m | 0 .../Room/View/MEWThemeColor+MEWRoom.h | 0 .../Room/View/MEWThemeColor+MEWRoom.m | 0 .../MenuContainerView/MewRoomSendTextView.h | 0 .../MenuContainerView/MewRoomSendTextView.m | 18 +- .../MewRoomMessageContainerView.h | 0 .../MewRoomMessageContainerView.m | 4 +- .../MewRoomMessageHeaderView.h | 0 .../MewRoomMessageHeaderView.m | 2 +- .../Model/MewMessageInfoModel.h | 0 .../Model/MewMessageInfoModel.m | 0 .../Model/MewMessageRemoteExtModel.h | 0 .../Model/MewMessageRemoteExtModel.m | 0 .../Tool/MewRoomMessageConstant.h | 0 .../Tool/MewRoomMessageFilter.h | 0 .../Tool/MewRoomMessageFilter.m | 24 +- .../Tool/MewRoomMessageParser.h | 0 .../Tool/MewRoomMessageParser.m | 7 +- .../View/MewNetImageLabel.h | 0 .../View/MewNetImageLabel.m | 0 .../Room/View/MewMicroQueueProtocol.h | 8 +- .../Room/View/MewRoomAnimationProtocol.h | 0 .../Room/View/MewRoomGuestDelegate.h | 0 .../Room/View/MewRoomHostDelegate.h | 0 .../View/MewView}/MewRoomViewController.h | 0 .../View/MewView}/MewRoomViewController.m | 34 +- .../RoomHeaderView/MewRoomHeaderView.h | 0 .../RoomHeaderView/MewRoomHeaderView.m | 8 +- .../RoomMessageView/MewRoomMessageTableCell.h | 0 .../RoomMessageView/MewRoomMessageTableCell.m | 4 +- .../MewView}/RoomRightView/MewRoomRightView.h | 0 .../MewView}/RoomRightView/MewRoomRightView.m | 0 .../RoomStageView/MewSocialStageView.h | 4 +- .../RoomStageView/MewSocialStageView.m | 18 +- .../RoomMicroView/MewSocialMicroView.h | 0 .../RoomMicroView/MewSocialMicroView.m | 16 +- .../View/StageView/MewStageView.h} | 34 +- .../View/StageView/MewStageView.m} | 160 ++++----- .../Room/View/StageView/MicroView/MicroView.h | 0 .../Room/View/StageView/MicroView/MicroView.m | 43 +-- .../StageView/MicroView/MicroViewProtocol.h | 16 +- .../View/StageView/Model/MewMicroExtModel.h} | 4 +- .../View/StageView/Model/MewMicroExtModel.m | 12 + .../StageView/Model/MewMicroQueueModel.h} | 8 +- .../View/StageView/Model/MewMicroQueueModel.m | 12 + .../View/StageView/Model/MewMicroStateModel.h | 33 ++ .../View/StageView/Model/MewMicroStateModel.m | 12 + .../Main/Tabbar/Presenter/MainPresenter.m | 12 +- .../Main/Tabbar/View/MewTabBarController.m | 6 +- .../Main/{ => WebView}/MewWebViewController.h | 0 .../Main/{ => WebView}/MewWebViewController.m | 8 +- .../Room/View/StageView/Model/MicroExtModel.m | 12 - .../View/StageView/Model/MicroQueueModel.m | 12 - .../View/StageView/Model/MicroStateModel.h | 33 -- .../View/StageView/Model/MicroStateModel.m | 12 - 318 files changed, 935 insertions(+), 960 deletions(-) create mode 100644 yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/Mine/mine_setting_modif_pay_pwd_hidden.imageset/Contents.json create mode 100644 yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/Mine/mine_setting_modif_pay_pwd_hidden.imageset/mine_setting_modif_pay_pwd_hidden@2x.png create mode 100644 yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/Mine/mine_setting_modif_pay_pwd_hidden.imageset/mine_setting_modif_pay_pwd_hidden@3x.png create mode 100644 yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/Mine/mine_setting_modif_pay_pwd_show.imageset/Contents.json create mode 100644 yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/Mine/mine_setting_modif_pay_pwd_show.imageset/mine_setting_modif_pay_pwd_show@2x.png create mode 100644 yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/Mine/mine_setting_modif_pay_pwd_show.imageset/mine_setting_modif_pay_pwd_show@3x.png rename yinmeng-ios/yinmeng-ios/Base/Tool/EncryptTool/{NewEncryptTool.h => MewEncryptTool.h} (82%) rename yinmeng-ios/yinmeng-ios/Base/Tool/EncryptTool/{NewEncryptTool.m => MewEncryptTool.m} (98%) rename yinmeng-ios/yinmeng-ios/Base/Tool/GCDHelper/{MEWGCDHelper.h => MewGCDHelper.h} (89%) rename yinmeng-ios/yinmeng-ios/Base/Tool/GCDHelper/{MEWGCDHelper.m => MewGCDHelper.m} (85%) rename yinmeng-ios/yinmeng-ios/Base/Tool/IAPHelper/{MEWRechargeStorage.h => MewRechargeStorage.h} (90%) rename yinmeng-ios/yinmeng-ios/Base/Tool/IAPHelper/{MEWRechargeStorage.m => MewRechargeStorage.m} (96%) rename yinmeng-ios/yinmeng-ios/Base/Tool/ThemeColor/{MEWThemeColor.h => MewThemeColor.h} (97%) rename yinmeng-ios/yinmeng-ios/Base/Tool/ThemeColor/{MEWThemeColor.m => MewThemeColor.m} (95%) delete mode 100644 yinmeng-ios/yinmeng-ios/Base/Tool/Timer/MEWTimer.h create mode 100644 yinmeng-ios/yinmeng-ios/Base/Tool/Timer/MewTimer.h rename yinmeng-ios/yinmeng-ios/Base/Tool/Timer/{MEWTimer.m => MewTimer.m} (66%) rename yinmeng-ios/yinmeng-ios/Base/UI/EmptyView/{YMEmptyTableViewCell.h => MewEmptyTableViewCell.h} (72%) rename yinmeng-ios/yinmeng-ios/Base/UI/EmptyView/{YMEmptyTableViewCell.m => MewEmptyTableViewCell.m} (90%) rename yinmeng-ios/yinmeng-ios/{Main => }/ClientConfig/Api/Api+MewMain.h (100%) rename yinmeng-ios/yinmeng-ios/{Main => }/ClientConfig/Api/Api+MewMain.m (83%) rename yinmeng-ios/yinmeng-ios/{Main => }/ClientConfig/MewClientConfig.h (100%) rename yinmeng-ios/yinmeng-ios/{Main => }/ClientConfig/MewClientConfig.m (96%) rename yinmeng-ios/yinmeng-ios/{Main => }/ClientConfig/Model/MewClientDataModel.h (100%) rename yinmeng-ios/yinmeng-ios/{Main => }/ClientConfig/Model/MewClientDataModel.m (100%) rename yinmeng-ios/yinmeng-ios/Main/{Mew => }/Home/Api/Api+MewHome.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{Mew => }/Home/Api/Api+MewHome.m (86%) rename yinmeng-ios/yinmeng-ios/Main/{Mew => }/Home/Manager/MewAudioPlayerManager.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{Mew => }/Home/Manager/MewAudioPlayerManager.m (100%) rename yinmeng-ios/yinmeng-ios/Main/{Mew => }/Home/Presenter/MewHomePresenter.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{Mew => }/Home/Presenter/MewHomePresenter.m (95%) rename yinmeng-ios/yinmeng-ios/Main/{Mew => }/Home/Protocol/MewHomeProtocol.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{Mew => }/Home/View/MewHomeViewController.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{Mew => }/Home/View/MewHomeViewController.m (99%) rename yinmeng-ios/yinmeng-ios/Main/{Mew => }/Home/View/SubView/MewHeaderView.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{Mew => }/Home/View/SubView/MewHeaderView.m (95%) rename yinmeng-ios/yinmeng-ios/Main/{Mew => }/Home/View/SubView/MewHomeFilterView.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{Mew => }/Home/View/SubView/MewHomeFilterView.m (96%) rename yinmeng-ios/yinmeng-ios/Main/{Mew => }/Home/View/SubView/MewPlayVoiceView.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{Mew => }/Home/View/SubView/MewPlayVoiceView.m (97%) rename yinmeng-ios/yinmeng-ios/Main/{Mew => }/Home/View/SubView/MewPushExclusiveVoiceView.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{Mew => }/Home/View/SubView/MewPushExclusiveVoiceView.m (97%) rename yinmeng-ios/yinmeng-ios/Main/{Mew => }/Home/View/SubView/MewRightFollowVoiceCollectionCell.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{Mew => }/Home/View/SubView/MewRightFollowVoiceCollectionCell.m (100%) rename yinmeng-ios/yinmeng-ios/Main/{Mew => }/Home/View/SubView/MewRightFollowVoiceView.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{Mew => }/Home/View/SubView/MewRightFollowVoiceView.m (95%) rename yinmeng-ios/yinmeng-ios/Main/{Mew => }/Home/View/SubView/MewShowVoiceView.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{Mew => }/Home/View/SubView/MewShowVoiceView.m (100%) rename yinmeng-ios/yinmeng-ios/Main/{Mew => }/Home/View/SubView/MewUserIntroductionView.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{Mew => }/Home/View/SubView/MewUserIntroductionView.m (98%) rename yinmeng-ios/yinmeng-ios/Main/{Mew => }/Home/View/SubView/MewVoiceDiscView.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{Mew => }/Home/View/SubView/MewVoiceDiscView.m (100%) rename yinmeng-ios/yinmeng-ios/Main/{Mew => }/Home/View/SubView/MewVoiceGuideView.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{Mew => }/Home/View/SubView/MewVoiceGuideView.m (97%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/IM/Model/MewAttachmentModel.h (61%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/IM/Model/MewAttachmentModel.m (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/IM/Tool/MewCustomAttachmentDecoder.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/IM/Tool/MewCustomAttachmentDecoder.m (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Login/Api/Api+Login.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Login/Api/Api+Login.m (87%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Login/Model/MewThirdUserInfo.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Login/Model/MewThirdUserInfo.m (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Login/Presenter/LoginPresenter.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Login/Presenter/MewLoginBindPhonePresent.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Login/Presenter/MewLoginBindPhonePresent.m (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Login/Presenter/MewLoginForgetPasswordPresent.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Login/Presenter/MewLoginForgetPasswordPresent.m (85%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Login/Presenter/MewLoginFullInfoPresenter.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Login/Presenter/MewLoginFullInfoPresenter.m (90%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Login/Presenter/MewLoginPasswordPresent.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Login/Presenter/MewLoginPasswordPresent.m (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Login/Presenter/MewLoginPresenter.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Login/Presenter/MewLoginPresenter.m (95%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Login/Presenter/MewLoginVerifBindPhonePresenter.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Login/Presenter/MewLoginVerifBindPhonePresenter.m (93%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Login/Presenter/MewLoginVerifCodePresent.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Login/Presenter/MewLoginVerifCodePresent.m (97%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Login/Presenter/MineLoginPasswordPresenter.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Login/Presenter/MineLoginPasswordPresenter.m (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Login/Protocol/MewLoginForgetPasswordProtocol.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Login/Protocol/MewLoginFullInfoProtocol.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Login/Protocol/MewLoginPasswordProtocol.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Login/Protocol/MewLoginProtocol.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Login/Protocol/MewLoginVerifBindPhoneProtocol.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Login/Protocol/MewLoginVerifCodeProtocol.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Login/Protocol/MineLoginPasswordProtocol.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Login/View/CustomView/MewLoginForgetEditView.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Login/View/CustomView/MewLoginForgetEditView.m (91%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Login/View/CustomView/MewLoginInputView.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Login/View/CustomView/MewLoginInputView.m (90%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Login/View/LoginBindPhoneResultViewController.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Login/View/LoginBindPhoneResultViewController.m (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Login/View/MewLoginBindPhoneViewController.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Login/View/MewLoginBindPhoneViewController.m (94%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Login/View/MewLoginForgetPasswordViewController.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Login/View/MewLoginForgetPasswordViewController.m (97%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Login/View/MewLoginFullInfoViewController.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Login/View/MewLoginFullInfoViewController.m (97%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Login/View/MewLoginVerifBindPhoneViewController.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Login/View/MewLoginVerifBindPhoneViewController.m (93%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Login/View/MewMineLoginPasswordViewController.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Login/View/MewMineLoginPasswordViewController.m (98%) rename yinmeng-ios/yinmeng-ios/Main/{Mew/Login/View => Login/View/MewView}/MewLoginNumberViewController.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{Mew/Login/View => Login/View/MewView}/MewLoginNumberViewController.m (100%) rename yinmeng-ios/yinmeng-ios/Main/{Mew/Login/View => Login/View/MewView}/MewLoginViewController.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{Mew/Login/View => Login/View/MewView}/MewLoginViewController.m (98%) rename yinmeng-ios/yinmeng-ios/Main/{Mew/Login/View => Login/View/MewView}/SubView/MewLoginPasswordView.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{Mew/Login/View => Login/View/MewView}/SubView/MewLoginPasswordView.m (97%) rename yinmeng-ios/yinmeng-ios/Main/{Mew/Login/View => Login/View/MewView}/SubView/MewLoginPhoneView.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{Mew/Login/View => Login/View/MewView}/SubView/MewLoginPhoneView.m (95%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Message/Api/Api+Message.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Message/Api/Api+Message.m (82%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Message/Model/MewChatLimitModel.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Message/Model/MewChatLimitModel.m (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Message/Model/MewMessageMenuModel.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Message/Model/MewMessageMenuModel.m (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Message/Presenter/CHMessagePresenter.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Message/Presenter/MewMessagePresenter.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Message/Presenter/MewMessagePresenter.m (94%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Message/Protocol/CHMessageProtocol.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Message/Protocol/MewMessageProtocol.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Message/Tool/MewNIMMessageUtils.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Message/Tool/MewNIMMessageUtils.m (100%) rename yinmeng-ios/yinmeng-ios/Main/{Mew/Message/View/SessionList => Message/View/MewSessionList}/MewSessionListTableViewCell.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{Mew/Message/View/SessionList => Message/View/MewSessionList}/MewSessionListTableViewCell.m (98%) rename yinmeng-ios/yinmeng-ios/Main/{Mew/Message/View/SessionList => Message/View/MewSessionList}/MewSessionListViewController.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{Mew/Message/View/SessionList => Message/View/MewSessionList}/MewSessionListViewController.m (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Message/View/NIMViews/MewNIMBadgeView.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Message/View/NIMViews/MewNIMBadgeView.m (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Message/View/NIMViews/UITableView+NIMScrollToBottom.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Message/View/NIMViews/UITableView+NIMScrollToBottom.m (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Message/View/NIMViews/UIView+NIM.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Message/View/NIMViews/UIView+NIM.m (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Message/View/Session/Content/MewMessageContentImage.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Message/View/Session/Content/MewMessageContentImage.m (98%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Message/View/Session/Content/MewMessageContentProtocol.h (89%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Message/View/Session/Content/MewMessageContentText.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Message/View/Session/Content/MewMessageContentText.m (85%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Message/View/Session/Content/MewMessageContentUnSupportView.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Message/View/Session/Content/MewMessageContentUnSupportView.m (93%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Message/View/Session/Content/MewMessageToolMenuCollectionCell.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Message/View/Session/Content/MewMessageToolMenuCollectionCell.m (89%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Message/View/Session/Content/MewMessageToolMenuCollectionViewCell.m (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Message/View/Session/MewMessageAudioCenter.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Message/View/Session/MewMessageAudioCenter.m (93%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Message/View/Session/MewMessageConentAudioView.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Message/View/Session/MewMessageConentAudioView.m (98%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Message/View/Session/MewNIMMessageMaker.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Message/View/Session/MewNIMMessageMaker.m (83%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Message/View/Session/MewSessionAudioRecordView.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Message/View/Session/MewSessionAudioRecordView.m (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Message/View/Session/MewSessionInfoViewController.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Message/View/Session/MewSessionInfoViewController.m (94%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Message/View/Session/MewSessionMessageCell.h (91%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Message/View/Session/MewSessionMessageCell.m (95%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Message/View/Session/MewSessionNavView.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Message/View/Session/MewSessionNavView.m (95%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Message/View/Session/MewSessionToolbarView.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Message/View/Session/MewSessionToolbarView.m (96%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Message/View/Session/MewSessionViewController.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Message/View/Session/MewSessionViewController.m (97%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Mine/Api/Api+Mine.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Mine/Api/Api+Mine.m (90%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Mine/Model/Friend/MewFansInfoModel.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Mine/Model/Friend/MewFansInfoModel.m (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Mine/Model/MewMineCollectRoomModel.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Mine/Model/MewMineCollectRoomModel.m (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Mine/Model/MewMineSettingItemModel.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Mine/Model/MewMineSettingItemModel.m (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Mine/Model/Recharge/MewRechargeListModel.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Mine/Model/Recharge/MewRechargeListModel.m (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Mine/Model/Recharge/MewWalletInfoModel.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Mine/Model/Recharge/MewWalletInfoModel.m (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Mine/Presenter/MewMineCollectRoomPresenter.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Mine/Presenter/MewMineCollectRoomPresenter.m (94%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Mine/Presenter/MewMineRechargePresenter.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Mine/Presenter/MewMineRechargePresenter.m (89%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Mine/Presenter/MewMineSettingPresenter.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Mine/Presenter/MewMineSettingPresenter.m (93%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Mine/Presenter/YMMineCollectRoomPresenter.m (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Mine/Protocol/MewMineCollectRoomProtocol.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Mine/Protocol/MewMineRechargeProtocol.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Mine/Protocol/MewMineSettingProtocol.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Mine/Protocol/MineRechargeProtocol.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Mine/View/CollectRoom/Cell/MewMineCollectRoomCell.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Mine/View/CollectRoom/Cell/MewMineCollectRoomCell.m (97%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Mine/View/CollectRoom/MewMineCollectRoomViewController.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Mine/View/CollectRoom/MewMineCollectRoomViewController.m (90%) rename yinmeng-ios/yinmeng-ios/Main/{Mew/Mine/View => Mine/View/MiewMineView}/MewMineCollectionViewController.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{Mew/Mine/View => Mine/View/MiewMineView}/MewMineCollectionViewController.m (90%) rename yinmeng-ios/yinmeng-ios/Main/{Mew/Mine/View => Mine/View/MiewMineView}/MewRechargeSubView.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{Mew/Mine/View => Mine/View/MiewMineView}/MewRechargeSubView.m (96%) rename yinmeng-ios/yinmeng-ios/Main/{Mew/Mine/View => Mine/View/MiewMineView}/MewRechargeViewController.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{Mew/Mine/View => Mine/View/MiewMineView}/MewRechargeViewController.m (96%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Mine/View/Setting/Cell/MewMineCollectionTableViewCell.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Mine/View/Setting/Cell/MewMineCollectionTableViewCell.m (96%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Mine/View/Setting/Cell/MewMineSettingTableViewCell.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Mine/View/Setting/Cell/MewMineSettingTableViewCell.m (99%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Mine/View/Setting/MewMineAboutUsViewController.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Mine/View/Setting/MewMineAboutUsViewController.m (97%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Mine/View/Setting/MewMineSettingViewController.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Mine/View/Setting/MewMineSettingViewController.m (96%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Mine/View/SubView/MewMineModifPayPwdView.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Mine/View/SubView/MewMineModifPayPwdView.m (91%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/ModuleKit/MewGiftView/Api/Api+Gift.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/ModuleKit/MewGiftView/Api/Api+Gift.m (92%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/ModuleKit/MewGiftView/Model/MewGiftInfoModel.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/ModuleKit/MewGiftView/Model/MewGiftInfoModel.m (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/ModuleKit/MewGiftView/Model/MewGiftReceiveInfoModel.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/ModuleKit/MewGiftView/Model/MewGiftReceiveInfoModel.m (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/ModuleKit/MewGiftView/Presenter/MewGiftStorage.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/ModuleKit/MewGiftView/Presenter/MewGiftStorage.m (100%) rename yinmeng-ios/yinmeng-ios/Main/{Mew => }/Party/Api/Api+MewParty.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{Mew => }/Party/Api/Api+MewParty.m (84%) rename yinmeng-ios/yinmeng-ios/Main/{Mew => }/Party/Model/MewHomeRecommendRoomModel.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{Mew => }/Party/Model/MewHomeRecommendRoomModel.m (100%) rename yinmeng-ios/yinmeng-ios/Main/{Mew => }/Party/Model/MewPartyModel.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{Mew => }/Party/Model/MewPartyModel.m (100%) rename yinmeng-ios/yinmeng-ios/Main/{Mew => }/Party/Presenter/MewPartyPresenter.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{Mew => }/Party/Presenter/MewPartyPresenter.m (92%) rename yinmeng-ios/yinmeng-ios/Main/{Mew => }/Party/Protocol/MewPartyProtocol.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{Mew => }/Party/View/MewPartyListCollectionViewCell.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{Mew => }/Party/View/MewPartyListCollectionViewCell.m (96%) rename yinmeng-ios/yinmeng-ios/Main/{Mew => }/Party/View/MewPartyViewController.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{Mew => }/Party/View/MewPartyViewController.m (97%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Room/Api/Api+Room.h (98%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Room/Api/Api+Room.m (88%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Room/Model/MewRoomInfoModel.h (82%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Room/Model/MewRoomInfoModel.m (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Room/Presenter/MewRoomPresenter.h (97%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Room/Presenter/MewRoomPresenter.m (87%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Room/Protocol/MewRoomProtocol.h (85%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => Room}/RTC/Impl/MewBaseRtcImpl.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => Room}/RTC/Impl/MewBaseRtcImpl.m (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => Room}/RTC/Impl/MewRtcImplDelegate.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => Room}/RTC/Impl/MewRtcInterface.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => Room}/RTC/Impl/MewTRTCRtcImpl.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => Room}/RTC/Impl/MewTRTCRtcImpl.m (96%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => Room}/RTC/MewRtcDelegate.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => Room}/RTC/MewRtcManager.h (97%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => Room}/RTC/MewRtcManager.m (97%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Room/View/AnimationView/MewRoomAnimationGroup.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Room/View/AnimationView/MewRoomAnimationGroup.m (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Room/View/AnimationView/MewRoomAnimationHitView.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Room/View/AnimationView/MewRoomAnimationHitView.m (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Room/View/AnimationView/MewRoomAnimationView.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Room/View/AnimationView/MewRoomAnimationView.m (97%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Room/View/AnimationView/YMRoomGiftAnimationParser.m (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Room/View/MEWThemeColor+MEWRoom.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Room/View/MEWThemeColor+MEWRoom.m (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Room/View/MenuContainerView/MewRoomSendTextView.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Room/View/MenuContainerView/MewRoomSendTextView.m (95%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Room/View/MessageContainerView/MewRoomMessageContainerView.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Room/View/MessageContainerView/MewRoomMessageContainerView.m (99%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Room/View/MessageContainerView/MewRoomMessageHeaderView.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Room/View/MessageContainerView/MewRoomMessageHeaderView.m (99%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Room/View/MessageContainerView/Model/MewMessageInfoModel.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Room/View/MessageContainerView/Model/MewMessageInfoModel.m (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Room/View/MessageContainerView/Model/MewMessageRemoteExtModel.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Room/View/MessageContainerView/Model/MewMessageRemoteExtModel.m (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Room/View/MessageContainerView/Tool/MewRoomMessageConstant.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Room/View/MessageContainerView/Tool/MewRoomMessageFilter.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Room/View/MessageContainerView/Tool/MewRoomMessageFilter.m (55%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Room/View/MessageContainerView/Tool/MewRoomMessageParser.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Room/View/MessageContainerView/Tool/MewRoomMessageParser.m (97%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Room/View/MessageContainerView/View/MewNetImageLabel.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Room/View/MessageContainerView/View/MewNetImageLabel.m (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Room/View/MewMicroQueueProtocol.h (71%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Room/View/MewRoomAnimationProtocol.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Room/View/MewRoomGuestDelegate.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Room/View/MewRoomHostDelegate.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{Mew/Room/View => Room/View/MewView}/MewRoomViewController.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{Mew/Room/View => Room/View/MewView}/MewRoomViewController.m (95%) rename yinmeng-ios/yinmeng-ios/Main/{Mew/Room/View => Room/View/MewView}/RoomHeaderView/MewRoomHeaderView.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{Mew/Room/View => Room/View/MewView}/RoomHeaderView/MewRoomHeaderView.m (96%) rename yinmeng-ios/yinmeng-ios/Main/{Mew/Room/View => Room/View/MewView}/RoomMessageView/MewRoomMessageTableCell.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{Mew/Room/View => Room/View/MewView}/RoomMessageView/MewRoomMessageTableCell.m (98%) rename yinmeng-ios/yinmeng-ios/Main/{Mew/Room/View => Room/View/MewView}/RoomRightView/MewRoomRightView.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{Mew/Room/View => Room/View/MewView}/RoomRightView/MewRoomRightView.m (100%) rename yinmeng-ios/yinmeng-ios/Main/{Mew/Room/View => Room/View/MewView}/RoomStageView/MewSocialStageView.h (66%) rename yinmeng-ios/yinmeng-ios/Main/{Mew/Room/View => Room/View/MewView}/RoomStageView/MewSocialStageView.m (85%) rename yinmeng-ios/yinmeng-ios/Main/{Mew/Room/View => Room/View/MewView}/RoomStageView/RoomMicroView/MewSocialMicroView.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{Mew/Room/View => Room/View/MewView}/RoomStageView/RoomMicroView/MewSocialMicroView.m (76%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng/Room/View/StageView/CHStageView.h => Room/View/StageView/MewStageView.h} (53%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng/Room/View/StageView/CHStageView.m => Room/View/StageView/MewStageView.m} (77%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Room/View/StageView/MicroView/MicroView.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Room/View/StageView/MicroView/MicroView.m (85%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng => }/Room/View/StageView/MicroView/MicroViewProtocol.h (57%) rename yinmeng-ios/yinmeng-ios/Main/{YinMeng/Room/View/StageView/Model/MicroExtModel.h => Room/View/StageView/Model/MewMicroExtModel.h} (92%) create mode 100644 yinmeng-ios/yinmeng-ios/Main/Room/View/StageView/Model/MewMicroExtModel.m rename yinmeng-ios/yinmeng-ios/Main/{YinMeng/Room/View/StageView/Model/MicroQueueModel.h => Room/View/StageView/Model/MewMicroQueueModel.h} (64%) create mode 100644 yinmeng-ios/yinmeng-ios/Main/Room/View/StageView/Model/MewMicroQueueModel.m create mode 100644 yinmeng-ios/yinmeng-ios/Main/Room/View/StageView/Model/MewMicroStateModel.h create mode 100644 yinmeng-ios/yinmeng-ios/Main/Room/View/StageView/Model/MewMicroStateModel.m rename yinmeng-ios/yinmeng-ios/Main/{ => WebView}/MewWebViewController.h (100%) rename yinmeng-ios/yinmeng-ios/Main/{ => WebView}/MewWebViewController.m (98%) delete mode 100644 yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/StageView/Model/MicroExtModel.m delete mode 100644 yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/StageView/Model/MicroQueueModel.m delete mode 100644 yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/StageView/Model/MicroStateModel.h delete mode 100644 yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/StageView/Model/MicroStateModel.m 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 207f3d7..dd59331 100644 --- a/yinmeng-ios/yinmeng-ios.xcodeproj/project.pbxproj +++ b/yinmeng-ios/yinmeng-ios.xcodeproj/project.pbxproj @@ -77,7 +77,7 @@ 237054852B1F3B3200F5DE14 /* NetImageConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 237053FE2B1F3B3200F5DE14 /* NetImageConfig.m */; }; 237054862B1F3B3200F5DE14 /* NetImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 237054022B1F3B3200F5DE14 /* NetImageView.m */; }; 237054872B1F3B3200F5DE14 /* MewButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 237054042B1F3B3200F5DE14 /* MewButton.m */; }; - 237054882B1F3B3200F5DE14 /* YMEmptyTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 237054082B1F3B3200F5DE14 /* YMEmptyTableViewCell.m */; }; + 237054882B1F3B3200F5DE14 /* MewEmptyTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 237054082B1F3B3200F5DE14 /* MewEmptyTableViewCell.m */; }; 237054892B1F3B3200F5DE14 /* TTPopup.m in Sources */ = {isa = PBXBuildFile; fileRef = 2370540B2B1F3B3200F5DE14 /* TTPopup.m */; }; 2370548A2B1F3B3200F5DE14 /* TTAlertConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 2370540D2B1F3B3200F5DE14 /* TTAlertConfig.m */; }; 2370548B2B1F3B3200F5DE14 /* TTAlertButtonConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 237054122B1F3B3200F5DE14 /* TTAlertButtonConfig.m */; }; @@ -97,11 +97,11 @@ 237054A52B1F3B3200F5DE14 /* DESEncrypt.m in Sources */ = {isa = PBXBuildFile; fileRef = 2370545D2B1F3B3200F5DE14 /* DESEncrypt.m */; }; 237054A62B1F3B3200F5DE14 /* MEWBase64.m in Sources */ = {isa = PBXBuildFile; fileRef = 2370545E2B1F3B3200F5DE14 /* MEWBase64.m */; }; 237054A72B1F3B3200F5DE14 /* MewHUDTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 2370545F2B1F3B3200F5DE14 /* MewHUDTool.m */; }; - 237054A82B1F3B3200F5DE14 /* MEWTimer.m in Sources */ = {isa = PBXBuildFile; fileRef = 237054612B1F3B3200F5DE14 /* MEWTimer.m */; }; - 237054A92B1F3B3200F5DE14 /* NewEncryptTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 237054642B1F3B3200F5DE14 /* NewEncryptTool.m */; }; - 237054AA2B1F3B3200F5DE14 /* MEWGCDHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 237054682B1F3B3200F5DE14 /* MEWGCDHelper.m */; }; - 237054AB2B1F3B3200F5DE14 /* MEWThemeColor.m in Sources */ = {isa = PBXBuildFile; fileRef = 2370546B2B1F3B3200F5DE14 /* MEWThemeColor.m */; }; - 237054AC2B1F3B3200F5DE14 /* MEWRechargeStorage.m in Sources */ = {isa = PBXBuildFile; fileRef = 2370546E2B1F3B3200F5DE14 /* MEWRechargeStorage.m */; }; + 237054A82B1F3B3200F5DE14 /* MewTimer.m in Sources */ = {isa = PBXBuildFile; fileRef = 237054612B1F3B3200F5DE14 /* MewTimer.m */; }; + 237054A92B1F3B3200F5DE14 /* MewEncryptTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 237054642B1F3B3200F5DE14 /* MewEncryptTool.m */; }; + 237054AA2B1F3B3200F5DE14 /* MewGCDHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 237054682B1F3B3200F5DE14 /* MewGCDHelper.m */; }; + 237054AB2B1F3B3200F5DE14 /* MewThemeColor.m in Sources */ = {isa = PBXBuildFile; fileRef = 2370546B2B1F3B3200F5DE14 /* MewThemeColor.m */; }; + 237054AC2B1F3B3200F5DE14 /* MewRechargeStorage.m in Sources */ = {isa = PBXBuildFile; fileRef = 2370546E2B1F3B3200F5DE14 /* MewRechargeStorage.m */; }; 237054AD2B1F3B3200F5DE14 /* YYReachability.m in Sources */ = {isa = PBXBuildFile; fileRef = 237054722B1F3B3200F5DE14 /* YYReachability.m */; }; 237054AE2B1F3B3200F5DE14 /* NSObject+MEWExtension.m in Sources */ = {isa = PBXBuildFile; fileRef = 237054742B1F3B3200F5DE14 /* NSObject+MEWExtension.m */; }; 237054AF2B1F3B3200F5DE14 /* MewPaymentAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 237054772B1F3B3200F5DE14 /* MewPaymentAction.swift */; }; @@ -136,11 +136,11 @@ 8C9C841B2B0C697A00A601BC /* MewRoomPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C82F02B0C697A00A601BC /* MewRoomPresenter.m */; }; 8C9C841C2B0C697A00A601BC /* MewRoomInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C82F52B0C697A00A601BC /* MewRoomInfoModel.m */; }; 8C9C841E2B0C697A00A601BC /* MewRoomSendTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C82FB2B0C697A00A601BC /* MewRoomSendTextView.m */; }; - 8C9C841F2B0C697A00A601BC /* CHStageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C82FE2B0C697A00A601BC /* CHStageView.m */; }; + 8C9C841F2B0C697A00A601BC /* MewStageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C82FE2B0C697A00A601BC /* MewStageView.m */; }; 8C9C84202B0C697A00A601BC /* MicroView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83022B0C697A00A601BC /* MicroView.m */; }; - 8C9C84212B0C697A00A601BC /* MicroQueueModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83052B0C697A00A601BC /* MicroQueueModel.m */; }; - 8C9C84222B0C697A00A601BC /* MicroExtModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83062B0C697A00A601BC /* MicroExtModel.m */; }; - 8C9C84232B0C697A00A601BC /* MicroStateModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83072B0C697A00A601BC /* MicroStateModel.m */; }; + 8C9C84212B0C697A00A601BC /* MewMicroQueueModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83052B0C697A00A601BC /* MewMicroQueueModel.m */; }; + 8C9C84222B0C697A00A601BC /* MewMicroExtModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83062B0C697A00A601BC /* MewMicroExtModel.m */; }; + 8C9C84232B0C697A00A601BC /* MewMicroStateModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83072B0C697A00A601BC /* MewMicroStateModel.m */; }; 8C9C84242B0C697A00A601BC /* MewRoomMessageContainerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C830E2B0C697A00A601BC /* MewRoomMessageContainerView.m */; }; 8C9C84252B0C697A00A601BC /* MewMessageInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83112B0C697A00A601BC /* MewMessageInfoModel.m */; }; 8C9C84262B0C697A00A601BC /* MewMessageRemoteExtModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83122B0C697A00A601BC /* MewMessageRemoteExtModel.m */; }; @@ -244,8 +244,8 @@ 237053162B1F3A5300F5DE14 /* Api+MewMain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Api+MewMain.h"; sourceTree = ""; }; 237053182B1F3A5D00F5DE14 /* MewClientDataModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewClientDataModel.h; sourceTree = ""; }; 237053192B1F3A5D00F5DE14 /* MewClientDataModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewClientDataModel.m; sourceTree = ""; }; - 2370531B2B1F3A6E00F5DE14 /* MewWebViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MewWebViewController.m; path = Main/MewWebViewController.m; sourceTree = ""; }; - 2370531C2B1F3A6E00F5DE14 /* MewWebViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MewWebViewController.h; path = Main/MewWebViewController.h; sourceTree = ""; }; + 2370531B2B1F3A6E00F5DE14 /* MewWebViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewWebViewController.m; sourceTree = ""; }; + 2370531C2B1F3A6E00F5DE14 /* MewWebViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewWebViewController.h; sourceTree = ""; }; 237053212B1F3AA000F5DE14 /* MewSocialStageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewSocialStageView.h; sourceTree = ""; }; 237053232B1F3AA000F5DE14 /* MewSocialMicroView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewSocialMicroView.m; sourceTree = ""; }; 237053242B1F3AA000F5DE14 /* MewSocialMicroView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewSocialMicroView.h; sourceTree = ""; }; @@ -339,8 +339,8 @@ 237054022B1F3B3200F5DE14 /* NetImageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NetImageView.m; sourceTree = ""; }; 237054042B1F3B3200F5DE14 /* MewButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewButton.m; sourceTree = ""; }; 237054052B1F3B3200F5DE14 /* MewButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewButton.h; sourceTree = ""; }; - 237054072B1F3B3200F5DE14 /* YMEmptyTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YMEmptyTableViewCell.h; sourceTree = ""; }; - 237054082B1F3B3200F5DE14 /* YMEmptyTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YMEmptyTableViewCell.m; sourceTree = ""; }; + 237054072B1F3B3200F5DE14 /* MewEmptyTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewEmptyTableViewCell.h; sourceTree = ""; }; + 237054082B1F3B3200F5DE14 /* MewEmptyTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewEmptyTableViewCell.m; sourceTree = ""; }; 237054092B1F3B3200F5DE14 /* MewBaseNavigationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewBaseNavigationController.h; sourceTree = ""; }; 2370540B2B1F3B3200F5DE14 /* TTPopup.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TTPopup.m; sourceTree = ""; }; 2370540D2B1F3B3200F5DE14 /* TTAlertConfig.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TTAlertConfig.m; sourceTree = ""; }; @@ -384,17 +384,17 @@ 2370545D2B1F3B3200F5DE14 /* DESEncrypt.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DESEncrypt.m; sourceTree = ""; }; 2370545E2B1F3B3200F5DE14 /* MEWBase64.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MEWBase64.m; sourceTree = ""; }; 2370545F2B1F3B3200F5DE14 /* MewHUDTool.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewHUDTool.m; sourceTree = ""; }; - 237054612B1F3B3200F5DE14 /* MEWTimer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MEWTimer.m; sourceTree = ""; }; - 237054622B1F3B3200F5DE14 /* MEWTimer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MEWTimer.h; sourceTree = ""; }; - 237054642B1F3B3200F5DE14 /* NewEncryptTool.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NewEncryptTool.m; sourceTree = ""; }; - 237054652B1F3B3200F5DE14 /* NewEncryptTool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NewEncryptTool.h; sourceTree = ""; }; + 237054612B1F3B3200F5DE14 /* MewTimer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewTimer.m; sourceTree = ""; }; + 237054622B1F3B3200F5DE14 /* MewTimer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewTimer.h; sourceTree = ""; }; + 237054642B1F3B3200F5DE14 /* MewEncryptTool.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewEncryptTool.m; sourceTree = ""; }; + 237054652B1F3B3200F5DE14 /* MewEncryptTool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewEncryptTool.h; sourceTree = ""; }; 237054662B1F3B3200F5DE14 /* NSObject+MEWExtension.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSObject+MEWExtension.h"; sourceTree = ""; }; - 237054682B1F3B3200F5DE14 /* MEWGCDHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MEWGCDHelper.m; sourceTree = ""; }; - 237054692B1F3B3200F5DE14 /* MEWGCDHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MEWGCDHelper.h; sourceTree = ""; }; - 2370546B2B1F3B3200F5DE14 /* MEWThemeColor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MEWThemeColor.m; sourceTree = ""; }; - 2370546C2B1F3B3200F5DE14 /* MEWThemeColor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MEWThemeColor.h; sourceTree = ""; }; - 2370546E2B1F3B3200F5DE14 /* MEWRechargeStorage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MEWRechargeStorage.m; sourceTree = ""; }; - 2370546F2B1F3B3200F5DE14 /* MEWRechargeStorage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MEWRechargeStorage.h; sourceTree = ""; }; + 237054682B1F3B3200F5DE14 /* MewGCDHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewGCDHelper.m; sourceTree = ""; }; + 237054692B1F3B3200F5DE14 /* MewGCDHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewGCDHelper.h; sourceTree = ""; }; + 2370546B2B1F3B3200F5DE14 /* MewThemeColor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewThemeColor.m; sourceTree = ""; }; + 2370546C2B1F3B3200F5DE14 /* MewThemeColor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewThemeColor.h; sourceTree = ""; }; + 2370546E2B1F3B3200F5DE14 /* MewRechargeStorage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewRechargeStorage.m; sourceTree = ""; }; + 2370546F2B1F3B3200F5DE14 /* MewRechargeStorage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewRechargeStorage.h; sourceTree = ""; }; 237054712B1F3B3200F5DE14 /* YYReachability.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YYReachability.h; sourceTree = ""; }; 237054722B1F3B3200F5DE14 /* YYReachability.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YYReachability.m; sourceTree = ""; }; 237054732B1F3B3200F5DE14 /* MewHUDTool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewHUDTool.h; sourceTree = ""; }; @@ -469,17 +469,17 @@ 8C9C82F82B0C697A00A601BC /* MewMicroQueueProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewMicroQueueProtocol.h; sourceTree = ""; }; 8C9C82FB2B0C697A00A601BC /* MewRoomSendTextView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewRoomSendTextView.m; sourceTree = ""; }; 8C9C82FC2B0C697A00A601BC /* MewRoomSendTextView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewRoomSendTextView.h; sourceTree = ""; }; - 8C9C82FE2B0C697A00A601BC /* CHStageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CHStageView.m; sourceTree = ""; }; + 8C9C82FE2B0C697A00A601BC /* MewStageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewStageView.m; sourceTree = ""; }; 8C9C83002B0C697A00A601BC /* MicroView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MicroView.h; sourceTree = ""; }; 8C9C83012B0C697A00A601BC /* MicroViewProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MicroViewProtocol.h; sourceTree = ""; }; 8C9C83022B0C697A00A601BC /* MicroView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MicroView.m; sourceTree = ""; }; - 8C9C83042B0C697A00A601BC /* MicroStateModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MicroStateModel.h; sourceTree = ""; }; - 8C9C83052B0C697A00A601BC /* MicroQueueModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MicroQueueModel.m; sourceTree = ""; }; - 8C9C83062B0C697A00A601BC /* MicroExtModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MicroExtModel.m; sourceTree = ""; }; - 8C9C83072B0C697A00A601BC /* MicroStateModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MicroStateModel.m; sourceTree = ""; }; - 8C9C83082B0C697A00A601BC /* MicroExtModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MicroExtModel.h; sourceTree = ""; }; - 8C9C83092B0C697A00A601BC /* MicroQueueModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MicroQueueModel.h; sourceTree = ""; }; - 8C9C830A2B0C697A00A601BC /* CHStageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CHStageView.h; sourceTree = ""; }; + 8C9C83042B0C697A00A601BC /* MewMicroStateModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewMicroStateModel.h; sourceTree = ""; }; + 8C9C83052B0C697A00A601BC /* MewMicroQueueModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewMicroQueueModel.m; sourceTree = ""; }; + 8C9C83062B0C697A00A601BC /* MewMicroExtModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewMicroExtModel.m; sourceTree = ""; }; + 8C9C83072B0C697A00A601BC /* MewMicroStateModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewMicroStateModel.m; sourceTree = ""; }; + 8C9C83082B0C697A00A601BC /* MewMicroExtModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewMicroExtModel.h; sourceTree = ""; }; + 8C9C83092B0C697A00A601BC /* MewMicroQueueModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewMicroQueueModel.h; sourceTree = ""; }; + 8C9C830A2B0C697A00A601BC /* MewStageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewStageView.h; sourceTree = ""; }; 8C9C830B2B0C697A00A601BC /* MewRoomGuestDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewRoomGuestDelegate.h; sourceTree = ""; }; 8C9C830E2B0C697A00A601BC /* MewRoomMessageContainerView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewRoomMessageContainerView.m; sourceTree = ""; }; 8C9C830F2B0C697A00A601BC /* MewRoomMessageContainerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewRoomMessageContainerView.h; sourceTree = ""; }; @@ -656,6 +656,7 @@ 2337572F2B0CB577001D0B7F /* View */ = { isa = PBXGroup; children = ( + 237053462B1F3AA000F5DE14 /* MewSessionList */, 233757302B0CB577001D0B7F /* NIMViews */, 233757372B0CB577001D0B7F /* Session */, ); @@ -735,27 +736,6 @@ path = Tool; sourceTree = ""; }; - 2370531E2B1F3AA000F5DE14 /* Room */ = { - isa = PBXGroup; - children = ( - 2370531F2B1F3AA000F5DE14 /* View */, - ); - path = Room; - sourceTree = ""; - }; - 2370531F2B1F3AA000F5DE14 /* View */ = { - isa = PBXGroup; - children = ( - 237053202B1F3AA000F5DE14 /* RoomStageView */, - 237053262B1F3AA000F5DE14 /* MewRoomViewController.h */, - 237053272B1F3AA000F5DE14 /* RoomRightView */, - 2370532A2B1F3AA000F5DE14 /* RoomHeaderView */, - 2370532D2B1F3AA000F5DE14 /* RoomMessageView */, - 237053302B1F3AA000F5DE14 /* MewRoomViewController.m */, - ); - path = View; - sourceTree = ""; - }; 237053202B1F3AA000F5DE14 /* RoomStageView */ = { isa = PBXGroup; children = ( @@ -802,47 +782,6 @@ path = RoomMessageView; sourceTree = ""; }; - 237053312B1F3AA000F5DE14 /* Mine */ = { - isa = PBXGroup; - children = ( - 237053322B1F3AA000F5DE14 /* View */, - ); - path = Mine; - sourceTree = ""; - }; - 237053322B1F3AA000F5DE14 /* View */ = { - isa = PBXGroup; - children = ( - 237053332B1F3AA000F5DE14 /* MewRechargeViewController.m */, - 237053342B1F3AA000F5DE14 /* MewMineCollectionViewController.h */, - 237053352B1F3AA000F5DE14 /* MewRechargeSubView.h */, - 237053362B1F3AA000F5DE14 /* MewMineCollectionViewController.m */, - 237053372B1F3AA000F5DE14 /* MewRechargeViewController.h */, - 237053382B1F3AA000F5DE14 /* MewRechargeSubView.m */, - ); - path = View; - sourceTree = ""; - }; - 237053392B1F3AA000F5DE14 /* Login */ = { - isa = PBXGroup; - children = ( - 2370533A2B1F3AA000F5DE14 /* View */, - ); - path = Login; - sourceTree = ""; - }; - 2370533A2B1F3AA000F5DE14 /* View */ = { - isa = PBXGroup; - children = ( - 2370533B2B1F3AA000F5DE14 /* MewLoginViewController.h */, - 2370533C2B1F3AA000F5DE14 /* MewLoginNumberViewController.h */, - 2370533D2B1F3AA000F5DE14 /* SubView */, - 237053422B1F3AA000F5DE14 /* MewLoginNumberViewController.m */, - 237053432B1F3AA000F5DE14 /* MewLoginViewController.m */, - ); - path = View; - sourceTree = ""; - }; 2370533D2B1F3AA000F5DE14 /* SubView */ = { isa = PBXGroup; children = ( @@ -854,23 +793,7 @@ path = SubView; sourceTree = ""; }; - 237053442B1F3AA000F5DE14 /* Message */ = { - isa = PBXGroup; - children = ( - 237053452B1F3AA000F5DE14 /* View */, - ); - path = Message; - sourceTree = ""; - }; - 237053452B1F3AA000F5DE14 /* View */ = { - isa = PBXGroup; - children = ( - 237053462B1F3AA000F5DE14 /* SessionList */, - ); - path = View; - sourceTree = ""; - }; - 237053462B1F3AA000F5DE14 /* SessionList */ = { + 237053462B1F3AA000F5DE14 /* MewSessionList */ = { isa = PBXGroup; children = ( 237053472B1F3AA000F5DE14 /* MewSessionListViewController.h */, @@ -878,7 +801,7 @@ 237053492B1F3AA000F5DE14 /* MewSessionListTableViewCell.h */, 2370534A2B1F3AA000F5DE14 /* MewSessionListViewController.m */, ); - path = SessionList; + path = MewSessionList; sourceTree = ""; }; 2370534B2B1F3AA100F5DE14 /* Party */ = { @@ -1079,8 +1002,8 @@ 237054062B1F3B3200F5DE14 /* EmptyView */ = { isa = PBXGroup; children = ( - 237054072B1F3B3200F5DE14 /* YMEmptyTableViewCell.h */, - 237054082B1F3B3200F5DE14 /* YMEmptyTableViewCell.m */, + 237054072B1F3B3200F5DE14 /* MewEmptyTableViewCell.h */, + 237054082B1F3B3200F5DE14 /* MewEmptyTableViewCell.m */, ); path = EmptyView; sourceTree = ""; @@ -1317,8 +1240,8 @@ 237054602B1F3B3200F5DE14 /* Timer */ = { isa = PBXGroup; children = ( - 237054622B1F3B3200F5DE14 /* MEWTimer.h */, - 237054612B1F3B3200F5DE14 /* MEWTimer.m */, + 237054622B1F3B3200F5DE14 /* MewTimer.h */, + 237054612B1F3B3200F5DE14 /* MewTimer.m */, ); path = Timer; sourceTree = ""; @@ -1326,8 +1249,8 @@ 237054632B1F3B3200F5DE14 /* EncryptTool */ = { isa = PBXGroup; children = ( - 237054642B1F3B3200F5DE14 /* NewEncryptTool.m */, - 237054652B1F3B3200F5DE14 /* NewEncryptTool.h */, + 237054642B1F3B3200F5DE14 /* MewEncryptTool.m */, + 237054652B1F3B3200F5DE14 /* MewEncryptTool.h */, ); path = EncryptTool; sourceTree = ""; @@ -1335,8 +1258,8 @@ 237054672B1F3B3200F5DE14 /* GCDHelper */ = { isa = PBXGroup; children = ( - 237054682B1F3B3200F5DE14 /* MEWGCDHelper.m */, - 237054692B1F3B3200F5DE14 /* MEWGCDHelper.h */, + 237054682B1F3B3200F5DE14 /* MewGCDHelper.m */, + 237054692B1F3B3200F5DE14 /* MewGCDHelper.h */, ); path = GCDHelper; sourceTree = ""; @@ -1344,8 +1267,8 @@ 2370546A2B1F3B3200F5DE14 /* ThemeColor */ = { isa = PBXGroup; children = ( - 2370546B2B1F3B3200F5DE14 /* MEWThemeColor.m */, - 2370546C2B1F3B3200F5DE14 /* MEWThemeColor.h */, + 2370546B2B1F3B3200F5DE14 /* MewThemeColor.m */, + 2370546C2B1F3B3200F5DE14 /* MewThemeColor.h */, ); path = ThemeColor; sourceTree = ""; @@ -1353,8 +1276,8 @@ 2370546D2B1F3B3200F5DE14 /* IAPHelper */ = { isa = PBXGroup; children = ( - 2370546E2B1F3B3200F5DE14 /* MEWRechargeStorage.m */, - 2370546F2B1F3B3200F5DE14 /* MEWRechargeStorage.h */, + 2370546E2B1F3B3200F5DE14 /* MewRechargeStorage.m */, + 2370546F2B1F3B3200F5DE14 /* MewRechargeStorage.h */, ); path = IAPHelper; sourceTree = ""; @@ -1453,11 +1376,8 @@ isa = PBXGroup; children = ( 8C9C84B22B0E94FA00A601BC /* yinmeng-ios.entitlements */, - 8C9C847B2B0C697F00A601BC /* Sources */, + 8C9C83B72B0C697A00A601BC /* ClientConfig */, 8C9C82DE2B0C697A00A601BC /* Main */, - 2370531C2B1F3A6E00F5DE14 /* MewWebViewController.h */, - 2370531B2B1F3A6E00F5DE14 /* MewWebViewController.m */, - 8C9C82DD2B0C697000A601BC /* Library */, 8C9C82D72B0C696900A601BC /* Global */, 8C9C82212B0C695600A601BC /* Base */, 8C9C821A2B0C694900A601BC /* AppDelegate */, @@ -1517,42 +1437,27 @@ path = Global; sourceTree = ""; }; - 8C9C82DD2B0C697000A601BC /* Library */ = { - isa = PBXGroup; - children = ( - ); - path = Library; - sourceTree = ""; - }; 8C9C82DE2B0C697A00A601BC /* Main */ = { isa = PBXGroup; children = ( - 8C9C82E02B0C697A00A601BC /* YinMeng */, - 8C9C83C12B0C697A00A601BC /* Mew */, - 8C9C83AB2B0C697A00A601BC /* Tabbar */, - 8C9C83B62B0C697A00A601BC /* MewParty */, - 8C9C83B72B0C697A00A601BC /* ClientConfig */, - ); - path = Main; - sourceTree = ""; - }; - 8C9C82E02B0C697A00A601BC /* YinMeng */ = { - isa = PBXGroup; - children = ( + 2370535E2B1F3AA100F5DE14 /* Home */, + 2370534B2B1F3AA100F5DE14 /* Party */, 8C9C84802B0D25C700A601BC /* ModuleKit */, 8C9C82EE2B0C697A00A601BC /* Room */, 233757242B0CB577001D0B7F /* Message */, - 8C9C834D2B0C697A00A601BC /* RTC */, 8C9C83582B0C697A00A601BC /* Mine */, 8C9C83822B0C697A00A601BC /* IM */, 8C9C83892B0C697A00A601BC /* Login */, + 8CAB973C2B23A09800ED8639 /* WebView */, + 8C9C83AB2B0C697A00A601BC /* Tabbar */, ); - path = YinMeng; + path = Main; sourceTree = ""; }; 8C9C82EE2B0C697A00A601BC /* Room */ = { isa = PBXGroup; children = ( + 8C9C834D2B0C697A00A601BC /* RTC */, 8C9C82EF2B0C697A00A601BC /* Presenter */, 8C9C82F22B0C697A00A601BC /* Protocol */, 8C9C82F42B0C697A00A601BC /* Model */, @@ -1591,6 +1496,7 @@ 8C9C82F72B0C697A00A601BC /* View */ = { isa = PBXGroup; children = ( + 8CAB973B2B239F4A00ED8639 /* MewView */, 8C9C84912B0D659800A601BC /* AnimationView */, 8C9C82F82B0C697A00A601BC /* MewMicroQueueProtocol.h */, 8C9C82FA2B0C697A00A601BC /* MenuContainerView */, @@ -1617,8 +1523,8 @@ children = ( 8C9C82FF2B0C697A00A601BC /* MicroView */, 8C9C83032B0C697A00A601BC /* Model */, - 8C9C830A2B0C697A00A601BC /* CHStageView.h */, - 8C9C82FE2B0C697A00A601BC /* CHStageView.m */, + 8C9C830A2B0C697A00A601BC /* MewStageView.h */, + 8C9C82FE2B0C697A00A601BC /* MewStageView.m */, ); path = StageView; sourceTree = ""; @@ -1636,12 +1542,12 @@ 8C9C83032B0C697A00A601BC /* Model */ = { isa = PBXGroup; children = ( - 8C9C83042B0C697A00A601BC /* MicroStateModel.h */, - 8C9C83052B0C697A00A601BC /* MicroQueueModel.m */, - 8C9C83062B0C697A00A601BC /* MicroExtModel.m */, - 8C9C83072B0C697A00A601BC /* MicroStateModel.m */, - 8C9C83082B0C697A00A601BC /* MicroExtModel.h */, - 8C9C83092B0C697A00A601BC /* MicroQueueModel.h */, + 8C9C83042B0C697A00A601BC /* MewMicroStateModel.h */, + 8C9C83072B0C697A00A601BC /* MewMicroStateModel.m */, + 8C9C83092B0C697A00A601BC /* MewMicroQueueModel.h */, + 8C9C83052B0C697A00A601BC /* MewMicroQueueModel.m */, + 8C9C83062B0C697A00A601BC /* MewMicroExtModel.m */, + 8C9C83082B0C697A00A601BC /* MewMicroExtModel.h */, ); path = Model; sourceTree = ""; @@ -1796,6 +1702,7 @@ 8C9C836E2B0C697A00A601BC /* View */ = { isa = PBXGroup; children = ( + 8CAB973A2B239F1900ED8639 /* MiewMineView */, 8C92A8152B0EF3CE008F362C /* SubView */, 8C9C836F2B0C697A00A601BC /* CollectRoom */, 8C9C83752B0C697A00A601BC /* Setting */, @@ -1942,6 +1849,7 @@ 8C9C839E2B0C697A00A601BC /* View */ = { isa = PBXGroup; children = ( + 8CAB97392B239ECE00ED8639 /* MewView */, 8C9C83A12B0C697A00A601BC /* MewLoginForgetPasswordViewController.h */, 8C9C839F2B0C697A00A601BC /* MewLoginForgetPasswordViewController.m */, 8C9C83A02B0C697A00A601BC /* MewLoginFullInfoViewController.h */, @@ -1987,13 +1895,6 @@ path = Tabbar; sourceTree = ""; }; - 8C9C83B62B0C697A00A601BC /* MewParty */ = { - isa = PBXGroup; - children = ( - ); - path = MewParty; - sourceTree = ""; - }; 8C9C83B72B0C697A00A601BC /* ClientConfig */ = { isa = PBXGroup; children = ( @@ -2023,26 +1924,6 @@ path = Api; sourceTree = ""; }; - 8C9C83C12B0C697A00A601BC /* Mew */ = { - isa = PBXGroup; - children = ( - 2370535E2B1F3AA100F5DE14 /* Home */, - 237053392B1F3AA000F5DE14 /* Login */, - 237053442B1F3AA000F5DE14 /* Message */, - 237053312B1F3AA000F5DE14 /* Mine */, - 2370534B2B1F3AA100F5DE14 /* Party */, - 2370531E2B1F3AA000F5DE14 /* Room */, - ); - path = Mew; - sourceTree = ""; - }; - 8C9C847B2B0C697F00A601BC /* Sources */ = { - isa = PBXGroup; - children = ( - ); - path = Sources; - sourceTree = ""; - }; 8C9C84802B0D25C700A601BC /* ModuleKit */ = { isa = PBXGroup; children = ( @@ -2103,6 +1984,53 @@ path = Presenter; sourceTree = ""; }; + 8CAB97392B239ECE00ED8639 /* MewView */ = { + isa = PBXGroup; + children = ( + 2370533B2B1F3AA000F5DE14 /* MewLoginViewController.h */, + 2370533C2B1F3AA000F5DE14 /* MewLoginNumberViewController.h */, + 2370533D2B1F3AA000F5DE14 /* SubView */, + 237053422B1F3AA000F5DE14 /* MewLoginNumberViewController.m */, + 237053432B1F3AA000F5DE14 /* MewLoginViewController.m */, + ); + path = MewView; + sourceTree = ""; + }; + 8CAB973A2B239F1900ED8639 /* MiewMineView */ = { + isa = PBXGroup; + children = ( + 237053332B1F3AA000F5DE14 /* MewRechargeViewController.m */, + 237053342B1F3AA000F5DE14 /* MewMineCollectionViewController.h */, + 237053352B1F3AA000F5DE14 /* MewRechargeSubView.h */, + 237053362B1F3AA000F5DE14 /* MewMineCollectionViewController.m */, + 237053372B1F3AA000F5DE14 /* MewRechargeViewController.h */, + 237053382B1F3AA000F5DE14 /* MewRechargeSubView.m */, + ); + path = MiewMineView; + sourceTree = ""; + }; + 8CAB973B2B239F4A00ED8639 /* MewView */ = { + isa = PBXGroup; + children = ( + 237053202B1F3AA000F5DE14 /* RoomStageView */, + 237053262B1F3AA000F5DE14 /* MewRoomViewController.h */, + 237053272B1F3AA000F5DE14 /* RoomRightView */, + 2370532A2B1F3AA000F5DE14 /* RoomHeaderView */, + 2370532D2B1F3AA000F5DE14 /* RoomMessageView */, + 237053302B1F3AA000F5DE14 /* MewRoomViewController.m */, + ); + path = MewView; + sourceTree = ""; + }; + 8CAB973C2B23A09800ED8639 /* WebView */ = { + isa = PBXGroup; + children = ( + 2370531C2B1F3A6E00F5DE14 /* MewWebViewController.h */, + 2370531B2B1F3A6E00F5DE14 /* MewWebViewController.m */, + ); + path = WebView; + sourceTree = ""; + }; B603F71B608343F0E1A79C4B /* Frameworks */ = { isa = PBXGroup; children = ( @@ -2257,12 +2185,12 @@ 8C9C821F2B0C694900A601BC /* AppDelegate.m in Sources */, 8C92A8182B0EF3E9008F362C /* MewMineModifPayPwdView.m in Sources */, 237053F12B1F3B1700F5DE14 /* MewHtmlUrl.m in Sources */, - 237054A92B1F3B3200F5DE14 /* NewEncryptTool.m in Sources */, - 237054A82B1F3B3200F5DE14 /* MEWTimer.m in Sources */, + 237054A92B1F3B3200F5DE14 /* MewEncryptTool.m in Sources */, + 237054A82B1F3B3200F5DE14 /* MewTimer.m in Sources */, 2370547F2B1F3B3200F5DE14 /* UIView+MewFilletCorner.m in Sources */, 8C9C84462B0C697A00A601BC /* MewMineSettingViewController.m in Sources */, - 237054882B1F3B3200F5DE14 /* YMEmptyTableViewCell.m in Sources */, - 237054AA2B1F3B3200F5DE14 /* MEWGCDHelper.m in Sources */, + 237054882B1F3B3200F5DE14 /* MewEmptyTableViewCell.m in Sources */, + 237054AA2B1F3B3200F5DE14 /* MewGCDHelper.m in Sources */, 237054872B1F3B3200F5DE14 /* MewButton.m in Sources */, 237053142B1F3A3D00F5DE14 /* MewClientConfig.m in Sources */, 8C9C843D2B0C697A00A601BC /* MewMineCollectRoomPresenter.m in Sources */, @@ -2284,7 +2212,7 @@ 8CAB96F52B1AB15200ED8639 /* MewRoomAnimationGroup.m in Sources */, 237054B12B1F3B3200F5DE14 /* UIButton+MewEnlargeTouchArea.m in Sources */, 237054E72B204F1000F5DE14 /* MewUtility+MewApp.m in Sources */, - 237054AC2B1F3B3200F5DE14 /* MEWRechargeStorage.m in Sources */, + 237054AC2B1F3B3200F5DE14 /* MewRechargeStorage.m in Sources */, 237053962B1F3AA100F5DE14 /* Api+MewParty.m in Sources */, 237054812B1F3B3200F5DE14 /* MewStackManager.m in Sources */, 8C92A80E2B0EEF3A008F362C /* MewLoginBindPhoneViewController.m in Sources */, @@ -2312,7 +2240,7 @@ 237054A42B1F3B3200F5DE14 /* MewTimeIntervalUtils.m in Sources */, 233757562B0CB577001D0B7F /* MewMessagePresenter.m in Sources */, 8C9C84512B0C697A00A601BC /* MewLoginPasswordPresent.m in Sources */, - 8C9C841F2B0C697A00A601BC /* CHStageView.m in Sources */, + 8C9C841F2B0C697A00A601BC /* MewStageView.m in Sources */, 237054C32B20179800F5DE14 /* MewAccountInfoStorage.m in Sources */, 237053892B1F3AA100F5DE14 /* MewMineCollectionViewController.m in Sources */, 8C9C844D2B0C697A00A601BC /* MewLoginForgetPasswordPresent.m in Sources */, @@ -2324,10 +2252,10 @@ 237053A32B1F3AA100F5DE14 /* MewRightFollowVoiceCollectionCell.m in Sources */, 8C9C84402B0C697A00A601BC /* MewMineSettingItemModel.m in Sources */, 237054AE2B1F3B3200F5DE14 /* NSObject+MEWExtension.m in Sources */, - 8C9C84232B0C697A00A601BC /* MicroStateModel.m in Sources */, - 8C9C84212B0C697A00A601BC /* MicroQueueModel.m in Sources */, + 8C9C84232B0C697A00A601BC /* MewMicroStateModel.m in Sources */, + 8C9C84212B0C697A00A601BC /* MewMicroQueueModel.m in Sources */, 8C9C844F2B0C697A00A601BC /* MewLoginFullInfoPresenter.m in Sources */, - 8C9C84222B0C697A00A601BC /* MicroExtModel.m in Sources */, + 8C9C84222B0C697A00A601BC /* MewMicroExtModel.m in Sources */, 8C9C843C2B0C697A00A601BC /* MewRtcManager.m in Sources */, 8C9C84BA2B0ECD2100A601BC /* MewMineRechargePresenter.m in Sources */, 2370538C2B1F3AA100F5DE14 /* MewLoginPasswordView.m in Sources */, @@ -2391,7 +2319,7 @@ 8C9C84902B0D439800A601BC /* MewRoomMessageFilter.m in Sources */, 237054E42B204ED000F5DE14 /* MewUtility.m in Sources */, 8C92A8072B0EEDD0008F362C /* MewLoginVerifBindPhoneViewController.m in Sources */, - 237054AB2B1F3B3200F5DE14 /* MEWThemeColor.m in Sources */, + 237054AB2B1F3B3200F5DE14 /* MewThemeColor.m in Sources */, 8C9C84412B0C697A00A601BC /* MewMineCollectRoomModel.m in Sources */, 2370548D2B1F3B3200F5DE14 /* TTActionSheetConfig.m in Sources */, 2370538A2B1F3AA100F5DE14 /* MewRechargeSubView.m in Sources */, diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/Mine/mine_setting_modif_pay_pwd_hidden.imageset/Contents.json b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/Mine/mine_setting_modif_pay_pwd_hidden.imageset/Contents.json new file mode 100644 index 0000000..777e892 --- /dev/null +++ b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/Mine/mine_setting_modif_pay_pwd_hidden.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "mine_setting_modif_pay_pwd_hidden@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "mine_setting_modif_pay_pwd_hidden@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/Mine/mine_setting_modif_pay_pwd_hidden.imageset/mine_setting_modif_pay_pwd_hidden@2x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/Mine/mine_setting_modif_pay_pwd_hidden.imageset/mine_setting_modif_pay_pwd_hidden@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..71f4259525d623f96c83b56425141261ed528ca0 GIT binary patch literal 385 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Ew!3-qLWqbvIRCs_-h%1o3c<~Y#UA%nx3Yc;E z;>F9CE?v5C;R+A{84v&z1j=3pD!Ovz{Q2`h_N7Z8l@JDy1JMg%_-)I$2(qsv$S;`T z*K|L%k1x0B@w2)*bfkq^N^{;hRFxO&ae2++Nm&c*fa>;ox;TbtoIiWXQ>a-%fHlCN zNuilB{qJ}C^p3)&OQ){wfAwm6Muq~v-@oJWTlQv6Pg?P-rqE%j)^4>efm7_y3w?XG z`n%q%hAjr)j)^j7X*+MNwtIE>{=#${%iReJ-k+6aU+eK?$sERa*U}ijbhi6AY~+hr zb)_@qfYlPlkVlGa8Qb<6U$FTqmhiioXNJ&sNeBPaay3s<;~(#csIgO@GS`w}oqlYA z&cc~Jv70vcuT{=8;q@!Ie$(spZ2NC_Y8ak6^1ZpX_2nC&M;JU^{an^LB{Ts5501e% literal 0 HcmV?d00001 diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/Mine/mine_setting_modif_pay_pwd_hidden.imageset/mine_setting_modif_pay_pwd_hidden@3x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/Mine/mine_setting_modif_pay_pwd_hidden.imageset/mine_setting_modif_pay_pwd_hidden@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..01ce2de5343235d163e9ae0efe2885416b635211 GIT binary patch literal 610 zcmeAS@N?(olHy`uVBq!ia0vp^20*OE!3-o1P1NuJQbhqiA+A9B`0*3x&tJH3;o_xB zmoHwtboT5yAPGc3L5RqO3zvY>=gyr2a)HXg=)&d8SAc3DT!=D=mJ1gy-@bhts0CsO zm~j!P`0CYbH*Va#ef!SWzUH++Ta`+J{DK)+?Ry@*5}bcR`pdTRP}N_l@nUcHn%}=N zv93s;XZ5lvt=Zw9=1*W?V663YaSZV|{&vdsNzDd4u7;e;$|JmX>HPn%zm7-o+omZe zedLPg9k3F*E_dwObpC_)zP#O5alSld$Mu614}aT9|6R;bX`6py`Ho`k^_lN#J~7_9 z+VITz7t|vm{GW)X(4h>P4IXKel@_>-;C3FLP{G zB?%mh5l#R6+2E&n{LcqR4|jiS{S+zYaen@94gr@tA4=!-$h8Gu-q6hucx;-beB5u{ z6GBR_N5=~7Jv)7szZr;JMjb{AK%7O5tz{@VKayDY;`uA^12 z*8j-aKXIldpU2Cu;06oo4&9w{G5ss6$lEjO(>|&68w6-O?tk?9XW1P0b>%*)x(^Juefy)s z;KZQlZNBl_CzmJv3yN2-6-}!6rNgwc>hdMd%_)!Xbzopr0B6oU_y7O^ literal 0 HcmV?d00001 diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/Mine/mine_setting_modif_pay_pwd_show.imageset/Contents.json b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/Mine/mine_setting_modif_pay_pwd_show.imageset/Contents.json new file mode 100644 index 0000000..6ec156d --- /dev/null +++ b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/Mine/mine_setting_modif_pay_pwd_show.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "mine_setting_modif_pay_pwd_show@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "mine_setting_modif_pay_pwd_show@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/Mine/mine_setting_modif_pay_pwd_show.imageset/mine_setting_modif_pay_pwd_show@2x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/Mine/mine_setting_modif_pay_pwd_show.imageset/mine_setting_modif_pay_pwd_show@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..505763c22687d035d2f3e7290d14edd033294312 GIT binary patch literal 288 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Ew!3-qLWqbvIlx2WVh%1o31O^u`UIL;sXU<#% zfy+Py6b6a_!BsE-iU4UK_re9B>?N7^NB#gc3zY=<1v7j*a6Oa5Y}wq(Z4N3T&*iQK zrCJ^60m`;`x;TbtoWDEKo$r7F2g|{|OMdxgZV;bHzB`mP@6 O9tKZWKbLh*2~7YcK8HmB literal 0 HcmV?d00001 diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/Mine/mine_setting_modif_pay_pwd_show.imageset/mine_setting_modif_pay_pwd_show@3x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/Mine/mine_setting_modif_pay_pwd_show.imageset/mine_setting_modif_pay_pwd_show@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..d007e4753fa9a161064da0924d6e6c6076d8f4a9 GIT binary patch literal 486 zcmeAS@N?(olHy`uVBq!ia0vp^20*OE!3-o1P1NuJQpo{6A+A9B;>AmsFJA$Ymo8no zaN#0^ec{4|qeqVd1rHuP2v%?zC=C<@D+97GpFe-`^yy1iu3QC*fP}&1xpP1zmw+4~ z2~>0K+Vz_^Z@Npad;_#bt|Z7WnBmofeUgqpHY;-nvwfV9n{eZBW0mm7^K(0V^;epu z`%HSR&%nSa;_2cT;&J@#l$%9|6?j~=4IWf5zK;%C{Qv(cr4`nBv&|M?_xbY3QD&ib z7)rUBpG>6jF)?`b9dN_zj9}**R0d~&n|D(SaINGx5loA`uj4<{B;(s zV_3ko<$m*O&3E1JOONa|IQ@H7Ue?ylYbM0(+8^wdrnK(ttoeL5tpx9?{Z@@vN;O}# zBte^TNpC<{aMF~+{IEra4_$#IQa*R9G=Y=z5TWW3JF9-!0MeE0=ff zU)riF*PxX1DQAlF?%;#I3C9*!8olvan!+*J{qS*tyEUS5*RJgO7vX4O-w~|HK4tzn zJBEnqZy468h$7S=Mu|A3me5QP$HZAU(%s0kEEc%7D>ythJLz2PM L)z4*}Q$iB}7Ax}9 literal 0 HcmV?d00001 diff --git a/yinmeng-ios/yinmeng-ios/Base/MVP/Api/Api.h b/yinmeng-ios/yinmeng-ios/Base/MVP/Api/Api.h index a86498d..32d6d45 100644 --- a/yinmeng-ios/yinmeng-ios/Base/MVP/Api/Api.h +++ b/yinmeng-ios/yinmeng-ios/Base/MVP/Api/Api.h @@ -24,25 +24,25 @@ NS_ASSUME_NONNULL_BEGIN /// 获取用户信息 /// @param completion 请求完成 /// @param uid 用户id -+ (void)getUserInfo:(MewHttpRequestHelperCompletion)completion uid:(NSString *)uid; ++ (void)Mew_GetUserInfo:(MewHttpRequestHelperCompletion)completion uid:(NSString *)uid; /// 获取手机号的验证码 /// @param completion 请求完成 /// @param mobile 手机号 /// @param type 类型 请看XPEunm中的枚举 -+ (void)mew_phoneSmsCode:(MewHttpRequestHelperCompletion)completion mobile:(NSString *)mobile type:(NSString *)type; ++ (void)Mew_PhoneSmsCode:(MewHttpRequestHelperCompletion)completion mobile:(NSString *)mobile type:(NSString *)type; /// 批量验证 /// @param complection 完成 /// @param transcationIdStr 需要验证的数据 -+ (void)requestCheckTranscationIds:(MewHttpRequestHelperCompletion)complection ++ (void)Mew_RequestCheckTranscationIds:(MewHttpRequestHelperCompletion)complection transcationIdStr:(NSString *)transcationIdStr; /// 补全用户资料 /// @param complection 完成 /// @param userInfo 需要更新的用户信息 -+ (void)mew_completeUserInfo:(MewHttpRequestHelperCompletion)complection ++ (void)Mew_CompleteUserInfo:(MewHttpRequestHelperCompletion)complection userInfo:(NSDictionary *)userInfo; /// 获取用户钱包余额信息 @@ -50,7 +50,7 @@ NS_ASSUME_NONNULL_BEGIN /// @param uid 用户uid /// @param ticket ticketg -+ (void)mew_getUserWalletInfo:(MewHttpRequestHelperCompletion)complection ++ (void)Mew_GetUserWalletInfo:(MewHttpRequestHelperCompletion)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 b8d51ed..da0755e 100644 --- a/yinmeng-ios/yinmeng-ios/Base/MVP/Api/Api.m +++ b/yinmeng-ios/yinmeng-ios/Base/MVP/Api/Api.m @@ -6,7 +6,7 @@ // #import "Api.h" -#import "NewEncryptTool.h" +#import "MewEncryptTool.h" @implementation Api + (void)makeRequest:(NSString *)route method:(MewHttpRequestHelperMethod)method completion:(MewHttpRequestHelperCompletion)completion, ... { @@ -44,17 +44,17 @@ } /// 获取用户信息 -+ (void)getUserInfo:(MewHttpRequestHelperCompletion)completion uid:(NSString *)uid { - NSString *getUrl = [NewEncryptTool MEW_aesDecrypt:@"KEMxFkjgYfZuaj0tYsUeqQ=="];///user/get ++ (void)Mew_GetUserInfo:(MewHttpRequestHelperCompletion)completion uid:(NSString *)uid { + NSString *getUrl = [MewEncryptTool MEW_aesDecrypt:@"KEMxFkjgYfZuaj0tYsUeqQ=="];///user/get [self makeRequest:getUrl method:MewHttpRequestHelperMethodGET completion:completion, __FUNCTION__, uid, nil]; } /// 批量验证 /// @param complection 完成 /// @param transcationIdStr 需要验证的数据 -+ (void)requestCheckTranscationIds:(MewHttpRequestHelperCompletion)complection ++ (void)Mew_RequestCheckTranscationIds:(MewHttpRequestHelperCompletion)complection transcationIdStr:(NSString *)transcationIdStr { - NSString *getUrl = [NewEncryptTool MEW_aesDecrypt:@"AC1UrTdJJWq1b8dtUCnP4zFOik6EzK85rr1GEjLv2Kk="];///verify/checkIOSChargeRecord + NSString *getUrl = [MewEncryptTool MEW_aesDecrypt:@"AC1UrTdJJWq1b8dtUCnP4zFOik6EzK85rr1GEjLv2Kk="];///verify/checkIOSChargeRecord [self makeRequest:getUrl method:MewHttpRequestHelperMethodPOST completion:complection, __FUNCTION__,transcationIdStr, nil]; } @@ -62,17 +62,17 @@ /// @param completion 请求完成 /// @param mobile 手机号 /// @param type 类型 请看XPEunm中的枚举 -+ (void)mew_phoneSmsCode:(MewHttpRequestHelperCompletion)completion mobile:(NSString *)mobile type:(NSString *)type { - NSString *getUrl = [NewEncryptTool MEW_aesDecrypt:@"2Hx71goXCYG6r1fVVkSHsA=="];///sms/getCode ++ (void)Mew_PhoneSmsCode:(MewHttpRequestHelperCompletion)completion mobile:(NSString *)mobile type:(NSString *)type { + NSString *getUrl = [MewEncryptTool MEW_aesDecrypt:@"2Hx71goXCYG6r1fVVkSHsA=="];///sms/getCode [self makeRequest:getUrl method:MewHttpRequestHelperMethodPOST completion:completion, __FUNCTION__, mobile, type, nil]; } /// 补全用户资料 /// @param complection 完成 /// @param userInfo 需要更新的用户信息 -+ (void)mew_completeUserInfo:(MewHttpRequestHelperCompletion)complection ++ (void)Mew_CompleteUserInfo:(MewHttpRequestHelperCompletion)complection userInfo:(NSDictionary *)userInfo { - NSString *getUrl = [NewEncryptTool MEW_aesDecrypt:@"6A7+MXSz6a7RbsOb9Ls+mA=="];///user/v2/update + NSString *getUrl = [MewEncryptTool MEW_aesDecrypt:@"6A7+MXSz6a7RbsOb9Ls+mA=="];///user/v2/update [MewHttpRequestHelper request:getUrl method:MewHttpRequestHelperMethodPOST params:userInfo completion:complection]; } @@ -81,10 +81,10 @@ /// @param complection 完成 /// @param uid 用户uid /// @param ticket ticketg -+ (void)mew_getUserWalletInfo:(MewHttpRequestHelperCompletion)complection ++ (void)Mew_GetUserWalletInfo:(MewHttpRequestHelperCompletion)complection uid:(NSString *)uid ticket:(NSString *)ticket { - NSString *getUrl = [NewEncryptTool MEW_aesDecrypt:@"7xFYk5dOEOCLb2Sfp0mwZw=="];//purse/query + NSString *getUrl = [MewEncryptTool MEW_aesDecrypt:@"7xFYk5dOEOCLb2Sfp0mwZw=="];//purse/query [self makeRequest:getUrl method:MewHttpRequestHelperMethodGET completion:complection, __FUNCTION__, uid, ticket,nil]; } @end diff --git a/yinmeng-ios/yinmeng-ios/Base/MVP/Model/MewAccountInfoStorage.h b/yinmeng-ios/yinmeng-ios/Base/MVP/Model/MewAccountInfoStorage.h index 0b063d4..389af0d 100644 --- a/yinmeng-ios/yinmeng-ios/Base/MVP/Model/MewAccountInfoStorage.h +++ b/yinmeng-ios/yinmeng-ios/Base/MVP/Model/MewAccountInfoStorage.h @@ -29,7 +29,7 @@ NS_ASSUME_NONNULL_BEGIN /// 获取Ticket - (NSString *)mew_getTicket; /// 获取用户id -- (NSString *)getUid; +- (NSString *)mew_getUid; @end diff --git a/yinmeng-ios/yinmeng-ios/Base/MVP/Model/MewAccountInfoStorage.m b/yinmeng-ios/yinmeng-ios/Base/MVP/Model/MewAccountInfoStorage.m index e0a8664..7f3788f 100644 --- a/yinmeng-ios/yinmeng-ios/Base/MVP/Model/MewAccountInfoStorage.m +++ b/yinmeng-ios/yinmeng-ios/Base/MVP/Model/MewAccountInfoStorage.m @@ -77,7 +77,7 @@ static MewAccountInfoStorage *_instance = nil; return self.ticket; } -- (NSString *)getUid { +- (NSString *)mew_getUid { MewAccountModel *am = [self mew_getCurrentAccountInfo]; if (am == nil) { return @""; diff --git a/yinmeng-ios/yinmeng-ios/Base/Net/MewHttpRequestHelper.m b/yinmeng-ios/yinmeng-ios/Base/Net/MewHttpRequestHelper.m index f809587..6832921 100644 --- a/yinmeng-ios/yinmeng-ios/Base/Net/MewHttpRequestHelper.m +++ b/yinmeng-ios/yinmeng-ios/Base/Net/MewHttpRequestHelper.m @@ -14,7 +14,7 @@ #import "MewUtility.h" #import "YYReachability.h" -#import "NewEncryptTool.h" +#import "MewEncryptTool.h" @implementation MewHttpRequestHelper @@ -196,8 +196,8 @@ static BOOL isShowing = NO; + (void)configHeaders { AFHTTPSessionManager *client = [MewHttpRequestHelper requestManager]; - if ([[MewAccountInfoStorage instance] getUid].length > 0) { - [client.requestSerializer setValue:[[MewAccountInfoStorage instance] getUid] forHTTPHeaderField:@"pub_uid"]; + if ([[MewAccountInfoStorage instance] mew_getUid].length > 0) { + [client.requestSerializer setValue:[[MewAccountInfoStorage instance] mew_getUid] forHTTPHeaderField:@"pub_uid"]; } else { [client.requestSerializer setValue:nil forHTTPHeaderField:@"pub_uid"]; } diff --git a/yinmeng-ios/yinmeng-ios/Base/Tool/EncryptTool/NewEncryptTool.h b/yinmeng-ios/yinmeng-ios/Base/Tool/EncryptTool/MewEncryptTool.h similarity index 82% rename from yinmeng-ios/yinmeng-ios/Base/Tool/EncryptTool/NewEncryptTool.h rename to yinmeng-ios/yinmeng-ios/Base/Tool/EncryptTool/MewEncryptTool.h index c4184ae..217b7e5 100644 --- a/yinmeng-ios/yinmeng-ios/Base/Tool/EncryptTool/NewEncryptTool.h +++ b/yinmeng-ios/yinmeng-ios/Base/Tool/EncryptTool/MewEncryptTool.h @@ -1,5 +1,5 @@ // -// NewEncryptTool.h +// MewEncryptTool.h // yinmeng-ios // // Created by duoban on 2023/11/23. @@ -9,7 +9,7 @@ NS_ASSUME_NONNULL_BEGIN -@interface NewEncryptTool : NSObject +@interface MewEncryptTool : NSObject //MARK: AES加解密 + (NSString *)MEW_aesEncrypt:(NSString *)sourceStr; diff --git a/yinmeng-ios/yinmeng-ios/Base/Tool/EncryptTool/NewEncryptTool.m b/yinmeng-ios/yinmeng-ios/Base/Tool/EncryptTool/MewEncryptTool.m similarity index 98% rename from yinmeng-ios/yinmeng-ios/Base/Tool/EncryptTool/NewEncryptTool.m rename to yinmeng-ios/yinmeng-ios/Base/Tool/EncryptTool/MewEncryptTool.m index 072968a..17d006e 100644 --- a/yinmeng-ios/yinmeng-ios/Base/Tool/EncryptTool/NewEncryptTool.m +++ b/yinmeng-ios/yinmeng-ios/Base/Tool/EncryptTool/MewEncryptTool.m @@ -1,16 +1,16 @@ // -// NewEncryptTool.m +// MewEncryptTool.m // yinmeng-ios // // Created by duoban on 2023/11/23. // -#import "NewEncryptTool.h" +#import "MewEncryptTool.h" #import #import #define MEW_GL_AES_KEY @"weidskfjsdskfws" #define MEW_GL_AES_IV @"seffkssfsfsdfsd" -@implementation NewEncryptTool +@implementation MewEncryptTool //MARK: AES加解密相关 start + (NSString *)MEW_aesEncrypt:(NSString *)sourceStr { if (!sourceStr) { diff --git a/yinmeng-ios/yinmeng-ios/Base/Tool/GCDHelper/MEWGCDHelper.h b/yinmeng-ios/yinmeng-ios/Base/Tool/GCDHelper/MewGCDHelper.h similarity index 89% rename from yinmeng-ios/yinmeng-ios/Base/Tool/GCDHelper/MEWGCDHelper.h rename to yinmeng-ios/yinmeng-ios/Base/Tool/GCDHelper/MewGCDHelper.h index f506423..733de49 100644 --- a/yinmeng-ios/yinmeng-ios/Base/Tool/GCDHelper/MEWGCDHelper.h +++ b/yinmeng-ios/yinmeng-ios/Base/Tool/GCDHelper/MewGCDHelper.h @@ -1,5 +1,5 @@ // -// MEWGCDHelper.h +// MewGCDHelper.h // yinmeng-ios // // Created by duoban on 2023/12/1. diff --git a/yinmeng-ios/yinmeng-ios/Base/Tool/GCDHelper/MEWGCDHelper.m b/yinmeng-ios/yinmeng-ios/Base/Tool/GCDHelper/MewGCDHelper.m similarity index 85% rename from yinmeng-ios/yinmeng-ios/Base/Tool/GCDHelper/MEWGCDHelper.m rename to yinmeng-ios/yinmeng-ios/Base/Tool/GCDHelper/MewGCDHelper.m index 38549ea..c88eded 100644 --- a/yinmeng-ios/yinmeng-ios/Base/Tool/GCDHelper/MEWGCDHelper.m +++ b/yinmeng-ios/yinmeng-ios/Base/Tool/GCDHelper/MewGCDHelper.m @@ -1,11 +1,11 @@ // -// MEWGCDHelper.m +// MewGCDHelper.m // yinmeng-ios // // Created by duoban on 2023/12/1. // -#import "MEWGCDHelper.h" +#import "MewGCDHelper.h" void mew_dispatch_main_sync_safe(dispatch_block_t block) { if ([NSThread isMainThread]) { diff --git a/yinmeng-ios/yinmeng-ios/Base/Tool/IAPHelper/MEWRechargeStorage.h b/yinmeng-ios/yinmeng-ios/Base/Tool/IAPHelper/MewRechargeStorage.h similarity index 90% rename from yinmeng-ios/yinmeng-ios/Base/Tool/IAPHelper/MEWRechargeStorage.h rename to yinmeng-ios/yinmeng-ios/Base/Tool/IAPHelper/MewRechargeStorage.h index a9e137d..21fa1f7 100644 --- a/yinmeng-ios/yinmeng-ios/Base/Tool/IAPHelper/MEWRechargeStorage.h +++ b/yinmeng-ios/yinmeng-ios/Base/Tool/IAPHelper/MewRechargeStorage.h @@ -1,5 +1,5 @@ // -// MEWRechargeStorage.h +// MewRechargeStorage.h // yinmeng-ios // // Created by duoban on 2023/12/1. @@ -9,7 +9,7 @@ NS_ASSUME_NONNULL_BEGIN -@interface MEWRechargeStorage : NSObject +@interface MewRechargeStorage : NSObject /// 根据商品id保存凭证 + (BOOL)mewSaveTranscationId:(NSString *)transcationId recipt:(NSString *)recipt diff --git a/yinmeng-ios/yinmeng-ios/Base/Tool/IAPHelper/MEWRechargeStorage.m b/yinmeng-ios/yinmeng-ios/Base/Tool/IAPHelper/MewRechargeStorage.m similarity index 96% rename from yinmeng-ios/yinmeng-ios/Base/Tool/IAPHelper/MEWRechargeStorage.m rename to yinmeng-ios/yinmeng-ios/Base/Tool/IAPHelper/MewRechargeStorage.m index e02e6d3..cdb3098 100644 --- a/yinmeng-ios/yinmeng-ios/Base/Tool/IAPHelper/MEWRechargeStorage.m +++ b/yinmeng-ios/yinmeng-ios/Base/Tool/IAPHelper/MewRechargeStorage.m @@ -1,14 +1,14 @@ // -// MEWRechargeStorage.m +// MewRechargeStorage.m // yinmeng-ios // // Created by duoban on 2023/12/1. // -#import "MEWRechargeStorage.h" +#import "MewRechargeStorage.h" #import #define kMewAppStoreKey @"kMewAppStoreKey" -@implementation MEWRechargeStorage +@implementation MewRechargeStorage /// 根据商品id保存凭证 + (BOOL)mewSaveTranscationId:(NSString *)transcationId recipt:(NSString *)recipt diff --git a/yinmeng-ios/yinmeng-ios/Base/Tool/MewHUDTool.m b/yinmeng-ios/yinmeng-ios/Base/Tool/MewHUDTool.m index fb9e9bf..5a38789 100644 --- a/yinmeng-ios/yinmeng-ios/Base/Tool/MewHUDTool.m +++ b/yinmeng-ios/yinmeng-ios/Base/Tool/MewHUDTool.m @@ -7,7 +7,7 @@ #import "MewHUDTool.h" #import -#import "MEWGCDHelper.h" +#import "MewGCDHelper.h" #define kDelayTime 2.5 @implementation MewHUDTool diff --git a/yinmeng-ios/yinmeng-ios/Base/Tool/ThemeColor/MEWThemeColor.h b/yinmeng-ios/yinmeng-ios/Base/Tool/ThemeColor/MewThemeColor.h similarity index 97% rename from yinmeng-ios/yinmeng-ios/Base/Tool/ThemeColor/MEWThemeColor.h rename to yinmeng-ios/yinmeng-ios/Base/Tool/ThemeColor/MewThemeColor.h index 744e119..9317b89 100644 --- a/yinmeng-ios/yinmeng-ios/Base/Tool/ThemeColor/MEWThemeColor.h +++ b/yinmeng-ios/yinmeng-ios/Base/Tool/ThemeColor/MewThemeColor.h @@ -1,5 +1,5 @@ // -// MEWMEWMEWThemeColor.h +// MEWMEWMewThemeColor.h // yinmeng-ios // // Created by duoban on 2023/12/1. @@ -13,7 +13,7 @@ NS_ASSUME_NONNULL_BEGIN #define UIColorMewRGBAlpha(rgbValue,a) [UIColor colorWithRed:((float)((rgbValue & 0xFF0000) >> 16))/255.0 green:((float)((rgbValue & 0xFF00) >> 8))/255.0 blue:((float)(rgbValue & 0xFF))/255.0 alpha:(a)] -@interface MEWThemeColor : NSObject +@interface MewThemeColor : NSObject /// view的背景色 0xF3F5FA + (UIColor *)mewAppBackgroundColor; /// cell的背景色 0xFFFFFF diff --git a/yinmeng-ios/yinmeng-ios/Base/Tool/ThemeColor/MEWThemeColor.m b/yinmeng-ios/yinmeng-ios/Base/Tool/ThemeColor/MewThemeColor.m similarity index 95% rename from yinmeng-ios/yinmeng-ios/Base/Tool/ThemeColor/MEWThemeColor.m rename to yinmeng-ios/yinmeng-ios/Base/Tool/ThemeColor/MewThemeColor.m index f611ec6..8d81170 100644 --- a/yinmeng-ios/yinmeng-ios/Base/Tool/ThemeColor/MEWThemeColor.m +++ b/yinmeng-ios/yinmeng-ios/Base/Tool/ThemeColor/MewThemeColor.m @@ -1,13 +1,13 @@ // -// MEWThemeColor.m +// MewThemeColor.m // yinmeng-ios // // Created by duoban on 2023/12/1. // -#import "MEWThemeColor.h" +#import "MewThemeColor.h" -@implementation MEWThemeColor +@implementation MewThemeColor /// view的背景色 0xF3F5FA + (UIColor *)mewAppBackgroundColor { return UIColorMewFromRGB(0xF8F8FB); @@ -51,11 +51,11 @@ /* ------Button 相关颜色 START------ */ /// button 可用 渐变色的开始 0xFFA936 + (UIColor *)mewConfirmButtonGradientStartColor { - return UIColorMewFromRGB(0xFFE710); + return UIColorMewFromRGB(0x9552FF); } /// button 可用 渐变色的开始 0xFFCB47 + (UIColor *)mewConfirmButtonGradientEndColor { - return UIColorMewFromRGB(0xFFE710); + return UIColorMewFromRGB(0x9552FF); } /// 确定的按钮文字颜色 #FFFFFF + (UIColor *)mewConfirmButtonTextColor { @@ -63,11 +63,11 @@ } /// 取消按钮 渐变色的开始 0xF7DDBF + (UIColor *)mewCancelButtonGradientStartColor { - return UIColorMewFromRGB(0xFFFACF); + return UIColorMewFromRGB(0xE6E6FA); } /// 取消按钮 渐变色的结束 0xF7E8C4 + (UIColor *)mewCancelButtonGradientEndColor { - return UIColorMewFromRGB(0xFFFACF); + return UIColorMewFromRGB(0xE6E6FA); } /// 取消的按钮文字颜色 0xFFA936 + (UIColor *)mewCancelButtonTextColor { diff --git a/yinmeng-ios/yinmeng-ios/Base/Tool/Timer/MEWTimer.h b/yinmeng-ios/yinmeng-ios/Base/Tool/Timer/MEWTimer.h deleted file mode 100644 index 54b22e6..0000000 --- a/yinmeng-ios/yinmeng-ios/Base/Tool/Timer/MEWTimer.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// MEWTimer.h -// yinmeng-ios -// -// Created by duoban on 2023/12/1. -// - -#import -typedef void(^MEWTimerHandler) (id _Nullable userInfo); -NS_ASSUME_NONNULL_BEGIN -@interface MEWTimerTarget : NSObject - -@end - -@interface MEWTimer : NSObject -+ (NSTimer *)MEWScheduledTimerWithTimeInterval:(NSTimeInterval)interval block:(MEWTimerHandler)block userInfo:(id)userInfo repeats:(BOOL)repeats; - -+ (NSTimer *)MEWScheduledTimerWithTimeInterval:(NSTimeInterval)interval target:(id)aTarget selector:(SEL)aSelector userInfo:(id)userInfo repeats:(BOOL)repeats; -@end - -NS_ASSUME_NONNULL_END diff --git a/yinmeng-ios/yinmeng-ios/Base/Tool/Timer/MewTimer.h b/yinmeng-ios/yinmeng-ios/Base/Tool/Timer/MewTimer.h new file mode 100644 index 0000000..95dbcfb --- /dev/null +++ b/yinmeng-ios/yinmeng-ios/Base/Tool/Timer/MewTimer.h @@ -0,0 +1,21 @@ +// +// MewTimer.h +// yinmeng-ios +// +// Created by duoban on 2023/12/1. +// + +#import +typedef void(^MewTimerHandler) (id _Nullable userInfo); +NS_ASSUME_NONNULL_BEGIN +@interface MewTimerTarget : NSObject + +@end + +@interface MewTimer : NSObject ++ (NSTimer *)MewScheduledTimerWithTimeInterval:(NSTimeInterval)interval block:(MewTimerHandler)block userInfo:(id)userInfo repeats:(BOOL)repeats; + ++ (NSTimer *)MewScheduledTimerWithTimeInterval:(NSTimeInterval)interval target:(id)aTarget selector:(SEL)aSelector userInfo:(id)userInfo repeats:(BOOL)repeats; +@end + +NS_ASSUME_NONNULL_END diff --git a/yinmeng-ios/yinmeng-ios/Base/Tool/Timer/MEWTimer.m b/yinmeng-ios/yinmeng-ios/Base/Tool/Timer/MewTimer.m similarity index 66% rename from yinmeng-ios/yinmeng-ios/Base/Tool/Timer/MEWTimer.m rename to yinmeng-ios/yinmeng-ios/Base/Tool/Timer/MewTimer.m index 9f82cca..df3a6ce 100644 --- a/yinmeng-ios/yinmeng-ios/Base/Tool/Timer/MEWTimer.m +++ b/yinmeng-ios/yinmeng-ios/Base/Tool/Timer/MewTimer.m @@ -1,17 +1,17 @@ // -// MEWTimer.m +// MewTimer.m // yinmeng-ios // // Created by duoban on 2023/12/1. // -#import "MEWTimer.h" -@interface MEWTimerTarget() +#import "MewTimer.h" +@interface MewTimerTarget() @property (nonatomic, weak) id target; @property (nonatomic, weak) NSTimer* timer; @property (nonatomic, assign) SEL selector; @end -@implementation MEWTimerTarget +@implementation MewTimerTarget - (void) fire:(NSTimer *)timer { if(self.target) { #pragma clang diagnostic push @@ -26,26 +26,26 @@ #pragma mark - YMWeakTimer -@implementation MEWTimer +@implementation MewTimer -+ (NSTimer *)MEWScheduledTimerWithTimeInterval:(NSTimeInterval)interval target:(id)aTarget selector:(SEL)aSelector userInfo:(id)userInfo repeats:(BOOL)repeats{ - MEWTimerTarget* timerTarget = [[MEWTimerTarget alloc] init]; ++ (NSTimer *)MewScheduledTimerWithTimeInterval:(NSTimeInterval)interval target:(id)aTarget selector:(SEL)aSelector userInfo:(id)userInfo repeats:(BOOL)repeats{ + MewTimerTarget* timerTarget = [[MewTimerTarget alloc] init]; timerTarget.target = aTarget; timerTarget.selector = aSelector; timerTarget.timer = [NSTimer scheduledTimerWithTimeInterval:interval target:timerTarget selector:@selector(fire:) userInfo:userInfo repeats:repeats]; return timerTarget.timer; } -+ (NSTimer *)MEWScheduledTimerWithTimeInterval:(NSTimeInterval)interval block:(MEWTimerHandler)block userInfo:(id)userInfo repeats:(BOOL)repeats{ ++ (NSTimer *)MewScheduledTimerWithTimeInterval:(NSTimeInterval)interval block:(MewTimerHandler)block userInfo:(id)userInfo repeats:(BOOL)repeats{ NSMutableArray *userInfoArray = [NSMutableArray arrayWithObject:[block copy]]; if (userInfo != nil) { [userInfoArray addObject:userInfo]; } - return [self MEWScheduledTimerWithTimeInterval:interval target:self selector:@selector(MEWSTimerBlockInvoke:) userInfo:[userInfoArray copy] repeats:repeats]; + return [self MewScheduledTimerWithTimeInterval:interval target:self selector:@selector(MewTimerBlockInvoke:) userInfo:[userInfoArray copy] repeats:repeats]; } -+ (void)MEWSTimerBlockInvoke:(NSArray*)userInfo { - MEWTimerHandler block = userInfo[0]; ++ (void)MewTimerBlockInvoke:(NSArray*)userInfo { + MewTimerHandler block = userInfo[0]; id info = nil; if (userInfo.count == 2) { info = userInfo[1]; diff --git a/yinmeng-ios/yinmeng-ios/Base/Tool/YYUtility/MewUtility+MewDevice.m b/yinmeng-ios/yinmeng-ios/Base/Tool/YYUtility/MewUtility+MewDevice.m index a6f2e5f..1df903c 100644 --- a/yinmeng-ios/yinmeng-ios/Base/Tool/YYUtility/MewUtility+MewDevice.m +++ b/yinmeng-ios/yinmeng-ios/Base/Tool/YYUtility/MewUtility+MewDevice.m @@ -22,7 +22,7 @@ #import #import #import "SSKeychain.h" -#import "MEWGCDHelper.h" +#import "MewGCDHelper.h" #if !defined(IFT_ETHER) diff --git a/yinmeng-ios/yinmeng-ios/Base/UI/EmptyView/YMEmptyTableViewCell.h b/yinmeng-ios/yinmeng-ios/Base/UI/EmptyView/MewEmptyTableViewCell.h similarity index 72% rename from yinmeng-ios/yinmeng-ios/Base/UI/EmptyView/YMEmptyTableViewCell.h rename to yinmeng-ios/yinmeng-ios/Base/UI/EmptyView/MewEmptyTableViewCell.h index 233629b..1a2c7d4 100644 --- a/yinmeng-ios/yinmeng-ios/Base/UI/EmptyView/YMEmptyTableViewCell.h +++ b/yinmeng-ios/yinmeng-ios/Base/UI/EmptyView/MewEmptyTableViewCell.h @@ -1,5 +1,5 @@ // -// YMEmptyTableViewCell.h +// MewEmptyTableViewCell.h // mew-ios // // Created by 触海 on 2023/11/9. @@ -9,7 +9,7 @@ NS_ASSUME_NONNULL_BEGIN -@interface YMEmptyTableViewCell : UITableViewCell +@interface MewEmptyTableViewCell : UITableViewCell ///空白的文字 @property (nonatomic,copy) NSString *emptyTitle; diff --git a/yinmeng-ios/yinmeng-ios/Base/UI/EmptyView/YMEmptyTableViewCell.m b/yinmeng-ios/yinmeng-ios/Base/UI/EmptyView/MewEmptyTableViewCell.m similarity index 90% rename from yinmeng-ios/yinmeng-ios/Base/UI/EmptyView/YMEmptyTableViewCell.m rename to yinmeng-ios/yinmeng-ios/Base/UI/EmptyView/MewEmptyTableViewCell.m index 2191ed0..3218320 100644 --- a/yinmeng-ios/yinmeng-ios/Base/UI/EmptyView/YMEmptyTableViewCell.m +++ b/yinmeng-ios/yinmeng-ios/Base/UI/EmptyView/MewEmptyTableViewCell.m @@ -1,23 +1,23 @@ // -// YMEmptyTableViewCell.m +// MewEmptyTableViewCell.m // mew-ios // // Created by 触海 on 2023/11/9. // -#import "YMEmptyTableViewCell.h" +#import "MewEmptyTableViewCell.h" ///Third #import ///Tool -#import "MEWThemeColor.h" +#import "MewThemeColor.h" #import "UIImageConstant.h" -@interface YMEmptyTableViewCell() +@interface MewEmptyTableViewCell() @property (nonatomic,strong) UIImageView *emptyImageView; @property (nonatomic,strong) UILabel *titleLabel; @end -@implementation YMEmptyTableViewCell +@implementation MewEmptyTableViewCell #pragma mark - Init - (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { @@ -75,7 +75,7 @@ _titleLabel.numberOfLines = 2; _titleLabel.font = [UIFont systemFontOfSize:16]; _titleLabel.textAlignment = NSTextAlignmentCenter; - _titleLabel.textColor = [MEWThemeColor mewSecondTextColor]; + _titleLabel.textColor = [MewThemeColor mewSecondTextColor]; } return _titleLabel; } diff --git a/yinmeng-ios/yinmeng-ios/Base/UI/MewBaseNavigationController.m b/yinmeng-ios/yinmeng-ios/Base/UI/MewBaseNavigationController.m index d8dec06..d1cf482 100644 --- a/yinmeng-ios/yinmeng-ios/Base/UI/MewBaseNavigationController.m +++ b/yinmeng-ios/yinmeng-ios/Base/UI/MewBaseNavigationController.m @@ -7,7 +7,7 @@ #import "MewBaseNavigationController.h" -#import "MEWThemeColor.h" +#import "MewThemeColor.h" @interface MewBaseNavigationController () @@ -28,7 +28,7 @@ if (self.childViewControllers.count > 0) { viewController.hidesBottomBarWhenPushed = YES; UIBarButtonItem *leftBarButtonItem = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"mew_common_nav_back"] style:UIBarButtonItemStyleDone target:self action:@selector(mew_backClick)]; - leftBarButtonItem.tintColor = [MEWThemeColor mewMainTextColor]; + leftBarButtonItem.tintColor = [MewThemeColor mewMainTextColor]; viewController.navigationItem.leftBarButtonItem = leftBarButtonItem; } viewController.navigationItem.backBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"" style:UIBarButtonItemStylePlain target:nil action:nil]; @@ -42,21 +42,21 @@ - (void)mew_themeConfig { self.navigationBar.shadowImage = [[UIImage alloc] init]; - self.navigationBar.barTintColor = [MEWThemeColor mewAppBackgroundColor]; + self.navigationBar.barTintColor = [MewThemeColor mewAppBackgroundColor]; self.navigationBar.tintColor = [UIColor whiteColor]; self.navigationBar.translucent = NO; - self.view.backgroundColor = [MEWThemeColor mewAppBackgroundColor]; + self.view.backgroundColor = [MewThemeColor mewAppBackgroundColor]; [self.navigationBar setTitleTextAttributes:@{ NSFontAttributeName:[UIFont systemFontOfSize:18 weight:UIFontWeightMedium], - NSForegroundColorAttributeName:[MEWThemeColor mewMainTextColor] + NSForegroundColorAttributeName:[MewThemeColor mewMainTextColor] }]; /// scrollEdgeAppearance 属性iOS15 强制适用于 所有导航器 如果为nil 则使用 standardAppearance属性中的设置，并修改为使用透明背景 @fengshuo if (@available(iOS 15.0, *)) { UINavigationBarAppearance *appearance = [UINavigationBarAppearance new]; appearance.titleTextAttributes = @{NSFontAttributeName:[UIFont systemFontOfSize:18 weight:UIFontWeightMedium], - NSForegroundColorAttributeName:[MEWThemeColor mewMainTextColor]}; - appearance.backgroundColor = [MEWThemeColor mewAppCellBackgroundColor]; + NSForegroundColorAttributeName:[MewThemeColor mewMainTextColor]}; + appearance.backgroundColor = [MewThemeColor mewAppCellBackgroundColor]; self.navigationBar.standardAppearance = appearance; self.navigationBar.scrollEdgeAppearance = appearance; } diff --git a/yinmeng-ios/yinmeng-ios/Base/UI/TTPopup/Config/TTActionSheetConfig.m b/yinmeng-ios/yinmeng-ios/Base/UI/TTPopup/Config/TTActionSheetConfig.m index 0236a24..f263065 100644 --- a/yinmeng-ios/yinmeng-ios/Base/UI/TTPopup/Config/TTActionSheetConfig.m +++ b/yinmeng-ios/yinmeng-ios/Base/UI/TTPopup/Config/TTActionSheetConfig.m @@ -6,7 +6,7 @@ // #import "TTActionSheetConfig.h" -#import "MEWThemeColor.h" +#import "MewThemeColor.h" @implementation TTActionSheetConfig @@ -24,7 +24,7 @@ + (TTActionSheetConfig *)normalTitle:(NSString *)title selectColorType:(TTItemSelectType)type clickAction:(TTActionSheetClickAction)clickAction { - UIColor *color = type == TTItemSelectHighLight ? [MEWThemeColor mewAlertTitleColor] : [MEWThemeColor mewAlertTitleColor]; + UIColor *color = type == TTItemSelectHighLight ? [MewThemeColor mewAlertTitleColor] : [MewThemeColor mewAlertTitleColor]; TTActionSheetConfig *config = [self actionWithTitle:title color:color handler:clickAction]; config.type = type; diff --git a/yinmeng-ios/yinmeng-ios/Base/UI/TTPopup/Config/TTAlertConfig.m b/yinmeng-ios/yinmeng-ios/Base/UI/TTPopup/Config/TTAlertConfig.m index 56999da..c5eb51f 100644 --- a/yinmeng-ios/yinmeng-ios/Base/UI/TTPopup/Config/TTAlertConfig.m +++ b/yinmeng-ios/yinmeng-ios/Base/UI/TTPopup/Config/TTAlertConfig.m @@ -8,7 +8,7 @@ #import "TTAlertConfig.h" #import "UIImage+MewUtils.h" -#import "MEWThemeColor.h" +#import "MewThemeColor.h" static CGFloat kAlertTitleFont = 18.f; static CGFloat kAlertButtonFont = 15.f; @@ -24,7 +24,7 @@ static CGFloat kAlertButtonCornerRadius = 8.f; self = [super init]; if (self) { - _backgroundColor = [MEWThemeColor mewAlertBackgroundColor]; + _backgroundColor = [MewThemeColor mewAlertBackgroundColor]; //背景颜色 kAlertTitleFont = 16.f; @@ -36,12 +36,12 @@ static CGFloat kAlertButtonCornerRadius = 8.f; // title _title = @"";// 标题 _titleFont = [UIFont fontWithName:@"PingFangSC-Medium" size:kAlertTitleFont];// 字体 - _titleColor = [MEWThemeColor mewAlertTitleColor];// 颜色 + _titleColor = [MewThemeColor mewAlertTitleColor];// 颜色 // message _message = @""; _messageFont = [UIFont systemFontOfSize:kAlertMessageFont];// 内容 - _messageColor = [MEWThemeColor mewAlertMessageColor];// 颜色 + _messageColor = [MewThemeColor mewAlertMessageColor];// 颜色 _messageLineSpacing = kAlertMessageFontLineSpace;// 字体行间距 _messageAttributedConfig = @[];// 自定义富文本样式 @@ -49,16 +49,16 @@ static CGFloat kAlertButtonCornerRadius = 8.f; _cancelButtonConfig = [[TTAlertButtonConfig alloc] init]; _cancelButtonConfig.title = @"取消";// 取消按钮 _cancelButtonConfig.font = [UIFont systemFontOfSize:kAlertButtonFont];// 按钮字体 - _cancelButtonConfig.titleColor = [MEWThemeColor mewCancelButtonTextColor];// 字体颜色 - _cancelButtonConfig.backgroundImage = [UIImage mew_gradientColorImageFromColors:@[[MEWThemeColor mewCancelButtonGradientStartColor], [MEWThemeColor mewCancelButtonGradientEndColor]] gradientType:MewGradientTypeLeftToRight imgSize:CGSizeMake(10, 10)]; + _cancelButtonConfig.titleColor = [MewThemeColor mewCancelButtonTextColor];// 字体颜色 + _cancelButtonConfig.backgroundImage = [UIImage mew_gradientColorImageFromColors:@[[MewThemeColor mewCancelButtonGradientStartColor], [MewThemeColor mewCancelButtonGradientEndColor]] gradientType:MewGradientTypeLeftToRight imgSize:CGSizeMake(10, 10)]; _cancelButtonConfig.cornerRadius = kAlertButtonCornerRadius;// 按钮背景图 // confirm button _confirmButtonConfig = [[TTAlertButtonConfig alloc] init]; _confirmButtonConfig.title = @"确定"; _confirmButtonConfig.font = [UIFont systemFontOfSize:kAlertButtonFont]; - _confirmButtonConfig.titleColor = [MEWThemeColor mewConfirmButtonTextColor]; - _confirmButtonConfig.backgroundImage = [UIImage mew_gradientColorImageFromColors:@[[MEWThemeColor mewConfirmButtonGradientStartColor], [MEWThemeColor mewConfirmButtonGradientEndColor]] gradientType:MewGradientTypeLeftToRight imgSize:CGSizeMake(10, 10)]; + _confirmButtonConfig.titleColor = [MewThemeColor mewConfirmButtonTextColor]; + _confirmButtonConfig.backgroundImage = [UIImage mew_gradientColorImageFromColors:@[[MewThemeColor mewConfirmButtonGradientStartColor], [MewThemeColor mewConfirmButtonGradientEndColor]] gradientType:MewGradientTypeLeftToRight imgSize:CGSizeMake(10, 10)]; _confirmButtonConfig.cornerRadius = kAlertButtonCornerRadius; _cornerRadius = kAlertCornerRadius;// 默认圆角 diff --git a/yinmeng-ios/yinmeng-ios/Base/UI/TTPopup/View/TTActionSheetView.m b/yinmeng-ios/yinmeng-ios/Base/UI/TTPopup/View/TTActionSheetView.m index 8744385..2f64e47 100644 --- a/yinmeng-ios/yinmeng-ios/Base/UI/TTPopup/View/TTActionSheetView.m +++ b/yinmeng-ios/yinmeng-ios/Base/UI/TTPopup/View/TTActionSheetView.m @@ -8,7 +8,7 @@ #import "TTActionSheetView.h" #import "TTActionSheetConfig.h" -#import "MEWThemeColor.h" +#import "MewThemeColor.h" #import static CGFloat const kSheetViewCellHeight = 51.f; @@ -104,7 +104,7 @@ static NSString *const kSheetViewCellConst = @"kSheetViewCellConst"; _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain]; _tableView.delegate = self; _tableView.dataSource = self; - _tableView.separatorColor = [MEWThemeColor mewActionSeparatorColor]; + _tableView.separatorColor = [MewThemeColor mewActionSeparatorColor]; _tableView.separatorStyle = UITableViewCellSeparatorStyleSingleLine; _tableView.rowHeight = kSheetViewCellHeight; _tableView.tableFooterView = [[UIView alloc] init]; @@ -122,7 +122,7 @@ static NSString *const kSheetViewCellConst = @"kSheetViewCellConst"; _cancelButton = [UIButton buttonWithType:UIButtonTypeCustom]; [_cancelButton setTitle:@"取消" forState:UIControlStateNormal]; [_cancelButton setBackgroundColor:UIColor.whiteColor]; - [_cancelButton setTitleColor:[MEWThemeColor mewAlertMessageColor] forState:UIControlStateNormal]; + [_cancelButton setTitleColor:[MewThemeColor mewAlertMessageColor] forState:UIControlStateNormal]; [_cancelButton.titleLabel setFont:[UIFont systemFontOfSize:16]]; _cancelButton.layer.cornerRadius = kSheetViewCornerRadius; _cancelButton.layer.masksToBounds = YES; diff --git a/yinmeng-ios/yinmeng-ios/Base/UI/TTPopup/View/TTAlertView.m b/yinmeng-ios/yinmeng-ios/Base/UI/TTPopup/View/TTAlertView.m index e52b2f8..2637022 100644 --- a/yinmeng-ios/yinmeng-ios/Base/UI/TTPopup/View/TTAlertView.m +++ b/yinmeng-ios/yinmeng-ios/Base/UI/TTPopup/View/TTAlertView.m @@ -8,7 +8,7 @@ #import "TTAlertView.h" #import "TTAlertConfig.h" -#import "MEWThemeColor.h" +#import "MewThemeColor.h" #import static CGFloat const kMargin = 25.f; @@ -180,9 +180,9 @@ static CGFloat const kBtnHeight = 38.f; _messageLabel.text = config.message; } - _cancelButton.layer.borderColor = [MEWThemeColor mewDividerColor].CGColor; + _cancelButton.layer.borderColor = [MewThemeColor mewDividerColor].CGColor; _cancelButton.layer.borderWidth = 2.f; - _confirmButton.layer.borderColor = [MEWThemeColor mewDividerColor].CGColor; + _confirmButton.layer.borderColor = [MewThemeColor mewDividerColor].CGColor; _confirmButton.layer.borderWidth = 2.f; } @@ -190,15 +190,15 @@ static CGFloat const kBtnHeight = 38.f; _isConfigBoard = isConfigBoard; if (isConfigBoard) { //需要边框 - _cancelButton.layer.borderColor = [MEWThemeColor mewDividerColor].CGColor; + _cancelButton.layer.borderColor = [MewThemeColor mewDividerColor].CGColor; _cancelButton.layer.borderWidth = 2.f; - _confirmButton.layer.borderColor = [MEWThemeColor mewDividerColor].CGColor; + _confirmButton.layer.borderColor = [MewThemeColor mewDividerColor].CGColor; _confirmButton.layer.borderWidth = 2.f; }else { //不需要边框 - _cancelButton.layer.borderColor = [MEWThemeColor mewDividerColor].CGColor; + _cancelButton.layer.borderColor = [MewThemeColor mewDividerColor].CGColor; _cancelButton.layer.borderWidth = 0; - _confirmButton.layer.borderColor = [MEWThemeColor mewDividerColor].CGColor; + _confirmButton.layer.borderColor = [MewThemeColor mewDividerColor].CGColor; _confirmButton.layer.borderWidth = 0; } } diff --git a/yinmeng-ios/yinmeng-ios/Main/ClientConfig/Api/Api+MewMain.h b/yinmeng-ios/yinmeng-ios/ClientConfig/Api/Api+MewMain.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/ClientConfig/Api/Api+MewMain.h rename to yinmeng-ios/yinmeng-ios/ClientConfig/Api/Api+MewMain.h diff --git a/yinmeng-ios/yinmeng-ios/Main/ClientConfig/Api/Api+MewMain.m b/yinmeng-ios/yinmeng-ios/ClientConfig/Api/Api+MewMain.m similarity index 83% rename from yinmeng-ios/yinmeng-ios/Main/ClientConfig/Api/Api+MewMain.m rename to yinmeng-ios/yinmeng-ios/ClientConfig/Api/Api+MewMain.m index 3977b02..26fe690 100644 --- a/yinmeng-ios/yinmeng-ios/Main/ClientConfig/Api/Api+MewMain.m +++ b/yinmeng-ios/yinmeng-ios/ClientConfig/Api/Api+MewMain.m @@ -6,24 +6,24 @@ // #import "Api+MewMain.h" -#import "NewEncryptTool.h" +#import "MewEncryptTool.h" @implementation Api (MewMain) /// 请求Ticket + (void)mew_requestTicket:(MewHttpRequestHelperCompletion)completion access_token:(NSString *)accessToken issue_type:(NSString *)issueType { - NSString *getUrl = [NewEncryptTool MEW_aesDecrypt:@"G0vRJk+lM7aIFJdrDs1Xhg=="];///oauth/ticket + NSString *getUrl = [MewEncryptTool MEW_aesDecrypt:@"G0vRJk+lM7aIFJdrDs1Xhg=="];///oauth/ticket [self makeRequest:getUrl method:MewHttpRequestHelperMethodPOST completion:completion, __FUNCTION__, accessToken, issueType, nil]; } /// 初始化配置 /// @param complection 完成 + (void)mew_clientInitConfig:(MewHttpRequestHelperCompletion)complection { - NSString *getUrl = [NewEncryptTool MEW_aesDecrypt:@"B0VaK5AAEVj2lGQmh7fdkg=="];///client/init + NSString *getUrl = [MewEncryptTool MEW_aesDecrypt:@"B0VaK5AAEVj2lGQmh7fdkg=="];///client/init [MewHttpRequestHelper request:getUrl method:MewHttpRequestHelperMethodGET params:[NSMutableDictionary dictionary] completion:complection]; } ///心跳接口，每 30 秒调用一次，用来更新用户在线状态 登录成功之后调用 + (void)mew_requestClientHeartBrat:(MewHttpRequestHelperCompletion)completion { - NSString *getUrl = [NewEncryptTool MEW_aesDecrypt:@"hq8XfxW9EwyMQW8i9Gu8SujFTd3xA+6qI6zbeP4xLnY="];///"client/heartbeat" + NSString *getUrl = [MewEncryptTool MEW_aesDecrypt:@"hq8XfxW9EwyMQW8i9Gu8SujFTd3xA+6qI6zbeP4xLnY="];///"client/heartbeat" [self makeRequest:getUrl method:MewHttpRequestHelperMethodPOST completion:completion, __FUNCTION__, nil]; } diff --git a/yinmeng-ios/yinmeng-ios/Main/ClientConfig/MewClientConfig.h b/yinmeng-ios/yinmeng-ios/ClientConfig/MewClientConfig.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/ClientConfig/MewClientConfig.h rename to yinmeng-ios/yinmeng-ios/ClientConfig/MewClientConfig.h diff --git a/yinmeng-ios/yinmeng-ios/Main/ClientConfig/MewClientConfig.m b/yinmeng-ios/yinmeng-ios/ClientConfig/MewClientConfig.m similarity index 96% rename from yinmeng-ios/yinmeng-ios/Main/ClientConfig/MewClientConfig.m rename to yinmeng-ios/yinmeng-ios/ClientConfig/MewClientConfig.m index 69308c6..6bdded6 100644 --- a/yinmeng-ios/yinmeng-ios/Main/ClientConfig/MewClientConfig.m +++ b/yinmeng-ios/yinmeng-ios/ClientConfig/MewClientConfig.m @@ -7,7 +7,7 @@ #import "MewClientConfig.h" #import "Api+MewMain.h" -#import "MEWTimer.h" +#import "MewTimer.h" #import "NSObject+MEWExtension.h" @interface MewClientConfig() ///重试的次数 10次 如果你还是失败的话 那就算了 没办法了 @@ -68,7 +68,7 @@ - (void)mew_addHeartBratTimer { if (_timer == nil) return; - _timer = [MEWTimer MEWScheduledTimerWithTimeInterval:30 block:^(id _Nonnull userInfo) { + _timer = [MewTimer MewScheduledTimerWithTimeInterval:30 block:^(id _Nonnull userInfo) { [Api mew_requestClientHeartBrat:^(MewBaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { diff --git a/yinmeng-ios/yinmeng-ios/Main/ClientConfig/Model/MewClientDataModel.h b/yinmeng-ios/yinmeng-ios/ClientConfig/Model/MewClientDataModel.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/ClientConfig/Model/MewClientDataModel.h rename to yinmeng-ios/yinmeng-ios/ClientConfig/Model/MewClientDataModel.h diff --git a/yinmeng-ios/yinmeng-ios/Main/ClientConfig/Model/MewClientDataModel.m b/yinmeng-ios/yinmeng-ios/ClientConfig/Model/MewClientDataModel.m similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/ClientConfig/Model/MewClientDataModel.m rename to yinmeng-ios/yinmeng-ios/ClientConfig/Model/MewClientDataModel.m diff --git a/yinmeng-ios/yinmeng-ios/Global/MewConstant.m b/yinmeng-ios/yinmeng-ios/Global/MewConstant.m index 31f0fc5..cccd936 100644 --- a/yinmeng-ios/yinmeng-ios/Global/MewConstant.m +++ b/yinmeng-ios/yinmeng-ios/Global/MewConstant.m @@ -6,7 +6,7 @@ // #import "MewConstant.h" -#import "NewEncryptTool.h" +#import "MewEncryptTool.h" @implementation MewConstant NSString * const KeyWithType(KeyType type) { BOOL isRelase = NO; @@ -40,7 +40,7 @@ NSString * const KeyWithType(KeyType type) { }; NSDictionary *enviroDic = [dic objectForKey:@(isRelase)]; - return [NewEncryptTool MEW_aesDecrypt:[enviroDic objectForKey:@(type)]]; + return [MewEncryptTool MEW_aesDecrypt:[enviroDic objectForKey:@(type)]]; } @end diff --git a/yinmeng-ios/yinmeng-ios/Global/MewHtmlUrl.m b/yinmeng-ios/yinmeng-ios/Global/MewHtmlUrl.m index 75b07d9..85d0508 100644 --- a/yinmeng-ios/yinmeng-ios/Global/MewHtmlUrl.m +++ b/yinmeng-ios/yinmeng-ios/Global/MewHtmlUrl.m @@ -6,16 +6,16 @@ // #import "MewHtmlUrl.h" -#import "NewEncryptTool.h" +#import "MewEncryptTool.h" @implementation MewHtmlUrl NSString * const URLWithType(URLType type) { NSString * prefix = @"mew"; NSDictionary * dic = @{ - @(kPrivacyURL) : [NewEncryptTool MEW_aesDecrypt:@"RW2RUxUBFSQXiYS0xFpDv+HMdWG2/xfjkYMyeSFR/BY="],//隐私政策modules/rule/privacy-wap.html - @(kCancelAccout) : [NewEncryptTool MEW_aesDecrypt:@"OdODqmY17B0vG9Gs7FGtEuzMJQXILqziECH6PQoOSLo="],//注销账号modules/logout/index.html - @(kUserProtocalURL) : [NewEncryptTool MEW_aesDecrypt:@"oSYlxZYQP2Vu+3KRnQorypsYWQGEz2tKII7AwcFks7s="],///用户协议modules/rule/protocol.html + @(kPrivacyURL) : [MewEncryptTool MEW_aesDecrypt:@"RW2RUxUBFSQXiYS0xFpDv+HMdWG2/xfjkYMyeSFR/BY="],//隐私政策modules/rule/privacy-wap.html + @(kCancelAccout) : [MewEncryptTool MEW_aesDecrypt:@"OdODqmY17B0vG9Gs7FGtEuzMJQXILqziECH6PQoOSLo="],//注销账号modules/logout/index.html + @(kUserProtocalURL) : [MewEncryptTool MEW_aesDecrypt:@"oSYlxZYQP2Vu+3KRnQorypsYWQGEz2tKII7AwcFks7s="],///用户协议modules/rule/protocol.html }; NSString * url = [dic objectForKey:@(type)]; return [NSString stringWithFormat:@"%@/%@",prefix, url]; diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/Api/Api+MewHome.h b/yinmeng-ios/yinmeng-ios/Main/Home/Api/Api+MewHome.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Home/Api/Api+MewHome.h rename to yinmeng-ios/yinmeng-ios/Main/Home/Api/Api+MewHome.h diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/Api/Api+MewHome.m b/yinmeng-ios/yinmeng-ios/Main/Home/Api/Api+MewHome.m similarity index 86% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Home/Api/Api+MewHome.m rename to yinmeng-ios/yinmeng-ios/Main/Home/Api/Api+MewHome.m index a5de7a6..f7009a7 100644 --- a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/Api/Api+MewHome.m +++ b/yinmeng-ios/yinmeng-ios/Main/Home/Api/Api+MewHome.m @@ -6,26 +6,26 @@ // #import "Api+MewHome.h" -#import "NewEncryptTool.h" +#import "MewEncryptTool.h" @implementation Api (MewHome) /// Mew 首页随机列表 + (void)getMewHomeFriendListCompleted:(MewHttpRequestHelperCompletion)completed gender:(NSString *)gender { - NSString *getUrl = [NewEncryptTool MEW_aesDecrypt:@"ZnqkAkDTTXWcnvwqETmxzC3fgpK+OuH3kRHkQFI0HyM="];///voiceShow/listRandom + NSString *getUrl = [MewEncryptTool MEW_aesDecrypt:@"ZnqkAkDTTXWcnvwqETmxzC3fgpK+OuH3kRHkQFI0HyM="];///voiceShow/listRandom [self makeRequest:getUrl method:MewHttpRequestHelperMethodGET completion:completed, __FUNCTION__, gender, nil]; } /// 获取新朋友列表 + (void)getNewFriendListComplection:(MewHttpRequestHelperCompletion)complection gender:(NSString *)gender { - NSString *getUrl = [NewEncryptTool MEW_aesDecrypt:@"snLITcKwwnlRGbuT+0t3Gw=="];///home/newFriend + NSString *getUrl = [MewEncryptTool MEW_aesDecrypt:@"snLITcKwwnlRGbuT+0t3Gw=="];///home/newFriend [self makeRequest:getUrl method:MewHttpRequestHelperMethodGET completion:complection, __FUNCTION__, gender, nil]; } /// 上传七牛获取token /// @param completion 完成 + (void)qiniuUpLoadImage:(MewHttpRequestHelperCompletion)completion { - NSString *getUrl = [NewEncryptTool MEW_aesDecrypt:@"V5gbqkWkuc4Fvzj9mYj/hBeoD5CULsPTsiK8Z8GieqY="];///qiniu/upload/getUploadToken + NSString *getUrl = [MewEncryptTool MEW_aesDecrypt:@"V5gbqkWkuc4Fvzj9mYj/hBeoD5CULsPTsiK8Z8GieqY="];///qiniu/upload/getUploadToken [self makeRequest:getUrl method:MewHttpRequestHelperMethodGET completion:completion, __FUNCTION__, nil]; } diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/Manager/MewAudioPlayerManager.h b/yinmeng-ios/yinmeng-ios/Main/Home/Manager/MewAudioPlayerManager.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Home/Manager/MewAudioPlayerManager.h rename to yinmeng-ios/yinmeng-ios/Main/Home/Manager/MewAudioPlayerManager.h diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/Manager/MewAudioPlayerManager.m b/yinmeng-ios/yinmeng-ios/Main/Home/Manager/MewAudioPlayerManager.m similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Home/Manager/MewAudioPlayerManager.m rename to yinmeng-ios/yinmeng-ios/Main/Home/Manager/MewAudioPlayerManager.m diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/Presenter/MewHomePresenter.h b/yinmeng-ios/yinmeng-ios/Main/Home/Presenter/MewHomePresenter.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Home/Presenter/MewHomePresenter.h rename to yinmeng-ios/yinmeng-ios/Main/Home/Presenter/MewHomePresenter.h diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/Presenter/MewHomePresenter.m b/yinmeng-ios/yinmeng-ios/Main/Home/Presenter/MewHomePresenter.m similarity index 95% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Home/Presenter/MewHomePresenter.m rename to yinmeng-ios/yinmeng-ios/Main/Home/Presenter/MewHomePresenter.m index 656b4a2..b938c94 100644 --- a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/Presenter/MewHomePresenter.m +++ b/yinmeng-ios/yinmeng-ios/Main/Home/Presenter/MewHomePresenter.m @@ -88,7 +88,7 @@ /// 获取两个人的关注状态 - (void)mew_getUserAttentionState:(NSString *)targetUid { - NSString *uid = [[MewAccountInfoStorage instance] getUid]; + NSString *uid = [[MewAccountInfoStorage instance] mew_getUid]; [Api Mew_AttentionStatusCompletion:[self mew_createHttpCompletion:^(MewBaseModel * _Nonnull data) { BOOL isLike = ((NSNumber *)data.data).boolValue; [[self mew_getView] mew_getUserAttentionSuccess:isLike]; @@ -99,7 +99,7 @@ /// 获取用户信息 - (void)mew_getUserInfoWithUid:(NSString *)uid { - [Api getUserInfo:[self mew_createHttpCompletion:^(MewBaseModel * _Nonnull data) { + [Api Mew_GetUserInfo:[self mew_createHttpCompletion:^(MewBaseModel * _Nonnull data) { MewUserInfoModel *userInfo = [MewUserInfoModel mewModelWithDictionary:data.data]; [[self mew_getView] mew_getUserInfoSuccess:userInfo]; } fail:^(NSInteger code, NSString * _Nullable msg) { @@ -120,7 +120,7 @@ /// @param page 当前的页数 /// @param pageSize 一页多少个 - (void)mew_getUserAttentionList:(int)page pageSize:(int)pageSize state:(int)state{ - NSString * uid= [MewAccountInfoStorage instance].getUid; + NSString * uid= [MewAccountInfoStorage instance].mew_getUid; NSString * pageStr = [NSString stringWithFormat:@"%d", page]; NSString * pageSizeStr = [NSString stringWithFormat:@"%d", pageSize]; [Api Mew_GetAttentionListCompletion:[self mew_createHttpCompletion:^(MewBaseModel * _Nonnull data) { @@ -145,7 +145,7 @@ #pragma mark - Private Method - (void)initiatemew_attentionUser:(NSString *)targetUid state:(BOOL)state { - NSString *uid = [[MewAccountInfoStorage instance] getUid]; + NSString *uid = [[MewAccountInfoStorage instance] mew_getUid]; NSString *ticket = [[MewAccountInfoStorage instance] mew_getTicket]; NSString *type = state ? @"1" : @"2"; [Api Mew_AttentionCompletion:[self mew_createHttpCompletion:^(MewBaseModel * _Nonnull data) { diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/Protocol/MewHomeProtocol.h b/yinmeng-ios/yinmeng-ios/Main/Home/Protocol/MewHomeProtocol.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Home/Protocol/MewHomeProtocol.h rename to yinmeng-ios/yinmeng-ios/Main/Home/Protocol/MewHomeProtocol.h diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/MewHomeViewController.h b/yinmeng-ios/yinmeng-ios/Main/Home/View/MewHomeViewController.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/MewHomeViewController.h rename to yinmeng-ios/yinmeng-ios/Main/Home/View/MewHomeViewController.h diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/MewHomeViewController.m b/yinmeng-ios/yinmeng-ios/Main/Home/View/MewHomeViewController.m similarity index 99% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/MewHomeViewController.m rename to yinmeng-ios/yinmeng-ios/Main/Home/View/MewHomeViewController.m index a1c758b..16e1dc4 100644 --- a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/MewHomeViewController.m +++ b/yinmeng-ios/yinmeng-ios/Main/Home/View/MewHomeViewController.m @@ -22,7 +22,7 @@ #import /// Tool #import "MewMacro.h" -#import "MEWThemeColor.h" +#import "MewThemeColor.h" #import "MewHUDTool.h" /// P #import "MewHomePresenter.h" @@ -430,7 +430,7 @@ - (UIView *)rightBgVoiceView { if (!_rightBgVoiceView) { _rightBgVoiceView = [[UIView alloc] init]; - _rightBgVoiceView.backgroundColor = [MEWThemeColor mewColorWithHexString:@"#1D1F33"]; + _rightBgVoiceView.backgroundColor = [MewThemeColor mewColorWithHexString:@"#1D1F33"]; } return _rightBgVoiceView; } @@ -450,7 +450,7 @@ - (MewRightFollowVoiceView *)rightFollowVoiceView { if (!_rightFollowVoiceView) { _rightFollowVoiceView = [[MewRightFollowVoiceView alloc] init]; - _rightFollowVoiceView.backgroundColor = [MEWThemeColor mewColorWithHexString:@"#050505"]; + _rightFollowVoiceView.backgroundColor = [MewThemeColor mewColorWithHexString:@"#050505"]; _rightFollowVoiceView.hidden = YES; _rightFollowVoiceView.delegate = self; __weak typeof(self) weakSelf = self; diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewHeaderView.h b/yinmeng-ios/yinmeng-ios/Main/Home/View/SubView/MewHeaderView.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewHeaderView.h rename to yinmeng-ios/yinmeng-ios/Main/Home/View/SubView/MewHeaderView.h diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewHeaderView.m b/yinmeng-ios/yinmeng-ios/Main/Home/View/SubView/MewHeaderView.m similarity index 95% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewHeaderView.m rename to yinmeng-ios/yinmeng-ios/Main/Home/View/SubView/MewHeaderView.m index c82d9cd..4223ebf 100644 --- a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewHeaderView.m +++ b/yinmeng-ios/yinmeng-ios/Main/Home/View/SubView/MewHeaderView.m @@ -8,7 +8,7 @@ #import "MewHeaderView.h" /// Tool #import "MewMacro.h" -#import "MEWThemeColor.h" +#import "MewThemeColor.h" #import @interface MewHeaderView() @@ -117,11 +117,11 @@ // _filterButton.frame = CGRectMake(24, _voiceBgImageView.frame.size.height + 10.0, 61, 27); [_filterButton setImage:[UIImage imageNamed:@"mew_home_header_voice_filter"] forState:UIControlStateNormal]; [_filterButton setTitle:@"筛选" forState:UIControlStateNormal]; - [_filterButton setTitleColor:[MEWThemeColor mewColorWithHexString:@"#E1E4E6"] forState:UIControlStateNormal]; + [_filterButton setTitleColor:[MewThemeColor mewColorWithHexString:@"#E1E4E6"] forState:UIControlStateNormal]; _filterButton.titleLabel.font = kFontMedium(12); _filterButton.layer.cornerRadius = 14; _filterButton.layer.masksToBounds = YES; - _filterButton.backgroundColor = [MEWThemeColor mewColorWithHexString:@"#1D1E1F"]; + _filterButton.backgroundColor = [MewThemeColor mewColorWithHexString:@"#1D1E1F"]; _filterButton.selected = NO; [_filterButton addTarget:self action:@selector(filterButtonAction:) forControlEvents:UIControlEventTouchUpInside]; } @@ -134,11 +134,11 @@ // _reviewLoadButton.frame = CGRectMake(CGRectGetMaxX(_filterButton.frame) + 20, CGRectGetMinY(_filterButton.frame), 76, 27); [_reviewLoadButton setImage:[UIImage imageNamed:@"mew_home_header_renew_voice"] forState:UIControlStateNormal]; [_reviewLoadButton setTitle:@"换一换" forState:UIControlStateNormal]; - [_reviewLoadButton setTitleColor:[MEWThemeColor mewColorWithHexString:@"#E1E4E6"] forState:UIControlStateNormal]; + [_reviewLoadButton setTitleColor:[MewThemeColor mewColorWithHexString:@"#E1E4E6"] forState:UIControlStateNormal]; _reviewLoadButton.titleLabel.font = kFontMedium(12); _reviewLoadButton.layer.cornerRadius = 14; _reviewLoadButton.layer.masksToBounds = YES; - _reviewLoadButton.backgroundColor = [MEWThemeColor mewColorWithHexString:@"#1D1E1F"]; + _reviewLoadButton.backgroundColor = [MewThemeColor mewColorWithHexString:@"#1D1E1F"]; [_reviewLoadButton addTarget:self action:@selector(reviewLoadButtonAction) forControlEvents:UIControlEventTouchUpInside]; } diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewHomeFilterView.h b/yinmeng-ios/yinmeng-ios/Main/Home/View/SubView/MewHomeFilterView.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewHomeFilterView.h rename to yinmeng-ios/yinmeng-ios/Main/Home/View/SubView/MewHomeFilterView.h diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewHomeFilterView.m b/yinmeng-ios/yinmeng-ios/Main/Home/View/SubView/MewHomeFilterView.m similarity index 96% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewHomeFilterView.m rename to yinmeng-ios/yinmeng-ios/Main/Home/View/SubView/MewHomeFilterView.m index f501917..c348a1c 100644 --- a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewHomeFilterView.m +++ b/yinmeng-ios/yinmeng-ios/Main/Home/View/SubView/MewHomeFilterView.m @@ -10,7 +10,7 @@ #import /// Tool #import "MewMacro.h" -#import "MEWThemeColor.h" +#import "MewThemeColor.h" @interface MewHomeFilterView() @property (nonatomic, copy) NSArray *datas; @@ -72,7 +72,7 @@ static NSInteger targetIndex = 0; CGFloat margin = (107 - 3 * 28 - 2 * 6.0)/2; for (int i = 0; i < self.datas.count; i++) { UIView *colorBgView = [[UIView alloc] init]; - colorBgView.backgroundColor = i==targetIndex ? [MEWThemeColor mewColorWithHexString:@"#DCDDE0"] : UIColor.clearColor; + colorBgView.backgroundColor = i==targetIndex ? [MewThemeColor mewColorWithHexString:@"#DCDDE0"] : UIColor.clearColor; colorBgView.tag = i; colorBgView.layer.cornerRadius = 6; colorBgView.layer.masksToBounds = YES; @@ -89,7 +89,7 @@ static NSInteger targetIndex = 0; UILabel *titleLabel = [[UILabel alloc] init]; titleLabel.text = self.datas[i]; - titleLabel.textColor = [MEWThemeColor mewColorWithHexString:@"#1F1B4F"]; + titleLabel.textColor = [MewThemeColor mewColorWithHexString:@"#1F1B4F"]; titleLabel.font = kFontMedium(12); titleLabel.textAlignment = NSTextAlignmentCenter; [colorBgView addSubview:titleLabel]; diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewPlayVoiceView.h b/yinmeng-ios/yinmeng-ios/Main/Home/View/SubView/MewPlayVoiceView.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewPlayVoiceView.h rename to yinmeng-ios/yinmeng-ios/Main/Home/View/SubView/MewPlayVoiceView.h diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewPlayVoiceView.m b/yinmeng-ios/yinmeng-ios/Main/Home/View/SubView/MewPlayVoiceView.m similarity index 97% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewPlayVoiceView.m rename to yinmeng-ios/yinmeng-ios/Main/Home/View/SubView/MewPlayVoiceView.m index b5287cf..e415d17 100644 --- a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewPlayVoiceView.m +++ b/yinmeng-ios/yinmeng-ios/Main/Home/View/SubView/MewPlayVoiceView.m @@ -12,7 +12,7 @@ #import /// Tool #import "UIImage+MewUtils.h" -#import "MEWThemeColor.h" +#import "MewThemeColor.h" #import "MewMacro.h" #import "MewHUDTool.h" #import "MewButton.h" @@ -195,9 +195,9 @@ _pushVoiceButton.layer.cornerRadius = 52.0/2; _pushVoiceButton.layer.masksToBounds = YES; UIImage *backgroundImage = [UIImage mew_gradientColorImageFromColors:@[ - [MEWThemeColor mewColorWithHexString:@"#FF60FD"], - [MEWThemeColor mewColorWithHexString:@"##8974FF"], - [MEWThemeColor mewColorWithHexString:@"#69EBFF"] + [MewThemeColor mewColorWithHexString:@"#FF60FD"], + [MewThemeColor mewColorWithHexString:@"##8974FF"], + [MewThemeColor mewColorWithHexString:@"#69EBFF"] ] gradientType:MewGradientTypeLeftToRight imgSize:CGSizeMake(200, 52)]; _pushVoiceButton.backgroundColor = [UIColor colorWithPatternImage:backgroundImage]; [_pushVoiceButton addTarget:self action:@selector(pushVoiceButtonAction) forControlEvents:UIControlEventTouchUpInside]; diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewPushExclusiveVoiceView.h b/yinmeng-ios/yinmeng-ios/Main/Home/View/SubView/MewPushExclusiveVoiceView.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewPushExclusiveVoiceView.h rename to yinmeng-ios/yinmeng-ios/Main/Home/View/SubView/MewPushExclusiveVoiceView.h diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewPushExclusiveVoiceView.m b/yinmeng-ios/yinmeng-ios/Main/Home/View/SubView/MewPushExclusiveVoiceView.m similarity index 97% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewPushExclusiveVoiceView.m rename to yinmeng-ios/yinmeng-ios/Main/Home/View/SubView/MewPushExclusiveVoiceView.m index 71d4671..a34f3d6 100644 --- a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewPushExclusiveVoiceView.m +++ b/yinmeng-ios/yinmeng-ios/Main/Home/View/SubView/MewPushExclusiveVoiceView.m @@ -8,7 +8,7 @@ #import "MewPushExclusiveVoiceView.h" /// Tool #import "MewMacro.h" -#import "MEWThemeColor.h" +#import "MewThemeColor.h" #import "UIImage+MewUtils.h" #import "MewUtility.h" #import "MewAccountInfoStorage.h" @@ -359,7 +359,7 @@ static MewPushExclusiveVoiceView *_exclusiveVoiceView = nil; } self.longTapColorView.hidden = NO; - self.longTapColorView.backgroundColor = [MEWThemeColor mewColorWithHexString:isRecord ? @"#FF43B1" : @"#43F4FF"]; + self.longTapColorView.backgroundColor = [MewThemeColor mewColorWithHexString:isRecord ? @"#FF43B1" : @"#43F4FF"]; } /// 初始化录音对象 @@ -383,7 +383,7 @@ static MewPushExclusiveVoiceView *_exclusiveVoiceView = nil; NSDateFormatter *dateFormat = [[NSDateFormatter alloc] init]; [dateFormat setDateFormat:@"yyyy-MM-dd HH:mm:ss"]; NSString *date = [dateFormat stringFromDate:[NSDate date]]; - self.fileName = [NSString stringWithFormat:@"voiceShow_%@_%@.wav", [MewAccountInfoStorage instance].getUid, date]; + self.fileName = [NSString stringWithFormat:@"voiceShow_%@_%@.wav", [MewAccountInfoStorage instance].mew_getUid, date]; NSFileManager *fileMgr = [[NSFileManager alloc] init]; //创建文件管理器 NSString *filePath = [[NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) mewSafeObjectAtIndex:0] stringByAppendingPathComponent:@"voiceShow"]; @@ -529,7 +529,7 @@ static MewPushExclusiveVoiceView *_exclusiveVoiceView = nil; CGFloat imageWidth = 60; CGFloat marginX = (KScreenWidth - 48 - 20.0 - 4 * imageWidth)/5; UIButton *muteButton = [[UIButton alloc] init]; - muteButton.backgroundColor = [MEWThemeColor mewColorWithHexString:@"#444F75"]; + muteButton.backgroundColor = [MewThemeColor mewColorWithHexString:@"#444F75"]; [muteButton setImage:[UIImage imageNamed:@"mew_home_change_voice_bg"] forState:UIControlStateSelected]; [muteButton setImage:[UIImage imageNamed:@"mew_home_change_voice_nomarl"] forState:UIControlStateNormal]; muteButton.layer.cornerRadius = 8; @@ -554,7 +554,7 @@ static MewPushExclusiveVoiceView *_exclusiveVoiceView = nil; UILabel *muteLabel = [[UILabel alloc] init]; muteLabel.text = self.voiceTitleArrays[i]; muteLabel.font = kFontRegular(12); - muteLabel.textColor = [MEWThemeColor mewColorWithHexString:@"#F0F0F0"]; + muteLabel.textColor = [MewThemeColor mewColorWithHexString:@"#F0F0F0"]; [self.voiceView addSubview:muteLabel]; [muteLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.equalTo(muteImageView.mas_bottom).offset(5.0); @@ -584,7 +584,7 @@ static MewPushExclusiveVoiceView *_exclusiveVoiceView = nil; - (UIView *)whiteBgView { if (!_whiteBgView) { _whiteBgView = [[UIView alloc] init]; - _whiteBgView.backgroundColor = [MEWThemeColor mewColorWithHexString:@"#525566"];; + _whiteBgView.backgroundColor = [MewThemeColor mewColorWithHexString:@"#525566"];; _whiteBgView.layer.cornerRadius = 15.0; _whiteBgView.layer.masksToBounds = YES; } @@ -633,7 +633,7 @@ static MewPushExclusiveVoiceView *_exclusiveVoiceView = nil; - (UIView *)longTapView { if (!_longTapView) { _longTapView = [[UIView alloc] init]; - _longTapView.backgroundColor = [MEWThemeColor mewColorWithHexString:@"#9552FF"]; + _longTapView.backgroundColor = [MewThemeColor mewColorWithHexString:@"#9552FF"]; _longTapView.layer.cornerRadius = 24.0; _longTapView.layer.masksToBounds = YES; //长按 @@ -665,7 +665,7 @@ static MewPushExclusiveVoiceView *_exclusiveVoiceView = nil; - (UIView *)longTapColorView { if (!_longTapColorView) { _longTapColorView = [[UIView alloc] init]; - _longTapColorView.backgroundColor = [MEWThemeColor mewColorWithHexString:@"#43F4FF"]; + _longTapColorView.backgroundColor = [MewThemeColor mewColorWithHexString:@"#43F4FF"]; _longTapColorView.layer.cornerRadius = 6.0/2.0; _longTapColorView.layer.masksToBounds = YES; } @@ -695,7 +695,7 @@ static MewPushExclusiveVoiceView *_exclusiveVoiceView = nil; - (UIView *)textBgView { if (!_textBgView) { _textBgView = [[UIView alloc] init]; - _textBgView.backgroundColor = [MEWThemeColor mewColorWithHexString:@"#DCDDE0"]; + _textBgView.backgroundColor = [MewThemeColor mewColorWithHexString:@"#DCDDE0"]; _textBgView.layer.cornerRadius = 11.0; _textBgView.layer.masksToBounds = YES; } @@ -706,7 +706,7 @@ static MewPushExclusiveVoiceView *_exclusiveVoiceView = nil; _textView = [[UITextView alloc] init]; _textView.delegate = self; _textView.font = kFontRegular(13); - _textView.textColor = [MEWThemeColor mewColorWithHexString:@"#7D8499"]; + _textView.textColor = [MewThemeColor mewColorWithHexString:@"#7D8499"]; _textView.backgroundColor = UIColor.clearColor; } return _textView; @@ -715,7 +715,7 @@ static MewPushExclusiveVoiceView *_exclusiveVoiceView = nil; if (!_placeholdLabel) { _placeholdLabel = [[UILabel alloc] init]; _placeholdLabel.text = @"说点什么..."; - _placeholdLabel.textColor = [MEWThemeColor mewColorWithHexString:@"#7D8499"]; + _placeholdLabel.textColor = [MewThemeColor mewColorWithHexString:@"#7D8499"]; _placeholdLabel.font = kFontRegular(13); } return _placeholdLabel; @@ -729,7 +729,7 @@ static MewPushExclusiveVoiceView *_exclusiveVoiceView = nil; _pushVoiceButton.titleLabel.font = kFontSemibold(16); _pushVoiceButton.layer.cornerRadius = 23.0; _pushVoiceButton.layer.masksToBounds = YES; - UIImage *image = [UIImage mew_gradientColorImageFromColors:@[[MEWThemeColor mewColorWithHexString:@"#FF60FD"], [MEWThemeColor mewColorWithHexString:@"#8974FF"],[MEWThemeColor mewColorWithHexString:@"#69EBFF"]] gradientType:MewGradientTypeLeftToRight imgSize:CGSizeMake(KScreenWidth - 4 * 28, 46)]; + UIImage *image = [UIImage mew_gradientColorImageFromColors:@[[MewThemeColor mewColorWithHexString:@"#FF60FD"], [MewThemeColor mewColorWithHexString:@"#8974FF"],[MewThemeColor mewColorWithHexString:@"#69EBFF"]] gradientType:MewGradientTypeLeftToRight imgSize:CGSizeMake(KScreenWidth - 4 * 28, 46)]; _pushVoiceButton.backgroundColor = [UIColor colorWithPatternImage:image]; [_pushVoiceButton addTarget:self action:@selector(pushWithRecordVoice) forControlEvents:UIControlEventTouchUpInside]; } diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewRightFollowVoiceCollectionCell.h b/yinmeng-ios/yinmeng-ios/Main/Home/View/SubView/MewRightFollowVoiceCollectionCell.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewRightFollowVoiceCollectionCell.h rename to yinmeng-ios/yinmeng-ios/Main/Home/View/SubView/MewRightFollowVoiceCollectionCell.h diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewRightFollowVoiceCollectionCell.m b/yinmeng-ios/yinmeng-ios/Main/Home/View/SubView/MewRightFollowVoiceCollectionCell.m similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewRightFollowVoiceCollectionCell.m rename to yinmeng-ios/yinmeng-ios/Main/Home/View/SubView/MewRightFollowVoiceCollectionCell.m diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewRightFollowVoiceView.h b/yinmeng-ios/yinmeng-ios/Main/Home/View/SubView/MewRightFollowVoiceView.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewRightFollowVoiceView.h rename to yinmeng-ios/yinmeng-ios/Main/Home/View/SubView/MewRightFollowVoiceView.h diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewRightFollowVoiceView.m b/yinmeng-ios/yinmeng-ios/Main/Home/View/SubView/MewRightFollowVoiceView.m similarity index 95% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewRightFollowVoiceView.m rename to yinmeng-ios/yinmeng-ios/Main/Home/View/SubView/MewRightFollowVoiceView.m index 22a24a3..636717b 100644 --- a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewRightFollowVoiceView.m +++ b/yinmeng-ios/yinmeng-ios/Main/Home/View/SubView/MewRightFollowVoiceView.m @@ -12,7 +12,7 @@ #import /// Tool #import "MewMacro.h" -#import "MEWThemeColor.h" +#import "MewThemeColor.h" #import "MewFansInfoModel.h" #import "MewUserInfoModel.h" #import "NSArray+MewSafe.h" @@ -92,12 +92,12 @@ MJRefreshNormalHeader *header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(mew_headerRefresh)]; header.stateLabel.font = [UIFont systemFontOfSize:10.0]; header.lastUpdatedTimeLabel.font = [UIFont systemFontOfSize:10.0]; - header.stateLabel.textColor = [MEWThemeColor mewSecondTextColor]; - header.lastUpdatedTimeLabel.textColor = [MEWThemeColor mewSecondTextColor]; + header.stateLabel.textColor = [MewThemeColor mewSecondTextColor]; + header.lastUpdatedTimeLabel.textColor = [MewThemeColor mewSecondTextColor]; self.followCollectionView.mj_header = header; MJRefreshBackNormalFooter *footer = [MJRefreshBackNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(mew_footerRefresh)]; - footer.stateLabel.textColor = [MEWThemeColor mewSecondTextColor]; + footer.stateLabel.textColor = [MewThemeColor mewSecondTextColor]; footer.stateLabel.font = [UIFont systemFontOfSize:10.0]; self.followCollectionView.mj_footer = footer; diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewShowVoiceView.h b/yinmeng-ios/yinmeng-ios/Main/Home/View/SubView/MewShowVoiceView.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewShowVoiceView.h rename to yinmeng-ios/yinmeng-ios/Main/Home/View/SubView/MewShowVoiceView.h diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewShowVoiceView.m b/yinmeng-ios/yinmeng-ios/Main/Home/View/SubView/MewShowVoiceView.m similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewShowVoiceView.m rename to yinmeng-ios/yinmeng-ios/Main/Home/View/SubView/MewShowVoiceView.m diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewUserIntroductionView.h b/yinmeng-ios/yinmeng-ios/Main/Home/View/SubView/MewUserIntroductionView.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewUserIntroductionView.h rename to yinmeng-ios/yinmeng-ios/Main/Home/View/SubView/MewUserIntroductionView.h diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewUserIntroductionView.m b/yinmeng-ios/yinmeng-ios/Main/Home/View/SubView/MewUserIntroductionView.m similarity index 98% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewUserIntroductionView.m rename to yinmeng-ios/yinmeng-ios/Main/Home/View/SubView/MewUserIntroductionView.m index db5518f..760c521 100644 --- a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewUserIntroductionView.m +++ b/yinmeng-ios/yinmeng-ios/Main/Home/View/SubView/MewUserIntroductionView.m @@ -11,7 +11,7 @@ #import "MewUserInfoModel.h" /// Tool #import "MewMacro.h" -#import "MEWThemeColor.h" +#import "MewThemeColor.h" #import "MewAudioPlayerManager.h" /// Third #import @@ -372,7 +372,7 @@ static MewUserIntroductionView *_userIntroductionView = nil; - (UIView *)whiteBgView { if (!_whiteBgView) { _whiteBgView = [[UIView alloc] init]; - _whiteBgView.backgroundColor = [MEWThemeColor mewColorWithHexString:@"#525566"]; + _whiteBgView.backgroundColor = [MewThemeColor mewColorWithHexString:@"#525566"]; _whiteBgView.layer.cornerRadius = 16; _whiteBgView.layer.masksToBounds = YES; } @@ -449,10 +449,10 @@ static MewUserIntroductionView *_userIntroductionView = nil; _starSignLabel.text = @"天蝎座"; _starSignLabel.textAlignment = NSTextAlignmentCenter; _starSignLabel.font = kFontRegular(10); - _starSignLabel.textColor = [MEWThemeColor mewColorWithHexString:@"#9168FA"]; + _starSignLabel.textColor = [MewThemeColor mewColorWithHexString:@"#9168FA"]; _starSignLabel.layer.cornerRadius = 9.0; _starSignLabel.layer.masksToBounds = YES; - _starSignLabel.backgroundColor = [MEWThemeColor mewColorWithHexString:@"#E9E1FF"]; + _starSignLabel.backgroundColor = [MewThemeColor mewColorWithHexString:@"#E9E1FF"]; } return _starSignLabel; } @@ -462,7 +462,7 @@ static MewUserIntroductionView *_userIntroductionView = nil; - (UIView *)voiceIntroductionView { if (!_voiceIntroductionView) { _voiceIntroductionView = [[UIView alloc] init]; - _voiceIntroductionView.backgroundColor = [MEWThemeColor mewColorWithHexString:@"#DCDDE0"]; + _voiceIntroductionView.backgroundColor = [MewThemeColor mewColorWithHexString:@"#DCDDE0"]; _voiceIntroductionView.layer.cornerRadius = 11.0; _voiceIntroductionView.layer.masksToBounds = YES; } @@ -474,7 +474,7 @@ static MewUserIntroductionView *_userIntroductionView = nil; _voiceTitleLabel = [[UILabel alloc] init]; _voiceTitleLabel.text = @"这是一段用户签名，这是一段用户签名，这是一段用户签名~"; _voiceTitleLabel.font = kFontRegular(13); - _voiceTitleLabel.textColor = [MEWThemeColor mewColorWithHexString:@"#1F1B4F"]; + _voiceTitleLabel.textColor = [MewThemeColor mewColorWithHexString:@"#1F1B4F"]; _voiceTitleLabel.numberOfLines = 0; } return _voiceTitleLabel; @@ -512,7 +512,7 @@ static MewUserIntroductionView *_userIntroductionView = nil; _voiceTimeLabel = [[UILabel alloc] init]; _voiceTimeLabel.text = @"30”"; _voiceTimeLabel.font = kFontMedium(14); - _voiceTimeLabel.textColor = [MEWThemeColor mewColorWithHexString:@"#1F1B4F"]; + _voiceTimeLabel.textColor = [MewThemeColor mewColorWithHexString:@"#1F1B4F"]; } return _voiceTimeLabel; } diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewVoiceDiscView.h b/yinmeng-ios/yinmeng-ios/Main/Home/View/SubView/MewVoiceDiscView.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewVoiceDiscView.h rename to yinmeng-ios/yinmeng-ios/Main/Home/View/SubView/MewVoiceDiscView.h diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewVoiceDiscView.m b/yinmeng-ios/yinmeng-ios/Main/Home/View/SubView/MewVoiceDiscView.m similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewVoiceDiscView.m rename to yinmeng-ios/yinmeng-ios/Main/Home/View/SubView/MewVoiceDiscView.m diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewVoiceGuideView.h b/yinmeng-ios/yinmeng-ios/Main/Home/View/SubView/MewVoiceGuideView.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewVoiceGuideView.h rename to yinmeng-ios/yinmeng-ios/Main/Home/View/SubView/MewVoiceGuideView.h diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewVoiceGuideView.m b/yinmeng-ios/yinmeng-ios/Main/Home/View/SubView/MewVoiceGuideView.m similarity index 97% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewVoiceGuideView.m rename to yinmeng-ios/yinmeng-ios/Main/Home/View/SubView/MewVoiceGuideView.m index 3afdf13..5204c64 100644 --- a/yinmeng-ios/yinmeng-ios/Main/Mew/Home/View/SubView/MewVoiceGuideView.m +++ b/yinmeng-ios/yinmeng-ios/Main/Home/View/SubView/MewVoiceGuideView.m @@ -7,7 +7,7 @@ #import "MewVoiceGuideView.h" /// Tool -#import "MEWThemeColor.h" +#import "MewThemeColor.h" #import "MewMacro.h" #import @@ -125,7 +125,7 @@ static MewVoiceGuideView *_guideView = nil; - (UIView *)guideBgView { if (!_guideBgView) { _guideBgView = [[UIView alloc] init]; - _guideBgView.backgroundColor = [MEWThemeColor mewColorWithHexString:@"#6A60FF"]; + _guideBgView.backgroundColor = [MewThemeColor mewColorWithHexString:@"#6A60FF"]; } return _guideBgView; } diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/IM/Model/MewAttachmentModel.h b/yinmeng-ios/yinmeng-ios/Main/IM/Model/MewAttachmentModel.h similarity index 61% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/IM/Model/MewAttachmentModel.h rename to yinmeng-ios/yinmeng-ios/Main/IM/Model/MewAttachmentModel.h index c336d60..f32f8b7 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/IM/Model/MewAttachmentModel.h +++ b/yinmeng-ios/yinmeng-ios/Main/IM/Model/MewAttachmentModel.h @@ -32,59 +32,59 @@ typedef NS_ENUM(NSUInteger, Mew_CustomMessageType) { ///first = Mew_CustomMessageType_Room_Tip typedef NS_ENUM(NSUInteger, MewCustomMessageSubRoomTip) { ///分享房间 - Custom_Message_Sub_Room_Tip_ShareRoom = 21, + Mew_Custom_Message_Sub_Room_Tip_ShareRoom = 21, ///关注房主 - Custom_Message_Sub_Room_Tip_Attention_Owner = 22, + Mew_Custom_Message_Sub_Room_Tip_Attention_Owner = 22, }; ///first = Mew_CustomMessageType_Gift -typedef NS_ENUM(NSUInteger, CustomMessageSubGift) { +typedef NS_ENUM(NSUInteger, MewCustomMessageSubGift) { ///发送礼物 - Custom_Message_Sub_Gift_Send = 31, + Mew_Custom_Message_Sub_Gift_Send = 31, ///全服发送礼物 - Custom_Message_Sub_Gift_ChannelNotify = 32, + Mew_Custom_Message_Sub_Gift_ChannelNotify = 32, ///发送 福袋 礼物 - Custom_Message_Sub_Gift_LuckySend = 34, + Mew_Custom_Message_Sub_Gift_LuckySend = 34, }; ///first = Mew_CustomMessageType_Queue -typedef NS_ENUM(NSInteger, CustomMessageSubQueue) { +typedef NS_ENUM(NSInteger, MewCustomMessageSubQueue) { ///踢下麦 - Custom_Message_Sub_Queue_Kick = 82, + Mew_Custom_Message_Sub_Queue_Kick = 82, }; //first = Mew_CustomMessageType_Face -typedef NS_ENUM(NSUInteger, CustomMessageSubFace) { +typedef NS_ENUM(NSUInteger, MewCustomMessageSubFace) { ///发送 - Custom_Message_Sub_Face_Send = 91, + Mew_Custom_Message_Sub_Face_Send = 91, }; ///first = Mew_CustomMessageType_ALLMicroSend -typedef NS_ENUM(NSUInteger, CustomMessageSubAllMicroSend) { +typedef NS_ENUM(NSUInteger, MewCustomMessageSubAllMicroSend) { ///全麦送礼物 - Custom_Message_Sub_AllMicroSend = 121, + Mew_Custom_Message_Sub_AllMicroSend = 121, ///非全麦 多人送礼 - Custom_Message_Sub_AllBatchSend = 123, + Mew_Custom_Message_Sub_AllBatchSend = 123, ///非全麦 多人送福袋礼物 - Custom_Message_Sub_AllBatchMicroLuckySend = 124, + Mew_Custom_Message_Sub_AllBatchMicroLuckySend = 124, ///全麦送 福袋 礼物 122老版本占用了 - Custom_Message_Sub_AllMicroLuckySend = 125, + Mew_Custom_Message_Sub_AllMicroLuckySend = 125, }; ///first = Mew_CustomMessageType_Kick_User -typedef NS_ENUM(NSUInteger, CustomNotificationSubKick) { +typedef NS_ENUM(NSUInteger, MewCustomNotificationSubKick) { ///拉黑 - Custom_Message_Sub_Kick_BlackList = 182, + Mew_Custom_Message_Sub_Kick_BlackList = 182, ///踢出房间 - Custom_Message_Sub_Kick_BeKicked = 181, + Mew_Custom_Message_Sub_Kick_BeKicked = 181, }; ///first = Mew_CustomMessageType_Room_GiftValue -typedef NS_ENUM(NSUInteger, CustomMessageSubRoomGiftValue) { +typedef NS_ENUM(NSUInteger, MewCustomMessageSubRoomGiftValue) { ///礼物值同步 - Custom_Message_Sub_Room_GiftValue_Sync = 421 + Mew_Custom_Message_Sub_Room_GiftValue_Sync = 421 }; @interface MewAttachmentModel : NSObject diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/IM/Model/MewAttachmentModel.m b/yinmeng-ios/yinmeng-ios/Main/IM/Model/MewAttachmentModel.m similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/IM/Model/MewAttachmentModel.m rename to yinmeng-ios/yinmeng-ios/Main/IM/Model/MewAttachmentModel.m diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/IM/Tool/MewCustomAttachmentDecoder.h b/yinmeng-ios/yinmeng-ios/Main/IM/Tool/MewCustomAttachmentDecoder.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/IM/Tool/MewCustomAttachmentDecoder.h rename to yinmeng-ios/yinmeng-ios/Main/IM/Tool/MewCustomAttachmentDecoder.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/IM/Tool/MewCustomAttachmentDecoder.m b/yinmeng-ios/yinmeng-ios/Main/IM/Tool/MewCustomAttachmentDecoder.m similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/IM/Tool/MewCustomAttachmentDecoder.m rename to yinmeng-ios/yinmeng-ios/Main/IM/Tool/MewCustomAttachmentDecoder.m diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Api/Api+Login.h b/yinmeng-ios/yinmeng-ios/Main/Login/Api/Api+Login.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Api/Api+Login.h rename to yinmeng-ios/yinmeng-ios/Main/Login/Api/Api+Login.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Api/Api+Login.m b/yinmeng-ios/yinmeng-ios/Main/Login/Api/Api+Login.m similarity index 87% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Api/Api+Login.m rename to yinmeng-ios/yinmeng-ios/Main/Login/Api/Api+Login.m index 9528ab4..eca3089 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Api/Api+Login.m +++ b/yinmeng-ios/yinmeng-ios/Main/Login/Api/Api+Login.m @@ -6,11 +6,11 @@ // #import "Api+Login.h" -#import "NewEncryptTool.h" +#import "MewEncryptTool.h" @implementation Api (Login) /// 一键登录 + (void)Mew_PhoneQuickLogin:(MewHttpRequestHelperCompletion)completion accessToken:(NSString *)accessToken token:(NSString *)token { - NSString *getUrl = [NewEncryptTool MEW_aesDecrypt:@"5OuUEI/lxBioS84/A1+LB6USUuyY1yofu3VeNn4bGRA="];///acc/oneclick/login + NSString *getUrl = [MewEncryptTool MEW_aesDecrypt:@"5OuUEI/lxBioS84/A1+LB6USUuyY1yofu3VeNn4bGRA="];///acc/oneclick/login [self makeRequest:getUrl method:MewHttpRequestHelperMethodPOST completion:completion, __FUNCTION__, accessToken, token, nil]; } @@ -19,7 +19,7 @@ /// @param phone 手机号 /// @param code 验证码 + (void)Mew_LoginWithCode:(MewHttpRequestHelperCompletion)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 + NSString *getUrl = [MewEncryptTool MEW_aesDecrypt:@"QFgInRYQSkXdbIyvBsVUvA=="];////oauth/token [self makeRequest:getUrl method:MewHttpRequestHelperMethodPOST completion:completion, __FUNCTION__,phone,code,client_secret,version, client_id, grant_type, nil]; } @@ -28,7 +28,7 @@ /// @param phone 手机号 /// @param password 验证码 + (void)Mew_LoginWithPassword:(MewHttpRequestHelperCompletion)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 + NSString *getUrl = [MewEncryptTool MEW_aesDecrypt:@"QFgInRYQSkXdbIyvBsVUvA=="];///oauth/token [self makeRequest:getUrl method:MewHttpRequestHelperMethodPOST completion:completion, __FUNCTION__,phone,password,client_secret,version, client_id, grant_type, nil]; } @@ -38,7 +38,7 @@ /// @param newPwd 新的密码 /// @param smsCode 验证码 + (void)Mew_ResetPasswordWithPhone:(MewHttpRequestHelperCompletion)completion phone:(NSString *)phone newPwd:(NSString *)newPwd smsCode:(NSString *)smsCode { - NSString *getUrl = [NewEncryptTool MEW_aesDecrypt:@"ZstXKg9XrXuRUPW6jNgkzQ=="];///acc/pwd/reset + NSString *getUrl = [MewEncryptTool MEW_aesDecrypt:@"ZstXKg9XrXuRUPW6jNgkzQ=="];///acc/pwd/reset [self makeRequest:getUrl method:MewHttpRequestHelperMethodPOST completion:completion, __FUNCTION__, phone, newPwd, smsCode, nil]; } @@ -50,14 +50,14 @@ /// @param access_token access_token /// @param type 第三方登录的类型 + (void)Mew_LoginWithThirdPart:(MewHttpRequestHelperCompletion)completion openid:(NSString *)openid unionid:(NSString *)unionid access_token:(NSString *)access_token type:(NSString *)type { - NSString *getUrl = [NewEncryptTool MEW_aesDecrypt:@"jenVNOO6MbwSC77wnPIMng=="];///acc/third/login + NSString *getUrl = [MewEncryptTool MEW_aesDecrypt:@"jenVNOO6MbwSC77wnPIMng=="];///acc/third/login [self makeRequest:getUrl method:MewHttpRequestHelperMethodPOST completion:completion, __FUNCTION__, openid, unionid, access_token, type, nil]; } /// 随机获取一个昵称 /// @param completion 完成 + (void)Mew_RandomNick:(MewHttpRequestHelperCompletion)completion { - NSString *getUrl = [NewEncryptTool MEW_aesDecrypt:@"7oWMT+wxmM3FF/aCDKLrRw=="];////random/nick/get + NSString *getUrl = [MewEncryptTool MEW_aesDecrypt:@"7oWMT+wxmM3FF/aCDKLrRw=="];////random/nick/get [self makeRequest:getUrl method:MewHttpRequestHelperMethodPOST completion:completion, __FUNCTION__, nil]; } @@ -70,7 +70,7 @@ phone:(NSString *)phone code:(NSString *)code ticket:(NSString *)ticket { - NSString *getUrl = [NewEncryptTool MEW_aesDecrypt:@"l+R2IRWIqi9yPiDc6rg+jg=="];///withDraw/phone + NSString *getUrl = [MewEncryptTool MEW_aesDecrypt:@"l+R2IRWIqi9yPiDc6rg+jg=="];///withDraw/phone [self makeRequest:getUrl method:MewHttpRequestHelperMethodPOST completion:complection, __FUNCTION__, phone, code, ticket, nil]; } diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Model/MewThirdUserInfo.h b/yinmeng-ios/yinmeng-ios/Main/Login/Model/MewThirdUserInfo.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Model/MewThirdUserInfo.h rename to yinmeng-ios/yinmeng-ios/Main/Login/Model/MewThirdUserInfo.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Model/MewThirdUserInfo.m b/yinmeng-ios/yinmeng-ios/Main/Login/Model/MewThirdUserInfo.m similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Model/MewThirdUserInfo.m rename to yinmeng-ios/yinmeng-ios/Main/Login/Model/MewThirdUserInfo.m diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/LoginPresenter.h b/yinmeng-ios/yinmeng-ios/Main/Login/Presenter/LoginPresenter.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/LoginPresenter.h rename to yinmeng-ios/yinmeng-ios/Main/Login/Presenter/LoginPresenter.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginBindPhonePresent.h b/yinmeng-ios/yinmeng-ios/Main/Login/Presenter/MewLoginBindPhonePresent.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginBindPhonePresent.h rename to yinmeng-ios/yinmeng-ios/Main/Login/Presenter/MewLoginBindPhonePresent.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginBindPhonePresent.m b/yinmeng-ios/yinmeng-ios/Main/Login/Presenter/MewLoginBindPhonePresent.m similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginBindPhonePresent.m rename to yinmeng-ios/yinmeng-ios/Main/Login/Presenter/MewLoginBindPhonePresent.m diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginForgetPasswordPresent.h b/yinmeng-ios/yinmeng-ios/Main/Login/Presenter/MewLoginForgetPasswordPresent.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginForgetPasswordPresent.h rename to yinmeng-ios/yinmeng-ios/Main/Login/Presenter/MewLoginForgetPasswordPresent.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginForgetPasswordPresent.m b/yinmeng-ios/yinmeng-ios/Main/Login/Presenter/MewLoginForgetPasswordPresent.m similarity index 85% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginForgetPasswordPresent.m rename to yinmeng-ios/yinmeng-ios/Main/Login/Presenter/MewLoginForgetPasswordPresent.m index 47877cb..31c68f4 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginForgetPasswordPresent.m +++ b/yinmeng-ios/yinmeng-ios/Main/Login/Presenter/MewLoginForgetPasswordPresent.m @@ -24,9 +24,9 @@ /// 获取手机的验证码 /// @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 mew_phoneSmsCode:[self mew_createHttpCompletion:^(id _Nonnull data) { + [Api Mew_PhoneSmsCode:[self mew_createHttpCompletion:^(id _Nonnull data) { [[self mew_getView] mew_phoneSmsCodeSuccess]; }] mobile:desPhone type:[NSString stringWithFormat:@"%lu", (unsigned long)type]]; } @@ -35,7 +35,7 @@ /// @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 Mew_ResetPasswordWithPhone:[self mew_createHttpCompletion:^(MewBaseModel * _Nonnull data) { diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginFullInfoPresenter.h b/yinmeng-ios/yinmeng-ios/Main/Login/Presenter/MewLoginFullInfoPresenter.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginFullInfoPresenter.h rename to yinmeng-ios/yinmeng-ios/Main/Login/Presenter/MewLoginFullInfoPresenter.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginFullInfoPresenter.m b/yinmeng-ios/yinmeng-ios/Main/Login/Presenter/MewLoginFullInfoPresenter.m similarity index 90% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginFullInfoPresenter.m rename to yinmeng-ios/yinmeng-ios/Main/Login/Presenter/MewLoginFullInfoPresenter.m index 2051b9a..48fddb1 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginFullInfoPresenter.m +++ b/yinmeng-ios/yinmeng-ios/Main/Login/Presenter/MewLoginFullInfoPresenter.m @@ -24,7 +24,7 @@ #pragma mark - Public Method /// 获取保存的第三方的数据模型 -- (MewThirdUserInfo *)getThirdUserInfo { +- (MewThirdUserInfo *)mew_getMewThirdUserInfo { if ([MewAccountInfoStorage instance].thirdUserInfo) { return [MewAccountInfoStorage instance].thirdUserInfo; } @@ -32,7 +32,7 @@ } /// 随机获取昵称 -- (void)randomRequestNick { +- (void)mew_randomRequestNick { [Api Mew_RandomNick:[self mew_createHttpCompletion:^(MewBaseModel * _Nonnull data) { [[self mew_getView] mew_requestRandomNickSuccess:data.data]; }]]; @@ -46,14 +46,14 @@ /// @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 roomUid:(NSString * __nullable)roomUid shareUid:(NSString * __nullable)shareUid shareChannel:(NSString * __nullable)shareChannel { - NSString * uid = [[MewAccountInfoStorage instance] getUid]; + NSString * uid = [[MewAccountInfoStorage instance] mew_getUid]; NSString * ticket = [[MewAccountInfoStorage instance] mew_getTicket]; NSMutableDictionary * params = [NSMutableDictionary dictionary]; [params mewSafeSetObject:avatar forKey:@"avatar"]; @@ -77,7 +77,7 @@ [params mewSafeSetObject:shareChannel forKey:@"shareChannel"]; } - [Api mew_completeUserInfo:[self mew_createHttpCompletion:^(MewBaseModel * _Nonnull data) { + [Api Mew_CompleteUserInfo:[self mew_createHttpCompletion:^(MewBaseModel * _Nonnull data) { [[self mew_getView] mew_complementInfoSuccess]; }] userInfo:params]; } diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginPasswordPresent.h b/yinmeng-ios/yinmeng-ios/Main/Login/Presenter/MewLoginPasswordPresent.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginPasswordPresent.h rename to yinmeng-ios/yinmeng-ios/Main/Login/Presenter/MewLoginPasswordPresent.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginPasswordPresent.m b/yinmeng-ios/yinmeng-ios/Main/Login/Presenter/MewLoginPasswordPresent.m similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginPasswordPresent.m rename to yinmeng-ios/yinmeng-ios/Main/Login/Presenter/MewLoginPasswordPresent.m diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginPresenter.h b/yinmeng-ios/yinmeng-ios/Main/Login/Presenter/MewLoginPresenter.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginPresenter.h rename to yinmeng-ios/yinmeng-ios/Main/Login/Presenter/MewLoginPresenter.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginPresenter.m b/yinmeng-ios/yinmeng-ios/Main/Login/Presenter/MewLoginPresenter.m similarity index 95% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginPresenter.m rename to yinmeng-ios/yinmeng-ios/Main/Login/Presenter/MewLoginPresenter.m index d9ef6c4..f26afae 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginPresenter.m +++ b/yinmeng-ios/yinmeng-ios/Main/Login/Presenter/MewLoginPresenter.m @@ -23,7 +23,7 @@ #pragma mark - Public Method /// 一键登录 -- (void)Mew_PhoneQuickLogin:(NSString *)accessToken token:(NSString *)token { +- (void)mew_phoneQuickLogin:(NSString *)accessToken token:(NSString *)token { [Api Mew_PhoneQuickLogin:[self mew_createHttpCompletion:^(MewBaseModel * _Nonnull data) { }] accessToken:accessToken token:token]; diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginVerifBindPhonePresenter.h b/yinmeng-ios/yinmeng-ios/Main/Login/Presenter/MewLoginVerifBindPhonePresenter.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginVerifBindPhonePresenter.h rename to yinmeng-ios/yinmeng-ios/Main/Login/Presenter/MewLoginVerifBindPhonePresenter.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginVerifBindPhonePresenter.m b/yinmeng-ios/yinmeng-ios/Main/Login/Presenter/MewLoginVerifBindPhonePresenter.m similarity index 93% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginVerifBindPhonePresenter.m rename to yinmeng-ios/yinmeng-ios/Main/Login/Presenter/MewLoginVerifBindPhonePresenter.m index a3e47d8..4207a97 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginVerifBindPhonePresenter.m +++ b/yinmeng-ios/yinmeng-ios/Main/Login/Presenter/MewLoginVerifBindPhonePresenter.m @@ -22,7 +22,7 @@ - (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 mew_phoneSmsCode:[self mew_createHttpCompletion:^(MewBaseModel * _Nonnull data) { + [Api Mew_PhoneSmsCode:[self mew_createHttpCompletion:^(MewBaseModel * _Nonnull data) { [[self mew_getView] mew_phoneSmsCodeSuccess]; }] mobile:desPhone type:typeStr]; @@ -33,7 +33,7 @@ /// @param moblieNum 手机号码 /// @param code 验证码 - (void)mew_checkMoblieCodeWithMoblie:(NSString *)moblieNum code:(NSString *)code { - NSString * uid = [[MewAccountInfoStorage instance] getUid]; + NSString * uid = [[MewAccountInfoStorage instance] mew_getUid]; NSString * ticket = [[MewAccountInfoStorage instance] mew_getTicket]; NSString * desPhone = [DESEncrypt encryptUseDES:moblieNum key:KeyWithType(KeyType_PasswordEncode)]; // [Api checkMoblieCode:[self mew_createHttpCompletion:^(MewBaseModel * _Nonnull data) { diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginVerifCodePresent.h b/yinmeng-ios/yinmeng-ios/Main/Login/Presenter/MewLoginVerifCodePresent.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginVerifCodePresent.h rename to yinmeng-ios/yinmeng-ios/Main/Login/Presenter/MewLoginVerifCodePresent.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginVerifCodePresent.m b/yinmeng-ios/yinmeng-ios/Main/Login/Presenter/MewLoginVerifCodePresent.m similarity index 97% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginVerifCodePresent.m rename to yinmeng-ios/yinmeng-ios/Main/Login/Presenter/MewLoginVerifCodePresent.m index 169fea8..727d3e3 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MewLoginVerifCodePresent.m +++ b/yinmeng-ios/yinmeng-ios/Main/Login/Presenter/MewLoginVerifCodePresent.m @@ -30,7 +30,7 @@ - (void)mew_phoneSmsCode:(NSString *)phone type:(GetSmsType)type { NSString *desPhone = [DESEncrypt encryptUseDES:phone key:KeyWithType(KeyType_PasswordEncode)]; - [Api mew_phoneSmsCode:[self mew_createHttpCompletion:^(MewBaseModel * _Nonnull data) { + [Api Mew_PhoneSmsCode:[self mew_createHttpCompletion:^(MewBaseModel * _Nonnull data) { [[self mew_getView] mew_phoneSmsCodeSuccess]; }] mobile:desPhone type:[NSString stringWithFormat:@"%lu", (unsigned long)type]]; } diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MineLoginPasswordPresenter.h b/yinmeng-ios/yinmeng-ios/Main/Login/Presenter/MineLoginPasswordPresenter.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MineLoginPasswordPresenter.h rename to yinmeng-ios/yinmeng-ios/Main/Login/Presenter/MineLoginPasswordPresenter.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MineLoginPasswordPresenter.m b/yinmeng-ios/yinmeng-ios/Main/Login/Presenter/MineLoginPasswordPresenter.m similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Presenter/MineLoginPasswordPresenter.m rename to yinmeng-ios/yinmeng-ios/Main/Login/Presenter/MineLoginPasswordPresenter.m diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Protocol/MewLoginForgetPasswordProtocol.h b/yinmeng-ios/yinmeng-ios/Main/Login/Protocol/MewLoginForgetPasswordProtocol.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Protocol/MewLoginForgetPasswordProtocol.h rename to yinmeng-ios/yinmeng-ios/Main/Login/Protocol/MewLoginForgetPasswordProtocol.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Protocol/MewLoginFullInfoProtocol.h b/yinmeng-ios/yinmeng-ios/Main/Login/Protocol/MewLoginFullInfoProtocol.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Protocol/MewLoginFullInfoProtocol.h rename to yinmeng-ios/yinmeng-ios/Main/Login/Protocol/MewLoginFullInfoProtocol.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Protocol/MewLoginPasswordProtocol.h b/yinmeng-ios/yinmeng-ios/Main/Login/Protocol/MewLoginPasswordProtocol.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Protocol/MewLoginPasswordProtocol.h rename to yinmeng-ios/yinmeng-ios/Main/Login/Protocol/MewLoginPasswordProtocol.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Protocol/MewLoginProtocol.h b/yinmeng-ios/yinmeng-ios/Main/Login/Protocol/MewLoginProtocol.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Protocol/MewLoginProtocol.h rename to yinmeng-ios/yinmeng-ios/Main/Login/Protocol/MewLoginProtocol.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Protocol/MewLoginVerifBindPhoneProtocol.h b/yinmeng-ios/yinmeng-ios/Main/Login/Protocol/MewLoginVerifBindPhoneProtocol.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Protocol/MewLoginVerifBindPhoneProtocol.h rename to yinmeng-ios/yinmeng-ios/Main/Login/Protocol/MewLoginVerifBindPhoneProtocol.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Protocol/MewLoginVerifCodeProtocol.h b/yinmeng-ios/yinmeng-ios/Main/Login/Protocol/MewLoginVerifCodeProtocol.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Protocol/MewLoginVerifCodeProtocol.h rename to yinmeng-ios/yinmeng-ios/Main/Login/Protocol/MewLoginVerifCodeProtocol.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Protocol/MineLoginPasswordProtocol.h b/yinmeng-ios/yinmeng-ios/Main/Login/Protocol/MineLoginPasswordProtocol.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/Protocol/MineLoginPasswordProtocol.h rename to yinmeng-ios/yinmeng-ios/Main/Login/Protocol/MineLoginPasswordProtocol.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/CustomView/MewLoginForgetEditView.h b/yinmeng-ios/yinmeng-ios/Main/Login/View/CustomView/MewLoginForgetEditView.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/CustomView/MewLoginForgetEditView.h rename to yinmeng-ios/yinmeng-ios/Main/Login/View/CustomView/MewLoginForgetEditView.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/CustomView/MewLoginForgetEditView.m b/yinmeng-ios/yinmeng-ios/Main/Login/View/CustomView/MewLoginForgetEditView.m similarity index 91% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/CustomView/MewLoginForgetEditView.m rename to yinmeng-ios/yinmeng-ios/Main/Login/View/CustomView/MewLoginForgetEditView.m index bfc0377..060c0b8 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/CustomView/MewLoginForgetEditView.m +++ b/yinmeng-ios/yinmeng-ios/Main/Login/View/CustomView/MewLoginForgetEditView.m @@ -9,7 +9,7 @@ ///第三方 #import ///Tool -#import "MEWThemeColor.h" +#import "MewThemeColor.h" @interface MewLoginForgetEditView() /// @@ -30,14 +30,14 @@ - (instancetype)initWithFrame:(CGRect)frame { if (self = [super initWithFrame:frame]) { [self mew_initView]; - [self initConstrations]; + [self mew_initConstrations]; } return self; } #pragma mark - private method - (void)mew_initView { - self.backgroundColor = [MEWThemeColor mewAppCellBackgroundColor]; + self.backgroundColor = [MewThemeColor mewAppCellBackgroundColor]; [self addSubview:self.stackView]; [self addSubview:self.bottomLineView]; @@ -46,7 +46,7 @@ [self.stackView addArrangedSubview:self.authCodeButton]; } -- (void)initConstrations { +- (void)mew_initConstrations { [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.authCodeButton); make.left.right.mas_equalTo(self.bottomLineView); @@ -89,7 +89,7 @@ NSDictionary *dic = @{ NSParagraphStyleAttributeName:style, NSFontAttributeName:[UIFont systemFontOfSize:14], - NSForegroundColorAttributeName:[MEWThemeColor mewSecondTextColor]}; + NSForegroundColorAttributeName:[MewThemeColor mewSecondTextColor]}; if (placeholder == nil || placeholder.length == 0) { placeholder = @""; } @@ -101,7 +101,7 @@ if (!_textField) { _textField = [[UITextField alloc] init]; _textField.font = [UIFont systemFontOfSize:14]; - _textField.textColor = [MEWThemeColor mewMainTextColor]; + _textField.textColor = [MewThemeColor mewMainTextColor]; _textField.keyboardType = UIKeyboardTypeNumberPad; _textField.tintColor = UIColor.blackColor; } @@ -120,7 +120,7 @@ if (!_bottomLineView) { _bottomLineView = [[UIView alloc] init]; _bottomLineView.backgroundColor = UIColor.grayColor; -// _bottomLineView.backgroundColor = [MEWThemeColor mewDividerColor]; +// _bottomLineView.backgroundColor = [MewThemeColor mewDividerColor]; } return _bottomLineView; } @@ -130,7 +130,7 @@ _authCodeButton = [UIButton buttonWithType:UIButtonTypeCustom]; _authCodeButton.titleLabel.font = [UIFont systemFontOfSize:14]; [_authCodeButton setTitle:@"获取验证码" forState:UIControlStateNormal]; - [_authCodeButton setTitleColor:[MEWThemeColor mewSecondTextColor] forState:UIControlStateDisabled]; + [_authCodeButton setTitleColor:[MewThemeColor mewSecondTextColor] forState:UIControlStateDisabled]; [_authCodeButton setTitleColor:UIColor.blackColor forState:UIControlStateNormal]; } return _authCodeButton; diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/CustomView/MewLoginInputView.h b/yinmeng-ios/yinmeng-ios/Main/Login/View/CustomView/MewLoginInputView.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/CustomView/MewLoginInputView.h rename to yinmeng-ios/yinmeng-ios/Main/Login/View/CustomView/MewLoginInputView.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/CustomView/MewLoginInputView.m b/yinmeng-ios/yinmeng-ios/Main/Login/View/CustomView/MewLoginInputView.m similarity index 90% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/CustomView/MewLoginInputView.m rename to yinmeng-ios/yinmeng-ios/Main/Login/View/CustomView/MewLoginInputView.m index 343a00f..f68a8ef 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/CustomView/MewLoginInputView.m +++ b/yinmeng-ios/yinmeng-ios/Main/Login/View/CustomView/MewLoginInputView.m @@ -9,7 +9,7 @@ ///Third #import ///Tool -#import "MEWThemeColor.h" +#import "MewThemeColor.h" @interface MewLoginInputView() @@ -63,7 +63,7 @@ - (void)setPlaceHolder:(NSString *)placeHolder { _placeHolder = placeHolder; if (_placeHolder) { - self.textField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:_placeHolder attributes:@{NSForegroundColorAttributeName: [MEWThemeColor mewSecondTextColor], NSFontAttributeName:[UIFont systemFontOfSize:14]}]; + self.textField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:_placeHolder attributes:@{NSForegroundColorAttributeName: [MewThemeColor mewSecondTextColor], NSFontAttributeName:[UIFont systemFontOfSize:14]}]; } } @@ -89,7 +89,7 @@ if (!_titleLabel) { _titleLabel = [[UILabel alloc] init]; _titleLabel.font = [UIFont systemFontOfSize:18]; - _titleLabel.textColor = [MEWThemeColor mewMainTextColor]; + _titleLabel.textColor = [MewThemeColor mewMainTextColor]; _titleLabel.text = @"+86"; } return _titleLabel; @@ -98,7 +98,7 @@ - (UIView *)lineView { if (!_lineView) { _lineView = [[UIView alloc] init]; - _lineView.backgroundColor = [MEWThemeColor mewColorWithHexString:@"#F2F3F6"]; + _lineView.backgroundColor = [MewThemeColor mewColorWithHexString:@"#F2F3F6"]; } return _lineView; } @@ -107,11 +107,11 @@ - (UITextField *)textField { if (!_textField) { _textField = [[UITextField alloc] init]; - _textField.textColor = [MEWThemeColor mewMainTextColor]; + _textField.textColor = [MewThemeColor mewMainTextColor]; _textField.font = [UIFont systemFontOfSize:18.f]; _textField.borderStyle = UITextBorderStyleNone; _textField.keyboardType = UIKeyboardTypeNumberPad; - _textField.tintColor = [MEWThemeColor mewMainTextColor]; + _textField.tintColor = [MewThemeColor mewMainTextColor]; _textField.backgroundColor = [UIColor clearColor]; _textField.delegate = self; } diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/LoginBindPhoneResultViewController.h b/yinmeng-ios/yinmeng-ios/Main/Login/View/LoginBindPhoneResultViewController.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/LoginBindPhoneResultViewController.h rename to yinmeng-ios/yinmeng-ios/Main/Login/View/LoginBindPhoneResultViewController.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/LoginBindPhoneResultViewController.m b/yinmeng-ios/yinmeng-ios/Main/Login/View/LoginBindPhoneResultViewController.m similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/LoginBindPhoneResultViewController.m rename to yinmeng-ios/yinmeng-ios/Main/Login/View/LoginBindPhoneResultViewController.m diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MewLoginBindPhoneViewController.h b/yinmeng-ios/yinmeng-ios/Main/Login/View/MewLoginBindPhoneViewController.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MewLoginBindPhoneViewController.h rename to yinmeng-ios/yinmeng-ios/Main/Login/View/MewLoginBindPhoneViewController.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MewLoginBindPhoneViewController.m b/yinmeng-ios/yinmeng-ios/Main/Login/View/MewLoginBindPhoneViewController.m similarity index 94% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MewLoginBindPhoneViewController.m rename to yinmeng-ios/yinmeng-ios/Main/Login/View/MewLoginBindPhoneViewController.m index 353f6f6..b33859e 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MewLoginBindPhoneViewController.m +++ b/yinmeng-ios/yinmeng-ios/Main/Login/View/MewLoginBindPhoneViewController.m @@ -11,7 +11,7 @@ #import ///Tool #import "MewMacro.h" -#import "MEWThemeColor.h" +#import "MewThemeColor.h" //#import "NSString+Utils.h" ///Tool @@ -45,15 +45,15 @@ - (void)viewDidLoad { [super viewDidLoad]; - [self setUpUI]; - [self setEvents]; + [self mew_setUpUI]; + [self mew_setEvents]; } - (void)viewDidAppear:(BOOL)animated { [self mew_showErrorToast:@"第三方登录需绑定手机号喔~"]; } -- (void)setUpUI { +- (void)mew_setUpUI { [self.view addSubview:self.titleLabel]; [self.view addSubview:self.bgView];//输入框 [self.bgView addSubview:self.countryLabel]; @@ -103,7 +103,7 @@ }]; } -- (void)setEvents { +- (void)mew_setEvents { @weakify(self) // 登录 [[RACSignal combineLatest:@[self.phoneTextField.rac_textSignal] @@ -158,7 +158,7 @@ _titleLabel = [[UILabel alloc] init]; _titleLabel.font = [UIFont fontWithName:@"PingFang-SC-Medium" size:18]; _titleLabel.text = @"绑定手机号"; - _titleLabel.textColor = [MEWThemeColor mewMainTextColor]; + _titleLabel.textColor = [MewThemeColor mewMainTextColor]; } return _titleLabel; } @@ -166,7 +166,7 @@ - (UIView *)bgView { if (!_bgView) { _bgView = [[UIView alloc] init]; - _bgView.backgroundColor = [MEWThemeColor mewAppCellBackgroundColor]; + _bgView.backgroundColor = [MewThemeColor mewAppCellBackgroundColor]; _bgView.layer.cornerRadius = 45/2; _bgView.layer.masksToBounds = YES; } @@ -178,7 +178,7 @@ _countryLabel = [[UILabel alloc] init]; _countryLabel.font = [UIFont fontWithName:@"PingFang-SC-Medium" size:15]; _countryLabel.text = @"+86"; - _countryLabel.textColor = [MEWThemeColor mewMainTextColor]; + _countryLabel.textColor = [MewThemeColor mewMainTextColor]; _countryLabel.backgroundColor = [UIColor clearColor]; _countryLabel.textAlignment = NSTextAlignmentCenter; } @@ -190,8 +190,8 @@ _phoneTextField = [[UITextField alloc] init]; _phoneTextField.keyboardType = UIKeyboardTypeNumberPad; _phoneTextField.backgroundColor = [UIColor clearColor]; - _phoneTextField.textColor = [MEWThemeColor mewMainTextColor]; -// _phoneTextField.tintColor = [MEWThemeColor appMainColor]; + _phoneTextField.textColor = [MewThemeColor mewMainTextColor]; +// _phoneTextField.tintColor = [MewThemeColor appMainColor]; _phoneTextField.font = [UIFont fontWithName:@"PingFang-SC-Medium" size:15]; _phoneTextField.textAlignment = NSTextAlignmentLeft; } diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MewLoginForgetPasswordViewController.h b/yinmeng-ios/yinmeng-ios/Main/Login/View/MewLoginForgetPasswordViewController.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MewLoginForgetPasswordViewController.h rename to yinmeng-ios/yinmeng-ios/Main/Login/View/MewLoginForgetPasswordViewController.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MewLoginForgetPasswordViewController.m b/yinmeng-ios/yinmeng-ios/Main/Login/View/MewLoginForgetPasswordViewController.m similarity index 97% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MewLoginForgetPasswordViewController.m rename to yinmeng-ios/yinmeng-ios/Main/Login/View/MewLoginForgetPasswordViewController.m index 018fcbe..55acc0a 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MewLoginForgetPasswordViewController.m +++ b/yinmeng-ios/yinmeng-ios/Main/Login/View/MewLoginForgetPasswordViewController.m @@ -15,7 +15,7 @@ #import #import ///Tool -#import "MEWThemeColor.h" +#import "MewThemeColor.h" #import "MEWCountDownHelper.h" #import "MewMacro.h" #import "UIImage+MewUtils.h" @@ -202,7 +202,7 @@ [_finishButton setImage:[UIImage imageNamed:@"mew_login_next"] forState:UIControlStateNormal]; _finishButton.titleLabel.font = [UIFont fontWithName:@"PingFang-SC-Medium" size:18]; [_finishButton setTitleColor:UIColor.blackColor forState:UIControlStateNormal]; - UIImage *image = [UIImage mew_gradientColorImageFromColors:@[[MEWThemeColor mewColorWithHexString:@"#FF60FD"], [MEWThemeColor mewColorWithHexString:@"#8974FF"],[MEWThemeColor mewColorWithHexString:@"#69EBFF"]] gradientType:MewGradientTypeLeftToRight imgSize:CGSizeMake(KScreenWidth - 2*36, 52)]; + UIImage *image = [UIImage mew_gradientColorImageFromColors:@[[MewThemeColor mewColorWithHexString:@"#FF60FD"], [MewThemeColor mewColorWithHexString:@"#8974FF"],[MewThemeColor mewColorWithHexString:@"#69EBFF"]] gradientType:MewGradientTypeLeftToRight imgSize:CGSizeMake(KScreenWidth - 2*36, 52)]; _finishButton.backgroundColor = [UIColor colorWithPatternImage:image]; [_finishButton addTarget:self action:@selector(mew_finishButtonAction:) forControlEvents:UIControlEventTouchUpInside]; } @@ -239,7 +239,7 @@ _codeView.placeholder = @"请输入验证码"; _codeView.type = MewLoginForgetEditViewTypeSms; _codeView.backgroundColor = UIColor.whiteColor; - [_codeView.authCodeButton setTitleColor:[MEWThemeColor mewColorWithHexString:@"#9552FF"] forState:UIControlStateNormal]; + [_codeView.authCodeButton setTitleColor:[MewThemeColor mewColorWithHexString:@"#9552FF"] forState:UIControlStateNormal]; _codeView.layer.cornerRadius = 52/2.f; _codeView.layer.masksToBounds = YES; [_codeView.authCodeButton addTarget:self action:@selector(mew_authCodeButtonAction:) forControlEvents:UIControlEventTouchUpInside]; diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MewLoginFullInfoViewController.h b/yinmeng-ios/yinmeng-ios/Main/Login/View/MewLoginFullInfoViewController.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MewLoginFullInfoViewController.h rename to yinmeng-ios/yinmeng-ios/Main/Login/View/MewLoginFullInfoViewController.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MewLoginFullInfoViewController.m b/yinmeng-ios/yinmeng-ios/Main/Login/View/MewLoginFullInfoViewController.m similarity index 97% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MewLoginFullInfoViewController.m rename to yinmeng-ios/yinmeng-ios/Main/Login/View/MewLoginFullInfoViewController.m index 12bcbdc..8af68c7 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MewLoginFullInfoViewController.m +++ b/yinmeng-ios/yinmeng-ios/Main/Login/View/MewLoginFullInfoViewController.m @@ -10,12 +10,12 @@ #import #import ///Tool -#import "MEWThemeColor.h" +#import "MewThemeColor.h" #import "MewMacro.h" #import "MewAccountInfoStorage.h" #import "UIImage+MewUtils.h" #import "MewHUDTool.h" -#import "NewEncryptTool.h" +#import "MewEncryptTool.h" ///Model #import "MewThirdUserInfo.h" /// presenter @@ -118,7 +118,7 @@ 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"]; + avatar = [MewEncryptTool MEW_aesDecrypt:@"xdPnNelVD/RTlTKFqgSrESDPcNF6Diqb8sLg+HEvxpvjDdTLom1euQUOAOppjx15"]; } return avatar; } @@ -267,7 +267,7 @@ - (UITextField *)textField { if (!_textField) { _textField = [[UITextField alloc] init]; - _textField.textColor = [MEWThemeColor mewMainTextColor]; + _textField.textColor = [MewThemeColor mewMainTextColor]; _textField.font = [UIFont fontWithName:@"PingFang-SC-Medium" size:15.f]; _textField.textAlignment = NSTextAlignmentLeft; _textField.placeholder = @"请输入昵称"; @@ -313,7 +313,7 @@ _nextButton.layer.cornerRadius = 52/2.f; [_nextButton setImage:[UIImage imageNamed:@"mew_login_next"] forState:UIControlStateNormal]; _nextButton.titleLabel.font = [UIFont fontWithName:@"PingFang-SC-Medium" size:18]; - UIImage *image = [UIImage mew_gradientColorImageFromColors:@[[MEWThemeColor mewColorWithHexString:@"#FF60FD"], [MEWThemeColor mewColorWithHexString:@"#8974FF"],[MEWThemeColor mewColorWithHexString:@"#69EBFF"]] gradientType:MewGradientTypeLeftToRight imgSize:CGSizeMake(KScreenWidth - 2*36, 52)]; + UIImage *image = [UIImage mew_gradientColorImageFromColors:@[[MewThemeColor mewColorWithHexString:@"#FF60FD"], [MewThemeColor mewColorWithHexString:@"#8974FF"],[MewThemeColor mewColorWithHexString:@"#69EBFF"]] gradientType:MewGradientTypeLeftToRight imgSize:CGSizeMake(KScreenWidth - 2*36, 52)]; _nextButton.backgroundColor = [UIColor colorWithPatternImage:image]; [_nextButton addTarget:self action:@selector(mew_nextButtonAction) forControlEvents:UIControlEventTouchUpInside]; } diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MewLoginVerifBindPhoneViewController.h b/yinmeng-ios/yinmeng-ios/Main/Login/View/MewLoginVerifBindPhoneViewController.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MewLoginVerifBindPhoneViewController.h rename to yinmeng-ios/yinmeng-ios/Main/Login/View/MewLoginVerifBindPhoneViewController.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MewLoginVerifBindPhoneViewController.m b/yinmeng-ios/yinmeng-ios/Main/Login/View/MewLoginVerifBindPhoneViewController.m similarity index 93% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MewLoginVerifBindPhoneViewController.m rename to yinmeng-ios/yinmeng-ios/Main/Login/View/MewLoginVerifBindPhoneViewController.m index 780e42b..aac3d08 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MewLoginVerifBindPhoneViewController.m +++ b/yinmeng-ios/yinmeng-ios/Main/Login/View/MewLoginVerifBindPhoneViewController.m @@ -10,7 +10,7 @@ #import #import ///Tool -#import "MEWThemeColor.h" +#import "MewThemeColor.h" #import "MewConstant.h" #import "MewMacro.h" #import "UIImage+MewUtils.h" @@ -62,8 +62,8 @@ [super viewDidLoad]; [self mew_initSubViews]; [self mew_initSubViewConstraints]; - [self setConfigs]; - [self setEvents]; + [self mew_setConfigs]; + [self mew_setEvents]; } - (void)viewDidDisappear:(BOOL)animated { @@ -156,7 +156,7 @@ } #pragma mark -配置 -- (void)setConfigs { +- (void)mew_setConfigs { switch (self.bindingPhoneNumType) { case MewBindingPhoneNumTypeEdit:{ self.navigationItem.title = @"更改绑定手机"; @@ -187,7 +187,7 @@ #pragma mark 交互事件 -- (void)setEvents { +- (void)mew_setEvents { @weakify(self) // 获取验证码点击事件 [[[self.authCodeBtn rac_signalForControlEvents:UIControlEventTouchUpInside] filter:^BOOL(__kindof UIControl * _Nullable value) { @@ -280,7 +280,7 @@ - (UIView *)containerView{ if (!_containerView) { _containerView = [[UIView alloc] init]; - _containerView.backgroundColor = [MEWThemeColor mewAppBackgroundColor]; + _containerView.backgroundColor = [MewThemeColor mewAppBackgroundColor]; } return _containerView; } @@ -315,7 +315,7 @@ if (!_areaCodeLabel) { _areaCodeLabel = [[UILabel alloc] init]; _areaCodeLabel.text = @"+86"; - _areaCodeLabel.textColor = [MEWThemeColor mewSecondTextColor]; + _areaCodeLabel.textColor = [MewThemeColor mewSecondTextColor]; _areaCodeLabel.font = [UIFont systemFontOfSize:14.f]; _areaCodeLabel.adjustsFontSizeToFitWidth = YES; } @@ -331,7 +331,7 @@ _confirmBtn.layer.cornerRadius = 52/2.f; _confirmBtn.layer.masksToBounds = YES; _confirmBtn.enabled = NO; - UIImage *image = [UIImage mew_gradientColorImageFromColors:@[[MEWThemeColor mewColorWithHexString:@"#FF60FD"], [MEWThemeColor mewColorWithHexString:@"#8974FF"],[MEWThemeColor mewColorWithHexString:@"#69EBFF"]] gradientType:MewGradientTypeLeftToRight imgSize:CGSizeMake(KScreenWidth - 2*36, 52)]; + UIImage *image = [UIImage mew_gradientColorImageFromColors:@[[MewThemeColor mewColorWithHexString:@"#FF60FD"], [MewThemeColor mewColorWithHexString:@"#8974FF"],[MewThemeColor mewColorWithHexString:@"#69EBFF"]] gradientType:MewGradientTypeLeftToRight imgSize:CGSizeMake(KScreenWidth - 2*36, 52)]; _confirmBtn.backgroundColor = [UIColor colorWithPatternImage:image]; } return _confirmBtn; @@ -341,9 +341,9 @@ if (!_authCodeBtn) { _authCodeBtn = [UIButton buttonWithType:UIButtonTypeCustom]; [_authCodeBtn setTitle:@"获取验证码" forState:UIControlStateNormal]; - [_authCodeBtn setTitleColor:[MEWThemeColor mewColorWithHexString:@"#9552FF"] forState:UIControlStateNormal]; -// [_authCodeBtn setTitleColor:[MEWThemeColor appMainColor] forState:UIControlStateNormal]; - [_authCodeBtn setTitleColor:[MEWThemeColor mewSecondTextColor] forState:UIControlStateDisabled]; + [_authCodeBtn setTitleColor:[MewThemeColor mewColorWithHexString:@"#9552FF"] forState:UIControlStateNormal]; +// [_authCodeBtn setTitleColor:[MewThemeColor appMainColor] forState:UIControlStateNormal]; + [_authCodeBtn setTitleColor:[MewThemeColor mewSecondTextColor] forState:UIControlStateDisabled]; [_authCodeBtn.titleLabel setFont:[UIFont systemFontOfSize:12.f]]; } return _authCodeBtn; @@ -361,13 +361,13 @@ - (UITextField *)phoneNumTextField { if (!_phoneNumTextField) { _phoneNumTextField = [[UITextField alloc] init]; - _phoneNumTextField.textColor = [MEWThemeColor mewMainTextColor]; + _phoneNumTextField.textColor = [MewThemeColor mewMainTextColor]; _phoneNumTextField.font = [UIFont systemFontOfSize:14.f]; - _phoneNumTextField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:@"输入手机号"attributes:@{NSForegroundColorAttributeName: [MEWThemeColor mewSecondTextColor]}]; + _phoneNumTextField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:@"输入手机号"attributes:@{NSForegroundColorAttributeName: [MewThemeColor mewSecondTextColor]}]; _phoneNumTextField.clearButtonMode = UITextFieldViewModeWhileEditing; _phoneNumTextField.borderStyle = UITextBorderStyleNone; _phoneNumTextField.keyboardType = UIKeyboardTypeNumberPad; - _phoneNumTextField.tintColor = [MEWThemeColor mewMainTextColor]; + _phoneNumTextField.tintColor = [MewThemeColor mewMainTextColor]; } return _phoneNumTextField; } @@ -385,13 +385,13 @@ - (UITextField *)authCodeTextField { if (!_authCodeTextField) { _authCodeTextField = [[UITextField alloc] init]; - _authCodeTextField.textColor = [MEWThemeColor mewMainTextColor]; + _authCodeTextField.textColor = [MewThemeColor mewMainTextColor]; _authCodeTextField.font = [UIFont systemFontOfSize:14.f]; - _authCodeTextField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:@"输入验证码"attributes:@{NSForegroundColorAttributeName: [MEWThemeColor mewSecondTextColor]}]; + _authCodeTextField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:@"输入验证码"attributes:@{NSForegroundColorAttributeName: [MewThemeColor mewSecondTextColor]}]; _authCodeTextField.clearButtonMode = UITextFieldViewModeWhileEditing; _authCodeTextField.borderStyle = UITextBorderStyleNone; _authCodeTextField.keyboardType = UIKeyboardTypeNumberPad; - _authCodeTextField.tintColor = [MEWThemeColor mewMainTextColor]; + _authCodeTextField.tintColor = [MewThemeColor mewMainTextColor]; } return _authCodeTextField; } diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MewMineLoginPasswordViewController.h b/yinmeng-ios/yinmeng-ios/Main/Login/View/MewMineLoginPasswordViewController.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MewMineLoginPasswordViewController.h rename to yinmeng-ios/yinmeng-ios/Main/Login/View/MewMineLoginPasswordViewController.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MewMineLoginPasswordViewController.m b/yinmeng-ios/yinmeng-ios/Main/Login/View/MewMineLoginPasswordViewController.m similarity index 98% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MewMineLoginPasswordViewController.m rename to yinmeng-ios/yinmeng-ios/Main/Login/View/MewMineLoginPasswordViewController.m index 8e06892..56fbb8b 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Login/View/MewMineLoginPasswordViewController.m +++ b/yinmeng-ios/yinmeng-ios/Main/Login/View/MewMineLoginPasswordViewController.m @@ -12,7 +12,7 @@ #import #import ///Tool -#import "MEWThemeColor.h" +#import "MewThemeColor.h" #import "UIButton+MewEnlargeTouchArea.h" #import "UIImage+MewUtils.h" #import "MewMacro.h" @@ -60,7 +60,7 @@ - (void)viewDidLoad { [super viewDidLoad]; - self.view.backgroundColor = [MEWThemeColor mewColorWithHexString:@"#14171B"]; + self.view.backgroundColor = [MewThemeColor mewColorWithHexString:@"#14171B"]; [self mew_initSubViews]; [self mew_initSubViewConstraints]; } @@ -249,7 +249,7 @@ _submitButton.layer.masksToBounds = YES; _submitButton.layer.cornerRadius = 52/2; _submitButton.enabled = YES; - UIImage *image = [UIImage mew_gradientColorImageFromColors:@[[MEWThemeColor mewColorWithHexString:@"#FF60FD"], [MEWThemeColor mewColorWithHexString:@"#8974FF"],[MEWThemeColor mewColorWithHexString:@"#69EBFF"]] gradientType:MewGradientTypeLeftToRight imgSize:CGSizeMake(KScreenWidth - 2*36, 52)]; + UIImage *image = [UIImage mew_gradientColorImageFromColors:@[[MewThemeColor mewColorWithHexString:@"#FF60FD"], [MewThemeColor mewColorWithHexString:@"#8974FF"],[MewThemeColor mewColorWithHexString:@"#69EBFF"]] gradientType:MewGradientTypeLeftToRight imgSize:CGSizeMake(KScreenWidth - 2*36, 52)]; _submitButton.backgroundColor = [UIColor colorWithPatternImage:image]; [_submitButton addTarget:self action:@selector(mew_submitButtonAction:) forControlEvents:UIControlEventTouchUpInside]; } diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Login/View/MewLoginNumberViewController.h b/yinmeng-ios/yinmeng-ios/Main/Login/View/MewView/MewLoginNumberViewController.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Login/View/MewLoginNumberViewController.h rename to yinmeng-ios/yinmeng-ios/Main/Login/View/MewView/MewLoginNumberViewController.h diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Login/View/MewLoginNumberViewController.m b/yinmeng-ios/yinmeng-ios/Main/Login/View/MewView/MewLoginNumberViewController.m similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Login/View/MewLoginNumberViewController.m rename to yinmeng-ios/yinmeng-ios/Main/Login/View/MewView/MewLoginNumberViewController.m diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Login/View/MewLoginViewController.h b/yinmeng-ios/yinmeng-ios/Main/Login/View/MewView/MewLoginViewController.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Login/View/MewLoginViewController.h rename to yinmeng-ios/yinmeng-ios/Main/Login/View/MewView/MewLoginViewController.h diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Login/View/MewLoginViewController.m b/yinmeng-ios/yinmeng-ios/Main/Login/View/MewView/MewLoginViewController.m similarity index 98% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Login/View/MewLoginViewController.m rename to yinmeng-ios/yinmeng-ios/Main/Login/View/MewView/MewLoginViewController.m index 4ebae2e..e31f080 100644 --- a/yinmeng-ios/yinmeng-ios/Main/Mew/Login/View/MewLoginViewController.m +++ b/yinmeng-ios/yinmeng-ios/Main/Login/View/MewView/MewLoginViewController.m @@ -18,11 +18,11 @@ #import ///Tool #import "MewMacro.h" -#import "MEWThemeColor.h" +#import "MewThemeColor.h" #import "MewHUDTool.h" #import "UIImage+MewUtils.h" #import "MewConstant.h" -#import "MEWGCDHelper.h" +#import "MewGCDHelper.h" #import "Base.h" #import "MewAccountInfoStorage.h" #import "Api+Login.h" @@ -415,12 +415,12 @@ typedef NS_ENUM(NSUInteger, XYLoginType) { [_loginButton setTitleColor:UIColor.whiteColor forState:UIControlStateNormal]; _loginButton.titleLabel.font = kFontMedium(16); _loginButton.titleLabel.font = [UIFont fontWithName:@"PingFang-SC-Medium" size:18]; - UIImage *bgImage = [UIImage mew_gradientColorImageFromColors:@[[MEWThemeColor mewColorWithHexString:@"#FF60FD"], - [MEWThemeColor mewColorWithHexString:@"##8974FF"], - [MEWThemeColor mewColorWithHexString:@"#69EBFF"]] gradientType:MewGradientTypeLeftToRight imgSize:CGSizeMake(KScreenWidth - 80, 52)]; + UIImage *bgImage = [UIImage mew_gradientColorImageFromColors:@[[MewThemeColor mewColorWithHexString:@"#FF60FD"], + [MewThemeColor mewColorWithHexString:@"##8974FF"], + [MewThemeColor mewColorWithHexString:@"#69EBFF"]] gradientType:MewGradientTypeLeftToRight imgSize:CGSizeMake(KScreenWidth - 80, 52)]; _loginButton.backgroundColor = [UIColor colorWithPatternImage:bgImage]; // [_loginButton setTitleColor:ThemeColor.mewMainTextColor forState:UIControlStateNormal]; -// UIImage *image = [UIImage mew_gradientColorImageFromColors:@[[MEWThemeColor mewConfirmButtonGradientStartColor],[MEWThemeColor mewConfirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(KScreenWidth - 52 * 2, 45)]; +// UIImage *image = [UIImage mew_gradientColorImageFromColors:@[[MewThemeColor mewConfirmButtonGradientStartColor],[MewThemeColor mewConfirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(KScreenWidth - 52 * 2, 45)]; // [_loginButton setBackgroundImage:image forState:UIControlStateNormal]; [_loginButton addTarget:self action:@selector(mew_loginButtonAction:) forControlEvents:UIControlEventTouchUpInside]; } diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Login/View/SubView/MewLoginPasswordView.h b/yinmeng-ios/yinmeng-ios/Main/Login/View/MewView/SubView/MewLoginPasswordView.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Login/View/SubView/MewLoginPasswordView.h rename to yinmeng-ios/yinmeng-ios/Main/Login/View/MewView/SubView/MewLoginPasswordView.h diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Login/View/SubView/MewLoginPasswordView.m b/yinmeng-ios/yinmeng-ios/Main/Login/View/MewView/SubView/MewLoginPasswordView.m similarity index 97% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Login/View/SubView/MewLoginPasswordView.m rename to yinmeng-ios/yinmeng-ios/Main/Login/View/MewView/SubView/MewLoginPasswordView.m index 456ea45..3b1e7b4 100644 --- a/yinmeng-ios/yinmeng-ios/Main/Mew/Login/View/SubView/MewLoginPasswordView.m +++ b/yinmeng-ios/yinmeng-ios/Main/Login/View/MewView/SubView/MewLoginPasswordView.m @@ -10,7 +10,7 @@ #import #import /// Tool -#import "MEWThemeColor.h" +#import "MewThemeColor.h" #import "MewHUDTool.h" #import "UIImage+MewUtils.h" #import "MewConstant.h" @@ -144,7 +144,7 @@ [_nextButton setImage:[UIImage imageNamed:@"mew_login_next"] forState:UIControlStateNormal]; _nextButton.titleLabel.font = [UIFont fontWithName:@"PingFang-SC-Medium" size:18]; [_nextButton setTitleColor:UIColor.blackColor forState:UIControlStateNormal]; - UIImage *image = [UIImage mew_gradientColorImageFromColors:@[[MEWThemeColor mewColorWithHexString:@"#FF60FD"], [MEWThemeColor mewColorWithHexString:@"#8974FF"],[MEWThemeColor mewColorWithHexString:@"#69EBFF"]] gradientType:MewGradientTypeLeftToRight imgSize:CGSizeMake(KScreenWidth - 2*36, 52)]; + UIImage *image = [UIImage mew_gradientColorImageFromColors:@[[MewThemeColor mewColorWithHexString:@"#FF60FD"], [MewThemeColor mewColorWithHexString:@"#8974FF"],[MewThemeColor mewColorWithHexString:@"#69EBFF"]] gradientType:MewGradientTypeLeftToRight imgSize:CGSizeMake(KScreenWidth - 2*36, 52)]; _nextButton.backgroundColor = [UIColor colorWithPatternImage:image]; [_nextButton addTarget:self action:@selector(mew_nextButtonAction) forControlEvents:UIControlEventTouchUpInside]; } diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Login/View/SubView/MewLoginPhoneView.h b/yinmeng-ios/yinmeng-ios/Main/Login/View/MewView/SubView/MewLoginPhoneView.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Login/View/SubView/MewLoginPhoneView.h rename to yinmeng-ios/yinmeng-ios/Main/Login/View/MewView/SubView/MewLoginPhoneView.h diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Login/View/SubView/MewLoginPhoneView.m b/yinmeng-ios/yinmeng-ios/Main/Login/View/MewView/SubView/MewLoginPhoneView.m similarity index 95% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Login/View/SubView/MewLoginPhoneView.m rename to yinmeng-ios/yinmeng-ios/Main/Login/View/MewView/SubView/MewLoginPhoneView.m index 0d333ab..16b67bc 100644 --- a/yinmeng-ios/yinmeng-ios/Main/Mew/Login/View/SubView/MewLoginPhoneView.m +++ b/yinmeng-ios/yinmeng-ios/Main/Login/View/MewView/SubView/MewLoginPhoneView.m @@ -14,7 +14,7 @@ ///Protocole #import "MewLoginVerifCodeProtocol.h" /// Tool -#import "MEWThemeColor.h" +#import "MewThemeColor.h" #import "MewMacro.h" #import "MewHUDTool.h" #import "UIImage+MewUtils.h" @@ -247,7 +247,7 @@ - (MewLoginInputView *)phoneInputView { if (!_phoneInputView) { _phoneInputView = [[MewLoginInputView alloc] init]; - _phoneInputView.backgroundColor = [MEWThemeColor mewColorWithHexString:@"#F8F8FB"]; + _phoneInputView.backgroundColor = [MewThemeColor mewColorWithHexString:@"#F8F8FB"]; _phoneInputView.layer.cornerRadius = 51.0/2; _phoneInputView.layer.masksToBounds = YES; _phoneInputView.maxLength = 11; @@ -270,13 +270,13 @@ - (UITextField *)codeTextField { if (!_codeTextField) { _codeTextField = [[UITextField alloc] init]; - _codeTextField.textColor = [MEWThemeColor mewMainTextColor]; + _codeTextField.textColor = [MewThemeColor mewMainTextColor]; _codeTextField.font = [UIFont systemFontOfSize:18.f]; _codeTextField.keyboardType = UIKeyboardTypeNumberPad; - _codeTextField.tintColor = [MEWThemeColor mewMainTextColor]; + _codeTextField.tintColor = [MewThemeColor mewMainTextColor]; _codeTextField.backgroundColor = [UIColor clearColor]; [_codeTextField addTarget:self action:@selector(textFieldDidChange:) forControlEvents:UIControlEventEditingChanged]; - _codeTextField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:@"请输入验证码" attributes:@{NSForegroundColorAttributeName: [MEWThemeColor mewSecondTextColor], NSFontAttributeName:[UIFont systemFontOfSize:14]}]; + _codeTextField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:@"请输入验证码" attributes:@{NSForegroundColorAttributeName: [MewThemeColor mewSecondTextColor], NSFontAttributeName:[UIFont systemFontOfSize:14]}]; } return _codeTextField; } @@ -286,7 +286,7 @@ _cutdownLabel = [[UILabel alloc] init]; _cutdownLabel.textAlignment = NSTextAlignmentCenter; _cutdownLabel.font = [UIFont boldSystemFontOfSize:11]; - _cutdownLabel.textColor = [MEWThemeColor mewSecondTextColor]; + _cutdownLabel.textColor = [MewThemeColor mewSecondTextColor]; _cutdownLabel.hidden = YES; } return _cutdownLabel; @@ -297,7 +297,7 @@ if (!_retryCodeButton) { _retryCodeButton = [UIButton buttonWithType:UIButtonTypeCustom]; [_retryCodeButton setTitle:@"获取验证码" forState:UIControlStateNormal]; - [_retryCodeButton setTitleColor:[MEWThemeColor mewColorWithHexString:@"#9552FF"] forState:UIControlStateNormal]; + [_retryCodeButton setTitleColor:[MewThemeColor mewColorWithHexString:@"#9552FF"] forState:UIControlStateNormal]; _retryCodeButton.titleLabel.font = [UIFont systemFontOfSize:11 weight:UIFontWeightMedium]; [_retryCodeButton addTarget:self action:@selector(mew_getSmsCodeButtonAction) forControlEvents:UIControlEventTouchUpInside]; _retryCodeButton.hidden = NO; @@ -314,7 +314,7 @@ _confirmButton.layer.cornerRadius = 52/2.f; [_confirmButton setImage:[UIImage imageNamed:@"mew_login_next"] forState:UIControlStateNormal]; _confirmButton.titleLabel.font = [UIFont fontWithName:@"PingFang-SC-Medium" size:18]; - UIImage *image = [UIImage mew_gradientColorImageFromColors:@[[MEWThemeColor mewColorWithHexString:@"#FF60FD"], [MEWThemeColor mewColorWithHexString:@"#8974FF"],[MEWThemeColor mewColorWithHexString:@"#69EBFF"]] gradientType:MewGradientTypeLeftToRight imgSize:CGSizeMake(KScreenWidth - 2*36, 52)]; + UIImage *image = [UIImage mew_gradientColorImageFromColors:@[[MewThemeColor mewColorWithHexString:@"#FF60FD"], [MewThemeColor mewColorWithHexString:@"#8974FF"],[MewThemeColor mewColorWithHexString:@"#69EBFF"]] gradientType:MewGradientTypeLeftToRight imgSize:CGSizeMake(KScreenWidth - 2*36, 52)]; _confirmButton.backgroundColor = [UIColor colorWithPatternImage:image]; [_confirmButton setTitleColor:UIColor.whiteColor forState:UIControlStateNormal]; [_confirmButton addTarget:self action:@selector(mew_confirmButtonAction) forControlEvents:UIControlEventTouchUpInside]; diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/Api/Api+Message.h b/yinmeng-ios/yinmeng-ios/Main/Message/Api/Api+Message.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/Api/Api+Message.h rename to yinmeng-ios/yinmeng-ios/Main/Message/Api/Api+Message.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/Api/Api+Message.m b/yinmeng-ios/yinmeng-ios/Main/Message/Api/Api+Message.m similarity index 82% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/Api/Api+Message.m rename to yinmeng-ios/yinmeng-ios/Main/Message/Api/Api+Message.m index 1566ca3..b8fc4b8 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/Api/Api+Message.m +++ b/yinmeng-ios/yinmeng-ios/Main/Message/Api/Api+Message.m @@ -6,10 +6,10 @@ // #import "Api+Message.h" -#import "NewEncryptTool.h" +#import "MewEncryptTool.h" @implementation Api (Message) + (void)Mew_GetChatLimit:(MewHttpRequestHelperCompletion)complection receiverUid:(NSString *)receiverUid { - NSString *getUrl = [NewEncryptTool MEW_aesDecrypt:@"ml84Zo9PhMJ69iyUKDccSccouVGFyLv2OiwzJUi0qGI="];///privateChat/limit + NSString *getUrl = [MewEncryptTool MEW_aesDecrypt:@"ml84Zo9PhMJ69iyUKDccSccouVGFyLv2OiwzJUi0qGI="];///privateChat/limit [self makeRequest:getUrl method:MewHttpRequestHelperMethodGET completion:complection, __FUNCTION__, receiverUid,nil]; } diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/Model/MewChatLimitModel.h b/yinmeng-ios/yinmeng-ios/Main/Message/Model/MewChatLimitModel.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/Model/MewChatLimitModel.h rename to yinmeng-ios/yinmeng-ios/Main/Message/Model/MewChatLimitModel.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/Model/MewChatLimitModel.m b/yinmeng-ios/yinmeng-ios/Main/Message/Model/MewChatLimitModel.m similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/Model/MewChatLimitModel.m rename to yinmeng-ios/yinmeng-ios/Main/Message/Model/MewChatLimitModel.m diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/Model/MewMessageMenuModel.h b/yinmeng-ios/yinmeng-ios/Main/Message/Model/MewMessageMenuModel.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/Model/MewMessageMenuModel.h rename to yinmeng-ios/yinmeng-ios/Main/Message/Model/MewMessageMenuModel.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/Model/MewMessageMenuModel.m b/yinmeng-ios/yinmeng-ios/Main/Message/Model/MewMessageMenuModel.m similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/Model/MewMessageMenuModel.m rename to yinmeng-ios/yinmeng-ios/Main/Message/Model/MewMessageMenuModel.m diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/Presenter/CHMessagePresenter.h b/yinmeng-ios/yinmeng-ios/Main/Message/Presenter/CHMessagePresenter.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/Presenter/CHMessagePresenter.h rename to yinmeng-ios/yinmeng-ios/Main/Message/Presenter/CHMessagePresenter.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/Presenter/MewMessagePresenter.h b/yinmeng-ios/yinmeng-ios/Main/Message/Presenter/MewMessagePresenter.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/Presenter/MewMessagePresenter.h rename to yinmeng-ios/yinmeng-ios/Main/Message/Presenter/MewMessagePresenter.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/Presenter/MewMessagePresenter.m b/yinmeng-ios/yinmeng-ios/Main/Message/Presenter/MewMessagePresenter.m similarity index 94% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/Presenter/MewMessagePresenter.m rename to yinmeng-ios/yinmeng-ios/Main/Message/Presenter/MewMessagePresenter.m index 34c3065..71d5c98 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/Presenter/MewMessagePresenter.m +++ b/yinmeng-ios/yinmeng-ios/Main/Message/Presenter/MewMessagePresenter.m @@ -36,7 +36,7 @@ ///是否关注当前用户 - (void)mew_getFansLike:(NSString *)likeUid { - NSString * uid = [MewAccountInfoStorage instance].getUid; + NSString * uid = [MewAccountInfoStorage instance].mew_getUid; [Api Mew_AttentionStatusCompletion:[self mew_createHttpCompletion:^(MewBaseModel * _Nonnull data) { BOOL isLike = [data.data boolValue]; [[self mew_getView] mew_getFansLikeSuccess:isLike]; @@ -46,7 +46,7 @@ /// 关注用户 /// @param targetUid 目标用户的uid - (void)mew_attentionMessageUser:(NSString *)targetUid { - NSString * uid = [[MewAccountInfoStorage instance] getUid]; + NSString * uid = [[MewAccountInfoStorage instance] mew_getUid]; NSString * ticket = [[MewAccountInfoStorage instance] mew_getTicket]; NSString * type = @"1"; [Api Mew_AttentionCompletion:[self mew_createHttpCompletion:^(MewBaseModel * _Nonnull data) { diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/Protocol/CHMessageProtocol.h b/yinmeng-ios/yinmeng-ios/Main/Message/Protocol/CHMessageProtocol.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/Protocol/CHMessageProtocol.h rename to yinmeng-ios/yinmeng-ios/Main/Message/Protocol/CHMessageProtocol.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/Protocol/MewMessageProtocol.h b/yinmeng-ios/yinmeng-ios/Main/Message/Protocol/MewMessageProtocol.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/Protocol/MewMessageProtocol.h rename to yinmeng-ios/yinmeng-ios/Main/Message/Protocol/MewMessageProtocol.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/Tool/MewNIMMessageUtils.h b/yinmeng-ios/yinmeng-ios/Main/Message/Tool/MewNIMMessageUtils.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/Tool/MewNIMMessageUtils.h rename to yinmeng-ios/yinmeng-ios/Main/Message/Tool/MewNIMMessageUtils.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/Tool/MewNIMMessageUtils.m b/yinmeng-ios/yinmeng-ios/Main/Message/Tool/MewNIMMessageUtils.m similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/Tool/MewNIMMessageUtils.m rename to yinmeng-ios/yinmeng-ios/Main/Message/Tool/MewNIMMessageUtils.m diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Message/View/SessionList/MewSessionListTableViewCell.h b/yinmeng-ios/yinmeng-ios/Main/Message/View/MewSessionList/MewSessionListTableViewCell.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Message/View/SessionList/MewSessionListTableViewCell.h rename to yinmeng-ios/yinmeng-ios/Main/Message/View/MewSessionList/MewSessionListTableViewCell.h diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Message/View/SessionList/MewSessionListTableViewCell.m b/yinmeng-ios/yinmeng-ios/Main/Message/View/MewSessionList/MewSessionListTableViewCell.m similarity index 98% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Message/View/SessionList/MewSessionListTableViewCell.m rename to yinmeng-ios/yinmeng-ios/Main/Message/View/MewSessionList/MewSessionListTableViewCell.m index f092e2c..a878757 100644 --- a/yinmeng-ios/yinmeng-ios/Main/Mew/Message/View/SessionList/MewSessionListTableViewCell.m +++ b/yinmeng-ios/yinmeng-ios/Main/Message/View/MewSessionList/MewSessionListTableViewCell.m @@ -14,13 +14,13 @@ /// Tool #import "MewClientConfig.h" #import "NetImageView.h" -#import "MEWThemeColor.h" +#import "MewThemeColor.h" #import "MewNIMMessageUtils.h" #import "MewTimeIntervalUtils.h" #import "UIView+NIM.h" #import "UIView+MewFilletCorner.h" #import "MewMacro.h" -#import "NewEncryptTool.h" +#import "MewEncryptTool.h" @interface MewSessionListTableViewCell() /// 内容 @@ -45,7 +45,7 @@ - (void)mew_renderWithSession:(NIMRecentSession *)recent { _session = recent; NIMUser *user = [[NIMSDK sharedSDK].userManager userInfo:recent.session.sessionId]; - self.avatarImageView.imageUrl = (user.userInfo.avatarUrl == nil || user.userInfo.avatarUrl.length == 0) ? [NewEncryptTool MEW_aesDecrypt:@"xdPnNelVD/RTlTKFqgSrESDPcNF6Diqb8sLg+HEvxpvjDdTLom1euQUOAOppjx15"] : user.userInfo.avatarUrl; + self.avatarImageView.imageUrl = (user.userInfo.avatarUrl == nil || user.userInfo.avatarUrl.length == 0) ? [MewEncryptTool MEW_aesDecrypt:@"xdPnNelVD/RTlTKFqgSrESDPcNF6Diqb8sLg+HEvxpvjDdTLom1euQUOAOppjx15"] : user.userInfo.avatarUrl; self.nameLabel.text = user.userInfo.nickName; [self.nameLabel sizeToFit]; diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Message/View/SessionList/MewSessionListViewController.h b/yinmeng-ios/yinmeng-ios/Main/Message/View/MewSessionList/MewSessionListViewController.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Message/View/SessionList/MewSessionListViewController.h rename to yinmeng-ios/yinmeng-ios/Main/Message/View/MewSessionList/MewSessionListViewController.h diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Message/View/SessionList/MewSessionListViewController.m b/yinmeng-ios/yinmeng-ios/Main/Message/View/MewSessionList/MewSessionListViewController.m similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Message/View/SessionList/MewSessionListViewController.m rename to yinmeng-ios/yinmeng-ios/Main/Message/View/MewSessionList/MewSessionListViewController.m diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/NIMViews/MewNIMBadgeView.h b/yinmeng-ios/yinmeng-ios/Main/Message/View/NIMViews/MewNIMBadgeView.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/NIMViews/MewNIMBadgeView.h rename to yinmeng-ios/yinmeng-ios/Main/Message/View/NIMViews/MewNIMBadgeView.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/NIMViews/MewNIMBadgeView.m b/yinmeng-ios/yinmeng-ios/Main/Message/View/NIMViews/MewNIMBadgeView.m similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/NIMViews/MewNIMBadgeView.m rename to yinmeng-ios/yinmeng-ios/Main/Message/View/NIMViews/MewNIMBadgeView.m diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/NIMViews/UITableView+NIMScrollToBottom.h b/yinmeng-ios/yinmeng-ios/Main/Message/View/NIMViews/UITableView+NIMScrollToBottom.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/NIMViews/UITableView+NIMScrollToBottom.h rename to yinmeng-ios/yinmeng-ios/Main/Message/View/NIMViews/UITableView+NIMScrollToBottom.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/NIMViews/UITableView+NIMScrollToBottom.m b/yinmeng-ios/yinmeng-ios/Main/Message/View/NIMViews/UITableView+NIMScrollToBottom.m similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/NIMViews/UITableView+NIMScrollToBottom.m rename to yinmeng-ios/yinmeng-ios/Main/Message/View/NIMViews/UITableView+NIMScrollToBottom.m diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/NIMViews/UIView+NIM.h b/yinmeng-ios/yinmeng-ios/Main/Message/View/NIMViews/UIView+NIM.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/NIMViews/UIView+NIM.h rename to yinmeng-ios/yinmeng-ios/Main/Message/View/NIMViews/UIView+NIM.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/NIMViews/UIView+NIM.m b/yinmeng-ios/yinmeng-ios/Main/Message/View/NIMViews/UIView+NIM.m similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/NIMViews/UIView+NIM.m rename to yinmeng-ios/yinmeng-ios/Main/Message/View/NIMViews/UIView+NIM.m diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/Content/MewMessageContentImage.h b/yinmeng-ios/yinmeng-ios/Main/Message/View/Session/Content/MewMessageContentImage.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/Content/MewMessageContentImage.h rename to yinmeng-ios/yinmeng-ios/Main/Message/View/Session/Content/MewMessageContentImage.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/Content/MewMessageContentImage.m b/yinmeng-ios/yinmeng-ios/Main/Message/View/Session/Content/MewMessageContentImage.m similarity index 98% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/Content/MewMessageContentImage.m rename to yinmeng-ios/yinmeng-ios/Main/Message/View/Session/Content/MewMessageContentImage.m index 9a00888..98ff00c 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/Content/MewMessageContentImage.m +++ b/yinmeng-ios/yinmeng-ios/Main/Message/View/Session/Content/MewMessageContentImage.m @@ -34,7 +34,7 @@ return self; } -+ (CGFloat)mew_sessionMeasureHeight:(NIMMessage *)message { ++ (CGFloat)Mew_SessionMeasureHeight:(NIMMessage *)message { if (!message || message.messageType != NIMMessageTypeImage) return 0; NIMImageObject *imageObject = (NIMImageObject*)[message messageObject]; CGFloat attachmentImageMinWidth = (MESSAGE_IMAGE_Min_SIZE); diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/Content/MewMessageContentProtocol.h b/yinmeng-ios/yinmeng-ios/Main/Message/View/Session/Content/MewMessageContentProtocol.h similarity index 89% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/Content/MewMessageContentProtocol.h rename to yinmeng-ios/yinmeng-ios/Main/Message/View/Session/Content/MewMessageContentProtocol.h index 5b04921..f33b817 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/Content/MewMessageContentProtocol.h +++ b/yinmeng-ios/yinmeng-ios/Main/Message/View/Session/Content/MewMessageContentProtocol.h @@ -19,7 +19,7 @@ NS_ASSUME_NONNULL_BEGIN @protocol MewMessageContentProtocol -+ (CGFloat)mew_sessionMeasureHeight:(NIMMessage *)message; ++ (CGFloat)Mew_SessionMeasureHeight:(NIMMessage *)message; - (void)mew_renderMessage:(NIMMessage *)message; @end diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/Content/MewMessageContentText.h b/yinmeng-ios/yinmeng-ios/Main/Message/View/Session/Content/MewMessageContentText.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/Content/MewMessageContentText.h rename to yinmeng-ios/yinmeng-ios/Main/Message/View/Session/Content/MewMessageContentText.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/Content/MewMessageContentText.m b/yinmeng-ios/yinmeng-ios/Main/Message/View/Session/Content/MewMessageContentText.m similarity index 85% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/Content/MewMessageContentText.m rename to yinmeng-ios/yinmeng-ios/Main/Message/View/Session/Content/MewMessageContentText.m index cf4663b..a80752b 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/Content/MewMessageContentText.m +++ b/yinmeng-ios/yinmeng-ios/Main/Message/View/Session/Content/MewMessageContentText.m @@ -8,7 +8,7 @@ #import "MewMessageContentText.h" #import "MewMessageContentText.h" -#import "MEWThemeColor.h" +#import "MewThemeColor.h" #import "NSObject+MEWExtension.h" @@ -28,7 +28,7 @@ @implementation MewMessageContentText -+ (CGFloat)mew_sessionMeasureHeight:(NIMMessage *)message { ++ (CGFloat)Mew_SessionMeasureHeight:(NIMMessage *)message { NSString * messageText = message.text; if (!messageText) { messageText = @"未知消息类型"; @@ -36,12 +36,12 @@ CGSize dstRect = CGSizeMake(CONTENT_WIDTH_MAX - MESSAGE_TEXT_PADDING * 2, MAXFLOAT); - CGFloat msgHeight = [messageText boundingRectWithSize:dstRect options:NSStringDrawingUsesLineFragmentOrigin attributes:[MewMessageContentText messageTextAttibutes] context:nil].size.height; + CGFloat msgHeight = [messageText boundingRectWithSize:dstRect options:NSStringDrawingUsesLineFragmentOrigin attributes:[MewMessageContentText Mew_MessageTextAttibutes] context:nil].size.height; return msgHeight + MESSAGE_TEXT_PADDING * 2 + CONTENT_PADDING_V_TOTAL; } -+ (NSDictionary *)messageTextAttibutes { ++ (NSDictionary *)Mew_MessageTextAttibutes { UIFont *font = [UIFont systemFontOfSize:13.f]; NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init]; [paragraphStyle setLineSpacing:2.5]; @@ -67,14 +67,14 @@ if (!messageText || (message.messageType != NIMMessageTypeTip && message.messageType != NIMMessageTypeText)) { messageText = @"未知消息类型"; } - _messageText.attributedText = [[NSAttributedString alloc] initWithString:messageText attributes:[MewMessageContentText messageTextAttibutes]]; + _messageText.attributedText = [[NSAttributedString alloc] initWithString:messageText attributes:[MewMessageContentText Mew_MessageTextAttibutes]]; } - (UILabel *)messageText { if (!_messageText) { _messageText = [[UILabel alloc]initWithFrame:CGRectZero]; _messageText.preferredMaxLayoutWidth = CONTENT_WIDTH_MAX - MESSAGE_TEXT_PADDING * 2; - _messageText.textColor = MEWThemeColor.mewMainTextColor; + _messageText.textColor = MewThemeColor.mewMainTextColor; _messageText.numberOfLines = 0; } return _messageText; diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/Content/MewMessageContentUnSupportView.h b/yinmeng-ios/yinmeng-ios/Main/Message/View/Session/Content/MewMessageContentUnSupportView.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/Content/MewMessageContentUnSupportView.h rename to yinmeng-ios/yinmeng-ios/Main/Message/View/Session/Content/MewMessageContentUnSupportView.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/Content/MewMessageContentUnSupportView.m b/yinmeng-ios/yinmeng-ios/Main/Message/View/Session/Content/MewMessageContentUnSupportView.m similarity index 93% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/Content/MewMessageContentUnSupportView.m rename to yinmeng-ios/yinmeng-ios/Main/Message/View/Session/Content/MewMessageContentUnSupportView.m index d0ef928..5fe231c 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/Content/MewMessageContentUnSupportView.m +++ b/yinmeng-ios/yinmeng-ios/Main/Message/View/Session/Content/MewMessageContentUnSupportView.m @@ -11,7 +11,7 @@ #import #import ///Tool -#import "MEWThemeColor.h" +#import "MewThemeColor.h" #define MESSAGE_TEXT_PADDING 10 @@ -22,7 +22,7 @@ @implementation MewMessageContentUnSupportView -+ (CGFloat)mew_sessionMeasureHeight:(NIMMessage *)message { ++ (CGFloat)Mew_SessionMeasureHeight:(NIMMessage *)message { NSString * messageText = @"暂不支持此种类型消息"; CGSize dstRect = CGSizeMake(CONTENT_WIDTH_MAX - MESSAGE_TEXT_PADDING * 2, MAXFLOAT); CGFloat msgHeight = [messageText boundingRectWithSize:dstRect options:NSStringDrawingUsesLineFragmentOrigin attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:13]} context:nil].size.height; @@ -59,7 +59,7 @@ if (!_unSupportLabel) { _unSupportLabel = [[UILabel alloc]initWithFrame:CGRectZero]; _unSupportLabel.preferredMaxLayoutWidth = CONTENT_WIDTH_MAX - MESSAGE_TEXT_PADDING * 2; - _unSupportLabel.textColor = MEWThemeColor.mewMainTextColor; + _unSupportLabel.textColor = MewThemeColor.mewMainTextColor; _unSupportLabel.text = @"暂不支持此种类型消息"; _unSupportLabel.textAlignment = NSTextAlignmentCenter; _unSupportLabel.font = [UIFont systemFontOfSize:13]; diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/Content/MewMessageToolMenuCollectionCell.h b/yinmeng-ios/yinmeng-ios/Main/Message/View/Session/Content/MewMessageToolMenuCollectionCell.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/Content/MewMessageToolMenuCollectionCell.h rename to yinmeng-ios/yinmeng-ios/Main/Message/View/Session/Content/MewMessageToolMenuCollectionCell.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/Content/MewMessageToolMenuCollectionCell.m b/yinmeng-ios/yinmeng-ios/Main/Message/View/Session/Content/MewMessageToolMenuCollectionCell.m similarity index 89% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/Content/MewMessageToolMenuCollectionCell.m rename to yinmeng-ios/yinmeng-ios/Main/Message/View/Session/Content/MewMessageToolMenuCollectionCell.m index b05b7b2..e6b68ac 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/Content/MewMessageToolMenuCollectionCell.m +++ b/yinmeng-ios/yinmeng-ios/Main/Message/View/Session/Content/MewMessageToolMenuCollectionCell.m @@ -20,18 +20,18 @@ - (instancetype)initWithFrame:(CGRect)frame { self = [super initWithFrame:frame]; if (self) { - [self initSubViews]; - [self initSubViewConstraints]; + [self mew_initSubViews]; + [self mew_initSubViewConstraints]; } return self; } #pragma mark - Private Method -- (void)initSubViews { +- (void)mew_initSubViews { [self.contentView addSubview:self.logoImageView]; } -- (void)initSubViewConstraints { +- (void)mew_initSubViewConstraints { [self.logoImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.edges.mas_equalTo(self.contentView); }]; diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/Content/MewMessageToolMenuCollectionViewCell.m b/yinmeng-ios/yinmeng-ios/Main/Message/View/Session/Content/MewMessageToolMenuCollectionViewCell.m similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/Content/MewMessageToolMenuCollectionViewCell.m rename to yinmeng-ios/yinmeng-ios/Main/Message/View/Session/Content/MewMessageToolMenuCollectionViewCell.m diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/MewMessageAudioCenter.h b/yinmeng-ios/yinmeng-ios/Main/Message/View/Session/MewMessageAudioCenter.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/MewMessageAudioCenter.h rename to yinmeng-ios/yinmeng-ios/Main/Message/View/Session/MewMessageAudioCenter.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/MewMessageAudioCenter.m b/yinmeng-ios/yinmeng-ios/Main/Message/View/Session/MewMessageAudioCenter.m similarity index 93% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/MewMessageAudioCenter.m rename to yinmeng-ios/yinmeng-ios/Main/Message/View/Session/MewMessageAudioCenter.m index e044613..7589926 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/MewMessageAudioCenter.m +++ b/yinmeng-ios/yinmeng-ios/Main/Message/View/Session/MewMessageAudioCenter.m @@ -28,12 +28,12 @@ self = [super init]; if (self) { [[NIMSDK sharedSDK].mediaManager addDelegate:self]; - [self resetRetryCount]; + [self mew_resetRetryCount]; } return self; } -- (void)resetRetryCount { +- (void)mew_resetRetryCount { _retryCount = 3; } @@ -58,10 +58,10 @@ }); }else{ self.currentPlayingMessage = nil; - [self resetRetryCount]; + [self mew_resetRetryCount]; } } else { - [self resetRetryCount]; + [self mew_resetRetryCount]; } } diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/MewMessageConentAudioView.h b/yinmeng-ios/yinmeng-ios/Main/Message/View/Session/MewMessageConentAudioView.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/MewMessageConentAudioView.h rename to yinmeng-ios/yinmeng-ios/Main/Message/View/Session/MewMessageConentAudioView.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/MewMessageConentAudioView.m b/yinmeng-ios/yinmeng-ios/Main/Message/View/Session/MewMessageConentAudioView.m similarity index 98% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/MewMessageConentAudioView.m rename to yinmeng-ios/yinmeng-ios/Main/Message/View/Session/MewMessageConentAudioView.m index d7b0a10..bbe57bf 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/MewMessageConentAudioView.m +++ b/yinmeng-ios/yinmeng-ios/Main/Message/View/Session/MewMessageConentAudioView.m @@ -11,7 +11,7 @@ #import ///Tool -#import "MEWThemeColor.h" +#import "MewThemeColor.h" #import "MewMessageAudioCenter.h" @interface MewMessageConentAudioView () ///背景 @@ -136,7 +136,7 @@ if (!_timeLabel) { _timeLabel = [[UILabel alloc] init]; _timeLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium]; - _timeLabel.textColor = [MEWThemeColor mewMainTextColor]; + _timeLabel.textColor = [MewThemeColor mewMainTextColor]; } return _timeLabel; } diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/MewNIMMessageMaker.h b/yinmeng-ios/yinmeng-ios/Main/Message/View/Session/MewNIMMessageMaker.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/MewNIMMessageMaker.h rename to yinmeng-ios/yinmeng-ios/Main/Message/View/Session/MewNIMMessageMaker.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/MewNIMMessageMaker.m b/yinmeng-ios/yinmeng-ios/Main/Message/View/Session/MewNIMMessageMaker.m similarity index 83% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/MewNIMMessageMaker.m rename to yinmeng-ios/yinmeng-ios/Main/Message/View/Session/MewNIMMessageMaker.m index db0a761..16c6835 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/MewNIMMessageMaker.m +++ b/yinmeng-ios/yinmeng-ios/Main/Message/View/Session/MewNIMMessageMaker.m @@ -14,7 +14,7 @@ { NIMMessage *textMessage = [[NIMMessage alloc] init]; textMessage.text = text; - [self setupMessage:textMessage]; + [self Mew_SetupMessage:textMessage]; return textMessage; } @@ -24,7 +24,7 @@ NIMMessage *message = [[NIMMessage alloc] init]; message.messageObject = audioObject; message.text = @"发来了一段语音"; - [self setupMessage:message]; + [self Mew_SetupMessage:message]; return message; } @@ -35,22 +35,22 @@ NIMImageOption *option = [[NIMImageOption alloc] init]; option.compressQuality = 0.7; imageObject.option = option; - return [MewNIMMessageMaker generateImageMessage:imageObject]; + return [MewNIMMessageMaker Mew_GenerateImageMessage:imageObject]; } + (NIMMessage *)Mew_MsgWithImagePath:(NSString*)path { NIMImageObject * imageObject = [[NIMImageObject alloc] initWithFilepath:path scene:NIMNOSSceneTypeMessage]; - return [MewNIMMessageMaker generateImageMessage:imageObject]; + return [MewNIMMessageMaker Mew_GenerateImageMessage:imageObject]; } + (NIMMessage *)Mew_MsgWithImageData:(NSData *)data extension:(NSString *)extension { NIMImageObject *imageObject = [[NIMImageObject alloc] initWithData:data extension:extension]; - return [MewNIMMessageMaker generateImageMessage:imageObject]; + return [MewNIMMessageMaker Mew_GenerateImageMessage:imageObject]; } -+ (NIMMessage *)generateImageMessage:(NIMImageObject *)imageObject ++ (NIMMessage *)Mew_GenerateImageMessage:(NIMImageObject *)imageObject { NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init]; [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm"]; @@ -59,11 +59,11 @@ NIMMessage *message = [[NIMMessage alloc] init]; message.messageObject = imageObject; message.apnsContent = @"发来了一张图片"; - [self setupMessage:message]; + [self Mew_SetupMessage:message]; return message; } -+ (void)setupMessage:(NIMMessage *)message ++ (void)Mew_SetupMessage:(NIMMessage *)message { message.apnsPayload = @{ @"apns-collapse-id": message.messageId, diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/MewSessionAudioRecordView.h b/yinmeng-ios/yinmeng-ios/Main/Message/View/Session/MewSessionAudioRecordView.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/MewSessionAudioRecordView.h rename to yinmeng-ios/yinmeng-ios/Main/Message/View/Session/MewSessionAudioRecordView.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/MewSessionAudioRecordView.m b/yinmeng-ios/yinmeng-ios/Main/Message/View/Session/MewSessionAudioRecordView.m similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/MewSessionAudioRecordView.m rename to yinmeng-ios/yinmeng-ios/Main/Message/View/Session/MewSessionAudioRecordView.m diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/MewSessionInfoViewController.h b/yinmeng-ios/yinmeng-ios/Main/Message/View/Session/MewSessionInfoViewController.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/MewSessionInfoViewController.h rename to yinmeng-ios/yinmeng-ios/Main/Message/View/Session/MewSessionInfoViewController.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/MewSessionInfoViewController.m b/yinmeng-ios/yinmeng-ios/Main/Message/View/Session/MewSessionInfoViewController.m similarity index 94% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/MewSessionInfoViewController.m rename to yinmeng-ios/yinmeng-ios/Main/Message/View/Session/MewSessionInfoViewController.m index 5d4b7ee..7d9e200 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/MewSessionInfoViewController.m +++ b/yinmeng-ios/yinmeng-ios/Main/Message/View/Session/MewSessionInfoViewController.m @@ -10,7 +10,7 @@ #import #import ///Tool -#import "MEWThemeColor.h" +#import "MewThemeColor.h" #import "NetImageView.h" #import "TTPopup.h" @@ -46,13 +46,13 @@ - (void)viewDidLoad { [super viewDidLoad]; - [self initData]; + [self mew_initData]; [self mew_initSubViews]; [self mew_initSubViewConstraints]; } #pragma mark - Private Method -- (void)initData { +- (void)mew_initData { [[NIMSDK sharedSDK].userManager fetchUserInfos:@[self.userId] completion:^(NSArray * _Nullable users, NSError * _Nullable error) { if (!error) { NIMUser * user = users.firstObject; @@ -228,7 +228,7 @@ - (UIView *)infoView { if (!_infoView) { _infoView = [[UIView alloc] init]; - _infoView.backgroundColor = [MEWThemeColor mewAppCellBackgroundColor]; + _infoView.backgroundColor = [MewThemeColor mewAppCellBackgroundColor]; _infoView.hidden = YES; } return _infoView; @@ -250,7 +250,7 @@ if (!_nickLabel) { _nickLabel = [[UILabel alloc] init]; _nickLabel.font = [UIFont systemFontOfSize:15]; - _nickLabel.textColor = [MEWThemeColor mewMainTextColor]; + _nickLabel.textColor = [MewThemeColor mewMainTextColor]; } return _nickLabel; } @@ -260,7 +260,7 @@ _titleLabel = [[UILabel alloc] init]; _titleLabel.font = [UIFont systemFontOfSize:14]; _titleLabel.text = @"个人主页"; - _titleLabel.textColor = [MEWThemeColor mewSecondTextColor]; + _titleLabel.textColor = [MewThemeColor mewSecondTextColor]; } return _titleLabel; } @@ -290,9 +290,9 @@ if (!_reportButton) { _reportButton = [UIButton buttonWithType:UIButtonTypeCustom]; [_reportButton setTitle:@"举报" forState:UIControlStateNormal]; - [_reportButton setTitleColor:[MEWThemeColor mewMainTextColor] forState:UIControlStateNormal]; + [_reportButton setTitleColor:[MewThemeColor mewMainTextColor] forState:UIControlStateNormal]; _reportButton.titleLabel.font = [UIFont systemFontOfSize:16 weight:UIFontWeightMedium]; - [_reportButton setBackgroundColor:[MEWThemeColor mewAppCellBackgroundColor]]; + [_reportButton setBackgroundColor:[MewThemeColor mewAppCellBackgroundColor]]; [_reportButton addTarget:self action:@selector(mew_reportButtonAction:) forControlEvents:UIControlEventTouchUpInside]; } return _reportButton; @@ -301,7 +301,7 @@ - (UIView *)lineView { if (!_lineView) { _lineView = [[UIView alloc] init]; - _lineView.backgroundColor = [MEWThemeColor mewDividerColor]; + _lineView.backgroundColor = [MewThemeColor mewDividerColor]; } return _lineView; } @@ -311,10 +311,10 @@ _blackButton = [UIButton buttonWithType:UIButtonTypeCustom]; [_blackButton setTitle:@"加入黑名单" forState:UIControlStateNormal]; [_blackButton setTitle:@"移除黑名单" forState:UIControlStateSelected]; - [_blackButton setTitleColor:[MEWThemeColor mewMainTextColor] forState:UIControlStateNormal]; - [_blackButton setTitleColor:[MEWThemeColor mewMainTextColor] forState:UIControlStateSelected]; + [_blackButton setTitleColor:[MewThemeColor mewMainTextColor] forState:UIControlStateNormal]; + [_blackButton setTitleColor:[MewThemeColor mewMainTextColor] forState:UIControlStateSelected]; _blackButton.titleLabel.font = [UIFont systemFontOfSize:16 weight:UIFontWeightMedium]; - [_blackButton setBackgroundColor:[MEWThemeColor mewAppCellBackgroundColor]]; + [_blackButton setBackgroundColor:[MewThemeColor mewAppCellBackgroundColor]]; [_blackButton addTarget:self action:@selector(mew_blackButtonAction:) forControlEvents:UIControlEventTouchUpInside]; } return _blackButton; diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/MewSessionMessageCell.h b/yinmeng-ios/yinmeng-ios/Main/Message/View/Session/MewSessionMessageCell.h similarity index 91% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/MewSessionMessageCell.h rename to yinmeng-ios/yinmeng-ios/Main/Message/View/Session/MewSessionMessageCell.h index dbe5971..a5edefa 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/MewSessionMessageCell.h +++ b/yinmeng-ios/yinmeng-ios/Main/Message/View/Session/MewSessionMessageCell.h @@ -19,7 +19,7 @@ NS_ASSUME_NONNULL_BEGIN @interface MewSessionMessageCell : UITableViewCell -+ (CGFloat)mew_sessionMeasureHeight:(NIMMessage *)message; ++ (CGFloat)Mew_SessionMeasureHeight:(NIMMessage *)message; - (void)mew_renderWithMessage:(NIMMessage *)message; + (NSString *)mew_cellMessageContent:(NIMMessage *)message; diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/MewSessionMessageCell.m b/yinmeng-ios/yinmeng-ios/Main/Message/View/Session/MewSessionMessageCell.m similarity index 95% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/MewSessionMessageCell.m rename to yinmeng-ios/yinmeng-ios/Main/Message/View/Session/MewSessionMessageCell.m index bdac12a..f8ff73a 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/MewSessionMessageCell.m +++ b/yinmeng-ios/yinmeng-ios/Main/Message/View/Session/MewSessionMessageCell.m @@ -13,9 +13,9 @@ #import "MewMessageContentImage.h" #import "MewMessageConentAudioView.h" ///Tool -#import "MEWThemeColor.h" +#import "MewThemeColor.h" #import "MewMacro.h" -#import "NewEncryptTool.h" +#import "MewEncryptTool.h" /// Third #import #import @@ -48,7 +48,7 @@ @implementation MewSessionMessageCell #pragma mark - Public Method -+ (CGFloat)mew_sessionMeasureHeight:(NIMMessage *)message { ++ (CGFloat)Mew_SessionMeasureHeight:(NIMMessage *)message { CGFloat minHeight = AVATAR_SIZE + AVATAR_MARGIN_H * 2; if (!message) { return minHeight; @@ -58,13 +58,13 @@ switch (message.messageType) { case NIMMessageTypeText: case NIMMessageTypeTip: - measureHeight = [MewMessageContentText mew_sessionMeasureHeight:message]; + measureHeight = [MewMessageContentText Mew_SessionMeasureHeight:message]; break; case NIMMessageTypeImage: - measureHeight = [MewMessageContentImage mew_sessionMeasureHeight:message]; + measureHeight = [MewMessageContentImage Mew_SessionMeasureHeight:message]; break; case NIMMessageTypeAudio: - measureHeight = [MewMessageConentAudioView mew_sessionMeasureHeight:message]; + measureHeight = [MewMessageConentAudioView Mew_SessionMeasureHeight:message]; break; case NIMMessageTypeCustom: measureHeight = [self mew_customMessageMeasureHeight:message]; @@ -87,13 +87,13 @@ self.rightAvatar.hidden = NO; [self.messageBackgroundLeft uninstall]; [self.messageBackgroundRight install]; - self.rightAvatar.imageUrl = (avatarUrl == nil ||avatarUrl.length == 0) ? [NewEncryptTool MEW_aesDecrypt:@"xdPnNelVD/RTlTKFqgSrESDPcNF6Diqb8sLg+HEvxpvjDdTLom1euQUOAOppjx15"] : avatarUrl;; + self.rightAvatar.imageUrl = (avatarUrl == nil ||avatarUrl.length == 0) ? [MewEncryptTool MEW_aesDecrypt:@"xdPnNelVD/RTlTKFqgSrESDPcNF6Diqb8sLg+HEvxpvjDdTLom1euQUOAOppjx15"] : avatarUrl;; } else { self.leftAvatar.hidden = NO; self.rightAvatar.hidden = YES; [self.messageBackgroundLeft install]; [self.messageBackgroundRight uninstall]; - self.leftAvatar.imageUrl = (avatarUrl == nil ||avatarUrl.length == 0) ? [NewEncryptTool MEW_aesDecrypt:@"xdPnNelVD/RTlTKFqgSrESDPcNF6Diqb8sLg+HEvxpvjDdTLom1euQUOAOppjx15"] : avatarUrl;; + self.leftAvatar.imageUrl = (avatarUrl == nil ||avatarUrl.length == 0) ? [MewEncryptTool MEW_aesDecrypt:@"xdPnNelVD/RTlTKFqgSrESDPcNF6Diqb8sLg+HEvxpvjDdTLom1euQUOAOppjx15"] : avatarUrl;; } [self mew_handleMessageFail:message]; @@ -182,7 +182,7 @@ /// 自定义消息的高度 + (CGFloat)mew_customMessageMeasureHeight:(NIMMessage *)message { //暂不支持该信息 - return [MewMessageContentUnSupportView mew_sessionMeasureHeight:message]; + return [MewMessageContentUnSupportView Mew_SessionMeasureHeight:message]; } - (UIView *)mew_getCustomMessageContentView:(NIMMessage *)message { @@ -311,7 +311,7 @@ - (UIView *)messageBackground { if (!_messageBackground) { _messageBackground = [[UIView alloc]init]; - _messageBackground.backgroundColor = [MEWThemeColor mewAppCellBackgroundColor]; + _messageBackground.backgroundColor = [MewThemeColor mewAppCellBackgroundColor]; _messageBackground.layer.masksToBounds = YES; _messageBackground.layer.cornerRadius = 8.f; } diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/MewSessionNavView.h b/yinmeng-ios/yinmeng-ios/Main/Message/View/Session/MewSessionNavView.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/MewSessionNavView.h rename to yinmeng-ios/yinmeng-ios/Main/Message/View/Session/MewSessionNavView.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/MewSessionNavView.m b/yinmeng-ios/yinmeng-ios/Main/Message/View/Session/MewSessionNavView.m similarity index 95% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/MewSessionNavView.m rename to yinmeng-ios/yinmeng-ios/Main/Message/View/Session/MewSessionNavView.m index ef89db9..015514f 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/MewSessionNavView.m +++ b/yinmeng-ios/yinmeng-ios/Main/Message/View/Session/MewSessionNavView.m @@ -7,7 +7,7 @@ #import "MewSessionNavView.h" /// Tool -#import "MEWThemeColor.h" +#import "MewThemeColor.h" #import #import "MewMacro.h" /// Third @@ -135,7 +135,7 @@ if (!_nickLabel) { _nickLabel = [[UILabel alloc] init]; _nickLabel.font = [UIFont systemFontOfSize:16 weight:UIFontWeightMedium]; - _nickLabel.textColor = [MEWThemeColor mewMainTextColor]; + _nickLabel.textColor = [MewThemeColor mewMainTextColor]; _nickLabel.textAlignment = NSTextAlignmentCenter; } return _nickLabel; @@ -148,9 +148,9 @@ _likeButton.titleLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightMedium]; _likeButton.layer.cornerRadius = 21/2; _likeButton.layer.masksToBounds = YES; - [_likeButton setTitleColor:UIColorMewFromRGB(0xFFDA24) forState:UIControlStateNormal]; + [_likeButton setTitleColor:UIColorMewFromRGB(0x9552FF) forState:UIControlStateNormal]; _likeButton.layer.borderWidth = 0.5; - _likeButton.layer.borderColor = UIColorMewFromRGB(0xFFDA24).CGColor; + _likeButton.layer.borderColor = UIColorMewFromRGB(0x9552FF).CGColor; [_likeButton addTarget:self action:@selector(mew_likeButtonAction:) forControlEvents:UIControlEventTouchUpInside]; _likeButton.hidden = NO; } diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/MewSessionToolbarView.h b/yinmeng-ios/yinmeng-ios/Main/Message/View/Session/MewSessionToolbarView.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/MewSessionToolbarView.h rename to yinmeng-ios/yinmeng-ios/Main/Message/View/Session/MewSessionToolbarView.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/MewSessionToolbarView.m b/yinmeng-ios/yinmeng-ios/Main/Message/View/Session/MewSessionToolbarView.m similarity index 96% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/MewSessionToolbarView.m rename to yinmeng-ios/yinmeng-ios/Main/Message/View/Session/MewSessionToolbarView.m index 952febd..ebd1aec 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/MewSessionToolbarView.m +++ b/yinmeng-ios/yinmeng-ios/Main/Message/View/Session/MewSessionToolbarView.m @@ -10,7 +10,7 @@ #import #import ///Tool -#import "MEWThemeColor.h" +#import "MewThemeColor.h" #import "MewMacro.h" #import "NSArray+MewSafe.h" ///Model @@ -61,8 +61,8 @@ [[NIMSDK sharedSDK].mediaManager addDelegate:self]; [self mew_addNotification]; [self mew_addAudioButtonAction]; - [self initSubViews]; - [self initSubViewConstraints]; + [self mew_initSubViews]; + [self mew_initSubViewConstraints]; } return self; } @@ -89,8 +89,8 @@ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(mew_keyboardWillShow:) name:UIKeyboardWillShowNotification object:nil]; } -- (void)initSubViews { - self.backgroundColor = [MEWThemeColor mewAppCellBackgroundColor]; +- (void)mew_initSubViews { + self.backgroundColor = [MewThemeColor mewAppCellBackgroundColor]; [self addSubview:self.stackView]; [self.stackView addArrangedSubview:self.toolStackView]; @@ -107,7 +107,7 @@ [self.inputBackView addSubview:self.inputView]; } -- (void)initSubViewConstraints { +- (void)mew_initSubViewConstraints { [self mas_makeConstraints:^(MASConstraintMaker *make) { make.bottom.mas_equalTo(self.stackView); }]; @@ -331,10 +331,10 @@ self.userInteractionEnabled = !sendDisabled; if (sendDisabled) { self.inputView.text = @""; - NSAttributedString * attribute = [[NSAttributedString alloc] initWithString:_model == 2 ? @"互相关注成为好友可发起聊天" : @"暂时无法私聊" attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:15], NSForegroundColorAttributeName : [MEWThemeColor mewSecondTextColor]}]; + NSAttributedString * attribute = [[NSAttributedString alloc] initWithString:_model == 2 ? @"互相关注成为好友可发起聊天" : @"暂时无法私聊" attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:15], NSForegroundColorAttributeName : [MewThemeColor mewSecondTextColor]}]; self.inputView.attributedPlaceholder = attribute; } else { - NSAttributedString * attribute = [[NSAttributedString alloc] initWithString:@"请输入消息" attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:15], NSForegroundColorAttributeName : [MEWThemeColor mewSecondTextColor]}]; + NSAttributedString * attribute = [[NSAttributedString alloc] initWithString:@"请输入消息" attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:15], NSForegroundColorAttributeName : [MewThemeColor mewSecondTextColor]}]; self.inputView.attributedPlaceholder = attribute; } } @@ -395,11 +395,11 @@ - (UITextField *)inputView{ if (!_inputView) { _inputView = [[UITextField alloc] init]; - NSAttributedString * attribute = [[NSAttributedString alloc] initWithString:@"请输入消息" attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:15], NSForegroundColorAttributeName : [MEWThemeColor mewSecondTextColor]}]; + NSAttributedString * attribute = [[NSAttributedString alloc] initWithString:@"请输入消息" attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:15], NSForegroundColorAttributeName : [MewThemeColor mewSecondTextColor]}]; _inputView.attributedPlaceholder = attribute; _inputView.borderStyle = UITextBorderStyleNone; - _inputView.tintColor = UIColorMewFromRGB(0xFFE710); - _inputView.textColor = [MEWThemeColor mewMainTextColor]; + _inputView.tintColor = UIColorMewFromRGB(0x9552FF); + _inputView.textColor = [MewThemeColor mewMainTextColor]; _inputView.font = [UIFont systemFontOfSize:12.f]; _inputView.delegate = self; _inputView.autocorrectionType = UITextAutocorrectionTypeNo; @@ -413,7 +413,7 @@ _audioButton = [UIButton buttonWithType:UIButtonTypeCustom]; [_audioButton setTitle:@"按住说话" forState:UIControlStateNormal]; [_audioButton setTitle:@"松开结束" forState:UIControlStateSelected]; - [_audioButton setTitleColor:[MEWThemeColor mewMainTextColor] forState:UIControlStateNormal]; + [_audioButton setTitleColor:[MewThemeColor mewMainTextColor] forState:UIControlStateNormal]; _audioButton.titleLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium]; _audioButton.layer.masksToBounds = YES; _audioButton.layer.cornerRadius = 4; diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/MewSessionViewController.h b/yinmeng-ios/yinmeng-ios/Main/Message/View/Session/MewSessionViewController.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/MewSessionViewController.h rename to yinmeng-ios/yinmeng-ios/Main/Message/View/Session/MewSessionViewController.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/MewSessionViewController.m b/yinmeng-ios/yinmeng-ios/Main/Message/View/Session/MewSessionViewController.m similarity index 97% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/MewSessionViewController.m rename to yinmeng-ios/yinmeng-ios/Main/Message/View/Session/MewSessionViewController.m index 27826dd..cce7ce4 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/MewSessionViewController.m +++ b/yinmeng-ios/yinmeng-ios/Main/Message/View/Session/MewSessionViewController.m @@ -11,7 +11,7 @@ #import "MewSessionMessageCell.h" /// Tool #import "MewMacro.h" -#import "MEWThemeColor.h" +#import "MewThemeColor.h" #import "NSArray+MewSafe.h" #import "UITableView+NIMScrollToBottom.h" #import "MewClientConfig.h" @@ -278,7 +278,7 @@ - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { NIMMessage *msg = [self.messages mewSafeObjectAtIndex:indexPath.row]; - return [MewSessionMessageCell mew_sessionMeasureHeight:msg]; + return [MewSessionMessageCell Mew_SessionMeasureHeight:msg]; } @@ -289,8 +289,8 @@ MJRefreshNormalHeader *header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(mew_headerRefresh)]; header.stateLabel.font = [UIFont systemFontOfSize:10.0]; header.lastUpdatedTimeLabel.font = [UIFont systemFontOfSize:10.0]; - header.stateLabel.textColor = [MEWThemeColor mewSecondTextColor]; - header.lastUpdatedTimeLabel.textColor = [MEWThemeColor mewSecondTextColor]; + header.stateLabel.textColor = [MewThemeColor mewSecondTextColor]; + header.lastUpdatedTimeLabel.textColor = [MewThemeColor mewSecondTextColor]; self.sessionTableView.mj_header = header; [self mew_headerRefresh]; [self initData]; @@ -418,9 +418,9 @@ imagePickerVc.modalPresentationStyle = UIModalPresentationOverFullScreen; imagePickerVc.allowPickingVideo = NO; imagePickerVc.allowTakeVideo = NO; - imagePickerVc.naviBgColor = [MEWThemeColor mewAppCellBackgroundColor]; - imagePickerVc.naviTitleColor = [MEWThemeColor mewMainTextColor]; - imagePickerVc.barItemTextColor = [MEWThemeColor mewMainTextColor]; + imagePickerVc.naviBgColor = [MewThemeColor mewAppCellBackgroundColor]; + imagePickerVc.naviTitleColor = [MewThemeColor mewMainTextColor]; + imagePickerVc.barItemTextColor = [MewThemeColor mewMainTextColor]; [self presentViewController:imagePickerVc animated:YES completion:nil]; } break; diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Api/Api+Mine.h b/yinmeng-ios/yinmeng-ios/Main/Mine/Api/Api+Mine.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Api/Api+Mine.h rename to yinmeng-ios/yinmeng-ios/Main/Mine/Api/Api+Mine.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Api/Api+Mine.m b/yinmeng-ios/yinmeng-ios/Main/Mine/Api/Api+Mine.m similarity index 90% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Api/Api+Mine.m rename to yinmeng-ios/yinmeng-ios/Main/Mine/Api/Api+Mine.m index b5faa98..c102399 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Api/Api+Mine.m +++ b/yinmeng-ios/yinmeng-ios/Main/Mine/Api/Api+Mine.m @@ -6,7 +6,7 @@ // #import "Api+Mine.h" -#import "NewEncryptTool.h" +#import "MewEncryptTool.h" @implementation Api (Mine) /// 请求收藏房间列表 @@ -16,7 +16,7 @@ /// @param pageSize 一页多少个 /// @param roomType 类型：4：个播房；其他：派对房；不传：所有房间 + (void)Mew_RequestMineCollectRoomList:(MewHttpRequestHelperCompletion)completion uid:(NSString *)uid page:(NSString *)page pageSize:(NSString *)pageSize roomType:(NSString *)roomType { - NSString *getUrl = [NewEncryptTool MEW_aesDecrypt:@"xbrIaF3tjG37mRyRC97ZrffhHg2YaksxPephr1wGtYI="];//fans/fansRoomList + NSString *getUrl = [MewEncryptTool MEW_aesDecrypt:@"xbrIaF3tjG37mRyRC97ZrffhHg2YaksxPephr1wGtYI="];//fans/fansRoomList [self makeRequest:getUrl method:MewHttpRequestHelperMethodGET completion:completion, __FUNCTION__,uid , page, pageSize, roomType, nil]; } @@ -24,7 +24,7 @@ /// @param completion 完成 /// @param access_token token + (void)Mew_LogoutCurrentAccount:(MewHttpRequestHelperCompletion)completion access_token:(NSString *)access_token { - NSString *getUrl = [NewEncryptTool MEW_aesDecrypt:@"73cfDtRGGthZvJUN7DktoA=="];///acc/logout + NSString *getUrl = [MewEncryptTool MEW_aesDecrypt:@"73cfDtRGGthZvJUN7DktoA=="];///acc/logout [self makeRequest:getUrl method:MewHttpRequestHelperMethodPOST completion:completion, __FUNCTION__, access_token, nil]; } @@ -35,7 +35,7 @@ /// @param page page /// @param pageSize pagesize + (void)Mew_UserDetailInfoCompletion:(MewHttpRequestHelperCompletion)completion uid:(NSString *)uid page:(NSString *)page pageSize:(NSString *)pageSize { - NSString *getUrl = [NewEncryptTool MEW_aesDecrypt:@"W7uzbHnGUU1RiDHmTvViGQ=="];///user/detail/get + NSString *getUrl = [MewEncryptTool MEW_aesDecrypt:@"W7uzbHnGUU1RiDHmTvViGQ=="];///user/detail/get [self makeRequest:getUrl method:MewHttpRequestHelperMethodGET completion:completion, __FUNCTION__, uid, page, pageSize, nil]; } @@ -47,7 +47,7 @@ /// @param ticket ticket /// @param type 1 关注 2取消关注 + (void)Mew_AttentionCompletion:(MewHttpRequestHelperCompletion)completion uid:(NSString *)uid likedUid:(NSString *)likedUid ticket:(NSString *)ticket type:(NSString *)type { - NSString *getUrl = [NewEncryptTool MEW_aesDecrypt:@"atxkzRc+U9YS4UOIpECXlw=="];///fans/like + NSString *getUrl = [MewEncryptTool MEW_aesDecrypt:@"atxkzRc+U9YS4UOIpECXlw=="];///fans/like [self makeRequest:getUrl method:MewHttpRequestHelperMethodPOST completion:completion, __FUNCTION__, uid, likedUid, ticket, type, nil]; } @@ -56,7 +56,7 @@ /// @param uid 自己的uid /// @param isLikeUid 要查询的那个人的uid + (void)Mew_AttentionStatusCompletion:(MewHttpRequestHelperCompletion)completion uid:(NSString *)uid isLikeUid:(NSString *)isLikeUid { - NSString *getUrl = [NewEncryptTool MEW_aesDecrypt:@"2D8AkLpUg8cU9aQTxO+Mmw=="];///fans/islike + NSString *getUrl = [MewEncryptTool MEW_aesDecrypt:@"2D8AkLpUg8cU9aQTxO+Mmw=="];///fans/islike [self makeRequest:getUrl method:MewHttpRequestHelperMethodGET completion:completion,__FUNCTION__, uid, isLikeUid, nil]; } @@ -66,7 +66,7 @@ /// @param pageNo 当前页数 /// @param pageSize 一页多少个 + (void)Mew_GetAttentionListCompletion:(MewHttpRequestHelperCompletion)completion uid:(NSString *)uid pageNo:(NSString *)pageNo pageSize:(NSString *)pageSize { - NSString *getUrl = [NewEncryptTool MEW_aesDecrypt:@"INF19c+8RN4ef4v8DIWwJQ=="];///fans/following + NSString *getUrl = [MewEncryptTool MEW_aesDecrypt:@"INF19c+8RN4ef4v8DIWwJQ=="];///fans/following [self makeRequest:getUrl method:MewHttpRequestHelperMethodGET completion:completion, __FUNCTION__, uid, pageNo, pageSize, nil]; } @@ -76,7 +76,7 @@ /// @param completion 完成 /// @param channelType channel + (void)Mew_GetRechargeList:(MewHttpRequestHelperCompletion)completion channelType:(NSString *)channelType { - NSString *getUrl = [NewEncryptTool MEW_aesDecrypt:@"tJGng+8YSnwgwk5S0i5New=="];////chargeprod/list + NSString *getUrl = [MewEncryptTool MEW_aesDecrypt:@"tJGng+8YSnwgwk5S0i5New=="];////chargeprod/list [self makeRequest:getUrl method:MewHttpRequestHelperMethodGET completion:completion, __FUNCTION__,channelType, nil]; } @@ -88,7 +88,7 @@ /// @param deviceInfo uuid /// @param clientIp ip地址 + (void)Mew_RequestIAPRecharge:(MewHttpRequestHelperCompletion)completion chargeProdId:(NSString *)chargeProdId uid:(NSString *)uid ticket:(NSString *)ticket deviceInfo:(NSString *)deviceInfo clientIp:(NSString *)clientIp { - NSString *getUrl = [NewEncryptTool MEW_aesDecrypt:@"bwrNIwSuCtX9ebT29xed93rJaaaSsuxrTFso6OAppms="];//storeKitV/placeOrder + NSString *getUrl = [MewEncryptTool MEW_aesDecrypt:@"bwrNIwSuCtX9ebT29xed93rJaaaSsuxrTFso6OAppms="];//storeKitV/placeOrder [self makeRequest:getUrl method:MewHttpRequestHelperMethodPOST completion:completion, __FUNCTION__,chargeProdId, uid, ticket, deviceInfo, clientIp, nil]; } @@ -102,7 +102,7 @@ /// @param uid 用户uid /// @param ticket ticket + (void)Mew_CheckReceipt:(MewHttpRequestHelperCompletion)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 + NSString *getUrl = [MewEncryptTool MEW_aesDecrypt:@"/sdsv2QZR4mbqOhGOocSTQ=="];////verify/setiap [self makeRequest:getUrl method:MewHttpRequestHelperMethodPOST completion:completion, __FUNCTION__,receipt, chooseEnv, chargeRecordId, transcationId, uid, ticket, nil]; } /// 验证凭据 @@ -113,7 +113,7 @@ /// @param uid 用户uid /// @param ticket ticket + (void)Mew_CheckReceipt:(MewHttpRequestHelperCompletion)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 + NSString *getUrl = [MewEncryptTool MEW_aesDecrypt:@"10iACYRNJ/Q7R019Q4DRNFPf0nODacTzggh6x9bvmOw="];//storeKitV2/verifyOrder [self makeRequest:getUrl method:MewHttpRequestHelperMethodPOST completion:completion, __FUNCTION__, chooseEnv, chargeRecordId, transcationId, uid, ticket, nil]; } diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/Friend/MewFansInfoModel.h b/yinmeng-ios/yinmeng-ios/Main/Mine/Model/Friend/MewFansInfoModel.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/Friend/MewFansInfoModel.h rename to yinmeng-ios/yinmeng-ios/Main/Mine/Model/Friend/MewFansInfoModel.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/Friend/MewFansInfoModel.m b/yinmeng-ios/yinmeng-ios/Main/Mine/Model/Friend/MewFansInfoModel.m similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/Friend/MewFansInfoModel.m rename to yinmeng-ios/yinmeng-ios/Main/Mine/Model/Friend/MewFansInfoModel.m diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/MewMineCollectRoomModel.h b/yinmeng-ios/yinmeng-ios/Main/Mine/Model/MewMineCollectRoomModel.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/MewMineCollectRoomModel.h rename to yinmeng-ios/yinmeng-ios/Main/Mine/Model/MewMineCollectRoomModel.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/MewMineCollectRoomModel.m b/yinmeng-ios/yinmeng-ios/Main/Mine/Model/MewMineCollectRoomModel.m similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/MewMineCollectRoomModel.m rename to yinmeng-ios/yinmeng-ios/Main/Mine/Model/MewMineCollectRoomModel.m diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/MewMineSettingItemModel.h b/yinmeng-ios/yinmeng-ios/Main/Mine/Model/MewMineSettingItemModel.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/MewMineSettingItemModel.h rename to yinmeng-ios/yinmeng-ios/Main/Mine/Model/MewMineSettingItemModel.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/MewMineSettingItemModel.m b/yinmeng-ios/yinmeng-ios/Main/Mine/Model/MewMineSettingItemModel.m similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/MewMineSettingItemModel.m rename to yinmeng-ios/yinmeng-ios/Main/Mine/Model/MewMineSettingItemModel.m diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/Recharge/MewRechargeListModel.h b/yinmeng-ios/yinmeng-ios/Main/Mine/Model/Recharge/MewRechargeListModel.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/Recharge/MewRechargeListModel.h rename to yinmeng-ios/yinmeng-ios/Main/Mine/Model/Recharge/MewRechargeListModel.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/Recharge/MewRechargeListModel.m b/yinmeng-ios/yinmeng-ios/Main/Mine/Model/Recharge/MewRechargeListModel.m similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/Recharge/MewRechargeListModel.m rename to yinmeng-ios/yinmeng-ios/Main/Mine/Model/Recharge/MewRechargeListModel.m diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/Recharge/MewWalletInfoModel.h b/yinmeng-ios/yinmeng-ios/Main/Mine/Model/Recharge/MewWalletInfoModel.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/Recharge/MewWalletInfoModel.h rename to yinmeng-ios/yinmeng-ios/Main/Mine/Model/Recharge/MewWalletInfoModel.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/Recharge/MewWalletInfoModel.m b/yinmeng-ios/yinmeng-ios/Main/Mine/Model/Recharge/MewWalletInfoModel.m similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Model/Recharge/MewWalletInfoModel.m rename to yinmeng-ios/yinmeng-ios/Main/Mine/Model/Recharge/MewWalletInfoModel.m diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Presenter/MewMineCollectRoomPresenter.h b/yinmeng-ios/yinmeng-ios/Main/Mine/Presenter/MewMineCollectRoomPresenter.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Presenter/MewMineCollectRoomPresenter.h rename to yinmeng-ios/yinmeng-ios/Main/Mine/Presenter/MewMineCollectRoomPresenter.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Presenter/MewMineCollectRoomPresenter.m b/yinmeng-ios/yinmeng-ios/Main/Mine/Presenter/MewMineCollectRoomPresenter.m similarity index 94% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Presenter/MewMineCollectRoomPresenter.m rename to yinmeng-ios/yinmeng-ios/Main/Mine/Presenter/MewMineCollectRoomPresenter.m index e0cad0b..36d18cb 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Presenter/MewMineCollectRoomPresenter.m +++ b/yinmeng-ios/yinmeng-ios/Main/Mine/Presenter/MewMineCollectRoomPresenter.m @@ -19,7 +19,7 @@ /// @param pageSize 一页多少个 /// @param type 类型：4：个播房；其他：派对房；不传：所有房间 - (void)mew_getCollectRoomList:(int)page pageSize:(int)pageSize state:(int)state type:(NSString *)type { - NSString * uid = [MewAccountInfoStorage instance].getUid; + NSString * uid = [MewAccountInfoStorage instance].mew_getUid; [Api Mew_RequestMineCollectRoomList:[self mew_createHttpCompletion:^(MewBaseModel * _Nonnull data) { NSArray * array = [MewMineCollectRoomModel mewModelsWithArray:data.data[@"fansRoomList"]]; [[self mew_getView] mew_fonGetCollectRoomListSuccess:array state:state]; diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Presenter/MewMineRechargePresenter.h b/yinmeng-ios/yinmeng-ios/Main/Mine/Presenter/MewMineRechargePresenter.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Presenter/MewMineRechargePresenter.h rename to yinmeng-ios/yinmeng-ios/Main/Mine/Presenter/MewMineRechargePresenter.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Presenter/MewMineRechargePresenter.m b/yinmeng-ios/yinmeng-ios/Main/Mine/Presenter/MewMineRechargePresenter.m similarity index 89% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Presenter/MewMineRechargePresenter.m rename to yinmeng-ios/yinmeng-ios/Main/Mine/Presenter/MewMineRechargePresenter.m index ab296bb..ed4981b 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Presenter/MewMineRechargePresenter.m +++ b/yinmeng-ios/yinmeng-ios/Main/Mine/Presenter/MewMineRechargePresenter.m @@ -21,9 +21,9 @@ /// 获取钱包信息 - (void)mew_getUserWalletInfo { - NSString * uid = [MewAccountInfoStorage instance].getUid; + NSString * uid = [MewAccountInfoStorage instance].mew_getUid; NSString * ticket = [MewAccountInfoStorage instance].mew_getTicket; - [Api mew_getUserWalletInfo:[self mew_createHttpCompletion:^(MewBaseModel * _Nonnull data) { + [Api Mew_GetUserWalletInfo:[self mew_createHttpCompletion:^(MewBaseModel * _Nonnull data) { MewWalletInfoModel * model = [MewWalletInfoModel mewModelWithDictionary:data.data]; [[self mew_getView] mew_getUserWalletInfo:model]; }] uid:uid ticket:ticket]; @@ -42,7 +42,7 @@ /// 获取充值的订单编号 /// @param chargeProdId 苹果服务器的充值 的id - (void)mew_requestIAPRechargeOrderWithChargeProdId:(NSString *)chargeProdId { - NSString * uid = [MewAccountInfoStorage instance].getUid; + NSString * uid = [MewAccountInfoStorage instance].mew_getUid; NSString * ticket = [MewAccountInfoStorage instance].mew_getTicket; NSString * deviceInfo = [MewUtility deviceID]; NSString * clientIp= [MewUtility ipAddress]; @@ -62,7 +62,7 @@ /// @param orderId 订单编号 /// @param transcationId 商品id - (void)mew_checkReceiptWithOrderId:(NSString *)orderId transcationId:(NSString *)transcationId errorToast:(BOOL)errorToast{ - NSString * uid = [MewAccountInfoStorage instance].getUid; + NSString * uid = [MewAccountInfoStorage instance].mew_getUid; NSString * ticket = [MewAccountInfoStorage instance].mew_getTicket; [Api Mew_CheckReceipt:[self mew_createHttpCompletion:^(MewBaseModel * _Nonnull data) { [[self mew_getView] mew_checkReceiptSuccess:transcationId]; @@ -76,7 +76,7 @@ /// @param orderId 订单编号 /// @param transcationId 商品id - (void)mew_checkReceiptWithData:(NSString *)receipt orderId:(NSString *)orderId transcationId:(NSString *)transcationId { - NSString * uid = [MewAccountInfoStorage instance].getUid; + NSString * uid = [MewAccountInfoStorage instance].mew_getUid; NSString * ticket = [MewAccountInfoStorage instance].mew_getTicket; [Api Mew_CheckReceipt:[self mew_createHttpCompletion:^(MewBaseModel * _Nonnull data) { [[self mew_getView] mew_checkReceiptSuccess:transcationId]; @@ -88,7 +88,7 @@ /// @param transcations 凭据的数组 - (void)mew_checkTranscationIds:(NSArray *)transcations { NSString * transcationIdStr = [transcations mewToJSONString]; - [Api requestCheckTranscationIds:[self mew_createHttpCompletion:^(MewBaseModel * _Nonnull data) { + [Api Mew_RequestCheckTranscationIds:[self mew_createHttpCompletion:^(MewBaseModel * _Nonnull data) { [[self mew_getView] mew_checkTranscationIdsSuccess]; }] transcationIdStr:transcationIdStr]; } diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Presenter/MewMineSettingPresenter.h b/yinmeng-ios/yinmeng-ios/Main/Mine/Presenter/MewMineSettingPresenter.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Presenter/MewMineSettingPresenter.h rename to yinmeng-ios/yinmeng-ios/Main/Mine/Presenter/MewMineSettingPresenter.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Presenter/MewMineSettingPresenter.m b/yinmeng-ios/yinmeng-ios/Main/Mine/Presenter/MewMineSettingPresenter.m similarity index 93% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Presenter/MewMineSettingPresenter.m rename to yinmeng-ios/yinmeng-ios/Main/Mine/Presenter/MewMineSettingPresenter.m index f9c6a47..e434962 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Presenter/MewMineSettingPresenter.m +++ b/yinmeng-ios/yinmeng-ios/Main/Mine/Presenter/MewMineSettingPresenter.m @@ -50,8 +50,8 @@ /// 获取用户信息 - (void)mew_getUserInfo { - NSString *uid = [[MewAccountInfoStorage instance] getUid]; - [Api getUserInfo:[self mew_createHttpCompletion:^(MewBaseModel * _Nonnull data) { + NSString *uid = [[MewAccountInfoStorage instance] mew_getUid]; + [Api Mew_GetUserInfo:[self mew_createHttpCompletion:^(MewBaseModel * _Nonnull data) { MewUserInfoModel *userInfo = [MewUserInfoModel mewModelWithDictionary:data.data]; [[self mew_getView] mew_onGetUserInfoSuccess:userInfo]; }] uid:uid]; diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Presenter/YMMineCollectRoomPresenter.m b/yinmeng-ios/yinmeng-ios/Main/Mine/Presenter/YMMineCollectRoomPresenter.m similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Presenter/YMMineCollectRoomPresenter.m rename to yinmeng-ios/yinmeng-ios/Main/Mine/Presenter/YMMineCollectRoomPresenter.m diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Protocol/MewMineCollectRoomProtocol.h b/yinmeng-ios/yinmeng-ios/Main/Mine/Protocol/MewMineCollectRoomProtocol.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Protocol/MewMineCollectRoomProtocol.h rename to yinmeng-ios/yinmeng-ios/Main/Mine/Protocol/MewMineCollectRoomProtocol.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Protocol/MewMineRechargeProtocol.h b/yinmeng-ios/yinmeng-ios/Main/Mine/Protocol/MewMineRechargeProtocol.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Protocol/MewMineRechargeProtocol.h rename to yinmeng-ios/yinmeng-ios/Main/Mine/Protocol/MewMineRechargeProtocol.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Protocol/MewMineSettingProtocol.h b/yinmeng-ios/yinmeng-ios/Main/Mine/Protocol/MewMineSettingProtocol.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Protocol/MewMineSettingProtocol.h rename to yinmeng-ios/yinmeng-ios/Main/Mine/Protocol/MewMineSettingProtocol.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Protocol/MineRechargeProtocol.h b/yinmeng-ios/yinmeng-ios/Main/Mine/Protocol/MineRechargeProtocol.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Protocol/MineRechargeProtocol.h rename to yinmeng-ios/yinmeng-ios/Main/Mine/Protocol/MineRechargeProtocol.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/CollectRoom/Cell/MewMineCollectRoomCell.h b/yinmeng-ios/yinmeng-ios/Main/Mine/View/CollectRoom/Cell/MewMineCollectRoomCell.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/CollectRoom/Cell/MewMineCollectRoomCell.h rename to yinmeng-ios/yinmeng-ios/Main/Mine/View/CollectRoom/Cell/MewMineCollectRoomCell.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/CollectRoom/Cell/MewMineCollectRoomCell.m b/yinmeng-ios/yinmeng-ios/Main/Mine/View/CollectRoom/Cell/MewMineCollectRoomCell.m similarity index 97% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/CollectRoom/Cell/MewMineCollectRoomCell.m rename to yinmeng-ios/yinmeng-ios/Main/Mine/View/CollectRoom/Cell/MewMineCollectRoomCell.m index 7343d76..912ee3b 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/CollectRoom/Cell/MewMineCollectRoomCell.m +++ b/yinmeng-ios/yinmeng-ios/Main/Mine/View/CollectRoom/Cell/MewMineCollectRoomCell.m @@ -12,7 +12,7 @@ #import "MewMineCollectRoomModel.h" /// Tool #import "NetImageView.h" -#import "MEWThemeColor.h" +#import "MewThemeColor.h" @interface MewMineCollectRoomCell() ///显示头像 @@ -91,7 +91,7 @@ if (!_nickLabel) { _nickLabel = [[UILabel alloc] init]; _nickLabel.font = [UIFont systemFontOfSize:14]; - _nickLabel.textColor = [MEWThemeColor mewMainTextColor]; + _nickLabel.textColor = [MewThemeColor mewMainTextColor]; } return _nickLabel; } diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/CollectRoom/MewMineCollectRoomViewController.h b/yinmeng-ios/yinmeng-ios/Main/Mine/View/CollectRoom/MewMineCollectRoomViewController.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/CollectRoom/MewMineCollectRoomViewController.h rename to yinmeng-ios/yinmeng-ios/Main/Mine/View/CollectRoom/MewMineCollectRoomViewController.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/CollectRoom/MewMineCollectRoomViewController.m b/yinmeng-ios/yinmeng-ios/Main/Mine/View/CollectRoom/MewMineCollectRoomViewController.m similarity index 90% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/CollectRoom/MewMineCollectRoomViewController.m rename to yinmeng-ios/yinmeng-ios/Main/Mine/View/CollectRoom/MewMineCollectRoomViewController.m index d3b66ac..7d557a1 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/CollectRoom/MewMineCollectRoomViewController.m +++ b/yinmeng-ios/yinmeng-ios/Main/Mine/View/CollectRoom/MewMineCollectRoomViewController.m @@ -10,14 +10,14 @@ #import #import ///Tool -#import "MEWThemeColor.h" +#import "MewThemeColor.h" #import "NSArray+MewSafe.h" ///P #import "MewMineCollectRoomPresenter.h" #import "MewMineCollectRoomProtocol.h" ///View #import "MewMineCollectRoomCell.h" -#import "YMEmptyTableViewCell.h" +#import "MewEmptyTableViewCell.h" @interface MewMineCollectRoomViewController () @@ -85,7 +85,7 @@ } // 无收藏房间 - YMEmptyTableViewCell *emptyCell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([YMEmptyTableViewCell class])]; + MewEmptyTableViewCell *emptyCell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([MewEmptyTableViewCell class])]; emptyCell.emptyTitle = @"暂无收藏的房间"; return emptyCell; @@ -110,12 +110,12 @@ MJRefreshNormalHeader *header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(mew_headerRefresh)]; header.stateLabel.font = [UIFont systemFontOfSize:10.0]; header.lastUpdatedTimeLabel.font = [UIFont systemFontOfSize:10.0]; - header.stateLabel.textColor = [MEWThemeColor mewSecondTextColor]; - header.lastUpdatedTimeLabel.textColor = [MEWThemeColor mewSecondTextColor]; + header.stateLabel.textColor = [MewThemeColor mewSecondTextColor]; + header.lastUpdatedTimeLabel.textColor = [MewThemeColor mewSecondTextColor]; self.tableView.mj_header = header; MJRefreshBackNormalFooter *footer = [MJRefreshBackNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(mew_footerRefresh)]; - footer.stateLabel.textColor = [MEWThemeColor mewSecondTextColor]; + footer.stateLabel.textColor = [MewThemeColor mewSecondTextColor]; footer.stateLabel.font = [UIFont systemFontOfSize:10.0]; self.tableView.mj_footer = footer; @@ -152,7 +152,7 @@ _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; } _tableView.contentInset = UIEdgeInsetsMake(8, 0, 0, 0); - [_tableView registerClass:[YMEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([YMEmptyTableViewCell class])]; + [_tableView registerClass:[MewEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([MewEmptyTableViewCell class])]; [_tableView registerClass:[MewMineCollectRoomCell class] forCellReuseIdentifier:NSStringFromClass([MewMineCollectRoomCell class])]; } return _tableView; diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Mine/View/MewMineCollectionViewController.h b/yinmeng-ios/yinmeng-ios/Main/Mine/View/MiewMineView/MewMineCollectionViewController.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Mine/View/MewMineCollectionViewController.h rename to yinmeng-ios/yinmeng-ios/Main/Mine/View/MiewMineView/MewMineCollectionViewController.h diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Mine/View/MewMineCollectionViewController.m b/yinmeng-ios/yinmeng-ios/Main/Mine/View/MiewMineView/MewMineCollectionViewController.m similarity index 90% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Mine/View/MewMineCollectionViewController.m rename to yinmeng-ios/yinmeng-ios/Main/Mine/View/MiewMineView/MewMineCollectionViewController.m index b0a9f53..28d260a 100644 --- a/yinmeng-ios/yinmeng-ios/Main/Mew/Mine/View/MewMineCollectionViewController.m +++ b/yinmeng-ios/yinmeng-ios/Main/Mine/View/MiewMineView/MewMineCollectionViewController.m @@ -7,10 +7,10 @@ #import "MewMineCollectionViewController.h" #import "MewMineCollectionTableViewCell.h" -#import "YMEmptyTableViewCell.h" +#import "MewEmptyTableViewCell.h" /// Tool #import "MewMacro.h" -#import "MEWThemeColor.h" +#import "MewThemeColor.h" /// Third #import #import "NSArray+MEWSafe.h" @@ -60,7 +60,7 @@ } - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { if (self.collectionModels.count == 0) { - YMEmptyTableViewCell *emptyCell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([YMEmptyTableViewCell class])]; + MewEmptyTableViewCell *emptyCell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([MewEmptyTableViewCell class])]; emptyCell.emptyTitle = @"暂无收藏的房间"; return emptyCell; @@ -78,12 +78,12 @@ MJRefreshNormalHeader *header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(mew_headerRefresh)]; header.stateLabel.font = [UIFont systemFontOfSize:10.0]; header.lastUpdatedTimeLabel.font = [UIFont systemFontOfSize:10.0]; - header.stateLabel.textColor = [MEWThemeColor mewSecondTextColor]; - header.lastUpdatedTimeLabel.textColor = [MEWThemeColor mewSecondTextColor]; + header.stateLabel.textColor = [MewThemeColor mewSecondTextColor]; + header.lastUpdatedTimeLabel.textColor = [MewThemeColor mewSecondTextColor]; self.collectionTableView.mj_header = header; MJRefreshBackNormalFooter *footer = [MJRefreshBackNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(mew_footerRefresh)]; - footer.stateLabel.textColor = [MEWThemeColor mewSecondTextColor]; + footer.stateLabel.textColor = [MewThemeColor mewSecondTextColor]; footer.stateLabel.font = [UIFont systemFontOfSize:10.0]; self.collectionTableView.mj_footer = footer; @@ -144,7 +144,7 @@ _collectionTableView.separatorStyle = UITableViewCellSeparatorStyleNone; _collectionTableView.rowHeight = 80; [_collectionTableView registerClass:[MewMineCollectionTableViewCell class] forCellReuseIdentifier:NSStringFromClass([MewMineCollectionTableViewCell class])]; - [_collectionTableView registerClass:[YMEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([YMEmptyTableViewCell class])]; + [_collectionTableView registerClass:[MewEmptyTableViewCell class] forCellReuseIdentifier:NSStringFromClass([MewEmptyTableViewCell class])]; } return _collectionTableView; } diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Mine/View/MewRechargeSubView.h b/yinmeng-ios/yinmeng-ios/Main/Mine/View/MiewMineView/MewRechargeSubView.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Mine/View/MewRechargeSubView.h rename to yinmeng-ios/yinmeng-ios/Main/Mine/View/MiewMineView/MewRechargeSubView.h diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Mine/View/MewRechargeSubView.m b/yinmeng-ios/yinmeng-ios/Main/Mine/View/MiewMineView/MewRechargeSubView.m similarity index 96% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Mine/View/MewRechargeSubView.m rename to yinmeng-ios/yinmeng-ios/Main/Mine/View/MiewMineView/MewRechargeSubView.m index 30d9777..ef5fb51 100644 --- a/yinmeng-ios/yinmeng-ios/Main/Mew/Mine/View/MewRechargeSubView.m +++ b/yinmeng-ios/yinmeng-ios/Main/Mine/View/MiewMineView/MewRechargeSubView.m @@ -13,7 +13,7 @@ #import #import /// Tool -#import "MEWThemeColor.h" +#import "MewThemeColor.h" #import "MewMacro.h" #import "UIImage+MewUtils.h" #import "MewHUDTool.h" @@ -71,7 +71,7 @@ } UIView *currentRechargeView = tap.view; - currentRechargeView.layer.borderColor = [MEWThemeColor mewColorWithHexString:@"#9552FF"].CGColor; + currentRechargeView.layer.borderColor = [MewThemeColor mewColorWithHexString:@"#9552FF"].CGColor; currentRechargeView.layer.borderWidth = 1.0; NSInteger selectIndex = tap.view.tag - 100; @@ -262,10 +262,10 @@ _rechargePrivacyLabel.numberOfLines = 0; NSMutableAttributedString *attString = [[NSMutableAttributedString alloc] initWithString:@"已阅读并同意"]; - attString.yy_color = [MEWThemeColor mewSecondTextColor]; + attString.yy_color = [MewThemeColor mewSecondTextColor]; attString.yy_font = [UIFont systemFontOfSize:13]; - NSMutableAttributedString *rechargeAttString = [[NSMutableAttributedString alloc] initWithString:@"《用户充值协议》\n" attributes:@{NSForegroundColorAttributeName:[MEWThemeColor mewColorWithHexString:@"#5DA4F5"]}]; + NSMutableAttributedString *rechargeAttString = [[NSMutableAttributedString alloc] initWithString:@"《用户充值协议》\n" attributes:@{NSForegroundColorAttributeName:[MewThemeColor mewColorWithHexString:@"#5DA4F5"]}]; @kWeakify(self); [rechargeAttString yy_setTextHighlightRange:NSMakeRange(0, rechargeAttString.length) color:nil backgroundColor:nil userInfo:nil tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) { @kStrongify(self); @@ -277,7 +277,7 @@ } longPressAction:nil]; NSMutableAttributedString *serviceAttString = [[NSMutableAttributedString alloc] initWithString:@"如有任何问题请咨询客服"]; - serviceAttString.yy_color = [MEWThemeColor mewSecondTextColor]; + serviceAttString.yy_color = [MewThemeColor mewSecondTextColor]; serviceAttString.yy_font = [UIFont systemFontOfSize:13]; [attString appendAttributedString:rechargeAttString]; @@ -296,9 +296,9 @@ _rechargeButton.titleLabel.font = kFontMedium(16); _rechargeButton.layer.cornerRadius = 24; _rechargeButton.layer.masksToBounds = YES; - UIImage *image = [UIImage mew_gradientColorImageFromColors:@[[MEWThemeColor mewColorWithHexString:@"#FF60FD"], - [MEWThemeColor mewColorWithHexString:@"#8974FF"], - [MEWThemeColor mewColorWithHexString:@"#69EBFF"] + UIImage *image = [UIImage mew_gradientColorImageFromColors:@[[MewThemeColor mewColorWithHexString:@"#FF60FD"], + [MewThemeColor mewColorWithHexString:@"#8974FF"], + [MewThemeColor mewColorWithHexString:@"#69EBFF"] ] gradientType:MewGradientTypeLeftToRight imgSize:CGSizeMake(KScreenWidth - 2*40, 48)]; _rechargeButton.backgroundColor = [UIColor colorWithPatternImage:image]; [_rechargeButton addTarget:self action:@selector(mew_rechargeButtonAction) forControlEvents:UIControlEventTouchUpInside]; diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Mine/View/MewRechargeViewController.h b/yinmeng-ios/yinmeng-ios/Main/Mine/View/MiewMineView/MewRechargeViewController.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Mine/View/MewRechargeViewController.h rename to yinmeng-ios/yinmeng-ios/Main/Mine/View/MiewMineView/MewRechargeViewController.h diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Mine/View/MewRechargeViewController.m b/yinmeng-ios/yinmeng-ios/Main/Mine/View/MiewMineView/MewRechargeViewController.m similarity index 96% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Mine/View/MewRechargeViewController.m rename to yinmeng-ios/yinmeng-ios/Main/Mine/View/MiewMineView/MewRechargeViewController.m index 6afa59c..55545ed 100644 --- a/yinmeng-ios/yinmeng-ios/Main/Mew/Mine/View/MewRechargeViewController.m +++ b/yinmeng-ios/yinmeng-ios/Main/Mine/View/MiewMineView/MewRechargeViewController.m @@ -20,8 +20,8 @@ #import "MewMineRechargePresenter.h" #import "MewHUDTool.h" #import "yinmeng_ios-Swift.h" -#import "MEWRechargeStorage.h" -#import "NewEncryptTool.h" +#import "MewRechargeStorage.h" +#import "MewEncryptTool.h" @interface MewRechargeViewController () @property (nonatomic, strong) UIImageView *rechargeBgImageView; @@ -182,8 +182,8 @@ } ///删除本地保存的 - (void)mew_deleteRechageReciptWithTransactionIdentifier:(NSString *)transactionIdentifier { - NSString * uid = [MewAccountInfoStorage instance].getUid; - BOOL deleteSuccess = [MEWRechargeStorage mewDelegateTranscationId:transactionIdentifier uid:uid]; + NSString * uid = [MewAccountInfoStorage instance].mew_getUid; + BOOL deleteSuccess = [MewRechargeStorage mewDelegateTranscationId:transactionIdentifier uid:uid]; if (deleteSuccess) { #warning to do 保存失败 需要埋点 } @@ -204,8 +204,8 @@ } if(dictionary.allKeys.count == 0)return; NSString *reciptJson = [dictionary mewToJSONString]; - NSString * uid = [MewAccountInfoStorage instance].getUid; - BOOL saveSuccess = [MEWRechargeStorage mewSaveTranscationId:transactionIdentifier recipt:reciptJson uid:uid]; + NSString * uid = [MewAccountInfoStorage instance].mew_getUid; + BOOL saveSuccess = [MewRechargeStorage mewSaveTranscationId:transactionIdentifier recipt:reciptJson uid:uid]; if (!saveSuccess) { #warning to do 保存失败 需要埋点 } @@ -222,7 +222,7 @@ MewWebViewController * webVC = [[MewWebViewController alloc] init]; /// mew/modules/rule/rechargeAgreement.html - NSString *rechageProtocol = [NewEncryptTool MEW_aesDecrypt:@"3fYQzValG55yGNx2mWnN7NvVzsWc9cmKVWuOUkwu8a9ALvqUxXRhaWrnne5rd9oR"]; + NSString *rechageProtocol = [MewEncryptTool MEW_aesDecrypt:@"3fYQzValG55yGNx2mWnN7NvVzsWc9cmKVWuOUkwu8a9ALvqUxXRhaWrnne5rd9oR"]; webVC.url = rechageProtocol; [self.navigationController pushViewController:webVC animated:YES]; } diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/Cell/MewMineCollectionTableViewCell.h b/yinmeng-ios/yinmeng-ios/Main/Mine/View/Setting/Cell/MewMineCollectionTableViewCell.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/Cell/MewMineCollectionTableViewCell.h rename to yinmeng-ios/yinmeng-ios/Main/Mine/View/Setting/Cell/MewMineCollectionTableViewCell.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/Cell/MewMineCollectionTableViewCell.m b/yinmeng-ios/yinmeng-ios/Main/Mine/View/Setting/Cell/MewMineCollectionTableViewCell.m similarity index 96% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/Cell/MewMineCollectionTableViewCell.m rename to yinmeng-ios/yinmeng-ios/Main/Mine/View/Setting/Cell/MewMineCollectionTableViewCell.m index f5cf4e4..fdd55a1 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/Cell/MewMineCollectionTableViewCell.m +++ b/yinmeng-ios/yinmeng-ios/Main/Mine/View/Setting/Cell/MewMineCollectionTableViewCell.m @@ -10,7 +10,7 @@ #import "MewMineCollectRoomModel.h" #import #import "MewMacro.h" -#import "MEWThemeColor.h" +#import "MewThemeColor.h" @interface MewMineCollectionTableViewCell() @property (nonatomic, strong) NetImageView *avaterImageView; @@ -88,7 +88,7 @@ - (UIView *)lineView { if (!_lineView) { _lineView = [[UIView alloc] init]; - _lineView.backgroundColor = [MEWThemeColor mewDividerColor]; + _lineView.backgroundColor = [MewThemeColor mewDividerColor]; } return _lineView; } diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/Cell/MewMineSettingTableViewCell.h b/yinmeng-ios/yinmeng-ios/Main/Mine/View/Setting/Cell/MewMineSettingTableViewCell.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/Cell/MewMineSettingTableViewCell.h rename to yinmeng-ios/yinmeng-ios/Main/Mine/View/Setting/Cell/MewMineSettingTableViewCell.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/Cell/MewMineSettingTableViewCell.m b/yinmeng-ios/yinmeng-ios/Main/Mine/View/Setting/Cell/MewMineSettingTableViewCell.m similarity index 99% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/Cell/MewMineSettingTableViewCell.m rename to yinmeng-ios/yinmeng-ios/Main/Mine/View/Setting/Cell/MewMineSettingTableViewCell.m index e85e148..9fd7d2b 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/Cell/MewMineSettingTableViewCell.m +++ b/yinmeng-ios/yinmeng-ios/Main/Mine/View/Setting/Cell/MewMineSettingTableViewCell.m @@ -11,7 +11,7 @@ /// Third #import ///Tool -#import "MEWThemeColor.h" +#import "MewThemeColor.h" #import "MewMacro.h" @interface MewMineSettingTableViewCell() diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/MewMineAboutUsViewController.h b/yinmeng-ios/yinmeng-ios/Main/Mine/View/Setting/MewMineAboutUsViewController.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/MewMineAboutUsViewController.h rename to yinmeng-ios/yinmeng-ios/Main/Mine/View/Setting/MewMineAboutUsViewController.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/MewMineAboutUsViewController.m b/yinmeng-ios/yinmeng-ios/Main/Mine/View/Setting/MewMineAboutUsViewController.m similarity index 97% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/MewMineAboutUsViewController.m rename to yinmeng-ios/yinmeng-ios/Main/Mine/View/Setting/MewMineAboutUsViewController.m index 9dc1b96..a6fe0bf 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/MewMineAboutUsViewController.m +++ b/yinmeng-ios/yinmeng-ios/Main/Mine/View/Setting/MewMineAboutUsViewController.m @@ -11,7 +11,7 @@ #import /// Tool #import "MewMacro.h" -#import "MEWThemeColor.h" +#import "MewThemeColor.h" #import "Base.h" #import "MewUtility.h" #import "MewHtmlUrl.h" @@ -39,7 +39,7 @@ - (void)viewDidLoad { [super viewDidLoad]; self.title = [NSString stringWithFormat:@"关于%@",@"我们"]; - self.view.backgroundColor = [MEWThemeColor mewColorWithHexString:@"#14171B"]; + self.view.backgroundColor = [MewThemeColor mewColorWithHexString:@"#14171B"]; [self mew_initSubViews]; [self makeConstriants]; } @@ -150,7 +150,7 @@ - (UIView *)privacyView { if(!_privacyView) { _privacyView = [[UIView alloc] init]; - _privacyView.backgroundColor = [MEWThemeColor mewColorWithHexString:@"#5E6175"]; + _privacyView.backgroundColor = [MewThemeColor mewColorWithHexString:@"#5E6175"]; UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(mew_pushPrivacyView:)]; [_privacyView addGestureRecognizer:tap]; } diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/MewMineSettingViewController.h b/yinmeng-ios/yinmeng-ios/Main/Mine/View/Setting/MewMineSettingViewController.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/MewMineSettingViewController.h rename to yinmeng-ios/yinmeng-ios/Main/Mine/View/Setting/MewMineSettingViewController.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/MewMineSettingViewController.m b/yinmeng-ios/yinmeng-ios/Main/Mine/View/Setting/MewMineSettingViewController.m similarity index 96% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/MewMineSettingViewController.m rename to yinmeng-ios/yinmeng-ios/Main/Mine/View/Setting/MewMineSettingViewController.m index 230f6c4..7b5f726 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/MewMineSettingViewController.m +++ b/yinmeng-ios/yinmeng-ios/Main/Mine/View/Setting/MewMineSettingViewController.m @@ -24,7 +24,7 @@ #import ///Tool #import "NSArray+MewSafe.h" -#import "MEWThemeColor.h" +#import "MewThemeColor.h" #import "MewMacro.h" #import "UIImage+MewUtils.h" #import "MewHUDTool.h" @@ -59,7 +59,7 @@ #pragma mark - Life Cycle - (void)viewDidLoad { [super viewDidLoad]; - self.view.backgroundColor = [MEWThemeColor mewColorWithHexString:@"#14171B"]; + self.view.backgroundColor = [MewThemeColor mewColorWithHexString:@"#14171B"]; [self mew_initSubViews]; [self.presenter mew_getMineSettingDataSourceWith:self.userInfo]; } @@ -229,12 +229,12 @@ if (!_logoutButton) { _logoutButton = [UIButton buttonWithType:UIButtonTypeCustom]; _logoutButton.frame = CGRectMake(40, 40, KScreenWidth - 40 * 2, 50); - _logoutButton.backgroundColor = [MEWThemeColor mewAppCellBackgroundColor]; + _logoutButton.backgroundColor = [MewThemeColor mewAppCellBackgroundColor]; _logoutButton.layer.masksToBounds = YES; _logoutButton.layer.cornerRadius = 50/2; _logoutButton.titleLabel.font = [UIFont systemFontOfSize:16]; [_logoutButton setTitleColor:UIColor.whiteColor forState:UIControlStateNormal]; - UIImage *image = [UIImage mew_gradientColorImageFromColors:@[[MEWThemeColor mewColorWithHexString:@"#FF60FD"], [MEWThemeColor mewColorWithHexString:@"#8974FF"], [MEWThemeColor mewColorWithHexString:@"#69EBFF"]] gradientType:MewGradientTypeLeftToRight imgSize:CGSizeMake(KScreenWidth - 2 * 40, 48)]; + UIImage *image = [UIImage mew_gradientColorImageFromColors:@[[MewThemeColor mewColorWithHexString:@"#FF60FD"], [MewThemeColor mewColorWithHexString:@"#8974FF"], [MewThemeColor mewColorWithHexString:@"#69EBFF"]] gradientType:MewGradientTypeLeftToRight imgSize:CGSizeMake(KScreenWidth - 2 * 40, 48)]; _logoutButton.backgroundColor = [UIColor colorWithPatternImage:image]; [_logoutButton setTitle:@"退出账号" forState:UIControlStateNormal]; [_logoutButton addTarget:self action:@selector(logoutButtonAction:) forControlEvents:UIControlEventTouchUpInside]; diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/SubView/MewMineModifPayPwdView.h b/yinmeng-ios/yinmeng-ios/Main/Mine/View/SubView/MewMineModifPayPwdView.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/SubView/MewMineModifPayPwdView.h rename to yinmeng-ios/yinmeng-ios/Main/Mine/View/SubView/MewMineModifPayPwdView.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/SubView/MewMineModifPayPwdView.m b/yinmeng-ios/yinmeng-ios/Main/Mine/View/SubView/MewMineModifPayPwdView.m similarity index 91% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/SubView/MewMineModifPayPwdView.m rename to yinmeng-ios/yinmeng-ios/Main/Mine/View/SubView/MewMineModifPayPwdView.m index a946d11..377260b 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/SubView/MewMineModifPayPwdView.m +++ b/yinmeng-ios/yinmeng-ios/Main/Mine/View/SubView/MewMineModifPayPwdView.m @@ -9,7 +9,7 @@ ///Third #import ///Tool -#import "MEWThemeColor.h" +#import "MewThemeColor.h" #import "UIButton+MewEnlargeTouchArea.h" @interface MewMineModifPayPwdView() @@ -43,7 +43,7 @@ #pragma mark - Private Method - (void)mew_initSubViews { - self.backgroundColor = [MEWThemeColor mewAppCellBackgroundColor]; + self.backgroundColor = [MewThemeColor mewAppCellBackgroundColor]; [self addSubview:self.contentTextField]; [self addSubview:self.commandButton]; [self addSubview:self.partLineView]; @@ -76,14 +76,14 @@ #pragma mark - Getters And Setters - (void)setPlaceholder:(NSString *)placeholder { _placeholder = placeholder; - self.contentTextField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:placeholder attributes:@{NSFontAttributeName : self.contentTextField.font, NSForegroundColorAttributeName : [MEWThemeColor mewSecondTextColor]}]; + self.contentTextField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:placeholder attributes:@{NSFontAttributeName : self.contentTextField.font, NSForegroundColorAttributeName : [MewThemeColor mewSecondTextColor]}]; } - (UIView *)partLineView { if (!_partLineView) { _partLineView = [[UIView alloc] init]; - _partLineView.backgroundColor = [MEWThemeColor mewDividerColor]; + _partLineView.backgroundColor = [MewThemeColor mewDividerColor]; _partLineView.hidden = YES; } return _partLineView; @@ -94,8 +94,8 @@ _contentTextField = [[UITextField alloc] init]; _contentTextField.secureTextEntry = YES; _contentTextField.font = [UIFont systemFontOfSize:13]; - _contentTextField.textColor = [MEWThemeColor mewMainTextColor]; -// _contentTextField.tintColor = [MEWThemeColor appMainColor]; + _contentTextField.textColor = [MewThemeColor mewMainTextColor]; +// _contentTextField.tintColor = [MewThemeColor appMainColor]; } return _contentTextField; } diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/ModuleKit/MewGiftView/Api/Api+Gift.h b/yinmeng-ios/yinmeng-ios/Main/ModuleKit/MewGiftView/Api/Api+Gift.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/ModuleKit/MewGiftView/Api/Api+Gift.h rename to yinmeng-ios/yinmeng-ios/Main/ModuleKit/MewGiftView/Api/Api+Gift.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/ModuleKit/MewGiftView/Api/Api+Gift.m b/yinmeng-ios/yinmeng-ios/Main/ModuleKit/MewGiftView/Api/Api+Gift.m similarity index 92% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/ModuleKit/MewGiftView/Api/Api+Gift.m rename to yinmeng-ios/yinmeng-ios/Main/ModuleKit/MewGiftView/Api/Api+Gift.m index d7eb930..b8f1255 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/ModuleKit/MewGiftView/Api/Api+Gift.m +++ b/yinmeng-ios/yinmeng-ios/Main/ModuleKit/MewGiftView/Api/Api+Gift.m @@ -6,7 +6,7 @@ // #import "Api+Gift.h" -#import "NewEncryptTool.h" +#import "MewEncryptTool.h" @implementation Api (Gift) /// 送礼物的接口 /// @param complection 完成 @@ -29,7 +29,7 @@ roomUid:(NSString *)roomUid msg:(NSString *)msg uid:(NSString *)uid { - NSString *getUrl = [NewEncryptTool MEW_aesDecrypt:@"gIV0xamx+afcRMN4yGb5jw=="];//gift/sendV4 + NSString *getUrl = [MewEncryptTool MEW_aesDecrypt:@"gIV0xamx+afcRMN4yGb5jw=="];//gift/sendV4 NSString *method = getUrl; [self makeRequest:method method:MewHttpRequestHelperMethodPOST completion:complection, __FUNCTION__, targetUids, giftNum, sendType, giftId, giftSource, giftType, roomUid, msg, uid, nil]; } diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/ModuleKit/MewGiftView/Model/MewGiftInfoModel.h b/yinmeng-ios/yinmeng-ios/Main/ModuleKit/MewGiftView/Model/MewGiftInfoModel.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/ModuleKit/MewGiftView/Model/MewGiftInfoModel.h rename to yinmeng-ios/yinmeng-ios/Main/ModuleKit/MewGiftView/Model/MewGiftInfoModel.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/ModuleKit/MewGiftView/Model/MewGiftInfoModel.m b/yinmeng-ios/yinmeng-ios/Main/ModuleKit/MewGiftView/Model/MewGiftInfoModel.m similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/ModuleKit/MewGiftView/Model/MewGiftInfoModel.m rename to yinmeng-ios/yinmeng-ios/Main/ModuleKit/MewGiftView/Model/MewGiftInfoModel.m diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/ModuleKit/MewGiftView/Model/MewGiftReceiveInfoModel.h b/yinmeng-ios/yinmeng-ios/Main/ModuleKit/MewGiftView/Model/MewGiftReceiveInfoModel.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/ModuleKit/MewGiftView/Model/MewGiftReceiveInfoModel.h rename to yinmeng-ios/yinmeng-ios/Main/ModuleKit/MewGiftView/Model/MewGiftReceiveInfoModel.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/ModuleKit/MewGiftView/Model/MewGiftReceiveInfoModel.m b/yinmeng-ios/yinmeng-ios/Main/ModuleKit/MewGiftView/Model/MewGiftReceiveInfoModel.m similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/ModuleKit/MewGiftView/Model/MewGiftReceiveInfoModel.m rename to yinmeng-ios/yinmeng-ios/Main/ModuleKit/MewGiftView/Model/MewGiftReceiveInfoModel.m diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/ModuleKit/MewGiftView/Presenter/MewGiftStorage.h b/yinmeng-ios/yinmeng-ios/Main/ModuleKit/MewGiftView/Presenter/MewGiftStorage.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/ModuleKit/MewGiftView/Presenter/MewGiftStorage.h rename to yinmeng-ios/yinmeng-ios/Main/ModuleKit/MewGiftView/Presenter/MewGiftStorage.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/ModuleKit/MewGiftView/Presenter/MewGiftStorage.m b/yinmeng-ios/yinmeng-ios/Main/ModuleKit/MewGiftView/Presenter/MewGiftStorage.m similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/ModuleKit/MewGiftView/Presenter/MewGiftStorage.m rename to yinmeng-ios/yinmeng-ios/Main/ModuleKit/MewGiftView/Presenter/MewGiftStorage.m diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Party/Api/Api+MewParty.h b/yinmeng-ios/yinmeng-ios/Main/Party/Api/Api+MewParty.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Party/Api/Api+MewParty.h rename to yinmeng-ios/yinmeng-ios/Main/Party/Api/Api+MewParty.h diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Party/Api/Api+MewParty.m b/yinmeng-ios/yinmeng-ios/Main/Party/Api/Api+MewParty.m similarity index 84% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Party/Api/Api+MewParty.m rename to yinmeng-ios/yinmeng-ios/Main/Party/Api/Api+MewParty.m index 94e315a..56dcead 100644 --- a/yinmeng-ios/yinmeng-ios/Main/Mew/Party/Api/Api+MewParty.m +++ b/yinmeng-ios/yinmeng-ios/Main/Party/Api/Api+MewParty.m @@ -6,14 +6,14 @@ // #import "Api+MewParty.h" -#import "NewEncryptTool.h" +#import "MewEncryptTool.h" @implementation Api (MewParty) /// 请求推荐房间列表 /// @param completion 完成 /// @param uid 用户的uid + (void)mew_partyRecommendRoomListComplection:(MewHttpRequestHelperCompletion)completion uid:(NSString *)uid { - NSString *getUrl = [NewEncryptTool MEW_aesDecrypt:@"QFTxN/O9DfSc+M1EAx2zzw=="];///home/tab/homeV2 + NSString *getUrl = [MewEncryptTool MEW_aesDecrypt:@"QFTxN/O9DfSc+M1EAx2zzw=="];///home/tab/homeV2 [self makeRequest:getUrl method:MewHttpRequestHelperMethodGET completion:completion, __FUNCTION__, uid, nil]; } @end diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Party/Model/MewHomeRecommendRoomModel.h b/yinmeng-ios/yinmeng-ios/Main/Party/Model/MewHomeRecommendRoomModel.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Party/Model/MewHomeRecommendRoomModel.h rename to yinmeng-ios/yinmeng-ios/Main/Party/Model/MewHomeRecommendRoomModel.h diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Party/Model/MewHomeRecommendRoomModel.m b/yinmeng-ios/yinmeng-ios/Main/Party/Model/MewHomeRecommendRoomModel.m similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Party/Model/MewHomeRecommendRoomModel.m rename to yinmeng-ios/yinmeng-ios/Main/Party/Model/MewHomeRecommendRoomModel.m diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Party/Model/MewPartyModel.h b/yinmeng-ios/yinmeng-ios/Main/Party/Model/MewPartyModel.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Party/Model/MewPartyModel.h rename to yinmeng-ios/yinmeng-ios/Main/Party/Model/MewPartyModel.h diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Party/Model/MewPartyModel.m b/yinmeng-ios/yinmeng-ios/Main/Party/Model/MewPartyModel.m similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Party/Model/MewPartyModel.m rename to yinmeng-ios/yinmeng-ios/Main/Party/Model/MewPartyModel.m diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Party/Presenter/MewPartyPresenter.h b/yinmeng-ios/yinmeng-ios/Main/Party/Presenter/MewPartyPresenter.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Party/Presenter/MewPartyPresenter.h rename to yinmeng-ios/yinmeng-ios/Main/Party/Presenter/MewPartyPresenter.h diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Party/Presenter/MewPartyPresenter.m b/yinmeng-ios/yinmeng-ios/Main/Party/Presenter/MewPartyPresenter.m similarity index 92% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Party/Presenter/MewPartyPresenter.m rename to yinmeng-ios/yinmeng-ios/Main/Party/Presenter/MewPartyPresenter.m index 3449cc8..3952ba2 100644 --- a/yinmeng-ios/yinmeng-ios/Main/Mew/Party/Presenter/MewPartyPresenter.m +++ b/yinmeng-ios/yinmeng-ios/Main/Party/Presenter/MewPartyPresenter.m @@ -16,7 +16,7 @@ /// 请求推荐房间列表 - (void)mew_partyRecommendRoomList { - NSString *uid = [MewAccountInfoStorage instance].getUid; + NSString *uid = [MewAccountInfoStorage instance].mew_getUid; [Api mew_partyRecommendRoomListComplection:[self mew_createHttpCompletion:^(MewBaseModel * _Nonnull data) { NSArray * array = [MewHomeRecommendRoomModel mewModelsWithArray:data.data]; [[self mew_getView] mew_partyRecommendRoomListSuccess:array]; diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Party/Protocol/MewPartyProtocol.h b/yinmeng-ios/yinmeng-ios/Main/Party/Protocol/MewPartyProtocol.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Party/Protocol/MewPartyProtocol.h rename to yinmeng-ios/yinmeng-ios/Main/Party/Protocol/MewPartyProtocol.h diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Party/View/MewPartyListCollectionViewCell.h b/yinmeng-ios/yinmeng-ios/Main/Party/View/MewPartyListCollectionViewCell.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Party/View/MewPartyListCollectionViewCell.h rename to yinmeng-ios/yinmeng-ios/Main/Party/View/MewPartyListCollectionViewCell.h diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Party/View/MewPartyListCollectionViewCell.m b/yinmeng-ios/yinmeng-ios/Main/Party/View/MewPartyListCollectionViewCell.m similarity index 96% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Party/View/MewPartyListCollectionViewCell.m rename to yinmeng-ios/yinmeng-ios/Main/Party/View/MewPartyListCollectionViewCell.m index d7fc1ac..4648e2a 100644 --- a/yinmeng-ios/yinmeng-ios/Main/Mew/Party/View/MewPartyListCollectionViewCell.m +++ b/yinmeng-ios/yinmeng-ios/Main/Party/View/MewPartyListCollectionViewCell.m @@ -10,7 +10,7 @@ #import "NetImageView.h" /// Tool #import "MewMacro.h" -#import "MEWThemeColor.h" +#import "MewThemeColor.h" /// Third #import /// Model @@ -51,7 +51,7 @@ self.partyBgImageView.image = [UIImage imageNamed:_model.imageName]; self.titleLabel.text = _model.title; self.detailLabel.text = _model.detail; - self.detailLabel.textColor = [MEWThemeColor mewColorWithHexString:_model.colorString]; + self.detailLabel.textColor = [MewThemeColor mewColorWithHexString:_model.colorString]; // self.lookLabel.hidden = !_model.isLook; } @@ -150,7 +150,7 @@ if (!_partyBottomLabel) { _partyBottomLabel = [[UILabel alloc] init]; _partyBottomLabel.text = @"9999人派对中"; - _partyBottomLabel.textColor = [MEWThemeColor mewColorWithHexString:@"#F0F0F0"]; + _partyBottomLabel.textColor = [MewThemeColor mewColorWithHexString:@"#F0F0F0"]; _partyBottomLabel.font = kFontRegular(11); } return _partyBottomLabel; diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Party/View/MewPartyViewController.h b/yinmeng-ios/yinmeng-ios/Main/Party/View/MewPartyViewController.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Party/View/MewPartyViewController.h rename to yinmeng-ios/yinmeng-ios/Main/Party/View/MewPartyViewController.h diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Party/View/MewPartyViewController.m b/yinmeng-ios/yinmeng-ios/Main/Party/View/MewPartyViewController.m similarity index 97% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Party/View/MewPartyViewController.m rename to yinmeng-ios/yinmeng-ios/Main/Party/View/MewPartyViewController.m index 5ffd71b..2466539 100644 --- a/yinmeng-ios/yinmeng-ios/Main/Mew/Party/View/MewPartyViewController.m +++ b/yinmeng-ios/yinmeng-ios/Main/Party/View/MewPartyViewController.m @@ -14,6 +14,7 @@ #import /// Tool #import "MewMacro.h" +#import "MewHUDTool.h" /// Model #import "MewPartyModel.h" #import "MewHomeRecommendRoomModel.h" @@ -94,7 +95,10 @@ } - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath { - if (indexPath.row >= self.homeRecommendModels.count) { return; } + if (indexPath.row >= self.homeRecommendModels.count) { + [MewHUDTool showErrorWithMessage:@"房主已下播，请等待房主重新开启房间"]; + return; + } NSString *roomId = self.homeRecommendModels[indexPath.row].roomUid; diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/Api/Api+Room.h b/yinmeng-ios/yinmeng-ios/Main/Room/Api/Api+Room.h similarity index 98% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/Api/Api+Room.h rename to yinmeng-ios/yinmeng-ios/Main/Room/Api/Api+Room.h index 583505a..066bc58 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/Api/Api+Room.h +++ b/yinmeng-ios/yinmeng-ios/Main/Room/Api/Api+Room.h @@ -31,7 +31,7 @@ NS_ASSUME_NONNULL_BEGIN /// @param mgId 小游戏的id + (void)Mew_OpenRoom:(MewHttpRequestHelperCompletion)complection title:(NSString *)title - type:(RoomType)type + type:(MewRoomType)type roomPwd:(NSString *)roomPwd roomDesc:(NSString *)roomDesc backPic:(NSString *)backPic diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/Api/Api+Room.m b/yinmeng-ios/yinmeng-ios/Main/Room/Api/Api+Room.m similarity index 88% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/Api/Api+Room.m rename to yinmeng-ios/yinmeng-ios/Main/Room/Api/Api+Room.m index 828daca..713f2ba 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/Api/Api+Room.m +++ b/yinmeng-ios/yinmeng-ios/Main/Room/Api/Api+Room.m @@ -6,7 +6,7 @@ // #import "Api+Room.h" -#import "NewEncryptTool.h" +#import "MewEncryptTool.h" @implementation Api (Room) /// 获取房间信息 @@ -14,7 +14,7 @@ /// @param uid 用户的uid /// @param intoUid 自己的Uid 判断当前进房用户是否是平台超管 判断进房用户是否开启青少年 + (void)Mew_GetRoomInformation:(MewHttpRequestHelperCompletion)complection uid:(NSString *)uid intoUid:(NSString *)intoUid { - NSString *getUrl = [NewEncryptTool MEW_aesDecrypt:@"gs8/IEqGWXCD7Cn4Hs11dw=="];///room/get + NSString *getUrl = [MewEncryptTool MEW_aesDecrypt:@"gs8/IEqGWXCD7Cn4Hs11dw=="];///room/get [self makeRequest:getUrl method:MewHttpRequestHelperMethodGET completion:complection, __FUNCTION__, uid, intoUid, nil]; } @@ -30,14 +30,14 @@ /// @param mgId 小游戏的id + (void)Mew_OpenRoom:(MewHttpRequestHelperCompletion)complection title:(NSString *)title - type:(RoomType)type + type:(MewRoomType)type roomPwd:(NSString *)roomPwd roomDesc:(NSString *)roomDesc backPic:(NSString *)backPic uid:(NSString *)uid ticket:(NSString *)ticket mgId:(NSString *)mgId { - NSString *getUrl = [NewEncryptTool MEW_aesDecrypt:@"/Q7ygAZSSdH/vm0uhYbwIw=="];///room/open + NSString *getUrl = [MewEncryptTool MEW_aesDecrypt:@"/Q7ygAZSSdH/vm0uhYbwIw=="];///room/open [Api makeRequest:getUrl method:MewHttpRequestHelperMethodPOST completion:complection, __FUNCTION__, title, @(type), roomPwd, roomDesc, backPic, uid, ticket, mgId,nil]; } @@ -49,7 +49,7 @@ /// @param position 坑位的序号 /// @param ticket ticket + (void)Mew_RoomMicUpMic:(MewHttpRequestHelperCompletion)complection micUid:(NSString *)micUid roomId:(NSString *)roomId position:(NSString *)position ticket:(NSString *)ticket { - NSString *getUrl = [NewEncryptTool MEW_aesDecrypt:@"8gpgcXMk36xfvm6d+muZng=="];///room/mic/upmic + NSString *getUrl = [MewEncryptTool MEW_aesDecrypt:@"8gpgcXMk36xfvm6d+muZng=="];///room/mic/upmic [self makeRequest:getUrl method:MewHttpRequestHelperMethodPOST completion:complection, __FUNCTION__, micUid, roomId, position, ticket, nil]; } @@ -60,7 +60,7 @@ /// @param position 坑位的序号 /// @param ticket ticket + (void)Mew_RoomMicDownMic:(MewHttpRequestHelperCompletion)complection micUid:(NSString *)micUid roomId:(NSString *)roomId position:(NSString *)position ticket:(NSString *)ticket { - NSString *getUrl = [NewEncryptTool MEW_aesDecrypt:@"yLlyaDpUfo8seQvUf2xVE1pDQw0kPWhe5imJar+ZYGs="];//room/mic/downmic + NSString *getUrl = [MewEncryptTool MEW_aesDecrypt:@"yLlyaDpUfo8seQvUf2xVE1pDQw0kPWhe5imJar+ZYGs="];//room/mic/downmic [Api makeRequest:getUrl method:MewHttpRequestHelperMethodPOST completion:complection, __FUNCTION__, micUid, roomId, position, ticket, nil]; } @@ -71,7 +71,7 @@ /// @param type 1 收藏 2 取消收藏 3：批量取消收藏 /// @param roomUids 批量删除的房间uid,用逗号隔开 + (void)Mew_CollectRoom:(MewHttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid uid:(NSString *)uid type:(NSString *)type roomUids:(NSString *)roomUids { - NSString *getUrl = [NewEncryptTool MEW_aesDecrypt:@"GQiHXUlHz3kGtxBxaDpYOg=="];///fans/fansRoom + NSString *getUrl = [MewEncryptTool MEW_aesDecrypt:@"GQiHXUlHz3kGtxBxaDpYOg=="];///fans/fansRoom [Api makeRequest:getUrl method:MewHttpRequestHelperMethodPOST completion:completion, __FUNCTION__, roomUid, uid, type, roomUids, nil]; } @@ -82,7 +82,7 @@ /// @param roomUid 房间uid /// @param ticket ticket + (void)Mew_RequestReportUserInterRoom:(MewHttpRequestHelperCompletion)completion uid:(NSString *)uid roomUid:(NSString *)roomUid ticket:(NSString *)ticket { - NSString *getUrl = [NewEncryptTool MEW_aesDecrypt:@"+RPS7HavWT0Wo413/I2TLA=="];///userroom/inV2 + NSString *getUrl = [MewEncryptTool MEW_aesDecrypt:@"+RPS7HavWT0Wo413/I2TLA=="];///userroom/inV2 [self makeRequest:getUrl method:MewHttpRequestHelperMethodPOST completion:completion, __FUNCTION__, uid, roomUid, ticket, nil]; } @@ -93,7 +93,7 @@ /// @param roomUid 房间uid /// @param ticket ticket + (void)Mew_RequestReportUserOutRoom:(MewHttpRequestHelperCompletion)completion uid:(NSString *)uid roomUid:(NSString *)roomUid ticket:(NSString *)ticket { - NSString *getUrl = [NewEncryptTool MEW_aesDecrypt:@"eGme6ANFUqQGdpX/DtfRrg=="];///userroom/outV2 + NSString *getUrl = [MewEncryptTool MEW_aesDecrypt:@"eGme6ANFUqQGdpX/DtfRrg=="];///userroom/outV2 [self makeRequest:getUrl method:MewHttpRequestHelperMethodPOST completion:completion, __FUNCTION__, uid, roomUid, ticket, nil]; } diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/Model/MewRoomInfoModel.h b/yinmeng-ios/yinmeng-ios/Main/Room/Model/MewRoomInfoModel.h similarity index 82% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/Model/MewRoomInfoModel.h rename to yinmeng-ios/yinmeng-ios/Main/Room/Model/MewRoomInfoModel.h index cd0827e..7065c0c 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/Model/MewRoomInfoModel.h +++ b/yinmeng-ios/yinmeng-ios/Main/Room/Model/MewRoomInfoModel.h @@ -8,10 +8,10 @@ #import NS_ASSUME_NONNULL_BEGIN -typedef NS_ENUM(NSInteger, RoomType) { - RoomType_Game = 3, - RoomType_Anchor = 6, // 个播房 - RoomType_MiniGame = 7//小游戏房 +typedef NS_ENUM(NSInteger, MewRoomType) { + MewRoomType_Game = 3, + MewRoomType_Anchor = 6, // 个播房 + MewRoomType_MiniGame = 7//小游戏房 }; @interface MewRoomInfoModel : NSObject @@ -22,7 +22,7 @@ typedef NS_ENUM(NSInteger, RoomType) { @property (nonatomic , assign) NSInteger uid; //房间Uid @property (nonatomic , assign) BOOL valid; //房间是否有效 @property (nonatomic , assign) NSInteger roomId; //房间Roomid -@property (nonatomic , assign) RoomType type; //房间的类型 +@property (nonatomic , assign) MewRoomType type; //房间的类型 @property (nonatomic , copy) NSString *title; //房间标题 @property (nonatomic , copy) NSString * roomDesc; @property (nonatomic , copy) NSString * trtcSig; diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/Model/MewRoomInfoModel.m b/yinmeng-ios/yinmeng-ios/Main/Room/Model/MewRoomInfoModel.m similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/Model/MewRoomInfoModel.m rename to yinmeng-ios/yinmeng-ios/Main/Room/Model/MewRoomInfoModel.m diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/Presenter/MewRoomPresenter.h b/yinmeng-ios/yinmeng-ios/Main/Room/Presenter/MewRoomPresenter.h similarity index 97% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/Presenter/MewRoomPresenter.h rename to yinmeng-ios/yinmeng-ios/Main/Room/Presenter/MewRoomPresenter.h index 4bb87f8..dcd02f7 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/Presenter/MewRoomPresenter.h +++ b/yinmeng-ios/yinmeng-ios/Main/Room/Presenter/MewRoomPresenter.h @@ -37,7 +37,7 @@ NS_ASSUME_NONNULL_BEGIN /// @param backPic 房间背景 /// @param mgId 小游戏的id - (void)mew_openUserRoom:(NSString *)title - type:(RoomType)type + type:(MewRoomType)type roomPwd:(NSString *)roomPwd roomDesc:(NSString *)roomDesc backPic:(NSString *)backPic diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/Presenter/MewRoomPresenter.m b/yinmeng-ios/yinmeng-ios/Main/Room/Presenter/MewRoomPresenter.m similarity index 87% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/Presenter/MewRoomPresenter.m rename to yinmeng-ios/yinmeng-ios/Main/Room/Presenter/MewRoomPresenter.m index 83f2b43..b299461 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/Presenter/MewRoomPresenter.m +++ b/yinmeng-ios/yinmeng-ios/Main/Room/Presenter/MewRoomPresenter.m @@ -33,12 +33,12 @@ [[self mew_getView] mew_initEnterCurrentRoomSuccess:room user:user]; return nil; }] subscribeError:^(NSError * _Nullable error) { - [[self mew_getView] enterCurrentRoomFail:error.code]; + [[self mew_getView] mew_enterCurrentRoomFail:error.code]; }]; /// 获取用户信息 - [Api getUserInfo:[self mew_createHttpCompletion:^(MewBaseModel * _Nonnull data) { + [Api Mew_GetUserInfo:[self mew_createHttpCompletion:^(MewBaseModel * _Nonnull data) { MewUserInfoModel *userInfo = [MewUserInfoModel mewModelWithJSON:data.data]; [user sendNext:userInfo]; [user sendCompleted]; @@ -69,9 +69,9 @@ /// 云信进房 [[NIMSDK sharedSDK].chatroomManager enterChatroom:request completion:^(NSError * _Nullable error, NIMChatroom * _Nullable chatroom, NIMChatroomMember * _Nullable me) { if (error) { - [[self mew_getView] enterCurrentRoomFail:error.code]; + [[self mew_getView] mew_enterCurrentRoomFail:error.code]; } else { - [[self mew_getView] enterCurrentRoomSuccess:chatroom]; + [[self mew_getView] mew_enterCurrentRoomSuccess:chatroom]; } }]; } @@ -90,12 +90,12 @@ /// @param backPic 房间背景 /// @param mgId 小游戏的id - (void)mew_openUserRoom:(NSString *)title - type:(RoomType)type + type:(MewRoomType)type roomPwd:(NSString *)roomPwd roomDesc:(NSString *)roomDesc backPic:(NSString *)backPic mgId:(NSString *)mgId{ - NSString * uid = [MewAccountInfoStorage instance].getUid; + NSString * uid = [MewAccountInfoStorage instance].mew_getUid; NSString * ticket = [MewAccountInfoStorage instance].mew_getTicket; if (title.length <= 0) { title = @""; @@ -119,9 +119,9 @@ [Api Mew_OpenRoom:[self mew_createHttpCompletion:^(MewBaseModel * _Nonnull data) { MewRoomInfoModel *roomInfo = [MewRoomInfoModel mewModelWithJSON:data.data]; - [[self mew_getView] openCurrentRoomSuccess:roomInfo]; + [[self mew_getView] mew_openCurrentRoomSuccess:roomInfo]; } fail:^(NSInteger code, NSString * _Nullable msg) { - [[self mew_getView] enterCurrentRoomFail:code]; + [[self mew_getView] mew_enterCurrentRoomFail:code]; }] title:title type:type roomPwd:roomPwd roomDesc:roomDesc backPic:backPic uid:uid ticket:ticket mgId:mgId]; } @@ -133,7 +133,7 @@ } [Api Mew_RequestReportUserInterRoom:^(MewBaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - } uid:[[MewAccountInfoStorage instance] getUid] roomUid:roomUid ticket:[[MewAccountInfoStorage instance] mew_getTicket]]; + } uid:[[MewAccountInfoStorage instance] mew_getUid] roomUid:roomUid ticket:[[MewAccountInfoStorage instance] mew_getTicket]]; } @@ -145,7 +145,7 @@ } [Api Mew_RequestReportUserOutRoom:^(MewBaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - } uid:[[MewAccountInfoStorage instance] getUid] roomUid:roomUid ticket:[[MewAccountInfoStorage instance] mew_getTicket]]; + } uid:[[MewAccountInfoStorage instance] mew_getUid] roomUid:roomUid ticket:[[MewAccountInfoStorage instance] mew_getTicket]]; } /// Mew 送礼物 房间内给麦位上的某个用户送普通的薯片礼物，默认写死 @@ -153,7 +153,7 @@ /// @param roomUid 房主的uid - (void)mew_sendRoomGift:(NSString *)targetUids roomUid:(NSString *)roomUid { - NSString *uid = [MewAccountInfoStorage instance].getUid; + NSString *uid = [MewAccountInfoStorage instance].mew_getUid; NSString *giftNum = @"1"; // 房间内给麦位上的人送礼物 NSString *sendType = @"3"; diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/Protocol/MewRoomProtocol.h b/yinmeng-ios/yinmeng-ios/Main/Room/Protocol/MewRoomProtocol.h similarity index 85% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/Protocol/MewRoomProtocol.h rename to yinmeng-ios/yinmeng-ios/Main/Room/Protocol/MewRoomProtocol.h index 4dda5bf..8dba6cd 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/Protocol/MewRoomProtocol.h +++ b/yinmeng-ios/yinmeng-ios/Main/Room/Protocol/MewRoomProtocol.h @@ -14,11 +14,11 @@ NS_ASSUME_NONNULL_BEGIN /// 进入房间成功 - (void)mew_initEnterCurrentRoomSuccess:(MewRoomInfoModel *)roomInfo user:(MewUserInfoModel *)userInfo; ///开启房间成功 -- (void)openCurrentRoomSuccess:(MewRoomInfoModel *)roomInfo; +- (void)mew_openCurrentRoomSuccess:(MewRoomInfoModel *)roomInfo; ///进入房间成功 -- (void)enterCurrentRoomSuccess:(NIMChatroom *)chatRoom; +- (void)mew_enterCurrentRoomSuccess:(NIMChatroom *)chatRoom; ///进入房间失败（当前获取用户信息、获取房间信息、开启房间、进入云信房间失败，均会导致进房失败） -- (void)enterCurrentRoomFail:(NSInteger)code; +- (void)mew_enterCurrentRoomFail:(NSInteger)code; ///获取当前房间的信息，个播房 //- (void)getCurrentRoomInfoSuccess:(MewRoomInfoModel *_Nullable)roomInfo; diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/Impl/MewBaseRtcImpl.h b/yinmeng-ios/yinmeng-ios/Main/Room/RTC/Impl/MewBaseRtcImpl.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/Impl/MewBaseRtcImpl.h rename to yinmeng-ios/yinmeng-ios/Main/Room/RTC/Impl/MewBaseRtcImpl.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/Impl/MewBaseRtcImpl.m b/yinmeng-ios/yinmeng-ios/Main/Room/RTC/Impl/MewBaseRtcImpl.m similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/Impl/MewBaseRtcImpl.m rename to yinmeng-ios/yinmeng-ios/Main/Room/RTC/Impl/MewBaseRtcImpl.m diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/Impl/MewRtcImplDelegate.h b/yinmeng-ios/yinmeng-ios/Main/Room/RTC/Impl/MewRtcImplDelegate.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/Impl/MewRtcImplDelegate.h rename to yinmeng-ios/yinmeng-ios/Main/Room/RTC/Impl/MewRtcImplDelegate.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/Impl/MewRtcInterface.h b/yinmeng-ios/yinmeng-ios/Main/Room/RTC/Impl/MewRtcInterface.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/Impl/MewRtcInterface.h rename to yinmeng-ios/yinmeng-ios/Main/Room/RTC/Impl/MewRtcInterface.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/Impl/MewTRTCRtcImpl.h b/yinmeng-ios/yinmeng-ios/Main/Room/RTC/Impl/MewTRTCRtcImpl.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/Impl/MewTRTCRtcImpl.h rename to yinmeng-ios/yinmeng-ios/Main/Room/RTC/Impl/MewTRTCRtcImpl.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/Impl/MewTRTCRtcImpl.m b/yinmeng-ios/yinmeng-ios/Main/Room/RTC/Impl/MewTRTCRtcImpl.m similarity index 96% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/Impl/MewTRTCRtcImpl.m rename to yinmeng-ios/yinmeng-ios/Main/Room/RTC/Impl/MewTRTCRtcImpl.m index 2774867..27de260 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/Impl/MewTRTCRtcImpl.m +++ b/yinmeng-ios/yinmeng-ios/Main/Room/RTC/Impl/MewTRTCRtcImpl.m @@ -47,7 +47,7 @@ UInt32 roomId; sscanf([channelId UTF8String], "%u", &roomId); params.roomId = roomId; - params.userId = [[MewAccountInfoStorage instance] getUid]; + params.userId = [[MewAccountInfoStorage instance] mew_getUid]; params.userSig = sign; params.role = TRTCRoleAudience; [self.engine enterRoom:params appScene:TRTCAppSceneLIVE]; @@ -120,8 +120,8 @@ NSString *uid = userInfo.userId; if (userInfo.volume > 2) { if (uid.integerValue == 0) { - if([MewAccountInfoStorage instance].getUid.length > 0) { - [uids addObject:[[MewAccountInfoStorage instance] getUid]]; + if([MewAccountInfoStorage instance].mew_getUid.length > 0) { + [uids addObject:[[MewAccountInfoStorage instance] mew_getUid]]; } } else { [uids addObject:uid]; diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/MewRtcDelegate.h b/yinmeng-ios/yinmeng-ios/Main/Room/RTC/MewRtcDelegate.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/MewRtcDelegate.h rename to yinmeng-ios/yinmeng-ios/Main/Room/RTC/MewRtcDelegate.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/MewRtcManager.h b/yinmeng-ios/yinmeng-ios/Main/Room/RTC/MewRtcManager.h similarity index 97% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/MewRtcManager.h rename to yinmeng-ios/yinmeng-ios/Main/Room/RTC/MewRtcManager.h index c17ccd4..40f0c89 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/MewRtcManager.h +++ b/yinmeng-ios/yinmeng-ios/Main/Room/RTC/MewRtcManager.h @@ -76,7 +76,7 @@ typedef enum : NSUInteger { @return - 进房结果。 */ -- (BOOL)enterRoom:(NSString *)roomUid trtcSign:(NSString *)sign; +- (BOOL)mew_enterRoom:(NSString *)roomUid trtcSign:(NSString *)sign; /** * 上下麦（说话） diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/MewRtcManager.m b/yinmeng-ios/yinmeng-ios/Main/Room/RTC/MewRtcManager.m similarity index 97% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/MewRtcManager.m rename to yinmeng-ios/yinmeng-ios/Main/Room/RTC/MewRtcManager.m index 97a2efa..88f0d4b 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/RTC/MewRtcManager.m +++ b/yinmeng-ios/yinmeng-ios/Main/Room/RTC/MewRtcManager.m @@ -50,7 +50,7 @@ #pragma mark - Public Method -- (BOOL)enterRoom:(NSString *)roomUid trtcSign:(NSString *)sign { +- (BOOL)mew_enterRoom:(NSString *)roomUid trtcSign:(NSString *)sign { if (self.enterdRoomUid && [self.enterdRoomUid isEqualToString:roomUid]) { return YES; } diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/AnimationView/MewRoomAnimationGroup.h b/yinmeng-ios/yinmeng-ios/Main/Room/View/AnimationView/MewRoomAnimationGroup.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/AnimationView/MewRoomAnimationGroup.h rename to yinmeng-ios/yinmeng-ios/Main/Room/View/AnimationView/MewRoomAnimationGroup.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/AnimationView/MewRoomAnimationGroup.m b/yinmeng-ios/yinmeng-ios/Main/Room/View/AnimationView/MewRoomAnimationGroup.m similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/AnimationView/MewRoomAnimationGroup.m rename to yinmeng-ios/yinmeng-ios/Main/Room/View/AnimationView/MewRoomAnimationGroup.m diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/AnimationView/MewRoomAnimationHitView.h b/yinmeng-ios/yinmeng-ios/Main/Room/View/AnimationView/MewRoomAnimationHitView.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/AnimationView/MewRoomAnimationHitView.h rename to yinmeng-ios/yinmeng-ios/Main/Room/View/AnimationView/MewRoomAnimationHitView.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/AnimationView/MewRoomAnimationHitView.m b/yinmeng-ios/yinmeng-ios/Main/Room/View/AnimationView/MewRoomAnimationHitView.m similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/AnimationView/MewRoomAnimationHitView.m rename to yinmeng-ios/yinmeng-ios/Main/Room/View/AnimationView/MewRoomAnimationHitView.m diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/AnimationView/MewRoomAnimationView.h b/yinmeng-ios/yinmeng-ios/Main/Room/View/AnimationView/MewRoomAnimationView.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/AnimationView/MewRoomAnimationView.h rename to yinmeng-ios/yinmeng-ios/Main/Room/View/AnimationView/MewRoomAnimationView.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/AnimationView/MewRoomAnimationView.m b/yinmeng-ios/yinmeng-ios/Main/Room/View/AnimationView/MewRoomAnimationView.m similarity index 97% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/AnimationView/MewRoomAnimationView.m rename to yinmeng-ios/yinmeng-ios/Main/Room/View/AnimationView/MewRoomAnimationView.m index 25723f8..41d24d0 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/AnimationView/MewRoomAnimationView.m +++ b/yinmeng-ios/yinmeng-ios/Main/Room/View/AnimationView/MewRoomAnimationView.m @@ -94,7 +94,8 @@ MewAttachmentModel *attachment = (MewAttachmentModel *)obj.attachment; if (attachment.first == Mew_CustomMessageType_Gift) { MewGiftReceiveInfoModel * receiveInfo = [MewGiftReceiveInfoModel mewModelWithJSON:attachment.data]; - + // 过滤礼物薯片id + if (![receiveInfo.giftId isEqualToString:@"2"]) { return; } [self mew_receiveGiftHandleSendGiftAnimation:attachment]; [self mew_receiveGift:receiveInfo]; } @@ -149,7 +150,7 @@ if (self.giftEffectQueue.count > 0) { dispatch_sync(dispatch_get_main_queue(), ^{ MewGiftReceiveInfoModel * receiveModel = [self.giftEffectQueue firstObject]; - [self createGiftBannerViewAnimation:receiveModel]; + [self mew_createGiftBannerViewAnimation:receiveModel]; [self.giftEffectQueue removeObject:receiveModel]; }); }else { @@ -161,7 +162,7 @@ self.giftEffectTimer = _timer; } -- (void)createGiftBannerViewAnimation:(MewGiftReceiveInfoModel *)receiveInfo { +- (void)mew_createGiftBannerViewAnimation:(MewGiftReceiveInfoModel *)receiveInfo { MewGiftInfoModel *giftInfo = receiveInfo.gift != nil ? receiveInfo.gift : receiveInfo.giftInfo; if (!giftInfo) { giftInfo = [[MewGiftStorage shareStorage] mew_findGiftInfo: receiveInfo.giftId]; diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/AnimationView/YMRoomGiftAnimationParser.m b/yinmeng-ios/yinmeng-ios/Main/Room/View/AnimationView/YMRoomGiftAnimationParser.m similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/AnimationView/YMRoomGiftAnimationParser.m rename to yinmeng-ios/yinmeng-ios/Main/Room/View/AnimationView/YMRoomGiftAnimationParser.m diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MEWThemeColor+MEWRoom.h b/yinmeng-ios/yinmeng-ios/Main/Room/View/MEWThemeColor+MEWRoom.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MEWThemeColor+MEWRoom.h rename to yinmeng-ios/yinmeng-ios/Main/Room/View/MEWThemeColor+MEWRoom.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MEWThemeColor+MEWRoom.m b/yinmeng-ios/yinmeng-ios/Main/Room/View/MEWThemeColor+MEWRoom.m similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MEWThemeColor+MEWRoom.m rename to yinmeng-ios/yinmeng-ios/Main/Room/View/MEWThemeColor+MEWRoom.m diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MenuContainerView/MewRoomSendTextView.h b/yinmeng-ios/yinmeng-ios/Main/Room/View/MenuContainerView/MewRoomSendTextView.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MenuContainerView/MewRoomSendTextView.h rename to yinmeng-ios/yinmeng-ios/Main/Room/View/MenuContainerView/MewRoomSendTextView.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MenuContainerView/MewRoomSendTextView.m b/yinmeng-ios/yinmeng-ios/Main/Room/View/MenuContainerView/MewRoomSendTextView.m similarity index 95% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MenuContainerView/MewRoomSendTextView.m rename to yinmeng-ios/yinmeng-ios/Main/Room/View/MenuContainerView/MewRoomSendTextView.m index 37b35bf..0657d04 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MenuContainerView/MewRoomSendTextView.m +++ b/yinmeng-ios/yinmeng-ios/Main/Room/View/MenuContainerView/MewRoomSendTextView.m @@ -7,7 +7,7 @@ #import "MewRoomSendTextView.h" /// Tool -#import "MEWThemeColor.h" +#import "MewThemeColor.h" #import "UIImage+MewUtils.h" #import "MewMacro.h" #import "MewAccountInfoStorage.h" @@ -49,7 +49,7 @@ self = [super initWithFrame:CGRectMake(0, KScreenHeight - 40, KScreenWidth, 40)]; if (self) { self.delegate = delegate; - [self addNotification]; + [self mew_addNotification]; [self mew_initSubViews]; [self mew_initSubViewConstraints]; [IQKeyboardManager sharedManager].enable = NO; @@ -95,7 +95,7 @@ extModel.vipIcon = userInfo.MewUserVipInfoVo.vipIcon; NIMMessage * message = [[NIMMessage alloc] init]; message.text = self.inputMessage; - NSMutableDictionary *remoteExt = [NSMutableDictionary dictionaryWithObject:extModel.mewModel2dictionary forKey:[MewAccountInfoStorage instance].getUid]; + NSMutableDictionary *remoteExt = [NSMutableDictionary dictionaryWithObject:extModel.mewModel2dictionary forKey:[MewAccountInfoStorage instance].mew_getUid]; message.remoteExt = remoteExt; ///网易易盾 拦截高风险 @@ -187,7 +187,7 @@ #pragma mark - Private Method - (void)mew_initSubViews { - self.backgroundColor = [MEWThemeColor mewAppBackgroundColor]; + self.backgroundColor = [MewThemeColor mewAppBackgroundColor]; [self addSubview:self.stackView]; [self.stackView addArrangedSubview:self.editTextFiled]; [self.stackView addArrangedSubview:self.sendButton]; @@ -206,7 +206,7 @@ }]; } -- (void)addNotification { +- (void)mew_addNotification { [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(mew_keyboardWillHidden:) name:UIKeyboardWillHideNotification object:nil]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(mew_keyboardWillShow:) name:UIKeyboardWillShowNotification object:nil]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(mew_textFieldEditChanged:) name:UITextFieldTextDidChangeNotification object:self.editTextFiled]; @@ -216,10 +216,10 @@ - (UITextField *)editTextFiled{ if (!_editTextFiled) { _editTextFiled = [[UITextField alloc] init]; - NSAttributedString * attribute = [[NSAttributedString alloc] initWithString:@"请输入消息..." attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:15], NSForegroundColorAttributeName : [MEWThemeColor mewSecondTextColor]}]; + NSAttributedString * attribute = [[NSAttributedString alloc] initWithString:@"请输入消息..." attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:15], NSForegroundColorAttributeName : [MewThemeColor mewSecondTextColor]}]; _editTextFiled.attributedPlaceholder = attribute; _editTextFiled.borderStyle = UITextBorderStyleNone; - _editTextFiled.textColor = [MEWThemeColor mewAlertTitleColor]; + _editTextFiled.textColor = [MewThemeColor mewAlertTitleColor]; _editTextFiled.font = [UIFont systemFontOfSize:15]; [_editTextFiled setContentHuggingPriority:UILayoutPriorityDefaultLow forAxis:UILayoutConstraintAxisHorizontal]; @@ -230,9 +230,9 @@ if (!_sendButton) { _sendButton = [[UIButton alloc] init]; [_sendButton setTitle:@"发送" forState:UIControlStateNormal]; - _sendButton.titleLabel.textColor = [MEWThemeColor mewMainTextColor]; + _sendButton.titleLabel.textColor = [MewThemeColor mewMainTextColor]; _sendButton.titleLabel.font = [UIFont systemFontOfSize:15]; - [_sendButton setBackgroundImage:[UIImage mew_imageWithColor:[MEWThemeColor mewColorWithHexString:@"#9552FF"] ] forState:UIControlStateNormal]; + [_sendButton setBackgroundImage:[UIImage mew_imageWithColor:[MewThemeColor mewColorWithHexString:@"#9552FF"] ] forState:UIControlStateNormal]; _sendButton.enabled = NO; _sendButton.layer.cornerRadius = 5.0; _sendButton.layer.masksToBounds = YES; diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MessageContainerView/MewRoomMessageContainerView.h b/yinmeng-ios/yinmeng-ios/Main/Room/View/MessageContainerView/MewRoomMessageContainerView.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MessageContainerView/MewRoomMessageContainerView.h rename to yinmeng-ios/yinmeng-ios/Main/Room/View/MessageContainerView/MewRoomMessageContainerView.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MessageContainerView/MewRoomMessageContainerView.m b/yinmeng-ios/yinmeng-ios/Main/Room/View/MessageContainerView/MewRoomMessageContainerView.m similarity index 99% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MessageContainerView/MewRoomMessageContainerView.m rename to yinmeng-ios/yinmeng-ios/Main/Room/View/MessageContainerView/MewRoomMessageContainerView.m index 0fa884b..22be39c 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MessageContainerView/MewRoomMessageContainerView.m +++ b/yinmeng-ios/yinmeng-ios/Main/Room/View/MessageContainerView/MewRoomMessageContainerView.m @@ -20,7 +20,7 @@ #import "MewRoomMessageFilter.h" #import "MewClientConfig.h" #import "MewAccountInfoStorage.h" -#import "MEWThemeColor.h" +#import "MewThemeColor.h" /// Third #import #import @@ -69,7 +69,7 @@ NIMChatroomNotificationContent *content = (NIMChatroomNotificationContent *)notiMsg.content; if (content.eventType == NIMChatroomEventTypeEnter) { NIMChatroomNotificationMember *member = content.targets[0]; - if (member.userId.integerValue == [MewAccountInfoStorage instance].getUid.integerValue) { + if (member.userId.integerValue == [MewAccountInfoStorage instance].mew_getUid.integerValue) { ///自己进房成功后拉取历史消息 [self handleFetchHistoryMessage:message]; } else { diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MessageContainerView/MewRoomMessageHeaderView.h b/yinmeng-ios/yinmeng-ios/Main/Room/View/MessageContainerView/MewRoomMessageHeaderView.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MessageContainerView/MewRoomMessageHeaderView.h rename to yinmeng-ios/yinmeng-ios/Main/Room/View/MessageContainerView/MewRoomMessageHeaderView.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MessageContainerView/MewRoomMessageHeaderView.m b/yinmeng-ios/yinmeng-ios/Main/Room/View/MessageContainerView/MewRoomMessageHeaderView.m similarity index 99% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MessageContainerView/MewRoomMessageHeaderView.m rename to yinmeng-ios/yinmeng-ios/Main/Room/View/MessageContainerView/MewRoomMessageHeaderView.m index b060a69..e8c85f6 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MessageContainerView/MewRoomMessageHeaderView.m +++ b/yinmeng-ios/yinmeng-ios/Main/Room/View/MessageContainerView/MewRoomMessageHeaderView.m @@ -9,7 +9,7 @@ ///Third #import ///Tool -#import "MEWThemeColor.h" +#import "MewThemeColor.h" #import "MewRoomMessageConstant.h" #import "MewMacro.h" diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MessageContainerView/Model/MewMessageInfoModel.h b/yinmeng-ios/yinmeng-ios/Main/Room/View/MessageContainerView/Model/MewMessageInfoModel.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MessageContainerView/Model/MewMessageInfoModel.h rename to yinmeng-ios/yinmeng-ios/Main/Room/View/MessageContainerView/Model/MewMessageInfoModel.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MessageContainerView/Model/MewMessageInfoModel.m b/yinmeng-ios/yinmeng-ios/Main/Room/View/MessageContainerView/Model/MewMessageInfoModel.m similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MessageContainerView/Model/MewMessageInfoModel.m rename to yinmeng-ios/yinmeng-ios/Main/Room/View/MessageContainerView/Model/MewMessageInfoModel.m diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MessageContainerView/Model/MewMessageRemoteExtModel.h b/yinmeng-ios/yinmeng-ios/Main/Room/View/MessageContainerView/Model/MewMessageRemoteExtModel.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MessageContainerView/Model/MewMessageRemoteExtModel.h rename to yinmeng-ios/yinmeng-ios/Main/Room/View/MessageContainerView/Model/MewMessageRemoteExtModel.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MessageContainerView/Model/MewMessageRemoteExtModel.m b/yinmeng-ios/yinmeng-ios/Main/Room/View/MessageContainerView/Model/MewMessageRemoteExtModel.m similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MessageContainerView/Model/MewMessageRemoteExtModel.m rename to yinmeng-ios/yinmeng-ios/Main/Room/View/MessageContainerView/Model/MewMessageRemoteExtModel.m diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MessageContainerView/Tool/MewRoomMessageConstant.h b/yinmeng-ios/yinmeng-ios/Main/Room/View/MessageContainerView/Tool/MewRoomMessageConstant.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MessageContainerView/Tool/MewRoomMessageConstant.h rename to yinmeng-ios/yinmeng-ios/Main/Room/View/MessageContainerView/Tool/MewRoomMessageConstant.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MessageContainerView/Tool/MewRoomMessageFilter.h b/yinmeng-ios/yinmeng-ios/Main/Room/View/MessageContainerView/Tool/MewRoomMessageFilter.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MessageContainerView/Tool/MewRoomMessageFilter.h rename to yinmeng-ios/yinmeng-ios/Main/Room/View/MessageContainerView/Tool/MewRoomMessageFilter.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MessageContainerView/Tool/MewRoomMessageFilter.m b/yinmeng-ios/yinmeng-ios/Main/Room/View/MessageContainerView/Tool/MewRoomMessageFilter.m similarity index 55% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MessageContainerView/Tool/MewRoomMessageFilter.m rename to yinmeng-ios/yinmeng-ios/Main/Room/View/MessageContainerView/Tool/MewRoomMessageFilter.m index 6c3e526..4eeae0d 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MessageContainerView/Tool/MewRoomMessageFilter.m +++ b/yinmeng-ios/yinmeng-ios/Main/Room/View/MessageContainerView/Tool/MewRoomMessageFilter.m @@ -14,33 +14,33 @@ return @{ @(Mew_CustomMessageType_AllMicroSend): [NSSet setWithObjects: - @(Custom_Message_Sub_AllMicroSend), - @(Custom_Message_Sub_AllMicroLuckySend), - @(Custom_Message_Sub_AllBatchSend), - @(Custom_Message_Sub_AllBatchMicroLuckySend), + @(Mew_Custom_Message_Sub_AllMicroSend), + @(Mew_Custom_Message_Sub_AllMicroLuckySend), + @(Mew_Custom_Message_Sub_AllBatchSend), + @(Mew_Custom_Message_Sub_AllBatchMicroLuckySend), nil], @(Mew_CustomMessageType_Gift): [NSSet setWithObjects: - @(Custom_Message_Sub_Gift_Send), - @(Custom_Message_Sub_Gift_LuckySend), + @(Mew_Custom_Message_Sub_Gift_Send), + @(Mew_Custom_Message_Sub_Gift_LuckySend), nil], @(Mew_CustomMessageType_Room_Tip): [NSSet setWithObjects: - @(Custom_Message_Sub_Room_Tip_ShareRoom), - @(Custom_Message_Sub_Room_Tip_Attention_Owner), + @(Mew_Custom_Message_Sub_Room_Tip_ShareRoom), + @(Mew_Custom_Message_Sub_Room_Tip_Attention_Owner), nil], @(Mew_CustomMessageType_Kick_User): [NSSet setWithObjects: - @(Custom_Message_Sub_Kick_BeKicked), - @(Custom_Message_Sub_Kick_BlackList), + @(Mew_Custom_Message_Sub_Kick_BeKicked), + @(Mew_Custom_Message_Sub_Kick_BlackList), nil], @(Mew_CustomMessageType_Queue): [NSSet setWithObjects: - @(Custom_Message_Sub_Queue_Kick), + @(Mew_Custom_Message_Sub_Queue_Kick), nil], @(Mew_CustomMessageType_Face): [NSSet setWithObjects: - @(Custom_Message_Sub_Face_Send), + @(Mew_Custom_Message_Sub_Face_Send), nil], }; } diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MessageContainerView/Tool/MewRoomMessageParser.h b/yinmeng-ios/yinmeng-ios/Main/Room/View/MessageContainerView/Tool/MewRoomMessageParser.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MessageContainerView/Tool/MewRoomMessageParser.h rename to yinmeng-ios/yinmeng-ios/Main/Room/View/MessageContainerView/Tool/MewRoomMessageParser.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MessageContainerView/Tool/MewRoomMessageParser.m b/yinmeng-ios/yinmeng-ios/Main/Room/View/MessageContainerView/Tool/MewRoomMessageParser.m similarity index 97% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MessageContainerView/Tool/MewRoomMessageParser.m rename to yinmeng-ios/yinmeng-ios/Main/Room/View/MessageContainerView/Tool/MewRoomMessageParser.m index fd3f96d..8dd69d6 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MessageContainerView/Tool/MewRoomMessageParser.m +++ b/yinmeng-ios/yinmeng-ios/Main/Room/View/MessageContainerView/Tool/MewRoomMessageParser.m @@ -44,7 +44,7 @@ #pragma mark - Private Method /// @param message 消息的实体 - (MewMessageInfoModel*)mew_makeChatAttribute:(NIMMessage *)message messageInfo:(MewMessageInfoModel *)messageInfo{ - NSString * uid = [MewAccountInfoStorage instance].getUid; + NSString * uid = [MewAccountInfoStorage instance].mew_getUid; messageInfo.isShowAvatar = YES; messageInfo.uid = message.from; NSString * nick = [NSString stringWithFormat:@"%@:", ((NIMMessageChatroomExtension *)message.messageExt).roomNickname]; @@ -93,6 +93,11 @@ giftInfo = [[MewGiftStorage shareStorage] mew_findGiftInfo:info.giftId]; } + // 过滤礼物薯片id + if (giftInfo.giftId != 2) { + return nil; + } + //nick [attribute appendAttributedString:[self mew_createSapceAttribute:2]];; //打赏 diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MessageContainerView/View/MewNetImageLabel.h b/yinmeng-ios/yinmeng-ios/Main/Room/View/MessageContainerView/View/MewNetImageLabel.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MessageContainerView/View/MewNetImageLabel.h rename to yinmeng-ios/yinmeng-ios/Main/Room/View/MessageContainerView/View/MewNetImageLabel.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MessageContainerView/View/MewNetImageLabel.m b/yinmeng-ios/yinmeng-ios/Main/Room/View/MessageContainerView/View/MewNetImageLabel.m similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MessageContainerView/View/MewNetImageLabel.m rename to yinmeng-ios/yinmeng-ios/Main/Room/View/MessageContainerView/View/MewNetImageLabel.m diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MewMicroQueueProtocol.h b/yinmeng-ios/yinmeng-ios/Main/Room/View/MewMicroQueueProtocol.h similarity index 71% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MewMicroQueueProtocol.h rename to yinmeng-ios/yinmeng-ios/Main/Room/View/MewMicroQueueProtocol.h index 15e5c34..c24f592 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MewMicroQueueProtocol.h +++ b/yinmeng-ios/yinmeng-ios/Main/Room/View/MewMicroQueueProtocol.h @@ -1,12 +1,12 @@ // -// MicroQueueModel.h +// MewMicroQueueModel.h // mew-ios // // Created by 触海 on 2023/11/14. // #import -@class MicroQueueModel; +@class MewMicroQueueModel; NS_ASSUME_NONNULL_BEGIN @@ -21,10 +21,10 @@ NS_ASSUME_NONNULL_BEGIN @optional /// 获取麦序 -- (NSMutableDictionary *)mew_getCustomMicroQueue; +- (NSMutableDictionary *)mew_getCustomMicroQueue; /// 麦序更新通知 -- (void)mew_microQueueUpdate:(NSMutableDictionary *)queue; +- (void)mew_microQueueUpdate:(NSMutableDictionary *)queue; @end diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MewRoomAnimationProtocol.h b/yinmeng-ios/yinmeng-ios/Main/Room/View/MewRoomAnimationProtocol.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MewRoomAnimationProtocol.h rename to yinmeng-ios/yinmeng-ios/Main/Room/View/MewRoomAnimationProtocol.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MewRoomGuestDelegate.h b/yinmeng-ios/yinmeng-ios/Main/Room/View/MewRoomGuestDelegate.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MewRoomGuestDelegate.h rename to yinmeng-ios/yinmeng-ios/Main/Room/View/MewRoomGuestDelegate.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MewRoomHostDelegate.h b/yinmeng-ios/yinmeng-ios/Main/Room/View/MewRoomHostDelegate.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MewRoomHostDelegate.h rename to yinmeng-ios/yinmeng-ios/Main/Room/View/MewRoomHostDelegate.h diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Room/View/MewRoomViewController.h b/yinmeng-ios/yinmeng-ios/Main/Room/View/MewView/MewRoomViewController.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Room/View/MewRoomViewController.h rename to yinmeng-ios/yinmeng-ios/Main/Room/View/MewView/MewRoomViewController.h diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Room/View/MewRoomViewController.m b/yinmeng-ios/yinmeng-ios/Main/Room/View/MewView/MewRoomViewController.m similarity index 95% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Room/View/MewRoomViewController.m rename to yinmeng-ios/yinmeng-ios/Main/Room/View/MewView/MewRoomViewController.m index b6fe56d..5b10133 100644 --- a/yinmeng-ios/yinmeng-ios/Main/Mew/Room/View/MewRoomViewController.m +++ b/yinmeng-ios/yinmeng-ios/Main/Room/View/MewView/MewRoomViewController.m @@ -20,7 +20,7 @@ #import "MewRoomInfoModel.h" #import "MewMessageInfoModel.h" #import "MewAttachmentModel.h" -#import "MicroQueueModel.h" +#import "MewMicroQueueModel.h" #import "MewGiftInfoModel.h" #import "MewGiftReceiveInfoModel.h" #import "MewMessageRemoteExtModel.h" @@ -47,7 +47,7 @@ @property (nonatomic, strong) UIImageView *roomBgImageView; @property (nonatomic, strong) MewRoomHeaderView *roomHeaderView; @property (nonatomic, strong) MewRoomRightView *roomRightView; -@property (nonatomic, strong) CHStageView *roomStageView; +@property (nonatomic, strong) MewStageView *roomStageView; @property (nonatomic, strong) MewRoomMessageContainerView *roomMessageView; ///动画的view @property (nonatomic,strong) MewRoomAnimationView *roomAnimationView; @@ -83,7 +83,7 @@ self.emojiArrays = @[@"mew_room_emoji_deyi",@"mew_room_emoji_happy",@"mew_room_emoji_sex",@"mew_room_emoji_suprise"]; self.playEmojiArrays = [NSMutableArray array]; self.isPlayEmojiAnimation = NO; - [self.presenter mew_initEnterCurrentRoom:self.roomUid user:[MewAccountInfoStorage instance].getUid]; + [self.presenter mew_initEnterCurrentRoom:self.roomUid user:[MewAccountInfoStorage instance].mew_getUid]; //监听云信消息 [[NIMSDK sharedSDK].chatroomManager addDelegate:self]; @@ -140,7 +140,7 @@ } break; case NIMChatroomEventTypeEnter: - if (content.source.userId.integerValue != [MewAccountInfoStorage instance].getUid.integerValue && self.userInfo.platformRole != 1) { + if (content.source.userId.integerValue != [MewAccountInfoStorage instance].mew_getUid.integerValue && self.userInfo.platformRole != 1) { // onLineNumber += 1; } break; @@ -154,7 +154,7 @@ NSDictionary* data = (NSDictionary *)content.ext; MewUserInfoModel* userInfo = [MewUserInfoModel mewModelWithJSON:[data objectForKey:NIMChatroomEventInfoQueueChangeItemValueKey]]; NSInteger changeType = [data[NIMChatroomEventInfoQueueChangeTypeKey] integerValue]; - if (changeType == 1 && userInfo.uid == [MewAccountInfoStorage instance].getUid.integerValue) { + if (changeType == 1 && userInfo.uid == [MewAccountInfoStorage instance].mew_getUid.integerValue) { // [self cancelRoomArrangeMic]; } } @@ -250,10 +250,10 @@ return self.navigationController; } -- (void)mew_microQueueUpdate:(NSMutableDictionary *)queue { +- (void)mew_microQueueUpdate:(NSMutableDictionary *)queue { BOOL isOnMic = false; - for (MicroQueueModel * info in queue.allValues) { - if (info.userInfo.uid > 0 && [MewAccountInfoStorage instance].getUid.integerValue == info.userInfo.uid) { + for (MewMicroQueueModel * info in queue.allValues) { + if (info.userInfo.uid > 0 && [MewAccountInfoStorage instance].mew_getUid.integerValue == info.userInfo.uid) { isOnMic = YES; break; } @@ -280,19 +280,19 @@ } else { NSString *title = [NSString stringWithFormat:@"%@的房间",userInfo.nick]; - RoomType type = RoomType_Game; + MewRoomType type = MewRoomType_Game; [self.presenter mew_openUserRoom:title type:type roomPwd:@"" roomDesc:@"" backPic:@"" mgId:@""]; } } else { [self mew_showSuccessToast:@"房主已下线"]; - [self enterCurrentRoomFail:-1]; + [self mew_enterCurrentRoomFail:-1]; } } } // 开房成功 -- (void)openCurrentRoomSuccess:(MewRoomInfoModel *)roomInfo { +- (void)mew_openCurrentRoomSuccess:(MewRoomInfoModel *)roomInfo { self.roomInfo = roomInfo; [self.roomHeaderView mew_onRoomEntered]; [self.presenter mew_enterNIMCurrentRoom:[NSString stringWithFormat:@"%ld", self.roomInfo.roomId] user:self.userInfo]; @@ -300,7 +300,7 @@ } // IM进房成功 -- (void)enterCurrentRoomSuccess:(NIMChatroom *)chatRoom { +- (void)mew_enterCurrentRoomSuccess:(NIMChatroom *)chatRoom { [MewHUDTool mew_hideHUDInView:self.navigationController.view]; [self.roomStageView mew_onRoomEntered]; if (self.roomInfo != nil) { @@ -312,7 +312,7 @@ } // 进房失败 -- (void)enterCurrentRoomFail:(NSInteger)code { +- (void)mew_enterCurrentRoomFail:(NSInteger)code { [MewHUDTool mew_hideHUDInView:self.navigationController.view]; [self mew_hideHUD]; if (code == 13003) { @@ -349,7 +349,7 @@ [data addEntriesFromDictionary:originDic]; MewAttachmentModel *attchment = [[MewAttachmentModel alloc] init]; attchment.first = Mew_CustomMessageType_Gift; - attchment.second = Custom_Message_Sub_Gift_Send; + attchment.second = Mew_Custom_Message_Sub_Gift_Send; NSDictionary *targetUsers = ((NSArray *)[data objectForKey:@"targetUsers"]).firstObject; [data setObject:[targetUsers valueForKeyPath:@"uid"] forKey:@"targetUid"]; [data setObject:[targetUsers valueForKeyPath:@"nick"] forKey:@"targetNick"]; @@ -447,7 +447,7 @@ - (void)sendRoomGift { MewSocialStageView *mewStageView = (MewSocialStageView *)self.roomStageView; NSString *selectId = mewStageView.selectUid; - if (selectId == [MewAccountInfoStorage instance].getUid) { + if (selectId == [MewAccountInfoStorage instance].mew_getUid) { [self mew_showErrorToast:@"不能赠送礼物给自己"]; return; } @@ -530,7 +530,7 @@ [self.roomStageView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.equalTo(self.roomRightView); make.left.right.equalTo(self.view); - make.height.mas_equalTo(self.roomStageView.heightForStageView); + make.height.mas_equalTo(self.roomStageView.mew_heightForStageView); }]; [self.roomMessageView mas_makeConstraints:^(MASConstraintMaker *make) { @@ -576,7 +576,7 @@ return _roomRightView; } -- (CHStageView *)roomStageView { +- (MewStageView *)roomStageView { if (!_roomStageView) { _roomStageView = [[MewSocialStageView alloc] initWithDelegate:self]; } diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Room/View/RoomHeaderView/MewRoomHeaderView.h b/yinmeng-ios/yinmeng-ios/Main/Room/View/MewView/RoomHeaderView/MewRoomHeaderView.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Room/View/RoomHeaderView/MewRoomHeaderView.h rename to yinmeng-ios/yinmeng-ios/Main/Room/View/MewView/RoomHeaderView/MewRoomHeaderView.h diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Room/View/RoomHeaderView/MewRoomHeaderView.m b/yinmeng-ios/yinmeng-ios/Main/Room/View/MewView/RoomHeaderView/MewRoomHeaderView.m similarity index 96% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Room/View/RoomHeaderView/MewRoomHeaderView.m rename to yinmeng-ios/yinmeng-ios/Main/Room/View/MewView/RoomHeaderView/MewRoomHeaderView.m index 29f43d9..5b97b77 100644 --- a/yinmeng-ios/yinmeng-ios/Main/Mew/Room/View/RoomHeaderView/MewRoomHeaderView.m +++ b/yinmeng-ios/yinmeng-ios/Main/Room/View/MewView/RoomHeaderView/MewRoomHeaderView.m @@ -8,7 +8,7 @@ #import "MewRoomHeaderView.h" #import "MewMacro.h" #import -#import "MEWThemeColor.h" +#import "MewThemeColor.h" #import "MewAccountInfoStorage.h" #import "Api+Room.h" #import "NSMutableDictionary+MewSafe.h" @@ -126,7 +126,7 @@ static MewRoomHeaderFilterView *_filterView = nil; - (UIView *)lineView { if (!_lineView) { _lineView = [[UIView alloc] init]; - _lineView.backgroundColor = [MEWThemeColor mewColorWithHexString:@"#DEE1E5"]; + _lineView.backgroundColor = [MewThemeColor mewColorWithHexString:@"#DEE1E5"]; } return _lineView; } @@ -167,7 +167,7 @@ static MewRoomHeaderFilterView *_filterView = nil; if (roomInfo) { self.roomTitleLabel.text = roomInfo.title; - if (roomInfo.uid == [MewAccountInfoStorage instance].getUid.integerValue) {//进入的是自己的房间 + if (roomInfo.uid == [MewAccountInfoStorage instance].mew_getUid.integerValue) {//进入的是自己的房间 self.roomCollectButton.hidden = YES; } else { self.roomCollectButton.hidden = NO; @@ -181,7 +181,7 @@ static MewRoomHeaderFilterView *_filterView = nil; // 收藏 - (void)roomCollectButtonAction:(UIButton *)sender { NSString *type = sender.selected ? @"2" : @"1"; - NSString *uid = [MewAccountInfoStorage instance].getUid; + NSString *uid = [MewAccountInfoStorage instance].mew_getUid; NSString *roomUid = [NSString stringWithFormat:@"%ld",self.hostDelegate.mew_getRoomInformation.uid]; [Api Mew_CollectRoom:^(MewBaseModel * _Nonnull data, NSInteger code, NSString * _Nonnull msg) { if (code == 200) { diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Room/View/RoomMessageView/MewRoomMessageTableCell.h b/yinmeng-ios/yinmeng-ios/Main/Room/View/MewView/RoomMessageView/MewRoomMessageTableCell.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Room/View/RoomMessageView/MewRoomMessageTableCell.h rename to yinmeng-ios/yinmeng-ios/Main/Room/View/MewView/RoomMessageView/MewRoomMessageTableCell.h diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Room/View/RoomMessageView/MewRoomMessageTableCell.m b/yinmeng-ios/yinmeng-ios/Main/Room/View/MewView/RoomMessageView/MewRoomMessageTableCell.m similarity index 98% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Room/View/RoomMessageView/MewRoomMessageTableCell.m rename to yinmeng-ios/yinmeng-ios/Main/Room/View/MewView/RoomMessageView/MewRoomMessageTableCell.m index a8b621b..7f3515d 100644 --- a/yinmeng-ios/yinmeng-ios/Main/Mew/Room/View/RoomMessageView/MewRoomMessageTableCell.m +++ b/yinmeng-ios/yinmeng-ios/Main/Room/View/MewView/RoomMessageView/MewRoomMessageTableCell.m @@ -11,8 +11,8 @@ #import "MewRoomMessageConstant.h" #import "MewMacro.h" -#import "MEWThemeColor.h" -#import "MEWThemeColor.h" +#import "MewThemeColor.h" +#import "MewThemeColor.h" #import "UIImage+MewUtils.h" #import #import diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Room/View/RoomRightView/MewRoomRightView.h b/yinmeng-ios/yinmeng-ios/Main/Room/View/MewView/RoomRightView/MewRoomRightView.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Room/View/RoomRightView/MewRoomRightView.h rename to yinmeng-ios/yinmeng-ios/Main/Room/View/MewView/RoomRightView/MewRoomRightView.h diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Room/View/RoomRightView/MewRoomRightView.m b/yinmeng-ios/yinmeng-ios/Main/Room/View/MewView/RoomRightView/MewRoomRightView.m similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Room/View/RoomRightView/MewRoomRightView.m rename to yinmeng-ios/yinmeng-ios/Main/Room/View/MewView/RoomRightView/MewRoomRightView.m diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Room/View/RoomStageView/MewSocialStageView.h b/yinmeng-ios/yinmeng-ios/Main/Room/View/MewView/RoomStageView/MewSocialStageView.h similarity index 66% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Room/View/RoomStageView/MewSocialStageView.h rename to yinmeng-ios/yinmeng-ios/Main/Room/View/MewView/RoomStageView/MewSocialStageView.h index 388e919..4442373 100644 --- a/yinmeng-ios/yinmeng-ios/Main/Mew/Room/View/RoomStageView/MewSocialStageView.h +++ b/yinmeng-ios/yinmeng-ios/Main/Room/View/MewView/RoomStageView/MewSocialStageView.h @@ -5,11 +5,11 @@ // Created by 触海 on 2023/11/14. // -#import "CHStageView.h" +#import "MewStageView.h" NS_ASSUME_NONNULL_BEGIN -@interface MewSocialStageView : CHStageView +@interface MewSocialStageView : MewStageView diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Room/View/RoomStageView/MewSocialStageView.m b/yinmeng-ios/yinmeng-ios/Main/Room/View/MewView/RoomStageView/MewSocialStageView.m similarity index 85% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Room/View/RoomStageView/MewSocialStageView.m rename to yinmeng-ios/yinmeng-ios/Main/Room/View/MewView/RoomStageView/MewSocialStageView.m index 72b03af..1160769 100644 --- a/yinmeng-ios/yinmeng-ios/Main/Mew/Room/View/RoomStageView/MewSocialStageView.m +++ b/yinmeng-ios/yinmeng-ios/Main/Room/View/MewView/RoomStageView/MewSocialStageView.m @@ -8,9 +8,9 @@ #import "MewSocialStageView.h" #import "MewSocialMicroView.h" #import "MewMacro.h" -#import "MicroQueueModel.h" +#import "MewMicroQueueModel.h" #import "MewUserInfoModel.h" -#import "MEWThemeColor.h" +#import "MewThemeColor.h" #define ownerTopMargin 0.0 #define ownerWidth 140 * kScreenScale @@ -41,13 +41,13 @@ #pragma mark - Super // 坑位数目 -- (NSInteger)countOfMircoView { +- (NSInteger)mew_countOfMircoView { return 7; } // index的坑位 -- (UIView *)microViewForIndex:(NSInteger)index { - UIView *microView = [super microViewForIndex:index]; +- (UIView *)mew_microViewForIndex:(NSInteger)index { + UIView *microView = [super mew_microViewForIndex:index]; if (microView) { return microView; } @@ -65,7 +65,7 @@ } // index处坑位的区域 -- (CGRect)rectForViewAtIndex:(NSInteger)index { +- (CGRect)mew_rectForViewAtIndex:(NSInteger)index { if (index == 0) { return CGRectMake(paddingH, ownerTopMargin, ownerWidth, ownerHeight); } @@ -78,17 +78,17 @@ return CGRectMake(paddingH + (mcWidth + marginH) * (index - 3 - 1), secondRowTop, mcWidth, mcHeight);; } - return [super rectForViewAtIndex:index]; + return [super mew_rectForViewAtIndex:index]; } // 坑位区域的高度（宽度默认屏幕宽度） -- (CGFloat)heightForStageView { +- (CGFloat)mew_heightForStageView { return ownerTopMargin + ownerHeight + marginV1 + mcHeight + marginV2 + mcHeight + marginV2; } - (CGPoint)mew_animationPointAtStageViewByUid:(NSString *)uid { - NSInteger index = [self getIndexByUid:uid]; + NSInteger index = [self mew_getIndexByUid:uid]; CGPoint point = CGPointZero; if (index == 0) { diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Room/View/RoomStageView/RoomMicroView/MewSocialMicroView.h b/yinmeng-ios/yinmeng-ios/Main/Room/View/MewView/RoomStageView/RoomMicroView/MewSocialMicroView.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Room/View/RoomStageView/RoomMicroView/MewSocialMicroView.h rename to yinmeng-ios/yinmeng-ios/Main/Room/View/MewView/RoomStageView/RoomMicroView/MewSocialMicroView.h diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Room/View/RoomStageView/RoomMicroView/MewSocialMicroView.m b/yinmeng-ios/yinmeng-ios/Main/Room/View/MewView/RoomStageView/RoomMicroView/MewSocialMicroView.m similarity index 76% rename from yinmeng-ios/yinmeng-ios/Main/Mew/Room/View/RoomStageView/RoomMicroView/MewSocialMicroView.m rename to yinmeng-ios/yinmeng-ios/Main/Room/View/MewView/RoomStageView/RoomMicroView/MewSocialMicroView.m index 0c62c71..24e8d6a 100644 --- a/yinmeng-ios/yinmeng-ios/Main/Mew/Room/View/RoomStageView/RoomMicroView/MewSocialMicroView.m +++ b/yinmeng-ios/yinmeng-ios/Main/Room/View/MewView/RoomStageView/RoomMicroView/MewSocialMicroView.m @@ -7,9 +7,9 @@ #import "MewSocialMicroView.h" /// Model -#import "MicroQueueModel.h" +#import "MewMicroQueueModel.h" #import "MewUserInfoModel.h" -#import "MEWThemeColor.h" +#import "MewThemeColor.h" @interface MewSocialMicroView() /// 当前坑位 @@ -19,10 +19,10 @@ @implementation MewSocialMicroView -- (void)configMicroView:(MicroQueueModel *)model { +- (void)mew_configMicroView:(MewMicroQueueModel *)model { self.position = model.microState.position; - [super configMicroView:model]; - MicroStateModel *micState = model.microState; + [super mew_configMicroView:model]; + MewMicroStateModel *micState = model.microState; // MewUserInfoModel *userInfo = model.userInfo; UIImage *image = [UIImage imageNamed:@"mew_room_position_empty"]; @@ -39,12 +39,12 @@ self.avatarImageView.backgroundColor = [UIColor colorWithPatternImage:newImage]; } -- (void)configUser:(MewUserInfoModel *)userInfo { - [super configUser:userInfo]; +- (void)mew_configUser:(MewUserInfoModel *)userInfo { + [super mew_configUser:userInfo]; } -- (BOOL)isHiddenMicroUserInfoView { +- (BOOL)mew_isHiddenMicroUserInfoView { return YES; } diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/StageView/CHStageView.h b/yinmeng-ios/yinmeng-ios/Main/Room/View/StageView/MewStageView.h similarity index 53% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/StageView/CHStageView.h rename to yinmeng-ios/yinmeng-ios/Main/Room/View/StageView/MewStageView.h index 08bd028..b20185f 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/StageView/CHStageView.h +++ b/yinmeng-ios/yinmeng-ios/Main/Room/View/StageView/MewStageView.h @@ -9,7 +9,7 @@ #import "MewRoomGuestDelegate.h" #import "MewRoomHostDelegate.h" #import "MicroViewProtocol.h" -@class MicroQueueModel; +@class MewMicroQueueModel; NS_ASSUME_NONNULL_BEGIN @@ -17,52 +17,52 @@ NS_ASSUME_NONNULL_BEGIN @protocol StageViewDelegate /// 坑位数目 -- (NSInteger)countOfMircoView; +- (NSInteger)mew_countOfMircoView; /// 坑位区域的高度（宽度默认屏幕宽度） -- (CGFloat)heightForStageView; +- (CGFloat)mew_heightForStageView; /// index的坑位 -- (UIView *)microViewForIndex:(NSInteger)index; +- (UIView *)mew_microViewForIndex:(NSInteger)index; /// index处坑位的区域 -- (CGRect)rectForViewAtIndex:(NSInteger)index; +- (CGRect)mew_rectForViewAtIndex:(NSInteger)index; /// index处的坑位点击事件 -- (void)didSelectAtIndex:(NSInteger)index; +- (void)mew_didSelectAtIndex:(NSInteger)index; @end /// 基本都是工具方法 -@protocol StageViewProtocol +@protocol MewStageViewProtocol /// 网易云信的麦序转成坑位的index -- (NSInteger)positionToIndex:(NSString *)position; +- (NSInteger)mew_positionToIndex:(NSString *)position; /// 坑位的index转成网易云信的麦序 -- (NSString *)indexToPosition:(NSInteger)index; +- (NSString *)mew_indexToPosition:(NSInteger)index; /// 根据 uid 获取该用户的坑位index，如果uid没在坑位上返回-1 -- (NSInteger)getIndexByUid:(NSString *)uid; +- (NSInteger)mew_getIndexByUid:(NSString *)uid; /// 根据 uid 查找该用户的坑位信息，用户不在麦位上返回nil -- (MicroQueueModel *)findMicroInfoByUid:(NSString *)uid; +- (MewMicroQueueModel *)mew_findMicroInfoByUid:(NSString *)uid; /// 根据 uid 查找该用户的上麦的坑位 View，用户不在麦位上将返回nil -- (UIView *)findMicroViewByUid:(NSString *)uid; +- (UIView *)mew_findMicroViewByUid:(NSString *)uid; /// 根据 index 查找坑位 View -- (UIView *)findMicroViewByIndex:(NSInteger)index; +- (UIView *)mew_findMicroViewByIndex:(NSInteger)index; /// 根据 position 查找坑位 View -- (UIView *)findMicroViewByPosition:(NSString *)position; +- (UIView *)mew_findMicroViewByPosition:(NSString *)position; -- (NSArray *> *)getAllMicroViewArray; -- (NSString *)getMewMicroSelectUid; +- (NSArray *> *)mew_getAllMicroViewArray; +- (NSString *)mew_getMewMicroSelectUid; @end -@interface CHStageView : UIView +@interface MewStageView : UIView @property (nonatomic, weak, readonly) id hostDelegate; - (instancetype)initWithDelegate:(id)delegate; diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/StageView/CHStageView.m b/yinmeng-ios/yinmeng-ios/Main/Room/View/StageView/MewStageView.m similarity index 77% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/StageView/CHStageView.m rename to yinmeng-ios/yinmeng-ios/Main/Room/View/StageView/MewStageView.m index 764719f..b1826f8 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/StageView/CHStageView.m +++ b/yinmeng-ios/yinmeng-ios/Main/Room/View/StageView/MewStageView.m @@ -5,30 +5,30 @@ // Created by 触海 on 2023/11/13. // -#import "CHStageView.h" +#import "MewStageView.h" /// Tool #import "NSArray+MEWSafe.h" #import "MewRtcManager.h" #import "MewAccountInfoStorage.h" #import "TTPopup.h" -#import "MEWThemeColor.h" +#import "MewThemeColor.h" /// Model -#import "MicroQueueModel.h" +#import "MewMicroQueueModel.h" #import "MewUserInfoModel.h" #import "MewRoomInfoModel.h" #import "MewAttachmentModel.h" -#import "MicroExtModel.h" +#import "MewMicroExtModel.h" #import "MewHUDTool.h" ///Third #import #import -@interface CHStageView() +@interface MewStageView() /**云信麦序的 position 和本类 index 的关系 * 网易云信返回的麦序（position）从 -1 开始 - * - 使用者：MicroStateModel、self.micQueue. + * - 使用者：MewMicroStateModel、self.micQueue. * * 麦位 View 的 index 从 0 开始 * - 使用者：StageViewDelegate、self.microViews. @@ -39,7 +39,7 @@ @property (nonatomic, strong) NSMutableArray *microViews; /// 麦位上用户信息 -@property (nonatomic, strong) NSMutableDictionary *micQueue; +@property (nonatomic, strong) NSMutableDictionary *micQueue; @property (nonatomic, weak) id hostDelegate; @@ -58,19 +58,19 @@ @end -@implementation CHStageView +@implementation MewStageView #pragma mark - Init - (instancetype)initWithDelegate:(id)delegate { self = [super initWithFrame:CGRectZero]; if (self) { _hostDelegate = delegate; - NSInteger microCount = self.countOfMircoView; + NSInteger microCount = self.mew_countOfMircoView; for (int i = 0; i < microCount; i++) { - UIView *microView = [self microViewForIndex:i]; + UIView *microView = [self mew_microViewForIndex:i]; if (microView) { microView.tag = i; - microView.frame = [self rectForViewAtIndex:i]; + microView.frame = [self mew_rectForViewAtIndex:i]; [self addSubview:microView]; UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(microViewTapped:)]; [microView addGestureRecognizer:tap]; @@ -78,7 +78,7 @@ } } [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(self.heightForStageView); + make.height.mas_equalTo(self.mew_heightForStageView); }]; if (_hostDelegate.mew_getRoomInformation) { @@ -103,7 +103,7 @@ // RTRC的初始化， 进入房间 NSInteger roomId = roomInfo.roomId > INT_MAX ? roomInfo.uid : roomInfo.roomId; [MewRtcManager initEngineWithType:Mew_RtcEngineType_TRTC delegate:self]; - [[MewRtcManager instance] enterRoom:[NSString stringWithFormat:@"%ld",roomId] trtcSign:roomInfo.trtcSig]; + [[MewRtcManager instance] mew_enterRoom:[NSString stringWithFormat:@"%ld",roomId] trtcSign:roomInfo.trtcSig]; } /// 获取云信麦位信息 @@ -119,9 +119,9 @@ for (NSDictionary *item in info) { MewUserInfoModel *userInfo = [MewUserInfoModel mewModelWithJSON:item.allValues.firstObject]; NSString *position = item.allKeys.firstObject; - MicroQueueModel *sequence = [self.micQueue objectForKey:position]; + MewMicroQueueModel *sequence = [self.micQueue objectForKey:position]; sequence.userInfo = userInfo; - if (userInfo.uid == [MewAccountInfoStorage instance].getUid.integerValue) { + if (userInfo.uid == [MewAccountInfoStorage instance].mew_getUid.integerValue) { ownerRTCChange = YES; } } @@ -141,7 +141,7 @@ [self initNIMMicroQueues]; } -- (NSMutableDictionary *)mew_getCustomMicroQueue { +- (NSMutableDictionary *)mew_getCustomMicroQueue { return self.micQueue; } @@ -162,15 +162,15 @@ NSArray* microStates; switch (type) { case 2: - microStates = @[[MicroStateModel mewModelWithJSON:data[@"micInfo"]]]; + microStates = @[[MewMicroStateModel mewModelWithJSON:data[@"micInfo"]]]; break; case 3: - microStates = [MicroStateModel mewModelsWithArray:data[@"micInfo"]]; + microStates = [MewMicroStateModel mewModelsWithArray:data[@"micInfo"]]; break; } if (microStates && microStates.count > 0) { - for (MicroStateModel *microState in microStates) { - MicroQueueModel *micSequence = [self.micQueue objectForKey:[NSString stringWithFormat:@"%d", microState.position]]; + for (MewMicroStateModel *microState in microStates) { + MewMicroQueueModel *micSequence = [self.micQueue objectForKey:[NSString stringWithFormat:@"%d", microState.position]]; micSequence.microState = microState; } microQueueChanged = YES; @@ -184,21 +184,21 @@ NSString* position = [data objectForKey:NIMChatroomEventInfoQueueChangeItemKey]; MewUserInfoModel* userInfo = [MewUserInfoModel mewModelWithJSON:[data objectForKey:NIMChatroomEventInfoQueueChangeItemValueKey]]; NSInteger changeType = [data[NIMChatroomEventInfoQueueChangeTypeKey] integerValue]; - if (userInfo.uid == [MewAccountInfoStorage instance].getUid.integerValue) { + if (userInfo.uid == [MewAccountInfoStorage instance].mew_getUid.integerValue) { ownerRTCChanged = YES; } // 先清除该用户旧的麦位 - for (MicroQueueModel *sequence in self.micQueue.allValues) { + for (MewMicroQueueModel *sequence in self.micQueue.allValues) { if (userInfo.uid == sequence.userInfo.uid) { sequence.userInfo = nil; } } if (changeType == 1) { // 上麦 - MicroQueueModel *sequence = [self.micQueue objectForKey:position]; + MewMicroQueueModel *sequence = [self.micQueue objectForKey:position]; sequence.userInfo = userInfo; //如果是当前用户上麦，关闭自己的麦克风 - if (sequence && sequence.userInfo.uid == [MewAccountInfoStorage instance].getUid.integerValue ) { + if (sequence && sequence.userInfo.uid == [MewAccountInfoStorage instance].mew_getUid.integerValue ) { [MewRtcManager instance].localMuted = NO; } } @@ -210,7 +210,7 @@ case NIMChatroomEventTypeKicked: { for (NIMChatroomNotificationMember *member in content.targets) { - for (MicroQueueModel *sequence in self.micQueue.allValues) { + for (MewMicroQueueModel *sequence in self.micQueue.allValues) { if (member.userId.integerValue == sequence.userInfo.uid) { sequence.userInfo = nil; microQueueChanged = YES; @@ -225,7 +225,7 @@ NSInteger changeType = [data[NIMChatroomEventInfoQueueChangeTypeKey] integerValue]; if(changeType == 4){ for (NIMChatroomNotificationMember *member in content.targets) { - for (MicroQueueModel *sequence in self.micQueue.allValues) { + for (MewMicroQueueModel *sequence in self.micQueue.allValues) { if (member.userId.integerValue == sequence.userInfo.uid) { sequence.userInfo = nil; microQueueChanged = YES; @@ -270,17 +270,17 @@ } - for (int i = 0; i < self.countOfMircoView; i++) { - MicroQueueModel *model = [self.micQueue objectForKey:[self indexToPosition:i]]; + for (int i = 0; i < self.mew_countOfMircoView; i++) { + MewMicroQueueModel *model = [self.micQueue objectForKey:[self mew_indexToPosition:i]]; - UIView *view = [self findMicroViewByIndex:i]; - [view configRoomInfo:roomInfo]; - [view configMicQueue:self.micQueue]; - [view configMicroView:model]; + UIView *view = [self mew_findMicroViewByIndex:i]; + [view mew_configRoomInfo:roomInfo]; + [view mew_configMicQueue:self.micQueue]; + [view mew_configMicroView:model]; if (self.hostDelegate.mew_getUserInformation.uid && model.userInfo.uid == self.hostDelegate.mew_getUserInformation.uid) { - selfNeedBroadcast = model.microState.micState == MicroMicStateType_Open; + selfNeedBroadcast = model.microState.micState == MewMicroMicStateType_Open; } - if (model.microState.micState == MicroMicStateType_Close) { + if (model.microState.micState == MewMicroMicStateType_Close) { [MewRtcManager instance].localMuted = YES; } @@ -293,38 +293,38 @@ } -- (NSString *)getMewMicroSelectUid { +- (NSString *)mew_getMewMicroSelectUid { return nil; } #pragma mark - StageViewDelegate - 留给子 View 重写的模板方法 /// 坑位数目 -- (NSInteger)countOfMircoView { +- (NSInteger)mew_countOfMircoView { return 0; } /// 坑位区域的高度（宽度默认屏幕宽度） -- (CGFloat)heightForStageView { +- (CGFloat)mew_heightForStageView { return 0; } /// index的坑位 -- (UIView *)microViewForIndex:(NSInteger)index { - return [self findMicroViewByIndex:index]; +- (UIView *)mew_microViewForIndex:(NSInteger)index { + return [self mew_findMicroViewByIndex:index]; } /// index处坑位的区域 -- (CGRect)rectForViewAtIndex:(NSInteger)index { +- (CGRect)mew_rectForViewAtIndex:(NSInteger)index { return CGRectZero; } /// index处的坑位点击事件 -- (void)didSelectAtIndex:(NSInteger)index { +- (void)mew_didSelectAtIndex:(NSInteger)index { - MicroQueueModel* micModel = [self.micQueue objectForKey:[self indexToPosition:index]]; + MewMicroQueueModel* micModel = [self.micQueue objectForKey:[self mew_indexToPosition:index]]; MewUserInfoModel* userInfo = self.hostDelegate.mew_getUserInformation; MewRoomInfoModel* roomInfo = self.hostDelegate.mew_getRoomInformation; - NSString* position = [self indexToPosition:index]; + NSString* position = [self mew_indexToPosition:index]; NSString* uid = [NSString stringWithFormat:@"%ld", userInfo.uid]; NSString* roomId = [NSString stringWithFormat:@"%ld", roomInfo.roomId]; @@ -342,14 +342,14 @@ if (targetUid && targetUid.length > 0) { self.isSelectMicUser = !self.isSelectMicUser; self.selectUid = self.isSelectMicUser ? [NSString stringWithFormat:@"%ld",micModel.userInfo.uid] : @""; - NSArray *> *microViews = [self getAllMicroViewArray]; + NSArray *> *microViews = [self mew_getAllMicroViewArray]; for (UIView *view in microViews) { view.layer.borderColor = UIColor.clearColor.CGColor; view.layer.borderWidth = 0.0; } - UIView *selectMicroView = [self findMicroViewByIndex:index]; - selectMicroView.layer.borderColor = self.isSelectMicUser ? [MEWThemeColor mewColorWithHexString:@"#9552FF"].CGColor : UIColor.clearColor.CGColor; + UIView *selectMicroView = [self mew_findMicroViewByIndex:index]; + selectMicroView.layer.borderColor = self.isSelectMicUser ? [MewThemeColor mewColorWithHexString:@"#9552FF"].CGColor : UIColor.clearColor.CGColor; selectMicroView.layer.borderWidth = self.isSelectMicUser ? 2.0 : 0.0; return; } @@ -366,7 +366,7 @@ if (!self.hadGetQueueInfoSuccess) { return; } - MicroQueueModel* micModel = [self.micQueue objectForKey:up]; + MewMicroQueueModel* micModel = [self.micQueue objectForKey:up]; if (micModel.userInfo) {///麦上已经有人,不上麦 [MewHUDTool showErrorWithMessage:@"该麦位已经有人了哦~"]; return; @@ -405,22 +405,22 @@ // 2.1.1 上麦 TTActionSheetConfig *upMic = [TTActionSheetConfig normalTitle:@"上麦" clickAction:^{ NSString* selfUid = [NSString stringWithFormat:@"%ld", (long)self.hostDelegate.mew_getUserInformation.uid]; - UIView* microView = [self findMicroViewByUid:selfUid]; + UIView* microView = [self mew_findMicroViewByUid:selfUid]; if (microView) { - nimDownQueue([self indexToPosition:microView.tag], position); + nimDownQueue([self mew_indexToPosition:microView.tag], position); } else { nimUpQueue(position, NO); } }]; } else { NSString* selfUid = [NSString stringWithFormat:@"%ld", (long)self.hostDelegate.mew_getUserInformation.uid]; - UIView* microView = [self findMicroViewByUid:selfUid]; + UIView* microView = [self mew_findMicroViewByUid:selfUid]; if (microView) { if (self.isUpingMic) { [MewHUDTool showErrorWithMessage:@"正在上麦"]; } else { self.isUpingMic = YES; - nimDownQueue([self indexToPosition:microView.tag], position); + nimDownQueue([self mew_indexToPosition:microView.tag], position); } } else { nimUpQueue(position, NO); @@ -429,7 +429,7 @@ }]; } -- (NSArray *> *)getAllMicroViewArray { +- (NSArray *> *)mew_getAllMicroViewArray { return [self.microViews copy]; } @@ -443,27 +443,27 @@ if ([MewRtcManager instance].isLocalMuted && uid.integerValue == self.hostDelegate.mew_getUserInformation.uid) { continue; } - UIView* microView = [self findMicroViewByUid:uid]; + UIView* microView = [self mew_findMicroViewByUid:uid]; if (microView) { - [microView userSpeaking]; + [microView mew_userSpeaking]; } } } -#pragma mark - StageViewProtocol - 基本上都是工具方法 +#pragma mark - MewStageViewProtocol - 基本上都是工具方法 /// 网易云信的麦序转成坑位的index -- (NSInteger)positionToIndex:(NSString *)position { +- (NSInteger)mew_positionToIndex:(NSString *)position { return position.intValue + 1; } /// 坑位的index转成网易云信的麦序 -- (NSString *)indexToPosition:(NSInteger)index { +- (NSString *)mew_indexToPosition:(NSInteger)index { return [NSString stringWithFormat:@"%ld", (long)(index - 1)]; } /// 根据 uid 获取该用户的坑位index，如果uid没在坑位上返回-1 -- (NSInteger)getIndexByUid:(NSString *)uid { - UIView *view = [self findMicroViewByUid:uid]; +- (NSInteger)mew_getIndexByUid:(NSString *)uid { + UIView *view = [self mew_findMicroViewByUid:uid]; if (view) { return [self.microViews indexOfObject:view]; } @@ -472,8 +472,8 @@ } /// 根据 uid 查找该用户的坑位信息，用户不在麦位上返回nil -- (MicroQueueModel *)findMicroInfoByUid:(NSString *)uid { - for (MicroQueueModel *model in self.micQueue.allValues) { +- (MewMicroQueueModel *)mew_findMicroInfoByUid:(NSString *)uid { + for (MewMicroQueueModel *model in self.micQueue.allValues) { if (model.userInfo && model.userInfo.uid == uid.intValue) { return model; } @@ -483,11 +483,11 @@ /// 根据 uid 查找该用户的上麦的坑位 View，用户不在麦位上将返回nil -- (UIView *)findMicroViewByUid:(NSString *)uid { - for (int i = 0; i < self.countOfMircoView; i++) { - MicroQueueModel *model = [self.micQueue objectForKey:[self indexToPosition:i]]; +- (UIView *)mew_findMicroViewByUid:(NSString *)uid { + for (int i = 0; i < self.mew_countOfMircoView; i++) { + MewMicroQueueModel *model = [self.micQueue objectForKey:[self mew_indexToPosition:i]]; if (model.userInfo && model.userInfo.uid == uid.intValue) { - return [self findMicroViewByIndex:i]; + return [self mew_findMicroViewByIndex:i]; } } return nil; @@ -495,7 +495,7 @@ /// 根据 index 查找坑位 View -- (UIView *)findMicroViewByIndex:(NSInteger)index { +- (UIView *)mew_findMicroViewByIndex:(NSInteger)index { if (self.microViews && self.microViews.count > index) { return [self.microViews mewSafeObjectAtIndex:index]; } @@ -503,8 +503,8 @@ } /// 根据 position 查找坑位 View -- (UIView *)findMicroViewByPosition:(NSString *)position { - return [self findMicroViewByIndex:[self positionToIndex:position]]; +- (UIView *)mew_findMicroViewByPosition:(NSString *)position { + return [self mew_findMicroViewByIndex:[self mew_positionToIndex:position]]; } @@ -513,7 +513,7 @@ * 麦位更新扩展字段。 */ - (NSDictionary *)userInfoToQueueExt:(MewUserInfoModel *)userInfo { - MicroExtModel * extModel = [[MicroExtModel alloc] init]; + MewMicroExtModel * extModel = [[MewMicroExtModel alloc] init]; extModel.gender = userInfo.gender; extModel.avatar = userInfo.avatar; extModel.uid = userInfo.uid; @@ -539,9 +539,9 @@ for (NSDictionary *item in info) { MewUserInfoModel *userInfo = [MewUserInfoModel mewModelWithJSON:item.allValues.firstObject]; NSString *position = item.allKeys.firstObject; - MicroQueueModel *sequence = [self.micQueue objectForKey:position]; + MewMicroQueueModel *sequence = [self.micQueue objectForKey:position]; sequence.userInfo = userInfo; - if (userInfo.uid == [MewAccountInfoStorage instance].getUid.integerValue) { + if (userInfo.uid == [MewAccountInfoStorage instance].mew_getUid.integerValue) { ownerRTCChange = YES; } } @@ -553,7 +553,7 @@ #pragma mark - Action Event - (void)microViewTapped:(UITapGestureRecognizer *)tap { - [self didSelectAtIndex:tap.view.tag]; + [self mew_didSelectAtIndex:tap.view.tag]; } #pragma mark - Private Method @@ -566,8 +566,8 @@ NSDictionary *info = [chatroom.ext mewToJSONObject]; NSDictionary *micState = [info[@"micQueue"] mewToJSONObject]; for (NSString *position in micState.allKeys) { - MicroStateModel *state = [MicroStateModel mewModelWithJSON:micState[position]]; - MicroQueueModel *sequence = [self.micQueue objectForKey:position]; + MewMicroStateModel *state = [MewMicroStateModel mewModelWithJSON:micState[position]]; + MewMicroQueueModel *sequence = [self.micQueue objectForKey:position]; sequence.microState = state; } [self microQueueUpdated:NO]; @@ -577,19 +577,19 @@ #pragma mark - Get - (NSMutableArray *)microViews { if (!_microViews) { - _microViews = [NSMutableArray arrayWithCapacity:self.countOfMircoView]; + _microViews = [NSMutableArray arrayWithCapacity:self.mew_countOfMircoView]; } return _microViews; } -- (NSMutableDictionary *)micQueue { +- (NSMutableDictionary *)micQueue { if (!_micQueue) { _micQueue = [NSMutableDictionary dictionary]; - for (int i = 0; i < self.countOfMircoView; i++) { - NSString *position = [self indexToPosition:i]; - MicroQueueModel *micSequence = [[MicroQueueModel alloc] init]; + for (int i = 0; i < self.mew_countOfMircoView; i++) { + NSString *position = [self mew_indexToPosition:i]; + MewMicroQueueModel *micSequence = [[MewMicroQueueModel alloc] init]; micSequence.userInfo = nil; - micSequence.microState = [[MicroStateModel alloc] init]; + micSequence.microState = [[MewMicroStateModel alloc] init]; micSequence.microState.position = [position intValue]; [_micQueue setObject:micSequence forKey:position]; } diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/StageView/MicroView/MicroView.h b/yinmeng-ios/yinmeng-ios/Main/Room/View/StageView/MicroView/MicroView.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/StageView/MicroView/MicroView.h rename to yinmeng-ios/yinmeng-ios/Main/Room/View/StageView/MicroView/MicroView.h diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/StageView/MicroView/MicroView.m b/yinmeng-ios/yinmeng-ios/Main/Room/View/StageView/MicroView/MicroView.m similarity index 85% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/StageView/MicroView/MicroView.m rename to yinmeng-ios/yinmeng-ios/Main/Room/View/StageView/MicroView/MicroView.m index 7c3ad99..c10de6f 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/StageView/MicroView/MicroView.m +++ b/yinmeng-ios/yinmeng-ios/Main/Room/View/StageView/MicroView/MicroView.m @@ -9,9 +9,9 @@ /// Model #import "MewUserInfoModel.h" #import "MewRoomInfoModel.h" -#import "MicroQueueModel.h" +#import "MewMicroQueueModel.h" /// Tool -#import "MEWThemeColor.h" +#import "MewThemeColor.h" #import "MewMacro.h" /// Third #import @@ -32,13 +32,13 @@ ///离开模式 @property (nonatomic,strong) UILabel *leaveLabel; ///麦序的信息 -@property (nonatomic,strong) MicroQueueModel *microModel; +@property (nonatomic,strong) MewMicroQueueModel *microModel; ///麦位的用户信息 @property (nonatomic,strong) MewUserInfoModel *userInfo; ///当前房间的信息 @property (nonatomic,strong) MewRoomInfoModel *roomInfo; ///当前的麦序 -@property (nonatomic,strong) NSMutableDictionary *micQueue; +@property (nonatomic,strong) NSMutableDictionary *micQueue; @end @implementation MicroView @@ -57,7 +57,7 @@ - (void)mew_initSubViews { [self addSubview:self.avatarImageView]; [self addSubview:self.micStateImageView]; - self.stackView.hidden = [self isHiddenMicroUserInfoView]; + self.stackView.hidden = [self mew_isHiddenMicroUserInfoView]; [self addSubview:self.stackView]; [self.stackView addArrangedSubview:self.postionLabel]; [self.stackView addArrangedSubview:self.nickLabel]; @@ -86,16 +86,16 @@ } /** 设置麦位信息。 */ -- (void)configMicroView:(MicroQueueModel *)model { +- (void)mew_configMicroView:(MewMicroQueueModel *)model { self.microModel = model; - MicroStateModel *micState = model.microState; + MewMicroStateModel *micState = model.microState; MewUserInfoModel *userInfo = model.userInfo; [self configMicroState:micState]; - [self configUser:userInfo]; + [self mew_configUser:userInfo]; } /** 设置用户信息。 */ -- (void)configUser:(MewUserInfoModel *)userInfo { +- (void)mew_configUser:(MewUserInfoModel *)userInfo { self.userInfo = userInfo; self.nickLabel.text = @"号麦位"; self.nickLabel.hidden = NO; @@ -107,7 +107,7 @@ [self.postionLabel setBackgroundColor:userInfo.gender == GenderType_Male ? UIColorMewFromRGB(0x3EBBFE) : UIColorMewFromRGB(0xFF5E83)]; self.nickLabel.text = userInfo.nick.length > 5 ? [NSString stringWithFormat:@"%@…",[userInfo.nick substringToIndex:5]] : userInfo.nick; - self.nickLabel.textColor = userInfo.micNickColor.length > 0 ? [MEWThemeColor mewColorWithHexString: userInfo.micNickColor] : UIColorMewFromRGB(0xFFFFFF); + self.nickLabel.textColor = userInfo.micNickColor.length > 0 ? [MewThemeColor mewColorWithHexString: userInfo.micNickColor] : UIColorMewFromRGB(0xFFFFFF); if (self.microModel.microState.position == -1) { self.sexImageView.hidden = NO; @@ -129,7 +129,7 @@ } /** 设置房间信息房间的信息 */ -- (void)configRoomInfo:(MewRoomInfoModel *)roomInfo { +- (void)mew_configRoomInfo:(MewRoomInfoModel *)roomInfo { self.roomInfo = roomInfo; } @@ -139,29 +139,29 @@ } /** 设置当前房间的麦序 */ -- (void)configMicQueue:(NSMutableDictionary *)micQueue { +- (void)mew_configMicQueue:(NSMutableDictionary *)micQueue { self.micQueue = micQueue; } /** 获取当前的麦序 */ -- (NSMutableDictionary *)mew_getCustomMicroQueue { +- (NSMutableDictionary *)mew_getCustomMicroQueue { return self.micQueue; } /** 用户正在讲话（播放光圈）。*/ -- (void)userSpeaking { +- (void)mew_userSpeaking { // [self.animationView startWaveAnimation]; } -- (BOOL)isHiddenMicroUserInfoView { +- (BOOL)mew_isHiddenMicroUserInfoView { return NO; } #pragma mark - Private Method -- (void)configMicroState:(MicroStateModel *)micState { - self.micStateImageView.hidden = micState.micState == MicroMicStateType_Open; - UIImage *image = [UIImage imageNamed:micState.posState == MicroPosStateType_Free ? @"mew_room_position_empty" : @"room_position_lock"]; +- (void)configMicroState:(MewMicroStateModel *)micState { + self.micStateImageView.hidden = micState.micState == MewMicroMicStateType_Open; + UIImage *image = [UIImage imageNamed:micState.posState == MewMicroPosStateType_Free ? @"mew_room_position_empty" : @"room_position_lock"]; CGSize scaledToSize = CGSizeMake(self.frame.size.width, self.frame.size.width); UIGraphicsBeginImageContextWithOptions(scaledToSize, false, 0.0); // 缩小“1”点儿，防止默认背景的边缘被裁剪 @@ -252,13 +252,6 @@ return _leaveLabel ; } -//- (MicroWaveView *)animationView { -// if (!_animationView) { -// _animationView = [[MicroWaveView alloc] init]; -// } -// return _animationView; -//} - @end diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/StageView/MicroView/MicroViewProtocol.h b/yinmeng-ios/yinmeng-ios/Main/Room/View/StageView/MicroView/MicroViewProtocol.h similarity index 57% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/StageView/MicroView/MicroViewProtocol.h rename to yinmeng-ios/yinmeng-ios/Main/Room/View/StageView/MicroView/MicroViewProtocol.h index a06d155..19e6ecc 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/StageView/MicroView/MicroViewProtocol.h +++ b/yinmeng-ios/yinmeng-ios/Main/Room/View/StageView/MicroView/MicroViewProtocol.h @@ -6,7 +6,7 @@ // #import -@class MewRoomInfoModel,MicroQueueModel,MewUserInfoModel; +@class MewRoomInfoModel,MewMicroQueueModel,MewUserInfoModel; NS_ASSUME_NONNULL_BEGIN @@ -18,27 +18,27 @@ NS_ASSUME_NONNULL_BEGIN - (void)mew_initSubViewConstraints; /** 设置麦位信息。 */ -- (void)configMicroView:(MicroQueueModel *)model; +- (void)mew_configMicroView:(MewMicroQueueModel *)model; /** 设置用户信息。 */ -- (void)configUser:(MewUserInfoModel *)userInfo; +- (void)mew_configUser:(MewUserInfoModel *)userInfo; /** 用户正在讲话（播放光圈）。*/ -- (void)userSpeaking; +- (void)mew_userSpeaking; -- (BOOL)isHiddenMicroUserInfoView; +- (BOOL)mew_isHiddenMicroUserInfoView; /** 设置房间信息房间的信息 */ -- (void)configRoomInfo:(MewRoomInfoModel *)roomInfo; +- (void)mew_configRoomInfo:(MewRoomInfoModel *)roomInfo; /** 获取当前房间的信息 */ - (MewRoomInfoModel *)mew_getRoomInformation; /** 设置当前房间的麦序 */ -- (void)configMicQueue:(NSMutableDictionary *)micQueue; +- (void)mew_configMicQueue:(NSMutableDictionary *)micQueue; /** 获取当前的麦序 */ -- (NSMutableDictionary*)mew_getCustomMicroQueue; +- (NSMutableDictionary*)mew_getCustomMicroQueue; @end NS_ASSUME_NONNULL_END diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/StageView/Model/MicroExtModel.h b/yinmeng-ios/yinmeng-ios/Main/Room/View/StageView/Model/MewMicroExtModel.h similarity index 92% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/StageView/Model/MicroExtModel.h rename to yinmeng-ios/yinmeng-ios/Main/Room/View/StageView/Model/MewMicroExtModel.h index 6619522..6d75b02 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/StageView/Model/MicroExtModel.h +++ b/yinmeng-ios/yinmeng-ios/Main/Room/View/StageView/Model/MewMicroExtModel.h @@ -1,5 +1,5 @@ // -// MicroExtModel.h +// MewMicroExtModel.h // mew-ios // // Created by 触海 on 2023/11/20. @@ -10,7 +10,7 @@ NS_ASSUME_NONNULL_BEGIN -@interface MicroExtModel : NSObject +@interface MewMicroExtModel : NSObject /// @property (nonatomic,assign) GenderType gender; /// diff --git a/yinmeng-ios/yinmeng-ios/Main/Room/View/StageView/Model/MewMicroExtModel.m b/yinmeng-ios/yinmeng-ios/Main/Room/View/StageView/Model/MewMicroExtModel.m new file mode 100644 index 0000000..b1d0189 --- /dev/null +++ b/yinmeng-ios/yinmeng-ios/Main/Room/View/StageView/Model/MewMicroExtModel.m @@ -0,0 +1,12 @@ +// +// MewMicroExtModel.m +// mew-ios +// +// Created by 触海 on 2023/11/20. +// + +#import "MewMicroExtModel.h" + +@implementation MewMicroExtModel + +@end diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/StageView/Model/MicroQueueModel.h b/yinmeng-ios/yinmeng-ios/Main/Room/View/StageView/Model/MewMicroQueueModel.h similarity index 64% rename from yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/StageView/Model/MicroQueueModel.h rename to yinmeng-ios/yinmeng-ios/Main/Room/View/StageView/Model/MewMicroQueueModel.h index dd4b3a4..000fd43 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/StageView/Model/MicroQueueModel.h +++ b/yinmeng-ios/yinmeng-ios/Main/Room/View/StageView/Model/MewMicroQueueModel.h @@ -1,19 +1,19 @@ // -// MicroQueueModel.h +// MewMicroQueueModel.h // mew-ios // // Created by 触海 on 2023/11/13. // #import "NSObject+MEWExtension.h" -#import "MicroStateModel.h" +#import "MewMicroStateModel.h" @class MewUserInfoModel; NS_ASSUME_NONNULL_BEGIN -@interface MicroQueueModel : NSObject +@interface MewMicroQueueModel : NSObject ///麦序的状态 -@property (nonatomic, strong) MicroStateModel *microState; +@property (nonatomic, strong) MewMicroStateModel *microState; ///麦序上是否有人 @property (nonatomic, strong, nullable) MewUserInfoModel *userInfo; @end diff --git a/yinmeng-ios/yinmeng-ios/Main/Room/View/StageView/Model/MewMicroQueueModel.m b/yinmeng-ios/yinmeng-ios/Main/Room/View/StageView/Model/MewMicroQueueModel.m new file mode 100644 index 0000000..08c0dfe --- /dev/null +++ b/yinmeng-ios/yinmeng-ios/Main/Room/View/StageView/Model/MewMicroQueueModel.m @@ -0,0 +1,12 @@ +// +// MewMicroQueueModel.m +// mew-ios +// +// Created by 触海 on 2023/11/13. +// + +#import "MewMicroQueueModel.h" + +@implementation MewMicroQueueModel + +@end diff --git a/yinmeng-ios/yinmeng-ios/Main/Room/View/StageView/Model/MewMicroStateModel.h b/yinmeng-ios/yinmeng-ios/Main/Room/View/StageView/Model/MewMicroStateModel.h new file mode 100644 index 0000000..58af34d --- /dev/null +++ b/yinmeng-ios/yinmeng-ios/Main/Room/View/StageView/Model/MewMicroStateModel.h @@ -0,0 +1,33 @@ +// +// MewMicroStateModel.h +// mew-ios +// +// Created by 触海 on 2023/11/13. +// + +#import "NSObject+MEWExtension.h" + +NS_ASSUME_NONNULL_BEGIN + +typedef NS_ENUM(NSInteger, MewMicroPosStateType) { + MewMicroPosStateType_Free = 0,///空闲 + MewMicroPosStateType_Lock = 1,///上锁 +}; + +typedef NS_ENUM(NSInteger, MewMicroMicStateType) { + MewMicroMicStateType_Open = 0,///开麦 + MewMicroMicStateType_Close = 1,///锁麦 +}; + +@interface MewMicroStateModel : NSObject + +///坑位的序号 +@property (nonatomic, assign) int position; +///坑位状态 锁坑/开坑 +@property (nonatomic, assign) MewMicroPosStateType posState; +///麦序的状态 闭麦/开麦 +@property (nonatomic, assign) MewMicroMicStateType micState; + +@end + +NS_ASSUME_NONNULL_END diff --git a/yinmeng-ios/yinmeng-ios/Main/Room/View/StageView/Model/MewMicroStateModel.m b/yinmeng-ios/yinmeng-ios/Main/Room/View/StageView/Model/MewMicroStateModel.m new file mode 100644 index 0000000..70cf76c --- /dev/null +++ b/yinmeng-ios/yinmeng-ios/Main/Room/View/StageView/Model/MewMicroStateModel.m @@ -0,0 +1,12 @@ +// +// MewMicroStateModel.m +// mew-ios +// +// Created by 触海 on 2023/11/13. +// + +#import "MewMicroStateModel.h" + +@implementation MewMicroStateModel + +@end diff --git a/yinmeng-ios/yinmeng-ios/Main/Tabbar/Presenter/MainPresenter.m b/yinmeng-ios/yinmeng-ios/Main/Tabbar/Presenter/MainPresenter.m index 416c5dc..dfc4626 100644 --- a/yinmeng-ios/yinmeng-ios/Main/Tabbar/Presenter/MainPresenter.m +++ b/yinmeng-ios/yinmeng-ios/Main/Tabbar/Presenter/MainPresenter.m @@ -11,7 +11,7 @@ #import "Api+MewMain.h" #import "MainProtocol.h" #import -#import "MEWRechargeStorage.h" +#import "MewRechargeStorage.h" #import "NSObject+MEWExtension.h" @implementation MainPresenter @@ -64,23 +64,23 @@ /// 获取用户信息 - (void)mew_getUserInfo { - [Api getUserInfo:[self mew_createHttpCompletion:^(MewBaseModel * _Nonnull data) { + [Api Mew_GetUserInfo:[self mew_createHttpCompletion:^(MewBaseModel * _Nonnull data) { [[self mew_getView] mew_getUserInfoSuccess:[MewUserInfoModel mewModelWithDictionary:data.data]]; } fail:^(NSInteger code, NSString * _Nullable msg) { - }] uid:[[MewAccountInfoStorage instance] getUid]]; + }] uid:[[MewAccountInfoStorage instance] mew_getUid]]; } /// 检查是否有未消费的内购订单 - (void)mew_checkTranscation { - NSString *uid = [MewAccountInfoStorage instance].getUid; - NSArray *array = [MEWRechargeStorage mewGetAllReciptsWithUid:uid]; + NSString *uid = [MewAccountInfoStorage instance].mew_getUid; + NSArray *array = [MewRechargeStorage mewGetAllReciptsWithUid:uid]; if (array == nil && array.count == 0) { return; } NSString *transcationIdStr = [array mewToJSONString]; - [Api requestCheckTranscationIds:[self mew_createHttpCompletion:^(MewBaseModel * _Nonnull data) { + [Api Mew_RequestCheckTranscationIds:[self mew_createHttpCompletion:^(MewBaseModel * _Nonnull data) { }] transcationIdStr:transcationIdStr]; diff --git a/yinmeng-ios/yinmeng-ios/Main/Tabbar/View/MewTabBarController.m b/yinmeng-ios/yinmeng-ios/Main/Tabbar/View/MewTabBarController.m index 74c4951..511e309 100644 --- a/yinmeng-ios/yinmeng-ios/Main/Tabbar/View/MewTabBarController.m +++ b/yinmeng-ios/yinmeng-ios/Main/Tabbar/View/MewTabBarController.m @@ -8,7 +8,7 @@ #import "MewTabBarController.h" #import "MewHUDTool.h" #import "MewClientConfig.h" -#import "MEWThemeColor.h" +#import "MewThemeColor.h" #import "UIImage+MewUtils.h" #import "MewMacro.h" #import "MewAccountInfoStorage.h" @@ -90,7 +90,7 @@ NSString * const kNetworkReachabilityKey = @"kNetworkReachabilityKey"; itemVc.title = title; itemVc.tabBarItem.image = [[UIImage imageNamed:image] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal]; itemVc.tabBarItem.selectedImage = [[UIImage imageNamed:selectedImage] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal]; - [itemVc.tabBarItem setTitleTextAttributes:@{NSForegroundColorAttributeName:[MEWThemeColor mewMainTextColor]} forState:UIControlStateSelected]; + [itemVc.tabBarItem setTitleTextAttributes:@{NSForegroundColorAttributeName:[MewThemeColor mewMainTextColor]} forState:UIControlStateSelected]; [itemVc.tabBarItem setTitleTextAttributes:@{NSForegroundColorAttributeName:UIColor.blackColor} forState:UIControlStateNormal]; MewBaseNavigationController *nav = [[MewBaseNavigationController alloc] initWithRootViewController:itemVc]; return nav; @@ -99,7 +99,7 @@ NSString * const kNetworkReachabilityKey = @"kNetworkReachabilityKey"; - (void)mew_configTheme { if (@available(iOS 13.0, *)) { UITabBarAppearance *appearance = [[UITabBarAppearance alloc] init]; - appearance.backgroundColor = [MEWThemeColor mewColorWithHexString:@"#1D2126"]; + appearance.backgroundColor = [MewThemeColor mewColorWithHexString:@"#1D2126"]; self.tabBar.standardAppearance = appearance; if (@available(iOS 15.0, *)) { self.tabBar.scrollEdgeAppearance = appearance; diff --git a/yinmeng-ios/yinmeng-ios/Main/MewWebViewController.h b/yinmeng-ios/yinmeng-ios/Main/WebView/MewWebViewController.h similarity index 100% rename from yinmeng-ios/yinmeng-ios/Main/MewWebViewController.h rename to yinmeng-ios/yinmeng-ios/Main/WebView/MewWebViewController.h diff --git a/yinmeng-ios/yinmeng-ios/Main/MewWebViewController.m b/yinmeng-ios/yinmeng-ios/Main/WebView/MewWebViewController.m similarity index 98% rename from yinmeng-ios/yinmeng-ios/Main/MewWebViewController.m rename to yinmeng-ios/yinmeng-ios/Main/WebView/MewWebViewController.m index 8e1d9a9..09ef130 100644 --- a/yinmeng-ios/yinmeng-ios/Main/MewWebViewController.m +++ b/yinmeng-ios/yinmeng-ios/Main/WebView/MewWebViewController.m @@ -13,9 +13,9 @@ #import "Api+Mine.h" #import "MewUtility.h" #import "MewAccountInfoStorage.h" -#import "MEWThemeColor.h" +#import "MewThemeColor.h" #import "MewMacro.h" -#import "NewEncryptTool.h" +#import "MewEncryptTool.h" #import "MewHttpRequestHelper.h" #import "MewAccountModel.h" #import "MewHUDTool.h" @@ -116,7 +116,7 @@ NSString * const kCancelAccount = @"cancelAccount"; if (currentUrl != nil) { #endif if ([message.name isEqualToString:kJSGetUid]) { - NSString *uid = [[MewAccountInfoStorage instance] getUid]; + NSString *uid = [[MewAccountInfoStorage instance] mew_getUid]; NSString *js = [NSString stringWithFormat:@"getMessage(\"uid\",%@)", uid]; [self.webview evaluateJavaScript:js completionHandler:^(id _Nullable other, NSError * _Nullable error) { NSLog(@"%@",error); @@ -218,7 +218,7 @@ NSString * const kCancelAccount = @"cancelAccount"; } configuration.allowsInlineMediaPlayback = YES; - NSString *uid = [[MewAccountInfoStorage instance] getUid]; + NSString *uid = [[MewAccountInfoStorage instance] mew_getUid]; NSString *realCookie = [NSString stringWithFormat:@"%@=%@",@"uid",uid]; WKUserScript *cookieScript = [[WKUserScript alloc] initWithSource: [NSString stringWithFormat:@"document.cookie = '%@';", realCookie] injectionTime:WKUserScriptInjectionTimeAtDocumentStart forMainFrameOnly:NO]; diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/StageView/Model/MicroExtModel.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/StageView/Model/MicroExtModel.m deleted file mode 100644 index fa7a0d3..0000000 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/StageView/Model/MicroExtModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// MicroExtModel.m -// mew-ios -// -// Created by 触海 on 2023/11/20. -// - -#import "MicroExtModel.h" - -@implementation MicroExtModel - -@end diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/StageView/Model/MicroQueueModel.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/StageView/Model/MicroQueueModel.m deleted file mode 100644 index a563c06..0000000 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/StageView/Model/MicroQueueModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// MicroQueueModel.m -// mew-ios -// -// Created by 触海 on 2023/11/13. -// - -#import "MicroQueueModel.h" - -@implementation MicroQueueModel - -@end diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/StageView/Model/MicroStateModel.h b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/StageView/Model/MicroStateModel.h deleted file mode 100644 index 4e8a942..0000000 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/StageView/Model/MicroStateModel.h +++ /dev/null @@ -1,33 +0,0 @@ -// -// MicroStateModel.h -// mew-ios -// -// Created by 触海 on 2023/11/13. -// - -#import "NSObject+MEWExtension.h" - -NS_ASSUME_NONNULL_BEGIN - -typedef NS_ENUM(NSInteger, MicroPosStateType) { - MicroPosStateType_Free = 0,///空闲 - MicroPosStateType_Lock = 1,///上锁 -}; - -typedef NS_ENUM(NSInteger, MicroMicStateType) { - MicroMicStateType_Open = 0,///开麦 - MicroMicStateType_Close = 1,///锁麦 -}; - -@interface MicroStateModel : NSObject - -///坑位的序号 -@property (nonatomic, assign) int position; -///坑位状态 锁坑/开坑 -@property (nonatomic, assign) MicroPosStateType posState; -///麦序的状态 闭麦/开麦 -@property (nonatomic, assign) MicroMicStateType micState; - -@end - -NS_ASSUME_NONNULL_END diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/StageView/Model/MicroStateModel.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/StageView/Model/MicroStateModel.m deleted file mode 100644 index 05fb19e..0000000 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/StageView/Model/MicroStateModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// MicroStateModel.m -// mew-ios -// -// Created by 触海 on 2023/11/13. -// - -#import "MicroStateModel.h" - -@implementation MicroStateModel - -@end