更换模型及删除无用代码

yinmeng-ios/yinmeng-ios.xcodeproj/project.pbxproj

@@ -7,15 +7,12 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		230D62EB2B5540C500DADC14 /* MewAppColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 230D62EA2B5540C500DADC14 /* MewAppColor.swift */; };
 		230D62F12B55463500DADC14 /* R.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 230D62F02B55463500DADC14 /* R.generated.swift */; };
 		230D62F62B554F5E00DADC14 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 230D62F42B554F5E00DADC14 /* Main.storyboard */; };
 		230D63182B557DE700DADC14 /* MewServerApi.swift in Sources */ = {isa = PBXBuildFile; fileRef = 230D63172B557DE700DADC14 /* MewServerApi.swift */; };
 		230D631F2B5585AE00DADC14 /* MewEncryptManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 230D631E2B5585AE00DADC14 /* MewEncryptManager.m */; };
-		230D63212B558B8800DADC14 /* MewBaseMapModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 230D63202B558B8800DADC14 /* MewBaseMapModel.swift */; };
 		230D63252B55955900DADC14 /* MewDevice.swift in Sources */ = {isa = PBXBuildFile; fileRef = 230D63242B55955900DADC14 /* MewDevice.swift */; };
 		230D63272B55989400DADC14 /* MewProvideManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 230D63262B55989400DADC14 /* MewProvideManager.swift */; };
-		230D633F2B58C8B100DADC14 /* MewBaseModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 230D633E2B58C8B100DADC14 /* MewBaseModel.m */; };
 		230D63412B58F75F00DADC14 /* mew_launch_logo.png in Resources */ = {isa = PBXBuildFile; fileRef = 230D63402B58F75F00DADC14 /* mew_launch_logo.png */; };
 		230D63742B58FB8F00DADC14 /* MewServerApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 230D63672B58FB8F00DADC14 /* MewServerApiManager.swift */; };
 		230D63752B58FB8F00DADC14 /* MewRoomPlayVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 230D63682B58FB8F00DADC14 /* MewRoomPlayVC.swift */; };
@@ -43,7 +40,6 @@
 		230D63A12B5926FB00DADC14 /* MewMainHomeMoreGameHeadView.m in Sources */ = {isa = PBXBuildFile; fileRef = 230D639F2B5926FB00DADC14 /* MewMainHomeMoreGameHeadView.m */; };
 		230D63AA2B59273D00DADC14 /* MewMainHomeMenuDataModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 230D63A82B59273D00DADC14 /* MewMainHomeMenuDataModel.m */; };
 		230D63AD2B59289A00DADC14 /* MewMainHomeMoreGameHeadCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 230D63AB2B59289900DADC14 /* MewMainHomeMoreGameHeadCell.m */; };
-		230D63B02B59290700DADC14 /* MewMainHomeHotRoomModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 230D63AE2B59290700DADC14 /* MewMainHomeHotRoomModel.m */; };
 		230D63B32B59293B00DADC14 /* MewMainHomeBannerInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 230D63B12B59293A00DADC14 /* MewMainHomeBannerInfoModel.m */; };
 		230D63BB2B592D0D00DADC14 /* MewMainHomeMakeFriendModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 230D63B92B592D0C00DADC14 /* MewMainHomeMakeFriendModel.m */; };
 		230D63BE2B592EA800DADC14 /* UserGameInfoVo.m in Sources */ = {isa = PBXBuildFile; fileRef = 230D63BD2B592EA800DADC14 /* UserGameInfoVo.m */; };
@@ -53,8 +49,6 @@
 		230D63CB2B5A0A5B00DADC14 /* MewOCServerManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 230D63CA2B5A0A5B00DADC14 /* MewOCServerManager.m */; };
 		23270C292B0E037300B9303B /* MewMessageConentAudioView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23270C272B0E037300B9303B /* MewMessageConentAudioView.m */; };
 		23270C2C2B0E041300B9303B /* MewMessageAudioCenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 23270C2B2B0E041300B9303B /* MewMessageAudioCenter.m */; };
-		233757572B0CB577001D0B7F /* MewMessageMenuModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 2337572C2B0CB577001D0B7F /* MewMessageMenuModel.m */; };
-		233757582B0CB577001D0B7F /* MewChatLimitModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 2337572D2B0CB577001D0B7F /* MewChatLimitModel.m */; };
 		233757592B0CB577001D0B7F /* MewNIMBadgeView.m in Sources */ = {isa = PBXBuildFile; fileRef = 233757312B0CB577001D0B7F /* MewNIMBadgeView.m */; };
 		2337575B2B0CB577001D0B7F /* UIView+NIM.m in Sources */ = {isa = PBXBuildFile; fileRef = 233757362B0CB577001D0B7F /* UIView+NIM.m */; };
 		2337575C2B0CB577001D0B7F /* MewSessionMessageCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 233757392B0CB577001D0B7F /* MewSessionMessageCell.m */; };
@@ -70,7 +64,6 @@
 		233757662B0CB577001D0B7F /* MewSessionAudioRecordView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2337574F2B0CB577001D0B7F /* MewSessionAudioRecordView.m */; };
 		233757682B0CB577001D0B7F /* MewNIMMessageUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 233757542B0CB577001D0B7F /* MewNIMMessageUtils.m */; };
 		237053142B1F3A3D00F5DE14 /* MewClientConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 237053132B1F3A3D00F5DE14 /* MewClientConfig.m */; };
-		2370531A2B1F3A5D00F5DE14 /* MewClientDataModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 237053192B1F3A5D00F5DE14 /* MewClientDataModel.m */; };
 		2370531D2B1F3A6E00F5DE14 /* MewWebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2370531B2B1F3A6E00F5DE14 /* MewWebViewController.m */; };
 		237053882B1F3AA100F5DE14 /* MewRechargeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 237053332B1F3AA000F5DE14 /* MewRechargeViewController.m */; };
 		237053892B1F3AA100F5DE14 /* MewMineCollectionViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 237053362B1F3AA000F5DE14 /* MewMineCollectionViewController.m */; };
@@ -93,7 +86,6 @@
 		237053A12B1F3AA100F5DE14 /* MewUserIntroductionView.m in Sources */ = {isa = PBXBuildFile; fileRef = 237053792B1F3AA100F5DE14 /* MewUserIntroductionView.m */; };
 		237053A22B1F3AA100F5DE14 /* MewHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2370537A2B1F3AA100F5DE14 /* MewHeaderView.m */; };
 		237053A32B1F3AA100F5DE14 /* MewRightFollowVoiceCollectionCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2370537D2B1F3AA100F5DE14 /* MewRightFollowVoiceCollectionCell.m */; };
-		237053F12B1F3B1700F5DE14 /* MewHtmlUrl.m in Sources */ = {isa = PBXBuildFile; fileRef = 237053EE2B1F3B1600F5DE14 /* MewHtmlUrl.m */; };
 		237053F22B1F3B1700F5DE14 /* MewConstant.m in Sources */ = {isa = PBXBuildFile; fileRef = 237053EF2B1F3B1600F5DE14 /* MewConstant.m */; };
 		2370547F2B1F3B3200F5DE14 /* UIView+MewFilletCorner.m in Sources */ = {isa = PBXBuildFile; fileRef = 237053F72B1F3B3200F5DE14 /* UIView+MewFilletCorner.m */; };
 		237054802B1F3B3200F5DE14 /* UIImage+MewUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 237053F82B1F3B3200F5DE14 /* UIImage+MewUtils.m */; };
@@ -107,16 +99,26 @@
 		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 */; };
-		237054AB2B1F3B3200F5DE14 /* MewThemeColor.m in Sources */ = {isa = PBXBuildFile; fileRef = 2370546B2B1F3B3200F5DE14 /* MewThemeColor.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 */; };
 		237054BB2B1F3BF600F5DE14 /* MewTabBarController.m in Sources */ = {isa = PBXBuildFile; fileRef = 237054B82B1F3BF600F5DE14 /* MewTabBarController.m */; };
-		237054C62B20265D00F5DE14 /* MewAccountModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 237054C52B20265D00F5DE14 /* MewAccountModel.m */; };
-		237054DB2B204ADE00F5DE14 /* MewUserInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 237054D92B204ADD00F5DE14 /* MewUserInfoModel.m */; };
 		23F1E6912B5A872F004777A2 /* MewUtility+MewDevice.m in Sources */ = {isa = PBXBuildFile; fileRef = 23F1E68B2B5A872E004777A2 /* MewUtility+MewDevice.m */; };
 		23F1E6922B5A872F004777A2 /* MewUtility.m in Sources */ = {isa = PBXBuildFile; fileRef = 23F1E68F2B5A872E004777A2 /* MewUtility.m */; };
 		23F1E6932B5A872F004777A2 /* MewUtility+MewApp.m in Sources */ = {isa = PBXBuildFile; fileRef = 23F1E6902B5A872E004777A2 /* MewUtility+MewApp.m */; };
+		23F1E69C2B5A93FB004777A2 /* MewNetworkDataModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 23F1E69B2B5A93FB004777A2 /* MewNetworkDataModel.m */; };
+		23F1E69E2B5A9463004777A2 /* MewLoginTokenInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 23F1E69D2B5A9463004777A2 /* MewLoginTokenInfoModel.swift */; };
+		23F1E6A22B5A9BAA004777A2 /* MewPersonInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 23F1E6A12B5A9BAA004777A2 /* MewPersonInfoModel.swift */; };
+		23F1E6A42B5ABFE0004777A2 /* MewInitInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 23F1E6A32B5ABFE0004777A2 /* MewInitInfoModel.swift */; };
+		23F1E6A62B5AC155004777A2 /* MewChatMsgItemModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 23F1E6A52B5AC155004777A2 /* MewChatMsgItemModel.swift */; };
+		23F1E6A82B5AC547004777A2 /* MewMineCellInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 23F1E6A72B5AC547004777A2 /* MewMineCellInfoModel.swift */; };
+		23F1E6AA2B5AC639004777A2 /* MewCollectListItemModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 23F1E6A92B5AC639004777A2 /* MewCollectListItemModel.swift */; };
+		23F1E6AC2B5AC7D3004777A2 /* MewPayItemModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 23F1E6AB2B5AC7D3004777A2 /* MewPayItemModel.swift */; };
+		23F1E6AE2B5AC8EC004777A2 /* MewDiamondNum.swift in Sources */ = {isa = PBXBuildFile; fileRef = 23F1E6AD2B5AC8EC004777A2 /* MewDiamondNum.swift */; };
+		23F1E6B02B5AC9AA004777A2 /* MewNIMMsgInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 23F1E6AF2B5AC9AA004777A2 /* MewNIMMsgInfoModel.swift */; };
+		23F1E6B22B5ACAE8004777A2 /* MewAppleInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 23F1E6B12B5ACAE8004777A2 /* MewAppleInfoModel.swift */; };
+		23F1E6B42B5AD383004777A2 /* MewAppColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 23F1E6B32B5AD383004777A2 /* MewAppColor.swift */; };
+		23F1E6BB2B5B5F28004777A2 /* MewGetColorTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 23F1E6BA2B5B5F28004777A2 /* MewGetColorTool.m */; };
 		8C4D535C2AFD4CF700238AE6 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8C4D535B2AFD4CF700238AE6 /* Assets.xcassets */; };
 		8C4D535F2AFD4CF700238AE6 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8C4D535D2AFD4CF700238AE6 /* LaunchScreen.storyboard */; };
 		8C4D53622AFD4CF700238AE6 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C4D53612AFD4CF700238AE6 /* main.m */; };
@@ -125,20 +127,13 @@
 		8C92A8182B0EF3E9008F362C /* MewMineModifPayPwdView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C92A8172B0EF3E9008F362C /* MewMineModifPayPwdView.m */; };
 		8C9C821F2B0C694900A601BC /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C821D2B0C694900A601BC /* AppDelegate.m */; };
 		8C9C82202B0C694900A601BC /* AppDelegate+ThirdConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C821E2B0C694900A601BC /* AppDelegate+ThirdConfig.m */; };
-		8C9C843F2B0C697A00A601BC /* MewFansInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83642B0C697A00A601BC /* MewFansInfoModel.m */; };
-		8C9C84402B0C697A00A601BC /* MewMineSettingItemModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83652B0C697A00A601BC /* MewMineSettingItemModel.m */; };
-		8C9C84412B0C697A00A601BC /* MewMineCollectRoomModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83662B0C697A00A601BC /* MewMineCollectRoomModel.m */; };
-		8C9C84422B0C697A00A601BC /* MewRechargeListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C836A2B0C697A00A601BC /* MewRechargeListModel.m */; };
-		8C9C84432B0C697A00A601BC /* MewWalletInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C836B2B0C697A00A601BC /* MewWalletInfoModel.m */; };
 		8C9C84442B0C697A00A601BC /* MewMineCollectRoomCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83722B0C697A00A601BC /* MewMineCollectRoomCell.m */; };
 		8C9C84452B0C697A00A601BC /* MewMineCollectRoomViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83742B0C697A00A601BC /* MewMineCollectRoomViewController.m */; };
 		8C9C84462B0C697A00A601BC /* MewMineSettingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83772B0C697A00A601BC /* MewMineSettingViewController.m */; };
 		8C9C84472B0C697A00A601BC /* MewMineCollectionTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C837A2B0C697A00A601BC /* MewMineCollectionTableViewCell.m */; };
 		8C9C84482B0C697A00A601BC /* MewMineSettingTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C837B2B0C697A00A601BC /* MewMineSettingTableViewCell.m */; };
 		8C9C84492B0C697A00A601BC /* MewMineAboutUsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C837E2B0C697A00A601BC /* MewMineAboutUsViewController.m */; };
-		8C9C844B2B0C697A00A601BC /* MewAttachmentModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83852B0C697A00A601BC /* MewAttachmentModel.m */; };
 		8C9C844C2B0C697A00A601BC /* MewCustomAttachmentDecoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83882B0C697A00A601BC /* MewCustomAttachmentDecoder.m */; };
-		8C9C84522B0C697A00A601BC /* MewThirdUserInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C839D2B0C697A00A601BC /* MewThirdUserInfo.m */; };
 		8C9C84532B0C697A00A601BC /* MewLoginForgetPasswordViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C839F2B0C697A00A601BC /* MewLoginForgetPasswordViewController.m */; };
 		8C9C84542B0C697A00A601BC /* MewLoginInputView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83A32B0C697A00A601BC /* MewLoginInputView.m */; };
 		8C9C84552B0C697A00A601BC /* MewLoginForgetEditView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83A62B0C697A00A601BC /* MewLoginForgetEditView.m */; };
