解决冲突

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

@@ -10,7 +10,6 @@
 		23270C292B0E037300B9303B /* CHMessageConentAudioView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23270C272B0E037300B9303B /* CHMessageConentAudioView.m */; };
 		23270C2C2B0E041300B9303B /* CHMessageAudioCenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 23270C2B2B0E041300B9303B /* CHMessageAudioCenter.m */; };
 		23270C302B0E071B00B9303B /* MewPaymentAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 23270C2F2B0E071B00B9303B /* MewPaymentAction.swift */; };
-		23270C342B0EFD9A00B9303B /* NewEncryptTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 23270C332B0EFD9A00B9303B /* NewEncryptTool.m */; };
 		233757562B0CB577001D0B7F /* CHMessagePresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 233757262B0CB577001D0B7F /* CHMessagePresenter.m */; };
 		233757572B0CB577001D0B7F /* MessageMenuModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 2337572C2B0CB577001D0B7F /* MessageMenuModel.m */; };
 		233757582B0CB577001D0B7F /* ChatLimitModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 2337572D2B0CB577001D0B7F /* ChatLimitModel.m */; };
@@ -31,6 +30,25 @@
 		233757672B0CB577001D0B7F /* Api+Message.m in Sources */ = {isa = PBXBuildFile; fileRef = 233757512B0CB577001D0B7F /* Api+Message.m */; };
 		233757682B0CB577001D0B7F /* NIMMessageUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 233757542B0CB577001D0B7F /* NIMMessageUtils.m */; };
 		2337576B2B0CB630001D0B7F /* UIView+FilletCorner.m in Sources */ = {isa = PBXBuildFile; fileRef = 2337576A2B0CB630001D0B7F /* UIView+FilletCorner.m */; };
+		2370514C2B1D7CD500F5DE14 /* YYUtility+Device.m in Sources */ = {isa = PBXBuildFile; fileRef = 2370511C2B1D7CD500F5DE14 /* YYUtility+Device.m */; };
+		2370514D2B1D7CD500F5DE14 /* YYUtility.m in Sources */ = {isa = PBXBuildFile; fileRef = 2370511D2B1D7CD500F5DE14 /* YYUtility.m */; };
+		2370514E2B1D7CD500F5DE14 /* YYUtility+App.m in Sources */ = {isa = PBXBuildFile; fileRef = 2370511E2B1D7CD500F5DE14 /* YYUtility+App.m */; };
+		2370514F2B1D7CD500F5DE14 /* UIImage+RW.m in Sources */ = {isa = PBXBuildFile; fileRef = 237051222B1D7CD500F5DE14 /* UIImage+RW.m */; };
+		237051502B1D7CD500F5DE14 /* NSMutableDictionary+MEWSafe.m in Sources */ = {isa = PBXBuildFile; fileRef = 237051262B1D7CD500F5DE14 /* NSMutableDictionary+MEWSafe.m */; };
+		237051512B1D7CD500F5DE14 /* NSArray+MewSafe.m in Sources */ = {isa = PBXBuildFile; fileRef = 237051272B1D7CD500F5DE14 /* NSArray+MewSafe.m */; };
+		237051522B1D7CD500F5DE14 /* MEWUploadFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 2370512A2B1D7CD500F5DE14 /* MEWUploadFile.m */; };
+		237051532B1D7CD500F5DE14 /* MEWCountDownHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 2370512D2B1D7CD500F5DE14 /* MEWCountDownHelper.m */; };
+		237051542B1D7CD500F5DE14 /* MewTimeIntervalUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 237051302B1D7CD500F5DE14 /* MewTimeIntervalUtils.m */; };
+		237051552B1D7CD500F5DE14 /* DESEncrypt.m in Sources */ = {isa = PBXBuildFile; fileRef = 237051342B1D7CD500F5DE14 /* DESEncrypt.m */; };
+		237051562B1D7CD500F5DE14 /* MEWBase64.m in Sources */ = {isa = PBXBuildFile; fileRef = 237051352B1D7CD500F5DE14 /* MEWBase64.m */; };
+		237051572B1D7CD500F5DE14 /* MewHUDTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 237051362B1D7CD500F5DE14 /* MewHUDTool.m */; };
+		237051582B1D7CD500F5DE14 /* MEWTimer.m in Sources */ = {isa = PBXBuildFile; fileRef = 237051382B1D7CD500F5DE14 /* MEWTimer.m */; };
+		237051592B1D7CD500F5DE14 /* NewEncryptTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 2370513B2B1D7CD500F5DE14 /* NewEncryptTool.m */; };
+		2370515A2B1D7CD500F5DE14 /* MEWGCDHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 2370513F2B1D7CD500F5DE14 /* MEWGCDHelper.m */; };
+		2370515B2B1D7CD500F5DE14 /* MEWThemeColor.m in Sources */ = {isa = PBXBuildFile; fileRef = 237051422B1D7CD500F5DE14 /* MEWThemeColor.m */; };
+		2370515C2B1D7CD500F5DE14 /* MEWRechargeStorage.m in Sources */ = {isa = PBXBuildFile; fileRef = 237051452B1D7CD500F5DE14 /* MEWRechargeStorage.m */; };
+		2370515D2B1D7CD500F5DE14 /* YYReachability.m in Sources */ = {isa = PBXBuildFile; fileRef = 237051492B1D7CD500F5DE14 /* YYReachability.m */; };
+		2370515E2B1D7CD500F5DE14 /* NSObject+MEWExtension.m in Sources */ = {isa = PBXBuildFile; fileRef = 2370514B2B1D7CD500F5DE14 /* NSObject+MEWExtension.m */; };
 		8C4D535A2AFD4CF600238AE6 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8C4D53582AFD4CF600238AE6 /* Main.storyboard */; };
 		8C4D535C2AFD4CF700238AE6 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8C4D535B2AFD4CF700238AE6 /* Assets.xcassets */; };
 		8C4D535F2AFD4CF700238AE6 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8C4D535D2AFD4CF700238AE6 /* LaunchScreen.storyboard */; };
@@ -75,26 +93,6 @@
 		8C9C82BF2B0C695600A601BC /* AccountModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C82692B0C695600A601BC /* AccountModel.m */; };
 		8C9C82C02B0C695600A601BC /* MvpViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C826C2B0C695600A601BC /* MvpViewController.m */; };
 		8C9C82C12B0C695600A601BC /* Api.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C826E2B0C695600A601BC /* Api.m */; };
-		8C9C82C22B0C695600A601BC /* YYUtility+Device.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C82732B0C695600A601BC /* YYUtility+Device.m */; };
-		8C9C82C32B0C695600A601BC /* YYUtility.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C82742B0C695600A601BC /* YYUtility.m */; };
-		8C9C82C42B0C695600A601BC /* YYUtility+Carrier.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C82752B0C695600A601BC /* YYUtility+Carrier.m */; };
-		8C9C82C52B0C695600A601BC /* YYUtility+App.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C82762B0C695600A601BC /* YYUtility+App.m */; };
-		8C9C82C62B0C695600A601BC /* UIImage+RW.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C827A2B0C695600A601BC /* UIImage+RW.m */; };
-		8C9C82C72B0C695600A601BC /* NSMutableDictionary+Safe.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C827C2B0C695600A601BC /* NSMutableDictionary+Safe.m */; };
-		8C9C82C82B0C695600A601BC /* NSArray+Safe.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C827F2B0C695600A601BC /* NSArray+Safe.m */; };
-		8C9C82C92B0C695600A601BC /* UploadFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C82812B0C695600A601BC /* UploadFile.m */; };
-		8C9C82CA2B0C695600A601BC /* CountDownHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C82852B0C695600A601BC /* CountDownHelper.m */; };
-		8C9C82CB2B0C695600A601BC /* TimeIntervalUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C82872B0C695600A601BC /* TimeIntervalUtils.m */; };
-		8C9C82CC2B0C695600A601BC /* DESEncrypt.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C828C2B0C695600A601BC /* DESEncrypt.m */; };
-		8C9C82CD2B0C695600A601BC /* Base64.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C828D2B0C695600A601BC /* Base64.m */; };
-		8C9C82CE2B0C695600A601BC /* YMWeakTimer.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C82912B0C695600A601BC /* YMWeakTimer.m */; };
-		8C9C82CF2B0C695600A601BC /* GCDHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C82952B0C695600A601BC /* GCDHelper.m */; };
-		8C9C82D02B0C695600A601BC /* ThemeColor.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C82992B0C695600A601BC /* ThemeColor.m */; };
-		8C9C82D12B0C695600A601BC /* RechargeStorage.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C829B2B0C695600A601BC /* RechargeStorage.m */; };
-		8C9C82D22B0C695600A601BC /* YMIAPHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C829C2B0C695600A601BC /* YMIAPHelper.m */; };
-		8C9C82D32B0C695600A601BC /* YYReachability.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C82A12B0C695600A601BC /* YYReachability.m */; };
-		8C9C82D42B0C695600A601BC /* NSObject+MJExtension.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C82A22B0C695600A601BC /* NSObject+MJExtension.m */; };
-		8C9C82D52B0C695600A601BC /* YMHUDTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C82A32B0C695600A601BC /* YMHUDTool.m */; };
 		8C9C82DC2B0C696900A601BC /* YMConstant.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C82DB2B0C696900A601BC /* YMConstant.m */; };
 		8C9C84172B0C697A00A601BC /* YMWebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C82DF2B0C697A00A601BC /* YMWebViewController.m */; };
 		8C9C84182B0C697A00A601BC /* YMHomePresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C82E32B0C697A00A601BC /* YMHomePresenter.m */; };
@@ -102,7 +100,6 @@
 		8C9C841A2B0C697A00A601BC /* Api+Home.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C82EC2B0C697A00A601BC /* Api+Home.m */; };
 		8C9C841B2B0C697A00A601BC /* YMRoomPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C82F02B0C697A00A601BC /* YMRoomPresenter.m */; };
 		8C9C841C2B0C697A00A601BC /* RoomInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C82F52B0C697A00A601BC /* RoomInfoModel.m */; };
-		8C9C841D2B0C697A00A601BC /* ThemeColor+Room.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C82F92B0C697A00A601BC /* ThemeColor+Room.m */; };
 		8C9C841E2B0C697A00A601BC /* YMRoomSendTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C82FB2B0C697A00A601BC /* YMRoomSendTextView.m */; };
 		8C9C841F2B0C697A00A601BC /* CHStageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C82FE2B0C697A00A601BC /* CHStageView.m */; };
 		8C9C84202B0C697A00A601BC /* MicroView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C9C83022B0C697A00A601BC /* MicroView.m */; };
