主题色优化

Podfile

@@ -65,6 +65,7 @@ target 'YuMi' do
   pod 'UMCommon'
   pod 'UMDevice'
   pod 'lottie-ios'
+  pod 'WeexSDK'
   pod 'ZLCollectionViewFlowLayout'
   pod 'WMZDropDownMenu'
   pod 'TABAnimated'

YuMi.xcodeproj/project.pbxproj

@@ -8,6 +8,7 @@
 
 /* Begin PBXBuildFile section */
 		140A7F52299CC69000841594 /* XPTabBar.m in Sources */ = {isa = PBXBuildFile; fileRef = 140A7F51299CC69000841594 /* XPTabBar.m */; };
+		140A818D299CFF1C00841594 /* XPVendorCallViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 140A818C299CFF1C00841594 /* XPVendorCallViewController.m */; };
 		1427212529A7566100C7C423 /* ZegoAudioRoom.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1427212329A7563A00C7C423 /* ZegoAudioRoom.framework */; };
 		1427212629A7566100C7C423 /* ZegoAudioRoom.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 1427212329A7563A00C7C423 /* ZegoAudioRoom.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		1427212C29A757EC00C7C423 /* MonentsListInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 1427212A29A757EC00C7C423 /* MonentsListInfoModel.m */; };
@@ -289,7 +290,6 @@
 		237852A12C072D8D00E360AC /* MSRoomGameModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 237852A02C072D8D00E360AC /* MSRoomGameModel.m */; };
 		237852A42C082A9800E360AC /* MSRoomGameSendTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 237852A32C082A9800E360AC /* MSRoomGameSendTextView.m */; };
 		237852A72C08764B00E360AC /* MSRoomGameResultsModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 237852A62C08764B00E360AC /* MSRoomGameResultsModel.m */; };
-		237852AA2C0D98BF00E360AC /* MsRoomMessagChatHallHeadView.m in Sources */ = {isa = PBXBuildFile; fileRef = 237852A92C0D98BF00E360AC /* MsRoomMessagChatHallHeadView.m */; };
 		237B94BC2A984DA7007853E3 /* XPTrumpetPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 237B94AE2A984DA7007853E3 /* XPTrumpetPresenter.m */; };
 		237B94BD2A984DA7007853E3 /* XPNobleTrumpetModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 237B94B32A984DA7007853E3 /* XPNobleTrumpetModel.m */; };
 		237B94BE2A984DA7007853E3 /* XPRoomTrumpetViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 237B94B72A984DA7007853E3 /* XPRoomTrumpetViewController.m */; };
@@ -520,8 +520,6 @@
 		23FF42762AA6E1480055733C /* XPHomeRecommendOtherRoomView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23FF42752AA6E1480055733C /* XPHomeRecommendOtherRoomView.m */; };
 		23FF42792AA6E19C0055733C /* HomeMenuSourceModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 23FF42782AA6E19C0055733C /* HomeMenuSourceModel.m */; };
 		23FF428E2AAB2D3A0055733C /* XPCandyTreeBuyView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23FF428D2AAB2D3A0055733C /* XPCandyTreeBuyView.m */; };
-		545888332C1AFFB500897585 /* XPRoomPKPanelView.m in Sources */ = {isa = PBXBuildFile; fileRef = 545888322C1AFFB500897585 /* XPRoomPKPanelView.m */; };
-		545888362C1C306B00897585 /* XPRoomPKPaneAvatarView.m in Sources */ = {isa = PBXBuildFile; fileRef = 545888352C1C306B00897585 /* XPRoomPKPaneAvatarView.m */; };
 		73FFADDC93E195344047A2EC /* Pods_YuMi.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CACF623970097D653132D69A /* Pods_YuMi.framework */; };
 		9B0086C627BA392B0032BD2B /* AnchorStageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B0086C527BA392B0032BD2B /* AnchorStageView.m */; };
 		9B0086CA27BA4F570032BD2B /* AnchorMicroView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B0086C927BA4F570032BD2B /* AnchorMicroView.m */; };
@@ -679,6 +677,7 @@
 		E8098CB1282E86EF0090B9F0 /* XPMonentsContentView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8098CB0282E86EF0090B9F0 /* XPMonentsContentView.m */; };
 		E8098CB4282E97550090B9F0 /* XPMineBlackListPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E8098CB3282E97550090B9F0 /* XPMineBlackListPresenter.m */; };
 		E80A086227F2AC190027B30C /* RoomPKDetailInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E80A086127F2AC190027B30C /* RoomPKDetailInfoModel.m */; };
+		E80A086527F318620027B30C /* XPRoomPKPlayingView.m in Sources */ = {isa = PBXBuildFile; fileRef = E80A086427F318620027B30C /* XPRoomPKPlayingView.m */; };
 		E80A63DC28B86B9700690914 /* MessageContentMonentsAutoView.m in Sources */ = {isa = PBXBuildFile; fileRef = E80A63DB28B86B9700690914 /* MessageContentMonentsAutoView.m */; };
 		E80B0712280D0A6700A79F63 /* FansInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E80B0711280D0A6700A79F63 /* FansInfoModel.m */; };
 		E80B0734280D740600A79F63 /* MessageContentGuildView.m in Sources */ = {isa = PBXBuildFile; fileRef = E80B0733280D740600A79F63 /* MessageContentGuildView.m */; };
@@ -911,6 +910,7 @@
 		E81A6546283519CA00F55894 /* MonentsTopicModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E81A6545283519CA00F55894 /* MonentsTopicModel.m */; };
 		E81A654928351B9500F55894 /* XPMonentsRecommendHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = E81A654828351B9500F55894 /* XPMonentsRecommendHeaderView.m */; };
 		E81A654C28351D9900F55894 /* XPMonentsTopicCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E81A654B28351D9900F55894 /* XPMonentsTopicCollectionViewCell.m */; };