@@ -152,17 +147,14 @@
 
 /* Begin PBXFileReference section */
 		1797344FB85F47F60D0CC2A0 /* Pods_yinmeng_ios.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_yinmeng_ios.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		230D62EA2B5540C500DADC14 /* MewAppColor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MewAppColor.swift; sourceTree = "<group>"; };
 		230D62F02B55463500DADC14 /* R.generated.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = R.generated.swift; sourceTree = SOURCE_ROOT; };
 		230D62F52B554F5E00DADC14 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		230D63152B55567300DADC14 /* MewPrefixHeader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MewPrefixHeader.h; sourceTree = "<group>"; };
 		230D63172B557DE700DADC14 /* MewServerApi.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MewServerApi.swift; sourceTree = "<group>"; };
 		230D631D2B5585AE00DADC14 /* MewEncryptManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MewEncryptManager.h; sourceTree = "<group>"; };
 		230D631E2B5585AE00DADC14 /* MewEncryptManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MewEncryptManager.m; sourceTree = "<group>"; };
-		230D63202B558B8800DADC14 /* MewBaseMapModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MewBaseMapModel.swift; sourceTree = "<group>"; };
 		230D63242B55955900DADC14 /* MewDevice.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MewDevice.swift; sourceTree = "<group>"; };
 		230D63262B55989400DADC14 /* MewProvideManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MewProvideManager.swift; sourceTree = "<group>"; };
-		230D633E2B58C8B100DADC14 /* MewBaseModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewBaseModel.m; sourceTree = "<group>"; };
 		230D63402B58F75F00DADC14 /* mew_launch_logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = mew_launch_logo.png; sourceTree = "<group>"; };
 		230D63672B58FB8F00DADC14 /* MewServerApiManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MewServerApiManager.swift; sourceTree = "<group>"; };
 		230D63682B58FB8F00DADC14 /* MewRoomPlayVC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MewRoomPlayVC.swift; sourceTree = "<group>"; };
@@ -197,8 +189,6 @@
 		230D63A92B59273D00DADC14 /* MewMainHomeMenuDataModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewMainHomeMenuDataModel.h; sourceTree = "<group>"; };
 		230D63AB2B59289900DADC14 /* MewMainHomeMoreGameHeadCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewMainHomeMoreGameHeadCell.m; sourceTree = "<group>"; };
 		230D63AC2B59289900DADC14 /* MewMainHomeMoreGameHeadCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewMainHomeMoreGameHeadCell.h; sourceTree = "<group>"; };
-		230D63AE2B59290700DADC14 /* MewMainHomeHotRoomModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewMainHomeHotRoomModel.m; sourceTree = "<group>"; };
-		230D63AF2B59290700DADC14 /* MewMainHomeHotRoomModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewMainHomeHotRoomModel.h; sourceTree = "<group>"; };
 		230D63B12B59293A00DADC14 /* MewMainHomeBannerInfoModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewMainHomeBannerInfoModel.m; sourceTree = "<group>"; };
 		230D63B22B59293B00DADC14 /* MewMainHomeBannerInfoModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewMainHomeBannerInfoModel.h; sourceTree = "<group>"; };
 		230D63B92B592D0C00DADC14 /* MewMainHomeMakeFriendModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewMainHomeMakeFriendModel.m; sourceTree = "<group>"; };
@@ -217,10 +207,6 @@
 		23270C282B0E037300B9303B /* MewMessageConentAudioView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewMessageConentAudioView.h; sourceTree = "<group>"; };
 		23270C2A2B0E041300B9303B /* MewMessageAudioCenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewMessageAudioCenter.h; sourceTree = "<group>"; };
 		23270C2B2B0E041300B9303B /* MewMessageAudioCenter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewMessageAudioCenter.m; sourceTree = "<group>"; };
-		2337572B2B0CB577001D0B7F /* MewChatLimitModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewChatLimitModel.h; sourceTree = "<group>"; };
-		2337572C2B0CB577001D0B7F /* MewMessageMenuModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewMessageMenuModel.m; sourceTree = "<group>"; };
-		2337572D2B0CB577001D0B7F /* MewChatLimitModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewChatLimitModel.m; sourceTree = "<group>"; };
-		2337572E2B0CB577001D0B7F /* MewMessageMenuModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewMessageMenuModel.h; sourceTree = "<group>"; };
 		233757312B0CB577001D0B7F /* MewNIMBadgeView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewNIMBadgeView.m; sourceTree = "<group>"; };
 		233757332B0CB577001D0B7F /* UIView+NIM.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+NIM.h"; sourceTree = "<group>"; };
 		233757352B0CB577001D0B7F /* MewNIMBadgeView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewNIMBadgeView.h; sourceTree = "<group>"; };
@@ -252,8 +238,6 @@
 		233757552B0CB577001D0B7F /* MewNIMMessageUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewNIMMessageUtils.h; sourceTree = "<group>"; };
 		237053122B1F3A3D00F5DE14 /* MewClientConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewClientConfig.h; sourceTree = "<group>"; };
 		237053132B1F3A3D00F5DE14 /* MewClientConfig.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewClientConfig.m; sourceTree = "<group>"; };
-		237053182B1F3A5D00F5DE14 /* MewClientDataModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewClientDataModel.h; sourceTree = "<group>"; };
-		237053192B1F3A5D00F5DE14 /* MewClientDataModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewClientDataModel.m; sourceTree = "<group>"; };
 		2370531B2B1F3A6E00F5DE14 /* MewWebViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewWebViewController.m; sourceTree = "<group>"; };
 		2370531C2B1F3A6E00F5DE14 /* MewWebViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewWebViewController.h; sourceTree = "<group>"; };
 		237053332B1F3AA000F5DE14 /* MewRechargeViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewRechargeViewController.m; sourceTree = "<group>"; };
@@ -299,9 +283,6 @@
 		2370537D2B1F3AA100F5DE14 /* MewRightFollowVoiceCollectionCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewRightFollowVoiceCollectionCell.m; sourceTree = "<group>"; };
 		2370537E2B1F3AA100F5DE14 /* MewPlayVoiceView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewPlayVoiceView.h; sourceTree = "<group>"; };
 		237053EB2B1F3B1600F5DE14 /* MewMacro.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewMacro.h; sourceTree = "<group>"; };
-		237053EC2B1F3B1600F5DE14 /* MewHtmlUrl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewHtmlUrl.h; sourceTree = "<group>"; };
-		237053ED2B1F3B1600F5DE14 /* MewEnum.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewEnum.h; sourceTree = "<group>"; };
-		237053EE2B1F3B1600F5DE14 /* MewHtmlUrl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewHtmlUrl.m; sourceTree = "<group>"; };
 		237053EF2B1F3B1600F5DE14 /* MewConstant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewConstant.m; sourceTree = "<group>"; };
 		237053F02B1F3B1700F5DE14 /* MewConstant.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewConstant.h; sourceTree = "<group>"; };
 		237053F52B1F3B3200F5DE14 /* UIView+MewFilletCorner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+MewFilletCorner.h"; sourceTree = "<group>"; };
@@ -328,8 +309,6 @@
 		2370545E2B1F3B3200F5DE14 /* MEWBase64.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MEWBase64.m; sourceTree = "<group>"; };
 		2370545F2B1F3B3200F5DE14 /* MewHUDTool.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewHUDTool.m; sourceTree = "<group>"; };
 		237054662B1F3B3200F5DE14 /* NSObject+MEWExtension.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSObject+MEWExtension.h"; sourceTree = "<group>"; };
-		2370546B2B1F3B3200F5DE14 /* MewThemeColor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewThemeColor.m; sourceTree = "<group>"; };
-		2370546C2B1F3B3200F5DE14 /* MewThemeColor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewThemeColor.h; sourceTree = "<group>"; };
 		237054712B1F3B3200F5DE14 /* YYReachability.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YYReachability.h; sourceTree = "<group>"; };
 		237054722B1F3B3200F5DE14 /* YYReachability.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YYReachability.m; sourceTree = "<group>"; };
 		237054732B1F3B3200F5DE14 /* MewHUDTool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewHUDTool.h; sourceTree = "<group>"; };
@@ -338,17 +317,28 @@
 		237054772B1F3B3200F5DE14 /* MewPaymentAction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MewPaymentAction.swift; sourceTree = "<group>"; };
 		237054B82B1F3BF600F5DE14 /* MewTabBarController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewTabBarController.m; sourceTree = "<group>"; };
 		237054B92B1F3BF600F5DE14 /* MewTabBarController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewTabBarController.h; sourceTree = "<group>"; };
-		237054C42B20265D00F5DE14 /* MewAccountModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MewAccountModel.h; sourceTree = "<group>"; };
-		237054C52B20265D00F5DE14 /* MewAccountModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MewAccountModel.m; sourceTree = "<group>"; };
-		237054C72B2027E000F5DE14 /* MewBaseModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MewBaseModel.h; sourceTree = "<group>"; };
-		237054D92B204ADD00F5DE14 /* MewUserInfoModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewUserInfoModel.m; sourceTree = "<group>"; };
-		237054DA2B204ADD00F5DE14 /* MewUserInfoModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewUserInfoModel.h; sourceTree = "<group>"; };
 		23F1E68B2B5A872E004777A2 /* MewUtility+MewDevice.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "MewUtility+MewDevice.m"; sourceTree = "<group>"; };
 		23F1E68C2B5A872E004777A2 /* MewUtility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewUtility.h; sourceTree = "<group>"; };
 		23F1E68D2B5A872E004777A2 /* MewUtility+MewApp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MewUtility+MewApp.h"; sourceTree = "<group>"; };
 		23F1E68E2B5A872E004777A2 /* MewUtility+MewDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MewUtility+MewDevice.h"; sourceTree = "<group>"; };
 		23F1E68F2B5A872E004777A2 /* MewUtility.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewUtility.m; sourceTree = "<group>"; };
 		23F1E6902B5A872E004777A2 /* MewUtility+MewApp.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "MewUtility+MewApp.m"; sourceTree = "<group>"; };
+		23F1E69A2B5A93FB004777A2 /* MewNetworkDataModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MewNetworkDataModel.h; sourceTree = "<group>"; };
+		23F1E69B2B5A93FB004777A2 /* MewNetworkDataModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MewNetworkDataModel.m; sourceTree = "<group>"; };
+		23F1E69D2B5A9463004777A2 /* MewLoginTokenInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MewLoginTokenInfoModel.swift; sourceTree = "<group>"; };
+		23F1E6A12B5A9BAA004777A2 /* MewPersonInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MewPersonInfoModel.swift; sourceTree = "<group>"; };
+		23F1E6A32B5ABFE0004777A2 /* MewInitInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MewInitInfoModel.swift; sourceTree = "<group>"; };
+		23F1E6A52B5AC155004777A2 /* MewChatMsgItemModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MewChatMsgItemModel.swift; sourceTree = "<group>"; };
+		23F1E6A72B5AC547004777A2 /* MewMineCellInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MewMineCellInfoModel.swift; sourceTree = "<group>"; };
+		23F1E6A92B5AC639004777A2 /* MewCollectListItemModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MewCollectListItemModel.swift; sourceTree = "<group>"; };
+		23F1E6AB2B5AC7D3004777A2 /* MewPayItemModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MewPayItemModel.swift; sourceTree = "<group>"; };
+		23F1E6AD2B5AC8EC004777A2 /* MewDiamondNum.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MewDiamondNum.swift; sourceTree = "<group>"; };
+		23F1E6AF2B5AC9AA004777A2 /* MewNIMMsgInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MewNIMMsgInfoModel.swift; sourceTree = "<group>"; };
+		23F1E6B12B5ACAE8004777A2 /* MewAppleInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MewAppleInfoModel.swift; sourceTree = "<group>"; };
+		23F1E6B32B5AD383004777A2 /* MewAppColor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MewAppColor.swift; sourceTree = "<group>"; };
+		23F1E6B62B5B5DCD004777A2 /* MewBaseEnumType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MewBaseEnumType.h; sourceTree = "<group>"; };
+		23F1E6B92B5B5F28004777A2 /* MewGetColorTool.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MewGetColorTool.h; sourceTree = "<group>"; };
+		23F1E6BA2B5B5F28004777A2 /* MewGetColorTool.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MewGetColorTool.m; sourceTree = "<group>"; };
 		8C4D534C2AFD4CF600238AE6 /* yinmeng-ios.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "yinmeng-ios.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		8C4D535B2AFD4CF700238AE6 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		8C4D535E2AFD4CF700238AE6 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
@@ -364,16 +354,6 @@
 		8C9C821C2B0C694900A601BC /* AppDelegate+ThirdConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "AppDelegate+ThirdConfig.h"; sourceTree = "<group>"; };
 		8C9C821D2B0C694900A601BC /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
 		8C9C821E2B0C694900A601BC /* AppDelegate+ThirdConfig.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "AppDelegate+ThirdConfig.m"; sourceTree = "<group>"; };
-		8C9C83632B0C697A00A601BC /* MewFansInfoModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewFansInfoModel.h; sourceTree = "<group>"; };
-		8C9C83642B0C697A00A601BC /* MewFansInfoModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewFansInfoModel.m; sourceTree = "<group>"; };
-		8C9C83652B0C697A00A601BC /* MewMineSettingItemModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewMineSettingItemModel.m; sourceTree = "<group>"; };
-		8C9C83662B0C697A00A601BC /* MewMineCollectRoomModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewMineCollectRoomModel.m; sourceTree = "<group>"; };
-		8C9C83682B0C697A00A601BC /* MewRechargeListModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewRechargeListModel.h; sourceTree = "<group>"; };
-		8C9C83692B0C697A00A601BC /* MewWalletInfoModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewWalletInfoModel.h; sourceTree = "<group>"; };
-		8C9C836A2B0C697A00A601BC /* MewRechargeListModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewRechargeListModel.m; sourceTree = "<group>"; };
-		8C9C836B2B0C697A00A601BC /* MewWalletInfoModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewWalletInfoModel.m; sourceTree = "<group>"; };
-		8C9C836C2B0C697A00A601BC /* MewMineSettingItemModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewMineSettingItemModel.h; sourceTree = "<group>"; };
-		8C9C836D2B0C697A00A601BC /* MewMineCollectRoomModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewMineCollectRoomModel.h; sourceTree = "<group>"; };
 		8C9C83702B0C697A00A601BC /* MewMineCollectRoomViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewMineCollectRoomViewController.h; sourceTree = "<group>"; };
 		8C9C83722B0C697A00A601BC /* MewMineCollectRoomCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewMineCollectRoomCell.m; sourceTree = "<group>"; };
 		8C9C83732B0C697A00A601BC /* MewMineCollectRoomCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewMineCollectRoomCell.h; sourceTree = "<group>"; };
@@ -386,12 +366,8 @@
 		8C9C837C2B0C697A00A601BC /* MewMineCollectionTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewMineCollectionTableViewCell.h; sourceTree = "<group>"; };
 		8C9C837D2B0C697A00A601BC /* MewMineSettingViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewMineSettingViewController.h; sourceTree = "<group>"; };
 		8C9C837E2B0C697A00A601BC /* MewMineAboutUsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewMineAboutUsViewController.m; sourceTree = "<group>"; };
-		8C9C83842B0C697A00A601BC /* MewAttachmentModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewAttachmentModel.h; sourceTree = "<group>"; };
-		8C9C83852B0C697A00A601BC /* MewAttachmentModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewAttachmentModel.m; sourceTree = "<group>"; };
 		8C9C83872B0C697A00A601BC /* MewCustomAttachmentDecoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewCustomAttachmentDecoder.h; sourceTree = "<group>"; };
 		8C9C83882B0C697A00A601BC /* MewCustomAttachmentDecoder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewCustomAttachmentDecoder.m; sourceTree = "<group>"; };
-		8C9C839C2B0C697A00A601BC /* MewThirdUserInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewThirdUserInfo.h; sourceTree = "<group>"; };
-		8C9C839D2B0C697A00A601BC /* MewThirdUserInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewThirdUserInfo.m; sourceTree = "<group>"; };
 		8C9C839F2B0C697A00A601BC /* MewLoginForgetPasswordViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewLoginForgetPasswordViewController.m; sourceTree = "<group>"; };
 		8C9C83A02B0C697A00A601BC /* MewLoginFullInfoViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewLoginFullInfoViewController.h; sourceTree = "<group>"; };
 		8C9C83A12B0C697A00A601BC /* MewLoginForgetPasswordViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewLoginForgetPasswordViewController.h; sourceTree = "<group>"; };
@@ -425,14 +401,6 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		230D62E92B5540AA00DADC14 /* Swift */ = {
-			isa = PBXGroup;
-			children = (
-				230D62EA2B5540C500DADC14 /* MewAppColor.swift */,
-			);
-			path = Swift;
-			sourceTree = "<group>";
-		};
 		230D63162B557DBD00DADC14 /* MewApi */ = {
 			isa = PBXGroup;
 			children = (
@@ -456,6 +424,7 @@
 		230D63482B58FB6D00DADC14 /* Swift */ = {
 			isa = PBXGroup;
 			children = (
+				23F1E6B32B5AD383004777A2 /* MewAppColor.swift */,
 				230D63492B58FB6D00DADC14 /* MewRoomPlay */,
 			);
 			path = Swift;
@@ -523,26 +492,24 @@
 		230D63952B59268E00DADC14 /* Game */ = {
 			isa = PBXGroup;
 			children = (
-				230D63962B5926B400DADC14 /* MewMainHomeMoreGameVC.h */,
+				230D63B22B59293B00DADC14 /* MewMainHomeBannerInfoModel.h */,
-				230D63972B5926B400DADC14 /* MewMainHomeMoreGameVC.m */,
+				230D63B12B59293A00DADC14 /* MewMainHomeBannerInfoModel.m */,
+				230D639C2B5926D700DADC14 /* MewMainHomeEmptyCell.h */,
+				230D639D2B5926D800DADC14 /* MewMainHomeEmptyCell.m */,
+				230D63BF2B5931E800DADC14 /* MewMainHomeGameTabModel.h */,
+				230D63C02B5931E800DADC14 /* MewMainHomeGameTabModel.m */,
+				230D63BA2B592D0D00DADC14 /* MewMainHomeMakeFriendModel.h */,
+				230D63B92B592D0C00DADC14 /* MewMainHomeMakeFriendModel.m */,
 				230D63A92B59273D00DADC14 /* MewMainHomeMenuDataModel.h */,
 				230D63A82B59273D00DADC14 /* MewMainHomeMenuDataModel.m */,
 				230D63992B5926C700DADC14 /* MewMainHomeMoreGameCell.h */,
 				230D639A2B5926C700DADC14 /* MewMainHomeMoreGameCell.m */,
-				230D639C2B5926D700DADC14 /* MewMainHomeEmptyCell.h */,
-				230D639D2B5926D800DADC14 /* MewMainHomeEmptyCell.m */,
-				230D63A02B5926FB00DADC14 /* MewMainHomeMoreGameHeadView.h */,
-				230D639F2B5926FB00DADC14 /* MewMainHomeMoreGameHeadView.m */,
 				230D63AC2B59289900DADC14 /* MewMainHomeMoreGameHeadCell.h */,
 				230D63AB2B59289900DADC14 /* MewMainHomeMoreGameHeadCell.m */,
-				230D63AF2B59290700DADC14 /* MewMainHomeHotRoomModel.h */,
+				230D63A02B5926FB00DADC14 /* MewMainHomeMoreGameHeadView.h */,
-				230D63BF2B5931E800DADC14 /* MewMainHomeGameTabModel.h */,
+				230D639F2B5926FB00DADC14 /* MewMainHomeMoreGameHeadView.m */,
-				230D63C02B5931E800DADC14 /* MewMainHomeGameTabModel.m */,
+				230D63962B5926B400DADC14 /* MewMainHomeMoreGameVC.h */,
-				230D63AE2B59290700DADC14 /* MewMainHomeHotRoomModel.m */,
+				230D63972B5926B400DADC14 /* MewMainHomeMoreGameVC.m */,
-				230D63B22B59293B00DADC14 /* MewMainHomeBannerInfoModel.h */,
-				230D63B12B59293A00DADC14 /* MewMainHomeBannerInfoModel.m */,
-				230D63BA2B592D0D00DADC14 /* MewMainHomeMakeFriendModel.h */,
-				230D63B92B592D0C00DADC14 /* MewMainHomeMakeFriendModel.m */,
 				230D63BC2B592EA800DADC14 /* UserGameInfoVo.h */,
 				230D63BD2B592EA800DADC14 /* UserGameInfoVo.m */,
 			);
@@ -561,7 +528,6 @@
 		233757242B0CB577001D0B7F /* Message */ = {
 			isa = PBXGroup;
 			children = (
-				233757252B0CB577001D0B7F /* Presenter */,
 				2337572A2B0CB577001D0B7F /* Model */,
 				2337572F2B0CB577001D0B7F /* View */,
 				233757532B0CB577001D0B7F /* Tool */,
@@ -569,20 +535,10 @@
 			path = Message;
 			sourceTree = "<group>";
 		};
-		233757252B0CB577001D0B7F /* Presenter */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = Presenter;
-			sourceTree = "<group>";
-		};
 		2337572A2B0CB577001D0B7F /* Model */ = {
 			isa = PBXGroup;
 			children = (
-				2337572B2B0CB577001D0B7F /* MewChatLimitModel.h */,
+				23F1E6A52B5AC155004777A2 /* MewChatMsgItemModel.swift */,
-				2337572D2B0CB577001D0B7F /* MewChatLimitModel.m */,
-				2337572E2B0CB577001D0B7F /* MewMessageMenuModel.h */,
-				2337572C2B0CB577001D0B7F /* MewMessageMenuModel.m */,
 			);
 			path = Model;
 			sourceTree = "<group>";
@@ -749,6 +705,8 @@
 				237054252B1F3B3200F5DE14 /* MewStackManager.h */,
 				237053F92B1F3B3200F5DE14 /* MewStackManager.m */,
 				237053F42B1F3B3200F5DE14 /* UIImage */,
+				23F1E6B92B5B5F28004777A2 /* MewGetColorTool.h */,
+				23F1E6BA2B5B5F28004777A2 /* MewGetColorTool.m */,
 			);
 			path = UI;
 			sourceTree = "<group>";
@@ -784,13 +742,10 @@
 		2370542D2B1F3B3200F5DE14 /* Model */ = {
 			isa = PBXGroup;
 			children = (
-				237054C42B20265D00F5DE14 /* MewAccountModel.h */,
+				23F1E69D2B5A9463004777A2 /* MewLoginTokenInfoModel.swift */,
-				237054C52B20265D00F5DE14 /* MewAccountModel.m */,
+				23F1E69A2B5A93FB004777A2 /* MewNetworkDataModel.h */,
-				237054C72B2027E000F5DE14 /* MewBaseModel.h */,
+				23F1E69B2B5A93FB004777A2 /* MewNetworkDataModel.m */,
-				230D633E2B58C8B100DADC14 /* MewBaseModel.m */,
+				23F1E6A12B5A9BAA004777A2 /* MewPersonInfoModel.swift */,
-				237054DA2B204ADD00F5DE14 /* MewUserInfoModel.h */,
-				237054D92B204ADD00F5DE14 /* MewUserInfoModel.m */,
-				230D63202B558B8800DADC14 /* MewBaseMapModel.swift */,
 			);
 			path = Model;
 			sourceTree = "<group>";
@@ -807,7 +762,6 @@
 				237054742B1F3B3200F5DE14 /* NSObject+MEWExtension.m */,
 				237054702B1F3B3200F5DE14 /* Reachability */,
 				2370545A2B1F3B3200F5DE14 /* Security */,
-				2370546A2B1F3B3200F5DE14 /* ThemeColor */,
 				23F1E68A2B5A872E004777A2 /* YYUtility */,
 				237054572B1F3B3200F5DE14 /* TimeInterval */,
 				237054492B1F3B3200F5DE14 /* UIImage */,
@@ -853,16 +807,6 @@
 			path = Security;
 			sourceTree = "<group>";
 		};
-		2370546A2B1F3B3200F5DE14 /* ThemeColor */ = {
-			isa = PBXGroup;
-			children = (
-				230D62E92B5540AA00DADC14 /* Swift */,
-				2370546B2B1F3B3200F5DE14 /* MewThemeColor.m */,
-				2370546C2B1F3B3200F5DE14 /* MewThemeColor.h */,
-			);
-			path = ThemeColor;
-			sourceTree = "<group>";
-		};
 		237054702B1F3B3200F5DE14 /* Reachability */ = {
 			isa = PBXGroup;
 			children = (
@@ -1001,9 +945,7 @@
 			children = (
 				237053F02B1F3B1700F5DE14 /* MewConstant.h */,
 				237053EF2B1F3B1600F5DE14 /* MewConstant.m */,
-				237053ED2B1F3B1600F5DE14 /* MewEnum.h */,
+				23F1E6B62B5B5DCD004777A2 /* MewBaseEnumType.h */,
-				237053EC2B1F3B1600F5DE14 /* MewHtmlUrl.h */,
-				237053EE2B1F3B1600F5DE14 /* MewHtmlUrl.m */,
 				237053EB2B1F3B1600F5DE14 /* MewMacro.h */,
 			);
 			path = Global;
@@ -1036,32 +978,18 @@
 		8C9C83612B0C697A00A601BC /* Model */ = {
 			isa = PBXGroup;
 			children = (
-				8C9C83622B0C697A00A601BC /* Friend */,
+				23F1E6A72B5AC547004777A2 /* MewMineCellInfoModel.swift */,
-				8C9C836C2B0C697A00A601BC /* MewMineSettingItemModel.h */,
+				23F1E6A92B5AC639004777A2 /* MewCollectListItemModel.swift */,
-				8C9C83652B0C697A00A601BC /* MewMineSettingItemModel.m */,
-				8C9C836D2B0C697A00A601BC /* MewMineCollectRoomModel.h */,
-				8C9C83662B0C697A00A601BC /* MewMineCollectRoomModel.m */,
 				8C9C83672B0C697A00A601BC /* Recharge */,
 			);
 			path = Model;
 			sourceTree = "<group>";
 		};
-		8C9C83622B0C697A00A601BC /* Friend */ = {
-			isa = PBXGroup;
-			children = (
-				8C9C83632B0C697A00A601BC /* MewFansInfoModel.h */,
-				8C9C83642B0C697A00A601BC /* MewFansInfoModel.m */,
-			);
-			path = Friend;
-			sourceTree = "<group>";
-		};
 		8C9C83672B0C697A00A601BC /* Recharge */ = {
 			isa = PBXGroup;
 			children = (
-				8C9C83682B0C697A00A601BC /* MewRechargeListModel.h */,
+				23F1E6AB2B5AC7D3004777A2 /* MewPayItemModel.swift */,
-				8C9C836A2B0C697A00A601BC /* MewRechargeListModel.m */,
+				23F1E6AD2B5AC8EC004777A2 /* MewDiamondNum.swift */,
-				8C9C83692B0C697A00A601BC /* MewWalletInfoModel.h */,
-				8C9C836B2B0C697A00A601BC /* MewWalletInfoModel.m */,
 			);
 			path = Recharge;
 			sourceTree = "<group>";
@@ -1131,8 +1059,7 @@
 		8C9C83832B0C697A00A601BC /* Model */ = {
 			isa = PBXGroup;
 			children = (
-				8C9C83842B0C697A00A601BC /* MewAttachmentModel.h */,
+				23F1E6AF2B5AC9AA004777A2 /* MewNIMMsgInfoModel.swift */,
-				8C9C83852B0C697A00A601BC /* MewAttachmentModel.m */,
 			);
 			path = Model;
 			sourceTree = "<group>";
@@ -1158,8 +1085,7 @@
 		8C9C839B2B0C697A00A601BC /* Model */ = {
 			isa = PBXGroup;
 			children = (
-				8C9C839C2B0C697A00A601BC /* MewThirdUserInfo.h */,
+				23F1E6B12B5ACAE8004777A2 /* MewAppleInfoModel.swift */,
-				8C9C839D2B0C697A00A601BC /* MewThirdUserInfo.m */,
 			);
 			path = Model;
 			sourceTree = "<group>";
@@ -1213,8 +1139,7 @@
 		8C9C83B92B0C697A00A601BC /* Model */ = {
 			isa = PBXGroup;
 			children = (
-				237053182B1F3A5D00F5DE14 /* MewClientDataModel.h */,
+				23F1E6A32B5ABFE0004777A2 /* MewInitInfoModel.swift */,
-				237053192B1F3A5D00F5DE14 /* MewClientDataModel.m */,
 			);
 			path = Model;
 			sourceTree = "<group>";
@@ -1419,14 +1344,15 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				23F1E6AE2B5AC8EC004777A2 /* MewDiamondNum.swift in Sources */,
 				8C9C84482B0C697A00A601BC /* MewMineSettingTableViewCell.m in Sources */,
 				233757682B0CB577001D0B7F /* MewNIMMessageUtils.m in Sources */,
 				237053982B1F3AA100F5DE14 /* MewAudioPlayerManager.m in Sources */,
 				230D63C12B5931E800DADC14 /* MewMainHomeGameTabModel.m in Sources */,
+				23F1E6A22B5A9BAA004777A2 /* MewPersonInfoModel.swift in Sources */,
 				2337575C2B0CB577001D0B7F /* MewSessionMessageCell.m in Sources */,
 				8C9C821F2B0C694900A601BC /* AppDelegate.m in Sources */,
 				8C92A8182B0EF3E9008F362C /* MewMineModifPayPwdView.m in Sources */,
-				237053F12B1F3B1700F5DE14 /* MewHtmlUrl.m in Sources */,
 				2370547F2B1F3B3200F5DE14 /* UIView+MewFilletCorner.m in Sources */,
 				8C9C84462B0C697A00A601BC /* MewMineSettingViewController.m in Sources */,
 				237054882B1F3B3200F5DE14 /* MewEmptyTableViewCell.m in Sources */,
@@ -1434,21 +1360,23 @@
 				230D63252B55955900DADC14 /* MewDevice.swift in Sources */,
 				230D63C42B59813D00DADC14 /* UIButton+MewSetButtomArea.m in Sources */,
 				230D63922B5902D600DADC14 /* MewGiftDataModel.swift in Sources */,
+				23F1E6A62B5AC155004777A2 /* MewChatMsgItemModel.swift in Sources */,
 				2370531D2B1F3A6E00F5DE14 /* MewWebViewController.m in Sources */,
 				2370539C2B1F3AA100F5DE14 /* MewVoiceDiscView.m in Sources */,
 				23270C292B0E037300B9303B /* MewMessageConentAudioView.m in Sources */,
 				230D63792B58FB8F00DADC14 /* MewRoomMicSeatView.swift in Sources */,
+				23F1E6AA2B5AC639004777A2 /* MewCollectListItemModel.swift in Sources */,
+				23F1E6B02B5AC9AA004777A2 /* MewNIMMsgInfoModel.swift in Sources */,
 				237053902B1F3AA100F5DE14 /* MewSessionListViewController.m in Sources */,
 				23F1E6912B5A872F004777A2 /* MewUtility+MewDevice.m in Sources */,
 				230D62F12B55463500DADC14 /* R.generated.swift in Sources */,
 				237054A72B1F3B3200F5DE14 /* MewHUDTool.m in Sources */,
 				237053F22B1F3B1700F5DE14 /* MewConstant.m in Sources */,
+				23F1E6B22B5ACAE8004777A2 /* MewAppleInfoModel.swift in Sources */,
 				237054AD2B1F3B3200F5DE14 /* YYReachability.m in Sources */,
 				230D63CB2B5A0A5B00DADC14 /* MewOCServerManager.m in Sources */,
-				237054DB2B204ADE00F5DE14 /* MewUserInfoModel.m in Sources */,
 				230D63752B58FB8F00DADC14 /* MewRoomPlayVC.swift in Sources */,
 				237054812B1F3B3200F5DE14 /* MewStackManager.m in Sources */,
-				8C9C84432B0C697A00A601BC /* MewWalletInfoModel.m in Sources */,
 				8C9C84552B0C697A00A601BC /* MewLoginForgetEditView.m in Sources */,
 				8C9C84542B0C697A00A601BC /* MewLoginInputView.m in Sources */,
 				233757632B0CB577001D0B7F /* MewMessageContentUnSupportView.m in Sources */,
@@ -1456,57 +1384,53 @@
 				230D63B32B59293B00DADC14 /* MewMainHomeBannerInfoModel.m in Sources */,
 				233757622B0CB577001D0B7F /* MewMessageContentImage.m in Sources */,
 				230D63802B58FBD500DADC14 /* MewRoomPlayModel.swift in Sources */,
-				230D62EB2B5540C500DADC14 /* MewAppColor.swift in Sources */,
 				8C9C84532B0C697A00A601BC /* MewLoginForgetPasswordViewController.m in Sources */,
 				237054BB2B1F3BF600F5DE14 /* MewTabBarController.m in Sources */,
 				237053882B1F3AA100F5DE14 /* MewRechargeViewController.m in Sources */,
 				2370539E2B1F3AA100F5DE14 /* MewPlayVoiceView.m in Sources */,
 				2337575B2B0CB577001D0B7F /* UIView+NIM.m in Sources */,
-				8C9C843F2B0C697A00A601BC /* MewFansInfoModel.m in Sources */,
 				233757652B0CB577001D0B7F /* MewSessionNavView.m in Sources */,
 				8CAB97012B1FE16000ED8639 /* UITableView+NIMScrollToBottom.m in Sources */,
 				233757592B0CB577001D0B7F /* MewNIMBadgeView.m in Sources */,
 				237054A42B1F3B3200F5DE14 /* MewTimeIntervalUtils.m in Sources */,
 				230D639E2B5926D800DADC14 /* MewMainHomeEmptyCell.m in Sources */,
 				230D637A2B58FB8F00DADC14 /* MewRoomMsgView.swift in Sources */,
+				23F1E6B42B5AD383004777A2 /* MewAppColor.swift in Sources */,
 				237053892B1F3AA100F5DE14 /* MewMineCollectionViewController.m in Sources */,
 				230D638C2B59010C00DADC14 /* MewMicListModel.swift in Sources */,
 				23270C2C2B0E041300B9303B /* MewMessageAudioCenter.m in Sources */,
 				8C9C84442B0C697A00A601BC /* MewMineCollectRoomCell.m in Sources */,
 				237053A32B1F3AA100F5DE14 /* MewRightFollowVoiceCollectionCell.m in Sources */,
-				8C9C84402B0C697A00A601BC /* MewMineSettingItemModel.m in Sources */,
 				237054AE2B1F3B3200F5DE14 /* NSObject+MEWExtension.m in Sources */,
 				2370538C2B1F3AA100F5DE14 /* MewLoginPasswordView.m in Sources */,
 				237053992B1F3AA100F5DE14 /* MewHomeViewController.m in Sources */,
 				23F1E6922B5A872F004777A2 /* MewUtility.m in Sources */,
 				23F1E6932B5A872F004777A2 /* MewUtility+MewApp.m in Sources */,
-				230D63B02B59290700DADC14 /* MewMainHomeHotRoomModel.m in Sources */,
 				8C4D53622AFD4CF700238AE6 /* main.m in Sources */,
 				233757642B0CB577001D0B7F /* MewMessageContentText.m in Sources */,
 				230D63BE2B592EA800DADC14 /* UserGameInfoVo.m in Sources */,
 				2370538D2B1F3AA100F5DE14 /* MewLoginNumberViewController.m in Sources */,
 				237054A62B1F3B3200F5DE14 /* MEWBase64.m in Sources */,
 				230D637E2B58FB8F00DADC14 /* MewRoomPlayTopView.swift in Sources */,
-				233757582B0CB577001D0B7F /* MewChatLimitModel.m in Sources */,
+				23F1E6BB2B5B5F28004777A2 /* MewGetColorTool.m in Sources */,
 				2370539A2B1F3AA100F5DE14 /* MewVoiceGuideView.m in Sources */,
 				8C9C84492B0C697A00A601BC /* MewMineAboutUsViewController.m in Sources */,
-				230D63212B558B8800DADC14 /* MewBaseMapModel.swift in Sources */,
+				23F1E69E2B5A9463004777A2 /* MewLoginTokenInfoModel.swift in Sources */,
 				237054AF2B1F3B3200F5DE14 /* MewPaymentAction.swift in Sources */,
 				8C9C844C2B0C697A00A601BC /* MewCustomAttachmentDecoder.m in Sources */,
 				2370538B2B1F3AA100F5DE14 /* MewLoginPhoneView.m in Sources */,
+				23F1E6A82B5AC547004777A2 /* MewMineCellInfoModel.swift in Sources */,
 				237054A32B1F3B3200F5DE14 /* MEWCountDownHelper.m in Sources */,
 				230D631F2B5585AE00DADC14 /* MewEncryptManager.m in Sources */,
 				230D63832B58FCBC00DADC14 /* MewMsgDataModel.m in Sources */,
 				230D639B2B5926C800DADC14 /* MewMainHomeMoreGameCell.m in Sources */,
 				2370538F2B1F3AA100F5DE14 /* MewSessionListTableViewCell.m in Sources */,
-				237054C62B20265D00F5DE14 /* MewAccountModel.m in Sources */,
 				2337575D2B0CB577001D0B7F /* MewSessionToolbarView.m in Sources */,
 				233757612B0CB577001D0B7F /* MewMessageToolMenuCollectionCell.m in Sources */,
 				2370539F2B1F3AA100F5DE14 /* MewRightFollowVoiceView.m in Sources */,
 				230D63AD2B59289A00DADC14 /* MewMainHomeMoreGameHeadCell.m in Sources */,
 				233757662B0CB577001D0B7F /* MewSessionAudioRecordView.m in Sources */,
 				230D63772B58FB8F00DADC14 /* MewRoomMsgHeadView.swift in Sources */,
-				8C9C84422B0C697A00A601BC /* MewRechargeListModel.m in Sources */,
 				230D63882B58FE7400DADC14 /* MewMsgExtDataModel.swift in Sources */,
 				230D63782B58FB8F00DADC14 /* MewRoomMsgCell.swift in Sources */,
 				230D63742B58FB8F00DADC14 /* MewServerApiManager.swift in Sources */,
@@ -1519,19 +1443,16 @@
 				230D638E2B59018700DADC14 /* MewMicExtDataModel.swift in Sources */,
 				230D637D2B58FB8F00DADC14 /* MewRoomMicSeatImageView.swift in Sources */,
 				237054A52B1F3B3200F5DE14 /* DESEncrypt.m in Sources */,
-				8C9C84522B0C697A00A601BC /* MewThirdUserInfo.m in Sources */,
 				230D63BB2B592D0D00DADC14 /* MewMainHomeMakeFriendModel.m in Sources */,
 				8C9C84472B0C697A00A601BC /* MewMineCollectionTableViewCell.m in Sources */,
 				230D637C2B58FB8F00DADC14 /* MewRoomTransferMsgView.swift in Sources */,
+				23F1E6A42B5ABFE0004777A2 /* MewInitInfoModel.swift in Sources */,
 				2370538E2B1F3AA100F5DE14 /* MewLoginViewController.m in Sources */,
-				230D633F2B58C8B100DADC14 /* MewBaseModel.m in Sources */,
 				2370549F2B1F3B3200F5DE14 /* UIImage+RW.m in Sources */,
 				230D637B2B58FB8F00DADC14 /* MewRoomPlayTopFilterView.swift in Sources */,
 				230D63182B557DE700DADC14 /* MewServerApi.swift in Sources */,
 				230D63762B58FB8F00DADC14 /* MewRoomPlayRightView.swift in Sources */,
 				8C92A8072B0EEDD0008F362C /* MewLoginVerifBindPhoneViewController.m in Sources */,
-				237054AB2B1F3B3200F5DE14 /* MewThemeColor.m in Sources */,
-				8C9C84412B0C697A00A601BC /* MewMineCollectRoomModel.m in Sources */,
 				230D63982B5926B400DADC14 /* MewMainHomeMoreGameVC.m in Sources */,
 				2370538A2B1F3AA100F5DE14 /* MewRechargeSubView.m in Sources */,
 				237054832B1F3B3200F5DE14 /* MewBaseViewController.m in Sources */,
@@ -1539,12 +1460,11 @@
 				8C9C84452B0C697A00A601BC /* MewMineCollectRoomViewController.m in Sources */,
 				230D63902B5902A100DADC14 /* MewReceiveGiftDataModel.swift in Sources */,
 				2337575F2B0CB577001D0B7F /* MewSessionInfoViewController.m in Sources */,
-				233757572B0CB577001D0B7F /* MewMessageMenuModel.m in Sources */,
+				23F1E69C2B5A93FB004777A2 /* MewNetworkDataModel.m in Sources */,
 				237053A02B1F3AA100F5DE14 /* MewShowVoiceView.m in Sources */,
-				8C9C844B2B0C697A00A601BC /* MewAttachmentModel.m in Sources */,
 				237053A12B1F3AA100F5DE14 /* MewUserIntroductionView.m in Sources */,
-				2370531A2B1F3A5D00F5DE14 /* MewClientDataModel.m in Sources */,
 				237054822B1F3B3200F5DE14 /* MewBaseNavigationController.m in Sources */,
+				23F1E6AC2B5AC7D3004777A2 /* MewPayItemModel.swift in Sources */,
 				8C9C84562B0C697A00A601BC /* MewLoginFullInfoViewController.m in Sources */,
 				2370539B2B1F3AA100F5DE14 /* MewPushExclusiveVoiceView.m in Sources */,
 				237054802B1F3B3200F5DE14 /* UIImage+MewUtils.m in Sources */,

yinmeng-ios/yinmeng-ios/Base.lproj/LaunchScreen.storyboard

@@ -17,9 +17,8 @@
                         <rect key="frame" x="0.0" y="0.0" width="390" height="844"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="mew_home_bg" translatesAutoresizingMaskIntoConstraints="NO" id="PNT-qz-0tc">
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="mew_home_bg" translatesAutoresizingMaskIntoConstraints="NO" id="PNT-qz-0tc">
-                                <rect key="frame" x="0.0" y="0.0" width="390" height="812"/>
+                                <rect key="frame" x="0.0" y="0.0" width="390" height="844"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             </imageView>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="mew_launch_logo.png" translatesAutoresizingMaskIntoConstraints="NO" id="VtB-hS-Aga">
                                 <rect key="frame" x="143" y="216.33333333333337" width="104" height="104"/>
@@ -28,7 +27,7 @@
                                 </constraints>
                             </imageView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="音萌" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="O9G-IL-eNc">
-                                <rect key="frame" x="170.66666666666666" y="335.33333333333326" width="48.666666666666657" height="28.666666666666742"/>
+                                <rect key="frame" x="170.66666666666666" y="335.33333333333331" width="48.666666666666657" height="28.666666666666686"/>
                                 <fontDescription key="fontDescription" name=".AppleSystemUIFont" family=".AppleSystemUIFont" pointSize="24"/>
                                 <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <nil key="highlightedColor"/>
@@ -44,10 +43,14 @@
                         <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
+                            <constraint firstItem="PNT-qz-0tc" firstAttribute="trailing" secondItem="Ze5-6b-2t3" secondAttribute="trailing" id="5xa-4U-mHg"/>
                             <constraint firstItem="O9G-IL-eNc" firstAttribute="top" secondItem="VtB-hS-Aga" secondAttribute="bottom" constant="15" id="DRl-U2-hWc"/>
                             <constraint firstItem="VtB-hS-Aga" firstAttribute="width" secondItem="Ze5-6b-2t3" secondAttribute="width" multiplier="100/375" id="LVF-8C-zU8"/>
+                            <constraint firstAttribute="bottom" secondItem="PNT-qz-0tc" secondAttribute="bottom" id="OK6-BA-StU"/>
                             <constraint firstItem="O9G-IL-eNc" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="R0b-K1-xkx"/>
+                            <constraint firstItem="PNT-qz-0tc" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="R6s-bV-83k"/>
                             <constraint firstItem="pcR-pR-yML" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="TGk-ow-WN9"/>
+                            <constraint firstItem="PNT-qz-0tc" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="XID-pb-4y1"/>
                             <constraint firstItem="VtB-hS-Aga" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="bottom" multiplier="208/812" id="Zdw-5S-0cS"/>
                             <constraint firstItem="pcR-pR-yML" firstAttribute="top" secondItem="O9G-IL-eNc" secondAttribute="bottom" constant="20" id="bhu-cy-Bhp"/>
                             <constraint firstItem="VtB-hS-Aga" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="iqs-BQ-ie6"/>

yinmeng-ios/yinmeng-ios/Base/MVP/Model/MewAccountModel.h

@@ -1,22 +0,0 @@
-//
-//  MewAccountModel.h
-//  yinmeng-ios
-//
-//  Created by duoban on 2023/12/6.
-//
-
-#import <Foundation/Foundation.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface MewAccountModel : NSObject
-@property (nonatomic, assign) NSString *uid;
-@property (nonatomic, copy) NSString *jti;
-@property (nonatomic, copy) NSString *token_type;
-@property (nonatomic, copy) NSString *refresh_token;
-@property (nonatomic, copy) NSString *netEaseToken;
-@property (nonatomic, copy) NSString *access_token;
-@property (nonatomic, assign) NSNumber *expires_in;
-@end
-
-NS_ASSUME_NONNULL_END

yinmeng-ios/yinmeng-ios/Base/MVP/Model/MewAccountModel.m

@@ -1,12 +0,0 @@
-//
-//  MewAccountModel.m
-//  yinmeng-ios
-//
-//  Created by duoban on 2023/12/6.
-//
-
-#import "MewAccountModel.h"
-
-@implementation MewAccountModel
-
-@end

yinmeng-ios/yinmeng-ios/Base/MVP/Model/MewBaseMapModel.swift

@@ -1,58 +0,0 @@
-//
-//  MewBaseMapModel.swift
-//  yinmeng-ios
-//
-//  Created by duoban on 2024/1/15.
-//
-
-import UIKit
-import ObjectMapper
-
-class MewBaseMapModel: Mappable {
-    
-    
-    
-    var data:AnyObject?
-    var code:Int64?
-    var message:String?
-    
-    required init?(map: ObjectMapper.Map) {
-        
-    }
-    
-    func mapping(map: ObjectMapper.Map) {
-        data <- map["data"]
-        code <- map["code"]
-        message <- map["message"]
-    }
-    class MewTransformInt: TransformType {
-       public typealias Object = Int
-       public typealias JSON = Any?
-       public init() {}
-       public func transformFromJSON(_ value: Any?) -> Int? {
-           var result: Int?
-           guard let json = value else {
-               return result
-           }
-           /// 如果是数值类型，小数等，需要用NSNumber
-           if json is NSNumber {
-               result = (json as! NSNumber).intValue
-           }
-           if json is Int {
-               result = (json as! Int)
-           }
-           if json is String {
-               result = Int(json as! String)
-           }
-           return result
-       }
-
-       public func transformToJSON(_ value: Int?) -> Any?? {
-           guard let object = value else {
-               return nil
-           }
-           return String(object)
-       }
-   }
-
-}

yinmeng-ios/yinmeng-ios/Base/MVP/Model/MewBaseModel.m

@@ -1,24 +0,0 @@
-//
-//  MewBaseModel.m
-//  yinmeng-ios
-//
-//  Created by duoban on 2023/12/6.
-//
-
-#import "MewBaseModel.h"
-
-@implementation MewBaseModel
-
-//找未找到的Key
-- (id) valueForUndefinedKey:(NSString *)key
-{
-    NSLog(@"Undefined Key: %@",key);
-    return nil;
-}
-//设置未找到的Key
-- (void)setValue:(id)value forUndefinedKey:(NSString *)key
-{
-    NSLog(@"Undefined Key: %@",key);
-}
-
-@end

yinmeng-ios/yinmeng-ios/Base/MVP/Model/MewLoginTokenInfoModel.swift

@@ -0,0 +1,18 @@
+//
+//  MewLoginTokenInfoModel.swift
+//  yinmeng-ios
+//
+//  Created by duoban on 2024/1/19.
+//
+
+import UIKit
+
+class MewLoginTokenInfoModel: NSObject {
+   @objc var uid = "";
+   @objc var jti = "";
+   @objc var token_type = "";
+   @objc var refresh_token = "";
+   @objc var netEaseToken = "";
+   @objc var access_token = "";
+   @objc var expires_in = "";
+}

yinmeng-ios/yinmeng-ios/Base/MVP/Model/MewNetworkDataModel.h

@@ -1,15 +1,15 @@
 //
-//  MewBaseModel.h
+//  MewNetworkDataModel.h
 //  yinmeng-ios
 //
-//  Created by duoban on 2023/12/6.
+//  Created by duoban on 2024/1/19.
 //
 
 #import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface MewBaseModel : NSObject
+@interface MewNetworkDataModel : NSObject
 @property (nonatomic, strong) id data;
 @property (nonatomic, assign) NSInteger code;
 @property (nonatomic, copy) NSString *message;

yinmeng-ios/yinmeng-ios/Base/MVP/Model/MewNetworkDataModel.m

@@ -0,0 +1,12 @@
+//
+//  MewNetworkDataModel.m
+//  yinmeng-ios
+//
+//  Created by duoban on 2024/1/19.
+//
+
+#import "MewNetworkDataModel.h"
+
+@implementation MewNetworkDataModel
+
+@end

yinmeng-ios/yinmeng-ios/Base/MVP/Model/MewPersonInfoModel.swift

@@ -0,0 +1,31 @@
+//
+//  MewPersonInfoModel.swift
+//  yinmeng-ios
+//
+//  Created by duoban on 2024/1/19.
+//
+
+import UIKit
+
+class MewPersonInfoModel: NSObject {
+    @objc var phone = ""
+    @objc var  nick = ""
+    @objc var  avatar = ""
+
+    @objc var gender:MewSexType = .male
+    @objc var uid = 0;
+
+    @objc var isBindPasswd = false
+
+    @objc var erbanNo = 0;
+    ///是否是新用户
+    @objc var newUser = false
+    /// 是否绑定手机号码
+    @objc var isBindPhone = false
+
+    @objc var userVoice = ""
+    /// 用户声音的事件
+    @objc var voiceDura = ""
+    /// 用户签名
+    @objc var userDesc = ""
+}

yinmeng-ios/yinmeng-ios/Base/MVP/Model/MewUserInfoModel.h

@@ -1,60 +0,0 @@
-//
-//  MewUserInfoModel.h
-//  yinmeng-ios
-//
-//  Created by duoban on 2023/12/6.
-//
-
-#import <Foundation/Foundation.h>
-#import "MewEnum.h"
-
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface MewUserInfoModel : NSObject
-@property (nonatomic , copy) NSString * phone;
-@property (nonatomic , copy) NSString * nick;
-@property (nonatomic , copy) NSString * avatar;
-/// mew avatar
-//@property (nonatomic , copy) NSString * newAvatar;
-@property (nonatomic , assign) MewSexType gender;
-@property (nonatomic , assign) NSInteger uid;
-@property (nonatomic , assign) NSInteger platformRole;
-@property (nonatomic , assign) BOOL isBindPasswd;
-@property (nonatomic , assign) NSInteger followNum;
-@property (nonatomic , assign) NSInteger fansNum;
-@property (nonatomic,assign) NSInteger erbanNo;
-///是否是新用户
-@property (nonatomic,assign) BOOL newUser;
-/// 是否绑定手机号码
-@property (nonatomic , assign) BOOL isBindPhone;
-/// 访客数量
-@property (nonatomic, assign) NSInteger visitNum;
-/// 出生日期
-@property (nonatomic,assign) long birth;
-/// 是否在房间，用在发现新朋友
-@property (nonatomic, copy) NSString * inRoomUid;
-/// 是否在麦位，用在发现新朋友
-@property (nonatomic, assign) BOOL inMic;
-/// 账号类型
-@property (nonatomic , assign) NSInteger defUser;
-
-///贵族icon
-@property (nonatomic, copy) NSString *vipIcon;
-/// 用户的声音秀
-@property (nonatomic, copy) NSString *userVoice;
-/// 用户声音的事件
-@property (nonatomic, assign) NSInteger voiceDura;
-/// 用户签名
-@property (nonatomic, copy) NSString *userDesc;
-///跟随的 本地添加的字段
-//@property (nonatomic,copy) NSString *fromNick;
-//@property (nonatomic,assign) UserEnterRoomFromType fromType;
-//@property (nonatomic,copy) NSString *fromUid;
-
-
-///麦位昵称颜色
-@property (nonatomic, copy) NSString *micNickColor;
-@end
-
-NS_ASSUME_NONNULL_END

yinmeng-ios/yinmeng-ios/Base/MVP/Model/MewUserInfoModel.m

@@ -1,12 +0,0 @@
-//
-//  MewUserInfoModel.m
-//  yinmeng-ios
-//
-//  Created by duoban on 2023/12/6.
-//
-
-#import "MewUserInfoModel.h"
-
-@implementation MewUserInfoModel
-
-@end

yinmeng-ios/yinmeng-ios/Base/MewApi/MewOCServerManager.h

@@ -6,7 +6,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "MewBaseModel.h"
+#import "MewNetworkDataModel.h"
 
 #ifdef DEBUG
 /// http://beta.h5.ymlive.fun
@@ -25,7 +25,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 
-typedef void(^MewOCServerManagerSucceed)(MewBaseModel* _Nullable obj, NSInteger num, NSString * text);
+typedef void(^MewOCServerManagerSucceed)(MewNetworkDataModel* _Nullable obj, NSInteger num, NSString * text);
 
 
 @interface MewOCServerManager : NSObject

yinmeng-ios/yinmeng-ios/Base/MewApi/MewOCServerManager.m

@@ -6,7 +6,7 @@
 //
 
 #import "MewOCServerManager.h"
-#import "MewAccountModel.h"
+
 
 #import <Qiniu/QiniuSDK.h>
 @implementation MewOCServerManager
@@ -42,7 +42,7 @@
 }
 + (void)mewRequestGetAction:(NSString *)path
       dic:(NSDictionary *)dic
-          successBlock:(void (^)(MewBaseModel *model))successBlock
+          successBlock:(void (^)(MewNetworkDataModel *model))successBlock
      failBlock:(void (^)(NSInteger num, NSString *text))failBlock {
    
     
@@ -52,7 +52,7 @@
     
 
     [[MewOCServerManager share] GET:path parameters:dic headers:nil progress:nil success:^(NSURLSessionDataTask * _Nonnull task, id  _Nullable responseObject) {
-        MewBaseModel *obj = [MewBaseModel mewModelWithDictionary:responseObject];
+        MewNetworkDataModel *obj = [MewNetworkDataModel mewModelWithDictionary:responseObject];
 
         successBlock(obj);
     } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
@@ -64,11 +64,11 @@
 
 + (void)mewRequestPOSTAction:(NSString *)path
       dic:(NSDictionary *)dic
-          successBlock:(void (^)(MewBaseModel *model))successBlock
+          successBlock:(void (^)(MewNetworkDataModel *model))successBlock
      failBlock:(void (^)(NSInteger num, NSString *text))failBlock {
    dic = [self mewSetParmars:dic];
     [[MewOCServerManager share] POST:path parameters:dic headers:nil progress:nil success:^(NSURLSessionDataTask * _Nonnull task, id  _Nullable responseObject) {
-        MewBaseModel *obj = [MewBaseModel mewModelWithDictionary:responseObject];
+        MewNetworkDataModel *obj = [MewNetworkDataModel mewModelWithDictionary:responseObject];
        
         successBlock(obj);
     } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
@@ -147,7 +147,7 @@
     va_end(list);
     switch (type) {
         case MewOCServerManagerTypeGET: {
-            [self mewRequestGetAction:url dic:dic successBlock:^(MewBaseModel *model) {
+            [self mewRequestGetAction:url dic:dic successBlock:^(MewNetworkDataModel *model) {
                 if(successBlock){
                     successBlock(model,model.code,model.message);
                 }
@@ -159,7 +159,7 @@
         }
             break;
         case MewOCServerManagerTypePOST:{
-            [self mewRequestPOSTAction:url dic:dic successBlock:^(MewBaseModel *model) {
+            [self mewRequestPOSTAction:url dic:dic successBlock:^(MewNetworkDataModel *model) {
                 if(successBlock){
                     successBlock(model,model.code,model.message);
                 }
@@ -192,7 +192,7 @@
         [dic setObject:gameId forKey:@"gameId"];
     }
     
-    [self mewRequestGetAction:[MewEncryptManager mewAESDecryptText:@"snLITcKwwnlRGbuT+0t3Gw=="] dic:dic successBlock:^(MewBaseModel *model) {
+    [self mewRequestGetAction:[MewEncryptManager mewAESDecryptText:@"snLITcKwwnlRGbuT+0t3Gw=="] dic:dic successBlock:^(MewNetworkDataModel *model) {
         if(successBlock){
             successBlock(model,model.code,model.message);
         }
@@ -310,7 +310,7 @@
 + (void)mewSetUserDataWithRegister:(MewOCServerManagerSucceed)successBlock
                     userInfo:(NSDictionary *)userInfo{
    
-    [self mewRequestPOSTAction:[MewEncryptManager mewAESDecryptText:@"6A7+MXSz6a7RbsOb9Ls+mA=="] dic:userInfo successBlock:^(MewBaseModel *model) {
+    [self mewRequestPOSTAction:[MewEncryptManager mewAESDecryptText:@"6A7+MXSz6a7RbsOb9Ls+mA=="] dic:userInfo successBlock:^(MewNetworkDataModel *model) {
         if(successBlock){
             successBlock(model,model.code,model.message);
         }

yinmeng-ios/yinmeng-ios/Base/MewIAP/yinmeng-ios-Bridging-Header.h

@@ -14,19 +14,18 @@
 #import "MewMacro.h"
 #import <MJExtension/MJExtension.h>
 #import "MewBaseViewController.h"
-#import "MewEnum.h"
+#import "MewBaseEnumType.h"
 #import <NIMSDK/NIMSDK.h>
 #import <YYText/YYText.h>
 #import <YYText/YYTextLayout.h>
 #import "NSObject+MEWExtension.h"
-#import "MewUserInfoModel.h"
+#import "MewGetColorTool.h"
 #import <UIImageView+WebCache.h>
 #import <SDImageCache.h>
 #import "MewMsgDataModel.h"
 #import "MewWebViewController.h"
 #import "MewOCServerManager.h"
 #import <TXLiteAVSDK_TRTC/TRTCCloud.h>
-#import "MewAttachmentModel.h"
 #import "MewConstant.h"
 #import <AFNetworking.h>
 #import <FFPopup/FFPopup.h>

yinmeng-ios/yinmeng-ios/Base/MewPrefixHeader.h

@@ -14,12 +14,12 @@
 #import "MewEncryptManager.h"
 #import "yinmeng_ios-Swift.h"
 
-#import "MewThemeColor.h"
+
-#import "MewUserInfoModel.h"
+
 
 #import "MewBaseNavigationController.h"
 #import "UIButton+MewSetButtomArea.h"
-#import "MewBaseModel.h"
+#import "MewNetworkDataModel.h"
 #import "MewSaveBaseUserModel.h"
 #import "MewOCServerManager.h"
 #endif /* MewHeader_h */

yinmeng-ios/yinmeng-ios/Base/MewSaveBaseUserModel/MewSaveBaseUserModel.h

@@ -6,20 +6,23 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "MewAccountModel.h"
+
-#import "MewThirdUserInfo.h"
+
 NS_ASSUME_NONNULL_BEGIN
+@class MewLoginTokenInfoModel,MewAppleInfoModel;
 
 @interface MewSaveBaseUserModel : NSObject
 
 ///如果是第三方登录的话 保存一下用户信息
-@property (nonatomic,strong) MewThirdUserInfo *mewAppleInfo;
+@property (nonatomic,strong) MewAppleInfoModel *mewAppleInfo;
+
 + (MewSaveBaseUserModel *)share;
--(MewAccountModel *)mewGetBaseUserData;
+-(MewLoginTokenInfoModel *)mewGetBaseUserData;
--(void)mewSaveBaseUserData:(MewAccountModel *_Nullable)model;
+-(void)mewSaveBaseUserData:(MewLoginTokenInfoModel *_Nullable)model;
 - (void)mewSaveUserTickets:(NSString *_Nullable)tickets;
 - (NSString *)mewUserTicket;
 - (NSString *)mewGetUserId;
+
 @end
 
 NS_ASSUME_NONNULL_END

yinmeng-ios/yinmeng-ios/Base/MewSaveBaseUserModel/MewSaveBaseUserModel.m

@@ -6,11 +6,11 @@
 //
 
 #import "MewSaveBaseUserModel.h"
-#import "MewAccountModel.h"
+
 
 @interface MewSaveBaseUserModel()
 @property (nonatomic, copy) NSString *mewPrivateUserTicket;
-@property (nonatomic, strong) MewAccountModel *mewUserData;
+@property (nonatomic, strong) MewLoginTokenInfoModel *mewUserData;
 @end
 @implementation MewSaveBaseUserModel
 static MewSaveBaseUserModel *_user = nil;
@@ -25,15 +25,16 @@ static MewSaveBaseUserModel *_user = nil;
     
     return _user;
 }
--(MewAccountModel *)mewGetBaseUserData{
+
+-(MewLoginTokenInfoModel *)mewGetBaseUserData{
     NSDictionary *dic = [[NSUserDefaults standardUserDefaults]valueForKey:@"kMewSaveBaseUserModel"];
     if(dic == nil)return nil;
-    MewAccountModel *model = [MewAccountModel mewModelWithDictionary:dic];
+    MewLoginTokenInfoModel *model = [MewLoginTokenInfoModel mewModelWithDictionary:dic];
     return model;
 }
--(void)mewSaveBaseUserData:(MewAccountModel *_Nullable)model{
+-(void)mewSaveBaseUserData:(MewLoginTokenInfoModel *_Nullable)model{
     if(model == nil){
-        model = [MewAccountModel new];
+        model = [MewLoginTokenInfoModel new];
     }
     self.mewUserData = model;
     NSDictionary *dic = [model mewModel2dictionary];
@@ -52,7 +53,7 @@ static MewSaveBaseUserModel *_user = nil;
 
 
 - (NSString *)mewGetUserId {
-    MewAccountModel *user = [self mewGetBaseUserData];
+    MewLoginTokenInfoModel *user = [self mewGetBaseUserData];
     if (user == nil) {
         return @"";
     }

yinmeng-ios/yinmeng-ios/Base/Tool/ThemeColor/MewThemeColor.h

@@ -1,59 +0,0 @@
-//
-//  MEWMEWMewThemeColor.h
-//  yinmeng-ios
-//
-//  Created by duoban on 2023/12/1.
-//
-
-#import <Foundation/Foundation.h>
-#import <UIKit/UIKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
-#define UIColorMewFromRGB(rgbValue) [UIColor colorWithRed:((float)((rgbValue & 0xFF0000) >> 16))/255.0 green:((float)((rgbValue & 0xFF00) >> 8))/255.0 blue:((float)(rgbValue & 0xFF))/255.0 alpha:1.0]
-
-#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
-/// view的背景色 0xF3F5FA
-+ (UIColor *)mewAppBackgroundColor;
-/// cell的背景色 0xFFFFFF
-+ (UIColor *)mewAppCellBackgroundColor;
-///正文颜色  0x333333
-+ (UIColor *)mewMainTextColor;
-/// 二级文字颜色 0x666666
-+ (UIColor *)mewSecondTextColor;
-///分割线的颜色  0xE8E8E8
-+ (UIColor *)mewDividerColor;
-
-/* ------弹窗相关颜色 START------ */
-+ (UIColor *)mewAlertBackgroundColor;
-+ (UIColor *)mewAlertTitleColor;
-+ (UIColor *)mewAlertMessageColor;
-+ (UIColor *)mewActionSeparatorColor;
-/* ------弹窗相关颜色 END------ */
-
-/* ------Button 相关颜色 START------ */
-/// button 可用 渐变色的开始 0xFFA936
-+ (UIColor *)mewConfirmButtonGradientStartColor;
-/// button 可用 渐变色的开始 0xFFCB47
-+ (UIColor *)mewConfirmButtonGradientEndColor;
-/// 确定的按钮文字颜色 #FFFFFF
-+ (UIColor *)mewConfirmButtonTextColor;
-/// 取消按钮  渐变色的开始 0xF7DDBF
-+ (UIColor *)mewCancelButtonGradientStartColor;
-/// 取消按钮  渐变色的结束 0xF7E8C4
-+ (UIColor *)mewCancelButtonGradientEndColor;
-/// 取消的按钮文字颜色 0xFFA936
-+ (UIColor *)mewCancelButtonTextColor;
-/// 取消按钮单一普通背景色 0xFFCE4E
-+ (UIColor *)mewCancelButtonNormalBgColor;
-/// 按钮不可点击背景色 0xD2D5D7
-+ (UIColor *)mewDisableButtonColor;
-/// 按钮不可点击文字颜色 0xF9F9F9
-+ (UIColor *)mewDisableButtonTextColor;
-/* ------Button 相关颜色 END------ */
-
-+ (UIColor *)mewColorWithHexString:(NSString *)hexString;
-@end
-
-NS_ASSUME_NONNULL_END

yinmeng-ios/yinmeng-ios/Base/Tool/ThemeColor/MewThemeColor.m

@@ -1,135 +0,0 @@
-//
-//  MewThemeColor.m
-//  yinmeng-ios
-//
-//  Created by duoban on 2023/12/1.
-//
-
-#import "MewThemeColor.h"
-
-@implementation MewThemeColor
-/// view的背景色 0xF3F5FA
-+ (UIColor *)mewAppBackgroundColor {
-    return UIColorMewFromRGB(0xF8F8FB);
-}
-/// cell的背景色 0xFFFFFF
-+ (UIColor *)mewAppCellBackgroundColor {
-    return UIColorMewFromRGB(0xFFFFFF);
-}
-///正文颜色  0x333333
-+ (UIColor *)mewMainTextColor {
-    return UIColorMewFromRGB(0x282828);
-}
-/// 二级文字颜色 0x666666
-+ (UIColor *)mewSecondTextColor {
-    return UIColorMewFromRGB(0x878B9C);
-}
-
-///分割线的颜色  0xE8E8E8
-+ (UIColor *)mewDividerColor {
-    return UIColorMewFromRGB(0xE8E8E8);
-}
-
-
-/* ------弹窗相关颜色 START------ */
-+ (UIColor *)mewAlertBackgroundColor {
-    return UIColorMewFromRGB(0xFFFFFF);
-}
-
-+ (UIColor *)mewAlertTitleColor {
-    return UIColorMewFromRGB(0x333333);
-}
-+ (UIColor *)mewAlertMessageColor {
-    return UIColorMewFromRGB(0x333333);
-}
-+ (UIColor *)mewActionSeparatorColor {
-    return UIColorMewFromRGB(0xF0F0F0);
-}
-/* ------弹窗相关颜色 END------ */
-
-
-/* ------Button 相关颜色 START------ */
-/// button 可用 渐变色的开始 0xFFA936
-+ (UIColor *)mewConfirmButtonGradientStartColor {
-    return UIColorMewFromRGB(0x9552FF);
-}
-/// button 可用 渐变色的开始 0xFFCB47
-+ (UIColor *)mewConfirmButtonGradientEndColor {
-    return UIColorMewFromRGB(0x9552FF);
-}
-/// 确定的按钮文字颜色 #FFFFFF
-+ (UIColor *)mewConfirmButtonTextColor {
-    return UIColorMewFromRGB(0x282828);
-}
-/// 取消按钮  渐变色的开始 0xF7DDBF
-+ (UIColor *)mewCancelButtonGradientStartColor {
-    return UIColorMewFromRGB(0xE6E6FA);
-}
-/// 取消按钮  渐变色的结束 0xF7E8C4
-+ (UIColor *)mewCancelButtonGradientEndColor {
-    return UIColorMewFromRGB(0xE6E6FA);
-}
-/// 取消的按钮文字颜色 0xFFA936
-+ (UIColor *)mewCancelButtonTextColor {
-    return UIColorMewFromRGB(0x282828);
-}
-/// 取消按钮单一普通背景色 0xFFCE4E
-+ (UIColor *)mewCancelButtonNormalBgColor {
-    return UIColorMewFromRGB(0xFFFACF);
-}
-/// 按钮不可点击背景色 0xD2D5D7
-+ (UIColor *)mewDisableButtonColor {
-    return UIColorMewFromRGB(0xF2F3F6);
-}
-/// 按钮不可点击文字颜色 0xF9F9F9
-+ (UIColor *)mewDisableButtonTextColor {
-    return UIColorMewFromRGB(0x878B9C);
-}
-/* ------Button 相关颜色 END------ */
-
-+ (UIColor *)mewColorWithHexString: (NSString *) hexString {
-    if (hexString.length == 0) {
-        return [UIColor blackColor];
-    }
-    NSString *colorString = [[hexString stringByReplacingOccurrencesOfString: @"#" withString: @""] uppercaseString];
-    CGFloat alpha, red, blue, green;
-    switch ([colorString length]) {
-        case 3: // #RGB
-            alpha = 1.0f;
-            red   = [self mewColorComponentFrom: colorString start: 0 length: 1];
-            green = [self mewColorComponentFrom: colorString start: 1 length: 1];
-            blue  = [self mewColorComponentFrom: colorString start: 2 length: 1];
-            break;
-        case 4: // #ARGB
-            alpha = [self mewColorComponentFrom: colorString start: 0 length: 1];
-            red   = [self mewColorComponentFrom: colorString start: 1 length: 1];
-            green = [self mewColorComponentFrom: colorString start: 2 length: 1];
-            blue  = [self mewColorComponentFrom: colorString start: 3 length: 1];
-            break;
-        case 6: // #RRGGBB
-            alpha = 1.0f;
-            red   = [self mewColorComponentFrom: colorString start: 0 length: 2];
-            green = [self mewColorComponentFrom: colorString start: 2 length: 2];
-            blue  = [self mewColorComponentFrom: colorString start: 4 length: 2];
-            break;
-        case 8: // #AARRGGBB
-            alpha = [self mewColorComponentFrom: colorString start: 0 length: 2];
-            red   = [self mewColorComponentFrom: colorString start: 2 length: 2];
-            green = [self mewColorComponentFrom: colorString start: 4 length: 2];
-            blue  = [self mewColorComponentFrom: colorString start: 6 length: 2];
-            break;
-        default:
-            [NSException raise:@"Invalid color value" format: @"Color value %@ is invalid.  It should be a hex value of the form #RBG, #ARGB, #RRGGBB, or #AARRGGBB", hexString];
-            break;
-    }
-    return [UIColor colorWithRed: red green: green blue: blue alpha: alpha];
-}
-
-+ (CGFloat) mewColorComponentFrom: (NSString *) string start: (NSUInteger) start length: (NSUInteger) length {
-    NSString *substring = [string substringWithRange: NSMakeRange(start, length)];
-    NSString *fullHex = length == 2 ? substring : [NSString stringWithFormat: @"%@%@", substring, substring];
-    unsigned hexComponent;
-    [[NSScanner scannerWithString: fullHex] scanHexInt: &hexComponent];
-    return hexComponent / 255.0;
-}
-@end

yinmeng-ios/yinmeng-ios/Base/Tool/UIImage/UIImage+RW.m

@@ -591,23 +591,23 @@ void cornerImage(UInt32 *const img, int w, int h, CGFloat cornerRadius) {
 }
 
 - (UIImage *)imageByGrayscale {
-    return [self imageByBlurRadius:0 tintColor:nil tintMode:0 saturation:0 maskImage:nil];
+    return [self imageByBlurRadius:0 tintColor:nil tintMode:0 saturation:0 maskMewGetImageData:nil];
 }
 
 - (UIImage *)imageByBlurSoft {
-    return [self imageByBlurRadius:60 tintColor:[UIColor colorWithWhite:0.84 alpha:0.36] tintMode:kCGBlendModeNormal saturation:1.8 maskImage:nil];
+    return [self imageByBlurRadius:60 tintColor:[UIColor colorWithWhite:0.84 alpha:0.36] tintMode:kCGBlendModeNormal saturation:1.8 maskMewGetImageData:nil];
 }
 
 - (UIImage *)imageByBlurLight {
-    return [self imageByBlurRadius:60 tintColor:[UIColor colorWithWhite:1.0 alpha:0.3] tintMode:kCGBlendModeNormal saturation:1.8 maskImage:nil];
+    return [self imageByBlurRadius:60 tintColor:[UIColor colorWithWhite:1.0 alpha:0.3] tintMode:kCGBlendModeNormal saturation:1.8 maskMewGetImageData:nil];
 }
 
 - (UIImage *)imageByBlurExtraLight {
-    return [self imageByBlurRadius:40 tintColor:[UIColor colorWithWhite:0.97 alpha:0.82] tintMode:kCGBlendModeNormal saturation:1.8 maskImage:nil];
+    return [self imageByBlurRadius:40 tintColor:[UIColor colorWithWhite:0.97 alpha:0.82] tintMode:kCGBlendModeNormal saturation:1.8 maskMewGetImageData:nil];
 }
 
 - (UIImage *)imageByBlurDark {
-    return [self imageByBlurRadius:40 tintColor:[UIColor colorWithWhite:0.11 alpha:0.73] tintMode:kCGBlendModeNormal saturation:1.8 maskImage:nil];
+    return [self imageByBlurRadius:40 tintColor:[UIColor colorWithWhite:0.11 alpha:0.73] tintMode:kCGBlendModeNormal saturation:1.8 maskMewGetImageData:nil];
 }
 
 - (UIImage *)imageByBlurWithTint:(UIColor *)tintColor {
@@ -625,7 +625,7 @@ void cornerImage(UInt32 *const img, int w, int h, CGFloat cornerRadius) {
             effectColor = [UIColor colorWithRed:r green:g blue:b alpha:EffectColorAlpha];
         }
     }
-    return [self imageByBlurRadius:20 tintColor:effectColor tintMode:kCGBlendModeNormal saturation:-1.0 maskImage:nil];
+    return [self imageByBlurRadius:20 tintColor:effectColor tintMode:kCGBlendModeNormal saturation:-1.0 maskMewGetImageData:nil];
 }
 
 
@@ -638,7 +638,7 @@ static void _yy_cleanupBuffer(void *userData, void *buf_data) {
                      tintColor:(UIColor *)tintColor
                       tintMode:(CGBlendMode)tintBlendMode
                     saturation:(CGFloat)saturation
-                     maskImage:(UIImage *)maskImage {
+                     maskMewGetImageData:(UIImage *)maskMewGetImageData {
     if (self.size.width < 1 || self.size.height < 1) {
         NSLog(@"UIImage+XHAdd error: invalid size: (%.2f x %.2f). Both dimensions must be >= 1: %@", self.size.width, self.size.height, self);
         return nil;
@@ -647,8 +647,8 @@ static void _yy_cleanupBuffer(void *userData, void *buf_data) {
         NSLog(@"UIImage+XHAdd error: inputImage must be backed by a CGImage: %@", self);
         return nil;
     }
-    if (maskImage && !maskImage.CGImage) {
+    if (maskMewGetImageData && !maskMewGetImageData.CGImage) {
-        NSLog(@"UIImage+XHAdd error: effectMaskImage must be backed by a CGImage: %@", maskImage);
+        NSLog(@"UIImage+XHAdd error: effectMaskMewGetImageData must be backed by a CGImage: %@", maskMewGetImageData);
         return nil;
     }
     
@@ -664,7 +664,7 @@ static void _yy_cleanupBuffer(void *userData, void *buf_data) {
     BOOL opaque = NO;
     
     if (!hasBlur && !hasSaturation) {
-        return [self _yy_mergeImageRef:imageRef tintColor:tintColor tintBlendMode:tintBlendMode maskImage:maskImage opaque:opaque];
+        return [self _yy_mergeImageRef:imageRef tintColor:tintColor tintBlendMode:tintBlendMode maskMewGetImageData:maskMewGetImageData opaque:opaque];
     }
     
     vImage_Buffer effect = { 0 }, scratch = { 0 };
@@ -774,7 +774,7 @@ static void _yy_cleanupBuffer(void *userData, void *buf_data) {
             free(input->data);
         }
         free(output->data);
-        outputImage = [self _yy_mergeImageRef:effectCGImage tintColor:tintColor tintBlendMode:tintBlendMode maskImage:maskImage opaque:opaque];
+        outputImage = [self _yy_mergeImageRef:effectCGImage tintColor:tintColor tintBlendMode:tintBlendMode maskMewGetImageData:maskMewGetImageData opaque:opaque];
         CGImageRelease(effectCGImage);
     } else {
         CGImageRef effectCGImage;
@@ -784,7 +784,7 @@ static void _yy_cleanupBuffer(void *userData, void *buf_data) {
         if (input == &effect) effectImage = UIGraphicsGetImageFromCurrentImageContext();
         UIGraphicsEndImageContext();
         effectCGImage = effectImage.CGImage;
-        outputImage = [self _yy_mergeImageRef:effectCGImage tintColor:tintColor tintBlendMode:tintBlendMode maskImage:maskImage opaque:opaque];
+        outputImage = [self _yy_mergeImageRef:effectCGImage tintColor:tintColor tintBlendMode:tintBlendMode maskMewGetImageData:maskMewGetImageData opaque:opaque];
     }
     return outputImage;
 }
@@ -793,10 +793,10 @@ static void _yy_cleanupBuffer(void *userData, void *buf_data) {
 - (UIImage *)_yy_mergeImageRef:(CGImageRef)effectCGImage
                      tintColor:(UIColor *)tintColor
                  tintBlendMode:(CGBlendMode)tintBlendMode
-                     maskImage:(UIImage *)maskImage
+                     maskMewGetImageData:(UIImage *)maskMewGetImageData
                         opaque:(BOOL)opaque {
     BOOL hasTint = tintColor != nil && CGColorGetAlpha(tintColor.CGColor) > __FLT_EPSILON__;
-    BOOL hasMask = maskImage != nil;
+    BOOL hasMask = maskMewGetImageData != nil;
     CGSize size = self.size;
     CGRect rect = { CGPointZero, size };
     CGFloat scale = self.scale;
@@ -812,7 +812,7 @@ static void _yy_cleanupBuffer(void *userData, void *buf_data) {
     if (hasMask) {
         CGContextDrawImage(context, rect, self.CGImage);
         CGContextSaveGState(context);
-        CGContextClipToMask(context, rect, maskImage.CGImage);
+        CGContextClipToMask(context, rect, maskMewGetImageData.CGImage);
     }
     CGContextDrawImage(context, rect, effectCGImage);
     if (hasTint) {

yinmeng-ios/yinmeng-ios/Base/UI/EmptyView/MewEmptyTableViewCell.m

@@ -9,7 +9,7 @@
 ///Third
 #import <Masonry/Masonry.h>
 ///Tool
-#import "MewThemeColor.h"
+
 
 
 @interface MewEmptyTableViewCell()
@@ -74,7 +74,7 @@
         _titleLabel.numberOfLines = 2;
         _titleLabel.font = [UIFont systemFontOfSize:16];
         _titleLabel.textAlignment = NSTextAlignmentCenter;
-        _titleLabel.textColor = [MewThemeColor mewSecondTextColor];
+        _titleLabel.textColor = [MewAppColor mewSecondTextColor];
     }
     return _titleLabel;
 }

yinmeng-ios/yinmeng-ios/Base/UI/MewBaseNavigationController.m

@@ -7,7 +7,7 @@
 
 #import "MewBaseNavigationController.h"
 
-#import "MewThemeColor.h"
+
 
 @interface MewBaseNavigationController ()<UIGestureRecognizerDelegate>
 
@@ -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 = [MewAppColor 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 = [MewAppColor mewViewBgColor];
     self.navigationBar.tintColor = [UIColor whiteColor];
     self.navigationBar.translucent = NO;
-    self.view.backgroundColor = [MewThemeColor mewAppBackgroundColor];
+    self.view.backgroundColor = [MewAppColor mewViewBgColor];
     [self.navigationBar setTitleTextAttributes:@{
         NSFontAttributeName:[UIFont systemFontOfSize:18 weight:UIFontWeightMedium],
-        NSForegroundColorAttributeName:[MewThemeColor mewMainTextColor]
+        NSForegroundColorAttributeName:[MewAppColor 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]};
+                                           NSForegroundColorAttributeName:[MewAppColor mewMainTextColor]};
-        appearance.backgroundColor = [MewThemeColor mewAppCellBackgroundColor];
+        appearance.backgroundColor = [MewAppColor mewAppCellBackgroundColor];
         self.navigationBar.standardAppearance = appearance;
         self.navigationBar.scrollEdgeAppearance = appearance;
     }

yinmeng-ios/yinmeng-ios/Base/UI/MewGetColorTool.h

@@ -0,0 +1,17 @@
+//
+//  MewGetColorTool.h
+//  yinmeng-ios
+//
+//  Created by duoban on 2024/1/20.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface MewGetColorTool : NSObject
++ (UIColor *)mewGetColorWithColorText:(NSString *) colorText;
++ (UIColor *)mewGetalphaColorWithColorText:(NSString *) colorText alpha:(CGFloat)alpha;
+@end
+
+NS_ASSUME_NONNULL_END

yinmeng-ios/yinmeng-ios/Base/UI/MewGetColorTool.m

@@ -0,0 +1,93 @@
+//
+//  MewGetColorTool.m
+//  yinmeng-ios
+//
+//  Created by duoban on 2024/1/20.
+//
+
+#import "MewGetColorTool.h"
+
+@implementation MewGetColorTool
+
++ (UIColor *)mewGetColorWithColorText: (NSString *) colorText {
+    if (colorText.length == 0) {
+        return [UIColor blackColor];
+    }
+    NSString *title = [[colorText stringByReplacingOccurrencesOfString: @"#" withString: @""] uppercaseString];
+    CGFloat alpha, red, blue, green;
+    switch ([title length]) {
+        case 3: // #RGB
+            alpha = 1.0f;
+            red   = [self mewGetColorValue: title begin: 0 count: 1];
+            green = [self mewGetColorValue: title begin: 1 count: 1];
+            blue  = [self mewGetColorValue: title begin: 2 count: 1];
+            break;
+        case 4: // #ARGB
+            alpha = [self mewGetColorValue: title begin: 0 count: 1];
+            red   = [self mewGetColorValue: title begin: 1 count: 1];
+            green = [self mewGetColorValue: title begin: 2 count: 1];
+            blue  = [self mewGetColorValue: title begin: 3 count: 1];
+            break;
+        case 6: // #RRGGBB
+            alpha = 1.0f;
+            red   = [self mewGetColorValue: title begin: 0 count: 2];
+            green = [self mewGetColorValue: title begin: 2 count: 2];
+            blue  = [self mewGetColorValue: title begin: 4 count: 2];
+            break;
+        case 8: // #AARRGGBB
+            alpha = [self mewGetColorValue: title begin: 0 count: 2];
+            red   = [self mewGetColorValue: title begin: 2 count: 2];
+            green = [self mewGetColorValue: title begin: 4 count: 2];
+            blue  = [self mewGetColorValue: title begin: 6 count: 2];
+            break;
+        default:
+            [NSException raise:@"Invalid color value" format: @"Color value %@ is invalid.  It should be a hex value of the form #RBG, #ARGB, #RRGGBB, or #AARRGGBB", colorText];
+            break;
+    }
+    return [UIColor colorWithRed: red green: green blue: blue alpha: alpha];
+}
++ (UIColor *)mewGetalphaColorWithColorText:(NSString *) colorText alpha:(CGFloat)alpha{
+    if (colorText.length == 0) {
+        return [UIColor blackColor];
+    }
+    NSString *title = [[colorText stringByReplacingOccurrencesOfString: @"#" withString: @""] uppercaseString];
+    CGFloat  red, blue, green;
+    switch ([title length]) {
+        case 3: // #RGB
+      
+            red   = [self mewGetColorValue: title begin: 0 count: 1];
+            green = [self mewGetColorValue: title begin: 1 count: 1];
+            blue  = [self mewGetColorValue: title begin: 2 count: 1];
+            break;
+        case 4: // #ARGB
+          
+            red   = [self mewGetColorValue: title begin: 1 count: 1];
+            green = [self mewGetColorValue: title begin: 2 count: 1];
+            blue  = [self mewGetColorValue: title begin: 3 count: 1];
+            break;
+        case 6: // #RRGGBB
+        
+            red   = [self mewGetColorValue: title begin: 0 count: 2];
+            green = [self mewGetColorValue: title begin: 2 count: 2];
+            blue  = [self mewGetColorValue: title begin: 4 count: 2];
+            break;
+        case 8: // #AARRGGBB
+        
+            red   = [self mewGetColorValue: title begin: 2 count: 2];
+            green = [self mewGetColorValue: title begin: 4 count: 2];
+            blue  = [self mewGetColorValue: title begin: 6 count: 2];
+            break;
+        default:
+            [NSException raise:@"Invalid color value" format: @"Color value %@ is invalid.  It should be a hex value of the form #RBG, #ARGB, #RRGGBB, or #AARRGGBB", colorText];
+            break;
+    }
+    return [UIColor colorWithRed: red green: green blue: blue alpha: alpha];
+}
++ (CGFloat) mewGetColorValue: (NSString *) text begin: (NSUInteger) begin count: (NSUInteger) count {
+    NSString *subText = [text substringWithRange: NSMakeRange(begin, count)];
+    NSString *colorValue= count == 2 ? subText : [NSString stringWithFormat: @"%@%@", subText, subText];
+    unsigned getValue;
+    [[NSScanner scannerWithString: colorValue] scanHexInt: &getValue];
+    return getValue / 255.0;
+}
+@end

yinmeng-ios/yinmeng-ios/ClientConfig/MewClientConfig.h

@@ -6,14 +6,14 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "MewClientDataModel.h"
+
 NS_ASSUME_NONNULL_BEGIN
 
 @interface MewClientConfig : NSObject
 /// iOS第三方登录是否需要绑定手机号
 @property (nonatomic,assign) BOOL iosPhoneBind;
 ///配置信息
-@property (nonatomic,strong) MewClientDataModel *configInfo;
+@property (nonatomic,strong) MewInitInfoModel *configInfo;
 
 
 + (instancetype)shareConfig;

yinmeng-ios/yinmeng-ios/ClientConfig/MewClientConfig.m

@@ -31,12 +31,12 @@
 /// 获取配置信息
 - (void)mew_clientInit {
 
-    [MewOCServerManager mewRequestInitInfo:^(MewBaseModel * _Nonnull obj, NSInteger num, NSString * _Nonnull text) {
+    [MewOCServerManager mewRequestInitInfo:^(MewNetworkDataModel * _Nonnull obj, NSInteger num, NSString * _Nonnull text) {
         if (num == 200) {
             self.retryCount = 0;
             NSDictionary *initData = obj.data;
             self.iosPhoneBind = [initData[@"iosPhoneBind"] boolValue];
-            MewClientDataModel *model = [MewClientDataModel mewModelWithDictionary:obj.data];
+            MewInitInfoModel *model = [MewInitInfoModel mewModelWithDictionary:obj.data];
             self.configInfo = model;
             // 表情
 

yinmeng-ios/yinmeng-ios/ClientConfig/Model/MewClientDataModel.h

@@ -1,20 +0,0 @@
-//
-//  MewClientDataModel.h
-//  yinmeng-ios
-//
-//  Created by duoban on 2023/12/5.
-//
-
-#import <Foundation/Foundation.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface MewClientDataModel : NSObject
-
-///官方消息Uid列表
-@property (nonatomic, strong) NSArray<NSString *> *officialMsgUids;
-///官方账号 小秘书 红包消息
-@property (nonatomic,strong) NSArray<NSString *> *officialAccountUids;
-@end
-
-NS_ASSUME_NONNULL_END

yinmeng-ios/yinmeng-ios/ClientConfig/Model/MewClientDataModel.m

@@ -1,12 +0,0 @@
-//
-//  MewClientDataModel.m
-//  yinmeng-ios
-//
-//  Created by duoban on 2023/12/5.
-//
-
-#import "MewClientDataModel.h"
-
-@implementation MewClientDataModel
-
-@end

yinmeng-ios/yinmeng-ios/ClientConfig/Model/MewInitInfoModel.swift

@@ -0,0 +1,15 @@
+//
+//  MewInitInfoModel.swift
+//  yinmeng-ios
+//
+//  Created by duoban on 2024/1/19.
+//
+
+import UIKit
+
+class MewInitInfoModel: NSObject {
+ 
+    @objc  var  officialMsgUids:[String] = []
+
+    @objc  var  officialAccountUids:[String] = []
+}

yinmeng-ios/yinmeng-ios/Global/MewBaseEnumType.h

@@ -1,12 +1,12 @@
 //
-//  MewEnum.h
+//  MewBaseEnumType.h
 //  yinmeng-ios
 //
-//  Created by duoban on 2023/12/5.
+//  Created by duoban on 2024/1/20.
 //
 
-#ifndef MewEnum_h
+#ifndef MewBaseEnumType_h
-#define MewEnum_h
+#define MewBaseEnumType_h
 
 typedef NS_ENUM(NSInteger, MewSexType) {
     MewSexType_Male = 1,///男性
@@ -41,4 +41,17 @@ typedef NS_ENUM(NSUInteger, MewOCServerManagerType) {
     MewOCServerManagerTypeGET,
 
 };
-#endif /* MewEnum_h */
+typedef NS_ENUM(NSInteger, MewChatMsgItemType) {
+    ///发送图片
+    MewChatMsgItemType_Photo = 1,
+};
+typedef NS_ENUM(NSInteger, MewMineCellType){
+    MewMineCellType_Phone, ///手机号
+    MewMineCellType_Password,///登录密码
+    MewMineCellType_About,///关于我们
+    MewMineCellType_Account, ///注销账号
+    MewMineCellType_Pay,///充值
+    MewMineCellType_MyRoom ,//我的房间
+};
+
+#endif /* MewBaseEnumType_h */

yinmeng-ios/yinmeng-ios/Global/MewConstant.m

@@ -45,7 +45,7 @@ NSString * const KeyWithType(KeyType type) {
 
 
 + (CAAnimationGroup *)mewGEtPoint:(CGPoint)startPoint endPoint:(CGPoint)endPoint {
-    CGPoint centerPoint = CGPointMake(KScreenWidth / 2, KScreenHeight / 2);
+    CGPoint centerPoint = CGPointMake(KMewGetScreenWidth / 2, KMewGetScreenHeight / 2);
     CAKeyframeAnimation *animation0 = [CAKeyframeAnimation animation];
     animation0.duration = 0.8;
     animation0.keyPath = @"transform.scale";

yinmeng-ios/yinmeng-ios/Global/MewHtmlUrl.h

@@ -1,24 +0,0 @@
-//
-//  MewHtmlUrl.h
-//  yinmeng-ios
-//
-//  Created by 触海 on 2023/11/23.
-//
-
-#import <Foundation/Foundation.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface MewHtmlUrl : NSObject
-
-typedef NS_ENUM(NSUInteger, URLType) {
-    kPrivacyURL,///隐私政策
-    kCancelAccout, /// 注销账号
-    kUserProtocalURL ///用户协议
-};
-
-
-NSString * const URLWithType(URLType type);
-@end
-
-NS_ASSUME_NONNULL_END

yinmeng-ios/yinmeng-ios/Global/MewHtmlUrl.m

@@ -1,23 +0,0 @@
-//
-//  MewHtmlUrl.m
-//  yinmeng-ios
-//
-//  Created by 触海 on 2023/11/23.
-//
-
-#import "MewHtmlUrl.h"
-
-@implementation MewHtmlUrl
-
-NSString * const URLWithType(URLType type) {
-    NSString * prefix = @"mew";
-    NSDictionary * dic = @{
-        @(kPrivacyURL)           : [MewEncryptManager mewAESDecryptText:@"RW2RUxUBFSQXiYS0xFpDv+HMdWG2/xfjkYMyeSFR/BY="],//隐私政策modules/rule/privacy-wap.html
-        @(kCancelAccout)         : [MewEncryptManager mewAESDecryptText:@"OdODqmY17B0vG9Gs7FGtEuzMJQXILqziECH6PQoOSLo="],//注销账号modules/logout/index.html
-        @(kUserProtocalURL)      : [MewEncryptManager mewAESDecryptText:@"oSYlxZYQP2Vu+3KRnQorypsYWQGEz2tKII7AwcFks7s="],///用户协议modules/rule/protocol.html
-    };
-    NSString * url = [dic objectForKey:@(type)];
-    return [NSString stringWithFormat:@"%@/%@",prefix, url];
-}
-    
-@end

yinmeng-ios/yinmeng-ios/Global/MewMacro.h

@@ -8,8 +8,7 @@
 #ifndef MewMacro_h
 #define MewMacro_h
 
-//iPhoneX系列设备(刘海屏设备）
+#define MewGetXHeight \
-#define iPhoneXSeries \
 ({BOOL isPhoneXSeries = NO;\
 if (@available(iOS 11.0, *)) {\
 isPhoneXSeries = [[UIApplication sharedApplication] delegate].window.safeAreaInsets.bottom > 0.0;\
@@ -17,37 +16,35 @@ isPhoneXSeries = [[UIApplication sharedApplication] delegate].window.safeAreaIns
 (isPhoneXSeries);})
 
 
-#define KScreenWidth [[UIScreen mainScreen] bounds].size.width
+#define KMewGetScreenWidth [[UIScreen mainScreen] bounds].size.width
-#define KScreenHeight [[UIScreen mainScreen] bounds].size.height
+#define KMewGetScreenHeight [[UIScreen mainScreen] bounds].size.height
-#define statusbarHeight  [[UIApplication sharedApplication] statusBarFrame].size.height
-#define kStatusBarHeight statusbarHeight
-#define kSafeAreaBottomHeight (iPhoneXSeries ? 34 : 0)
-#define kSafeAreaTopHeight (iPhoneXSeries ? 24 : 0)
-#define kNavigationHeight (kStatusBarHeight + 44)
-#define kTabBarHeight (iPhoneXSeries ? 49.0+34.0 : 49.0)
-#define kScreenScale ((CGFloat)KScreenWidth / (CGFloat)375)
-#define kScreenHeightScale ((CGFloat)KScreenHeight / (CGFloat)812)
-#define kRoundValue(value) round(kScreenScale * value)
 
-#define kHalfScreenHeight KScreenHeight * 0.65
+#define kMewGetBarHeight [[UIApplication sharedApplication] statusBarFrame].size.height
-#define kGetScaleWidth(width) kRoundValue(width)
+#define kMewGetSafeHeight (MewGetXHeight ? 34 : 0)
+#define kMewGetNavHeight (kMewGetBarHeight + 44)
+#define kMewGetTabBarHeight (MewGetXHeight ? 49.0+34.0 : 49.0)
+#define kMewSetScreenScale ((CGFloat)KMewGetScreenWidth / (CGFloat)375)
+
+
+
+#define kMewSetScaleWidth(width) round(kMewSetScreenScale * width)
 
 
 #define kWeakify(o) try{}@finally{} __weak typeof(o) o##Weak = o;
 #define kStrongify(o) autoreleasepool{} __strong typeof(o) o = o##Weak;
 
 ///UIFont
-#define kFontRegular(font) [UIFont systemFontOfSize:kGetScaleWidth(font) weight:UIFontWeightRegular]
+#define kMewSetFontRegular(font) [UIFont systemFontOfSize:kMewSetScaleWidth(font) weight:UIFontWeightRegular]
-#define kFontMedium(font) [UIFont systemFontOfSize:kGetScaleWidth(font) weight:UIFontWeightMedium]
+#define kMewSetFontMedium(font) [UIFont systemFontOfSize:kMewSetScaleWidth(font) weight:UIFontWeightMedium]
-#define kFontSemibold(font) [UIFont systemFontOfSize:kGetScaleWidth(font) weight:UIFontWeightSemibold]
+#define kMewSetFontSemibold(font) [UIFont systemFontOfSize:kMewSetScaleWidth(font) weight:UIFontWeightSemibold]
-#define kFontBold(font) [UIFont systemFontOfSize:kGetScaleWidth(font) weight:UIFontWeightBold]
+
-#define kFontHeavy(font) [UIFont systemFontOfSize:kGetScaleWidth(font) weight:UIFontWeightHeavy]
+
 
 ///image
-#define kImage(image) [UIImage imageNamed:image]
+#define kMewGetImageData(image) [UIImage imageNamed:image]
-/// ofType，需要写出.png/.jpg，如@"img.png"
+
-#define kFileImgeName(filePath)  [[NSBundle mainBundle] pathForResource:fileName ofType:nil]
+
-#define kFileImage(image)  [UIImage imageWithContentsOfFile:image]
+
 ///keyWindow
-#define kWindow [UIApplication sharedApplication].keyWindow
+#define kAppKeyWindow [UIApplication sharedApplication].keyWindow
 #endif /* MewMacro_h */

yinmeng-ios/yinmeng-ios/Main/Game/MewMainHomeEmptyCell.m

@@ -52,7 +52,7 @@
         _mewtextView.text = @"暂无数据";
         _mewtextView.font = [UIFont systemFontOfSize:16];
         _mewtextView.textAlignment = NSTextAlignmentCenter;
-        _mewtextView.textColor = [MewThemeColor mewSecondTextColor];
+        _mewtextView.textColor = [MewAppColor mewSecondTextColor];
     }
     return _mewtextView;
 }

yinmeng-ios/yinmeng-ios/Main/Game/MewMainHomeHotRoomModel.h

@@ -1,68 +0,0 @@
-//
-//  MewMainHomeHotRoomModel.h
-//  xplan-ios
-//
-//  Created by duoban on 2023/12/21.
-//
-
-#import <Foundation/Foundation.h>
-
-#import "MewMainHomeBannerInfoModel.h"
-NS_ASSUME_NONNULL_BEGIN
-@class MewMainHomeHotMicUserModel;
-@interface MewMainHomeHotRoomModel : NSObject
-@property(nonatomic,copy) NSString *mgId;
-@property(nonatomic,assign) int state;
-///头像
-@property (nonatomic,copy) NSString *avatar;
-///在线人数
-@property (nonatomic,assign) NSInteger onlineNum;
-///房主的uid
-@property (nonatomic,copy) NSString *roomUid;
-///房间的tag
-@property (nonatomic,copy) NSString *roomTag;
-///标题
-@property (nonatomic,copy) NSString *title;
-///tag的图片
-@property (nonatomic,copy) NSString *tagPict;
-///性别
-@property (nonatomic,assign) MewSexType gender;
-///房主的昵称
-@property (nonatomic,copy) NSString *nick;
-///房间的id
-@property (nonatomic,copy) NSString *roomId;
-///房主的uid
-@property (nonatomic,copy) NSString *uid;
-///房间简介
-@property(nonatomic, copy) NSString *roomDesc;
-///排列的顺序
-@property (nonatomic,strong) NSNumber * seq;
-///最新推荐上面的标签
-@property (nonatomic,copy) NSString *iconContent;
-///是否在跨房PK中
-@property (nonatomic, assign) BOOL crossPking;
-///是否是推荐房间
-@property (nonatomic, assign) BOOL isRecommend;
-///麦上用户
-@property (nonatomic, strong) NSArray<MewMainHomeHotMicUserModel *> *micUsers;
-@property(nonatomic,copy) NSString *backgroundPic;
-@property (nonatomic, copy) NSString *erbanNo;
-///列表中的banner信息
-@property (nonatomic, strong) NSArray<MewMainHomeBannerInfoModel *> *bannerVoList;
-@property(nonatomic,assign) BOOL isBanner;
-@end
-
-
-
-@interface MewMainHomeHotMicUserModel : NSObject
-///头像
-@property (nonatomic, copy) NSString *avatar;
-///性别
-@property (nonatomic,assign) MewSexType gender;
-///姓名
-@property (nonatomic,copy) NSString *nick;
-///用户的uid
-@property (nonatomic,copy) NSString *uid;
-
-@end
-NS_ASSUME_NONNULL_END

yinmeng-ios/yinmeng-ios/Main/Game/MewMainHomeHotRoomModel.m

@@ -1,21 +0,0 @@
-//
-//  MewMainHomeHotRoomModel.m
-//  xplan-ios
-//
-//  Created by duoban on 2023/12/21.
-//
-
-#import "MewMainHomeHotRoomModel.h"
-
-@implementation MewMainHomeHotRoomModel
-+ (NSDictionary *)objectClassInArray {
-    return @{
-        @"micUsers": [MewMainHomeHotMicUserModel class],
-        @"bannerVoList": [MewMainHomeBannerInfoModel class]
-    };
-}
-
-@end
-@implementation MewMainHomeHotMicUserModel
-
-@end

yinmeng-ios/yinmeng-ios/Main/Game/MewMainHomeMakeFriendModel.h

@@ -13,16 +13,15 @@ NS_ASSUME_NONNULL_BEGIN
 ///头像
 @property(nonatomic,copy) NSString *avatar;
 ///出生日期
-@property (nonatomic,assign) long birth;
+
-@property (nonatomic , assign) MewSexType gender;
+
-@property(nonatomic,assign) int inMic;
+
-@property(nonatomic,assign) int inOnline;
 @property(nonatomic,copy) NSString *inRoomUid;
 @property(nonatomic,copy) NSString *nick;
 @property(nonatomic,copy) NSString *roomTitle;
 @property(nonatomic,copy) NSString *uid;
 @property(nonatomic,strong) MewMainHomeMakeFriendCardModel *voiceCard;
-@property(nonatomic,assign) int lock;
+
 ///首页点单游戏信息
 @property(nonatomic,strong) UserGameInfoVo *userGamePartnerVo;
 @property(nonatomic,copy) NSString *playTime;

yinmeng-ios/yinmeng-ios/Main/Game/MewMainHomeMoreGameCell.m

@@ -24,19 +24,19 @@
         [self installConstraints];
         for (int i = 0; i < 5; i++) {
           
-        UIImage *placeHolder = i == 4 ? kImage(@"mew_main_home_more_game_add"):kImage(@"mew_main_home_more_game_mic");
+        UIImage *placeHolder = i == 4 ? kMewGetImageData(@"mew_main_home_more_game_add"):kMewGetImageData(@"mew_main_home_more_game_mic");
             UIImageView *imageView = [[UIImageView alloc]init];
             imageView.image = placeHolder;
             [self.mewMicNumBgView addSubview:imageView];
             imageView.tag = 99+i;
-            imageView.layer.cornerRadius = kGetScaleWidth(18)/2;
+            imageView.layer.cornerRadius = kMewSetScaleWidth(18)/2;
             imageView.layer.masksToBounds = YES;
             imageView.layer.borderWidth = 0;
             imageView.layer.borderColor = [UIColor whiteColor].CGColor;
-            CGFloat x = kGetScaleWidth(6) + i * kGetScaleWidth(12);
+            CGFloat x = kMewSetScaleWidth(6) + i * kMewSetScaleWidth(12);
             [imageView mas_makeConstraints:^(MASConstraintMaker *make) {
                 make.leading.mas_equalTo(x);
-                make.width.height.mas_equalTo(kGetScaleWidth(18));
+                make.width.height.mas_equalTo(kMewSetScaleWidth(18));
                 make.centerY.equalTo(self.mewMicNumBgView);
             }];
             
@@ -58,36 +58,36 @@
         make.edges.equalTo(self.contentView);
     }];
     [self.mewIconView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.width.height.mas_equalTo(kGetScaleWidth(40));
+        make.width.height.mas_equalTo(kMewSetScaleWidth(40));
-        make.leading.mas_equalTo(kGetScaleWidth(8));
+        make.leading.mas_equalTo(kMewSetScaleWidth(8));
-        make.top.mas_equalTo(kGetScaleWidth(12));
+        make.top.mas_equalTo(kMewSetScaleWidth(12));
     }];
     
     [self.mewTitleView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.leading.mas_equalTo(kGetScaleWidth(52));
+        make.leading.mas_equalTo(kMewSetScaleWidth(52));
         make.centerY.equalTo(self.mewIconView);
-        make.height.mas_equalTo(kGetScaleWidth(20));
+        make.height.mas_equalTo(kMewSetScaleWidth(20));
-        make.trailing.mas_equalTo(-kGetScaleWidth(9));
+        make.trailing.mas_equalTo(-kMewSetScaleWidth(9));
     }];
     [self.mewSubView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.leading.mas_equalTo(kGetScaleWidth(12));
+        make.leading.mas_equalTo(kMewSetScaleWidth(12));
-        make.top.mas_equalTo(kGetScaleWidth(62));
+        make.top.mas_equalTo(kMewSetScaleWidth(62));
-        make.trailing.mas_equalTo(-kGetScaleWidth(9));
+        make.trailing.mas_equalTo(-kMewSetScaleWidth(9));
     }];
     [self.mewHotNumView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.trailing.mas_equalTo(-kGetScaleWidth(10));
+        make.trailing.mas_equalTo(-kMewSetScaleWidth(10));
-        make.height.mas_equalTo(kGetScaleWidth(14));
+        make.height.mas_equalTo(kMewSetScaleWidth(14));
-        make.bottom.mas_equalTo(-kGetScaleWidth(14));
+        make.bottom.mas_equalTo(-kMewSetScaleWidth(14));
     }];
     [self.mewHotView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.width.height.mas_equalTo(kGetScaleWidth(12));
+        make.width.height.mas_equalTo(kMewSetScaleWidth(12));
         make.centerY.equalTo(self.mewHotNumView);
-        make.trailing.equalTo(self.mewHotNumView.mas_leading).mas_offset(-kGetScaleWidth(1));
+        make.trailing.equalTo(self.mewHotNumView.mas_leading).mas_offset(-kMewSetScaleWidth(1));
     }];
     [self.mewMicNumBgView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.height.mas_equalTo(kGetScaleWidth(22));
+        make.height.mas_equalTo(kMewSetScaleWidth(22));
-        make.width.mas_equalTo(kGetScaleWidth(78));
+        make.width.mas_equalTo(kMewSetScaleWidth(78));
-        make.leading.mas_equalTo(kGetScaleWidth(10));
+        make.leading.mas_equalTo(kMewSetScaleWidth(10));
         make.centerY.equalTo(self.mewHotView);
     }];
 }
@@ -113,7 +113,7 @@
   
     for (int i = 0; i < 5; i++) {
         UIImageView *imageView = [self.mewMicNumBgView viewWithTag:99+i];
-        imageView.image = i == 4 ? kImage(@"mew_main_home_more_game_add"):kImage(@"mew_main_home_more_game_mic");
+        imageView.image = i == 4 ? kMewGetImageData(@"mew_main_home_more_game_add"):kMewGetImageData(@"mew_main_home_more_game_mic");
         imageView.layer.borderWidth = 0;
         
     }
@@ -126,7 +126,7 @@
         _mewBgImageView = [[UIImageView alloc]init];
         _mewBgImageView.contentMode = UIViewContentModeScaleAspectFill;
         _mewBgImageView.clipsToBounds = YES ;
-        _mewBgImageView.layer.cornerRadius = kGetScaleWidth(12);
+        _mewBgImageView.layer.cornerRadius = kMewSetScaleWidth(12);
         _mewBgImageView.layer.masksToBounds = YES;
     }
     return _mewBgImageView;
@@ -135,7 +135,7 @@
     if(!_mewIconView){
         
         _mewIconView = [[UIImageView alloc]init];
-        _mewIconView.layer.cornerRadius = kGetScaleWidth(40)/2;
+        _mewIconView.layer.cornerRadius = kMewSetScaleWidth(40)/2;
         _mewIconView.layer.masksToBounds = YES;
     }
     return _mewIconView;
@@ -143,8 +143,8 @@
 - (UILabel *)mewTitleView{
     if(!_mewTitleView){
         _mewTitleView = [UILabel new];
-        _mewTitleView.font = kFontMedium(14);
+        _mewTitleView.font = kMewSetFontMedium(14);
-        _mewTitleView.textColor = UIColorMewFromRGB(0x2B2D33);
+        _mewTitleView.textColor = [MewAppColor mewGetColorOfTextWithHexString:@"0x2B2D33"];
       
         
     }
@@ -153,8 +153,8 @@
 - (UILabel *)mewSubView{
     if(!_mewSubView){
         _mewSubView  = [UILabel new];
-        _mewSubView .font = kFontRegular(11);
+        _mewSubView .font = kMewSetFontRegular(11);
-        _mewSubView .textColor = UIColorMewFromRGB(0x696D7A);
+        _mewSubView .textColor =[MewAppColor mewGetColorOfTextWithHexString:@"0x696D7A"];
      
     }
     return _mewSubView;
@@ -163,8 +163,8 @@
     if(!_mewHotNumView){
         _mewHotNumView  = [UILabel new];
         _mewHotNumView.text = @"0";
-        _mewHotNumView.font = kFontBold(11);
+        _mewHotNumView.font = [UIFont systemFontOfSize:kMewSetScaleWidth(11) weight:UIFontWeightBold];
-        _mewHotNumView.textColor = UIColorMewFromRGB(0x696D7A);
+        _mewHotNumView.textColor =[MewAppColor mewGetColorOfTextWithHexString:@"0x696D7A"];
        
     }
     return _mewHotNumView;
@@ -172,7 +172,7 @@
 - (UIImageView *)mewHotView{
     if(!_mewHotView){
         _mewHotView = [UIImageView new];
-        _mewHotView.image = kImage(@"mew_main_home_more_game_hot");
+        _mewHotView.image = kMewGetImageData(@"mew_main_home_more_game_hot");
     }
     return _mewHotView;
 }
@@ -180,7 +180,7 @@
     if(!_mewMicNumBgView){
         _mewMicNumBgView = [UIView new];
         _mewMicNumBgView.backgroundColor = [UIColor colorWithWhite:1 alpha:0.6];
-        _mewMicNumBgView.layer.cornerRadius = kGetScaleWidth(22)/2;
+        _mewMicNumBgView.layer.cornerRadius = kMewSetScaleWidth(22)/2;
         _mewMicNumBgView.layer.masksToBounds = YES;
         _mewMicNumBgView.layer.borderWidth = 0.5;
         _mewMicNumBgView.layer.borderColor = [UIColor whiteColor].CGColor;

yinmeng-ios/yinmeng-ios/Main/Game/MewMainHomeMoreGameHeadView.m

@@ -62,10 +62,10 @@
 - (UICollectionView *)mewCollectionView{
     if(!_mewCollectionView){
         UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc]init];
-        layout.itemSize = CGSizeMake(kGetScaleWidth(82), kGetScaleWidth(67));
+        layout.itemSize = CGSizeMake(kMewSetScaleWidth(82), kMewSetScaleWidth(67));
-        layout.sectionInset = UIEdgeInsetsMake(0, kGetScaleWidth(10), 0, kGetScaleWidth(10));
+        layout.sectionInset = UIEdgeInsetsMake(0, kMewSetScaleWidth(10), 0, kMewSetScaleWidth(10));
-        layout.minimumLineSpacing = kGetScaleWidth(5);
+        layout.minimumLineSpacing = kMewSetScaleWidth(5);
-        layout.minimumInteritemSpacing = kGetScaleWidth(5);
+        layout.minimumInteritemSpacing = kMewSetScaleWidth(5);
         layout.scrollDirection = UICollectionViewScrollDirectionHorizontal;
         
         _mewCollectionView = [[UICollectionView alloc]initWithFrame:CGRectZero collectionViewLayout:layout];

yinmeng-ios/yinmeng-ios/Main/Game/MewMainHomeMoreGameVC.m

@@ -66,11 +66,11 @@
     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.stateLabel.textColor = [MewAppColor mewSecondTextColor];
-    header.lastUpdatedTimeLabel.textColor = [MewThemeColor mewSecondTextColor];
+    header.lastUpdatedTimeLabel.textColor = [MewAppColor mewSecondTextColor];
     self.mewCollectionView.mj_header = header;
     
-    [MewOCServerManager mewRequestMainHomeGameTabList:^(MewBaseModel * _Nonnull obj, NSInteger num, NSString * _Nonnull text) {
+    [MewOCServerManager mewRequestMainHomeGameTabList:^(MewNetworkDataModel * _Nonnull obj, NSInteger num, NSString * _Nonnull text) {
         if(obj.code == 200){
             NSArray *list = [MewMainHomeGameTabModel mewModelsWithArray:obj.data];
             self.mewGameList = [NSMutableArray arrayWithArray:list];
@@ -84,7 +84,7 @@
 
 }
 -(void)mew_headerRefresh{
-    [MewOCServerManager mewRequestMainHomeNewFriendList:^(MewBaseModel * _Nonnull obj, NSInteger num, NSString * _Nonnull text) {
+    [MewOCServerManager mewRequestMainHomeNewFriendList:^(MewNetworkDataModel * _Nonnull obj, NSInteger num, NSString * _Nonnull text) {
         if(obj.code == 200){
             NSArray * array = [MewMainHomeMakeFriendModel mewModelsWithArray:obj.data];
             self.mewRoomList = [NSMutableArray arrayWithArray:array];
@@ -99,33 +99,34 @@
 }
 -(void)mewChooseAllAction{
     self.mewSex = nil;
-    self.mewSelecteAllBGView.backgroundColor = UIColorMewRGBAlpha(0xffffff, 1);
+    self.mewSelecteAllBGView.backgroundColor =
-    self.mewSelecteManBGView.backgroundColor = UIColorMewRGBAlpha(0xffffff, 0.4);
+    [MewAppColor mewGetAlphaColorOfTextWithHexString:@"0xffffff" alpha:1];
-    self.mewSelecteMomanBGView.backgroundColor = UIColorMewRGBAlpha(0xffffff, 0.4);
+    self.mewSelecteManBGView.backgroundColor = [MewAppColor mewGetAlphaColorOfTextWithHexString:@"0xffffff" alpha:0.4];
+    self.mewSelecteMomanBGView.backgroundColor = [MewAppColor mewGetAlphaColorOfTextWithHexString:@"0xffffff" alpha:0.4];
     [self.mewCollectionView.mj_header beginRefreshing];
 }
 -(void)mewChooseManAction{
     self.mewSex = @"1";
-    self.mewSelecteAllBGView.backgroundColor = UIColorMewRGBAlpha(0xffffff, 0.4);
+    self.mewSelecteAllBGView.backgroundColor = [MewAppColor mewGetAlphaColorOfTextWithHexString:@"0xffffff" alpha:0.4];
-    self.mewSelecteManBGView.backgroundColor = UIColorMewRGBAlpha(0xffffff, 1);
+    self.mewSelecteManBGView.backgroundColor = [MewAppColor mewGetAlphaColorOfTextWithHexString:@"0xffffff" alpha:1];
-    self.mewSelecteMomanBGView.backgroundColor = UIColorMewRGBAlpha(0xffffff, 0.4);
+    self.mewSelecteMomanBGView.backgroundColor = [MewAppColor mewGetAlphaColorOfTextWithHexString:@"0xffffff" alpha:0.4];
     [self.mewCollectionView.mj_header beginRefreshing];
 }
 -(void)mewChooseMomanAction{
     self.mewSex = @"2";
-    self.mewSelecteAllBGView.backgroundColor = UIColorMewRGBAlpha(0xffffff, 0.4);
+    self.mewSelecteAllBGView.backgroundColor = [MewAppColor mewGetAlphaColorOfTextWithHexString:@"0xffffff" alpha:0.4];
-    self.mewSelecteMomanBGView.backgroundColor = UIColorMewRGBAlpha(0xffffff, 1);
+    self.mewSelecteMomanBGView.backgroundColor = [MewAppColor mewGetAlphaColorOfTextWithHexString:@"0xffffff" alpha:1];
-    self.mewSelecteManBGView.backgroundColor = UIColorMewRGBAlpha(0xffffff, 0.4);
+    self.mewSelecteManBGView.backgroundColor = [MewAppColor mewGetAlphaColorOfTextWithHexString:@"0xffffff" alpha:0.4];
     [self.mewCollectionView.mj_header beginRefreshing];
 }
 
 
 -(void)installConstraints{
-    CGFloat top = kStatusBarHeight + 11;
+    CGFloat top = kMewGetBarHeight + 11;
     [self.mewSelecteAllBGView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.leading.mas_equalTo(kGetScaleWidth(15));
+        make.leading.mas_equalTo(kMewSetScaleWidth(15));
-        make.width.mas_equalTo(kGetScaleWidth(52));
+        make.width.mas_equalTo(kMewSetScaleWidth(52));
-        make.height.mas_equalTo(kGetScaleWidth(22));
+        make.height.mas_equalTo(kMewSetScaleWidth(22));
         make.top.mas_equalTo(top);
     }];
     [self.mewSelecteAllTextView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -133,9 +134,9 @@
     }];
     
     [self.mewSelecteMomanBGView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.leading.equalTo(self.mewSelecteAllBGView.mas_trailing).mas_offset(kGetScaleWidth(15));
+        make.leading.equalTo(self.mewSelecteAllBGView.mas_trailing).mas_offset(kMewSetScaleWidth(15));
-        make.width.mas_equalTo(kGetScaleWidth(52));
+        make.width.mas_equalTo(kMewSetScaleWidth(52));
-        make.height.mas_equalTo(kGetScaleWidth(22));
+        make.height.mas_equalTo(kMewSetScaleWidth(22));
         make.top.mas_equalTo(top);
     }];
     [self.mewSelecteMomanTextView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -143,9 +144,9 @@
     }];
     
     [self.mewSelecteManBGView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.leading.equalTo(self.mewSelecteMomanBGView.mas_trailing).mas_offset(kGetScaleWidth(15));
+        make.leading.equalTo(self.mewSelecteMomanBGView.mas_trailing).mas_offset(kMewSetScaleWidth(15));
-        make.width.mas_equalTo(kGetScaleWidth(52));
+        make.width.mas_equalTo(kMewSetScaleWidth(52));
-        make.height.mas_equalTo(kGetScaleWidth(22));
+        make.height.mas_equalTo(kMewSetScaleWidth(22));
         make.top.mas_equalTo(top);
     }];
     [self.mewSelecteManTextView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -158,7 +159,7 @@
    
     [self.mewCollectionView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.leading.trailing.bottom.equalTo(self.view);
-        make.top.mas_equalTo(kNavigationHeight);
+        make.top.mas_equalTo(kMewGetNavHeight);
     }];
 }
 
@@ -179,7 +180,7 @@
     return  CGSizeMake(0, 0);
 }
 -(CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath{
-    return CGSizeMake(kGetScaleWidth(168), kGetScaleWidth(148));
+    return CGSizeMake(kMewSetScaleWidth(168), kMewSetScaleWidth(148));
 }
 - (UICollectionReusableView *)collectionView:(UICollectionView *)collectionView viewForSupplementaryElementOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath
 {
@@ -218,7 +219,7 @@
 - (UIButton *)mewBackBtn{
     if(!_mewBackBtn){
         _mewBackBtn = [UIButton new];
-        [_mewBackBtn setImage:kImage(@"mew_mainHome_more_game_back") forState:UIControlStateNormal];
+        [_mewBackBtn setImage:kMewGetImageData(@"mew_mainHome_more_game_back") forState:UIControlStateNormal];
         [_mewBackBtn mew_setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10];
         [_mewBackBtn addTarget:self action:@selector(mew_dissViewAction) forControlEvents:UIControlEventTouchUpInside];
     }
@@ -228,9 +229,9 @@
     if(!_mewCollectionView){
         UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc]init];
       
-        layout.sectionInset = UIEdgeInsetsMake(kGetScaleWidth(16), kGetScaleWidth(15), kGetScaleWidth(15), kGetScaleWidth(15));
+        layout.sectionInset = UIEdgeInsetsMake(kMewSetScaleWidth(16), kMewSetScaleWidth(15), kMewSetScaleWidth(15), kMewSetScaleWidth(15));
-        layout.minimumLineSpacing = kGetScaleWidth(8);
+        layout.minimumLineSpacing = kMewSetScaleWidth(8);
-        layout.minimumInteritemSpacing = kGetScaleWidth(8);
+        layout.minimumInteritemSpacing = kMewSetScaleWidth(8);
         _mewCollectionView = [[UICollectionView alloc]initWithFrame:CGRectZero collectionViewLayout:layout];
         _mewCollectionView.backgroundColor = [UIColor clearColor];
         _mewCollectionView.delegate = self;
@@ -247,15 +248,15 @@
 - (UIImageView *)mewBgImageView{
     if(!_mewBgImageView){
         _mewBgImageView = [UIImageView new];
-        _mewBgImageView.image = kImage(@"mew_home_bg");
+        _mewBgImageView.image = kMewGetImageData(@"mew_home_bg");
     }
     return _mewBgImageView;
 }
 - (UIView *)mewSelecteAllBGView{
     if(!_mewSelecteAllBGView){
         _mewSelecteAllBGView = [UIView new];
-        _mewSelecteAllBGView.backgroundColor = UIColorMewRGBAlpha(0xffffff, 1);
+        _mewSelecteAllBGView.backgroundColor = [MewAppColor mewGetAlphaColorOfTextWithHexString:@"0xffffff" alpha:1];
-        _mewSelecteAllBGView.layer.cornerRadius = kGetScaleWidth(22)/2;
+        _mewSelecteAllBGView.layer.cornerRadius = kMewSetScaleWidth(22)/2;
         _mewSelecteAllBGView.layer.masksToBounds = YES;
         UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(mewChooseAllAction)];
         [_mewSelecteAllBGView addGestureRecognizer:tap];
@@ -266,8 +267,8 @@
     if(!_mewSelecteAllTextView){
         _mewSelecteAllTextView = [UILabel new];
         _mewSelecteAllTextView.text = @"全部";
-        _mewSelecteAllTextView.font = kFontRegular(11);
+        _mewSelecteAllTextView.font = kMewSetFontRegular(11);
-        _mewSelecteAllTextView.textColor = UIColorMewFromRGB(0x696D7A);
+        _mewSelecteAllTextView.textColor = [MewAppColor mewGetColorOfTextWithHexString:@"0x696D7A"];
         _mewSelecteAllTextView.textAlignment = NSTextAlignmentCenter;
     }
     return _mewSelecteAllTextView;
@@ -275,8 +276,8 @@
 - (UIView *)mewSelecteManBGView{
     if(!_mewSelecteManBGView){
         _mewSelecteManBGView = [UIView new];
-        _mewSelecteManBGView.backgroundColor = UIColorMewRGBAlpha(0xffffff, 0.5);
+        _mewSelecteManBGView.backgroundColor = [MewAppColor mewGetAlphaColorOfTextWithHexString:@"0xffffff" alpha:0.5];
-        _mewSelecteManBGView.layer.cornerRadius = kGetScaleWidth(22)/2;
+        _mewSelecteManBGView.layer.cornerRadius = kMewSetScaleWidth(22)/2;
         _mewSelecteManBGView.layer.masksToBounds = YES;
         UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(mewChooseManAction)];
         [_mewSelecteManBGView addGestureRecognizer:tap];
@@ -287,8 +288,8 @@
     if(!_mewSelecteManTextView){
         _mewSelecteManTextView = [UILabel new];
         _mewSelecteManTextView.text = @"男生";
-        _mewSelecteManTextView.font = kFontRegular(11);
+        _mewSelecteManTextView.font = kMewSetFontRegular(11);
-        _mewSelecteManTextView.textColor = UIColorMewFromRGB(0x696D7A);
+        _mewSelecteManTextView.textColor = [MewAppColor mewGetColorOfTextWithHexString:@"0x696D7A"];
         _mewSelecteManTextView.textAlignment = NSTextAlignmentCenter;
     }
     return _mewSelecteManTextView;
@@ -296,8 +297,8 @@
 - (UIView *)mewSelecteMomanBGView{
     if(!_mewSelecteMomanBGView){
         _mewSelecteMomanBGView = [UIView new];
-        _mewSelecteMomanBGView.backgroundColor = UIColorMewRGBAlpha(0xffffff, 0.5);
+        _mewSelecteMomanBGView.backgroundColor = [MewAppColor mewGetAlphaColorOfTextWithHexString:@"0xffffff" alpha:0.5];
-        _mewSelecteMomanBGView.layer.cornerRadius = kGetScaleWidth(22)/2;
+        _mewSelecteMomanBGView.layer.cornerRadius = kMewSetScaleWidth(22)/2;
         _mewSelecteMomanBGView.layer.masksToBounds = YES;
         UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(mewChooseMomanAction)];
         [_mewSelecteMomanBGView addGestureRecognizer:tap];
@@ -308,8 +309,8 @@
     if(!_mewSelecteMomanTextView){
         _mewSelecteMomanTextView = [UILabel new];
         _mewSelecteMomanTextView.text = @"女生";
-        _mewSelecteMomanTextView.font = kFontRegular(11);
+        _mewSelecteMomanTextView.font = kMewSetFontRegular(11);
-        _mewSelecteMomanTextView.textColor = UIColorMewFromRGB(0x696D7A);
+        _mewSelecteMomanTextView.textColor = [MewAppColor mewGetColorOfTextWithHexString:@"0x696D7A"];
         _mewSelecteMomanTextView.textAlignment = NSTextAlignmentCenter;
     }
     return _mewSelecteMomanTextView;

yinmeng-ios/yinmeng-ios/Main/Home/View/MewHomeViewController.m

@@ -22,12 +22,11 @@
 #import <NIMSDK/NIMSDK.h>
 /// Tool
 #import "MewMacro.h"
-#import "MewThemeColor.h"
+
 #import "MewHUDTool.h"
 
-/// Model
+
-#import "MewFansInfoModel.h"
+
-#import "MewUserInfoModel.h"
 
 #import <IQKeyboardManager/IQKeyboardManager.h>
 #import <NIMSDK/NIMSDK.h>
@@ -59,9 +58,9 @@
 @property (nonatomic, strong) MewHomeFilterView *filterView;
 
 /// 获取的用户数据数组
-@property (nonatomic, strong) NSArray<MewUserInfoModel *> *MewUserInfoModels;
+@property (nonatomic, strong) NSArray<MewPersonInfoModel *> *MewPersonInfoModels;
 /// 自己的model
-@property (nonatomic, strong) MewUserInfoModel *selfMineModel;
+@property (nonatomic, strong) MewPersonInfoModel *selfMineModel;
 /// 点击用户的id
 @property (nonatomic, copy) NSString *targetUid;
 /// 过滤字符串
@@ -76,7 +75,7 @@
 @property (nonatomic,assign) int page;
 ///更多数据
 @property (nonatomic,assign) BOOL hasNoMoreData;
-@property (nonatomic, strong) NSMutableArray<MewUserInfoModel *> *fansListModels;
+@property (nonatomic, strong) NSMutableArray<MewPersonInfoModel *> *fansListModels;
 
 @end
 
@@ -107,12 +106,12 @@
 
 #pragma mark - Load Data (获取数据)
 - (void)mew_loadHomeDataWithGender:(NSString *)gender {
-    [MewOCServerManager mewRequestRandomFindFriendList:^(MewBaseModel * _Nullable obj, NSInteger num, NSString * _Nonnull text) {
+    [MewOCServerManager mewRequestRandomFindFriendList:^(MewNetworkDataModel * _Nullable obj, NSInteger num, NSString * _Nonnull text) {
         if(obj.code == 200){
-            NSArray *array = [MewUserInfoModel mewModelsWithArray:obj.data[@"randomList"]];
+            NSArray *array = [MewPersonInfoModel mewModelsWithArray:obj.data[@"randomList"]];
-            MewUserInfoModel *mineModel = [MewUserInfoModel mewModelWithDictionary:obj.data[@"me"]];
+            MewPersonInfoModel *mineModel = [MewPersonInfoModel mewModelWithDictionary:obj.data[@"me"]];
-            self.MewUserInfoModels = array;
+            self.MewPersonInfoModels = array;
-            self.showVoiceView.userInfoArrays = self.MewUserInfoModels;
+            self.showVoiceView.userInfoArrays = self.MewPersonInfoModels;
             self.selfMineModel = mineModel;
         }
     } gender:gender];
@@ -148,9 +147,9 @@
   
     NSString * pageStr = [NSString stringWithFormat:@"%@", page];
     NSString * pageSizeStr = [NSString stringWithFormat:@"%@", pageSize];
-    [MewOCServerManager mewGetLikeListInfo:^(MewBaseModel * _Nullable obj, NSInteger num, NSString * _Nonnull text) {
+    [MewOCServerManager mewGetLikeListInfo:^(MewNetworkDataModel * _Nullable obj, NSInteger num, NSString * _Nonnull text) {
         if(obj.code == 200){
-            NSArray * array = [MewUserInfoModel mewModelsWithArray:obj.data];
+            NSArray * array = [MewPersonInfoModel mewModelsWithArray:obj.data];
             if (state == 0) {
                 [self.fansListModels removeAllObjects];
                 [self.rightFollowVoiceView.followCollectionView.mj_header endRefreshing];
@@ -171,7 +170,7 @@
 }
 #pragma mark - MewHomeProtocol
 /// 获取用户的信息成功
-- (void)mew_getUserDetailInfoSuccess:(MewUserInfoModel *)userInfo {
+- (void)mew_getUserDetailInfoSuccess:(MewPersonInfoModel *)userInfo {
     NSLog(@"userInfo: %@",userInfo);
 //    [self.userIntroductionView setCurrentUserModel:userInfo];
 }
@@ -222,7 +221,7 @@
 #pragma mark - MewShowVoiceViewDelegate (中部用户信息回调)
 /// 点击
 - (void)mew_didSelectMewShowVoiceViewWithTargetIndex:(NSInteger)index {
-    [self mew_pushUserInfoView:UserIntroductionView_OtherUser userInfo:self.MewUserInfoModels[index]];
+    [self mew_pushUserInfoView:UserIntroductionView_OtherUser userInfo:self.MewPersonInfoModels[index]];
     
 }
 /// 发布声音秀
@@ -244,7 +243,7 @@
         NSString *uid = [[MewSaveBaseUserModel share]mewGetUserId];
         NSString *ticket = [[MewSaveBaseUserModel share]mewUserTicket];
         NSString *type = optionType == 1 ? @"1" : @"2";
-        [MewOCServerManager mewLikeUsr:^(MewBaseModel * _Nullable obj, NSInteger num, NSString * _Nonnull text) {
+        [MewOCServerManager mewLikeUsr:^(MewNetworkDataModel * _Nullable obj, NSInteger num, NSString * _Nonnull text) {
             if(obj.code == 200){
                 [MewHUDTool showSuccessWithMessage:  type ? @"关注成功" : @"取消关注成功"];
                 [self.userIntroductionView updateAttentionState:type];
@@ -283,7 +282,7 @@
     self.duration = dura;
     
     
-    [MewOCServerManager mewRequestUploadPhotoToken:^(MewBaseModel * _Nullable obj, NSInteger num, NSString * _Nonnull text) {
+    [MewOCServerManager mewRequestUploadPhotoToken:^(MewNetworkDataModel * _Nullable obj, NSInteger num, NSString * _Nonnull text) {
         NSString *mewKey = obj.data[@"key"];
         NSString *mewToken = obj.data[@"token"];
         [MewOCServerManager mewUploadPhotoAction:filePath name:mewKey token:mewToken successBlock:^(NSString * _Nonnull key, NSDictionary * _Nonnull res) {
@@ -291,7 +290,7 @@
             if (self.voiceString.length == 0 || self.voiceString == nil || [self.voiceString isEqualToString:@""]) {
                 self.voiceString = @"这个人很懒还没有签名";
             }
-            [MewOCServerManager mewPublishSoundInfo:^(MewBaseModel * _Nonnull data, NSInteger code, NSString * _Nonnull msg) {
+            [MewOCServerManager mewPublishSoundInfo:^(MewNetworkDataModel * _Nonnull data, NSInteger code, NSString * _Nonnull msg) {
                 if(code == 200){
                     [MewHUDTool showSuccessWithMessage:@"上传音频成功"];
                     [MewPushExclusiveVoiceView removeExclusiveViewFromSuperView];
@@ -311,7 +310,7 @@
 
 
 #pragma mark - MewRightFollowVoiceViewDelegate
-- (void)mew_didSelectRightFollowVoiceUser:(MewUserInfoModel *)userInfo {
+- (void)mew_didSelectRightFollowVoiceUser:(MewPersonInfoModel *)userInfo {
     [self mew_pushUserInfoView:UserIntroductionView_OtherUser userInfo:userInfo];
 }
 
@@ -344,20 +343,20 @@
 }
 
 #pragma mark -  Private Method
-- (void)mew_pushUserInfoView:(UserIntroductionType)type userInfo:(MewUserInfoModel *)userInfo {
+- (void)mew_pushUserInfoView:(UserIntroductionType)type userInfo:(MewPersonInfoModel *)userInfo {
     MewUserIntroductionView *view = [MewUserIntroductionView showUserIntroductionViewWithType:type delegate:self];
     self.userIntroductionView = view;
     [view setCurrentUserModel:userInfo];
     [self.view addSubview:view];
-//    if (self.MewUserInfoModels.count > index) {
+//    if (self.MewPersonInfoModels.count > index) {
         self.targetUid = [NSString stringWithFormat:@"%ld",userInfo.uid];
         // 获取当前用户的详细信息
-    [MewOCServerManager mewGetDetailData:^(MewBaseModel * _Nullable obj, NSInteger num, NSString * _Nonnull text) {
+    [MewOCServerManager mewGetDetailData:^(MewNetworkDataModel * _Nullable obj, NSInteger num, NSString * _Nonnull text) {
             
     } uid:self.targetUid page:@"1" pageSize:@"20"];
         // 获取与当前用户的关注状态
     NSString *uid = [[MewSaveBaseUserModel share]mewGetUserId];
-    [MewOCServerManager mewGetListStatus:^(MewBaseModel * _Nullable obj, NSInteger num, NSString * _Nonnull text) {
+    [MewOCServerManager mewGetListStatus:^(MewNetworkDataModel * _Nullable obj, NSInteger num, NSString * _Nonnull text) {
         if(obj.code == 200){
             BOOL isLike = ((NSNumber *)obj.data).boolValue;
             [self.userIntroductionView updateAttentionState:isLike];
@@ -394,13 +393,13 @@
 - (void)mew_mew_initLayoutView {
     self.containerBgImageView.frame = self.view.frame;
     self.containerScrollView.frame = self.view.frame;
-    self.headerView.frame = CGRectMake(0, (kStatusBarHeight + 25.0) * kScreenScale, KScreenWidth, self.headerView.height);
+    self.headerView.frame = CGRectMake(0, (kMewGetBarHeight + 25.0) * kMewSetScreenScale, KMewGetScreenWidth, self.headerView.height);
-    self.showVoiceView.frame = CGRectMake(12.0, CGRectGetMaxY(self.headerView.frame), KScreenWidth - 28, 600);
+    self.showVoiceView.frame = CGRectMake(12.0, CGRectGetMaxY(self.headerView.frame), KMewGetScreenWidth - 28, 600);
     
     /// 右边侧栏frame
     self.rightBgVoiceView.frame = CGRectMake(self.showVoiceView.frame.size.width - 40 + 5.0, CGRectGetMinY(self.showVoiceView.frame) + 2.0, 44, self.showVoiceView.viewHieght - 4.0);
     self.showRightButton.frame = CGRectMake((self.rightBgVoiceView.frame.size.width - 24)/2.0, (self.rightBgVoiceView.frame.size.height - 24)/2.0, 24, 24);
-    self.containerScrollView.contentSize = CGSizeMake(KScreenWidth, CGRectGetMaxY(self.showVoiceView.frame));
+    self.containerScrollView.contentSize = CGSizeMake(KMewGetScreenWidth, CGRectGetMaxY(self.showVoiceView.frame));
     
     [self mew_updateBounderRect:self.rightBgVoiceView];
 }
@@ -456,7 +455,9 @@
 - (UIView *)rightBgVoiceView {
     if (!_rightBgVoiceView) {
         _rightBgVoiceView = [[UIView alloc] init];
-        _rightBgVoiceView.backgroundColor = [MewThemeColor mewColorWithHexString:@"#1D1F33"];
+        _rightBgVoiceView.backgroundColor =
+        
+        [MewAppColor mewGetColorOfTextWithHexString:@"#1D1F33"];
     }
     return _rightBgVoiceView;
 }
@@ -476,7 +477,7 @@
 - (MewRightFollowVoiceView *)rightFollowVoiceView {
     if (!_rightFollowVoiceView) {
         _rightFollowVoiceView = [[MewRightFollowVoiceView alloc] init];
-        _rightFollowVoiceView.backgroundColor = [MewThemeColor mewColorWithHexString:@"#050505"];
+        _rightFollowVoiceView.backgroundColor = [MewAppColor mewGetColorOfTextWithHexString:@"#050505"];
         _rightFollowVoiceView.hidden = YES;
         _rightFollowVoiceView.delegate = self;
         __weak typeof(self) weakSelf = self;

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 <Masonry/Masonry.h>
 
 @interface MewHeaderView()
@@ -37,7 +37,7 @@
     self = [super initWithFrame:frame];
     if (self) {
         self.voiceBgViewHeight = 100;
-//        (KScreenWidth - 48) * tupiandegao / tupiandewidth;
+//        (KMewGetScreenWidth - 48) * tupiandegao / tupiandewidth;
         
         [self mew_initView];
 //        self.height = CGRectGetMaxY(self.personCenterButton.frame) + 10.0;
@@ -122,11 +122,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:[MewAppColor mewGetColorOfTextWithHexString:@"#E1E4E6"] forState:UIControlStateNormal];
-        _filterButton.titleLabel.font = kFontMedium(12);
+        _filterButton.titleLabel.font = kMewSetFontMedium(12);
         _filterButton.layer.cornerRadius = 14;
         _filterButton.layer.masksToBounds = YES;
-        _filterButton.backgroundColor = [MewThemeColor mewColorWithHexString:@"#1D1E1F"];
+        _filterButton.backgroundColor = [MewAppColor mewGetColorOfTextWithHexString:@"#1D1E1F"];
         _filterButton.selected = NO;
         [_filterButton addTarget:self action:@selector(filterButtonAction:) forControlEvents:UIControlEventTouchUpInside];
     }
@@ -139,11 +139,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:[MewAppColor mewGetColorOfTextWithHexString:@"#E1E4E6"] forState:UIControlStateNormal];
-        _reviewLoadButton.titleLabel.font = kFontMedium(12);
+        _reviewLoadButton.titleLabel.font = kMewSetFontMedium(12);
         _reviewLoadButton.layer.cornerRadius = 14;
         _reviewLoadButton.layer.masksToBounds = YES;
-        _reviewLoadButton.backgroundColor = [MewThemeColor mewColorWithHexString:@"#1D1E1F"];
+        _reviewLoadButton.backgroundColor = [MewAppColor mewGetColorOfTextWithHexString:@"#1D1E1F"];
         [_reviewLoadButton addTarget:self action:@selector(reviewLoadButtonAction) forControlEvents:UIControlEventTouchUpInside];
         
     }
@@ -153,7 +153,7 @@
 - (UIImageView *)personCenterBgImageView {
     if (!_personCenterBgImageView) {
         UIImage *bgImage = [UIImage imageNamed:@"mew_home_header_person_bg"];
-        _personCenterBgImageView = [[UIImageView alloc] initWithFrame:CGRectMake(KScreenWidth - 24 - bgImage.size.width, CGRectGetMaxY(self.voiceBgImageView.frame) + 9, bgImage.size.width, bgImage.size.height)];
+        _personCenterBgImageView = [[UIImageView alloc] initWithFrame:CGRectMake(KMewGetScreenWidth - 24 - bgImage.size.width, CGRectGetMaxY(self.voiceBgImageView.frame) + 9, bgImage.size.width, bgImage.size.height)];
         _personCenterBgImageView.image = bgImage;
     }
     return _personCenterBgImageView;

yinmeng-ios/yinmeng-ios/Main/Home/View/SubView/MewHomeFilterView.m

@@ -10,7 +10,7 @@
 #import <Masonry/Masonry.h>
 /// Tool
 #import "MewMacro.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 ? [MewAppColor mewGetColorOfTextWithHexString:@"#DCDDE0"] : UIColor.clearColor;
        colorBgView.tag = i;
        colorBgView.layer.cornerRadius = 6;
        colorBgView.layer.masksToBounds = YES;
@@ -89,8 +89,8 @@ static NSInteger targetIndex = 0;
        
        UILabel *titleLabel = [[UILabel alloc] init];
        titleLabel.text = self.datas[i];
-       titleLabel.textColor = [MewThemeColor mewColorWithHexString:@"#1F1B4F"];
+       titleLabel.textColor = [MewAppColor mewGetColorOfTextWithHexString:@"#1F1B4F"];
-       titleLabel.font = kFontMedium(12);
+       titleLabel.font = kMewSetFontMedium(12);
        titleLabel.textAlignment = NSTextAlignmentCenter;
        [colorBgView addSubview:titleLabel];
        [titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {

yinmeng-ios/yinmeng-ios/Main/Home/View/SubView/MewPlayVoiceView.m

@@ -12,7 +12,7 @@
 #import <Masonry/Masonry.h>
 /// Tool
 #import "UIImage+MewUtils.h"
-#import "MewThemeColor.h"
+
 #import "MewMacro.h"
 #import "MewHUDTool.h"
 
@@ -197,9 +197,9 @@
         _pushVoiceButton.layer.cornerRadius = 52.0/2;
         _pushVoiceButton.layer.masksToBounds = YES;
         UIImage *backgroundImage =  [UIImage mew_gradientColorImageFromColors:@[
-            [MewThemeColor mewColorWithHexString:@"#FF60FD"],
+            [MewAppColor mewGetColorOfTextWithHexString:@"#FF60FD"],
-            [MewThemeColor mewColorWithHexString:@"##8974FF"],
+            [MewAppColor mewGetColorOfTextWithHexString:@"##8974FF"],
-            [MewThemeColor mewColorWithHexString:@"#69EBFF"]
+            [MewAppColor mewGetColorOfTextWithHexString:@"#69EBFF"]
         ] gradientType:MewGradientTypeLeftToRight imgSize:CGSizeMake(250, 52)];
         _pushVoiceButton.backgroundColor = [UIColor colorWithPatternImage:backgroundImage];
         [_pushVoiceButton addTarget:self action:@selector(pushVoiceButtonAction) forControlEvents:UIControlEventTouchUpInside];

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 "UIImage+MewUtils.h"
 #import "MewUtility.h"
 
@@ -91,7 +91,7 @@ static MewPushExclusiveVoiceView  *_exclusiveVoiceView = nil;
     }
     
     if (!_exclusiveVoiceView.superview) {
-        [kWindow addSubview:_exclusiveVoiceView];
+        [kAppKeyWindow addSubview:_exclusiveVoiceView];
     }
 
     
@@ -112,7 +112,7 @@ static MewPushExclusiveVoiceView  *_exclusiveVoiceView = nil;
     self = [super initWithFrame:frame];
     if (self) {
 
-        self.backgroundColor = UIColorMewRGBAlpha(0x000000, 0.5);
+        self.backgroundColor = [MewAppColor mewGetAlphaColorOfTextWithHexString:@"0x000000" alpha:0.5];
         [self mew_initView];
         [self mew_initLayout];
     }
@@ -314,7 +314,7 @@ static MewPushExclusiveVoiceView  *_exclusiveVoiceView = nil;
     }
     
     self.longTapColorView.hidden = NO;
-    self.longTapColorView.backgroundColor = [MewThemeColor mewColorWithHexString:isRecord ? @"#FF43B1" : @"#43F4FF"];
+    self.longTapColorView.backgroundColor = [MewAppColor mewGetColorOfTextWithHexString:isRecord ? @"#FF43B1" : @"#43F4FF"];
 }
 
 /// 初始化录音对象
@@ -393,7 +393,7 @@ static MewPushExclusiveVoiceView  *_exclusiveVoiceView = nil;
 - (void)mew_initLayout {
     [self.whiteBgView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.center.equalTo(self);
-        make.width.mas_equalTo(KScreenWidth - 56);
+        make.width.mas_equalTo(KMewGetScreenWidth - 56);
     }];
     [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.equalTo(self.whiteBgView).offset(10);
@@ -485,7 +485,7 @@ static MewPushExclusiveVoiceView  *_exclusiveVoiceView = nil;
 - (UIView *)whiteBgView {
     if (!_whiteBgView) {
         _whiteBgView = [[UIView alloc] init];
-        _whiteBgView.backgroundColor = [MewThemeColor mewColorWithHexString:@"#525566"];;
+        _whiteBgView.backgroundColor = [MewAppColor mewGetColorOfTextWithHexString:@"#525566"];;
         _whiteBgView.layer.cornerRadius = 15.0;
         _whiteBgView.layer.masksToBounds = YES;
     }
@@ -496,7 +496,7 @@ static MewPushExclusiveVoiceView  *_exclusiveVoiceView = nil;
     if (!_titleLabel) {
         _titleLabel = [[UILabel alloc] init];
         _titleLabel.text = @"发布专属声音秀";
-        _titleLabel.font = kFontMedium(16);
+        _titleLabel.font = kMewSetFontMedium(16);
         _titleLabel.textColor = UIColor.whiteColor;
     }
     return _titleLabel;
@@ -516,7 +516,7 @@ static MewPushExclusiveVoiceView  *_exclusiveVoiceView = nil;
 - (UIView *)longTapView {
     if (!_longTapView) {
         _longTapView = [[UIView alloc] init];
-        _longTapView.backgroundColor = [MewThemeColor mewColorWithHexString:@"#9552FF"];
+        _longTapView.backgroundColor = [MewAppColor mewGetColorOfTextWithHexString:@"#9552FF"];
         _longTapView.layer.cornerRadius = 24.0;
         _longTapView.layer.masksToBounds = YES;
         //长按
@@ -532,7 +532,7 @@ static MewPushExclusiveVoiceView  *_exclusiveVoiceView = nil;
     if (!_longTapTitleLabel) {
         _longTapTitleLabel = [[UILabel alloc] init];
         _longTapTitleLabel.text = @"长按录制";
-        _longTapTitleLabel.font = kFontRegular(12);
+        _longTapTitleLabel.font = kMewSetFontRegular(12);
         _longTapTitleLabel.textColor = UIColor.whiteColor;
     }
     return _longTapTitleLabel;
@@ -548,7 +548,7 @@ static MewPushExclusiveVoiceView  *_exclusiveVoiceView = nil;
 - (UIView *)longTapColorView {
     if (!_longTapColorView) {
         _longTapColorView = [[UIView alloc] init];
-        _longTapColorView.backgroundColor = [MewThemeColor mewColorWithHexString:@"#43F4FF"];
+        _longTapColorView.backgroundColor = [MewAppColor mewGetColorOfTextWithHexString:@"#43F4FF"];
         _longTapColorView.layer.cornerRadius = 6.0/2.0;
         _longTapColorView.layer.masksToBounds = YES;
     }
@@ -578,7 +578,7 @@ static MewPushExclusiveVoiceView  *_exclusiveVoiceView = nil;
 - (UIView *)textBgView {
     if (!_textBgView) {
         _textBgView = [[UIView alloc] init];
-        _textBgView.backgroundColor = [MewThemeColor mewColorWithHexString:@"#DCDDE0"];
+        _textBgView.backgroundColor = [MewAppColor mewGetColorOfTextWithHexString:@"#DCDDE0"];
         _textBgView.layer.cornerRadius = 11.0;
         _textBgView.layer.masksToBounds = YES;
     }
@@ -588,8 +588,8 @@ static MewPushExclusiveVoiceView  *_exclusiveVoiceView = nil;
     if (!_textView) {
         _textView = [[UITextView alloc] init];
         _textView.delegate = self;
-        _textView.font = kFontRegular(13);
+        _textView.font = kMewSetFontRegular(13);
-        _textView.textColor = [MewThemeColor mewColorWithHexString:@"#7D8499"];
+        _textView.textColor = [MewAppColor mewGetColorOfTextWithHexString:@"#7D8499"];
         _textView.backgroundColor = UIColor.clearColor;
     }
     return _textView;
@@ -598,8 +598,8 @@ static MewPushExclusiveVoiceView  *_exclusiveVoiceView = nil;
     if (!_placeholdLabel) {
         _placeholdLabel = [[UILabel alloc] init];
         _placeholdLabel.text = @"说点什么...";
-        _placeholdLabel.textColor = [MewThemeColor mewColorWithHexString:@"#7D8499"];
+        _placeholdLabel.textColor = [MewAppColor mewGetColorOfTextWithHexString:@"#7D8499"];
-        _placeholdLabel.font = kFontRegular(13);
+        _placeholdLabel.font = kMewSetFontRegular(13);
     }
     return _placeholdLabel;
 }
@@ -609,10 +609,10 @@ static MewPushExclusiveVoiceView  *_exclusiveVoiceView = nil;
         _pushVoiceButton = [[UIButton alloc] init];
         [_pushVoiceButton setTitle:@"发布" forState:UIControlStateNormal];
         [_pushVoiceButton setTitleColor:UIColor.whiteColor forState:UIControlStateNormal];
-        _pushVoiceButton.titleLabel.font = kFontSemibold(16);
+        _pushVoiceButton.titleLabel.font = kMewSetFontSemibold(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:@[[MewAppColor mewGetColorOfTextWithHexString:@"#FF60FD"], [MewAppColor mewGetColorOfTextWithHexString:@"#8974FF"],[MewAppColor mewGetColorOfTextWithHexString:@"#69EBFF"]] gradientType:MewGradientTypeLeftToRight imgSize:CGSizeMake(KMewGetScreenWidth - 4 * 28, 46)];
         _pushVoiceButton.backgroundColor = [UIColor colorWithPatternImage:image];
         [_pushVoiceButton addTarget:self action:@selector(pushWithRecordVoice) forControlEvents:UIControlEventTouchUpInside];
     }

yinmeng-ios/yinmeng-ios/Main/Home/View/SubView/MewRightFollowVoiceCollectionCell.h

@@ -6,7 +6,7 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "MewEnum.h"
+
 
 NS_ASSUME_NONNULL_BEGIN
 

yinmeng-ios/yinmeng-ios/Main/Home/View/SubView/MewRightFollowVoiceCollectionCell.m

@@ -87,7 +87,7 @@
     if (!_nickNameLabel) {
         _nickNameLabel = [[UILabel alloc] init];
         _nickNameLabel.text = @"昵称昵称昵称昵称";
-        _nickNameLabel.font = kFontRegular(12);
+        _nickNameLabel.font = kMewSetFontRegular(12);
         _nickNameLabel.textColor = UIColor.whiteColor;
         _nickNameLabel.textAlignment = NSTextAlignmentCenter;
     }

yinmeng-ios/yinmeng-ios/Main/Home/View/SubView/MewRightFollowVoiceView.h

@@ -7,12 +7,12 @@
 
 #import <UIKit/UIKit.h>
 #import <MJRefresh/MJRefresh.h>
-@class MewUserInfoModel;
+@class MewPersonInfoModel;
 
 NS_ASSUME_NONNULL_BEGIN
 
 @protocol MewRightFollowVoiceViewDelegate <NSObject>
-- (void)mew_didSelectRightFollowVoiceUser:(MewUserInfoModel *)userInfo;
+- (void)mew_didSelectRightFollowVoiceUser:(MewPersonInfoModel *)userInfo;
 @end
 
 typedef void(^follownRefresh)(void);
@@ -22,7 +22,7 @@ typedef void(^follownRefresh)(void);
 @property (nonatomic, copy) follownRefresh loadFollownRefresh;
 /// 加载更多
 @property (nonatomic, copy) follownRefresh moreFollownRefresh;
-@property (nonatomic, strong) NSArray<MewUserInfoModel *> *fansListModel;
+@property (nonatomic, strong) NSArray<MewPersonInfoModel *> *fansListModel;
 
 @property (nonatomic, strong, readonly) UICollectionView *followCollectionView;
 

yinmeng-ios/yinmeng-ios/Main/Home/View/SubView/MewRightFollowVoiceView.m

@@ -12,9 +12,9 @@
 #import <Masonry/Masonry.h>
 /// Tool
 #import "MewMacro.h"
-#import "MewThemeColor.h"
+
-#import "MewFansInfoModel.h"
+
-#import "MewUserInfoModel.h"
+
 
 
 @interface MewRightFollowVoiceView() <UICollectionViewDelegate, UICollectionViewDataSource>
@@ -41,7 +41,7 @@
 }
 
 #pragma mark - Set
-- (void)setFansListModel:(NSArray<MewUserInfoModel *> *)fansListModel {
+- (void)setFansListModel:(NSArray<MewPersonInfoModel *> *)fansListModel {
     _fansListModel = fansListModel;
     [self.followCollectionView reloadData];
 }
@@ -53,7 +53,7 @@
 
 - (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath {
     MewRightFollowVoiceCollectionCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([MewRightFollowVoiceCollectionCell class]) forIndexPath:indexPath];
-    MewUserInfoModel *model = [self.fansListModel objectAtIndex:indexPath.row];
+    MewPersonInfoModel *model = [self.fansListModel objectAtIndex:indexPath.row];
     cell.avater = model.avatar;
     cell.nick = model.nick;
     cell.sex = model.gender;
@@ -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.stateLabel.textColor = [MewAppColor mewSecondTextColor];
-    header.lastUpdatedTimeLabel.textColor = [MewThemeColor mewSecondTextColor];
+    header.lastUpdatedTimeLabel.textColor = [MewAppColor mewSecondTextColor];
     self.followCollectionView.mj_header = header;
     
     MJRefreshBackNormalFooter *footer = [MJRefreshBackNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(mew_footerRefresh)];
-    footer.stateLabel.textColor = [MewThemeColor mewSecondTextColor];
+    footer.stateLabel.textColor = [MewAppColor mewSecondTextColor];
     footer.stateLabel.font = [UIFont systemFontOfSize:10.0];
     self.followCollectionView.mj_footer = footer;
     
@@ -126,7 +126,7 @@
         _followLabel = [[UILabel alloc] init];
         _followLabel.text = @"我关注的声音";
         _followLabel.textColor = UIColor.whiteColor;
-        _followLabel.font = kFontSemibold(16);
+        _followLabel.font = kMewSetFontSemibold(16);
         _followLabel.textAlignment = NSTextAlignmentCenter;
     }
     return _followLabel;
@@ -138,7 +138,7 @@
         layout.minimumLineSpacing = 16;
         layout.minimumInteritemSpacing = 10;
         layout.sectionInset = UIEdgeInsetsMake(0.0, 12.0, 0.0, 12.0);
-        CGFloat width = ((2 * (KScreenWidth - 48) / 3.0) - 40 - 2*12.0 - 10.0) / 2.0;
+        CGFloat width = ((2 * (KMewGetScreenWidth - 48) / 3.0) - 40 - 2*12.0 - 10.0) / 2.0;
         layout.itemSize = CGSizeMake(width, width + 20);
         _followCollectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout];
         _followCollectionView.delegate = self;

yinmeng-ios/yinmeng-ios/Main/Home/View/SubView/MewShowVoiceView.h

@@ -6,7 +6,7 @@
 //
 
 #import <UIKit/UIKit.h>
-@class MewUserInfoModel;
+@class MewPersonInfoModel;
 NS_ASSUME_NONNULL_BEGIN
 
 @protocol MewShowVoiceViewDelegate <NSObject>
@@ -25,7 +25,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign, readonly) CGFloat viewHieght;
 
 /// 声音的用户数据
-@property (nonatomic, strong) NSArray<MewUserInfoModel *> *userInfoArrays;
+@property (nonatomic, strong) NSArray<MewPersonInfoModel *> *userInfoArrays;
 
 @property (nonatomic, weak) id<MewShowVoiceViewDelegate> delegate;
 

yinmeng-ios/yinmeng-ios/Main/Home/View/SubView/MewShowVoiceView.m

@@ -15,7 +15,7 @@
 /// Third
 #import <Masonry/Masonry.h>
 /// Model
-#import "MewUserInfoModel.h"
+
 
 @interface MewShowVoiceView()<MewPlayVoiceViewDelegate>
 
@@ -35,7 +35,7 @@
 @property (nonatomic, assign) CGPoint location;
 
 /// 当前正在播放的用户信息
-@property (nonatomic, strong) MewUserInfoModel *currentPlayUserModel;
+@property (nonatomic, strong) MewPersonInfoModel *currentPlayUserModel;
 @end
 
 @implementation MewShowVoiceView
@@ -128,8 +128,8 @@
 #pragma mark - Init
 - (void)mew_initView {
     UIImage *bgImage = [UIImage imageNamed:@"mew_home_play_voice_bg"];
-    CGFloat imageHeight = ((KScreenWidth - 28) * bgImage.size.height)/bgImage.size.width;
+    CGFloat imageHeight = ((KMewGetScreenWidth - 28) * bgImage.size.height)/bgImage.size.width;
-    self.bgImageView.frame = CGRectMake(0, self.frame.origin.y, KScreenWidth - 28, imageHeight);
+    self.bgImageView.frame = CGRectMake(0, self.frame.origin.y, KMewGetScreenWidth - 28, imageHeight);
     self.viewHieght = imageHeight;
     [self addSubview:self.bgImageView];
 
@@ -144,7 +144,7 @@
     CGFloat marginTop = 24.0;
     CGFloat marginItemX = 18.0;
     CGFloat marginItemY = 16.0;
-    CGFloat width = (KScreenWidth - 28 - marginLeft * 2.0 - marginItemX * 2.0) / 3.0;
+    CGFloat width = (KMewGetScreenWidth - 28 - marginLeft * 2.0 - marginItemX * 2.0) / 3.0;
     CGFloat height = (imageHeight - 2 * marginTop - 2 * marginItemY)/3.0;
     for (int i = 0; i < 9; i++) {
         CGFloat marginX = (i % 3) * (width + marginItemX) + marginLeft;
@@ -170,7 +170,7 @@
         UILabel *nickNameLabel = [[UILabel alloc] init];
         nickNameLabel.text = @"昵称昵称昵称";
         nickNameLabel.textColor = UIColor.whiteColor;
-        nickNameLabel.font = kFontMedium(14);
+        nickNameLabel.font = kMewSetFontMedium(14);
         [backView addSubview:nickNameLabel];
         [nickNameLabel mas_makeConstraints:^(MASConstraintMaker *make) {
             make.top.equalTo(discView.mas_bottom);
@@ -188,7 +188,7 @@
 }
 
 #pragma mark - Set
-- (void)setUserInfoArrays:(NSArray<MewUserInfoModel *> *)userInfoArrays {
+- (void)setUserInfoArrays:(NSArray<MewPersonInfoModel *> *)userInfoArrays {
     _userInfoArrays = userInfoArrays;
     
     [self.backBgViewArrays enumerateObjectsUsingBlock:^(UIView * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {

yinmeng-ios/yinmeng-ios/Main/Home/View/SubView/MewUserIntroductionView.h

@@ -6,7 +6,7 @@
 //
 
 #import <UIKit/UIKit.h>
-@class MewUserInfoModel;
+@class MewPersonInfoModel;
 
 NS_ASSUME_NONNULL_BEGIN
 typedef enum : NSUInteger {
@@ -33,7 +33,7 @@ typedef enum : NSUInteger {
 /// 关注按钮状态的更新
 - (void)updateAttentionState:(BOOL)state;
 /// 获取当前用户的信息
-- (void)setCurrentUserModel:(MewUserInfoModel *)userInfo;
+- (void)setCurrentUserModel:(MewPersonInfoModel *)userInfo;
 
 
 @end

yinmeng-ios/yinmeng-ios/Main/Home/View/SubView/MewUserIntroductionView.m

@@ -8,10 +8,10 @@
 #import "MewUserIntroductionView.h"
 
 ///Model
-#import "MewUserInfoModel.h"
+
 /// Tool
 #import "MewMacro.h"
-#import "MewThemeColor.h"
+
 #import "MewAudioPlayerManager.h"
 /// Third
 #import <Masonry/Masonry.h>
@@ -68,7 +68,7 @@
 @property (nonatomic, assign) UserIntroductionType type;
 @property (nonatomic, weak) id<MewUserIntroductionViewDelegate> delegate;
 
-@property (nonatomic, strong) MewUserInfoModel *currentUserInfo;
+@property (nonatomic, strong) MewPersonInfoModel *currentUserInfo;
 @end
 
 static MewUserIntroductionView *_userIntroductionView = nil;
@@ -83,7 +83,7 @@ static MewUserIntroductionView *_userIntroductionView = nil;
         _userIntroductionView.delegate = delegate;
     }
     if (!_userIntroductionView.superview) {
-        [kWindow addSubview:_userIntroductionView];
+        [kAppKeyWindow addSubview:_userIntroductionView];
     }
     return _userIntroductionView;
 }
@@ -96,7 +96,7 @@ static MewUserIntroductionView *_userIntroductionView = nil;
 }
 
 /// 获取当前用户的信息
-- (void)setCurrentUserModel:(MewUserInfoModel *)userInfo {
+- (void)setCurrentUserModel:(MewPersonInfoModel *)userInfo {
     if (_userIntroductionView == nil) return;
     _userIntroductionView.currentUserInfo = userInfo;
     _userIntroductionView.nickNameLabel.text = userInfo.nick;
@@ -117,7 +117,7 @@ static MewUserIntroductionView *_userIntroductionView = nil;
 - (instancetype)initWithFrame:(CGRect)frame {
     self = [super initWithFrame:frame];
     if (self) {
-        self.backgroundColor = UIColorMewRGBAlpha(0x000000, 0.4);
+        self.backgroundColor = [MewAppColor mewGetAlphaColorOfTextWithHexString:@"0x000000" alpha:0.4];
         UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(didSelectBgViewTapGesture:)];
         [self addGestureRecognizer:tap];
         [self mew_initView];
@@ -205,7 +205,7 @@ static MewUserIntroductionView *_userIntroductionView = nil;
     self.settingButton.hidden = _type == UserIntroductionView_OtherUser;
     self.verLineView2.hidden = _type == UserIntroductionView_OtherUser;
     
-    CGFloat marignX = _type == UserIntroductionView_SelfMine ? (KScreenWidth - 72)/3.0 : (KScreenWidth - 72)/2.0;
+    CGFloat marignX = _type == UserIntroductionView_SelfMine ? (KMewGetScreenWidth - 72)/3.0 : (KMewGetScreenWidth - 72)/2.0;
     [self.verLineView1 mas_updateConstraints:^(MASConstraintMaker *make) {
         make.left.mas_equalTo(self.whiteBgView).offset(marignX);
     }];
@@ -245,7 +245,7 @@ static MewUserIntroductionView *_userIntroductionView = nil;
 - (void)mew_initLayout {
     [self.whiteBgView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.center.equalTo(self);
-        make.width.mas_equalTo(KScreenWidth - 72);
+        make.width.mas_equalTo(KMewGetScreenWidth - 72);
         make.height.mas_equalTo(275);
     }];
     
@@ -372,7 +372,7 @@ static MewUserIntroductionView *_userIntroductionView = nil;
 - (UIView *)whiteBgView {
     if (!_whiteBgView) {
         _whiteBgView = [[UIView alloc] init];
-        _whiteBgView.backgroundColor = [MewThemeColor mewColorWithHexString:@"#525566"];
+        _whiteBgView.backgroundColor = [MewAppColor mewGetColorOfTextWithHexString:@"#525566"];
         _whiteBgView.layer.cornerRadius = 16;
         _whiteBgView.layer.masksToBounds = YES;
     }
@@ -404,7 +404,7 @@ static MewUserIntroductionView *_userIntroductionView = nil;
         [_followButton setTitle:@"关注" forState:UIControlStateNormal];
         [_followButton setTitle:@"已关注" forState:UIControlStateSelected];
         [_followButton setTitleColor:UIColor.whiteColor forState:UIControlStateNormal];
-        _followButton.titleLabel.font = kFontMedium(15);
+        _followButton.titleLabel.font = kMewSetFontMedium(15);
         [_followButton setImage:[UIImage imageNamed:@"mew_home_user_follown"] forState:UIControlStateNormal];
         [_followButton setImage:[UIImage imageNamed:@"mew_home_user_followned"] forState:UIControlStateSelected];
         [_followButton addTarget:self action:@selector(followFriendActionEvent:) forControlEvents:UIControlEventTouchUpInside];
@@ -418,7 +418,7 @@ static MewUserIntroductionView *_userIntroductionView = nil;
         _chatButton = [[UIButton alloc] init];
         [_chatButton setTitle:@"聊天" forState:UIControlStateNormal];
         [_chatButton setTitleColor:UIColor.whiteColor forState:UIControlStateNormal];
-        _chatButton.titleLabel.font = kFontMedium(15);
+        _chatButton.titleLabel.font = kMewSetFontMedium(15);
         [_chatButton setImage:[UIImage imageNamed:@"mew_home_user_chat"] forState:UIControlStateNormal];
         [_chatButton addTarget:self action:@selector(chatFriendActionEvent) forControlEvents:UIControlEventTouchUpInside];
     }
@@ -429,7 +429,7 @@ static MewUserIntroductionView *_userIntroductionView = nil;
     if (!_nickNameLabel) {
         _nickNameLabel = [[UILabel alloc] init];
         _nickNameLabel.text = @"这是用户昵称";
-        _nickNameLabel.font = kFontMedium(15);
+        _nickNameLabel.font = kMewSetFontMedium(15);
         _nickNameLabel.textColor = UIColor.whiteColor;
     }
     return _nickNameLabel;
@@ -448,11 +448,11 @@ static MewUserIntroductionView *_userIntroductionView = nil;
         _starSignLabel = [[UILabel alloc] init];
         _starSignLabel.text = @"天蝎座";
         _starSignLabel.textAlignment = NSTextAlignmentCenter;
-        _starSignLabel.font = kFontRegular(10);
+        _starSignLabel.font = kMewSetFontRegular(10);
-        _starSignLabel.textColor = [MewThemeColor mewColorWithHexString:@"#9168FA"];
+        _starSignLabel.textColor = [MewAppColor mewGetColorOfTextWithHexString:@"#9168FA"];
         _starSignLabel.layer.cornerRadius = 9.0;
         _starSignLabel.layer.masksToBounds = YES;
-        _starSignLabel.backgroundColor = [MewThemeColor mewColorWithHexString:@"#E9E1FF"];
+        _starSignLabel.backgroundColor = [MewAppColor mewGetColorOfTextWithHexString:@"#E9E1FF"];
         _starSignLabel.hidden = YES;
     }
     return _starSignLabel;
@@ -463,7 +463,7 @@ static MewUserIntroductionView *_userIntroductionView = nil;
 - (UIView *)voiceIntroductionView {
     if (!_voiceIntroductionView) {
         _voiceIntroductionView = [[UIView alloc] init];
-        _voiceIntroductionView.backgroundColor = [MewThemeColor mewColorWithHexString:@"#DCDDE0"];
+        _voiceIntroductionView.backgroundColor = [MewAppColor mewGetColorOfTextWithHexString:@"#DCDDE0"];
         _voiceIntroductionView.layer.cornerRadius = 11.0;
         _voiceIntroductionView.layer.masksToBounds = YES;
     }
@@ -474,8 +474,8 @@ static MewUserIntroductionView *_userIntroductionView = nil;
     if (!_voiceTitleLabel) {
         _voiceTitleLabel = [[UILabel alloc] init];
         _voiceTitleLabel.text = @"这是一段用户签名，这是一段用户签名，这是一段用户签名~";
-        _voiceTitleLabel.font = kFontRegular(13);
+        _voiceTitleLabel.font = kMewSetFontRegular(13);
-        _voiceTitleLabel.textColor = [MewThemeColor mewColorWithHexString:@"#1F1B4F"];
+        _voiceTitleLabel.textColor = [MewAppColor mewGetColorOfTextWithHexString:@"#1F1B4F"];
         _voiceTitleLabel.numberOfLines = 0;
     }
     return _voiceTitleLabel;
@@ -512,8 +512,8 @@ static MewUserIntroductionView *_userIntroductionView = nil;
     if (!_voiceTimeLabel) {
         _voiceTimeLabel = [[UILabel alloc] init];
         _voiceTimeLabel.text = @"30”";
-        _voiceTimeLabel.font = kFontMedium(14);
+        _voiceTimeLabel.font = kMewSetFontMedium(14);
-        _voiceTimeLabel.textColor = [MewThemeColor mewColorWithHexString:@"#1F1B4F"];
+        _voiceTimeLabel.textColor = [MewAppColor mewGetColorOfTextWithHexString:@"#1F1B4F"];
     }
     return _voiceTimeLabel;
 }
@@ -521,7 +521,7 @@ static MewUserIntroductionView *_userIntroductionView = nil;
 - (UIView *)horLineView {
     if (!_horLineView) {
         _horLineView = [[UIView alloc] init];
-        _horLineView.backgroundColor = UIColorMewRGBAlpha(0xFFFFFF, 0.2);
+        _horLineView.backgroundColor = [MewAppColor mewGetAlphaColorOfTextWithHexString:@"0xffffff" alpha:0.2];
         
     }
     return _horLineView;
@@ -530,7 +530,7 @@ static MewUserIntroductionView *_userIntroductionView = nil;
 - (UIView *)verLineView1 {
     if (!_verLineView1) {
         _verLineView1 = [[UIView alloc] init];
-        _verLineView1.backgroundColor = UIColorMewRGBAlpha(0xFFFFFF, 0.2);
+        _verLineView1.backgroundColor = [MewAppColor mewGetAlphaColorOfTextWithHexString:@"0xffffff" alpha:0.2];
     }
     return _verLineView1;
 }
@@ -540,7 +540,7 @@ static MewUserIntroductionView *_userIntroductionView = nil;
 - (UIView *)verLineView2 {
     if (!_verLineView2) {
         _verLineView2 = [[UIView alloc] init];
-        _verLineView2.backgroundColor = UIColorMewRGBAlpha(0xFFFFFF, 0.2);
+        _verLineView2.backgroundColor = [MewAppColor mewGetAlphaColorOfTextWithHexString:@"0xffffff" alpha:0.2];
     }
     return _verLineView2;
 }
@@ -552,7 +552,7 @@ static MewUserIntroductionView *_userIntroductionView = nil;
         _rechageButton = [[UIButton alloc] init];
         [_rechageButton setTitle:@"充值" forState:UIControlStateNormal];
         [_rechageButton setTitleColor:UIColor.whiteColor forState:UIControlStateNormal];
-        _rechageButton.titleLabel.font = kFontMedium(15);
+        _rechageButton.titleLabel.font = kMewSetFontMedium(15);
         [_rechageButton setImage:[UIImage imageNamed:@"mew_home_owner_rechage"] forState:UIControlStateNormal];
         [_rechageButton addTarget:self action:@selector(rechageMoneyActionEvent) forControlEvents:UIControlEventTouchUpInside];
     }
@@ -564,7 +564,7 @@ static MewUserIntroductionView *_userIntroductionView = nil;
         _mineCollectButton = [[UIButton alloc] init];
         [_mineCollectButton setTitle:@"收藏" forState:UIControlStateNormal];
         [_mineCollectButton setTitleColor:UIColor.whiteColor forState:UIControlStateNormal];
-        _mineCollectButton.titleLabel.font = kFontMedium(15);
+        _mineCollectButton.titleLabel.font = kMewSetFontMedium(15);
         [_mineCollectButton setImage:[UIImage imageNamed:@"mew_home_user_collection"] forState:UIControlStateNormal];
         [_mineCollectButton addTarget:self action:@selector(mineCollectionActionEvent) forControlEvents:UIControlEventTouchUpInside];
     }
@@ -576,7 +576,7 @@ static MewUserIntroductionView *_userIntroductionView = nil;
         _settingButton = [[UIButton alloc] init];
         [_settingButton setTitle:@"设置" forState:UIControlStateNormal];
         [_settingButton setTitleColor:UIColor.whiteColor forState:UIControlStateNormal];
-        _settingButton.titleLabel.font = kFontMedium(15);
+        _settingButton.titleLabel.font = kMewSetFontMedium(15);
         [_settingButton setImage:[UIImage imageNamed:@"mew_home_user_setting"] forState:UIControlStateNormal];
         [_settingButton addTarget:self action:@selector(settingActionEvent) forControlEvents:UIControlEventTouchUpInside];
     }

yinmeng-ios/yinmeng-ios/Main/Home/View/SubView/MewVoiceGuideView.m

@@ -7,7 +7,7 @@
 
 #import "MewVoiceGuideView.h"
 /// Tool
-#import "MewThemeColor.h"
+
 #import "MewMacro.h"
 #import <Masonry/Masonry.h>
 
@@ -35,7 +35,7 @@ static MewVoiceGuideView *_guideView = nil;
     }
     
     if (!_guideView.superview) {
-        [kWindow addSubview:_guideView];
+        [kAppKeyWindow addSubview:_guideView];
     }
     
     return _guideView;
@@ -47,7 +47,7 @@ static MewVoiceGuideView *_guideView = nil;
 - (instancetype)initWithFrame:(CGRect)frame {
     self = [super initWithFrame:frame];
     if (self) {
-        self.backgroundColor = UIColorMewRGBAlpha(0x000000, 0.4);
+        self.backgroundColor = [MewAppColor mewGetAlphaColorOfTextWithHexString:@"0x000000" alpha:0.4];
         UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(viewWithTapGesture:)];
         [self addGestureRecognizer:tap];
         [self mew_initView];
@@ -76,7 +76,7 @@ static MewVoiceGuideView *_guideView = nil;
 
 - (void)mew_initLayout {
     [self.guideHandImageView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.bottom.equalTo(self).offset(-226 * kScreenScale);
+        make.bottom.equalTo(self).offset(-226 * kMewSetScreenScale);
         make.left.equalTo(self).offset(64);
     }];
     [self.guideBubbleImageView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -125,7 +125,7 @@ static MewVoiceGuideView *_guideView = nil;
 - (UIView *)guideBgView {
     if (!_guideBgView) {
         _guideBgView = [[UIView alloc] init];
-        _guideBgView.backgroundColor = [MewThemeColor mewColorWithHexString:@"#6A60FF"];
+        _guideBgView.backgroundColor = [MewAppColor mewGetColorOfTextWithHexString:@"#6A60FF"];
     }
     return _guideBgView;
 }
@@ -136,7 +136,7 @@ static MewVoiceGuideView *_guideView = nil;
         _guideTitleLabel.text = @"选择感兴趣的声音\n拖动至唱片机播放";
         _guideTitleLabel.textColor = UIColor.whiteColor;
         _guideTitleLabel.numberOfLines = 0;
-        _guideTitleLabel.font = kFontMedium(14);
+        _guideTitleLabel.font = kMewSetFontMedium(14);
     }
     return _guideTitleLabel;
 }

yinmeng-ios/yinmeng-ios/Main/IM/Model/MewAttachmentModel.h

@@ -1,96 +0,0 @@
-//
-//  MewAttachmentModel.h
-//  mew-ios
-//
-//  Created by 触海 on 2023/11/20.
-//
-
-#import <Foundation/Foundation.h>
-#import <NIMSDK/NIMSDK.h>
-
-NS_ASSUME_NONNULL_BEGIN
-typedef NS_ENUM(NSUInteger, Mew_CustomMessageType) {
-    ///房间提示
-    Mew_CustomMessageType_Room_Tip = 2,
-    ///送礼物的接口
-    Mew_CustomMessageType_Gift = 3,
-    ///队列操作
-    Mew_CustomMessageType_Queue = 8,
-    ///表情
-    Mew_CustomMessageType_Face = 9,
-    ///全麦送
-    Mew_CustomMessageType_AllMicroSend = 12,
-    ///踢出房间
-    Mew_CustomMessageType_Kick_User = 18,
-    ///小秘书消息
-    Mew_CustomMessageType_Secretary = 19,
-    ///房间礼物值
-    Mew_CustomMessageType_Room_GiftValue  = 42,
-};
-
-
-///first = Mew_CustomMessageType_Room_Tip
-typedef NS_ENUM(NSUInteger, MewCustomMessageSubRoomTip) {
-    ///分享房间
-    Mew_Custom_Message_Sub_Room_Tip_ShareRoom = 21,
-    ///关注房主
-    Mew_Custom_Message_Sub_Room_Tip_Attention_Owner = 22,
-};
-
-///first = Mew_CustomMessageType_Gift
-typedef NS_ENUM(NSUInteger, MewCustomMessageSubGift) {
-    ///发送礼物
-    Mew_Custom_Message_Sub_Gift_Send = 31,
-    ///全服发送礼物
-    Mew_Custom_Message_Sub_Gift_ChannelNotify = 32,
-    ///发送 福袋 礼物
-    Mew_Custom_Message_Sub_Gift_LuckySend = 34,
-};
-
-///first = Mew_CustomMessageType_Queue
-typedef NS_ENUM(NSInteger, MewCustomMessageSubQueue) {
-    ///踢下麦
-    Mew_Custom_Message_Sub_Queue_Kick = 82,
-};
-
-//first = Mew_CustomMessageType_Face
-typedef NS_ENUM(NSUInteger, MewCustomMessageSubFace) {
-    ///发送
-    Mew_Custom_Message_Sub_Face_Send = 91,
-};
-
-///first = Mew_CustomMessageType_ALLMicroSend
-typedef NS_ENUM(NSUInteger, MewCustomMessageSubAllMicroSend) {
-    ///全麦送礼物
-    Mew_Custom_Message_Sub_AllMicroSend = 121,
-    ///非全麦 多人送礼
-    Mew_Custom_Message_Sub_AllBatchSend = 123,
-    ///非全麦 多人送福袋礼物
-    Mew_Custom_Message_Sub_AllBatchMicroLuckySend = 124,
-    ///全麦送  福袋 礼物 122老版本占用了
-    Mew_Custom_Message_Sub_AllMicroLuckySend = 125,
-};
-
-
-///first = Mew_CustomMessageType_Kick_User
-typedef NS_ENUM(NSUInteger, MewCustomNotificationSubKick) {
-    ///拉黑
-    Mew_Custom_Message_Sub_Kick_BlackList = 182,
-    ///踢出房间
-    Mew_Custom_Message_Sub_Kick_BeKicked = 181,
-};
-
-
-///first = Mew_CustomMessageType_Room_GiftValue
-typedef NS_ENUM(NSUInteger, MewCustomMessageSubRoomGiftValue) {
-    ///礼物值同步
-    Mew_Custom_Message_Sub_Room_GiftValue_Sync = 421
-};
-
-@interface MewAttachmentModel : NSObject<NIMCustomAttachment>
-@property (nonatomic,assign) int first;
-@property (nonatomic,assign) int second;
-@property (nonatomic, strong) id data;
-@end
-
-NS_ASSUME_NONNULL_END

yinmeng-ios/yinmeng-ios/Main/IM/Model/MewAttachmentModel.m

@@ -1,17 +0,0 @@
-//
-//  MewAttachmentModel.m
-//  mew-ios
-//
-//  Created by 触海 on 2023/11/20.
-//
-
-#import "MewAttachmentModel.h"
-#import "NSObject+MEWExtension.h"
-
-@implementation MewAttachmentModel
-- (NSString *)encodeAttachment {
-    return  [self mewToJSONString];
-}
-
-
-@end

yinmeng-ios/yinmeng-ios/Main/IM/Model/MewNIMMsgInfoModel.swift

@@ -0,0 +1,21 @@
+//
+//  MewNIMMsgInfoModel.swift
+//  yinmeng-ios
+//
+//  Created by duoban on 2024/1/19.
+//
+
+import UIKit
+
+class MewNIMMsgInfoModel: NSObject {
+    @objc var first:Int = 0
+    @objc var second:Int = 0
+    @objc var data:Any?
+}
+extension MewInitInfoModel:NIMCustomAttachment{
+    func encode() -> String {
+        return self.mewToJSONString()
+    }
+    
+    
+}

yinmeng-ios/yinmeng-ios/Main/IM/Tool/MewCustomAttachmentDecoder.m

@@ -7,7 +7,7 @@
 
 #import "MewCustomAttachmentDecoder.h"
 #import "NSObject+MEWExtension.h"
-#import "MewAttachmentModel.h"
+
 
 @implementation MewCustomAttachmentDecoder
 
@@ -24,9 +24,9 @@
                 data = [self dictionaryWithJsonString:(NSString *)data];
             }
             if ([data isKindOfClass:[NSDictionary class]]) {
-                MewAttachmentModel *attachment = [[MewAttachmentModel alloc]init];
+                MewNIMMsgInfoModel *attachment = [[MewNIMMsgInfoModel alloc]init];
-                attachment.first = (short)first;
+                attachment.first = (int)first;
-                attachment.second = (short)second;
+                attachment.second = (int)second;
                 attachment.data = data;
                 return attachment;
             }

yinmeng-ios/yinmeng-ios/Main/Login/Model/MewAppleInfoModel.swift

@@ -0,0 +1,15 @@
+//
+//  MewAppleInfoModel.swift
+//  yinmeng-ios
+//
+//  Created by duoban on 2024/1/19.
+//
+
+import UIKit
+
+class MewAppleInfoModel: NSObject {
+    ///用户名
+    @objc var userName = ""
+    ///头像的地址
+    @objc var avatarUrl = ""
+}

yinmeng-ios/yinmeng-ios/Main/Login/Model/MewThirdUserInfo.h

@@ -1,21 +0,0 @@
-//
-//  MewThirdUserInfo.h
-//  mew-ios
-//
-//  Created by 触海 on 2023/11/6.
-//
-
-#import <Foundation/Foundation.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface MewThirdUserInfo : NSObject
-
-///用户名
-@property (nonatomic,copy) NSString *userName;
-///头像的地址
-@property (nonatomic,copy) NSString *avatarUrl;
-
-@end
-
-NS_ASSUME_NONNULL_END

yinmeng-ios/yinmeng-ios/Main/Login/Model/MewThirdUserInfo.m

@@ -1,12 +0,0 @@
-//
-//  MewThirdUserInfo.m
-//  mew-ios
-//
-//  Created by 触海 on 2023/11/6.
-//
-
-#import "MewThirdUserInfo.h"
-
-@implementation MewThirdUserInfo
-
-@end

yinmeng-ios/yinmeng-ios/Main/Login/View/CustomView/MewLoginForgetEditView.m

@@ -9,7 +9,7 @@
 ///第三方
 #import <Masonry/Masonry.h>
 ///Tool
-#import "MewThemeColor.h"
+
 
 @interface MewLoginForgetEditView()
 ///
@@ -37,7 +37,7 @@
 
 #pragma mark - private method
 - (void)mew_initView {
-    self.backgroundColor = [MewThemeColor mewAppCellBackgroundColor];
+    self.backgroundColor = [MewAppColor mewAppCellBackgroundColor];
     [self addSubview:self.stackView];
     [self addSubview:self.bottomLineView];
     
@@ -89,7 +89,7 @@
         NSDictionary *dic = @{
             NSParagraphStyleAttributeName:style,
             NSFontAttributeName:[UIFont systemFontOfSize:14],
-            NSForegroundColorAttributeName:[MewThemeColor mewSecondTextColor]};
+            NSForegroundColorAttributeName:[MewAppColor 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 = [MewAppColor 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 = [MewAppColor 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:[MewAppColor mewSecondTextColor] forState:UIControlStateDisabled];
         [_authCodeButton setTitleColor:UIColor.blackColor forState:UIControlStateNormal];
     }
     return _authCodeButton;

yinmeng-ios/yinmeng-ios/Main/Login/View/CustomView/MewLoginInputView.m

@@ -9,7 +9,7 @@
 ///Third
 #import <Masonry/Masonry.h>
 ///Tool
-#import "MewThemeColor.h"
+
 
 
 @interface MewLoginInputView()<UITextFieldDelegate>
@@ -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: [MewAppColor 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 = [MewAppColor 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 = [MewAppColor mewGetColorOfTextWithHexString:@"#F2F3F6"];
     }
     return _lineView;
 }
@@ -107,11 +107,11 @@
 - (UITextField *)textField {
     if (!_textField) {
         _textField = [[UITextField alloc] init];
-        _textField.textColor = [MewThemeColor mewMainTextColor];
+        _textField.textColor = [MewAppColor mewMainTextColor];
         _textField.font = [UIFont systemFontOfSize:18.f];
         _textField.borderStyle = UITextBorderStyleNone;
         _textField.keyboardType = UIKeyboardTypeNumberPad;
-        _textField.tintColor = [MewThemeColor mewMainTextColor];
+        _textField.tintColor = [MewAppColor mewMainTextColor];
         _textField.backgroundColor = [UIColor clearColor];
         _textField.delegate = self;
     }

yinmeng-ios/yinmeng-ios/Main/Login/View/MewLoginForgetPasswordViewController.m

@@ -13,7 +13,7 @@
 #import <Masonry/Masonry.h>
 #import <ReactiveObjC/ReactiveObjC.h>
 ///Tool
-#import "MewThemeColor.h"
+
 #import "MEWCountDownHelper.h"
 #import "MewMacro.h"
 #import "UIImage+MewUtils.h"
@@ -79,7 +79,7 @@
 - (void)mew_finishButtonAction:(UIButton *)sender {
     NSString * desPassword = [DESEncrypt encryptUseDES:self.codeView.textField.text key:KeyWithType(KeyType_PasswordEncode)];
     NSString * phone = [DESEncrypt encryptUseDES:self.phoneView.textField.text key:KeyWithType(KeyType_PasswordEncode)];
-    [MewOCServerManager mewAgainSetPassword:^(MewBaseModel * _Nullable obj, NSInteger num, NSString * _Nonnull text) {
+    [MewOCServerManager mewAgainSetPassword:^(MewNetworkDataModel * _Nullable obj, NSInteger num, NSString * _Nonnull text) {
         if(obj.code == 200){
             [[MEWCountDownHelper shareHelper] mewStopCountDown];
             [self mew_showSuccessToast:@"重置密码成功"];
@@ -93,7 +93,7 @@
         [self mew_showErrorToast:@"请输入正确的手机号码"];
     } else {
         NSString * phone = [DESEncrypt encryptUseDES:self.phoneView.textField.text key:KeyWithType(KeyType_PasswordEncode)];
-        [MewOCServerManager mewGetPhoneAuthCode:^(MewBaseModel * _Nullable obj, NSInteger num, NSString * _Nonnull text) {
+        [MewOCServerManager mewGetPhoneAuthCode:^(MewNetworkDataModel * _Nullable obj, NSInteger num, NSString * _Nonnull text) {
             if(obj.code == 200){
                 self.codeView.authCodeButton.enabled= NO;
                 [self mew_showSuccessToast:@"验证码发送成功"];
@@ -130,7 +130,7 @@
     
     [self.backButton mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.mas_equalTo(self.view).mas_offset(10);
-        make.top.mas_equalTo(statusbarHeight);
+        make.top.mas_equalTo(kMewGetBarHeight);
         make.height.width.mas_equalTo(44);
     }];
     
@@ -141,7 +141,7 @@
     
     [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(60);
-        make.width.mas_equalTo(KScreenWidth - 2 *36);
+        make.width.mas_equalTo(KMewGetScreenWidth - 2 *36);
         make.centerX.equalTo(self.view);
     }];
     
@@ -187,7 +187,7 @@
     if (!_titleLabel) {
         _titleLabel = [[UILabel alloc] init];
         _titleLabel.text = @"忘记密码";
-        _titleLabel.font = kFontMedium(18);
+        _titleLabel.font = kMewSetFontMedium(18);
         _titleLabel.textColor = UIColor.whiteColor;
     }
     return _titleLabel;
@@ -201,7 +201,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:@[[MewAppColor mewGetColorOfTextWithHexString:@"#FF60FD"], [MewAppColor mewGetColorOfTextWithHexString:@"#8974FF"],[MewAppColor mewGetColorOfTextWithHexString:@"#69EBFF"]] gradientType:MewGradientTypeLeftToRight imgSize:CGSizeMake(KMewGetScreenWidth - 2*36, 52)];
         _finishButton.backgroundColor = [UIColor colorWithPatternImage:image];
         [_finishButton addTarget:self action:@selector(mew_finishButtonAction:) forControlEvents:UIControlEventTouchUpInside];
     }
@@ -238,7 +238,7 @@
         _codeView.placeholder = @"请输入验证码";
         _codeView.type = MewLoginForgetEditViewTypeSms;
         _codeView.backgroundColor = UIColor.whiteColor;
-        [_codeView.authCodeButton setTitleColor:[MewThemeColor mewColorWithHexString:@"#9552FF"] forState:UIControlStateNormal];
+        [_codeView.authCodeButton setTitleColor:[MewAppColor mewGetColorOfTextWithHexString:@"#9552FF"] forState:UIControlStateNormal];
         _codeView.layer.cornerRadius = 52/2.f;
         _codeView.layer.masksToBounds = YES;
         [_codeView.authCodeButton addTarget:self action:@selector(mew_authCodeButtonAction:) forControlEvents:UIControlEventTouchUpInside];

yinmeng-ios/yinmeng-ios/Main/Login/View/MewLoginFullInfoViewController.m

@@ -10,13 +10,13 @@
 #import <Masonry.h>
 #import <ReactiveObjC/ReactiveObjC.h>
 ///Tool
-#import "MewThemeColor.h"
+
 #import "MewMacro.h"
 
 #import "UIImage+MewUtils.h"
 #import "MewHUDTool.h"
 ///Model
-#import "MewThirdUserInfo.h"
+
 /// presenter
 
 
@@ -116,7 +116,7 @@
     
    
   
-    [MewOCServerManager mewSetUserDataWithRegister:^(MewBaseModel * _Nullable obj, NSInteger num, NSString * _Nonnull text) {
+    [MewOCServerManager mewSetUserDataWithRegister:^(MewNetworkDataModel * _Nullable obj, NSInteger num, NSString * _Nonnull text) {
         if(obj.code == 200){
             [self mew_dissMissVC];
         }
@@ -142,7 +142,7 @@
     }
 }
 
-- (MewThirdUserInfo *)mewGetAppleUserData {
+- (MewAppleInfoModel *)mewGetAppleUserData {
     if ([MewSaveBaseUserModel share].mewAppleInfo) {
         return [MewSaveBaseUserModel share].mewAppleInfo;
     }
@@ -174,7 +174,7 @@
     if ([self mewGetAppleUserData] && [self mewGetAppleUserData].userName.length > 0) {
         self.textField.text = [self mewGetAppleUserData].userName;
     } else {
-        [MewOCServerManager mewGetUserNick:^(MewBaseModel * _Nullable obj, NSInteger num, NSString * _Nonnull text) {
+        [MewOCServerManager mewGetUserNick:^(MewNetworkDataModel * _Nullable obj, NSInteger num, NSString * _Nonnull text) {
             if(obj.code == 200){
                 self.textField.text = obj.data;
             }
@@ -189,7 +189,7 @@
     
     [self.backButton mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.mas_equalTo(self.view).mas_offset(10);
-        make.top.mas_equalTo(statusbarHeight);
+        make.top.mas_equalTo(kMewGetBarHeight);
         make.height.width.mas_equalTo(44);
     }];
     
@@ -268,7 +268,7 @@
     if (!_titleLabel) {
         _titleLabel = [[UILabel alloc] init];
         _titleLabel.text = @"填写资料";
-        _titleLabel.font = kFontMedium(18);
+        _titleLabel.font = kMewSetFontMedium(18);
         _titleLabel.textColor = UIColor.whiteColor;
     }
     return _titleLabel;
@@ -287,7 +287,7 @@
 - (UITextField *)textField {
     if (!_textField) {
         _textField = [[UITextField alloc] init];
-        _textField.textColor = [MewThemeColor mewMainTextColor];
+        _textField.textColor = [MewAppColor mewMainTextColor];
         _textField.font = [UIFont fontWithName:@"PingFang-SC-Medium" size:15.f];
         _textField.textAlignment = NSTextAlignmentLeft;
         _textField.placeholder = @"请输入昵称";
@@ -333,7 +333,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:@[[MewAppColor mewGetColorOfTextWithHexString:@"#FF60FD"], [MewAppColor mewGetColorOfTextWithHexString:@"#8974FF"],[MewAppColor mewGetColorOfTextWithHexString:@"#69EBFF"]] gradientType:MewGradientTypeLeftToRight imgSize:CGSizeMake(KMewGetScreenWidth - 2*36, 52)];
         _nextButton.backgroundColor = [UIColor colorWithPatternImage:image];
         [_nextButton addTarget:self action:@selector(mew_nextButtonAction) forControlEvents:UIControlEventTouchUpInside];
     }

yinmeng-ios/yinmeng-ios/Main/Login/View/MewLoginVerifBindPhoneViewController.h

@@ -6,7 +6,7 @@
 //
 
 #import "MewBaseViewController.h"
-@class MewUserInfoModel;
+@class MewPersonInfoModel;
 /**
  手机号绑定的类型
  - MewBindingPhoneNumTypeNormal: 普通状态，首次绑定
@@ -23,7 +23,7 @@ NS_ASSUME_NONNULL_BEGIN
 @interface MewLoginVerifBindPhoneViewController : MewBaseViewController
 @property (nonatomic, assign) MewBindingPhoneNumType bindingPhoneNumType;
 ///用户信息
-@property (nonatomic, strong) MewUserInfoModel *userInfo;
+@property (nonatomic, strong) MewPersonInfoModel *userInfo;
 @end
 
 NS_ASSUME_NONNULL_END

yinmeng-ios/yinmeng-ios/Main/Login/View/MewLoginVerifBindPhoneViewController.m

@@ -10,14 +10,14 @@
 #import <Masonry/Masonry.h>
 #import <ReactiveObjC/ReactiveObjC.h>
 ///Tool
-#import "MewThemeColor.h"
+
 #import "MewConstant.h"
 #import "MewMacro.h"
 #import "UIImage+MewUtils.h"
 #import "MewHUDTool.h"
 #import "MEWCountDownHelper.h"
 ///Model
-#import "MewUserInfoModel.h"
+
 
 
 
@@ -100,7 +100,7 @@
     
     [self.backButton mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.mas_equalTo(self.view).mas_offset(10);
-        make.top.mas_equalTo(statusbarHeight);
+        make.top.mas_equalTo(kMewGetBarHeight);
         make.height.width.mas_equalTo(44);
     }];
     
@@ -113,7 +113,7 @@
         make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(60);
         make.left.mas_equalTo(32);
         make.height.mas_equalTo(52);
-        make.width.mas_equalTo(KScreenWidth - 2 * 36);
+        make.width.mas_equalTo(KMewGetScreenWidth - 2 * 36);
     }];
     
     [self.areaCodeLabel mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -203,7 +203,7 @@
 
         NSString * typeStr = [NSString stringWithFormat:@"%lu", (unsigned long)self.bindingPhoneNumType == MewBindingPhoneNumTypeConfirm ? MewUserLoginType_Unbind_Phone : MewUserLoginType_Bind_Phone];
         NSString * phone = [DESEncrypt encryptUseDES:self.phoneNumTextField.text key:KeyWithType(KeyType_PasswordEncode)];
-        [MewOCServerManager mewGetPhoneAuthCode:^(MewBaseModel * _Nullable obj, NSInteger num, NSString * _Nonnull text) {
+        [MewOCServerManager mewGetPhoneAuthCode:^(MewNetworkDataModel * _Nullable obj, NSInteger num, NSString * _Nonnull text) {
             if(obj.code == 200){
                 self.authCodeBtn.enabled = NO;
                 [self mew_showSuccessToast:@"验证码发送成功"];
@@ -232,7 +232,7 @@
         } else {
             NSString * ticket = [[MewSaveBaseUserModel share]mewUserTicket];
             NSString * phone = [DESEncrypt encryptUseDES:self.phoneNumTextField.text key:KeyWithType(KeyType_PasswordEncode)];
-            [MewOCServerManager mewSetUserPhoneInfo:^(MewBaseModel * _Nullable obj, NSInteger num, NSString * _Nonnull text) {
+            [MewOCServerManager mewSetUserPhoneInfo:^(MewNetworkDataModel * _Nullable obj, NSInteger num, NSString * _Nonnull text) {
                 if(obj.code == 200){
                     [[MEWCountDownHelper shareHelper] mewStopCountDown];
                     // 修改绑定信息
@@ -279,7 +279,8 @@
 - (UIView *)containerView{
     if (!_containerView) {
         _containerView = [[UIView alloc] init];
-        _containerView.backgroundColor = [MewThemeColor mewAppBackgroundColor];
+        _containerView.backgroundColor = [MewAppColor mewViewBgColor];
+        
     }
     return _containerView;
 }
@@ -304,7 +305,7 @@
     if (!_titleLabel) {
         _titleLabel = [[UILabel alloc] init];
         _titleLabel.text = @"绑定手机号";
-        _titleLabel.font = kFontMedium(18);
+        _titleLabel.font = kMewSetFontMedium(18);
         _titleLabel.textColor = UIColor.whiteColor;
     }
     return _titleLabel;
@@ -314,7 +315,7 @@
     if (!_areaCodeLabel) {
         _areaCodeLabel = [[UILabel alloc] init];
         _areaCodeLabel.text = @"+86";
-        _areaCodeLabel.textColor = [MewThemeColor mewSecondTextColor];
+        _areaCodeLabel.textColor = [MewAppColor mewSecondTextColor];
         _areaCodeLabel.font = [UIFont systemFontOfSize:14.f];
         _areaCodeLabel.adjustsFontSizeToFitWidth = YES;
     }
@@ -330,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:@[[MewAppColor mewGetColorOfTextWithHexString:@"#FF60FD"], [MewAppColor mewGetColorOfTextWithHexString:@"#8974FF"],[MewAppColor mewGetColorOfTextWithHexString:@"#69EBFF"]] gradientType:MewGradientTypeLeftToRight imgSize:CGSizeMake(KMewGetScreenWidth - 2*36, 52)];
         _confirmBtn.backgroundColor = [UIColor colorWithPatternImage:image];
     }
     return _confirmBtn;
@@ -340,9 +341,9 @@
     if (!_authCodeBtn) {
         _authCodeBtn = [UIButton buttonWithType:UIButtonTypeCustom];
         [_authCodeBtn setTitle:@"获取验证码" forState:UIControlStateNormal];
-        [_authCodeBtn setTitleColor:[MewThemeColor mewColorWithHexString:@"#9552FF"] forState:UIControlStateNormal];
+        [_authCodeBtn setTitleColor:[MewAppColor mewGetColorOfTextWithHexString:@"#9552FF"] forState:UIControlStateNormal];
-//        [_authCodeBtn setTitleColor:[MewThemeColor appMainColor] forState:UIControlStateNormal];
+//        [_authCodeBtn setTitleColor:[ appMainColor] forState:UIControlStateNormal];
-         [_authCodeBtn setTitleColor:[MewThemeColor mewSecondTextColor] forState:UIControlStateDisabled];
+         [_authCodeBtn setTitleColor:[MewAppColor mewSecondTextColor] forState:UIControlStateDisabled];
         [_authCodeBtn.titleLabel setFont:[UIFont systemFontOfSize:12.f]];
     }
     return _authCodeBtn;
@@ -360,13 +361,13 @@
 - (UITextField *)phoneNumTextField {
     if (!_phoneNumTextField) {
         _phoneNumTextField = [[UITextField alloc] init];
-        _phoneNumTextField.textColor = [MewThemeColor mewMainTextColor];
+        _phoneNumTextField.textColor = [MewAppColor mewMainTextColor];
         _phoneNumTextField.font = [UIFont systemFontOfSize:14.f];
-        _phoneNumTextField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:@"输入手机号"attributes:@{NSForegroundColorAttributeName: [MewThemeColor mewSecondTextColor]}];
+        _phoneNumTextField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:@"输入手机号"attributes:@{NSForegroundColorAttributeName: [MewAppColor mewSecondTextColor]}];
         _phoneNumTextField.clearButtonMode = UITextFieldViewModeWhileEditing;
         _phoneNumTextField.borderStyle = UITextBorderStyleNone;
         _phoneNumTextField.keyboardType = UIKeyboardTypeNumberPad;
-        _phoneNumTextField.tintColor = [MewThemeColor mewMainTextColor];
+        _phoneNumTextField.tintColor = [MewAppColor mewMainTextColor];
     }
     return _phoneNumTextField;
 }
@@ -384,13 +385,13 @@
 - (UITextField *)authCodeTextField {
     if (!_authCodeTextField) {
         _authCodeTextField = [[UITextField alloc] init];
-        _authCodeTextField.textColor = [MewThemeColor mewMainTextColor];
+        _authCodeTextField.textColor = [MewAppColor mewMainTextColor];
         _authCodeTextField.font = [UIFont systemFontOfSize:14.f];
-        _authCodeTextField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:@"输入验证码"attributes:@{NSForegroundColorAttributeName: [MewThemeColor mewSecondTextColor]}];
+        _authCodeTextField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:@"输入验证码"attributes:@{NSForegroundColorAttributeName: [MewAppColor mewSecondTextColor]}];
         _authCodeTextField.clearButtonMode = UITextFieldViewModeWhileEditing;
         _authCodeTextField.borderStyle = UITextBorderStyleNone;
         _authCodeTextField.keyboardType = UIKeyboardTypeNumberPad;
-        _authCodeTextField.tintColor = [MewThemeColor mewMainTextColor];
+        _authCodeTextField.tintColor = [MewAppColor mewMainTextColor];
     }
     return _authCodeTextField;
 }

yinmeng-ios/yinmeng-ios/Main/Login/View/MewMineLoginPasswordViewController.h

@@ -6,12 +6,12 @@
 //
 
 #import "MewBaseViewController.h"
-@class MewUserInfoModel;
+@class MewPersonInfoModel;
 
 NS_ASSUME_NONNULL_BEGIN
 
 @interface MewMineLoginPasswordViewController : MewBaseViewController
-@property (nonatomic,strong) MewUserInfoModel *userInfo;
+@property (nonatomic,strong) MewPersonInfoModel *userInfo;
 ///是否是修改密码
 @property (nonatomic,assign) BOOL isModifiPwd;
 @end

yinmeng-ios/yinmeng-ios/Main/Login/View/MewMineLoginPasswordViewController.m

@@ -12,12 +12,12 @@
 #import <Masonry/Masonry.h>
 #import <ReactiveObjC/ReactiveObjC.h>
 ///Tool
-#import "MewThemeColor.h"
+
 
 #import "UIImage+MewUtils.h"
 #import "MewMacro.h"
 ///Model
-#import "MewUserInfoModel.h"
+
 
 
 @interface MewMineLoginPasswordViewController ()
@@ -55,7 +55,7 @@
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-    self.view.backgroundColor = [MewThemeColor mewColorWithHexString:@"#14171B"];
+    self.view.backgroundColor = [MewAppColor mewGetColorOfTextWithHexString:@"#14171B"];
     [self mew_initSubViews];
     [self mew_initSubViewConstraints];
 }
@@ -76,7 +76,7 @@
 - (void)mew_initSubViewConstraints {
     [self.backButton mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.mas_equalTo(self.view).mas_offset(10);
-        make.top.mas_equalTo(statusbarHeight);
+        make.top.mas_equalTo(kMewGetBarHeight);
         make.height.width.mas_equalTo(44);
     }];
     
@@ -87,7 +87,7 @@
     
     [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) {
 //        make.left.right.mas_equalTo(self.view);
-        make.width.mas_equalTo(KScreenWidth - 2 *36);
+        make.width.mas_equalTo(KMewGetScreenWidth - 2 *36);
         make.centerX.equalTo(self.view);
         make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(60);
     }];
@@ -128,7 +128,7 @@
         return;
     }
     if (self.isModifiPwd) {
-        [MewOCServerManager mewChangeLoginPassword:^(MewBaseModel * _Nullable obj, NSInteger num, NSString * _Nonnull text) {
+        [MewOCServerManager mewChangeLoginPassword:^(MewNetworkDataModel * _Nullable obj, NSInteger num, NSString * _Nonnull text) {
             if(obj.code == 200){
                 [self mew_showSuccessToast:@"修改成功"];
                 [self.navigationController popViewControllerAnimated:YES];
@@ -138,7 +138,7 @@
     } else {
        
         
-        [MewOCServerManager mewSetLoginPasswordAction:^(MewBaseModel * _Nullable obj, NSInteger num, NSString * _Nonnull text) {
+        [MewOCServerManager mewSetLoginPasswordAction:^(MewNetworkDataModel * _Nullable obj, NSInteger num, NSString * _Nonnull text) {
             if(obj.code == 200){
                 [self mew_showSuccessToast:@"设置成功"];
                 [self.navigationController popViewControllerAnimated:YES];
@@ -250,7 +250,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:@[[MewAppColor mewGetColorOfTextWithHexString:@"#FF60FD"], [MewAppColor mewGetColorOfTextWithHexString:@"#8974FF"],[MewAppColor mewGetColorOfTextWithHexString:@"#69EBFF"]] gradientType:MewGradientTypeLeftToRight imgSize:CGSizeMake(KMewGetScreenWidth - 2*36, 52)];
         _submitButton.backgroundColor = [UIColor colorWithPatternImage:image];
         [_submitButton addTarget:self action:@selector(mew_submitButtonAction:) forControlEvents:UIControlEventTouchUpInside];
     }
@@ -292,7 +292,7 @@
     if (!_titleLabel) {
         _titleLabel = [[UILabel alloc] init];
         _titleLabel.text = @"重置密码";
-        _titleLabel.font = kFontMedium(18);
+        _titleLabel.font = kMewSetFontMedium(18);
         _titleLabel.textColor = UIColor.whiteColor;
     }
     return _titleLabel;

yinmeng-ios/yinmeng-ios/Main/Login/View/MewView/MewLoginNumberViewController.m

@@ -116,12 +116,12 @@
     }];
     [self.backButton mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.mas_equalTo(self.view).mas_offset(10);
-        make.top.mas_equalTo(statusbarHeight);
+        make.top.mas_equalTo(kMewGetBarHeight);
         make.height.width.mas_equalTo(44);
     }];
     
     [self.phoneButton mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.width.mas_equalTo(KScreenWidth/2);
+        make.width.mas_equalTo(KMewGetScreenWidth/2);
         make.top.equalTo(self.backButton.mas_bottom).offset(40);
         make.height.mas_equalTo(40);
         make.left.equalTo(self.view);
@@ -134,7 +134,7 @@
     
     [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.equalTo(self.phoneButton.mas_bottom);
-        make.left.mas_equalTo(KScreenWidth/4.0 - 60/2.0);
+        make.left.mas_equalTo(KMewGetScreenWidth/4.0 - 60/2.0);
         make.width.mas_equalTo(60);
         make.height.mas_equalTo(5);
     }];
@@ -142,7 +142,7 @@
     [self.phoneLoginView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.equalTo(self.lineView.mas_bottom).offset(20);
         make.left.right.equalTo(self.view);
-        make.height.mas_equalTo(KScreenHeight/2.0);
+        make.height.mas_equalTo(KMewGetScreenHeight/2.0);
     }];
     
     [self.passwordLoginView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -157,12 +157,12 @@
 - (void)setPhoneSelect:(BOOL)phoneSelect {
     _phoneSelect = phoneSelect;
     /// 更新样式
-    self.phoneButton.titleLabel.font = _phoneSelect ? kFontSemibold(18) : kFontSemibold(16);
+    self.phoneButton.titleLabel.font = _phoneSelect ? kMewSetFontSemibold(18) : kMewSetFontSemibold(16);
-    self.passwordButton.titleLabel.font = _phoneSelect ? kFontSemibold(16) : kFontSemibold(18);
+    self.passwordButton.titleLabel.font = _phoneSelect ? kMewSetFontSemibold(16) : kMewSetFontSemibold(18);
     self.phoneLoginView.hidden = !_phoneSelect;
     self.passwordLoginView.hidden = _phoneSelect;
     
-    CGFloat left = _phoneSelect ? KScreenWidth/4.0 - 60/2.0 : KScreenWidth/2.0 + KScreenWidth/4.0 - 60/2.0;
+    CGFloat left = _phoneSelect ? KMewGetScreenWidth/4.0 - 60/2.0 : KMewGetScreenWidth/2.0 + KMewGetScreenWidth/4.0 - 60/2.0;
     [self.lineView mas_updateConstraints:^(MASConstraintMaker *make) {
         make.left.mas_equalTo(left);
     }];
@@ -189,7 +189,7 @@
         _phoneButton = [[UIButton alloc] init];
         [_phoneButton setTitle:@"手机号登录" forState:UIControlStateNormal];
         [_phoneButton setTitleColor:UIColor.whiteColor forState:UIControlStateNormal];
-        _phoneButton.titleLabel.font = kFontSemibold(16);
+        _phoneButton.titleLabel.font = kMewSetFontSemibold(16);
         [_phoneButton addTarget:self action:@selector(mew_phoneButtonAction) forControlEvents:UIControlEventTouchUpInside];
     }
     return _phoneButton;
@@ -200,7 +200,7 @@
         _passwordButton = [[UIButton alloc] init];
         [_passwordButton setTitle:@"账号登录" forState:UIControlStateNormal];
         [_passwordButton setTitleColor:UIColor.whiteColor forState:UIControlStateNormal];
-        _phoneButton.titleLabel.font = kFontSemibold(16);
+        _phoneButton.titleLabel.font = kMewSetFontSemibold(16);
         [_passwordButton addTarget:self action:@selector(mew_passwordButtonAction) forControlEvents:UIControlEventTouchUpInside];
     }
     return _passwordButton;

yinmeng-ios/yinmeng-ios/Main/Login/View/MewView/MewLoginViewController.m

@@ -18,7 +18,7 @@
 #import <Masonry/Masonry.h>
 ///Tool
 #import "MewMacro.h"
-#import "MewThemeColor.h"
+
 #import "MewHUDTool.h"
 #import "UIImage+MewUtils.h"
 #import "MewConstant.h"
@@ -26,11 +26,11 @@
 
 
 
-#import "MewHtmlUrl.h"
+
 ///Present
 
 
-#import "MewThirdUserInfo.h"
+
 
 
 
@@ -116,7 +116,7 @@ API_AVAILABLE(ios(13.0))
         make.edges.equalTo(self.view);
     }];
     [self.helloBgImageView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.mas_equalTo(kStatusBarHeight + 92);
+        make.top.mas_equalTo(kMewGetBarHeight + 92);
         make.left.mas_equalTo(40);
         make.width.height.mas_equalTo(58);
     }];
@@ -145,7 +145,7 @@ API_AVAILABLE(ios(13.0))
     
     
     [self.appleButton mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.bottom.mas_equalTo(self.view).offset(-kSafeAreaBottomHeight - 60);
+        make.bottom.mas_equalTo(self.view).offset(-kMewGetSafeHeight - 60);
         make.centerX.mas_equalTo(self.view);
         make.width.height.mas_equalTo(40);
     }];
@@ -284,7 +284,7 @@ API_AVAILABLE(ios(13.0))
 - (void)authorizationController:(ASAuthorizationController *)controller didCompleteWithAuthorization:(ASAuthorization *)authorization API_AVAILABLE(ios(13.0)) {
     
     if ([authorization.credential isKindOfClass:[ASAuthorizationAppleIDCredential class]]) {
-        MewThirdUserInfo *userInfo = [[MewThirdUserInfo alloc] init];
+        MewAppleInfoModel *userInfo = [[MewAppleInfoModel alloc] init];
         
         ASAuthorizationAppleIDCredential * credential = (ASAuthorizationAppleIDCredential *)authorization.credential;
         
@@ -310,9 +310,9 @@ API_AVAILABLE(ios(13.0))
         [MewSaveBaseUserModel share].mewAppleInfo = userInfo;
         [MewHUDTool mew_showLoadingWithMessage:@"正在登录中"];
       
-        [MewOCServerManager mewAppleLogin:^(MewBaseModel * _Nullable obj, NSInteger num, NSString * _Nonnull text) {
+        [MewOCServerManager mewAppleLogin:^(MewNetworkDataModel * _Nullable obj, NSInteger num, NSString * _Nonnull text) {
             if(obj.code == 200){
-                MewAccountModel *model = [MewAccountModel mewModelWithDictionary:obj.data];
+                MewLoginTokenInfoModel *model = [MewLoginTokenInfoModel mewModelWithDictionary:obj.data];
                 if (model != nil) {
                     [[MewSaveBaseUserModel share]mewSaveBaseUserData:model];
                     [self dismissViewControllerAnimated:YES completion:nil];
@@ -365,11 +365,11 @@ API_AVAILABLE(ios(13.0))
         _loginButton.layer.cornerRadius = 45/2.f;
         [_loginButton setTitle:@"账号登录" forState:UIControlStateNormal];
         [_loginButton setTitleColor:UIColor.whiteColor forState:UIControlStateNormal];
-        _loginButton.titleLabel.font = kFontMedium(16);
+        _loginButton.titleLabel.font = kMewSetFontMedium(16);
         _loginButton.titleLabel.font = [UIFont fontWithName:@"PingFang-SC-Medium" size:18];
-        UIImage *bgImage = [UIImage mew_gradientColorImageFromColors:@[[MewThemeColor mewColorWithHexString:@"#FF60FD"],
+        UIImage *bgImage = [UIImage mew_gradientColorImageFromColors:@[[MewAppColor mewGetColorOfTextWithHexString:@"#FF60FD"],
-                                                                   [MewThemeColor mewColorWithHexString:@"##8974FF"],
+                                                                   [MewAppColor mewGetColorOfTextWithHexString:@"##8974FF"],
-                                                                   [MewThemeColor mewColorWithHexString:@"#69EBFF"]] gradientType:MewGradientTypeLeftToRight imgSize:CGSizeMake(KScreenWidth - 80, 52)];
+                                                                   [MewAppColor mewGetColorOfTextWithHexString:@"#69EBFF"]] gradientType:MewGradientTypeLeftToRight imgSize:CGSizeMake(KMewGetScreenWidth - 80, 52)];
         _loginButton.backgroundColor = [UIColor colorWithPatternImage:bgImage];
         [_loginButton addTarget:self action:@selector(mew_loginButtonAction:) forControlEvents:UIControlEventTouchUpInside];
     }
@@ -405,7 +405,7 @@ API_AVAILABLE(ios(13.0))
 
 - (NSMutableAttributedString *)privacyAttributedStr{
     NSMutableAttributedString *attString = [[NSMutableAttributedString alloc] initWithString:@"同意"];
-    attString.yy_color = UIColorMewRGBAlpha(0xFFFFFF, 0.8);
+    attString.yy_color = [MewAppColor mewGetAlphaColorOfTextWithHexString:@"0xffffff" alpha:0.8];
     NSString *userString = @"《用户服务协议》";
     NSMutableAttributedString *userAttString = [[NSMutableAttributedString alloc] initWithString:userString attributes:@{NSForegroundColorAttributeName:UIColor.whiteColor}];
     __weak typeof(self) weakSelf = self;
@@ -413,19 +413,19 @@ API_AVAILABLE(ios(13.0))
         __strong typeof(self) strongSelf = weakSelf;
         // 跳转用户协议
         MewWebViewController * webVC = [[MewWebViewController alloc] init];
-        webVC.url = URLWithType(kUserProtocalURL);
+        webVC.url = [NSString stringWithFormat:@"mew\%@",[MewEncryptManager mewAESDecryptText:@"oSYlxZYQP2Vu+3KRnQorypsYWQGEz2tKII7AwcFks7s="]];
         [strongSelf.navigationController pushViewController:webVC animated:YES];
     } longPressAction:nil];
     
     NSMutableAttributedString *andString = [[NSMutableAttributedString alloc] initWithString:@"和"];
-    andString.yy_color = UIColorMewRGBAlpha(0xFFFFFF, 0.8);
+    andString.yy_color = [MewAppColor mewGetAlphaColorOfTextWithHexString:@"0xffffff" alpha:0.8];
     NSString *protocolString = @"《隐私政策》";
     NSMutableAttributedString *privateString = [[NSMutableAttributedString alloc] initWithString:protocolString attributes:@{NSForegroundColorAttributeName:UIColor.whiteColor}];
     [privateString yy_setTextHighlightRange:NSMakeRange(0, privateString.length) color:nil backgroundColor:nil userInfo:nil tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) {
         __strong typeof(self) strongSelf = weakSelf;
         // 跳转隐私政策
         MewWebViewController * webVC = [[MewWebViewController alloc] init];
-        webVC.url = URLWithType(kPrivacyURL);
+        webVC.url = [NSString stringWithFormat:@"mew\%@",[MewEncryptManager mewAESDecryptText:@"RW2RUxUBFSQXiYS0xFpDv+HMdWG2/xfjkYMyeSFR/BY="]];
         [strongSelf.navigationController pushViewController:webVC animated:YES];
     } longPressAction:nil];
     [attString appendAttributedString:userAttString];
@@ -499,7 +499,7 @@ API_AVAILABLE(ios(13.0))
         _helloTitleLabel = [[UILabel alloc]init];
         _helloTitleLabel.text = @"Hi！";
         _helloTitleLabel.textColor = UIColor.whiteColor;
-        _helloTitleLabel.font = kFontMedium(68);
+        _helloTitleLabel.font = kMewSetFontMedium(68);
     }
     return _helloTitleLabel;
 }
@@ -509,7 +509,7 @@ API_AVAILABLE(ios(13.0))
         _helloDetailLabel = [[UILabel alloc]init];
         _helloDetailLabel.text = @"欢迎来到音萌";
         _helloDetailLabel.textColor = UIColor.whiteColor;
-        _helloDetailLabel.font = kFontMedium(40);
+        _helloDetailLabel.font = kMewSetFontMedium(40);
     }
     return _helloDetailLabel;
 }
@@ -535,7 +535,7 @@ API_AVAILABLE(ios(13.0))
         _otherLoginTitleLabel = [[UILabel alloc ]init];
         _otherLoginTitleLabel.text = @"其他登录方式";
         _otherLoginTitleLabel.textColor = UIColor.whiteColor;
-        _otherLoginTitleLabel.font = kFontRegular(13);
+        _otherLoginTitleLabel.font = kMewSetFontRegular(13);
     }
     return _otherLoginTitleLabel;
 }

yinmeng-ios/yinmeng-ios/Main/Login/View/MewView/SubView/MewLoginPasswordView.m

@@ -10,7 +10,7 @@
 #import <Masonry/Masonry.h>
 #import <ReactiveObjC/ReactiveObjC.h>
 /// Tool
-#import "MewThemeColor.h"
+
 #import "MewHUDTool.h"
 #import "UIImage+MewUtils.h"
 #import "MewConstant.h"
@@ -65,9 +65,9 @@
     }
     NSString * desPassword = [DESEncrypt encryptUseDES:self.codeView.textField.text key:KeyWithType(KeyType_PasswordEncode)];
     NSString * phone = [DESEncrypt encryptUseDES:self.phoneView.textField.text key:KeyWithType(KeyType_PasswordEncode)];
-    [MewOCServerManager mewLoginAppWithPassword:^(MewBaseModel * _Nullable obj, NSInteger num, NSString * _Nonnull text) {
+    [MewOCServerManager mewLoginAppWithPassword:^(MewNetworkDataModel * _Nullable obj, NSInteger num, NSString * _Nonnull text) {
         if(obj.code == 200){
-            MewAccountModel *model = [MewAccountModel mewModelWithDictionary:obj.data];
+            MewLoginTokenInfoModel *model = [MewLoginTokenInfoModel mewModelWithDictionary:obj.data];
             if (model && model.access_token.length > 0){
                 [[MewSaveBaseUserModel share]mewSaveBaseUserData:model];
             }
@@ -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:@[[MewAppColor mewGetColorOfTextWithHexString:@"#FF60FD"], [MewAppColor mewGetColorOfTextWithHexString:@"#8974FF"],[MewAppColor mewGetColorOfTextWithHexString:@"#69EBFF"]] gradientType:MewGradientTypeLeftToRight imgSize:CGSizeMake(KMewGetScreenWidth - 2*36, 52)];
         _nextButton.backgroundColor = [UIColor colorWithPatternImage:image];
         [_nextButton addTarget:self action:@selector(mew_nextButtonAction) forControlEvents:UIControlEventTouchUpInside];
     }
@@ -157,7 +157,7 @@
     if (!_forgetPasswordButton) {
         _forgetPasswordButton = [UIButton buttonWithType:UIButtonTypeCustom];
         [_forgetPasswordButton setTitle:@"忘记密码?" forState:UIControlStateNormal];
-        [_forgetPasswordButton setTitleColor:UIColorMewRGBAlpha(0xFFFFFF, 0.8) forState:UIControlStateNormal];
+        [_forgetPasswordButton setTitleColor:[MewAppColor mewGetAlphaColorOfTextWithHexString:@"0xffffff" alpha:0.8] forState:UIControlStateNormal];
         _forgetPasswordButton.titleLabel.font =  [UIFont fontWithName:@"PingFang-SC-Regular" size:14];
 //        _forgetPasswordButton.hidden = NO;
         [_forgetPasswordButton addTarget:self action:@selector(mew_forgetPasswordButtonAction) forControlEvents:UIControlEventTouchUpInside];

yinmeng-ios/yinmeng-ios/Main/Login/View/MewView/SubView/MewLoginPhoneView.m

@@ -12,7 +12,7 @@
 
 
 /// Tool
-#import "MewThemeColor.h"
+
 #import "MewMacro.h"
 #import "MewHUDTool.h"
 #import "UIImage+MewUtils.h"
@@ -76,7 +76,7 @@
     }
     
     NSString *phone = [DESEncrypt encryptUseDES:self.phone key:KeyWithType(KeyType_PasswordEncode)];
-    [MewOCServerManager mewGetPhoneAuthCode:^(MewBaseModel * _Nullable obj, NSInteger num, NSString * _Nonnull text) {
+    [MewOCServerManager mewGetPhoneAuthCode:^(MewNetworkDataModel * _Nullable obj, NSInteger num, NSString * _Nonnull text) {
         if(obj.code == 200){
             [MewHUDTool showErrorWithMessage:[NSString stringWithFormat:@"验证码已发送\n+86 %@", self.phone]];
             /// 开启定时器
@@ -98,9 +98,9 @@
 - (void)mew_confirmButtonAction {
     NSString *phone = [DESEncrypt encryptUseDES:self.phone key:KeyWithType(KeyType_PasswordEncode)];
 
-    [MewOCServerManager mewLoginAppWithCode:^(MewBaseModel * _Nullable obj, NSInteger num, NSString * _Nonnull text) {
+    [MewOCServerManager mewLoginAppWithCode:^(MewNetworkDataModel * _Nullable obj, NSInteger num, NSString * _Nonnull text) {
         if(obj.code == 200){
-            MewAccountModel *accountModel = [MewAccountModel mewModelWithDictionary:obj.data];
+            MewLoginTokenInfoModel *accountModel = [MewLoginTokenInfoModel mewModelWithDictionary:obj.data];
             if (accountModel && accountModel.access_token.length > 0) {
                 [[MewSaveBaseUserModel share]mewSaveBaseUserData:accountModel];
             }
@@ -251,7 +251,7 @@
 - (MewLoginInputView *)phoneInputView {
     if (!_phoneInputView) {
         _phoneInputView = [[MewLoginInputView alloc] init];
-        _phoneInputView.backgroundColor = [MewThemeColor mewColorWithHexString:@"#F8F8FB"];
+        _phoneInputView.backgroundColor = [MewAppColor mewGetColorOfTextWithHexString:@"#F8F8FB"];
         _phoneInputView.layer.cornerRadius = 51.0/2;
         _phoneInputView.layer.masksToBounds = YES;
         _phoneInputView.maxLength = 11;
@@ -274,13 +274,13 @@
 - (UITextField *)codeTextField {
     if (!_codeTextField) {
         _codeTextField = [[UITextField alloc] init];
-        _codeTextField.textColor = [MewThemeColor mewMainTextColor];
+        _codeTextField.textColor = [MewAppColor mewMainTextColor];
         _codeTextField.font = [UIFont systemFontOfSize:18.f];
         _codeTextField.keyboardType = UIKeyboardTypeNumberPad;
-        _codeTextField.tintColor = [MewThemeColor mewMainTextColor];
+        _codeTextField.tintColor = [MewAppColor 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: [MewAppColor mewSecondTextColor], NSFontAttributeName:[UIFont systemFontOfSize:14]}];
     }
     return _codeTextField;
 }
@@ -290,7 +290,7 @@
         _cutdownLabel = [[UILabel alloc] init];
         _cutdownLabel.textAlignment = NSTextAlignmentCenter;
         _cutdownLabel.font = [UIFont boldSystemFontOfSize:11];
-        _cutdownLabel.textColor = [MewThemeColor mewSecondTextColor];
+        _cutdownLabel.textColor = [MewAppColor mewSecondTextColor];
         _cutdownLabel.hidden = YES;
     }
     return _cutdownLabel;
@@ -301,7 +301,7 @@
     if (!_retryCodeButton) {
         _retryCodeButton = [UIButton buttonWithType:UIButtonTypeCustom];
         [_retryCodeButton setTitle:@"获取验证码" forState:UIControlStateNormal];
-        [_retryCodeButton setTitleColor:[MewThemeColor mewColorWithHexString:@"#9552FF"] forState:UIControlStateNormal];
+        [_retryCodeButton setTitleColor:[MewAppColor mewGetColorOfTextWithHexString:@"#9552FF"] forState:UIControlStateNormal];
         _retryCodeButton.titleLabel.font = [UIFont systemFontOfSize:11 weight:UIFontWeightMedium];
         [_retryCodeButton addTarget:self action:@selector(mew_getSmsCodeButtonAction) forControlEvents:UIControlEventTouchUpInside];
         _retryCodeButton.hidden = NO;
@@ -318,7 +318,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:@[[MewAppColor mewGetColorOfTextWithHexString:@"#FF60FD"], [MewAppColor mewGetColorOfTextWithHexString:@"#8974FF"],[MewAppColor mewGetColorOfTextWithHexString:@"#69EBFF"]] gradientType:MewGradientTypeLeftToRight imgSize:CGSizeMake(KMewGetScreenWidth - 2*36, 52)];
         _confirmButton.backgroundColor = [UIColor colorWithPatternImage:image];
         [_confirmButton setTitleColor:UIColor.whiteColor forState:UIControlStateNormal];
         [_confirmButton addTarget:self action:@selector(mew_confirmButtonAction) forControlEvents:UIControlEventTouchUpInside];

yinmeng-ios/yinmeng-ios/Main/Message/Model/MewChatLimitModel.h

@@ -1,22 +0,0 @@
-//
-//  MewChatLimitModel.h
-//  mew-ios
-//
-//  Created by 触海 on 2023/11/16.
-//
-
-#import "NSObject+MEWExtension.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface MewChatLimitModel : NSObject
-
-@property(nonatomic,assign) int model;
-@property (nonatomic, assign) BOOL chat;
-@property (nonatomic, copy) NSString * message;
-@property (nonatomic, copy) NSString * wealthLevel;
-@property (nonatomic, copy) NSString * charmLevel;
-
-@end
-
-NS_ASSUME_NONNULL_END

yinmeng-ios/yinmeng-ios/Main/Message/Model/MewChatLimitModel.m

@@ -1,12 +0,0 @@
-//
-//  MewChatLimitModel.m
-//  mew-ios
-//
-//  Created by 触海 on 2023/11/16.
-//
-
-#import "MewChatLimitModel.h"
-
-@implementation MewChatLimitModel
-
-@end

yinmeng-ios/yinmeng-ios/Main/Message/Model/MewChatMsgItemModel.swift

@@ -0,0 +1,15 @@
+//
+//  MewChatMsgItemModel.swift
+//  yinmeng-ios
+//
+//  Created by duoban on 2024/1/19.
+//
+
+import UIKit
+
+class MewChatMsgItemModel: NSObject {
+   
+    @objc var imageName = "";
+   
+    @objc var type:MewChatMsgItemType = .photo;
+}

yinmeng-ios/yinmeng-ios/Main/Message/Model/MewMessageMenuModel.h

@@ -1,27 +0,0 @@
-//
-//  MewMessageMenuModel.h
-//  yinmeng-ios
-//
-//  Created by 触海 on 2023/11/21.
-//
-
-#import <Foundation/Foundation.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-typedef NS_ENUM(NSInteger, MewMessageMenuType) {
-	///发送图片
-	Mew_MessageMenuType_Photo = 1,
-   ///送礼物
-	Mew_MessageMenuType_Gift
-};
-
-@interface MewMessageMenuModel : NSObject
-///图片
-@property (nonatomic,strong) NSString *imageName;
-///类型
-@property (nonatomic,assign) MewMessageMenuType type;
-
-@end
-
-NS_ASSUME_NONNULL_END

yinmeng-ios/yinmeng-ios/Main/Message/Model/MewMessageMenuModel.m

@@ -1,12 +0,0 @@
-//
-//  MewMessageMenuModel.m
-//  yinmeng-ios
-//
-//  Created by 触海 on 2023/11/21.
-//
-
-#import "MewMessageMenuModel.h"
-
-@implementation MewMessageMenuModel
-
-@end

yinmeng-ios/yinmeng-ios/Main/Message/View/MewSessionList/MewSessionListTableViewCell.m

@@ -14,7 +14,7 @@
 /// Tool
 #import "MewClientConfig.h"
 
-#import "MewThemeColor.h"
+
 #import "MewNIMMessageUtils.h"
 #import "MewTimeIntervalUtils.h"
 #import "UIView+NIM.h"
@@ -113,7 +113,7 @@
         make.height.mas_equalTo(72);
 //        make.top.mas_equalTo(10);
         make.left.mas_offset(16);
-        make.width.mas_equalTo(KScreenWidth - 32);
+        make.width.mas_equalTo(KMewGetScreenWidth - 32);
     }];
     
     [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -157,8 +157,8 @@
 - (UIView *)containerView {
     if (!_containerView) {
         _containerView = [[UIView alloc] init];
-        [_containerView mew_setCornerWithLeftTopCorner:36 rightTopCorner:10 bottomLeftCorner:36 bottomRightCorner:10 size:CGSizeMake(KScreenWidth - 32, 72)];
+        [_containerView mew_setCornerWithLeftTopCorner:36 rightTopCorner:10 bottomLeftCorner:36 bottomRightCorner:10 size:CGSizeMake(KMewGetScreenWidth - 32, 72)];
-        _containerView.backgroundColor = UIColorMewFromRGB(0x525566);
+        _containerView.backgroundColor = [MewAppColor mewGetColorOfTextWithHexString:@"0x525566"];
     }
     
     return _containerView;
@@ -192,7 +192,7 @@
         _messageLabel = [[UILabel alloc] initWithFrame:CGRectZero];
         _messageLabel.backgroundColor = [UIColor clearColor];
         _messageLabel.font = [UIFont systemFontOfSize:14.f];
-        _messageLabel.textColor = UIColorMewRGBAlpha(0xFFFFFF, 0.8);
+        _messageLabel.textColor = [MewAppColor mewGetAlphaColorOfTextWithHexString:@"0xffffff" alpha:0.8];
         _messageLabel.text = @"用户回复信息内容";
     }
     return _messageLabel;

yinmeng-ios/yinmeng-ios/Main/Message/View/MewSessionList/MewSessionListViewController.m

@@ -272,10 +272,10 @@
     [self.sessionBgView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.edges.equalTo(self.view);
     }];
-    self.headerView.frame = CGRectMake(0, 0, KScreenWidth, 100);
+    self.headerView.frame = CGRectMake(0, 0, KMewGetScreenWidth, 100);
-    self.titleLabel.frame = CGRectMake(20, kStatusBarHeight+10, 200, 30);
+    self.titleLabel.frame = CGRectMake(20, kMewGetBarHeight+10, 200, 30);
   
-    self.sessionListView.frame = CGRectMake(0, CGRectGetMaxY(self.headerView.frame), KScreenWidth, KScreenHeight - CGRectGetMaxY(self.headerView.frame));
+    self.sessionListView.frame = CGRectMake(0, CGRectGetMaxY(self.headerView.frame), KMewGetScreenWidth, KMewGetScreenHeight - CGRectGetMaxY(self.headerView.frame));
     [self.cleanMessageButton mas_makeConstraints:^(MASConstraintMaker *make) {
         make.width.height.mas_equalTo(28);
         make.right.mas_equalTo(-16);
@@ -304,7 +304,7 @@
         _titleLabel = [[UILabel alloc] init];
         _titleLabel.text = @"消息中心";
         _titleLabel.textColor = [UIColor whiteColor];
-        _titleLabel.font = kFontMedium(18);
+        _titleLabel.font = kMewSetFontMedium(18);
     }
     return _titleLabel;
 }
@@ -312,7 +312,7 @@
 - (UIButton *)cleanMessageButton {
     if (!_cleanMessageButton) {
         _cleanMessageButton = [[UIButton alloc] init];
-        [_cleanMessageButton setBackgroundImage:kImage(@"mew_session_list_clean") forState:UIControlStateNormal];
+        [_cleanMessageButton setBackgroundImage:kMewGetImageData(@"mew_session_list_clean") forState:UIControlStateNormal];
         [_cleanMessageButton addTarget:self action:@selector(mew_cleanMessageButtonAction) forControlEvents:UIControlEventTouchUpInside];
     }
     return _cleanMessageButton;
@@ -336,7 +336,7 @@
 - (UIImageView *)sessionBgView{
     if(!_sessionBgView){
         _sessionBgView = [UIImageView new];
-        _sessionBgView.image = kImage(@"mew_home_bg");
+        _sessionBgView.image = kMewGetImageData(@"mew_home_bg");
     }
     return _sessionBgView;
 }

yinmeng-ios/yinmeng-ios/Main/Message/View/Session/Content/MewMessageContentProtocol.h

@@ -11,7 +11,7 @@
 
 #define AVATAR_SIZE 45
 #define AVATAR_MARGIN_H 15
-#define CONTENT_WIDTH_MAX (KScreenWidth - AVATAR_MARGIN_H * 2 * 2 - AVATAR_SIZE * 2)
+#define CONTENT_WIDTH_MAX (KMewGetScreenWidth - AVATAR_MARGIN_H * 2 * 2 - AVATAR_SIZE * 2)
 #define CONTENT_PADDING_V_TOTAL (5 + 15 * 2)
 #define MESSAGE_PADDING (10)
 

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 "NSObject+MEWExtension.h"
 
 
@@ -74,7 +74,7 @@
     if (!_messageText) {
         _messageText = [[UILabel alloc]initWithFrame:CGRectZero];
         _messageText.preferredMaxLayoutWidth = CONTENT_WIDTH_MAX - MESSAGE_TEXT_PADDING * 2;
-        _messageText.textColor = MewThemeColor.mewMainTextColor;
+        _messageText.textColor = MewAppColor.mewMainTextColor;
         _messageText.numberOfLines = 0;
     }
     return  _messageText;

yinmeng-ios/yinmeng-ios/Main/Message/View/Session/Content/MewMessageContentUnSupportView.m

@@ -11,7 +11,7 @@
 #import <Masonry/Masonry.h>
 #import <NIMSDK/NIMSDK.h>
 ///Tool
-#import "MewThemeColor.h"
+
 
 #define MESSAGE_TEXT_PADDING 10
 
@@ -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 = MewAppColor.mewMainTextColor;
         _unSupportLabel.text = @"暂不支持此种类型消息";
         _unSupportLabel.textAlignment = NSTextAlignmentCenter;
         _unSupportLabel.font = [UIFont systemFontOfSize:13];

yinmeng-ios/yinmeng-ios/Main/Message/View/Session/MewMessageConentAudioView.m

@@ -11,7 +11,7 @@
 #import <NIMSDK/NIMSDK.h>
 ///Tool
 
-#import "MewThemeColor.h"
+
 #import "MewMessageAudioCenter.h"
 @interface MewMessageConentAudioView ()<NIMMediaManagerDelegate>
 ///背景
@@ -136,7 +136,7 @@
 	if (!_timeLabel) {
 		_timeLabel = [[UILabel alloc] init];
 		_timeLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium];
-		_timeLabel.textColor = [MewThemeColor mewMainTextColor];
+		_timeLabel.textColor = [MewAppColor mewMainTextColor];
 	}
 	return _timeLabel;
 }

yinmeng-ios/yinmeng-ios/Main/Message/View/Session/MewSessionInfoViewController.m

@@ -10,7 +10,7 @@
 #import <Masonry/Masonry.h>
 #import <NIMSDK/NIMSDK.h>
 ///Tool
-#import "MewThemeColor.h"
+
 
 
 
@@ -200,7 +200,7 @@
 - (UIView *)infoView {
 	if (!_infoView) {
 		_infoView = [[UIView alloc] init];
-		_infoView.backgroundColor = [MewThemeColor mewAppCellBackgroundColor];
+		_infoView.backgroundColor = [MewAppColor mewAppCellBackgroundColor];
         _infoView.hidden = YES;
 	}
 	return _infoView;
@@ -220,7 +220,7 @@
 	if (!_nickLabel) {
 		_nickLabel = [[UILabel alloc] init];
 		_nickLabel.font = [UIFont systemFontOfSize:15];
-		_nickLabel.textColor = [MewThemeColor mewMainTextColor];
+		_nickLabel.textColor = [MewAppColor mewMainTextColor];
 	}
 	return _nickLabel;
 }
@@ -230,7 +230,7 @@
 		_titleLabel = [[UILabel alloc] init];
 		_titleLabel.font = [UIFont systemFontOfSize:14];
 		_titleLabel.text = @"个人主页";
-		_titleLabel.textColor = [MewThemeColor mewSecondTextColor];
+		_titleLabel.textColor = [MewAppColor mewSecondTextColor];
 	}
 	return _titleLabel;
 }
@@ -260,9 +260,9 @@
 	if (!_reportButton) {
 		_reportButton = [UIButton buttonWithType:UIButtonTypeCustom];
 		[_reportButton setTitle:@"举报" forState:UIControlStateNormal];
-		[_reportButton setTitleColor:[MewThemeColor mewMainTextColor] forState:UIControlStateNormal];
+		[_reportButton setTitleColor:[MewAppColor mewMainTextColor] forState:UIControlStateNormal];
 		_reportButton.titleLabel.font = [UIFont systemFontOfSize:16 weight:UIFontWeightMedium];
-		[_reportButton setBackgroundColor:[MewThemeColor mewAppCellBackgroundColor]];
+		[_reportButton setBackgroundColor:[MewAppColor mewAppCellBackgroundColor]];
 		[_reportButton addTarget:self action:@selector(mew_reportButtonAction:) forControlEvents:UIControlEventTouchUpInside];
 	}
 	return _reportButton;
@@ -271,7 +271,7 @@
 - (UIView *)lineView {
 	if (!_lineView) {
 		_lineView = [[UIView alloc] init];
-		_lineView.backgroundColor = [MewThemeColor mewDividerColor];
+		_lineView.backgroundColor = [MewAppColor mewDividerColor];
 	}
 	return _lineView;
 }
@@ -281,10 +281,10 @@
 		_blackButton = [UIButton buttonWithType:UIButtonTypeCustom];
 		[_blackButton setTitle:@"加入黑名单" forState:UIControlStateNormal];
 		[_blackButton setTitle:@"移除黑名单" forState:UIControlStateSelected];
-		[_blackButton setTitleColor:[MewThemeColor mewMainTextColor] forState:UIControlStateNormal];
+		[_blackButton setTitleColor:[MewAppColor mewMainTextColor] forState:UIControlStateNormal];
-		[_blackButton setTitleColor:[MewThemeColor mewMainTextColor] forState:UIControlStateSelected];
+		[_blackButton setTitleColor:[MewAppColor mewMainTextColor] forState:UIControlStateSelected];
 		_blackButton.titleLabel.font = [UIFont systemFontOfSize:16 weight:UIFontWeightMedium];
-		[_blackButton setBackgroundColor:[MewThemeColor mewAppCellBackgroundColor]];
+		[_blackButton setBackgroundColor:[MewAppColor mewAppCellBackgroundColor]];
 		[_blackButton addTarget:self action:@selector(mew_blackButtonAction:) forControlEvents:UIControlEventTouchUpInside];
 	}
 	return _blackButton;

yinmeng-ios/yinmeng-ios/Main/Message/View/Session/MewSessionMessageCell.m

@@ -13,7 +13,7 @@
 #import "MewMessageContentImage.h"
 #import "MewMessageConentAudioView.h"
 ///Tool
-#import "MewThemeColor.h"
+
 #import "MewMacro.h"
 /// Third
 #import <Masonry/Masonry.h>
@@ -21,7 +21,7 @@
 /// P
 #import "MewMessageContentProtocol.h"
 ///Model
-//#import "MewAttachmentModel.h"
+//
 
 @interface MewSessionMessageCell()
 
@@ -306,7 +306,7 @@
 - (UIView *)messageBackground {
     if (!_messageBackground) {
         _messageBackground = [[UIView alloc]init];
-        _messageBackground.backgroundColor = [MewThemeColor mewAppCellBackgroundColor];
+        _messageBackground.backgroundColor = [MewAppColor mewAppCellBackgroundColor];
         _messageBackground.layer.masksToBounds = YES;
         _messageBackground.layer.cornerRadius = 8.f;
     }

yinmeng-ios/yinmeng-ios/Main/Message/View/Session/MewSessionNavView.m

@@ -7,7 +7,7 @@
 
 #import "MewSessionNavView.h"
 /// Tool
-#import "MewThemeColor.h"
+
 #import <NIMSDK/NIMSDK.h>
 #import "MewMacro.h"
 /// Third
@@ -69,12 +69,12 @@
     [self.backButton mas_makeConstraints:^(MASConstraintMaker *make) {
         make.size.mas_equalTo(CGSizeMake(22, 22));
         make.left.mas_equalTo(self).offset(8);
-        make.top.mas_equalTo(statusbarHeight + 14);
+        make.top.mas_equalTo(kMewGetBarHeight + 14);
     }];
     
     [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.centerX.mas_equalTo(self);
-        make.top.mas_equalTo(statusbarHeight + 4);
+        make.top.mas_equalTo(kMewGetBarHeight + 4);
         make.height.mas_equalTo(22);
     }];
     
@@ -135,7 +135,7 @@
     if (!_nickLabel) {
         _nickLabel = [[UILabel alloc] init];
         _nickLabel.font = [UIFont systemFontOfSize:16 weight:UIFontWeightMedium];
-        _nickLabel.textColor = [MewThemeColor mewMainTextColor];
+        _nickLabel.textColor = [MewAppColor 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(0x9552FF) forState:UIControlStateNormal];
+        [_likeButton setTitleColor:[MewAppColor mewGetColorOfTextWithHexString:@"0x9552FF)"] forState:UIControlStateNormal];
         _likeButton.layer.borderWidth = 0.5;
-        _likeButton.layer.borderColor = UIColorMewFromRGB(0x9552FF).CGColor;
+        _likeButton.layer.borderColor = [MewAppColor mewGetColorOfTextWithHexString:@"0x9552FF"].CGColor;
         [_likeButton addTarget:self action:@selector(mew_likeButtonAction:) forControlEvents:UIControlEventTouchUpInside];
         _likeButton.hidden = NO;
     }

yinmeng-ios/yinmeng-ios/Main/Message/View/Session/MewSessionToolbarView.h

@@ -8,13 +8,13 @@
 #import <UIKit/UIKit.h>
 
 NS_ASSUME_NONNULL_BEGIN
-@class MewMessageMenuModel;
+@class MewChatMsgItemModel;
 @protocol MewSessionToolbarViewDelegate <NSObject>
 
 - (void)mew_keyboardWillChangeFrame:(CGRect)rect;
 - (void)mew_sendTextMessage:(NSString *)text;
 - (void)mew_audioRecordCompletion:(NSString *)recordPath;
-- (void)mew_didSelectMenuItem:(MewMessageMenuModel *)info;
+- (void)mew_didSelectMenuItem:(MewChatMsgItemModel *)info;
 @end
 
 @interface MewSessionToolbarView : UIView

yinmeng-ios/yinmeng-ios/Main/Message/View/Session/MewSessionToolbarView.m

@@ -10,12 +10,10 @@
 #import <Masonry/Masonry.h>
 #import <NIMSDK/NIMSDK.h>
 ///Tool
-#import "MewThemeColor.h"
+
 #import "MewMacro.h"
 
-///Model
+
-#import "MewMessageMenuModel.h"
-///View
 #import "MewMessageToolMenuCollectionCell.h"
 #import "MewSessionAudioRecordView.h"
 
@@ -44,7 +42,7 @@
 ///底部的view
 @property (nonatomic,strong) UIView * placeView;
 ///菜单数据
-@property (nonatomic,strong) NSArray<MewMessageMenuModel *> *menuList;
+@property (nonatomic,strong) NSArray<MewChatMsgItemModel *> *menuList;
 ///录音的view
 @property (nonatomic,strong) MewSessionAudioRecordView *audioRecordView;
 @end
@@ -90,7 +88,7 @@
 }
 
 - (void)mew_initSubViews {
-	self.backgroundColor = [MewThemeColor mewAppCellBackgroundColor];
+	self.backgroundColor = [MewAppColor mewAppCellBackgroundColor];
 	[self addSubview:self.stackView];
 	
 	[self.stackView addArrangedSubview:self.toolStackView];
@@ -126,7 +124,7 @@
 	}];
 	
 	[self.placeView mas_makeConstraints:^(MASConstraintMaker *make) {
-		make.height.mas_equalTo(kSafeAreaBottomHeight);
+		make.height.mas_equalTo(kMewGetSafeHeight);
 	}];
 	
 	[self.changeButton mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -155,7 +153,7 @@
 
 - (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath {
     MewMessageToolMenuCollectionCell * cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([MewMessageToolMenuCollectionCell class]) forIndexPath:indexPath];
-	MewMessageMenuModel * model = [self.menuList objectAtIndex:indexPath.row];
+	MewChatMsgItemModel * model = [self.menuList objectAtIndex:indexPath.row];
 	cell.imageName = model.imageName;
 	return cell;
 }
@@ -163,7 +161,7 @@
 - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath {
 	[collectionView deselectItemAtIndexPath:indexPath animated:YES];
 	if (self.menuList.count > 0) {
-		MewMessageMenuModel * model = [self.menuList objectAtIndex:indexPath.row];
+		MewChatMsgItemModel * model = [self.menuList objectAtIndex:indexPath.row];
 		if (self.delegate && [self.delegate respondsToSelector:@selector(mew_didSelectMenuItem:)]) {
 			[self.delegate mew_didSelectMenuItem:model];
 		}
@@ -331,10 +329,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 : [MewAppColor 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 : [MewAppColor mewSecondTextColor]}];
 		self.inputView.attributedPlaceholder = attribute;
 	}
 }
@@ -385,7 +383,7 @@
 - (UIView *)inputBackView {
 	if (!_inputBackView) {
 		_inputBackView = [[UIView alloc] init];
-		_inputBackView.backgroundColor = UIColorMewFromRGB(0xF1F1FA);
+		_inputBackView.backgroundColor = [MewAppColor mewGetColorOfTextWithHexString:@"0xF1F1FA"];
 		_inputBackView.layer.masksToBounds = YES;
 		_inputBackView.layer.cornerRadius = 4;
 	}
@@ -395,11 +393,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 : [MewAppColor mewSecondTextColor]}];
 		_inputView.attributedPlaceholder = attribute;
 		_inputView.borderStyle = UITextBorderStyleNone;
-		_inputView.tintColor = UIColorMewFromRGB(0x9552FF);
+		_inputView.tintColor =[MewAppColor mewGetColorOfTextWithHexString:@"0x9552FF"];
-		_inputView.textColor = [MewThemeColor mewMainTextColor];
+		_inputView.textColor = [MewAppColor mewMainTextColor];
 		_inputView.font = [UIFont systemFontOfSize:12.f];
 		_inputView.delegate = self;
 	_inputView.autocorrectionType = UITextAutocorrectionTypeNo;
@@ -413,11 +411,11 @@
 		_audioButton = [UIButton buttonWithType:UIButtonTypeCustom];
 		[_audioButton setTitle:@"按住说话" forState:UIControlStateNormal];
 		[_audioButton setTitle:@"松开结束" forState:UIControlStateSelected];
-		[_audioButton setTitleColor:[MewThemeColor mewMainTextColor] forState:UIControlStateNormal];
+		[_audioButton setTitleColor:[MewAppColor mewMainTextColor] forState:UIControlStateNormal];
 		_audioButton.titleLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium];
 		_audioButton.layer.masksToBounds = YES;
 		_audioButton.layer.cornerRadius = 4;
-		_audioButton.backgroundColor = UIColorMewFromRGB(0xF1F1FA);
+		_audioButton.backgroundColor = [MewAppColor mewGetColorOfTextWithHexString:@"0xF1F1FA"];
 		_audioButton.hidden = YES;
 	}
 	return _audioButton;
@@ -458,11 +456,11 @@
 	return _placeView;
 }
 
-- (NSArray<MewMessageMenuModel *> *)menuList {
+- (NSArray<MewChatMsgItemModel *> *)menuList {
 	if (!_menuList) {
-		MewMessageMenuModel * phototModel = [[MewMessageMenuModel alloc] init];
+		MewChatMsgItemModel * phototModel = [[MewChatMsgItemModel alloc] init];
 		phototModel.imageName = @"mew_message_session_menu_photo";
-        phototModel.type= Mew_MessageMenuType_Photo;
+        phototModel.type = MewChatMsgItemType_Photo;
 		
 		
 		

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 "UITableView+NIMScrollToBottom.h"
 #import "MewClientConfig.h"
@@ -26,12 +26,10 @@
 
 #import <TZImagePickerController/TZImagePickerController.h>
 /// Model
-#import "MewChatLimitModel.h"
+
-#import "MewUserInfoModel.h"
 #import "MewSessionInfoViewController.h"
 #import "MewSessionToolbarView.h"
 #import "MewNIMMessageMaker.h"
-#import "MewMessageMenuModel.h"
 
 @interface MewSessionViewController ()<MewSessionToolbarViewDelegate,MewSessionNavViewDelegate,MewSessionMessageCellDelegate,
                                     UITableViewDelegate, UITableViewDataSource,
@@ -48,7 +46,7 @@
 @property (nonatomic, strong) NSMutableArray<NIMMessage *> * messages;
 
 // 用户信息
-@property (nonatomic, strong) MewUserInfoModel *userInfo;
+@property (nonatomic, strong) MewPersonInfoModel *userInfo;
 @end
 
 @implementation MewSessionViewController
@@ -73,7 +71,7 @@
     
   
     NSString * uid = [MewSaveBaseUserModel share].mewGetUserId;
-    [MewOCServerManager mewGetListStatus:^(MewBaseModel * _Nullable obj, NSInteger num, NSString * _Nonnull text) {
+    [MewOCServerManager mewGetListStatus:^(MewNetworkDataModel * _Nullable obj, NSInteger num, NSString * _Nonnull text) {
         if(obj.code == 200){
             BOOL isLike = [obj.data boolValue];
             if ([[MewClientConfig shareConfig].configInfo.officialMsgUids containsObject:self.session.sessionId]
@@ -119,7 +117,7 @@
     NSString * uid = [[MewSaveBaseUserModel share]mewGetUserId];
     NSString * ticket = [[MewSaveBaseUserModel share]mewUserTicket];
     NSString * type = @"1";
-    [MewOCServerManager mewLikeUsr:^(MewBaseModel * _Nullable obj, NSInteger num, NSString * _Nonnull text) {
+    [MewOCServerManager mewLikeUsr:^(MewNetworkDataModel * _Nullable obj, NSInteger num, NSString * _Nonnull text) {
         if ([uid isEqualToString:self.session.sessionId]) {
             self.sessionNavView.isLike = YES;
         }
@@ -265,8 +263,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.stateLabel.textColor = [MewAppColor mewSecondTextColor];
-    header.lastUpdatedTimeLabel.textColor = [MewThemeColor mewSecondTextColor];
+    header.lastUpdatedTimeLabel.textColor = [MewAppColor mewSecondTextColor];
     self.sessionTableView.mj_header = header;
     [self mew_headerRefresh];
     [self initData];
@@ -307,9 +305,9 @@
     [[NIMSDK sharedSDK].conversationManager markAllMessagesReadInSession:self.session];
    
    
-    [MewOCServerManager mewGetDetailData:^(MewBaseModel * _Nullable obj, NSInteger num, NSString * _Nonnull text) {
+    [MewOCServerManager mewGetDetailData:^(MewNetworkDataModel * _Nullable obj, NSInteger num, NSString * _Nonnull text) {
         if(obj.code == 200){
-            MewUserInfoModel * userInfo = [MewUserInfoModel mewModelWithDictionary:obj.data];
+            MewPersonInfoModel * userInfo = [MewPersonInfoModel mewModelWithDictionary:obj.data];
             self.userInfo = userInfo;
             
             if (userInfo.nick.length > 0) {
@@ -352,7 +350,7 @@
 }
 - (void)initLayout {
     [self.sessionNavView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.height.mas_equalTo(kNavigationHeight);
+        make.height.mas_equalTo(kMewGetNavHeight);
         make.left.top.right.mas_equalTo(self.view);
     }];
     [self.toolbarView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -384,7 +382,7 @@
     [[[NIMSDK sharedSDK] chatManager] sendMessage:message toSession:self.session error:nil];
 }
 
-- (void)mew_didSelectMenuItem:(MewMessageMenuModel *)info {
+- (void)mew_didSelectMenuItem:(MewChatMsgItemModel *)info {
     
     UIWindow * currentWindow;
     for (int i = 0; i < [UIApplication sharedApplication].windows.count; i++) {
@@ -399,15 +397,15 @@
         currentWindow.windowLevel = -1;
     }
     switch (info.type) {
-        case Mew_MessageMenuType_Photo:
+        case MewChatMsgItemType_Photo:
         {
             TZImagePickerController *imagePickerVc = [[TZImagePickerController alloc] initWithMaxImagesCount:1 delegate:self];
             imagePickerVc.modalPresentationStyle = UIModalPresentationOverFullScreen;
             imagePickerVc.allowPickingVideo = NO;
             imagePickerVc.allowTakeVideo = NO;
-            imagePickerVc.naviBgColor = [MewThemeColor mewAppCellBackgroundColor];
+            imagePickerVc.naviBgColor = [MewAppColor mewAppCellBackgroundColor];
-            imagePickerVc.naviTitleColor = [MewThemeColor mewMainTextColor];
+            imagePickerVc.naviTitleColor = [MewAppColor mewMainTextColor];
-            imagePickerVc.barItemTextColor = [MewThemeColor mewMainTextColor];
+            imagePickerVc.barItemTextColor = [MewAppColor mewMainTextColor];
             [self presentViewController:imagePickerVc animated:YES completion:nil];
         }
             break;
@@ -447,7 +445,7 @@
         _sessionTableView = [[UITableView alloc] init];
         _sessionTableView.delegate = self;
         _sessionTableView.dataSource = self;
-        _sessionTableView.backgroundColor = UIColorMewFromRGB(0xF8F8FB);
+        _sessionTableView.backgroundColor = [MewAppColor mewGetColorOfTextWithHexString:@"0xF8F8FB"];
         _sessionTableView.separatorStyle = UITableViewCellSeparatorStyleNone;
         _sessionTableView.showsVerticalScrollIndicator = NO;
         [_sessionTableView registerClass:[MewSessionMessageCell class] forCellReuseIdentifier:NSStringFromClass([MewSessionMessageCell class])];

yinmeng-ios/yinmeng-ios/Main/Mine/Model/MewCollectListItemModel.swift

@@ -0,0 +1,23 @@
+//
+//  MewCollectListItemModel.swift
+//  yinmeng-ios
+//
+//  Created by duoban on 2024/1/19.
+//
+
+import UIKit
+
+class MewCollectListItemModel: NSObject {
+    ///昵称
+    @objc var nick = ""
+    ///头像
+     @objc var roomAvatar = ""
+    ///昵称
+     @objc var roomName = ""
+
+    ///平台id
+     @objc var erbanNo = ""
+
+    ///房主的uid
+     @objc var roomUid = ""
+}

yinmeng-ios/yinmeng-ios/Main/Mine/Model/MewMineCellInfoModel.swift

@@ -0,0 +1,17 @@
+//
+//  MewMineCellInfoModel.swift
+//  yinmeng-ios
+//
+//  Created by duoban on 2024/1/19.
+//
+
+import UIKit
+
+class MewMineCellInfoModel: NSObject {
+    
+   @objc var  mewText = ""
+   
+    @objc var mewSubText:String?
+    
+    @objc var type:MewMineCellType = .myRoom;
+}

yinmeng-ios/yinmeng-ios/Main/Mine/Model/MewMineCollectRoomModel.h

@@ -1,36 +0,0 @@
-//
-//  MewMineCollectRoomModel.h
-//  mew-ios
-//
-//  Created by 触海 on 2023/11/9.
-//
-
-#import <Foundation/Foundation.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface MewMineCollectRoomModel : NSObject
-///昵称
-@property (nonatomic,copy) NSString *nick;
-///头像
-@property (nonatomic,copy) NSString *roomAvatar;
-///昵称
-@property (nonatomic,copy) NSString *roomName;
-///f在线人数
-@property (nonatomic,copy) NSString *roomOnlineNum;
-///是否跨房Pk
-@property (nonatomic,assign) BOOL crossPking;
-///平台id
-@property (nonatomic,copy) NSString *erbanNo;
-///tag
-@property (nonatomic,copy) NSString *tagPict;
-///房主的uid
-@property (nonatomic,copy) NSString *roomUid;
-///麦上用户
-//@property (nonatomic, strong) NSArray<HomePlayMicUserModel *> *micUsers;
-///是否选中
-@property (nonatomic, assign) BOOL isSelected;
-
-@end
-
-NS_ASSUME_NONNULL_END

yinmeng-ios/yinmeng-ios/Main/Mine/Model/MewMineCollectRoomModel.m

@@ -1,12 +0,0 @@
-//
-//  MewMineCollectRoomModel.m
-//  mew-ios
-//
-//  Created by 触海 on 2023/11/9.
-//
-
-#import "MewMineCollectRoomModel.h"
-
-@implementation MewMineCollectRoomModel
-
-@end

yinmeng-ios/yinmeng-ios/Main/Mine/Model/MewMineSettingItemModel.h

@@ -1,31 +0,0 @@
-//
-//  MewMineSettingItemModel.h
-//  mew-ios
-//
-//  Created by 触海 on 2023/11/9.
-//
-
-#import <Foundation/Foundation.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-typedef NS_ENUM(NSInteger, MewMineSettingItemType){
-    MewMineSettingItemType_Phone, ///手机号
-    MewMineSettingItemType_Login_Password,///登录密码
-    MewMineSettingItemType_About_Us,///关于我们
-    MewMineSettingItemType_Cancel_Account, ///注销账号
-    MewMineSettingItemType_Pay,///充值
-    MewMineSettingItemType_MyRoom ,//我的房间
-};
-
-@interface MewMineSettingItemModel : NSObject
-///标题
-@property (nonatomic,copy) NSString *title;
-///副标题
-@property (nonatomic,copy,) NSString * __nullable subTitle;
-///类型
-@property (nonatomic,assign) MewMineSettingItemType type;
-
-@end
-
-NS_ASSUME_NONNULL_END

yinmeng-ios/yinmeng-ios/Main/Mine/Model/MewMineSettingItemModel.m

@@ -1,12 +0,0 @@
-//
-//  MewMineSettingItemModel.m
-//  mew-ios
-//
-//  Created by 触海 on 2023/11/9.
-//
-
-#import "MewMineSettingItemModel.h"
-
-@implementation MewMineSettingItemModel
-
-@end

yinmeng-ios/yinmeng-ios/Main/Mine/Model/Recharge/MewDiamondNum.swift

@@ -0,0 +1,12 @@
+//
+//  MewDiamondNum.swift
+//  yinmeng-ios
+//
+//  Created by duoban on 2024/1/19.
+//
+
+import UIKit
+
+class MewDiamondNum: NSObject {
+    @objc var diamonds = ""
+}

yinmeng-ios/yinmeng-ios/Main/Mine/Model/Recharge/MewPayItemModel.swift

@@ -0,0 +1,17 @@
+//
+//  MewPayItemModel.swift
+//  yinmeng-ios
+//
+//  Created by duoban on 2024/1/19.
+//
+
+import UIKit
+
+class MewPayItemModel: NSObject {
+    @objc var chargeProdId = ""
+    @objc var prodName = ""
+    @objc var prodDesc = ""
+    @objc var money:NSNumber?
+    @objc var giftGoldNum:NSNumber?
+    @objc var channel = ""
+}