@@ -207,8 +204,6 @@
 		23270C2B2B0E041300B9303B /* CHMessageAudioCenter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CHMessageAudioCenter.m; sourceTree = "<group>"; };
 		23270C2E2B0E071B00B9303B /* yinmeng-ios-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "yinmeng-ios-Bridging-Header.h"; sourceTree = "<group>"; };
 		23270C2F2B0E071B00B9303B /* MewPaymentAction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MewPaymentAction.swift; sourceTree = "<group>"; };
-		23270C322B0EFD9A00B9303B /* NewEncryptTool.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NewEncryptTool.h; sourceTree = "<group>"; };
-		23270C332B0EFD9A00B9303B /* NewEncryptTool.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NewEncryptTool.m; sourceTree = "<group>"; };
 		233757262B0CB577001D0B7F /* CHMessagePresenter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CHMessagePresenter.m; sourceTree = "<group>"; };
 		233757272B0CB577001D0B7F /* CHMessagePresenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CHMessagePresenter.h; sourceTree = "<group>"; };
 		233757292B0CB577001D0B7F /* CHMessageProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CHMessageProtocol.h; sourceTree = "<group>"; };
@@ -251,6 +246,43 @@
 		233757552B0CB577001D0B7F /* NIMMessageUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NIMMessageUtils.h; sourceTree = "<group>"; };
 		233757692B0CB630001D0B7F /* UIView+FilletCorner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+FilletCorner.h"; sourceTree = "<group>"; };
 		2337576A2B0CB630001D0B7F /* UIView+FilletCorner.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+FilletCorner.m"; sourceTree = "<group>"; };
+		2370511B2B1D7CD500F5DE14 /* CarrierIdentifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CarrierIdentifier.h; sourceTree = "<group>"; };
+		2370511C2B1D7CD500F5DE14 /* YYUtility+Device.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "YYUtility+Device.m"; sourceTree = "<group>"; };
+		2370511D2B1D7CD500F5DE14 /* YYUtility.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YYUtility.m; sourceTree = "<group>"; };
+		2370511E2B1D7CD500F5DE14 /* YYUtility+App.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "YYUtility+App.m"; sourceTree = "<group>"; };
+		2370511F2B1D7CD500F5DE14 /* YYUtility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YYUtility.h; sourceTree = "<group>"; };
+		237051212B1D7CD500F5DE14 /* UIImage+RW.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImage+RW.h"; sourceTree = "<group>"; };
+		237051222B1D7CD500F5DE14 /* UIImage+RW.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIImage+RW.m"; sourceTree = "<group>"; };
+		237051242B1D7CD500F5DE14 /* NSMutableDictionary+MEWSafe.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSMutableDictionary+MEWSafe.h"; sourceTree = "<group>"; };
+		237051252B1D7CD500F5DE14 /* NSArray+MewSafe.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSArray+MewSafe.h"; sourceTree = "<group>"; };
+		237051262B1D7CD500F5DE14 /* NSMutableDictionary+MEWSafe.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSMutableDictionary+MEWSafe.m"; sourceTree = "<group>"; };
+		237051272B1D7CD500F5DE14 /* NSArray+MewSafe.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSArray+MewSafe.m"; sourceTree = "<group>"; };
+		237051292B1D7CD500F5DE14 /* MEWUploadFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MEWUploadFile.h; sourceTree = "<group>"; };
+		2370512A2B1D7CD500F5DE14 /* MEWUploadFile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MEWUploadFile.m; sourceTree = "<group>"; };
+		2370512C2B1D7CD500F5DE14 /* MEWCountDownHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MEWCountDownHelper.h; sourceTree = "<group>"; };
+		2370512D2B1D7CD500F5DE14 /* MEWCountDownHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MEWCountDownHelper.m; sourceTree = "<group>"; };
+		2370512F2B1D7CD500F5DE14 /* MewTimeIntervalUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewTimeIntervalUtils.h; sourceTree = "<group>"; };
+		237051302B1D7CD500F5DE14 /* MewTimeIntervalUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewTimeIntervalUtils.m; sourceTree = "<group>"; };
+		237051322B1D7CD500F5DE14 /* DESEncrypt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DESEncrypt.h; sourceTree = "<group>"; };
+		237051332B1D7CD500F5DE14 /* MEWBase64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MEWBase64.h; sourceTree = "<group>"; };
+		237051342B1D7CD500F5DE14 /* DESEncrypt.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DESEncrypt.m; sourceTree = "<group>"; };
+		237051352B1D7CD500F5DE14 /* MEWBase64.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MEWBase64.m; sourceTree = "<group>"; };
+		237051362B1D7CD500F5DE14 /* MewHUDTool.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewHUDTool.m; sourceTree = "<group>"; };
+		237051382B1D7CD500F5DE14 /* MEWTimer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MEWTimer.m; sourceTree = "<group>"; };
+		237051392B1D7CD500F5DE14 /* MEWTimer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MEWTimer.h; sourceTree = "<group>"; };
+		2370513B2B1D7CD500F5DE14 /* NewEncryptTool.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NewEncryptTool.m; sourceTree = "<group>"; };
+		2370513C2B1D7CD500F5DE14 /* NewEncryptTool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NewEncryptTool.h; sourceTree = "<group>"; };
+		2370513D2B1D7CD500F5DE14 /* NSObject+MEWExtension.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSObject+MEWExtension.h"; sourceTree = "<group>"; };
+		2370513F2B1D7CD500F5DE14 /* MEWGCDHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MEWGCDHelper.m; sourceTree = "<group>"; };
+		237051402B1D7CD500F5DE14 /* MEWGCDHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MEWGCDHelper.h; sourceTree = "<group>"; };
+		237051422B1D7CD500F5DE14 /* MEWThemeColor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MEWThemeColor.m; sourceTree = "<group>"; };
+		237051432B1D7CD500F5DE14 /* MEWThemeColor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MEWThemeColor.h; sourceTree = "<group>"; };
+		237051452B1D7CD500F5DE14 /* MEWRechargeStorage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MEWRechargeStorage.m; sourceTree = "<group>"; };
+		237051462B1D7CD500F5DE14 /* MEWRechargeStorage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MEWRechargeStorage.h; sourceTree = "<group>"; };
+		237051482B1D7CD500F5DE14 /* YYReachability.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YYReachability.h; sourceTree = "<group>"; };
+		237051492B1D7CD500F5DE14 /* YYReachability.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YYReachability.m; sourceTree = "<group>"; };
+		2370514A2B1D7CD500F5DE14 /* MewHUDTool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MewHUDTool.h; sourceTree = "<group>"; };
+		2370514B2B1D7CD500F5DE14 /* NSObject+MEWExtension.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSObject+MEWExtension.m"; sourceTree = "<group>"; };
 		8C4D534C2AFD4CF600238AE6 /* yinmeng-ios.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "yinmeng-ios.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		8C4D53592AFD4CF600238AE6 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		8C4D535B2AFD4CF700238AE6 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -344,44 +376,6 @@
 		8C9C826C2B0C695600A601BC /* MvpViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MvpViewController.m; sourceTree = "<group>"; };
 		8C9C826E2B0C695600A601BC /* Api.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Api.m; sourceTree = "<group>"; };
 		8C9C826F2B0C695600A601BC /* Api.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Api.h; sourceTree = "<group>"; };
-		8C9C82722B0C695600A601BC /* CarrierIdentifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CarrierIdentifier.h; sourceTree = "<group>"; };
-		8C9C82732B0C695600A601BC /* YYUtility+Device.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "YYUtility+Device.m"; sourceTree = "<group>"; };
-		8C9C82742B0C695600A601BC /* YYUtility.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YYUtility.m; sourceTree = "<group>"; };
-		8C9C82752B0C695600A601BC /* YYUtility+Carrier.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "YYUtility+Carrier.m"; sourceTree = "<group>"; };
-		8C9C82762B0C695600A601BC /* YYUtility+App.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "YYUtility+App.m"; sourceTree = "<group>"; };
-		8C9C82772B0C695600A601BC /* YYUtility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YYUtility.h; sourceTree = "<group>"; };
-		8C9C82792B0C695600A601BC /* UIImage+RW.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImage+RW.h"; sourceTree = "<group>"; };
-		8C9C827A2B0C695600A601BC /* UIImage+RW.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIImage+RW.m"; sourceTree = "<group>"; };
-		8C9C827C2B0C695600A601BC /* NSMutableDictionary+Safe.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSMutableDictionary+Safe.m"; sourceTree = "<group>"; };
-		8C9C827D2B0C695600A601BC /* NSArray+Safe.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSArray+Safe.h"; sourceTree = "<group>"; };
-		8C9C827E2B0C695600A601BC /* NSMutableDictionary+Safe.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSMutableDictionary+Safe.h"; sourceTree = "<group>"; };
-		8C9C827F2B0C695600A601BC /* NSArray+Safe.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSArray+Safe.m"; sourceTree = "<group>"; };
-		8C9C82812B0C695600A601BC /* UploadFile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UploadFile.m; sourceTree = "<group>"; };
-		8C9C82822B0C695600A601BC /* UploadFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UploadFile.h; sourceTree = "<group>"; };
-		8C9C82842B0C695600A601BC /* CountDownHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CountDownHelper.h; sourceTree = "<group>"; };
-		8C9C82852B0C695600A601BC /* CountDownHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CountDownHelper.m; sourceTree = "<group>"; };
-		8C9C82872B0C695600A601BC /* TimeIntervalUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TimeIntervalUtils.m; sourceTree = "<group>"; };
-		8C9C82882B0C695600A601BC /* TimeIntervalUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TimeIntervalUtils.h; sourceTree = "<group>"; };
-		8C9C828A2B0C695600A601BC /* DESEncrypt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DESEncrypt.h; sourceTree = "<group>"; };
-		8C9C828B2B0C695600A601BC /* Base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Base64.h; sourceTree = "<group>"; };
-		8C9C828C2B0C695600A601BC /* DESEncrypt.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DESEncrypt.m; sourceTree = "<group>"; };
-		8C9C828D2B0C695600A601BC /* Base64.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Base64.m; sourceTree = "<group>"; };
-		8C9C828E2B0C695600A601BC /* YMHUDTool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YMHUDTool.h; sourceTree = "<group>"; };
-		8C9C828F2B0C695600A601BC /* NSObject+MJExtension.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSObject+MJExtension.h"; sourceTree = "<group>"; };
-		8C9C82912B0C695600A601BC /* YMWeakTimer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YMWeakTimer.m; sourceTree = "<group>"; };
-		8C9C82922B0C695600A601BC /* YMWeakTimer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YMWeakTimer.h; sourceTree = "<group>"; };
-		8C9C82952B0C695600A601BC /* GCDHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GCDHelper.m; sourceTree = "<group>"; };
-		8C9C82962B0C695600A601BC /* GCDHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCDHelper.h; sourceTree = "<group>"; };
-		8C9C82982B0C695600A601BC /* ThemeColor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThemeColor.h; sourceTree = "<group>"; };
-		8C9C82992B0C695600A601BC /* ThemeColor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ThemeColor.m; sourceTree = "<group>"; };
-		8C9C829B2B0C695600A601BC /* RechargeStorage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RechargeStorage.m; sourceTree = "<group>"; };
-		8C9C829C2B0C695600A601BC /* YMIAPHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YMIAPHelper.m; sourceTree = "<group>"; };
-		8C9C829D2B0C695600A601BC /* RechargeStorage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RechargeStorage.h; sourceTree = "<group>"; };
-		8C9C829E2B0C695600A601BC /* YMIAPHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YMIAPHelper.h; sourceTree = "<group>"; };
-		8C9C82A02B0C695600A601BC /* YYReachability.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YYReachability.h; sourceTree = "<group>"; };
-		8C9C82A12B0C695600A601BC /* YYReachability.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YYReachability.m; sourceTree = "<group>"; };
-		8C9C82A22B0C695600A601BC /* NSObject+MJExtension.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSObject+MJExtension.m"; sourceTree = "<group>"; };
-		8C9C82A32B0C695600A601BC /* YMHUDTool.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YMHUDTool.m; sourceTree = "<group>"; };
 		8C9C82A52B0C695600A601BC /* Base.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Base.h; sourceTree = "<group>"; };
 		8C9C82D82B0C696900A601BC /* YMConstant.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YMConstant.h; sourceTree = "<group>"; };
 		8C9C82D92B0C696900A601BC /* YMMacro.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YMMacro.h; sourceTree = "<group>"; };
@@ -401,7 +395,6 @@
 		8C9C82F52B0C697A00A601BC /* RoomInfoModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RoomInfoModel.m; sourceTree = "<group>"; };
 		8C9C82F62B0C697A00A601BC /* RoomInfoModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RoomInfoModel.h; sourceTree = "<group>"; };
 		8C9C82F82B0C697A00A601BC /* MicroQueueProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MicroQueueProtocol.h; sourceTree = "<group>"; };
-		8C9C82F92B0C697A00A601BC /* ThemeColor+Room.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "ThemeColor+Room.m"; sourceTree = "<group>"; };
 		8C9C82FB2B0C697A00A601BC /* YMRoomSendTextView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YMRoomSendTextView.m; sourceTree = "<group>"; };
 		8C9C82FC2B0C697A00A601BC /* YMRoomSendTextView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YMRoomSendTextView.h; sourceTree = "<group>"; };
 		8C9C82FE2B0C697A00A601BC /* CHStageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CHStageView.m; sourceTree = "<group>"; };
@@ -427,7 +420,6 @@
 		8C9C83192B0C697A00A601BC /* YMRoomMessageParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YMRoomMessageParser.h; sourceTree = "<group>"; };
 		8C9C831A2B0C697A00A601BC /* YMRoomMessageParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YMRoomMessageParser.m; sourceTree = "<group>"; };
 		8C9C831B2B0C697A00A601BC /* YMRoomMessageConstant.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YMRoomMessageConstant.h; sourceTree = "<group>"; };
-		8C9C831D2B0C697A00A601BC /* ThemeColor+Room.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "ThemeColor+Room.h"; sourceTree = "<group>"; };
 		8C9C83202B0C697A00A601BC /* Api+Room.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Api+Room.h"; sourceTree = "<group>"; };
 		8C9C83212B0C697A00A601BC /* Api+Room.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "Api+Room.m"; sourceTree = "<group>"; };
 		8C9C83342B0C697A00A601BC /* MewSessionListTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MewSessionListTableViewCell.m; sourceTree = "<group>"; };
@@ -635,15 +627,6 @@
 			path = "yinmeng-ios/Base/MewIAP";
 			sourceTree = SOURCE_ROOT;
 		};
-		23270C312B0EFD2A00B9303B /* EncryptTool */ = {
-			isa = PBXGroup;
-			children = (
-				23270C322B0EFD9A00B9303B /* NewEncryptTool.h */,
-				23270C332B0EFD9A00B9303B /* NewEncryptTool.m */,
-			);
-			path = EncryptTool;
-			sourceTree = "<group>";
-		};
 		233757242B0CB577001D0B7F /* Message */ = {
 			isa = PBXGroup;
 			children = (
@@ -767,6 +750,154 @@
 			path = Tool;
 			sourceTree = "<group>";
 		};
+		237051192B1D7CD500F5DE14 /* Tool */ = {
+			isa = PBXGroup;
+			children = (
+				2370511A2B1D7CD500F5DE14 /* YYUtility */,
+				237051202B1D7CD500F5DE14 /* UIImage */,
+				237051232B1D7CD500F5DE14 /* Safe */,
+				237051282B1D7CD500F5DE14 /* File */,
+				2370512B2B1D7CD500F5DE14 /* CountDown */,
+				2370512E2B1D7CD500F5DE14 /* TimeInterval */,
+				237051312B1D7CD500F5DE14 /* Security */,
+				237051362B1D7CD500F5DE14 /* MewHUDTool.m */,
+				237051372B1D7CD500F5DE14 /* Timer */,
+				2370513A2B1D7CD500F5DE14 /* EncryptTool */,
+				2370513D2B1D7CD500F5DE14 /* NSObject+MEWExtension.h */,
+				2370513E2B1D7CD500F5DE14 /* GCDHelper */,
+				237051412B1D7CD500F5DE14 /* ThemeColor */,
+				237051442B1D7CD500F5DE14 /* IAPHelper */,
+				237051472B1D7CD500F5DE14 /* Reachability */,
+				2370514A2B1D7CD500F5DE14 /* MewHUDTool.h */,
+				2370514B2B1D7CD500F5DE14 /* NSObject+MEWExtension.m */,
+			);
+			path = Tool;
+			sourceTree = "<group>";
+		};
+		2370511A2B1D7CD500F5DE14 /* YYUtility */ = {
+			isa = PBXGroup;
+			children = (
+				2370511B2B1D7CD500F5DE14 /* CarrierIdentifier.h */,
+				2370511C2B1D7CD500F5DE14 /* YYUtility+Device.m */,
+				2370511D2B1D7CD500F5DE14 /* YYUtility.m */,
+				2370511E2B1D7CD500F5DE14 /* YYUtility+App.m */,
+				2370511F2B1D7CD500F5DE14 /* YYUtility.h */,
+			);
+			path = YYUtility;
+			sourceTree = "<group>";
+		};
+		237051202B1D7CD500F5DE14 /* UIImage */ = {
+			isa = PBXGroup;
+			children = (
+				237051212B1D7CD500F5DE14 /* UIImage+RW.h */,
+				237051222B1D7CD500F5DE14 /* UIImage+RW.m */,
+			);
+			path = UIImage;
+			sourceTree = "<group>";
+		};
+		237051232B1D7CD500F5DE14 /* Safe */ = {
+			isa = PBXGroup;
+			children = (
+				237051242B1D7CD500F5DE14 /* NSMutableDictionary+MEWSafe.h */,
+				237051252B1D7CD500F5DE14 /* NSArray+MewSafe.h */,
+				237051262B1D7CD500F5DE14 /* NSMutableDictionary+MEWSafe.m */,
+				237051272B1D7CD500F5DE14 /* NSArray+MewSafe.m */,
+			);
+			path = Safe;
+			sourceTree = "<group>";
+		};
+		237051282B1D7CD500F5DE14 /* File */ = {
+			isa = PBXGroup;
+			children = (
+				237051292B1D7CD500F5DE14 /* MEWUploadFile.h */,
+				2370512A2B1D7CD500F5DE14 /* MEWUploadFile.m */,
+			);
+			path = File;
+			sourceTree = "<group>";
+		};
+		2370512B2B1D7CD500F5DE14 /* CountDown */ = {
+			isa = PBXGroup;
+			children = (
+				2370512C2B1D7CD500F5DE14 /* MEWCountDownHelper.h */,
+				2370512D2B1D7CD500F5DE14 /* MEWCountDownHelper.m */,
+			);
+			path = CountDown;
+			sourceTree = "<group>";
+		};
+		2370512E2B1D7CD500F5DE14 /* TimeInterval */ = {
+			isa = PBXGroup;
+			children = (
+				2370512F2B1D7CD500F5DE14 /* MewTimeIntervalUtils.h */,
+				237051302B1D7CD500F5DE14 /* MewTimeIntervalUtils.m */,
+			);
+			path = TimeInterval;
+			sourceTree = "<group>";
+		};
+		237051312B1D7CD500F5DE14 /* Security */ = {
+			isa = PBXGroup;
+			children = (
+				237051322B1D7CD500F5DE14 /* DESEncrypt.h */,
+				237051332B1D7CD500F5DE14 /* MEWBase64.h */,
+				237051342B1D7CD500F5DE14 /* DESEncrypt.m */,
+				237051352B1D7CD500F5DE14 /* MEWBase64.m */,
+			);
+			path = Security;
+			sourceTree = "<group>";
+		};
+		237051372B1D7CD500F5DE14 /* Timer */ = {
+			isa = PBXGroup;
+			children = (
+				237051382B1D7CD500F5DE14 /* MEWTimer.m */,
+				237051392B1D7CD500F5DE14 /* MEWTimer.h */,
+			);
+			path = Timer;
+			sourceTree = "<group>";
+		};
+		2370513A2B1D7CD500F5DE14 /* EncryptTool */ = {
+			isa = PBXGroup;
+			children = (
+				2370513B2B1D7CD500F5DE14 /* NewEncryptTool.m */,
+				2370513C2B1D7CD500F5DE14 /* NewEncryptTool.h */,
+			);
+			path = EncryptTool;
+			sourceTree = "<group>";
+		};
+		2370513E2B1D7CD500F5DE14 /* GCDHelper */ = {
+			isa = PBXGroup;
+			children = (
+				2370513F2B1D7CD500F5DE14 /* MEWGCDHelper.m */,
+				237051402B1D7CD500F5DE14 /* MEWGCDHelper.h */,
+			);
+			path = GCDHelper;
+			sourceTree = "<group>";
+		};
+		237051412B1D7CD500F5DE14 /* ThemeColor */ = {
+			isa = PBXGroup;
+			children = (
+				237051422B1D7CD500F5DE14 /* MEWThemeColor.m */,
+				237051432B1D7CD500F5DE14 /* MEWThemeColor.h */,
+			);
+			path = ThemeColor;
+			sourceTree = "<group>";
+		};
+		237051442B1D7CD500F5DE14 /* IAPHelper */ = {
+			isa = PBXGroup;
+			children = (
+				237051452B1D7CD500F5DE14 /* MEWRechargeStorage.m */,
+				237051462B1D7CD500F5DE14 /* MEWRechargeStorage.h */,
+			);
+			path = IAPHelper;
+			sourceTree = "<group>";
+		};
+		237051472B1D7CD500F5DE14 /* Reachability */ = {
+			isa = PBXGroup;
+			children = (
+				237051482B1D7CD500F5DE14 /* YYReachability.h */,
+				237051492B1D7CD500F5DE14 /* YYReachability.m */,
+			);
+			path = Reachability;
+			sourceTree = "<group>";
+		};
 		4A6518CB5E73E536AD820F47 /* Pods */ = {
 			isa = PBXGroup;
 			children = (
@@ -849,7 +980,7 @@
 				8C9C82222B0C695600A601BC /* UI */,
 				8C9C82512B0C695600A601BC /* Net */,
 				8C9C82552B0C695600A601BC /* MVP */,
-				8C9C82702B0C695600A601BC /* Tool */,
+				237051192B1D7CD500F5DE14 /* Tool */,
 				8C9C82A52B0C695600A601BC /* Base.h */,
 			);
 			path = Base;
@@ -1052,148 +1183,6 @@
 			path = Api;
 			sourceTree = "<group>";
 		};
-		8C9C82702B0C695600A601BC /* Tool */ = {
-			isa = PBXGroup;
-			children = (
-				23270C312B0EFD2A00B9303B /* EncryptTool */,
-				8C9C82712B0C695600A601BC /* YYUtility */,
-				8C9C82782B0C695600A601BC /* UIImage */,
-				8C9C827B2B0C695600A601BC /* Safe */,
-				8C9C82802B0C695600A601BC /* File */,
-				8C9C82832B0C695600A601BC /* CountDown */,
-				8C9C82862B0C695600A601BC /* TimeInterval */,
-				8C9C82892B0C695600A601BC /* Security */,
-				8C9C828E2B0C695600A601BC /* YMHUDTool.h */,
-				8C9C828F2B0C695600A601BC /* NSObject+MJExtension.h */,
-				8C9C82902B0C695600A601BC /* Timer */,
-				8C9C82942B0C695600A601BC /* GCDHelper */,
-				8C9C82972B0C695600A601BC /* ThemeColor */,
-				8C9C829A2B0C695600A601BC /* IAPHelper */,
-				8C9C829F2B0C695600A601BC /* Reachability */,
-				8C9C82A22B0C695600A601BC /* NSObject+MJExtension.m */,
-				8C9C82A32B0C695600A601BC /* YMHUDTool.m */,
-			);
-			path = Tool;
-			sourceTree = "<group>";
-		};
-		8C9C82712B0C695600A601BC /* YYUtility */ = {
-			isa = PBXGroup;
-			children = (
-				8C9C82722B0C695600A601BC /* CarrierIdentifier.h */,
-				8C9C82732B0C695600A601BC /* YYUtility+Device.m */,
-				8C9C82742B0C695600A601BC /* YYUtility.m */,
-				8C9C82752B0C695600A601BC /* YYUtility+Carrier.m */,
-				8C9C82762B0C695600A601BC /* YYUtility+App.m */,
-				8C9C82772B0C695600A601BC /* YYUtility.h */,
-			);
-			path = YYUtility;
-			sourceTree = "<group>";
-		};
-		8C9C82782B0C695600A601BC /* UIImage */ = {
-			isa = PBXGroup;
-			children = (
-				8C9C82792B0C695600A601BC /* UIImage+RW.h */,
-				8C9C827A2B0C695600A601BC /* UIImage+RW.m */,
-			);
-			path = UIImage;
-			sourceTree = "<group>";
-		};
-		8C9C827B2B0C695600A601BC /* Safe */ = {
-			isa = PBXGroup;
-			children = (
-				8C9C827C2B0C695600A601BC /* NSMutableDictionary+Safe.m */,
-				8C9C827D2B0C695600A601BC /* NSArray+Safe.h */,
-				8C9C827E2B0C695600A601BC /* NSMutableDictionary+Safe.h */,
-				8C9C827F2B0C695600A601BC /* NSArray+Safe.m */,
-			);
-			path = Safe;
-			sourceTree = "<group>";
-		};
-		8C9C82802B0C695600A601BC /* File */ = {
-			isa = PBXGroup;
-			children = (
-				8C9C82812B0C695600A601BC /* UploadFile.m */,
-				8C9C82822B0C695600A601BC /* UploadFile.h */,
-			);
-			path = File;
-			sourceTree = "<group>";
-		};
-		8C9C82832B0C695600A601BC /* CountDown */ = {
-			isa = PBXGroup;
-			children = (
-				8C9C82842B0C695600A601BC /* CountDownHelper.h */,
-				8C9C82852B0C695600A601BC /* CountDownHelper.m */,
-			);
-			path = CountDown;
-			sourceTree = "<group>";
-		};
-		8C9C82862B0C695600A601BC /* TimeInterval */ = {
-			isa = PBXGroup;
-			children = (
-				8C9C82872B0C695600A601BC /* TimeIntervalUtils.m */,
-				8C9C82882B0C695600A601BC /* TimeIntervalUtils.h */,
-			);
-			path = TimeInterval;
-			sourceTree = "<group>";
-		};
-		8C9C82892B0C695600A601BC /* Security */ = {
-			isa = PBXGroup;
-			children = (
-				8C9C828B2B0C695600A601BC /* Base64.h */,
-				8C9C828D2B0C695600A601BC /* Base64.m */,
-				8C9C828A2B0C695600A601BC /* DESEncrypt.h */,
-				8C9C828C2B0C695600A601BC /* DESEncrypt.m */,
-			);
-			path = Security;
-			sourceTree = "<group>";
-		};
-		8C9C82902B0C695600A601BC /* Timer */ = {
-			isa = PBXGroup;
-			children = (
-				8C9C82912B0C695600A601BC /* YMWeakTimer.m */,
-				8C9C82922B0C695600A601BC /* YMWeakTimer.h */,
-			);
-			path = Timer;
-			sourceTree = "<group>";
-		};
-		8C9C82942B0C695600A601BC /* GCDHelper */ = {
-			isa = PBXGroup;
-			children = (
-				8C9C82952B0C695600A601BC /* GCDHelper.m */,
-				8C9C82962B0C695600A601BC /* GCDHelper.h */,
-			);
-			path = GCDHelper;
-			sourceTree = "<group>";
-		};
-		8C9C82972B0C695600A601BC /* ThemeColor */ = {
-			isa = PBXGroup;
-			children = (
-				8C9C82982B0C695600A601BC /* ThemeColor.h */,
-				8C9C82992B0C695600A601BC /* ThemeColor.m */,
-			);
-			path = ThemeColor;
-			sourceTree = "<group>";
-		};
-		8C9C829A2B0C695600A601BC /* IAPHelper */ = {
-			isa = PBXGroup;
-			children = (
-				8C9C829D2B0C695600A601BC /* RechargeStorage.h */,
-				8C9C829B2B0C695600A601BC /* RechargeStorage.m */,
-				8C9C829E2B0C695600A601BC /* YMIAPHelper.h */,
-				8C9C829C2B0C695600A601BC /* YMIAPHelper.m */,
-			);
-			path = IAPHelper;
-			sourceTree = "<group>";
-		};
-		8C9C829F2B0C695600A601BC /* Reachability */ = {
-			isa = PBXGroup;
-			children = (
-				8C9C82A02B0C695600A601BC /* YYReachability.h */,
-				8C9C82A12B0C695600A601BC /* YYReachability.m */,
-			);
-			path = Reachability;
-			sourceTree = "<group>";
-		};
 		8C9C82D72B0C696900A601BC /* Global */ = {
 			isa = PBXGroup;
 			children = (
@@ -1340,12 +1329,10 @@
 			children = (
 				8C9C84912B0D659800A601BC /* AnimationView */,
 				8C9C82F82B0C697A00A601BC /* MicroQueueProtocol.h */,
-				8C9C82F92B0C697A00A601BC /* ThemeColor+Room.m */,
 				8C9C82FA2B0C697A00A601BC /* MenuContainerView */,
 				8C9C82FD2B0C697A00A601BC /* StageView */,
 				8C9C830B2B0C697A00A601BC /* CHRoomGuestDelegate.h */,
 				8C9C830D2B0C697A00A601BC /* MessageContainerView */,
-				8C9C831D2B0C697A00A601BC /* ThemeColor+Room.h */,
 				8C9C849F2B0D6BCF00A601BC /* CHRoomAnimationProtocol.h */,
 				8CAB96F22B1A729300ED8639 /* CHRoomHostDelegate.h */,
 			);
@@ -2321,8 +2308,6 @@
 				233757682B0CB577001D0B7F /* NIMMessageUtils.m in Sources */,
 				8C9C845C2B0C697A00A601BC /* ClientConfig.m in Sources */,
 				8C9C843B2B0C697A00A601BC /* TRTCRtcImpl.m in Sources */,
-				8C9C82C32B0C695600A601BC /* YYUtility.m in Sources */,
-				8C9C82C92B0C695600A601BC /* UploadFile.m in Sources */,
 				2337575C2B0CB577001D0B7F /* CHSessionMessageCell.m in Sources */,
 				8C9C821F2B0C694900A601BC /* AppDelegate.m in Sources */,
 				8C92A8182B0EF3E9008F362C /* MineModifPayPwdView.m in Sources */,
@@ -2332,17 +2317,19 @@
 				8C9C82BC2B0C695600A601BC /* UserInfoModel.m in Sources */,
 				8C9C84602B0C697A00A601BC /* MewVoiceGuideView.m in Sources */,
 				23270C292B0E037300B9303B /* CHMessageConentAudioView.m in Sources */,
+				237051532B1D7CD500F5DE14 /* MEWCountDownHelper.m in Sources */,
 				8C9C84312B0C697A00A601BC /* MewSessionListViewController.m in Sources */,
 				8C9C82AB2B0C695600A601BC /* NetImageConfig.m in Sources */,
 				8C9C84892B0D286F00A601BC /* Api+Gift.m in Sources */,
+				237051572B1D7CD500F5DE14 /* MewHUDTool.m in Sources */,
 				8C9C849E2B0D6A5C00A601BC /* YMGiftStorage.m in Sources */,
 				8C9C843A2B0C697A00A601BC /* BaseRtcImpl.m in Sources */,
 				8C9C84672B0C697A00A601BC /* MewHeaderView.m in Sources */,
 				8C9C84662B0C697A00A601BC /* MewUserIntroductionView.m in Sources */,
 				8CAB96F52B1AB15200ED8639 /* CHRoomAnimationGroup.m in Sources */,
-				8C9C82C42B0C695600A601BC /* YYUtility+Carrier.m in Sources */,
 				8C9C84172B0C697A00A601BC /* YMWebViewController.m in Sources */,
 				8C92A8232B0FE1DC008F362C /* MewHtmlUrl.m in Sources */,
+				237051552B1D7CD500F5DE14 /* DESEncrypt.m in Sources */,
 				8C92A80E2B0EEF3A008F362C /* LoginBindPhoneViewController.m in Sources */,
 				8C9C84432B0C697A00A601BC /* WalletInfoModel.m in Sources */,
 				8C9C84552B0C697A00A601BC /* LoginForgetEditView.m in Sources */,
@@ -2364,14 +2351,19 @@
 				8C9C82B22B0C695600A601BC /* TTActionSheetConfig.m in Sources */,
 				8C9C841C2B0C697A00A601BC /* RoomInfoModel.m in Sources */,
 				2337575B2B0CB577001D0B7F /* UIView+NIM.m in Sources */,
+				2370515B2B1D7CD500F5DE14 /* MEWThemeColor.m in Sources */,
 				8C9C843F2B0C697A00A601BC /* FansInfoModel.m in Sources */,
 				8C9C84712B0C697A00A601BC /* MewPartyModel.m in Sources */,
 				8C9C82BF2B0C695600A601BC /* AccountModel.m in Sources */,
+				237051512B1D7CD500F5DE14 /* NSArray+MewSafe.m in Sources */,
+				2370515E2B1D7CD500F5DE14 /* NSObject+MEWExtension.m in Sources */,
 				233757652B0CB577001D0B7F /* CHSessionNavView.m in Sources */,
 				8C9C84722B0C697A00A601BC /* MewPartyListCollectionViewCell.m in Sources */,
 				8C9C846F2B0C697A00A601BC /* MewRoomMessageTableCell.m in Sources */,
 				8C9C84282B0C697A00A601BC /* YMRoomMessageParser.m in Sources */,
 				8C9C84302B0C697A00A601BC /* MewSessionListTableViewCell.m in Sources */,
+				2370515C2B1D7CD500F5DE14 /* MEWRechargeStorage.m in Sources */,
+				237051592B1D7CD500F5DE14 /* NewEncryptTool.m in Sources */,
 				8C9C84652B0C697A00A601BC /* MewShowVoiceView.m in Sources */,
 				233757592B0CB577001D0B7F /* NIMBadgeView.m in Sources */,
 				8C9C846D2B0C697A00A601BC /* MewRoomRightView.m in Sources */,
@@ -2382,10 +2374,9 @@
 				8C9C844D2B0C697A00A601BC /* LoginForgetPasswordPresent.m in Sources */,
 				8C9C82C12B0C695600A601BC /* Api.m in Sources */,
 				23270C2C2B0E041300B9303B /* CHMessageAudioCenter.m in Sources */,
+				2370514F2B1D7CD500F5DE14 /* UIImage+RW.m in Sources */,
 				8C9C844A2B0C697A00A601BC /* Api+Mine.m in Sources */,
 				8C9C82A82B0C695600A601BC /* BaseViewController.m in Sources */,
-				8C9C82C72B0C695600A601BC /* NSMutableDictionary+Safe.m in Sources */,
-				8C9C82C22B0C695600A601BC /* YYUtility+Device.m in Sources */,
 				8C9C84782B0C697A00A601BC /* MewLoginPasswordView.m in Sources */,
 				8C9C84622B0C697A00A601BC /* MewVoiceDiscView.m in Sources */,
 				8C9C82AE2B0C695600A601BC /* TTPopup.m in Sources */,
@@ -2394,19 +2385,16 @@
 				8C9C82B52B0C695600A601BC /* TTActionSheetView.m in Sources */,
 				8C9C82B32B0C695600A601BC /* TTPopupManagerService.m in Sources */,
 				8C9C84762B0C697A00A601BC /* MewRechargeSubView.m in Sources */,
-				8C9C82D42B0C695600A601BC /* NSObject+MJExtension.m in Sources */,
-				8C9C82C82B0C695600A601BC /* NSArray+Safe.m in Sources */,
+				237051502B1D7CD500F5DE14 /* NSMutableDictionary+MEWSafe.m in Sources */,
 				8C9C84402B0C697A00A601BC /* YMMineSettingItemModel.m in Sources */,
-				8C9C82CF2B0C695600A601BC /* GCDHelper.m in Sources */,
 				8C9C84232B0C697A00A601BC /* MicroStateModel.m in Sources */,
 				8C9C84212B0C697A00A601BC /* MicroQueueModel.m in Sources */,
 				8C9C82DC2B0C696900A601BC /* YMConstant.m in Sources */,
 				8C9C845B2B0C697A00A601BC /* Api+Main.m in Sources */,
 				8C9C846A2B0C697A00A601BC /* Api+MewHome.m in Sources */,
 				8C9C847A2B0C697A00A601BC /* MewLoginViewController.m in Sources */,
-				23270C342B0EFD9A00B9303B /* NewEncryptTool.m in Sources */,
+				237051542B1D7CD500F5DE14 /* MewTimeIntervalUtils.m in Sources */,
 				8C9C844F2B0C697A00A601BC /* LoginFullInfoPresenter.m in Sources */,
-				8C9C82D22B0C695600A601BC /* YMIAPHelper.m in Sources */,
 				8C9C84222B0C697A00A601BC /* MicroExtModel.m in Sources */,
 				8C9C843C2B0C697A00A601BC /* RtcManager.m in Sources */,
 				8C9C84BA2B0ECD2100A601BC /* MineRechargePresenter.m in Sources */,
@@ -2414,7 +2402,7 @@
 				8C9C841E2B0C697A00A601BC /* YMRoomSendTextView.m in Sources */,
 				8C9C843E2B0C697A00A601BC /* YMMineSettingPresenter.m in Sources */,
 				8C9C84732B0C697A00A601BC /* MewPartyViewController.m in Sources */,
-				8C9C82D32B0C695600A601BC /* YYReachability.m in Sources */,
+				2370514C2B1D7CD500F5DE14 /* YYUtility+Device.m in Sources */,
 				8C4D53622AFD4CF700238AE6 /* main.m in Sources */,
 				233757642B0CB577001D0B7F /* CHMessageContentText.m in Sources */,
 				8C9C84242B0C697A00A601BC /* YMRoomMessageContainerView.m in Sources */,
@@ -2423,10 +2411,7 @@
 				2337575A2B0CB577001D0B7F /* UITableView+NIMScrollToBottom.m in Sources */,
 				8C9C84252B0C697A00A601BC /* YMMessageInfoModel.m in Sources */,
 				23270C302B0E071B00B9303B /* MewPaymentAction.swift in Sources */,
-				8C9C82D12B0C695600A601BC /* RechargeStorage.m in Sources */,
 				8C9C84792B0C697A00A601BC /* MewLoginNumberViewController.m in Sources */,
-				8C9C841D2B0C697A00A601BC /* ThemeColor+Room.m in Sources */,
-				8C9C82D02B0C695600A601BC /* ThemeColor.m in Sources */,
 				233757582B0CB577001D0B7F /* ChatLimitModel.m in Sources */,
 				8C9C82BA2B0C695600A601BC /* AccountInfoStorage.m in Sources */,
 				8C9C846E2B0C697A00A601BC /* MewRoomHeaderView.m in Sources */,
@@ -2439,8 +2424,9 @@
 				8C9C848C2B0D2B8500A601BC /* GiftReceiveInfoModel.m in Sources */,
 				8C9C84572B0C697A00A601BC /* Api+Login.m in Sources */,
 				2337575D2B0CB577001D0B7F /* CHSessionToolbarView.m in Sources */,
-				8C9C82CB2B0C695600A601BC /* TimeIntervalUtils.m in Sources */,
+				237051522B1D7CD500F5DE14 /* MEWUploadFile.m in Sources */,
 				8C9C84192B0C697A00A601BC /* HomeRecommendRoomModel.m in Sources */,
+				2370515A2B1D7CD500F5DE14 /* MEWGCDHelper.m in Sources */,
 				233757612B0CB577001D0B7F /* CHMessageToolMenuCollectionViewCell.m in Sources */,
 				8C9C82B62B0C695600A601BC /* TTPopupService.m in Sources */,
 				233757662B0CB577001D0B7F /* CHSessionAudioRecordView.m in Sources */,
@@ -2451,14 +2437,14 @@
 				8C9C84422B0C697A00A601BC /* RechargeListModel.m in Sources */,
 				8C9C845A2B0C697A00A601BC /* ClientDataModel.m in Sources */,
 				8C9C84972B0D65E200A601BC /* YMRoomAnimationView.m in Sources */,
-				8C9C82D52B0C695600A601BC /* YMHUDTool.m in Sources */,
+				2370514E2B1D7CD500F5DE14 /* YYUtility+App.m in Sources */,
 				8C9C82202B0C694900A601BC /* AppDelegate+ThirdConfig.m in Sources */,
 				8C9C84202B0C697A00A601BC /* MicroView.m in Sources */,
 				8C9C84522B0C697A00A601BC /* ThirdUserInfo.m in Sources */,
 				8C9C82BD2B0C695600A601BC /* UserVipInfoVo.m in Sources */,
+				2370515D2B1D7CD500F5DE14 /* YYReachability.m in Sources */,
 				8C92A81F2B0EF4D2008F362C /* MineLoginPasswordPresenter.m in Sources */,
 				8C92A8042B0EED72008F362C /* LoginBindPhoneResultViewController.m in Sources */,
-				8C9C82CD2B0C695600A601BC /* Base64.m in Sources */,
 				8C9C84472B0C697A00A601BC /* MewMineCollectionTableViewCell.m in Sources */,
 				8C9C844E2B0C697A00A601BC /* LoginPresenter.m in Sources */,
 				8C9C84642B0C697A00A601BC /* MewRightFollowVoiceView.m in Sources */,
@@ -2469,9 +2455,7 @@
 				8C9C84902B0D439800A601BC /* YMRoomMessageFilter.m in Sources */,
 				8C92A8072B0EEDD0008F362C /* LoginVerifBindPhoneViewController.m in Sources */,
 				8C9C84412B0C697A00A601BC /* MineCollectRoomModel.m in Sources */,
-				8C9C82CC2B0C695600A601BC /* DESEncrypt.m in Sources */,
 				2337576B2B0CB630001D0B7F /* UIView+FilletCorner.m in Sources */,
-				8C9C82CA2B0C695600A601BC /* CountDownHelper.m in Sources */,
 				8C92A81C2B0EF449008F362C /* UIButton+EnlargeTouchArea.m in Sources */,
 				8C9C82B72B0C695600A601BC /* HttpRequestHelper.m in Sources */,
 				8C9C841B2B0C697A00A601BC /* YMRoomPresenter.m in Sources */,
@@ -2482,16 +2466,16 @@
 				8C9C84B12B0DEAE100A601BC /* YMIButton.m in Sources */,
 				8C9C846C2B0C697A00A601BC /* MewSocialStageView.m in Sources */,
 				8C9C84682B0C697A00A601BC /* MewRightFollowVoiceCollectionCell.m in Sources */,
+				2370514D2B1D7CD500F5DE14 /* YYUtility.m in Sources */,
 				8C9C84452B0C697A00A601BC /* YMMineCollectRoomViewController.m in Sources */,
 				8C9C82AC2B0C695600A601BC /* NetImageView.m in Sources */,
-				8C9C82C52B0C695600A601BC /* YYUtility+App.m in Sources */,
 				2337575F2B0CB577001D0B7F /* CHSessionInfoViewController.m in Sources */,
-				8C9C82CE2B0C695600A601BC /* YMWeakTimer.m in Sources */,
 				8C9C846B2B0C697A00A601BC /* MewSocialMicroView.m in Sources */,
 				233757572B0CB577001D0B7F /* MessageMenuModel.m in Sources */,
 				8C9C844B2B0C697A00A601BC /* AttachmentModel.m in Sources */,
+				237051582B1D7CD500F5DE14 /* MEWTimer.m in Sources */,
+				237051562B1D7CD500F5DE14 /* MEWBase64.m in Sources */,
 				8C92A8112B0EEFAE008F362C /* LoginBindPhonePresent.m in Sources */,
-				8C9C82C62B0C695600A601BC /* UIImage+RW.m in Sources */,
 				8C9C84562B0C697A00A601BC /* LoginFullInfoViewController.m in Sources */,
 				8C9C84262B0C697A00A601BC /* YMMessageRemoteExtModel.m in Sources */,
 				8C92A8142B0EF1D8008F362C /* MineLoginPasswordViewController.m in Sources */,

yinmeng-ios/yinmeng-ios.xcodeproj/xcshareddata/xcschemes/yinmeng-ios.xcscheme

@@ -31,7 +31,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "Release"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"

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

@@ -4,8 +4,8 @@
 //
 //  Created by 触海 on 2023/11/6.
 //
-
 #import "NSObject+MEWExtension.h"
+#import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

yinmeng-ios/yinmeng-ios/Base/Net/HttpRequestHelper.m

@@ -25,7 +25,7 @@ static BOOL isShowing = NO;
     static AFHTTPSessionManager *manager = nil;
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
-        manager = [[AFHTTPSessionManager manager]initWithBaseURL:[NSURL URLWithString:[NewEncryptTool MEW_aesDecrypt: API_HOST_URL]]];
+        manager = [[AFHTTPSessionManager manager]initWithBaseURL:[NSURL URLWithString:API_HOST_URL]];
         manager.responseSerializer = [AFJSONResponseSerializer serializer];
         manager.requestSerializer.HTTPShouldHandleCookies = YES;
         // 客户端是否信任非法证书

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

@@ -1,5 +1,5 @@
 //
-//  MEWMEWThemeColor.h
+//  MEWMEWMEWThemeColor.h
 //  yinmeng-ios
 //
 //  Created by duoban on 2023/12/1.

yinmeng-ios/yinmeng-ios/Base/Tool/YYUtility/YYUtility+Device.m

@@ -91,7 +91,9 @@
 {
     return (self.reachability.currentReachabilityStatus);
 }
-
++(NSInteger)carrierIdentifier{
+    return 1;
+}
 + (YYReachability *)reachability
 {
     static YYReachability *reachability = nil;

yinmeng-ios/yinmeng-ios/Main/ClientConfig/ClientConfig.m

@@ -8,7 +8,7 @@
 #import "ClientConfig.h"
 #import "Api+Main.h"
 #import "MEWTimer.h"
-
+#import "NSObject+MEWExtension.h"
 @interface ClientConfig()
 ///重试的次数 10次 如果你还是失败的话 那就算了 没办法了
 @property (nonatomic,assign) int retryCount;

yinmeng-ios/yinmeng-ios/Main/Mew/Mine/View/MewMineCollectionViewController.m

@@ -13,6 +13,7 @@
 #import "MEWThemeColor.h"
 /// Third
 #import <MJRefresh/MJRefresh.h>
+#import "NSArray+MEWSafe.h"
 ///P
 #import "YMMineCollectRoomProtocol.h"
 #import "YMMineCollectRoomPresenter.h"
@@ -67,7 +68,7 @@
     
     
     MewMineCollectionTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([MewMineCollectionTableViewCell class])];
-    cell.roomInfo = [self.collectionModels safeObjectAtIndex1:indexPath.row];
+    cell.roomInfo = [self.collectionModels mewSafeObjectAtIndex:indexPath.row];
     
     return cell;
 }

yinmeng-ios/yinmeng-ios/Main/Mew/Room/View/MewRoomViewController.m

@@ -26,9 +26,9 @@
 #import "YMMessageRemoteExtModel.h"
 ///Tool
 #import "AccountInfoStorage.h"
-#import "YMHUDTool.h"
+#import "MEWHUDTool.h"
 #import "YMMacro.h"
-#import "NSArray+Safe.h"
+#import "NSArray+MEWSafe.h"
 #import "RtcManager.h"
 ///P
 #import "YMRoomPresenter.h"
@@ -124,14 +124,14 @@
             switch (content.eventType) {
                 case NIMChatroomEventTypeInfoUpdated: // 麦序状态更新
                 {
-                    NSDictionary *data = [content.notifyExt toJSONObject];
+                    NSDictionary *data = [content.notifyExt mewToJSONObject];
                     int type = [data[@"type"] intValue];
                     switch (type) {
                         case 1:
                         case 3:
                         {
-                            NSMutableDictionary *lastRoomInfoDic = [NSMutableDictionary dictionaryWithDictionary:[self.roomInfo model2dictionary]];
-                            [lastRoomInfoDic addEntriesFromDictionary: ((NSString *)data[@"roomInfo"]).toJSONObject];
+                            NSMutableDictionary *lastRoomInfoDic = [NSMutableDictionary dictionaryWithDictionary:[self.roomInfo mewModel2dictionary]];
+                            [lastRoomInfoDic addEntriesFromDictionary: ((NSString *)data[@"roomInfo"]).mewToJSONObject];
                             [self.roomStageView onRoomInfoUpdate];
 //                            [self.roomMessageView onRoomUpdate];
                         }
@@ -153,7 +153,7 @@
                 case NIMChatroomEventTypeQueueChange: // 麦序上下麦
                 {
                     NSDictionary* data = (NSDictionary *)content.ext;
-                    UserInfoModel* userInfo = [UserInfoModel modelWithJSON:[data objectForKey:NIMChatroomEventInfoQueueChangeItemValueKey]];
+                    UserInfoModel* userInfo = [UserInfoModel mewModelWithJSON:[data objectForKey:NIMChatroomEventInfoQueueChangeItemValueKey]];
                     NSInteger changeType = [data[NIMChatroomEventInfoQueueChangeTypeKey] integerValue];
                     if (changeType == 1 && userInfo.uid == [AccountInfoStorage instance].getUid.integerValue) {
                         //                        [self cancelRoomArrangeMic];
@@ -190,8 +190,8 @@
     }
     
     if (message.yidunAntiSpamRes) {
-        NSDictionary * spamRes = message.yidunAntiSpamRes.toJSONObject;
-        NSDictionary * spamResExt = ((NSString *)spamRes[@"ext"]).toJSONObject;
+        NSDictionary * spamRes = message.yidunAntiSpamRes.mewToJSONObject;
+        NSDictionary * spamResExt = ((NSString *)spamRes[@"ext"]).mewToJSONObject;
         if ([spamResExt[@"antispam"][@"suggestion"] intValue] == 2) {
             [self showErrorToast:@"消息中可能含有违规信息，请停止发送类似信息!"];
             return;
@@ -267,7 +267,7 @@
 #pragma mark - YMRoomProtocol
 /// 进入房间成功
 - (void)initEnterCurrentRoomSuccess:(RoomInfoModel *)roomInfo user:(UserInfoModel *)userInfo {
-    [YMHUDTool hideHUDInView:self.navigationController.view];
+    [MewHUDTool hideHUDInView:self.navigationController.view];
     self.userInfo = userInfo;
     self.roomInfo = roomInfo;
     if (roomInfo.valid) {
@@ -302,7 +302,7 @@
 
 // IM进房成功
 - (void)enterCurrentRoomSuccess:(NIMChatroom *)chatRoom {
-    [YMHUDTool hideHUDInView:self.navigationController.view];
+    [MewHUDTool hideHUDInView:self.navigationController.view];
     [self.roomStageView onRoomEntered];
     if (self.roomInfo != nil) {
         [self.presenter reportUserInterRoom:[NSString stringWithFormat:@"%zd", self.roomInfo.uid]];
@@ -314,7 +314,7 @@
 
 // 进房失败
 - (void)enterCurrentRoomFail:(NSInteger)code {
-    [YMHUDTool hideHUDInView:self.navigationController.view];
+    [MewHUDTool hideHUDInView:self.navigationController.view];
     [self hideHUD];
     if (code == 13003) {
         [self showErrorToast:@"您已被管理员拉黑"];
@@ -329,7 +329,7 @@
 
 /// 送礼物成功
 - (void)sendGiftSuccess:(GiftReceiveInfoModel *)receiveInfo originDic:(NSDictionary *)originDic uidCount:(NSInteger)uidCount {
-    [YMHUDTool hideHUD];
+    [MewHUDTool hideHUD];
     
     [self sendCustomMessage:receiveInfo oringinDic:originDic];
     
@@ -337,7 +337,7 @@
 
 /// 送礼物失败
 - (void)sendGiftFailWithCode:(NSInteger)code msg:(NSString *)msg {
-    [YMHUDTool hideHUD];
+    [MewHUDTool hideHUD];
 
     if (code == 31005) {// 余额不足
         [self showErrorToast:msg];
@@ -372,7 +372,7 @@
     
     UserInfoModel *userInfo = [self getUserInformation];
     YMMessageRemoteExtModel *extModel = [[YMMessageRemoteExtModel alloc] init];
-    NSMutableDictionary *remoteExt = [NSMutableDictionary dictionaryWithObject:extModel.model2dictionary forKey:[NSString stringWithFormat:@"%ld",userInfo.uid]];
+    NSMutableDictionary *remoteExt = [NSMutableDictionary dictionaryWithObject:extModel.mewModel2dictionary forKey:[NSString stringWithFormat:@"%ld",userInfo.uid]];
     message.remoteExt = remoteExt;
     /// 构造会话
     NIMSessionType sessionType = NIMSessionTypeChatroom;
@@ -461,7 +461,7 @@
         return;
     }
     
-    [YMHUDTool showLoadingWithMessage:@"赠送中..."];
+    [MewHUDTool showLoadingWithMessage:@"赠送中..."];
     [self.presenter sendGift:mewStageView.selectUid roomUid:self.roomUid];
 }
 

yinmeng-ios/yinmeng-ios/Main/Mew/Room/View/RoomHeaderView/MewRoomHeaderView.m

@@ -8,13 +8,13 @@
 #import "MewRoomHeaderView.h"
 #import "YMMacro.h"
 #import <Masonry/Masonry.h>
-#import "ThemeColor.h"
+#import "MEWThemeColor.h"
 #import "AccountInfoStorage.h"
 #import "Api+Room.h"
-#import "YMHUDTool.h"
-#import "NSMutableDictionary+Safe.h"
+#import "NSMutableDictionary+MewSafe.h"
 #import "AttachmentModel.h"
 #import "UserInfoModel.h"
+#import "MEWHUDTool.h"
 
 #pragma mark -  过滤view（举报和退出）
 @interface MewRoomHeaderFilterView()
@@ -126,7 +126,7 @@ static MewRoomHeaderFilterView *_filterView = nil;
 - (UIView *)lineView {
     if (!_lineView) {
         _lineView = [[UIView alloc] init];
-        _lineView.backgroundColor = [ThemeColor colorWithHexString:@"#DEE1E5"];
+        _lineView.backgroundColor = [MEWThemeColor mewColorWithHexString:@"#DEE1E5"];
     }
     return _lineView;
 }
@@ -187,10 +187,10 @@ static MewRoomHeaderFilterView *_filterView = nil;
         if (code == 200) {
             sender.selected = !sender.selected;
             if ([type isEqualToString:@"1"]) {///收藏的话
-                [YMHUDTool showSuccessWithMessage:@"收藏成功"];
+                [MewHUDTool showSuccessWithMessage:@"收藏成功"];
             }
         } else {
-            [YMHUDTool showErrorWithMessage:msg];
+            [MewHUDTool showErrorWithMessage:msg];
         }
         
     } roomUid:roomUid uid:uid type:type roomUids:NULL];

yinmeng-ios/yinmeng-ios/Main/Mew/Room/View/RoomMessageView/MewRoomMessageTableCell.m

@@ -12,7 +12,7 @@
 #import "YMRoomMessageConstant.h"
 #import "YMMacro.h"
 #import "MEWThemeColor.h"
-#import "MEWThemeColor+MEWRoom.h"
+#import "MEWThemeColor.h"
 #import "UIImage+Utils.h"
 #import <Masonry/Masonry.h>
 #import <YYText/YYText.h>
@@ -41,7 +41,7 @@
     _messageInfo = messageInfo;
     if (_messageInfo) {
         self.contentLabel.attributedText = _messageInfo.content;
-        self.bubbleImageView.image = [UIImage imageWithColor:[MEWThemeColor messageBubbleColor]];
+        self.bubbleImageView.image = [UIImage imageWithColor:UIColorMewRGBAlpha(0xFFFFFF, 0.15)];
     }
 //    self.nickerNameLabel.attributedText = _messageInfo.content;
     

yinmeng-ios/yinmeng-ios/Main/Mew/Room/View/RoomStageView/MewSocialStageView.m

@@ -10,7 +10,7 @@
 #import "YMMacro.h"
 #import "MicroQueueModel.h"
 #import "UserInfoModel.h"
-#import "ThemeColor.h"
+#import "MEWThemeColor.h"
 
 #define ownerTopMargin 0.0
 #define ownerWidth 140 * kScreenScale

yinmeng-ios/yinmeng-ios/Main/Mew/Room/View/RoomStageView/RoomMicroView/MewSocialMicroView.m

@@ -9,7 +9,7 @@
 /// Model
 #import "MicroQueueModel.h"
 #import "UserInfoModel.h"
-#import "MEWThemeColor+MEWRoom.h"
+#import "MEWThemeColor.h"
 
 @interface MewSocialMicroView()
 /// 当前坑位

yinmeng-ios/yinmeng-ios/Main/YinMeng/Home/Presenter/YMHomePresenter.m

@@ -10,7 +10,8 @@
 #import "HomeRecommendRoomModel.h"
 #import "Api+Home.h"
 #import "YMHomeProtocol.h"
-
+#import "NSArray+MewSafe.h"
+#import "NSObject+MEWExtension.h"
 @implementation YMHomePresenter
 
 /// 请求首页

yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/CHMessageConentAudioView.m

@@ -12,8 +12,8 @@
 ///Tool
 
 #import "MEWThemeColor.h"
-#import "MessageAudioCenter.h"
-@interface MessageConentAudioView ()<NIMMediaManagerDelegate>
+#import "CHMessageAudioCenter.h"
+@interface CHMessageConentAudioView ()<NIMMediaManagerDelegate>
 ///背景
 @property (nonatomic,strong) UIView * backView;
 ///显示语音的时长

yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/CHSessionToolbarView.m

@@ -154,7 +154,7 @@
 }
 
 - (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath {
-	MessageToolMenuCollectionViewCell * cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([MessageToolMenuCollectionViewCell class]) forIndexPath:indexPath];
+    CHMessageToolMenuCollectionViewCell * cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([CHMessageToolMenuCollectionViewCell class]) forIndexPath:indexPath];
 	MessageMenuModel * model = [self.menuList mewSafeObjectAtIndex:indexPath.row];
 	cell.imageName = model.imageName;
 	return cell;

yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/Content/CHMessageContentText.m

@@ -7,7 +7,7 @@
 
 #import "CHMessageContentText.h"
 
-#import "MessageContentText.h"
+#import "CHMessageContentText.h"
 #import "MEWThemeColor.h"
 #import "NSObject+MEWExtension.h"
 

yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/Presenter/YMMineCollectRoomPresenter.m

@@ -10,7 +10,8 @@
 #import "Api+Mine.h"
 #import "MineCollectRoomModel.h"
 #import "YMMineCollectRoomProtocol.h"
-
+#import "NSArray+MEWSafe.h"
+#import "NSObject+MEWExtension.h"
 @implementation YMMineCollectRoomPresenter
 
 /// 获取收藏房间列表

yinmeng-ios/yinmeng-ios/Main/YinMeng/Mine/View/Setting/Cell/MewMineCollectionTableViewCell.m

@@ -10,7 +10,7 @@
 #import "MineCollectRoomModel.h"
 #import <Masonry/Masonry.h>
 #import "YMMacro.h"
-#import "ThemeColor.h"
+#import "MEWThemeColor.h"
 
 @interface MewMineCollectionTableViewCell()
 @property (nonatomic, strong) NetImageView *avaterImageView;
@@ -89,7 +89,7 @@
 - (UIView *)lineView {
     if (!_lineView) {
         _lineView = [[UIView alloc] init];
-        _lineView.backgroundColor = [ThemeColor dividerColor];
+        _lineView.backgroundColor = [MEWThemeColor mewDividerColor];
     }
     return _lineView;
 }

yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/Presenter/YMRoomPresenter.m

@@ -47,7 +47,7 @@
     }] uid:uid];
     
     /// 获取房间信息
-    [Api getRoomInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) {
+    [Api getRoomInformation:[self createHttpCompletion:^(BaseModel * _Nonnull data) {
         RoomInfoModel *roomInfo = [RoomInfoModel mewModelWithJSON:data.data];
         [room sendNext:roomInfo];
         [room sendCompleted];
@@ -119,7 +119,7 @@
     
     [Api openRoom:[self createHttpCompletion:^(BaseModel * _Nonnull data) {
         RoomInfoModel *roomInfo = [RoomInfoModel mewModelWithJSON:data.data];
-        [[self getView] openRoomSuccess:roomInfo];
+        [[self getView] openCurrentRoomSuccess:roomInfo];
     } fail:^(NSInteger code, NSString * _Nullable msg) {
         [[self getView] enterCurrentRoomFail:code];
     }] title:title type:type roomPwd:roomPwd roomDesc:roomDesc backPic:backPic uid:uid ticket:ticket mgId:mgId];

yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/AnimationView/YMRoomAnimationView.m

@@ -93,7 +93,7 @@
     if (obj.attachment != nil && [obj.attachment isKindOfClass:[AttachmentModel class]]) {
         AttachmentModel *attachment = (AttachmentModel *)obj.attachment;
         if (attachment.first == CustomMessageType_Gift) {
-            GiftReceiveInfoModel * receiveInfo = [GiftReceiveInfoModel modelWithJSON:attachment.data];
+            GiftReceiveInfoModel * receiveInfo = [GiftReceiveInfoModel mewModelWithJSON:attachment.data];
             
             [self receiveGiftHandleSendGiftAnimation:attachment];
             [self receiveGift:receiveInfo];
@@ -106,7 +106,7 @@
     NIMChatroomNotificationContent *content = (NIMChatroomNotificationContent *)notiMsg.content;
     if (content.eventType == NIMChatroomEventTypeEnter) {
         NIMMessageChatroomExtension * messageExt = (NIMMessageChatroomExtension *)message.messageExt;
-        NSDictionary * dic = [(NSDictionary *)messageExt.roomExt.toJSONObject objectForKey:message.from];
+        NSDictionary * dic = [(NSDictionary *)messageExt.roomExt.mewToJSONObject objectForKey:message.from];
     }
 }
 
@@ -178,7 +178,7 @@
 #pragma mark - 收到礼物展示动画
 - (void)receiveGiftHandleSendGiftAnimation:(AttachmentModel *)attachment {
     if (!self.delegate.getRoomInformation.hasAnimationEffect) {return;}
-    GiftReceiveInfoModel * receiveInfo = [GiftReceiveInfoModel modelWithJSON:attachment.data];
+    GiftReceiveInfoModel * receiveInfo = [GiftReceiveInfoModel mewModelWithJSON:attachment.data];
     GiftInfoModel * giftInfo = receiveInfo.gift ? receiveInfo.gift : receiveInfo.giftInfo;
     
    if (giftInfo == nil) {

yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MenuContainerView/YMRoomSendTextView.m

@@ -7,11 +7,11 @@
 
 #import "YMRoomSendTextView.h"
 /// Tool
-#import "ThemeColor.h"
+#import "MEWThemeColor.h"
 #import "UIImage+Utils.h"
 #import "YMMacro.h"
 #import "AccountInfoStorage.h"
-#import "NSArray+Safe.h"
+#import "NSArray+MEWSafe.h"
 #import "YMConstant.h"
 /// Third
 #import <Masonry/Masonry.h>
@@ -95,7 +95,7 @@
     extModel.vipIcon = userInfo.userVipInfoVO.vipIcon;
     NIMMessage * message = [[NIMMessage alloc] init];
     message.text = self.inputMessage;
-    NSMutableDictionary *remoteExt = [NSMutableDictionary dictionaryWithObject:extModel.model2dictionary forKey:[AccountInfoStorage instance].getUid];
+    NSMutableDictionary *remoteExt = [NSMutableDictionary dictionaryWithObject:extModel.mewModel2dictionary forKey:[AccountInfoStorage instance].getUid];
     message.remoteExt = remoteExt;
     
     ///网易易盾 拦截高风险
@@ -187,7 +187,7 @@
 
 #pragma mark - Private Method
 - (void)initSubViews {
-    self.backgroundColor = [ThemeColor appBackgroundColor];
+    self.backgroundColor = [MEWThemeColor mewAppBackgroundColor];
     [self addSubview:self.stackView];
     [self.stackView addArrangedSubview:self.editTextFiled];
     [self.stackView addArrangedSubview:self.sendButton];
@@ -216,10 +216,10 @@
 - (UITextField *)editTextFiled{
     if (!_editTextFiled) {
         _editTextFiled = [[UITextField alloc] init];
-    NSAttributedString * attribute = [[NSAttributedString alloc] initWithString:@"请输入消息..." attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:15], NSForegroundColorAttributeName : [ThemeColor secondTextColor]}];
+    NSAttributedString * attribute = [[NSAttributedString alloc] initWithString:@"请输入消息..." attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:15], NSForegroundColorAttributeName : [MEWThemeColor mewSecondTextColor]}];
         _editTextFiled.attributedPlaceholder = attribute;
         _editTextFiled.borderStyle = UITextBorderStyleNone;
-        _editTextFiled.textColor = [ThemeColor alertTitleColor];
+        _editTextFiled.textColor = [MEWThemeColor mewAlertTitleColor];
         _editTextFiled.font = [UIFont systemFontOfSize:15];
         [_editTextFiled setContentHuggingPriority:UILayoutPriorityDefaultLow forAxis:UILayoutConstraintAxisHorizontal];
         
@@ -230,9 +230,9 @@
     if (!_sendButton) {
         _sendButton = [[UIButton alloc] init];
         [_sendButton setTitle:@"发送" forState:UIControlStateNormal];
-        _sendButton.titleLabel.textColor = [ThemeColor mainTextColor];
+        _sendButton.titleLabel.textColor = [MEWThemeColor mewMainTextColor];
         _sendButton.titleLabel.font = [UIFont systemFontOfSize:15];
-        [_sendButton setBackgroundImage:[UIImage imageWithColor:[ThemeColor colorWithHexString:@"#9552FF"] ] forState:UIControlStateNormal];
+        [_sendButton setBackgroundImage:[UIImage imageWithColor:[MEWThemeColor mewColorWithHexString:@"#9552FF"] ] forState:UIControlStateNormal];
         _sendButton.enabled = NO;
         _sendButton.layer.cornerRadius = 5.0;
         _sendButton.layer.masksToBounds = YES;

yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MessageContainerView/CHRoomMessageHeaderView.m

@@ -9,7 +9,7 @@
 ///Third
 #import <Masonry/Masonry.h>
 ///Tool
-#import "MEWThemeColor+MEWRoom.h"
+#import "MEWThemeColor.h"
 #import "YMRoomMessageConstant.h"
 #import "YMMacro.h"
 
@@ -72,12 +72,12 @@
 }
 
 
-- (UIView *)bubbleView {
-    if (!_bubbleView) {
-        _bubbleView = [[UIView alloc] init];
-        _bubbleView.backgroundColor = [MEWThemeColor messageBubbleColor];
-        _bubbleView.layer.masksToBounds = YES;
-        _bubbleView.layer.cornerRadius = kRoomMessageBubbleCornerRadius;
+- (UIView *)bubbleBgView {
+    if (!_bubbleBgView) {
+        _bubbleBgView = [[UIView alloc] init];
+        _bubbleBgView.backgroundColor = UIColorMewRGBAlpha(0xFFFFFF, 0.15);
+        _bubbleBgView.layer.masksToBounds = YES;
+        _bubbleBgView.layer.cornerRadius = kRoomMessageBubbleCornerRadius;
     }
     return _bubbleBgView;
 }

yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MessageContainerView/Tool/YMRoomMessageParser.m

@@ -18,7 +18,7 @@
 #import "GiftInfoModel.h"
 /// Tool
 #import "AccountInfoStorage.h"
-#import "ThemeColor+Room.h"
+
 #import "YMRoomMessageConstant.h"
 #import "YMGiftStorage.h"
 #import "NetImageConfig.h"
@@ -41,7 +41,7 @@
 }
 
 - (NSString *)parseMessageBubble:(NIMMessage *)message {
-    YMMessageRemoteExtModel *model = [YMMessageRemoteExtModel modelWithJSON:message.remoteExt[message.from]];
+    YMMessageRemoteExtModel *model = [YMMessageRemoteExtModel mewModelWithJSON:message.remoteExt[message.from]];
     return model.iosBubbleUrl ? model.iosBubbleUrl : @"";
 }
 
@@ -62,7 +62,7 @@
 //    // 强制排版(从左到右)
     paraStyle.alignment = NSTextAlignmentLeft;
     paraStyle.baseWritingDirection = NSWritingDirectionLeftToRight;
-    NSMutableAttributedString *nameAtt = [self createTextAttribute:nick color:[ThemeColor messageDefaultTextColor] font:kRoomMessageTextFont];
+    NSMutableAttributedString *nameAtt = [self createTextAttribute:nick color:[UIColor colorWithWhite:1 alpha:0.5] font:kRoomMessageTextFont];
     nameAtt.yy_paragraphStyle = paraStyle;
     [attribute appendAttributedString:nameAtt];
     NSMutableAttributedString *msgStr;
@@ -79,7 +79,7 @@
 - (YMMessageInfoModel *)makeCustomAttribute:(NIMMessage *)message messageInfo:(YMMessageInfoModel*)messageInfo{
     NIMCustomObject *obj = (NIMCustomObject *)message.messageObject;
     AttachmentModel *attachment = (AttachmentModel *)obj.attachment;
-    YMMessageRemoteExtModel * model = [YMMessageRemoteExtModel modelWithJSON:message.remoteExt[message.from]];
+    YMMessageRemoteExtModel * model = [YMMessageRemoteExtModel mewModelWithJSON:message.remoteExt[message.from]];
     int first = attachment.first;
     if (first == CustomMessageType_Gift) {///单人送
         return [self createSendGiftAttribute:attachment sendInfo:model messageInfo:messageInfo];
@@ -91,7 +91,7 @@
 
 - (YMMessageInfoModel *)createSendGiftAttribute:(AttachmentModel *)attachment sendInfo:(YMMessageRemoteExtModel *)sendInfo  messageInfo:(YMMessageInfoModel *)messageInfo{
     NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] init];
-    GiftReceiveInfoModel *info = [GiftReceiveInfoModel modelWithJSON:attachment.data];
+    GiftReceiveInfoModel *info = [GiftReceiveInfoModel mewModelWithJSON:attachment.data];
     GiftInfoModel *giftInfo = info.gift == nil ? info.giftInfo : info.gift;
     if (giftInfo == nil) {
         giftInfo = [[YMGiftStorage shareStorage] findGiftInfo:info.giftId];
@@ -100,7 +100,7 @@
     //nick
     [attribute appendAttributedString:[self createSapceAttribute:2]];;
     //打赏
-    [attribute appendAttributedString:[self createTextAttribute:@"  打赏  " color:[ThemeColor messageDefaultTextColor] font:kRoomMessageTextFont]];
+    [attribute appendAttributedString:[self createTextAttribute:@"  打赏  " color:[UIColor colorWithWhite:1 alpha:0.5] font:kRoomMessageTextFont]];
     [attribute appendAttributedString:[self createSapceAttribute:2]];
     //target
     [attribute appendAttributedString:[self createSapceAttribute:2]];
@@ -108,7 +108,7 @@
     [attribute appendAttributedString:[self createUrlImageAttribute:giftInfo.giftUrl]];
     [attribute appendAttributedString:[self createSapceAttribute:2]];
     //x N
-    [attribute appendAttributedString:[self createTextAttribute:[NSString stringWithFormat:@" X%ld",info.giftNum] color:[ThemeColor messageTextColor] font:kRoomMessageTextFont]];
+    [attribute appendAttributedString:[self createTextAttribute:[NSString stringWithFormat:@" X%ld",info.giftNum] color:[UIColor whiteColor] font:kRoomMessageTextFont]];
     
     messageInfo.content = attribute;
     return messageInfo;

yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/MessageContainerView/YMRoomMessageContainerView.m

@@ -14,13 +14,13 @@
 #import "AttachmentModel.h"
 #import "RoomInfoModel.h"
 /// Tool
-#import "NSArray+Safe.h"
+#import "NSArray+MewSafe.h"
 #import "YMRoomMessageParser.h"
 #import "YMRoomMessageConstant.h"
 #import "YMRoomMessageFilter.h"
 #import "ClientConfig.h"
 #import "AccountInfoStorage.h"
-#import "ThemeColor+Room.h"
+#import "MEWThemeColor.h"
 /// Third
 #import <Masonry/Masonry.h>
 #import <NIMSDK/NIMSDK.h>
@@ -189,7 +189,7 @@
 }
 
 - (void)onRoomEntered {
-    self.headerView.bubbleColor = [ThemeColor messageBubbleColor];
+    self.headerView.bubbleColor = UIColorMewRGBAlpha(0xFFFFFF, 0.15);;
 }
 
 #pragma mark - UITableViewDelegate, UITableViewDataSource
@@ -202,14 +202,14 @@
 
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
     MewRoomMessageTableCell *cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([MewRoomMessageTableCell class])];
-    YMMessageInfoModel *messageInfo = [self.datasource safeObjectAtIndex1:indexPath.section];
+    YMMessageInfoModel *messageInfo = [self.datasource mewSafeObjectAtIndex:indexPath.section];
     cell.messageInfo = messageInfo;
     
     return cell;
 }
 
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
-    YMMessageInfoModel *model = [self.datasource safeObjectAtIndex1:indexPath.row];
+    YMMessageInfoModel *model = [self.datasource mewSafeObjectAtIndex:indexPath.row];
     return model.rowHeight;
 }
 

yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/StageView/CHStageView.m

@@ -7,19 +7,19 @@
 
 #import "CHStageView.h"
 /// Tool
-#import "NSArray+Safe.h"
+#import "NSArray+MEWSafe.h"
 #import "RtcManager.h"
 #import "AccountInfoStorage.h"
-#import "YMHUDTool.h"
+
 #import "TTPopup.h"
-#import "ThemeColor.h"
+#import "MEWThemeColor.h"
 /// Model
 #import "MicroQueueModel.h"
 #import "UserInfoModel.h"
 #import "RoomInfoModel.h"
 #import "AttachmentModel.h"
 #import "MicroExtModel.h"
-
+#import "MewHUDTool.h"
 ///Third
 #import <Masonry/Masonry.h>
 #import <NIMSDK/NIMSDK.h>
@@ -117,7 +117,7 @@
         if (error) return;
         BOOL ownerRTCChange = NO;
         for (NSDictionary *item in info) {
-            UserInfoModel *userInfo = [UserInfoModel modelWithJSON:item.allValues.firstObject];
+            UserInfoModel *userInfo = [UserInfoModel mewModelWithJSON:item.allValues.firstObject];
             NSString *position = item.allKeys.firstObject;
             MicroQueueModel *sequence = [self.micQueue objectForKey:position];
             sequence.userInfo = userInfo;
@@ -163,15 +163,15 @@
     switch (content.eventType) {
         case NIMChatroomEventTypeInfoUpdated: // 麦序状态更新
         {
-            NSDictionary *data = [content.notifyExt toJSONObject];
+            NSDictionary *data = [content.notifyExt mewToJSONObject];
             int type = [data[@"type"] intValue];
             NSArray* microStates;
             switch (type) {
                 case 2:
-                    microStates = @[[MicroStateModel modelWithJSON:data[@"micInfo"]]];
+                    microStates = @[[MicroStateModel mewModelWithJSON:data[@"micInfo"]]];
                     break;
                 case 3:
-                    microStates = [MicroStateModel modelsWithArray:data[@"micInfo"]];
+                    microStates = [MicroStateModel mewModelsWithArray:data[@"micInfo"]];
                     break;
             }
             if (microStates && microStates.count > 0) {
@@ -188,7 +188,7 @@
         {
             NSDictionary* data = (NSDictionary *)content.ext;
             NSString* position = [data objectForKey:NIMChatroomEventInfoQueueChangeItemKey];
-            UserInfoModel* userInfo = [UserInfoModel modelWithJSON:[data objectForKey:NIMChatroomEventInfoQueueChangeItemValueKey]];
+            UserInfoModel* userInfo = [UserInfoModel mewModelWithJSON:[data objectForKey:NIMChatroomEventInfoQueueChangeItemValueKey]];
             NSInteger changeType = [data[NIMChatroomEventInfoQueueChangeTypeKey] integerValue];
             if (userInfo.uid == [AccountInfoStorage instance].getUid.integerValue) {
                 ownerRTCChanged = YES;
@@ -357,7 +357,7 @@
         }
         
         UIView<MicroViewProtocol> *selectMicroView = [self findMicroViewByIndex:index];
-        selectMicroView.layer.borderColor =  self.isSelectMicUser ? [ThemeColor colorWithHexString:@"#9552FF"].CGColor : UIColor.clearColor.CGColor;
+        selectMicroView.layer.borderColor =  self.isSelectMicUser ? [MEWThemeColor mewColorWithHexString:@"#9552FF"].CGColor : UIColor.clearColor.CGColor;
         selectMicroView.layer.borderWidth = self.isSelectMicUser ? 2.0 : 0.0;
         return;
     }
@@ -376,12 +376,12 @@
             }
             MicroQueueModel* micModel = [self.micQueue objectForKey:up];
             if (micModel.userInfo) {///麦上已经有人,不上麦
-                [YMHUDTool showErrorWithMessage:@"该麦位已经有人了哦~"];
+                [MewHUDTool showErrorWithMessage:@"该麦位已经有人了哦~"];
                 return;
             }
             NIMChatroomQueueUpdateRequest *request = [[NIMChatroomQueueUpdateRequest alloc]init];
             request.key = up;
-            request.value = [[self userInfoToQueueExt:userInfo] toJSONString];
+            request.value = [[self userInfoToQueueExt:userInfo] mewToJSONString];
             request.roomId = roomId;
             request.transient = YES;
             [[NIMSDK sharedSDK].chatroomManager updateChatroomQueueObject:request completion:^(NSError * _Nullable error) {
@@ -425,7 +425,7 @@
             UIView* microView = [self findMicroViewByUid:selfUid];
             if (microView) {
                 if (self.isUpingMic) {
-                    [YMHUDTool showErrorWithMessage:@"正在上麦"];
+                    [MewHUDTool showErrorWithMessage:@"正在上麦"];
                 } else {
                     self.isUpingMic = YES;
                     nimDownQueue([self indexToPosition:microView.tag], position);
@@ -505,7 +505,7 @@
 /// 根据 index 查找坑位 View
 - (UIView<MicroViewProtocol> *)findMicroViewByIndex:(NSInteger)index {
     if (self.microViews && self.microViews.count > index) {
-        return [self.microViews safeObjectAtIndex1:index];
+        return [self.microViews mewSafeObjectAtIndex:index];
     }
     return nil;
 }
@@ -529,7 +529,7 @@
     extModel.micNickColor = userInfo.micNickColor;
     extModel.preventKick = userInfo.userVipInfoVO.preventKick;
     extModel.enterHide = userInfo.userVipInfoVO.enterHide;
-    return [extModel model2dictionary];
+    return [extModel mewModel2dictionary];
 }
 
 
@@ -545,7 +545,7 @@
         if (error) return;
         BOOL ownerRTCChange = NO;
         for (NSDictionary *item in info) {
-            UserInfoModel *userInfo = [UserInfoModel modelWithJSON:item.allValues.firstObject];
+            UserInfoModel *userInfo = [UserInfoModel mewModelWithJSON:item.allValues.firstObject];
             NSString *position = item.allKeys.firstObject;
             MicroQueueModel *sequence = [self.micQueue objectForKey:position];
             sequence.userInfo = userInfo;
@@ -571,10 +571,10 @@
     [[NIMSDK sharedSDK].chatroomManager fetchChatroomInfo:[NSString stringWithFormat:@"%ld", (long)roomInfo.roomId] completion:^(NSError * _Nullable error, NIMChatroom * _Nullable chatroom) {
         if (error) return;
         
-        NSDictionary *info = [chatroom.ext toJSONObject];
-        NSDictionary *micState = [info[@"micQueue"] toJSONObject];
+        NSDictionary *info = [chatroom.ext mewToJSONObject];
+        NSDictionary *micState = [info[@"micQueue"] mewToJSONObject];
         for (NSString *position in micState.allKeys) {
-            MicroStateModel *state = [MicroStateModel modelWithJSON:micState[position]];
+            MicroStateModel *state = [MicroStateModel mewModelWithJSON:micState[position]];
             MicroQueueModel *sequence = [self.micQueue objectForKey:position];
             sequence.microState = state;
         }

yinmeng-ios/yinmeng-ios/Main/YinMeng/Room/View/StageView/MicroView/MicroView.m

@@ -11,7 +11,7 @@
 #import "RoomInfoModel.h"
 #import "MicroQueueModel.h"
 /// Tool
-#import "MEWThemeColor+MEWRoom.h"
+#import "MEWThemeColor.h"
 #import "YMMacro.h"
 /// Third
 #import <Masonry/Masonry.h>
@@ -104,10 +104,10 @@
     
     if(userInfo) {
         self.avatarImageView.imageUrl = userInfo.avatar;
-        [self.postionLabel setBackgroundColor:userInfo.gender == GenderType_Male ? [MEWThemeColor positionMaleNickBackColor] : [MEWThemeColor positionFemaleNickBackColor]];
+        [self.postionLabel setBackgroundColor:userInfo.gender == GenderType_Male ? UIColorMewFromRGB(0x3EBBFE) : UIColorMewFromRGB(0xFF5E83)];
         
        self.nickLabel.text = userInfo.nick.length > 5 ? [NSString stringWithFormat:@"%@…",[userInfo.nick substringToIndex:5]] : userInfo.nick;
-        self.nickLabel.textColor = userInfo.micNickColor.length > 0 ? [MEWThemeColor mewColorWithHexString: userInfo.micNickColor] : [MEWThemeColor positionNickColor];
+        self.nickLabel.textColor = userInfo.micNickColor.length > 0 ? [MEWThemeColor mewColorWithHexString: userInfo.micNickColor] : UIColorMewFromRGB(0xFFFFFF);
         
         if (self.microModel.microState.position == -1) {
             self.sexImageView.hidden = NO;
@@ -116,9 +116,9 @@
         }
 
     } else {
-        self.nickLabel.textColor = [MEWThemeColor positionNickColor];
+        self.nickLabel.textColor = UIColorMewFromRGB(0xFFFFFF);
         self.avatarImageView.image = nil;
-        [self.postionLabel setBackgroundColor: [MEWThemeColor positionNormalNickBackColor]];
+        [self.postionLabel setBackgroundColor: [UIColor colorWithWhite:1 alpha:0.2]];
         if (self.microModel.microState.position == -1) {
             self.nickLabel.hidden = YES;
             self.postionLabel.hidden = YES;
@@ -198,7 +198,7 @@
     if (!_nickLabel) {
         _nickLabel = [[UILabel alloc] init];
         _nickLabel.font = [UIFont systemFontOfSize:11];
-        _nickLabel.textColor = [MEWThemeColor positionNickColor];
+        _nickLabel.textColor = UIColorMewFromRGB(0xFFFFFF);
         _nickLabel.textAlignment = NSTextAlignmentCenter;
     }
     return _nickLabel;
@@ -223,7 +223,7 @@
         _postionLabel.textColor = [UIColor colorWithWhite:1 alpha:1];
         _postionLabel.layer.masksToBounds = YES;
         _postionLabel.layer.cornerRadius = 7;
-        [_postionLabel setBackgroundColor:[MEWThemeColor positionNormalNickBackColor]];
+        [_postionLabel setBackgroundColor:[UIColor colorWithWhite:1 alpha:0.2]];
     }
     return _postionLabel;
 }