+		E81AF32527F1D5B8003B9E43 /* XPRoomPKProgressView.m in Sources */ = {isa = PBXBuildFile; fileRef = E81AF32427F1D5B8003B9E43 /* XPRoomPKProgressView.m */; };
 		E81AF32827F1EE69003B9E43 /* XPRoomPKPanelUserView.m in Sources */ = {isa = PBXBuildFile; fileRef = E81AF32727F1EE69003B9E43 /* XPRoomPKPanelUserView.m */; };
 		E81C1B1C27705F6B0020D1E4 /* XPArrangeMicPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E81C1B1B27705F6B0020D1E4 /* XPArrangeMicPresenter.m */; };
 		E81C1B1F27705F7A0020D1E4 /* XPArrangeMicViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E81C1B1E27705F7A0020D1E4 /* XPArrangeMicViewController.m */; };
@@ -1455,7 +1455,7 @@
 		E8D34D6728084E88009C4835 /* XPMineUserInfoGiftWallCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E8D34D6628084E88009C4835 /* XPMineUserInfoGiftWallCollectionViewCell.m */; };
 		E8D4824A278D1F73003C1D08 /* XPAcrossRoomPKInviteView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8D48249278D1F73003C1D08 /* XPAcrossRoomPKInviteView.m */; };
 		E8D4824D278D2CE4003C1D08 /* XPAcrossRoomPKInviteResultView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8D4824C278D2CE4003C1D08 /* XPAcrossRoomPKInviteResultView.m */; };
-		E8D48250278D68BA003C1D08 /* XPAcrossRoomPKPanelView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8D4824F278D68BA003C1D08 /* XPAcrossRoomPKPanelView.m */; };
+		E8D48250278D68BA003C1D08 /* XPAcrpssRoomPKPanelView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8D4824F278D68BA003C1D08 /* XPAcrpssRoomPKPanelView.m */; };
 		E8D48253278D8228003C1D08 /* AcrossRoomPKPanelModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E8D48252278D8228003C1D08 /* AcrossRoomPKPanelModel.m */; };
 		E8D48256278D83AE003C1D08 /* XPAcrossRoomPKPanelUserView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8D48255278D83AE003C1D08 /* XPAcrossRoomPKPanelUserView.m */; };
 		E8D4DE442940462C00EC788D /* XPGiftTwelveStarBroadcastView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8D4DE432940462C00EC788D /* XPGiftTwelveStarBroadcastView.m */; };
@@ -1552,6 +1552,8 @@
 /* Begin PBXFileReference section */
 		140A7F50299CC69000841594 /* XPTabBar.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPTabBar.h; sourceTree = "<group>"; };
 		140A7F51299CC69000841594 /* XPTabBar.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPTabBar.m; sourceTree = "<group>"; };
+		140A818B299CFF1C00841594 /* XPVendorCallViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPVendorCallViewController.h; sourceTree = "<group>"; };
+		140A818C299CFF1C00841594 /* XPVendorCallViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPVendorCallViewController.m; sourceTree = "<group>"; };
 		1427212329A7563A00C7C423 /* ZegoAudioRoom.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = ZegoAudioRoom.framework; sourceTree = "<group>"; };
 		1427212A29A757EC00C7C423 /* MonentsListInfoModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MonentsListInfoModel.m; sourceTree = "<group>"; };
 		1427212B29A757EC00C7C423 /* MonentsListInfoModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MonentsListInfoModel.h; sourceTree = "<group>"; };
@@ -2113,8 +2115,6 @@
 		237852A32C082A9800E360AC /* MSRoomGameSendTextView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSRoomGameSendTextView.m; sourceTree = "<group>"; };
 		237852A52C08764B00E360AC /* MSRoomGameResultsModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSRoomGameResultsModel.h; sourceTree = "<group>"; };
 		237852A62C08764B00E360AC /* MSRoomGameResultsModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSRoomGameResultsModel.m; sourceTree = "<group>"; };
-		237852A82C0D98BF00E360AC /* MsRoomMessagChatHallHeadView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MsRoomMessagChatHallHeadView.h; sourceTree = "<group>"; };
-		237852A92C0D98BF00E360AC /* MsRoomMessagChatHallHeadView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MsRoomMessagChatHallHeadView.m; sourceTree = "<group>"; };
 		237B94AD2A984DA7007853E3 /* XPTrumpetPresenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPTrumpetPresenter.h; sourceTree = "<group>"; };
 		237B94AE2A984DA7007853E3 /* XPTrumpetPresenter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPTrumpetPresenter.m; sourceTree = "<group>"; };
 		237B94B02A984DA7007853E3 /* XPRoomTrumpetProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPRoomTrumpetProtocol.h; sourceTree = "<group>"; };
@@ -2559,10 +2559,6 @@
 		23FF42782AA6E19C0055733C /* HomeMenuSourceModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HomeMenuSourceModel.m; sourceTree = "<group>"; };
 		23FF428C2AAB2D3A0055733C /* XPCandyTreeBuyView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPCandyTreeBuyView.h; sourceTree = "<group>"; };
 		23FF428D2AAB2D3A0055733C /* XPCandyTreeBuyView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPCandyTreeBuyView.m; sourceTree = "<group>"; };
-		545888312C1AFFB500897585 /* XPRoomPKPanelView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomPKPanelView.h; sourceTree = "<group>"; };
-		545888322C1AFFB500897585 /* XPRoomPKPanelView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomPKPanelView.m; sourceTree = "<group>"; };
-		545888342C1C306B00897585 /* XPRoomPKPaneAvatarView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomPKPaneAvatarView.h; sourceTree = "<group>"; };
-		545888352C1C306B00897585 /* XPRoomPKPaneAvatarView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomPKPaneAvatarView.m; sourceTree = "<group>"; };
 		7DB00EC07F1D0ADFF900B38D /* Pods-YuMi.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-YuMi.debug.xcconfig"; path = "Target Support Files/Pods-YuMi/Pods-YuMi.debug.xcconfig"; sourceTree = "<group>"; };
 		9B0086C427BA392B0032BD2B /* AnchorStageView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AnchorStageView.h; sourceTree = "<group>"; };
 		9B0086C527BA392B0032BD2B /* AnchorStageView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AnchorStageView.m; sourceTree = "<group>"; };
@@ -2888,6 +2884,8 @@
 		E8098CB6282E97AC0090B9F0 /* XPMineBlackListProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineBlackListProtocol.h; sourceTree = "<group>"; };
 		E80A086027F2AC190027B30C /* RoomPKDetailInfoModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RoomPKDetailInfoModel.h; sourceTree = "<group>"; };
 		E80A086127F2AC190027B30C /* RoomPKDetailInfoModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RoomPKDetailInfoModel.m; sourceTree = "<group>"; };
+		E80A086327F318620027B30C /* XPRoomPKPlayingView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomPKPlayingView.h; sourceTree = "<group>"; };
+		E80A086427F318620027B30C /* XPRoomPKPlayingView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomPKPlayingView.m; sourceTree = "<group>"; };
 		E80A63DA28B86B9700690914 /* MessageContentMonentsAutoView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageContentMonentsAutoView.h; sourceTree = "<group>"; };
 		E80A63DB28B86B9700690914 /* MessageContentMonentsAutoView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageContentMonentsAutoView.m; sourceTree = "<group>"; };
 		E80B0710280D0A6700A79F63 /* FansInfoModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FansInfoModel.h; sourceTree = "<group>"; };
@@ -3184,6 +3182,8 @@
 		E81A654828351B9500F55894 /* XPMonentsRecommendHeaderView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMonentsRecommendHeaderView.m; sourceTree = "<group>"; };
 		E81A654A28351D9900F55894 /* XPMonentsTopicCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMonentsTopicCollectionViewCell.h; sourceTree = "<group>"; };
 		E81A654B28351D9900F55894 /* XPMonentsTopicCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMonentsTopicCollectionViewCell.m; sourceTree = "<group>"; };
+		E81AF32327F1D5B8003B9E43 /* XPRoomPKProgressView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomPKProgressView.h; sourceTree = "<group>"; };
+		E81AF32427F1D5B8003B9E43 /* XPRoomPKProgressView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomPKProgressView.m; sourceTree = "<group>"; };
 		E81AF32627F1EE69003B9E43 /* XPRoomPKPanelUserView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomPKPanelUserView.h; sourceTree = "<group>"; };
 		E81AF32727F1EE69003B9E43 /* XPRoomPKPanelUserView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomPKPanelUserView.m; sourceTree = "<group>"; };
 		E81C1B1927705F4B0020D1E4 /* XPArrangeMicProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPArrangeMicProtocol.h; sourceTree = "<group>"; };
@@ -4314,8 +4314,8 @@
 		E8D48249278D1F73003C1D08 /* XPAcrossRoomPKInviteView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPAcrossRoomPKInviteView.m; sourceTree = "<group>"; };
 		E8D4824B278D2CE4003C1D08 /* XPAcrossRoomPKInviteResultView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPAcrossRoomPKInviteResultView.h; sourceTree = "<group>"; };
 		E8D4824C278D2CE4003C1D08 /* XPAcrossRoomPKInviteResultView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPAcrossRoomPKInviteResultView.m; sourceTree = "<group>"; };
-		E8D4824E278D68BA003C1D08 /* XPAcrossRoomPKPanelView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPAcrossRoomPKPanelView.h; sourceTree = "<group>"; };
-		E8D4824F278D68BA003C1D08 /* XPAcrossRoomPKPanelView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPAcrossRoomPKPanelView.m; sourceTree = "<group>"; };
+		E8D4824E278D68BA003C1D08 /* XPAcrpssRoomPKPanelView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPAcrpssRoomPKPanelView.h; sourceTree = "<group>"; };
+		E8D4824F278D68BA003C1D08 /* XPAcrpssRoomPKPanelView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPAcrpssRoomPKPanelView.m; sourceTree = "<group>"; };
 		E8D48251278D8228003C1D08 /* AcrossRoomPKPanelModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AcrossRoomPKPanelModel.h; sourceTree = "<group>"; };
 		E8D48252278D8228003C1D08 /* AcrossRoomPKPanelModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AcrossRoomPKPanelModel.m; sourceTree = "<group>"; };
 		E8D48254278D83AE003C1D08 /* XPAcrossRoomPKPanelUserView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPAcrossRoomPKPanelUserView.h; sourceTree = "<group>"; };
@@ -7088,10 +7088,12 @@
 				E801273F27E323C800BAC3F2 /* XPRoomPKViewController.m */,
 				E8664ED427E434D5000171BA /* XPRoomPKRecordViewController.h */,
 				E8664ED527E434D5000171BA /* XPRoomPKRecordViewController.m */,
+				E81AF32327F1D5B8003B9E43 /* XPRoomPKProgressView.h */,
+				E81AF32427F1D5B8003B9E43 /* XPRoomPKProgressView.m */,
+				E80A086327F318620027B30C /* XPRoomPKPlayingView.h */,
+				E80A086427F318620027B30C /* XPRoomPKPlayingView.m */,
 				E84843AD27F59E7E0050D365 /* XPRoomPKResultView.h */,
 				E84843AE27F59E7E0050D365 /* XPRoomPKResultView.m */,
-				545888312C1AFFB500897585 /* XPRoomPKPanelView.h */,
-				545888322C1AFFB500897585 /* XPRoomPKPanelView.m */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -7158,8 +7160,6 @@
 				E81AF32727F1EE69003B9E43 /* XPRoomPKPanelUserView.m */,
 				E84843B027F5A0740050D365 /* XPRomPKResultTitleLabel.h */,
 				E84843B127F5A0740050D365 /* XPRomPKResultTitleLabel.m */,
-				545888342C1C306B00897585 /* XPRoomPKPaneAvatarView.h */,
-				545888352C1C306B00897585 /* XPRoomPKPaneAvatarView.m */,
 			);
 			path = SubViews;
 			sourceTree = "<group>";
@@ -9617,8 +9617,8 @@
 				E8D48249278D1F73003C1D08 /* XPAcrossRoomPKInviteView.m */,
 				E8D4824B278D2CE4003C1D08 /* XPAcrossRoomPKInviteResultView.h */,
 				E8D4824C278D2CE4003C1D08 /* XPAcrossRoomPKInviteResultView.m */,
-				E8D4824E278D68BA003C1D08 /* XPAcrossRoomPKPanelView.h */,
-				E8D4824F278D68BA003C1D08 /* XPAcrossRoomPKPanelView.m */,
+				E8D4824E278D68BA003C1D08 /* XPAcrpssRoomPKPanelView.h */,
+				E8D4824F278D68BA003C1D08 /* XPAcrpssRoomPKPanelView.m */,
 				E8D48254278D83AE003C1D08 /* XPAcrossRoomPKPanelUserView.h */,
 				E8D48255278D83AE003C1D08 /* XPAcrossRoomPKPanelUserView.m */,
 				E88863C4278EAFC3004BCFAB /* XPAcrossRoomPKResultView.h */,
@@ -10185,8 +10185,6 @@
 				E8AEAEF227141C7C0017FCE0 /* XPRoomMessageContainerView.m */,
 				235714932BEDF517004C81D6 /* MsRoomMessagChatHallView.h */,
 				235714942BEDF517004C81D6 /* MsRoomMessagChatHallView.m */,
-				237852A82C0D98BF00E360AC /* MsRoomMessagChatHallHeadView.h */,
-				237852A92C0D98BF00E360AC /* MsRoomMessagChatHallHeadView.m */,
 			);
 			path = MessageContainerView;
 			sourceTree = "<group>";
@@ -10613,6 +10611,8 @@
 				E8E20BE1281695800033B688 /* XPMineLoginPasswordViewController.m */,
 				E8E20BEA2816A5B90033B688 /* XPMineBlackListViewController.h */,
 				E8E20BEB2816A5B90033B688 /* XPMineBlackListViewController.m */,
+				140A818B299CFF1C00841594 /* XPVendorCallViewController.h */,
+				140A818C299CFF1C00841594 /* XPVendorCallViewController.m */,
 				2305F3402AD94D5200AD403C /* XPMaskManagerVC.h */,
 				2305F33F2AD94D5200AD403C /* XPMaskManagerVC.m */,
 			);
@@ -11655,6 +11655,7 @@
 				E8D34D6028082BA5009C4835 /* XPMineUserDataPresenter.m in Sources */,
 				E84CBCE4284372D800D43221 /* XPRoomHalfMessageView.m in Sources */,
 				238B37A52AC55A2C00BFC9D5 /* TreasureFailyKeyInfoModel.m in Sources */,
+				140A818D299CFF1C00841594 /* XPVendorCallViewController.m in Sources */,
 				E8EEB8F226FC2050007C6EBA /* SDPhotoBrowser.m in Sources */,
 				23CEFC4F2AFB8FC100576D89 /* BSSDLayoutUtil.m in Sources */,
 				E81C27AB26EF2D920031E639 /* ThirdUserInfo.m in Sources */,
@@ -11714,6 +11715,7 @@
 				23E9EA942A84BE4800B792F2 /* XPGiftUserDataViewController.m in Sources */,
 				2331C16D2A5EB71000E1D940 /* XPNobleSettingNavView.m in Sources */,
 				E8AEAED6271412EC0017FCE0 /* XPRoomViewController.m in Sources */,
+				E80A086527F318620027B30C /* XPRoomPKPlayingView.m in Sources */,
 				2305F33B2AD9293D00AD403C /* PIRoomPhotoAlbumOperateView.m in Sources */,
 				E8E70D9226F2F60C00F03460 /* XPMineItemModel.m in Sources */,
 				E818DD1F2A48974300F163F7 /* LoginAreaModel.m in Sources */,
@@ -11826,7 +11828,6 @@
 				237700FA2BCCD25500D661F1 /* YYLabel+MSRTL.m in Sources */,
 				E84BF7DD277C765400EF8877 /* XPRoomRoleEmptyTableViewCell.m in Sources */,
 				E8F6135C291E26BD00E12650 /* NSMutableDictionary+Saft.m in Sources */,
-				237852AA2C0D98BF00E360AC /* MsRoomMessagChatHallHeadView.m in Sources */,
 				239D0F992BFB43BC002977CE /* MSRoomOnLineAvatarView.m in Sources */,
 				1427213429A75A2600C7C423 /* XPMonentsLatestPresenter.m in Sources */,
 				E83ABEFD280EB5E200322EE4 /* ContentOpenLiveInfoModel.m in Sources */,
@@ -12009,7 +12010,7 @@
 				9B3C181A292CE4FA003AF543 /* XPAnchorPKMatchView.m in Sources */,
 				E80EC80D28ACD84000D133C5 /* QInputBarView.m in Sources */,
 				23E9EA852A84B6FD00B792F2 /* XPSoundCardModel.m in Sources */,
-				E8D48250278D68BA003C1D08 /* XPAcrossRoomPKPanelView.m in Sources */,
+				E8D48250278D68BA003C1D08 /* XPAcrpssRoomPKPanelView.m in Sources */,
 				23E9E9B52A81E8E900B792F2 /* XPAdjustEvent.m in Sources */,
 				18F404C3276098F100A6C548 /* Api+Message.m in Sources */,
 				9B85B6D7279FDABA00A0A1AC /* XPUserCardSkillCardView.m in Sources */,
@@ -12187,6 +12188,7 @@
 				E81060F42987C6B200B772F0 /* MessageOpenLiveModel.m in Sources */,
 				E8AEAEF027141C430017FCE0 /* XPRoomMenuContainerView.m in Sources */,
 				9B85F3532806AB9A006EDF51 /* XPAnchorPKResultView.m in Sources */,
+				E81AF32527F1D5B8003B9E43 /* XPRoomPKProgressView.m in Sources */,
 				E8DEC99527648FA50078CB70 /* ClientConfig.m in Sources */,
 				9B6E8577281ABECC0041A321 /* XPRoomInsideRecommendEmptyCell.m in Sources */,
 				E85E7BC22A4EE82300B6D00A /* XPMineListCell.m in Sources */,
@@ -12452,7 +12454,6 @@
 				E80EC80F28ACD84000D133C5 /* QEmotion.m in Sources */,
 				E877A7EB2783E24700EFACED /* DatingStageView.m in Sources */,
 				9BD2ECDA288F867000F5CD9A /* XPMineFootPrintTableViewCell.m in Sources */,
-				545888332C1AFFB500897585 /* XPRoomPKPanelView.m in Sources */,
 				E8395339276A0CC100CF2F24 /* XPMineHeadwearTableViewCell.m in Sources */,
 				238B37CB2AC55A2C00BFC9D5 /* XPTreasureFairyWebView.m in Sources */,
 				E875FA8727D619820086ED04 /* ClientDataModel.m in Sources */,
@@ -12556,7 +12557,6 @@
 				1427218829A75F6F00C7C423 /* HTTPErrorResponse.m in Sources */,
 				E85E7B032A4EB0D200B6D00A /* XPGuildIncomePresenter.m in Sources */,
 				E8A30BF928534E48003B4873 /* XPSessionFindNewEmptyTableViewCell.m in Sources */,
-				545888362C1C306B00897585 /* XPRoomPKPaneAvatarView.m in Sources */,
 				E896EFB22771C93B00AD2CC1 /* XPMineFriendNumberView.m in Sources */,
 				14EB640D29A5C16000A4A00B /* XPMomentsSimpleDetailNav.m in Sources */,
 				E80EC80E28ACD84000D133C5 /* QKeyboardBaseManager.m in Sources */,
@@ -12764,7 +12764,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 20.20.25;
+				MARKETING_VERSION = 20.20.22;
 				PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -12802,7 +12802,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 20.20.25;
+				MARKETING_VERSION = 20.20.22;
 				PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

YuMi.xcodeproj/xcshareddata/xcschemes/YuMi.xcscheme

@@ -72,7 +72,7 @@
       buildConfiguration = "Debug">
    </AnalyzeAction>
    <ArchiveAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "Release"
       revealArchiveInOrganizer = "YES">
    </ArchiveAction>
 </Scheme>

YuMi/Appdelegate/AppDelegate+ThirdConfig.m

@@ -31,47 +31,55 @@
 
 #import "YuMi-swift.h"
 
+
 UIKIT_EXTERN NSString * kYouMiNumberCountKey;
 UIKIT_EXTERN NSString * adImageName;
 
+
+
 @implementation AppDelegate (ThirdConfig)
 
+
 /// 初始化一些第三方配置
-- (void)initThirdConfig{
+- (void)initThirdConfig {
 	[self configShareSDK];
 	[self configNIMSDK];
+	[self initEmojiData];
     [self configAdjust];
     [self configBugly];
     [self registerNot];
-    [self initEmojiData];
     [self setLanguage];
 }
-
 -(void)setLanguage{
-    UISemanticContentAttribute attribute = UISemanticContentAttributeForceLeftToRight;
+    
     if (isMSRTL()) {
-        attribute = UISemanticContentAttributeForceRightToLeft;
+        [UIView appearance].semanticContentAttribute = UISemanticContentAttributeForceRightToLeft;
+        [UISearchBar appearance].semanticContentAttribute = UISemanticContentAttributeForceRightToLeft;
+
+
+    } else {
+        [UIView appearance].semanticContentAttribute = UISemanticContentAttributeForceLeftToRight;
+        [UISearchBar appearance].semanticContentAttribute = UISemanticContentAttributeForceLeftToRight;
+
+
     }
-
-    [UIView appearance].semanticContentAttribute = attribute;
-    [UISearchBar appearance].semanticContentAttribute = attribute;
 }
-
 -(void)registerNot{
     if (@available(iOS 10.0, *)) {
-        UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
-        [center requestAuthorizationWithOptions:(UNAuthorizationOptionAlert | UNAuthorizationOptionBadge | UNAuthorizationOptionSound) completionHandler:^(BOOL granted, NSError * _Nullable error) {
-            if (granted) {
-                [center getNotificationSettingsWithCompletionHandler:^(UNNotificationSettings * _Nonnull settings) {
-                    if (settings.authorizationStatus == UNAuthorizationStatusAuthorized){
-                        dispatch_async(dispatch_get_main_queue(), ^{
-                            [[UIApplication sharedApplication] registerForRemoteNotifications];
-                        });
+                UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
+                [center requestAuthorizationWithOptions:(UNAuthorizationOptionAlert | UNAuthorizationOptionBadge | UNAuthorizationOptionSound) completionHandler:^(BOOL granted, NSError * _Nullable error) {
+                    if (granted) {
+                        [center getNotificationSettingsWithCompletionHandler:^(UNNotificationSettings * _Nonnull settings) {
+                            if (settings.authorizationStatus == UNAuthorizationStatusAuthorized){
+                                dispatch_async(dispatch_get_main_queue(), ^{
+                                    [[UIApplication sharedApplication] registerForRemoteNotifications];
+                                });
+                            }
+                        }];
                     }
                 }];
             }
-        }];
-    }
+   
 }
 
 /**
@@ -107,7 +115,10 @@ UIKIT_EXTERN NSString * adImageName;
 #else
     option.apnsCername = @"newPiko";
 #endif
+ 
+    
 
+    
 	[[NIMSDK sharedSDK] registerWithOption:option];
 	
 	// NIM SDK初始化
@@ -140,7 +151,6 @@ UIKIT_EXTERN NSString * adImageName;
    #endif
    [Adjust appDidLaunch:adjustConfig];
 }
-
 - (void)configShareSDK {
 
     [PILineLoginManager registerLine];
@@ -150,10 +160,11 @@ UIKIT_EXTERN NSString * adImageName;
 //		[platformsRegister setupFacebookWithAppkey:@"1266232494209868" appSecret:@"c9b170b383f8be9cdf118823b8632821" displayName:YMLocalizedString(@"AppDelegate_ThirdConfig0")];
 		[platformsRegister setupLineAuthType:SSDKAuthorizeTypeBoth];
 	}];
-
     NSString *isUpload = [[NSUserDefaults standardUserDefaults]valueForKey:@"kMobLinkUploadPrivacy"];
     if (isUpload == nil){
-        [MobSDK uploadPrivacyPermissionStatus:YES onResult:nil];
+        [MobSDK uploadPrivacyPermissionStatus:YES onResult:^(BOOL success) {
+            
+        }];
         [[NSUserDefaults standardUserDefaults] setValue:@"YES" forKey:@"kMobLinkUploadPrivacy"];
         [[NSUserDefaults standardUserDefaults] synchronize];
     }
@@ -161,24 +172,22 @@ UIKIT_EXTERN NSString * adImageName;
 
 #pragma mark - 表情
 - (void)initEmojiData {
-    dispatch_async(dispatch_get_global_queue(0, 0), ^{
-        NSArray * dicArray = [NSArray arrayWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"emoji" ofType:@"plist"]];
-        NSDictionary * dic = [dicArray firstObject];
-        NSArray * emojiArray = dic[@"data"];
-        NSMutableArray * array = [NSMutableArray array];
-        for (int i = 0; i < emojiArray.count; i++) {
-            NSDictionary * dic = [emojiArray objectAtIndex:i];
-            UIImage * image = [UIImage imageNamed:dic[@"file"]];
-            QEmotion * info = [[QEmotion alloc] init];
-            info.identifier = dic[@"id"];
-            info.image = image;
-            info.displayName = dic[@"tag"];
-            [array addObject:info];
-        }
-        //在这里强烈建议先预加载一下表情
-        QEmotionHelper *faceManager = [QEmotionHelper sharedEmotionHelper];
-        faceManager.emotionArray = array;
-    });
+	NSArray * dicArray = [NSArray arrayWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"emoji" ofType:@"plist"]];
+	NSDictionary * dic = [dicArray firstObject];
+	NSArray * emojiArray = dic[@"data"];
+	NSMutableArray * array = [NSMutableArray array];
+	for (int i = 0; i < emojiArray.count; i++) {
+		NSDictionary * dic = [emojiArray objectAtIndex:i];
+		UIImage * image = [UIImage imageNamed:dic[@"file"]];
+		QEmotion * info = [[QEmotion alloc] init];
+		info.identifier = dic[@"id"];
+		info.image = image;
+		info.displayName = dic[@"tag"];
+		[array addObject:info];
+	}
+	//在这里强烈建议先预加载一下表情
+	QEmotionHelper *faceManager = [QEmotionHelper sharedEmotionHelper];
+	faceManager.emotionArray = array;
 }
 
 #pragma mark - 广告
@@ -189,21 +198,22 @@ UIKIT_EXTERN NSString * adImageName;
 - (void)setupLaunchADView {
 	NSUserDefaults * kUserDefaults =  NSUserDefaults.standardUserDefaults;
 	// 判断沙盒中是否存在广告图片，如果存在，直接显示
-    NSString *adName = [kUserDefaults stringForKey:adImageName];
-	NSString *filePath = [XPAdImageTool.shareImageTool getFilePathWithImageName:adName];
+	NSString *filePath = [XPAdImageTool.shareImageTool getFilePathWithImageName:[kUserDefaults valueForKey:adImageName]];
 	BOOL isExist = [XPAdImageTool.shareImageTool isFileExistWithFilePath:filePath];
+	NSUserDefaults *userDefault = [NSUserDefaults standardUserDefaults];
 
-	if ([kUserDefaults integerForKey:@"adShow"]) {
-		[kUserDefaults setInteger:[kUserDefaults integerForKey:@"adShow"]+1
-                           forKey:@"adShow"];
+	if ([userDefault integerForKey:@"adShow"]) {
+		[userDefault setInteger:[userDefault integerForKey:@"adShow"]+1 forKey:@"adShow"];
 	} else {
-		[kUserDefaults setInteger:1 forKey:@"adShow"];
+		[userDefault setInteger:1 forKey:@"adShow"];
 	}
 
 	if (isExist) {// 图片存在
-		if ([kUserDefaults integerForKey:@"adShow"] > 4) {
+
+		if ([userDefault integerForKey:@"adShow"] > 4) {
 			@kWeakify(self);
-			AdvertiseModel *info = [XPAdImageTool.shareImageTool getAdInfoFromCacheInMainWith:adName];
+			NSString *imageName = [kUserDefaults valueForKey:adImageName];
+			AdvertiseModel *info = [XPAdImageTool.shareImageTool getAdInfoFromCacheInMainWith:imageName];
 			XPAdvertiseView *advertiseView = [[XPAdvertiseView alloc] initWithFrame:self.window.bounds];
 			advertiseView.filePath = filePath;
 			advertiseView.dismissHandler = ^(BOOL shouldJump) {
@@ -212,8 +222,9 @@ UIKIT_EXTERN NSString * adImageName;
 					return;
 				}
                 dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-                    [self advertiseJumpHandleWithInfo:info];
-                });
+                    [self performSelectorOnMainThread:@selector(advertiseJumpHandleWithInfo:) withObject:info waitUntilDone:NO];
+                   });
+				
 			};
 			[advertiseView show];
 		}

YuMi/Appdelegate/AppDelegate.m

@@ -5,16 +5,15 @@
 //  Created by admin on 2023/3/9.
 //
 
-
-#import "AppDelegate.h"
-#import <UMCommon/UMCommon.h>
 #import <MobLinkPro/MobLink.h>
 #import <MobLinkPro/MLSDKScene.h>
-#import <FBSDKCoreKit/FBSDKCoreKit.h>
+#import "AppDelegate.h"
 #import "TabbarViewController.h"
 #import "BaseNavigationController.h"
 #import "AppDelegate+ThirdConfig.h"
 #import <NIMSDK/NIMSDK.h>
+#import <UMCommon/UMCommon.h>
+#import <FBSDKCoreKit/FBSDKCoreKit.h>
 #import <AppTrackingTransparency/AppTrackingTransparency.h>
 #import "ClientConfig.h"
 #import <GoogleSignIn/GoogleSignIn.h>
@@ -35,77 +34,62 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification;
 @implementation AppDelegate
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
-
-	///初始化一些 sdk配置
-    [self initThirdConfig];
-    [self initUM:application launchOptions:launchOptions];
-
+   
+   
     self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
-    [self.window makeKeyAndVisible];
-
-    [self loadMainPage];
-    [self setupLaunchADView];
-
-    return YES;
-}
-
-- (void)initUM:(UIApplication *)application
- launchOptions:(NSDictionary *)launchOptions {
-    // 只有同意过了隐私协议 才初始化
-    if ([[NSUserDefaults standardUserDefaults] objectForKey:@"kYouMinumbernnagna"]) {
-        ///初始化友盟
-        [UMConfigure initWithAppkey:@"6434c6dfd64e686139618269" 
-                            channel:@"appstore"];
+   
+    AccountModel *accountModel = [[AccountInfoStorage instance] getCurrentAccountInfo];
+    if (accountModel == nil || accountModel.uid == nil || accountModel.access_token == nil) {
+        XPLoginViewController *lvc = [[XPLoginViewController alloc] init];
+        BaseNavigationController * nav = [[BaseNavigationController alloc] initWithRootViewController:lvc];
+        nav.modalPresentationStyle = UIModalPresentationFullScreen;
+        self.window.rootViewController = nav;
+    }else{
+        TabbarViewController *vc = [[TabbarViewController alloc] init];
+        BaseNavigationController *bnc = [[BaseNavigationController alloc] initWithRootViewController:vc];
+        self.window.rootViewController = bnc;
     }
+    
+    [self.window makeKeyAndVisible];
+	///设置广告页
+	[self setupLaunchADView];
+	///初始化一些 sdk配置
+	[self initThirdConfig];
+	// 只有同意过了隐私协议 才初始化
+	if ([[NSUserDefaults standardUserDefaults] objectForKey:@"kYouMinumbernnagna"]) {
+		///初始化友盟
+		[UMConfigure initWithAppkey:@"6434c6dfd64e686139618269" channel:@"appstore"];
+	}
     [[FBSDKApplicationDelegate sharedInstance] application:application didFinishLaunchingWithOptions:launchOptions];
     [FIRApp configure];
     [MobLink setDelegate:self];
+   
+   
+    return YES;
 }
 
-- (void)loadMainPage {
-    AccountModel *accountModel = [[AccountInfoStorage instance] getCurrentAccountInfo];
-    if (accountModel == nil || 
-        accountModel.uid == nil ||
-        accountModel.access_token == nil) {
-        [self toLoginPage];
-    }else{
-        [self toHomeTabbarPage];
-    }
-}
-
-- (void)toLoginPage {
-    XPLoginViewController *lvc = [[XPLoginViewController alloc] init];
-    BaseNavigationController * navigationController = [[BaseNavigationController alloc] initWithRootViewController:lvc];
-    navigationController.modalPresentationStyle = UIModalPresentationFullScreen;
-    self.window.rootViewController = navigationController;
-}
-
-- (void)toHomeTabbarPage {
-    TabbarViewController *vc = [[TabbarViewController alloc] init];
-    BaseNavigationController *navigationController = [[BaseNavigationController alloc] initWithRootViewController:vc];
-    self.window.rootViewController = navigationController;
-}
-
-- (void)IMLSDKWillRestoreScene:(MLSDKScene *)scene
-                       Restore:(void (^)(BOOL, RestoreStyle))restoreHandler {
+- (void) IMLSDKWillRestoreScene:(MLSDKScene *)scene Restore:(void (^)(BOOL, RestoreStyle))restoreHandler
+{
     NSString *inviteCode = scene.params[@"inviteCode"];
     if (inviteCode != nil && [[AccountInfoStorage instance]getUid].length == 0){
         ClientConfig *config = [ClientConfig shareConfig];
         config.inviteCode = inviteCode;
     }
+
     restoreHandler(YES, MLDefault);
+
 }
 
+
+
 - (void)applicationDidEnterBackground:(UIApplication *)application {
     NSInteger count = [NIMSDK sharedSDK].conversationManager.allUnreadCount;
     [[UIApplication sharedApplication] setApplicationIconBadgeNumber:count];
 }
-
 - (void)applicationDidBecomeActive:(UIApplication *)application {
     [self getAdvertisingTrackingAuthority];
     [[NSNotificationCenter defaultCenter]postNotificationName:@"kAppDidBecomeActive" object:nil];
 }
-
 - (void)getAdvertisingTrackingAuthority {
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
         if (@available(iOS 14, *)) {
@@ -162,14 +146,17 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification;
             config.pushChatId = userId;
         }
        });
+   
+   
+    
 }
 
 ///URL Scheme跳转
 -(BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary<NSString *,id> *)options{
     NSString *bundleID = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleIdentifier"];
     if ([url.scheme isEqualToString:[NSString stringWithFormat:@"line3rdp.%@",bundleID]]) {
-        return [PILineLoginManager applicationOpenurl:app open:url];
-    }
+            return [PILineLoginManager applicationOpenurl:app open:url];
+        }
     
     NSString *text = [url query];
     if(text.length){
@@ -215,6 +202,8 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification;
     }
    
     return [GIDSignIn.sharedInstance handleURL:url];
+    
+    
 }
 
 

YuMi/Assets.xcassets/Language/ar/room_across_pk_result_top_win_ar.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "room_across_pk_result_top_win_ar@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "room_across_pk_result_top_win_ar@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

YuMi/Assets.xcassets/Language/ar/room_pk_panel_result_fail_ar.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "room_pk_panel_result_fail_ar@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "room_pk_panel_result_fail_ar@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

YuMi/Assets.xcassets/Language/en/room_across_pk_result_top_draw_en.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "room_across_pk_result_top_draw_en@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "room_across_pk_result_top_draw_en@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

YuMi/Assets.xcassets/Language/en/room_across_pk_result_top_fail_en.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "room_across_pk_result_top_fail_en@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "room_across_pk_result_top_fail_en@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

YuMi/Assets.xcassets/Language/en/room_across_pk_result_top_win_en.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "room_across_pk_result_top_win_en@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "room_across_pk_result_top_win_en@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

YuMi/Assets.xcassets/Language/en/room_pk_panel_result_draw_en.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "room_pk_panel_result_draw_en@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "room_pk_panel_result_draw_en@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

YuMi/Assets.xcassets/Language/en/room_pk_panel_result_fail_en.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "room_pk_panel_result_fail_en@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "room_pk_panel_result_fail_en@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

YuMi/Assets.xcassets/Language/en/room_pk_panel_result_win_en.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "room_pk_panel_result_win_en@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "room_pk_panel_result_win_en@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

YuMi/Assets.xcassets/RoomGame/ms_room_game_underwa_coin_bg.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "room_pk_panel_result_draw_ar@2x.png",
+      "filename" : "ms_room_game_underwa_coin_bg@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "room_pk_panel_result_draw_ar@3x.png",
+      "filename" : "ms_room_game_underwa_coin_bg@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

YuMi/Assets.xcassets/RoomGame/ms_room_game_victory_border_first 1.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "ms_room_game_victory_border_first@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "ms_room_game_victory_border_first@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

YuMi/Assets.xcassets/chat/ms_room_game_button.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "ms_room_game_button@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "ms_room_game_button@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

YuMi/Assets.xcassets/chat/ms_room_game_switch_button.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "ms_room_game_switch_button@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "ms_room_game_switch_button@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

YuMi/Assets.xcassets/chat/ms_room_message_chat_hall_head_bg.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "ms_room_message_chat_hall_head_bg@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "ms_room_message_chat_hall_head_bg@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

YuMi/Assets.xcassets/jm/IncomeRecord/exchange_diamonds_arrow.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "pk_top_momey_mark_ar@2x.png",
+      "filename" : "exchange_diamonds_arrow@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "pk_top_momey_mark_ar@3x.png",
+      "filename" : "exchange_diamonds_arrow@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

YuMi/Assets.xcassets/jm/IncomeRecord/exchange_new_diamonds_icon.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "exchange_diamonds_icon@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "exchange_diamonds_icon@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

YuMi/Assets.xcassets/jm/IncomeRecord/ms_exchange_coin_icon.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "ms_exchange_coin_icon@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "ms_exchange_coin_icon@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

YuMi/Assets.xcassets/jm/IncomeRecord/ms_exchange_diamonds_coin_bg.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "ms_exchange_diamonds_coin_bg@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "ms_exchange_diamonds_coin_bg@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

YuMi/Assets.xcassets/jm/IncomeRecord/ms_exchange_diamonds_diamonds_bg.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "ms_exchange_diamonds_diamonds_bg@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "ms_exchange_diamonds_diamonds_bg@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

YuMi/Assets.xcassets/jm/IncomeRecord/ms_income_record_coin.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "ms_income_record_coin@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "ms_income_record_coin@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

YuMi/Assets.xcassets/jm/IncomeRecord/ms_income_recorddiamond.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "ms_income_recorddiamond@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "ms_income_recorddiamond@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

YuMi/Assets.xcassets/jm/IncomeRecord/ms_mine_coin_bg.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "ms_mine_coin_bg@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "ms_mine_coin_bg@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

YuMi/Assets.xcassets/jm/IncomeRecord/ms_mine_diamond_bg.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "ms_mine_diamond_bg@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "ms_mine_diamond_bg@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}