2.4.0版本发版此commit置顶

修复bug
2023-12-11 16:14:02 +08:00 · 2023-12-11 16:11:56 +08:00 · 2023-12-08 10:34:47 +08:00 · 2023-12-07 19:44:52 +08:00 · 2023-12-07 15:44:03 +08:00 · 2023-12-06 17:40:56 +08:00
386 changed files with 8644 additions and 1848 deletions
--- a/2
+++ b/2
@@ -39,7 +39,7 @@ target 'YuMi' do
  pod 'IQKeyboardManager'
  pod 'TZImagePickerController'
  #TRTC
-  pod 'TXLiteAVSDK_TRTC', '~> 11.4.14445'
+  pod 'TXLiteAVSDK_TRTC', '~> 11.4.14530'
  #vap礼物动画
  pod 'QGVAPlayer'
  #上传音乐
--- a/YuMi.xcodeproj/project.pbxproj
+++ b/YuMi.xcodeproj/project.pbxproj
@@ -206,6 +206,9 @@
 		234489082AC3C5DA0070E5D5 /* SudMGP.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 234489072AC3C5DA0070E5D5 /* SudMGP.framework */; };
 		234489092AC3C5FF0070E5D5 /* SudMGP.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 234489072AC3C5DA0070E5D5 /* SudMGP.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		234D821E2AEC57CF0022EFEB /* YYTextAsyncLayer+PITextAsyncLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 234D821D2AEC57CF0022EFEB /* YYTextAsyncLayer+PITextAsyncLayer.m */; };
+		235A451A2B04A352009753F5 /* PIRoomActivityWebView.m in Sources */ = {isa = PBXBuildFile; fileRef = 235A45192B04A352009753F5 /* PIRoomActivityWebView.m */; };
+		235A451D2B04A452009753F5 /* PIRoomActivityWebCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 235A451C2B04A452009753F5 /* PIRoomActivityWebCell.m */; };
+		235A45232B04BEB6009753F5 /* PIBaseModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 235A45222B04BEB6009753F5 /* PIBaseModel.m */; };
 		236896A02AE6720600EED5F2 /* PIRoomGiftBroadcastWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 2368969F2AE6720600EED5F2 /* PIRoomGiftBroadcastWindow.m */; };
 		2369F9912A89CE0E00563B48 /* PIUserSexView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2369F9902A89CE0E00563B48 /* PIUserSexView.m */; };
 		2369F9932A8B21EB00563B48 /* pi_treasure_fairy_gift_bg.svga in Resources */ = {isa = PBXBuildFile; fileRef = 2369F9922A8B21EA00563B48 /* pi_treasure_fairy_gift_bg.svga */; };
@@ -297,12 +300,43 @@
 		239141C92AE1358F00322CA9 /* PIInputEntireServerScrollingView.m in Sources */ = {isa = PBXBuildFile; fileRef = 239141C82AE1358F00322CA9 /* PIInputEntireServerScrollingView.m */; };
 		239141CC2AE267EF00322CA9 /* PIReceiveRedPacketSuccessView.m in Sources */ = {isa = PBXBuildFile; fileRef = 239141CB2AE267EF00322CA9 /* PIReceiveRedPacketSuccessView.m */; };
 		23942E912A86424500D0ECC2 /* XPLoginAuthCodeVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 23942E902A86424500D0ECC2 /* XPLoginAuthCodeVC.m */; };
+		2396FCE42B22BE5D0014021D /* pi_area_info.json in Resources */ = {isa = PBXBuildFile; fileRef = 2396FCE32B22BE5D0014021D /* pi_area_info.json */; };
 		239BEEDB2AA1E058005CDA94 /* PIHoemCategoryTitleView.m in Sources */ = {isa = PBXBuildFile; fileRef = 239BEEDA2AA1E058005CDA94 /* PIHoemCategoryTitleView.m */; };
 		23A439742AA1CF7C002E6039 /* XPNewHomeHeadView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23A439732AA1CF7C002E6039 /* XPNewHomeHeadView.m */; };
 		23B2AEC12A64E9C200543D17 /* LoginForgetEditView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23B2AEC02A64E9C200543D17 /* LoginForgetEditView.m */; };
 		23B2AEC42A6516C200543D17 /* LoginForgetPasswordViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 23B2AEC22A6516C200543D17 /* LoginForgetPasswordViewController.m */; };
 		23BA165B2A5D2ACF0030C5A3 /* PIBaseAnimationViewModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 23BA165A2A5D2ACF0030C5A3 /* PIBaseAnimationViewModel.m */; };
 		23C7C0B72A7CD7B000802205 /* XPNewMineGuildItemView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23C7C0B62A7CD7B000802205 /* XPNewMineGuildItemView.m */; };
+		23CEFB6C2AFB803B00576D89 /* PISwitchingEnvironmentVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 23CEFB6B2AFB803B00576D89 /* PISwitchingEnvironmentVC.m */; };
+		23CEFC4A2AFB8FC100576D89 /* BSNSStringUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 23CEFC0C2AFB8FC100576D89 /* BSNSStringUtil.m */; };
+		23CEFC4B2AFB8FC100576D89 /* BSUIDemoUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 23CEFC0D2AFB8FC100576D89 /* BSUIDemoUtil.m */; };
+		23CEFC4C2AFB8FC100576D89 /* BS_UIColor.m in Sources */ = {isa = PBXBuildFile; fileRef = 23CEFC0F2AFB8FC100576D89 /* BS_UIColor.m */; };
+		23CEFC4D2AFB8FC100576D89 /* BSXWDateUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 23CEFC102AFB8FC100576D89 /* BSXWDateUtil.m */; };
+		23CEFC4E2AFB8FC100576D89 /* BSNSDictionary.m in Sources */ = {isa = PBXBuildFile; fileRef = 23CEFC132AFB8FC100576D89 /* BSNSDictionary.m */; };
+		23CEFC4F2AFB8FC100576D89 /* BSSDLayoutUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 23CEFC172AFB8FC100576D89 /* BSSDLayoutUtil.m */; };
+		23CEFC502AFB8FC100576D89 /* UILabel+YBAttributeTextTapAction.m in Sources */ = {isa = PBXBuildFile; fileRef = 23CEFC1D2AFB8FC100576D89 /* UILabel+YBAttributeTextTapAction.m */; };
+		23CEFC512AFB8FC100576D89 /* SystemUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 23CEFC1E2AFB8FC100576D89 /* SystemUtil.m */; };
+		23CEFC522AFB8FC100576D89 /* BSFileOptionModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 23CEFC222AFB8FC100576D89 /* BSFileOptionModel.m */; };
+		23CEFC532AFB8FC100576D89 /* readMe_FileOption.txt in Resources */ = {isa = PBXBuildFile; fileRef = 23CEFC232AFB8FC100576D89 /* readMe_FileOption.txt */; };
+		23CEFC542AFB8FC100576D89 /* BSNotification.m in Sources */ = {isa = PBXBuildFile; fileRef = 23CEFC262AFB8FC100576D89 /* BSNotification.m */; };
+		23CEFC552AFB8FC100576D89 /* pay_off@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 23CEFC292AFB8FC100576D89 /* pay_off@3x.png */; };
+		23CEFC562AFB8FC100576D89 /* pay_off.png in Resources */ = {isa = PBXBuildFile; fileRef = 23CEFC2A2AFB8FC100576D89 /* pay_off.png */; };
+		23CEFC572AFB8FC100576D89 /* pay_off@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 23CEFC2B2AFB8FC100576D89 /* pay_off@2x.png */; };
+		23CEFC582AFB8FC100576D89 /* pay_on@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 23CEFC2C2AFB8FC100576D89 /* pay_on@3x.png */; };
+		23CEFC592AFB8FC100576D89 /* pay_on@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 23CEFC2E2AFB8FC100576D89 /* pay_on@2x.png */; };
+		23CEFC5A2AFB8FC100576D89 /* pay_on.png in Resources */ = {isa = PBXBuildFile; fileRef = 23CEFC2F2AFB8FC100576D89 /* pay_on.png */; };
+		23CEFC5B2AFB8FC100576D89 /* BSSelectView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23CEFC302AFB8FC100576D89 /* BSSelectView.m */; };
+		23CEFC5C2AFB8FC100576D89 /* BSNetListenModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 23CEFC312AFB8FC100576D89 /* BSNetListenModel.m */; };
+		23CEFC5D2AFB8FC100576D89 /* BSRecordModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 23CEFC342AFB8FC100576D89 /* BSRecordModel.m */; };
+		23CEFC5E2AFB8FC100576D89 /* BSRealTimeView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23CEFC372AFB8FC100576D89 /* BSRealTimeView.m */; };
+		23CEFC5F2AFB8FC100576D89 /* BSLogTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 23CEFC392AFB8FC100576D89 /* BSLogTableViewController.m */; };
+		23CEFC602AFB8FC100576D89 /* RealViewCellModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 23CEFC3D2AFB8FC100576D89 /* RealViewCellModel.m */; };
+		23CEFC612AFB8FC100576D89 /* RealViewNetWorkCell_0.m in Sources */ = {isa = PBXBuildFile; fileRef = 23CEFC402AFB8FC100576D89 /* RealViewNetWorkCell_0.m */; };
+		23CEFC622AFB8FC100576D89 /* BSLogNetDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 23CEFC422AFB8FC100576D89 /* BSLogNetDetailViewController.m */; };
+		23CEFC632AFB8FC100576D89 /* BSRealTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23CEFC442AFB8FC100576D89 /* BSRealTextView.m */; };
+		23CEFC642AFB8FC100576D89 /* BSkObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 23CEFC472AFB8FC100576D89 /* BSkObject.m */; };
+		23CEFC652AFB8FC100576D89 /* BSDrawLine.m in Sources */ = {isa = PBXBuildFile; fileRef = 23CEFC482AFB8FC100576D89 /* BSDrawLine.m */; };
+		23CEFC682AFCCE7700576D89 /* PIGiftInfoSegmentedView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23CEFC672AFCCE7700576D89 /* PIGiftInfoSegmentedView.m */; };
 		23D321D22ADD0EBC006B259C /* PIRoomPhotoAlbumItemPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 23D321D12ADD0EBC006B259C /* PIRoomPhotoAlbumItemPresenter.m */; };
 		23D321D52ADD0F05006B259C /* Api+PhotoAlbum.m in Sources */ = {isa = PBXBuildFile; fileRef = 23D321D42ADD0F05006B259C /* Api+PhotoAlbum.m */; };
 		23D321D92ADD1B46006B259C /* PIRoomPhotoAlbumItemModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 23D321D82ADD1B46006B259C /* PIRoomPhotoAlbumItemModel.m */; };
@@ -313,6 +347,7 @@
 		23D321E82ADFED10006B259C /* PIRoomSendRedPacketItemVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 23D321E72ADFED0F006B259C /* PIRoomSendRedPacketItemVC.m */; };
 		23D8DEF22AC5633300644637 /* PIIAPRegulate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 23D8DEF12AC5633300644637 /* PIIAPRegulate.swift */; };
 		23E45C052AC2B0A200D88BCA /* SessionDiscoverNewTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 23E45C042AC2B0A200D88BCA /* SessionDiscoverNewTableViewCell.m */; };
+		23E56B3C2B03564B00C8DAC9 /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 23E56B3B2B03564B00C8DAC9 /* CoreTelephony.framework */; };
 		23E9E9972A80C3A100B792F2 /* XPMineGuildPersonalBillRecordVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 23E9E9942A80C39F00B792F2 /* XPMineGuildPersonalBillRecordVC.m */; };
 		23E9E9982A80C3A100B792F2 /* XPMineGuildPersonalBillStatisVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 23E9E9962A80C3A100B792F2 /* XPMineGuildPersonalBillStatisVC.m */; };
 		23E9E99B2A80C40000B792F2 /* XPMineGuildPersonalBillRecordHeadView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23E9E9992A80C3FF00B792F2 /* XPMineGuildPersonalBillRecordHeadView.m */; };
@@ -1839,6 +1874,12 @@
 		234489072AC3C5DA0070E5D5 /* SudMGP.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = SudMGP.framework; sourceTree = "<group>"; };
 		234D821C2AEC57CF0022EFEB /* YYTextAsyncLayer+PITextAsyncLayer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "YYTextAsyncLayer+PITextAsyncLayer.h"; path = "YuMi/Appdelegate/YYTextAsyncLayer+PITextAsyncLayer.h"; sourceTree = SOURCE_ROOT; };
 		234D821D2AEC57CF0022EFEB /* YYTextAsyncLayer+PITextAsyncLayer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = "YYTextAsyncLayer+PITextAsyncLayer.m"; path = "YuMi/Appdelegate/YYTextAsyncLayer+PITextAsyncLayer.m"; sourceTree = SOURCE_ROOT; };
+		235A45182B04A352009753F5 /* PIRoomActivityWebView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIRoomActivityWebView.h; sourceTree = "<group>"; };
+		235A45192B04A352009753F5 /* PIRoomActivityWebView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIRoomActivityWebView.m; sourceTree = "<group>"; };
+		235A451B2B04A452009753F5 /* PIRoomActivityWebCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIRoomActivityWebCell.h; sourceTree = "<group>"; };
+		235A451C2B04A452009753F5 /* PIRoomActivityWebCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIRoomActivityWebCell.m; sourceTree = "<group>"; };
+		235A45212B04BEB6009753F5 /* PIBaseModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIBaseModel.h; sourceTree = "<group>"; };
+		235A45222B04BEB6009753F5 /* PIBaseModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIBaseModel.m; sourceTree = "<group>"; };
 		2368969E2AE6720600EED5F2 /* PIRoomGiftBroadcastWindow.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIRoomGiftBroadcastWindow.h; sourceTree = "<group>"; };
 		2368969F2AE6720600EED5F2 /* PIRoomGiftBroadcastWindow.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIRoomGiftBroadcastWindow.m; sourceTree = "<group>"; };
 		2369F98F2A89CE0E00563B48 /* PIUserSexView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIUserSexView.h; sourceTree = "<group>"; };
@@ -2023,6 +2064,7 @@
 		239141CB2AE267EF00322CA9 /* PIReceiveRedPacketSuccessView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIReceiveRedPacketSuccessView.m; sourceTree = "<group>"; };
 		23942E8F2A86424500D0ECC2 /* XPLoginAuthCodeVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPLoginAuthCodeVC.h; sourceTree = "<group>"; };
 		23942E902A86424500D0ECC2 /* XPLoginAuthCodeVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPLoginAuthCodeVC.m; sourceTree = "<group>"; };
+		2396FCE32B22BE5D0014021D /* pi_area_info.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = pi_area_info.json; sourceTree = "<group>"; };
 		239BEED92AA1E058005CDA94 /* PIHoemCategoryTitleView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIHoemCategoryTitleView.h; sourceTree = "<group>"; };
 		239BEEDA2AA1E058005CDA94 /* PIHoemCategoryTitleView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIHoemCategoryTitleView.m; sourceTree = "<group>"; };
 		23A439722AA1CF7C002E6039 /* XPNewHomeHeadView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPNewHomeHeadView.h; sourceTree = "<group>"; };
@@ -2035,6 +2077,60 @@
 		23BA165A2A5D2ACF0030C5A3 /* PIBaseAnimationViewModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIBaseAnimationViewModel.m; sourceTree = "<group>"; };
 		23C7C0B52A7CD7B000802205 /* XPNewMineGuildItemView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPNewMineGuildItemView.h; sourceTree = "<group>"; };
 		23C7C0B62A7CD7B000802205 /* XPNewMineGuildItemView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPNewMineGuildItemView.m; sourceTree = "<group>"; };
+		23CEFB6A2AFB803B00576D89 /* PISwitchingEnvironmentVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PISwitchingEnvironmentVC.h; sourceTree = "<group>"; };
+		23CEFB6B2AFB803B00576D89 /* PISwitchingEnvironmentVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PISwitchingEnvironmentVC.m; sourceTree = "<group>"; };
+		23CEFC0B2AFB8FC100576D89 /* BSXWDateUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BSXWDateUtil.h; sourceTree = "<group>"; };
+		23CEFC0C2AFB8FC100576D89 /* BSNSStringUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BSNSStringUtil.m; sourceTree = "<group>"; };
+		23CEFC0D2AFB8FC100576D89 /* BSUIDemoUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BSUIDemoUtil.m; sourceTree = "<group>"; };
+		23CEFC0E2AFB8FC100576D89 /* BSNSDictionary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BSNSDictionary.h; sourceTree = "<group>"; };
+		23CEFC0F2AFB8FC100576D89 /* BS_UIColor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BS_UIColor.m; sourceTree = "<group>"; };
+		23CEFC102AFB8FC100576D89 /* BSXWDateUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BSXWDateUtil.m; sourceTree = "<group>"; };
+		23CEFC112AFB8FC100576D89 /* BSUIDemoUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BSUIDemoUtil.h; sourceTree = "<group>"; };
+		23CEFC122AFB8FC100576D89 /* BSNSStringUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BSNSStringUtil.h; sourceTree = "<group>"; };
+		23CEFC132AFB8FC100576D89 /* BSNSDictionary.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BSNSDictionary.m; sourceTree = "<group>"; };
+		23CEFC142AFB8FC100576D89 /* BS_UIColor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BS_UIColor.h; sourceTree = "<group>"; };
+		23CEFC172AFB8FC100576D89 /* BSSDLayoutUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BSSDLayoutUtil.m; sourceTree = "<group>"; };
+		23CEFC182AFB8FC100576D89 /* BSSDLayoutUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BSSDLayoutUtil.h; sourceTree = "<group>"; };
+		23CEFC1A2AFB8FC100576D89 /* SystemUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SystemUtil.h; sourceTree = "<group>"; };
+		23CEFC1B2AFB8FC100576D89 /* UILabel+YBAttributeTextTapAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UILabel+YBAttributeTextTapAction.h"; sourceTree = "<group>"; };
+		23CEFC1C2AFB8FC100576D89 /* BS_Define.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BS_Define.h; sourceTree = "<group>"; };
+		23CEFC1D2AFB8FC100576D89 /* UILabel+YBAttributeTextTapAction.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UILabel+YBAttributeTextTapAction.m"; sourceTree = "<group>"; };
+		23CEFC1E2AFB8FC100576D89 /* SystemUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SystemUtil.m; sourceTree = "<group>"; };
+		23CEFC212AFB8FC100576D89 /* BSFileOptionModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BSFileOptionModel.h; sourceTree = "<group>"; };
+		23CEFC222AFB8FC100576D89 /* BSFileOptionModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BSFileOptionModel.m; sourceTree = "<group>"; };
+		23CEFC232AFB8FC100576D89 /* readMe_FileOption.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = readMe_FileOption.txt; sourceTree = "<group>"; };
+		23CEFC252AFB8FC100576D89 /* BSNotification.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BSNotification.h; sourceTree = "<group>"; };
+		23CEFC262AFB8FC100576D89 /* BSNotification.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BSNotification.m; sourceTree = "<group>"; };
+		23CEFC292AFB8FC100576D89 /* pay_off@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "pay_off@3x.png"; sourceTree = "<group>"; };
+		23CEFC2A2AFB8FC100576D89 /* pay_off.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = pay_off.png; sourceTree = "<group>"; };
+		23CEFC2B2AFB8FC100576D89 /* pay_off@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "pay_off@2x.png"; sourceTree = "<group>"; };
+		23CEFC2C2AFB8FC100576D89 /* pay_on@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "pay_on@3x.png"; sourceTree = "<group>"; };
+		23CEFC2D2AFB8FC100576D89 /* BSSelectView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BSSelectView.h; sourceTree = "<group>"; };
+		23CEFC2E2AFB8FC100576D89 /* pay_on@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "pay_on@2x.png"; sourceTree = "<group>"; };
+		23CEFC2F2AFB8FC100576D89 /* pay_on.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = pay_on.png; sourceTree = "<group>"; };
+		23CEFC302AFB8FC100576D89 /* BSSelectView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BSSelectView.m; sourceTree = "<group>"; };
+		23CEFC312AFB8FC100576D89 /* BSNetListenModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BSNetListenModel.m; sourceTree = "<group>"; };
+		23CEFC322AFB8FC100576D89 /* BSNetListenModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BSNetListenModel.h; sourceTree = "<group>"; };
+		23CEFC342AFB8FC100576D89 /* BSRecordModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BSRecordModel.m; sourceTree = "<group>"; };
+		23CEFC352AFB8FC100576D89 /* BSRecordModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BSRecordModel.h; sourceTree = "<group>"; };
+		23CEFC372AFB8FC100576D89 /* BSRealTimeView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BSRealTimeView.m; sourceTree = "<group>"; };
+		23CEFC382AFB8FC100576D89 /* BSRealTextView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BSRealTextView.h; sourceTree = "<group>"; };
+		23CEFC392AFB8FC100576D89 /* BSLogTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BSLogTableViewController.m; sourceTree = "<group>"; };
+		23CEFC3A2AFB8FC100576D89 /* BSLogNetDetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BSLogNetDetailViewController.h; sourceTree = "<group>"; };
+		23CEFC3C2AFB8FC100576D89 /* RealViewCellModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RealViewCellModel.h; sourceTree = "<group>"; };
+		23CEFC3D2AFB8FC100576D89 /* RealViewCellModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RealViewCellModel.m; sourceTree = "<group>"; };
+		23CEFC3F2AFB8FC100576D89 /* RealViewNetWorkCell_0.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RealViewNetWorkCell_0.h; sourceTree = "<group>"; };
+		23CEFC402AFB8FC100576D89 /* RealViewNetWorkCell_0.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RealViewNetWorkCell_0.m; sourceTree = "<group>"; };
+		23CEFC412AFB8FC100576D89 /* BSRealTimeView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BSRealTimeView.h; sourceTree = "<group>"; };
+		23CEFC422AFB8FC100576D89 /* BSLogNetDetailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BSLogNetDetailViewController.m; sourceTree = "<group>"; };
+		23CEFC432AFB8FC100576D89 /* BSLogTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BSLogTableViewController.h; sourceTree = "<group>"; };
+		23CEFC442AFB8FC100576D89 /* BSRealTextView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BSRealTextView.m; sourceTree = "<group>"; };
+		23CEFC462AFB8FC100576D89 /* BSDrawLine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BSDrawLine.h; sourceTree = "<group>"; };
+		23CEFC472AFB8FC100576D89 /* BSkObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BSkObject.m; sourceTree = "<group>"; };
+		23CEFC482AFB8FC100576D89 /* BSDrawLine.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BSDrawLine.m; sourceTree = "<group>"; };
+		23CEFC492AFB8FC100576D89 /* BSkObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BSkObject.h; sourceTree = "<group>"; };
+		23CEFC662AFCCE7700576D89 /* PIGiftInfoSegmentedView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIGiftInfoSegmentedView.h; sourceTree = "<group>"; };
+		23CEFC672AFCCE7700576D89 /* PIGiftInfoSegmentedView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIGiftInfoSegmentedView.m; sourceTree = "<group>"; };
 		23D321D02ADD0EBC006B259C /* PIRoomPhotoAlbumItemPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIRoomPhotoAlbumItemPresenter.h; sourceTree = "<group>"; };
 		23D321D12ADD0EBC006B259C /* PIRoomPhotoAlbumItemPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIRoomPhotoAlbumItemPresenter.m; sourceTree = "<group>"; };
 		23D321D32ADD0F05006B259C /* Api+PhotoAlbum.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Api+PhotoAlbum.h"; sourceTree = "<group>"; };
@@ -2055,6 +2151,7 @@
 		23D8DEF12AC5633300644637 /* PIIAPRegulate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PIIAPRegulate.swift; sourceTree = "<group>"; };
 		23E45C032AC2B0A200D88BCA /* SessionDiscoverNewTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SessionDiscoverNewTableViewCell.h; sourceTree = "<group>"; };
 		23E45C042AC2B0A200D88BCA /* SessionDiscoverNewTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SessionDiscoverNewTableViewCell.m; sourceTree = "<group>"; };
+		23E56B3B2B03564B00C8DAC9 /* CoreTelephony.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = System/Library/Frameworks/CoreTelephony.framework; sourceTree = SDKROOT; };
 		23E9E9932A80C39E00B792F2 /* XPMineGuildPersonalBillStatisVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineGuildPersonalBillStatisVC.h; sourceTree = "<group>"; };
 		23E9E9942A80C39F00B792F2 /* XPMineGuildPersonalBillRecordVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPMineGuildPersonalBillRecordVC.m; sourceTree = "<group>"; };
 		23E9E9952A80C3A000B792F2 /* XPMineGuildPersonalBillRecordVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMineGuildPersonalBillRecordVC.h; sourceTree = "<group>"; };
@@ -4115,6 +4212,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				23E56B3C2B03564B00C8DAC9 /* CoreTelephony.framework in Frameworks */,
 				234489082AC3C5DA0070E5D5 /* SudMGP.framework in Frameworks */,
 				73FFADDC93E195344047A2EC /* Pods_YuMi.framework in Frameworks */,
 				186A531926FC592100D67B2C /* libresolv.tbd in Frameworks */,
@@ -4497,6 +4595,7 @@
 				E84A2EAC2A52F20900D6AF8A /* Launch Screen.storyboard */,
 				23E9EB322A85E97B00B792F2 /* pi_login_new_logo.png */,
 				23E9EB302A85E5D100B792F2 /* pi_app_logo_new_bg.png */,
+				2396FCE32B22BE5D0014021D /* pi_area_info.json */,
 				189DD53D26DE255600AB55B1 /* Info.plist */,
 				E80E09AB2A40B70100CD2BE7 /* Localizable.strings */,
 				189DD53E26DE255600AB55B1 /* main.m */,
@@ -4549,6 +4648,8 @@
 				14D8767B29A7445C00E1DD7F /* NSObject+AutoCoding.m */,
 				187EEEDA26E89B32002833B2 /* BaseModel.h */,
 				187EEEDB26E89B32002833B2 /* BaseModel.m */,
+				235A45212B04BEB6009753F5 /* PIBaseModel.h */,
+				235A45222B04BEB6009753F5 /* PIBaseModel.m */,
 				187EEEDF26E89BFB002833B2 /* AccountModel.h */,
 				187EEEE026E89BFB002833B2 /* AccountModel.m */,
 				187EEEEF26E89FE8002833B2 /* AccountInfoStorage.h */,
@@ -4689,6 +4790,7 @@
 		189DD5A726DFA09700AB55B1 /* Tools */ = {
 			isa = PBXGroup;
 			children = (
+				23CEFC082AFB8FC100576D89 /* sdkContent */,
 				23FF255C2ABA8EEE0064E904 /* PIIAPTool */,
 				23E9EA9B2A84C42B00B792F2 /* SGYProgressView */,
 				23E9E9AB2A81E8E900B792F2 /* Event */,
@@ -5597,6 +5699,183 @@
 			path = Api;
 			sourceTree = "<group>";
 		};
+		23CEFC082AFB8FC100576D89 /* sdkContent */ = {
+			isa = PBXGroup;
+			children = (
+				23CEFC092AFB8FC100576D89 /* catagory */,
+				23CEFC1F2AFB8FC100576D89 /* content */,
+			);
+			path = sdkContent;
+			sourceTree = "<group>";
+		};
+		23CEFC092AFB8FC100576D89 /* catagory */ = {
+			isa = PBXGroup;
+			children = (
+				23CEFC0A2AFB8FC100576D89 /* Util */,
+				23CEFC152AFB8FC100576D89 /* 3Party */,
+				23CEFC192AFB8FC100576D89 /* system */,
+			);
+			path = catagory;
+			sourceTree = "<group>";
+		};
+		23CEFC0A2AFB8FC100576D89 /* Util */ = {
+			isa = PBXGroup;
+			children = (
+				23CEFC142AFB8FC100576D89 /* BS_UIColor.h */,
+				23CEFC0F2AFB8FC100576D89 /* BS_UIColor.m */,
+				23CEFC0E2AFB8FC100576D89 /* BSNSDictionary.h */,
+				23CEFC132AFB8FC100576D89 /* BSNSDictionary.m */,
+				23CEFC122AFB8FC100576D89 /* BSNSStringUtil.h */,
+				23CEFC0C2AFB8FC100576D89 /* BSNSStringUtil.m */,
+				23CEFC112AFB8FC100576D89 /* BSUIDemoUtil.h */,
+				23CEFC0D2AFB8FC100576D89 /* BSUIDemoUtil.m */,
+				23CEFC0B2AFB8FC100576D89 /* BSXWDateUtil.h */,
+				23CEFC102AFB8FC100576D89 /* BSXWDateUtil.m */,
+			);
+			path = Util;
+			sourceTree = "<group>";
+		};
+		23CEFC152AFB8FC100576D89 /* 3Party */ = {
+			isa = PBXGroup;
+			children = (
+				23CEFC162AFB8FC100576D89 /* fmdb */,
+			);
+			path = 3Party;
+			sourceTree = "<group>";
+		};
+		23CEFC162AFB8FC100576D89 /* fmdb */ = {
+			isa = PBXGroup;
+			children = (
+				23CEFC182AFB8FC100576D89 /* BSSDLayoutUtil.h */,
+				23CEFC172AFB8FC100576D89 /* BSSDLayoutUtil.m */,
+			);
+			path = fmdb;
+			sourceTree = "<group>";
+		};
+		23CEFC192AFB8FC100576D89 /* system */ = {
+			isa = PBXGroup;
+			children = (
+				23CEFC1C2AFB8FC100576D89 /* BS_Define.h */,
+				23CEFC1A2AFB8FC100576D89 /* SystemUtil.h */,
+				23CEFC1E2AFB8FC100576D89 /* SystemUtil.m */,
+				23CEFC1B2AFB8FC100576D89 /* UILabel+YBAttributeTextTapAction.h */,
+				23CEFC1D2AFB8FC100576D89 /* UILabel+YBAttributeTextTapAction.m */,
+			);
+			path = system;
+			sourceTree = "<group>";
+		};
+		23CEFC1F2AFB8FC100576D89 /* content */ = {
+			isa = PBXGroup;
+			children = (
+				23CEFC202AFB8FC100576D89 /* FileOption(文件操作) */,
+				23CEFC242AFB8FC100576D89 /* XWNotification(通知) */,
+				23CEFC272AFB8FC100576D89 /* NetListen(网络监听) */,
+				23CEFC452AFB8FC100576D89 /* K */,
+			);
+			path = content;
+			sourceTree = "<group>";
+		};
+		23CEFC202AFB8FC100576D89 /* FileOption(文件操作) */ = {
+			isa = PBXGroup;
+			children = (
+				23CEFC212AFB8FC100576D89 /* BSFileOptionModel.h */,
+				23CEFC222AFB8FC100576D89 /* BSFileOptionModel.m */,
+				23CEFC232AFB8FC100576D89 /* readMe_FileOption.txt */,
+			);
+			path = "FileOption(文件操作)";
+			sourceTree = "<group>";
+		};
+		23CEFC242AFB8FC100576D89 /* XWNotification(通知) */ = {
+			isa = PBXGroup;
+			children = (
+				23CEFC252AFB8FC100576D89 /* BSNotification.h */,
+				23CEFC262AFB8FC100576D89 /* BSNotification.m */,
+			);
+			path = "XWNotification(通知)";
+			sourceTree = "<group>";
+		};
+		23CEFC272AFB8FC100576D89 /* NetListen(网络监听) */ = {
+			isa = PBXGroup;
+			children = (
+				23CEFC282AFB8FC100576D89 /* component(组件) */,
+				23CEFC312AFB8FC100576D89 /* BSNetListenModel.m */,
+				23CEFC322AFB8FC100576D89 /* BSNetListenModel.h */,
+				23CEFC332AFB8FC100576D89 /* model */,
+				23CEFC362AFB8FC100576D89 /* RealTime(实时) */,
+			);
+			path = "NetListen(网络监听)";
+			sourceTree = "<group>";
+		};
+		23CEFC282AFB8FC100576D89 /* component(组件) */ = {
+			isa = PBXGroup;
+			children = (
+				23CEFC292AFB8FC100576D89 /* pay_off@3x.png */,
+				23CEFC2A2AFB8FC100576D89 /* pay_off.png */,
+				23CEFC2B2AFB8FC100576D89 /* pay_off@2x.png */,
+				23CEFC2C2AFB8FC100576D89 /* pay_on@3x.png */,
+				23CEFC2D2AFB8FC100576D89 /* BSSelectView.h */,
+				23CEFC2E2AFB8FC100576D89 /* pay_on@2x.png */,
+				23CEFC2F2AFB8FC100576D89 /* pay_on.png */,
+				23CEFC302AFB8FC100576D89 /* BSSelectView.m */,
+			);
+			path = "component(组件)";
+			sourceTree = "<group>";
+		};
+		23CEFC332AFB8FC100576D89 /* model */ = {
+			isa = PBXGroup;
+			children = (
+				23CEFC342AFB8FC100576D89 /* BSRecordModel.m */,
+				23CEFC352AFB8FC100576D89 /* BSRecordModel.h */,
+			);
+			path = model;
+			sourceTree = "<group>";
+		};
+		23CEFC362AFB8FC100576D89 /* RealTime(实时) */ = {
+			isa = PBXGroup;
+			children = (
+				23CEFC372AFB8FC100576D89 /* BSRealTimeView.m */,
+				23CEFC382AFB8FC100576D89 /* BSRealTextView.h */,
+				23CEFC392AFB8FC100576D89 /* BSLogTableViewController.m */,
+				23CEFC3A2AFB8FC100576D89 /* BSLogNetDetailViewController.h */,
+				23CEFC3B2AFB8FC100576D89 /* model */,
+				23CEFC3E2AFB8FC100576D89 /* view */,
+				23CEFC412AFB8FC100576D89 /* BSRealTimeView.h */,
+				23CEFC422AFB8FC100576D89 /* BSLogNetDetailViewController.m */,
+				23CEFC432AFB8FC100576D89 /* BSLogTableViewController.h */,
+				23CEFC442AFB8FC100576D89 /* BSRealTextView.m */,
+			);
+			path = "RealTime(实时)";
+			sourceTree = "<group>";
+		};
+		23CEFC3B2AFB8FC100576D89 /* model */ = {
+			isa = PBXGroup;
+			children = (
+				23CEFC3C2AFB8FC100576D89 /* RealViewCellModel.h */,
+				23CEFC3D2AFB8FC100576D89 /* RealViewCellModel.m */,
+			);
+			path = model;
+			sourceTree = "<group>";
+		};
+		23CEFC3E2AFB8FC100576D89 /* view */ = {
+			isa = PBXGroup;
+			children = (
+				23CEFC3F2AFB8FC100576D89 /* RealViewNetWorkCell_0.h */,
+				23CEFC402AFB8FC100576D89 /* RealViewNetWorkCell_0.m */,
+			);
+			path = view;
+			sourceTree = "<group>";
+		};
+		23CEFC452AFB8FC100576D89 /* K */ = {
+			isa = PBXGroup;
+			children = (
+				23CEFC462AFB8FC100576D89 /* BSDrawLine.h */,
+				23CEFC472AFB8FC100576D89 /* BSkObject.m */,
+				23CEFC482AFB8FC100576D89 /* BSDrawLine.m */,
+				23CEFC492AFB8FC100576D89 /* BSkObject.h */,
+			);
+			path = K;
+			sourceTree = "<group>";
+		};
 		23E9E9AB2A81E8E900B792F2 /* Event */ = {
 			isa = PBXGroup;
 			children = (
@@ -6287,6 +6566,7 @@
 		BFB922F5D81845AC32D1E1ED /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				23E56B3B2B03564B00C8DAC9 /* CoreTelephony.framework */,
 				E87888F32738C30E00BF1D57 /* StoreKit.framework */,
 				186A531826FC591100D67B2C /* libresolv.tbd */,
 				CACF623970097D653132D69A /* Pods_YuMi.framework */,
@@ -8463,6 +8743,8 @@
 				9B4E91FF28E57A620033419E /* XPGiftHeadTypeView.m */,
 				E8788940273A55AD00BF1D57 /* XPGiftUsersView.h */,
 				E8788941273A55AD00BF1D57 /* XPGiftUsersView.m */,
+				23CEFC662AFCCE7700576D89 /* PIGiftInfoSegmentedView.h */,
+				23CEFC672AFCCE7700576D89 /* PIGiftInfoSegmentedView.m */,
 				E8788943273A55C200BF1D57 /* XPGiftInfoView.h */,
 				E8788944273A55C200BF1D57 /* XPGiftInfoView.m */,
 				E8788946273A55D000BF1D57 /* XPGiftBarView.h */,
@@ -9427,6 +9709,10 @@
 				E8AE427227153A3500BEEBB2 /* XPRoomActivityContainerView.m */,
 				9BAC92EC28E6989400147DD8 /* XPRoomActivityPlayView.h */,
 				9BAC92ED28E6989400147DD8 /* XPRoomActivityPlayView.m */,
+				235A45182B04A352009753F5 /* PIRoomActivityWebView.h */,
+				235A45192B04A352009753F5 /* PIRoomActivityWebView.m */,
+				235A451B2B04A452009753F5 /* PIRoomActivityWebCell.h */,
+				235A451C2B04A452009753F5 /* PIRoomActivityWebCell.m */,
 			);
 			path = ActivityContainerView;
 			sourceTree = "<group>";
@@ -9939,6 +10225,8 @@
 				E8E70D7F26F2F39000F03460 /* SubViews */,
 				E8E70D7526F2F15100F03460 /* XPMineViewController.h */,
 				E8E70D7626F2F15100F03460 /* XPMineViewController.m */,
+				23CEFB6A2AFB803B00576D89 /* PISwitchingEnvironmentVC.h */,
+				23CEFB6B2AFB803B00576D89 /* PISwitchingEnvironmentVC.m */,
 				23E9EA932A84BE4800B792F2 /* XPGiftUserDataViewController.h */,
 				23E9EA922A84BE4800B792F2 /* XPGiftUserDataViewController.m */,
 				23E9EAA42A84C97C00B792F2 /* XPMineUserInfoTagVC.h */,
@@ -10277,6 +10565,7 @@
 				E80EC81F28ACD84000D133C5 /* emoji_45@2x.png in Resources */,
 				E80EC85A28ACD84000D133C5 /* emoji_14@2x.png in Resources */,
 				E80EC8B828ACD84100D133C5 /* emoji_85@2x.png in Resources */,
+				23CEFC5A2AFB8FC100576D89 /* pay_on.png in Resources */,
 				E80EC82828ACD84000D133C5 /* emoji_55@2x.png in Resources */,
 				E84A2EAD2A52F20900D6AF8A /* Launch Screen.storyboard in Resources */,
 				E8729EEF2A3B34D30076D80A /* images in Resources */,
@@ -10307,6 +10596,7 @@
 				E80EC8BF28ACDB2A00D133C5 /* Assets.xcassets in Resources */,
 				E80EC88028ACD84000D133C5 /* emoji_146@2x.png in Resources */,
 				E80EC82F28ACD84000D133C5 /* emoji_71@2x.png in Resources */,
+				23CEFC582AFB8FC100576D89 /* pay_on@3x.png in Resources */,
 				E80EC8A428ACD84100D133C5 /* emoji_31@2x.png in Resources */,
 				E80EC85028ACD84000D133C5 /* emoji_96@2x.png in Resources */,
 				E80EC85E28ACD84000D133C5 /* emoji_18@2x.png in Resources */,
@@ -10339,6 +10629,7 @@
 				E80EC81728ACD84000D133C5 /* emoji_134@2x.png in Resources */,
 				E8729EF02A3B34D30076D80A /* js in Resources */,
 				E80EC88328ACD84000D133C5 /* emoji_70@2x.png in Resources */,
+				23CEFC532AFB8FC100576D89 /* readMe_FileOption.txt in Resources */,
 				E80EC89528ACD84000D133C5 /* emoji_99@2x.png in Resources */,
 				E80EC89128ACD84000D133C5 /* emoji_133@2x.png in Resources */,
 				E80EC87F28ACD84000D133C5 /* emoji_137@2x.png in Resources */,
@@ -10384,6 +10675,7 @@
 				E80EC84A28ACD84000D133C5 /* emoji_94@2x.png in Resources */,
 				23FF255B2AB956D50064E904 /* pi_home_new_pk.svga in Resources */,
 				E80EC84F28ACD84000D133C5 /* emoji_151@2x.png in Resources */,
+				23CEFC592AFB8FC100576D89 /* pay_on@2x.png in Resources */,
 				E80EC88428ACD84000D133C5 /* emoji_01@2x.png in Resources */,
 				E80EC8B628ACD84100D133C5 /* emoji_107@2x.png in Resources */,
 				E80EC83B28ACD84000D133C5 /* emoji_163@2x.png in Resources */,
@@ -10427,6 +10719,7 @@
 				E80EC8A328ACD84100D133C5 /* emoji_52@2x.png in Resources */,
 				E80EC84E28ACD84000D133C5 /* emoji_132@2x.png in Resources */,
 				E8729EED2A3B34D30076D80A /* upload.html in Resources */,
+				23CEFC562AFB8FC100576D89 /* pay_off.png in Resources */,
 				E80EC82928ACD84000D133C5 /* emoji_28@2x.png in Resources */,
 				E80EC82028ACD84000D133C5 /* emoji_38@2x.png in Resources */,
 				23E9EB332A85E97C00B792F2 /* pi_login_new_logo.png in Resources */,
@@ -10446,6 +10739,7 @@
 				23E9EAA32A84C80300B792F2 /* pi_new_loading.svga in Resources */,
 				E80EC83628ACD84000D133C5 /* emoji_147@2x.png in Resources */,
 				23E9EB242A84E98300B792F2 /* pi_new_mine_info_sound_play.svga in Resources */,
+				23CEFC552AFB8FC100576D89 /* pay_off@3x.png in Resources */,
 				E80EC86B28ACD84000D133C5 /* emoji_200@2x.png in Resources */,
 				E80EC88F28ACD84000D133C5 /* emoji_121@2x.png in Resources */,
 				E80EC87C28ACD84000D133C5 /* emoji_162@2x.png in Resources */,
@@ -10456,7 +10750,9 @@
 				E80EC88228ACD84000D133C5 /* emoji_13@2x.png in Resources */,
 				E80EC82228ACD84000D133C5 /* emoji_34@2x.png in Resources */,
 				E80EC87628ACD84000D133C5 /* emoji_139@2x.png in Resources */,
+				23CEFC572AFB8FC100576D89 /* pay_off@2x.png in Resources */,
 				E80EC86328ACD84000D133C5 /* emoji_41@2x.png in Resources */,
+				2396FCE42B22BE5D0014021D /* pi_area_info.json in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -10549,6 +10845,7 @@
 				E88C72A02828FCD40047FB2B /* XPMusicLibraryPlayView.m in Sources */,
 				E823E38E290BE8BD00EADD86 /* WishGiftInfoUpdateModel.m in Sources */,
 				E80EC80A28ACD84000D133C5 /* QEmotionBoardView.m in Sources */,
+				235A451A2B04A352009753F5 /* PIRoomActivityWebView.m in Sources */,
 				E8998D962859DD6F00C68558 /* UIView+Corner.m in Sources */,
 				E8EEB91126FC6AE2007C6EBA /* XPMineUserInfoEditProtocol.h in Sources */,
 				E87E625D2A3F5622002F68C9 /* XPNewHomeViewController.m in Sources */,
@@ -10605,6 +10902,7 @@
 				E8E20BE2281695800033B688 /* XPMineLoginPasswordViewController.m in Sources */,
 				E84A2EA22A52883000D6AF8A /* XPIncomeRecordGoldDetailsTimeView.m in Sources */,
 				E86E79D628A4EA0C006DAF48 /* SessionRiskCache.m in Sources */,
+				23CEFC542AFB8FC100576D89 /* BSNotification.m in Sources */,
 				E824543826F5820A00BE8163 /* XPLoginVerifBindPhonePresenter.m in Sources */,
 				E8B846BF26FD827900A777FE /* XPMineUserInfoAlbumViewController.m in Sources */,
 				E84CBCE128436D3C00D43221 /* XPMineContactViewController.m in Sources */,
@@ -10716,6 +11014,7 @@
 				E8998D7A2859784200C68558 /* XPSVGAPlayer.m in Sources */,
 				9BD9A18427A0F128004186FE /* XPMineVisitorItemModel.m in Sources */,
 				E852D73E28631C18001465ED /* XPMonentsCommentTableViewCell.m in Sources */,
+				23CEFC4E2AFB8FC100576D89 /* BSNSDictionary.m in Sources */,
 				23FF426A2AA5DF050055733C /* XPNewHomePartyTagView.m in Sources */,
 				E85E7BA22A4EC99300B6D00A /* XPMineGiveDiamondSearchModel.m in Sources */,
 				1427219829A75F6F00C7C423 /* HTTPServer.m in Sources */,
@@ -10739,12 +11038,14 @@
 				E8BD0F8828A9E9E400DE050D /* RoomSailingPrizeModel.m in Sources */,
 				238B37B32AC55A2C00BFC9D5 /* XPTreasureFairyPrizeRecordCell.m in Sources */,
 				E8A1F79C290644DC0099C952 /* XPRoomMorePlayCollectionViewCell.m in Sources */,
+				23CEFC512AFB8FC100576D89 /* SystemUtil.m in Sources */,
 				E8659909273E800D00EE349D /* XPGiftCollectionViewFlowLayout.m in Sources */,
 				238B37BD2AC55A2C00BFC9D5 /* XPTreasureFairyTrialsContentView.m in Sources */,
 				E85E7B262A4EB0D300B6D00A /* XPMineGuildViewController.m in Sources */,
 				E85E7B672A4EC35A00B6D00A /* XPBindExtractInfoModel.m in Sources */,
 				E8B846CB26FDD7CD00A777FE /* XPMineRechargeViewController.m in Sources */,
 				E86596512701A1C000846EBD /* StatisticsService.m in Sources */,
+				23CEFC5E2AFB8FC100576D89 /* BSRealTimeView.m in Sources */,
 				E824544026F58F9400BE8163 /* XPMinePayPwdViewController.m in Sources */,
 				9BE01AED2893D0DF00B50299 /* XPDressShopSearchTableViewCell.m in Sources */,
 				23FF42732AA6CC480055733C /* PIHomeItemModel.m in Sources */,
@@ -10770,11 +11071,13 @@
 				E8AC723D26F4B6AA007D6E91 /* XPLoginBindPhoneResultViewController.m in Sources */,
 				E8AB632728AE13210023B0D2 /* XPMonentsTopicListPresenter.m in Sources */,
 				1427218729A75F6F00C7C423 /* MyHTTPConnection.m in Sources */,
+				23CEFB6C2AFB803B00576D89 /* PISwitchingEnvironmentVC.m in Sources */,
 				E8D55C9D28113218006935A5 /* MessageMenuModel.m in Sources */,
 				E87DF4EF2A42CB90009C1185 /* XPHomeCollectRoomTableViewCell.m in Sources */,
 				236B2E442AA07D06003967A8 /* UIColor+RW.m in Sources */,
 				189DD73E26E21C3F00AB55B1 /* YYUtility.m in Sources */,
 				14A6034F29A36D8300D2A6A5 /* XPSimpleMineHeaderView.m in Sources */,
+				23CEFC652AFB8FC100576D89 /* BSDrawLine.m in Sources */,
 				E81C1B2F277071670020D1E4 /* XPArrangeMicInfoModel.m in Sources */,
 				9B0086CA27BA4F570032BD2B /* AnchorMicroView.m in Sources */,
 				E83ABF00280EC45700322EE4 /* MessageContentApplicationShareView.m in Sources */,
@@ -10792,6 +11095,7 @@
 				E8A03DFF27635F960098D9EA /* XPRoomCandyGiftView.m in Sources */,
 				E8A3538E28FE5CED0014A784 /* Api+WishGift.m in Sources */,
 				180116F9279E8C4C00F2CBC0 /* PLTimeUtil.m in Sources */,
+				23CEFC502AFB8FC100576D89 /* UILabel+YBAttributeTextTapAction.m in Sources */,
 				E87E545429AA05EA00EBE52B /* XPFootPrintNavView.m in Sources */,
 				E8252FEE27687DF1002B3164 /* ActivityInfoModel.m in Sources */,
 				E84BF7D1277BFCDD00EF8877 /* RoomTagModel.m in Sources */,
@@ -10808,6 +11112,7 @@
 				9BA812E428BF70A600783EA7 /* XPRoomRedPacketPwdView.m in Sources */,
 				23E9EB1B2A84D28A00B792F2 /* XPMineUserInfoEditTagView.m in Sources */,
 				237B94BE2A984DA7007853E3 /* XPRoomTrumpetViewController.m in Sources */,
+				23CEFC5C2AFB8FC100576D89 /* BSNetListenModel.m in Sources */,
 				2331C1662A5EB71000E1D940 /* NobleCenterModel.m in Sources */,
 				E8998D8B2859CB6A00C68558 /* XPMineUserInfoGiftWallSubViewController.m in Sources */,
 				E8DEC9A42764A6600078CB70 /* XPMoreMenuPresenter.m in Sources */,
@@ -10858,6 +11163,7 @@
 				E8C1CD6627D88EF800376F83 /* XPRoomFaceViewController.m in Sources */,
 				E80DE4102775C34E00BE5BCB /* XPFirstRechargeSuccessView.m in Sources */,
 				E8412FB32779E285006E1101 /* Api+RoomSetting.m in Sources */,
+				23CEFC4A2AFB8FC100576D89 /* BSNSStringUtil.m in Sources */,
 				9B2F72D028E45A480000E4FA /* XPRoomQuickMessageContainView.m in Sources */,
 				23FF426D2AA5E4EE0055733C /* XPNewHomePartyAudioView.m in Sources */,
 				E81060E82987720F00B772F0 /* MessageUnSupportModel.m in Sources */,
@@ -10866,6 +11172,7 @@
 				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 */,
 				23FF25682ABC3BC00064E904 /* XPHomeGameCell.m in Sources */,
 				E8788950273A699900BF1D57 /* ThemeColor+SendGift.m in Sources */,
@@ -10998,6 +11305,7 @@
 				E85E7B472A4EB0D300B6D00A /* XPMineGuildManagerPerTableViewCell.m in Sources */,
 				E824544326F58FCE00BE8163 /* XPMinePayPwdInputView.m in Sources */,
 				23C7C0B72A7CD7B000802205 /* XPNewMineGuildItemView.m in Sources */,
+				23CEFC5D2AFB8FC100576D89 /* BSRecordModel.m in Sources */,
 				9B1B72A1280023F3003FACE9 /* XPMineAnchorFansTeamTableViewCell.m in Sources */,
 				1808073027315E8E001FD836 /* NetImageView.m in Sources */,
 				E880B3AC278BD98600A83B0D /* XPAcrossRoomPKEmptyTableViewCell.m in Sources */,
@@ -11074,6 +11382,7 @@
 				E8998D8028597B0300C68558 /* XPRoomLuckyBigPrizeView.m in Sources */,
 				E88E4A80297673DC00019A50 /* SessionNavLiveView.m in Sources */,
 				E81060DC298761F100B772F0 /* MessageTextModel.m in Sources */,
+				235A45232B04BEB6009753F5 /* PIBaseModel.m in Sources */,
 				E8DEC9A82764A68B0078CB70 /* Api+MoreMenu.m in Sources */,
 				9B86D87A2817DD8400494FCD /* XPRoomEnterHideTipView.m in Sources */,
 				E8AC721026F43955007D6E91 /* UIImageConstant.m in Sources */,
@@ -11113,6 +11422,7 @@
 				9B1B72BF2800422E003FACE9 /* XPAnchorPKRuleView.m in Sources */,
 				1427219729A75F6F00C7C423 /* DDRange.m in Sources */,
 				E85E7B6E2A4EC4AE00B6D00A /* XPMineGuildPresenter.m in Sources */,
+				23CEFC5B2AFB8FC100576D89 /* BSSelectView.m in Sources */,
 				E81125CA296E606F000D9804 /* QPhotoImageModel.m in Sources */,
 				9B42869528C1E00A009034D2 /* XPRedPacketResultModel.m in Sources */,
 				2331C16E2A5EB71000E1D940 /* XPNobleAuthorityDescView.m in Sources */,
@@ -11132,6 +11442,7 @@
 				18A61BE8274F9CF000A09A54 /* SessionListViewController.m in Sources */,
 				E8C1CD6A27D8937800376F83 /* XPRoomFaceCollectionViewCell.m in Sources */,
 				9B2EA7C02804037700ED17BF /* AnchorPKStageView.m in Sources */,
+				23CEFC622AFB8FC100576D89 /* BSLogNetDetailViewController.m in Sources */,
 				238B37CF2AC55A2C00BFC9D5 /* XPTreasureFairySendRecordView.m in Sources */,
 				238B37C52AC55A2C00BFC9D5 /* XPTreasureFairyMoreView.m in Sources */,
 				E811FFF72742367B00918544 /* XPGiftEmptyCollectionViewCell.m in Sources */,
@@ -11323,6 +11634,7 @@
 				E85E3FA728B7A6F000268DC8 /* MessageContentMonentsView.m in Sources */,
 				E880B3AF278BE1D800A83B0D /* Api+AcrossRoomPK.m in Sources */,
 				238B37DC2AC55A2C00BFC9D5 /* XPTreasureFairyBallView.m in Sources */,
+				23CEFC4B2AFB8FC100576D89 /* BSUIDemoUtil.m in Sources */,
 				E8B9842D28AB77F10022D026 /* XPMonentsPublishTopicView.m in Sources */,
 				239141C62AE129F700322CA9 /* PIInputScrollingView.m in Sources */,
 				E88C72992828F3620047FB2B /* XPRoomMusicLibraryTableViewCell.m in Sources */,
@@ -11388,7 +11700,9 @@
 				E8D34D5628080393009C4835 /* XPMineDataGiftCollectionViewCell.m in Sources */,
 				E84A2E9C2A52823900D6AF8A /* XPTextField.m in Sources */,
 				186A536926FC6F2E00D67B2C /* XPShareView.m in Sources */,
+				23CEFC602AFB8FC100576D89 /* RealViewCellModel.m in Sources */,
 				E8AB632C28AE19600023B0D2 /* XPMonentsMineViewController.m in Sources */,
+				23CEFC5F2AFB8FC100576D89 /* BSLogTableViewController.m in Sources */,
 				236B2E4D2AA07D06003967A8 /* XPRoomLittleGameContainerView.m in Sources */,
 				E87AE8C1284E184300CAFBB3 /* RoomNewUserGreetModel.m in Sources */,
 				9BC5C91C277C8A7B007C8719 /* XPReleaseRadioViewController.m in Sources */,
@@ -11412,6 +11726,7 @@
 				E818E34B286ECABF005EDF68 /* XPMonentsPublishPresenter.m in Sources */,
 				E85E7B462A4EB0D300B6D00A /* XPGuildEmptyCollectionViewCell.m in Sources */,
 				9B7B605B27BB53060070BB72 /* XPAnchorAudienceUpMicView.m in Sources */,
+				23CEFC522AFB8FC100576D89 /* BSFileOptionModel.m in Sources */,
 				238B37D02AC55A2C00BFC9D5 /* XPTreasureFairySummonGiftView.m in Sources */,
 				14DCAD0E299B6AD900A7DD31 /* XPForgetPwdViewController.m in Sources */,
 				23194DD12AD14BF000649F51 /* DDAbstractDatabaseLogger.m in Sources */,
@@ -11458,6 +11773,7 @@
 				23E9EA9E2A84C42B00B792F2 /* SGYProgressView.m in Sources */,
 				E87E91552796B6DE00A7B3F2 /* XPRoomInviteUserViewController.m in Sources */,
 				E880B3B5278C1FE400A83B0D /* XPAcrossRoomPKPresenter.m in Sources */,
+				23CEFC612AFB8FC100576D89 /* RealViewNetWorkCell_0.m in Sources */,
 				186A534626FC6ED900D67B2C /* TTPopup.m in Sources */,
 				9B4D449328F15765002572D5 /* XPGiftLuckyGiftBroadcastView.m in Sources */,
 				E81C278C26EAFAF60031E639 /* Base64.m in Sources */,
@@ -11466,6 +11782,7 @@
 				E85E7B4B2A4EB0D300B6D00A /* XPMineGuildManagerSetViewController.m in Sources */,
 				189DD73D26E21C3F00AB55B1 /* YYUtility+Device.m in Sources */,
 				187EEEDC26E89B32002833B2 /* BaseModel.m in Sources */,
+				23CEFC682AFCCE7700576D89 /* PIGiftInfoSegmentedView.m in Sources */,
 				E878B85E283640A500E22DCF /* MonentsUnReadModel.m in Sources */,
 				E81366FC26F0D2980076364C /* UIButton+EnlargeTouchArea.m in Sources */,
 				E85E7BA42A4EC99300B6D00A /* XPMineGiveDiamondCell.m in Sources */,
@@ -11496,6 +11813,7 @@
 				9BCE6144277D657600CC0358 /* XPReleaseRadioTableViewCell.m in Sources */,
 				186A534D26FC6ED900D67B2C /* TTActionSheetView.m in Sources */,
 				E81060E529876FF300B772F0 /* MessageAudioModel.m in Sources */,
+				23CEFC642AFB8FC100576D89 /* BSkObject.m in Sources */,
 				E83DB481274649FB00D8CBD1 /* XPGiftBannerUserInfoModel.m in Sources */,
 				9B3A1DF4280571000058E2DD /* XPAnchorPKInviteView.m in Sources */,
 				2331C1BD2A60F69E00E1D940 /* UILabel+Utils.m in Sources */,
@@ -11531,6 +11849,7 @@
 				9B41D36E282649230048C588 /* XPWeekStarRankUserModel.m in Sources */,
 				E824545926F5E65900BE8163 /* XPMineVerifIdentityView.m in Sources */,
 				E841ED61280FB0BD00904808 /* ContentLevelUpgradeModel.m in Sources */,
+				23CEFC632AFB8FC100576D89 /* BSRealTextView.m in Sources */,
 				238B37B92AC55A2C00BFC9D5 /* XPTreasureFairyTrialsRecordCell.m in Sources */,
 				236B2E542AA08757003967A8 /* LittleGameScrollStageView.m in Sources */,
 				189DD74026E21C3F00AB55B1 /* YYUtility+App.m in Sources */,
@@ -11551,6 +11870,7 @@
 				9B0997A327F19DE500EB8F14 /* QGHWDShaders.metal in Sources */,
 				E8778AF02988EF0600CF139B /* XPSessionSayHelloViewController.m in Sources */,
 				187EEEE126E89BFB002833B2 /* AccountModel.m in Sources */,
+				235A451D2B04A452009753F5 /* PIRoomActivityWebCell.m in Sources */,
 				E8098CA7282E00920090B9F0 /* Api+Monents.m in Sources */,
 				E896EFA92771AEEC00AD2CC1 /* XPMineAttentionTableViewCell.m in Sources */,
 				E8F1559328129EBA00EE8C06 /* ContentSecretaryModel.m in Sources */,
@@ -11618,6 +11938,7 @@
 				E85E7BB62A4ED59900B6D00A /* XPIncomeRecordGoldDetailsCell.m in Sources */,
 				9B7B606227BB96E40070BB72 /* XPRoomAnchorInfoCardView.m in Sources */,
 				E87DF4FE2A42CD7E009C1185 /* XPRoomSearchRecommendHeadView.m in Sources */,
+				23CEFC4D2AFB8FC100576D89 /* BSXWDateUtil.m in Sources */,
 				E85E7B442A4EB0D300B6D00A /* XPMineExchangeAuthorityCell.m in Sources */,
 				E80B0734280D740600A79F63 /* MessageContentGuildView.m in Sources */,
 				E8395334276A03C300CF2F24 /* XPMineDressUpPresenter.m in Sources */,
@@ -11690,6 +12011,7 @@
 				E81A654C28351D9900F55894 /* XPMonentsTopicCollectionViewCell.m in Sources */,
 				E85E7B9F2A4EC99300B6D00A /* XPMineGiveDiamondPresenter.m in Sources */,
 				14D8767C29A7445C00E1DD7F /* NSObject+AutoCoding.m in Sources */,
+				23CEFC4C2AFB8FC100576D89 /* BS_UIColor.m in Sources */,
 				E8412FA92779C2ED006E1101 /* XPRoomSettingItemModel.m in Sources */,
 				189DD58F26DF97E700AB55B1 /* LoginPresenter.m in Sources */,
 				E88863C9278EBA43004BCFAB /* XPAcrossRoomPKForceEndResultView.m in Sources */,
@@ -11879,7 +12201,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 20.20.1;
+				MARKETING_VERSION = 20.20.4;
 				PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -11914,7 +12236,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 20.20.1;
+				MARKETING_VERSION = 20.20.4;
 				PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
--- a/YuMi.xcodeproj/xcshareddata/xcschemes/YuMi.xcscheme
+++ b/YuMi.xcodeproj/xcshareddata/xcschemes/YuMi.xcscheme
@@ -31,7 +31,7 @@
      </Testables>
   </TestAction>
   <LaunchAction
-      buildConfiguration = "Release"
+      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
      launchStyle = "0"
--- a/YuMi/Assets.xcassets/jm/Guild/mine_give_diamond_search.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/jm/Guild/mine_give_diamond_search.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "mine_give_diamond_search@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "mine_give_diamond_search@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
--- a/YuMi/Assets.xcassets/jm/Guild/mine_give_diamond_search.imageset/mine_give_diamond_search@2x.png
+++ b/YuMi/Assets.xcassets/jm/Guild/mine_give_diamond_search.imageset/mine_give_diamond_search@2x.png
--- a/YuMi/Assets.xcassets/jm/Guild/mine_give_diamond_search.imageset/mine_give_diamond_search@3x.png
+++ b/YuMi/Assets.xcassets/jm/Guild/mine_give_diamond_search.imageset/mine_give_diamond_search@3x.png
--- a/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_frist_tap_bg.imageset/room_candy_tree_frist_tap_bg@2x.png
+++ b/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_frist_tap_bg.imageset/room_candy_tree_frist_tap_bg@2x.png
--- a/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_frist_tap_bg.imageset/room_candy_tree_frist_tap_bg@3x.png
+++ b/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_frist_tap_bg.imageset/room_candy_tree_frist_tap_bg@3x.png
--- a/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_hundredth_tap_bg.imageset/room_candy_tree_hundredth_tap_bg@2x.png
+++ b/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_hundredth_tap_bg.imageset/room_candy_tree_hundredth_tap_bg@2x.png
--- a/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_hundredth_tap_bg.imageset/room_candy_tree_hundredth_tap_bg@3x.png
+++ b/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_hundredth_tap_bg.imageset/room_candy_tree_hundredth_tap_bg@3x.png
--- a/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_ten_tap_bg.imageset/room_candy_tree_ten_tap_bg@2x.png
+++ b/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_ten_tap_bg.imageset/room_candy_tree_ten_tap_bg@2x.png
--- a/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_ten_tap_bg.imageset/room_candy_tree_ten_tap_bg@3x.png
+++ b/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_ten_tap_bg.imageset/room_candy_tree_ten_tap_bg@3x.png
--- a/YuMi/Assets.xcassets/yna/CandyTree/room_candy_two_hundredth_tap_bg.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/yna/CandyTree/room_candy_two_hundredth_tap_bg.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "room_candy_two_hundredth_tap_bg@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "room_candy_two_hundredth_tap_bg@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
--- a/YuMi/Assets.xcassets/yna/CandyTree/room_candy_two_hundredth_tap_bg.imageset/room_candy_two_hundredth_tap_bg@2x.png
+++ b/YuMi/Assets.xcassets/yna/CandyTree/room_candy_two_hundredth_tap_bg.imageset/room_candy_two_hundredth_tap_bg@2x.png
--- a/YuMi/Assets.xcassets/yna/CandyTree/room_candy_two_hundredth_tap_bg.imageset/room_candy_two_hundredth_tap_bg@3x.png
+++ b/YuMi/Assets.xcassets/yna/CandyTree/room_candy_two_hundredth_tap_bg.imageset/room_candy_two_hundredth_tap_bg@3x.png
--- a/YuMi/Config/ClientConfig.h
+++ b/YuMi/Config/ClientConfig.h
@@ -9,7 +9,7 @@
 #import "ClientDataModel.h"
 NS_ASSUME_NONNULL_BEGIN

-@interface ClientConfig : NSObject
+@interface ClientConfig : PIBaseModel
 + (instancetype)shareConfig;
 ///初始化
 - (void)clientInit;
--- a/YuMi/Config/ClientConfig.m
+++ b/YuMi/Config/ClientConfig.m
@@ -39,7 +39,7 @@
 - (void)clientInit {
 	
 #ifdef DEBUG
-            self.canOpen = YES;
+        self.canOpen = YES;
 #else
    if(isEnterprise == YES){
        self.canOpen = NO;
--- a/YuMi/Config/ClientDataModel.h
+++ b/YuMi/Config/ClientDataModel.h
@@ -16,7 +16,7 @@ typedef NS_ENUM(NSInteger, FaceLivenessStrategy) {
 	FaceLivenessStrategy_Guide = 2,
 };

-@interface ClientDataModel : NSObject
+@interface ClientDataModel : PIBaseModel
 ///首页tag 配置
@property (nonatomic,strong) NSArray<NSString *> *homeTabList;
 ///房间表情的数据
--- a/YuMi/Config/ClientRedPacketModel.h
+++ b/YuMi/Config/ClientRedPacketModel.h
@@ -11,7 +11,7 @@ NS_ASSUME_NONNULL_BEGIN

 //@class

-@interface ClientRedPacketModel : NSObject
+@interface ClientRedPacketModel : PIBaseModel

 ///红包开关
@property (nonatomic, assign) BOOL open;
--- a/YuMi/CustomUI/Adbvertise/AdvertiseModel.h
+++ b/YuMi/CustomUI/Adbvertise/AdvertiseModel.h
@@ -15,7 +15,7 @@ typedef NS_ENUM(NSInteger, SplashInfoSkipType) {
 	SplashInfoSkipTypeWeb = 3,
 };

-@interface AdvertiseModel : NSObject<NSCopying>
+@interface AdvertiseModel : PIBaseModel<NSCopying>
@property (nonatomic, strong) NSString *link;
@property (nonatomic, assign) SplashInfoSkipType type;// 1跳app页面，2跳聊天室，3跳h5页面
@property (nonatomic, copy)   NSString *pict;
--- a/YuMi/CustomUI/Adbvertise/XPAdImageTool.h
+++ b/YuMi/CustomUI/Adbvertise/XPAdImageTool.h
@@ -9,7 +9,7 @@
 #import "AdvertiseModel.h"
 NS_ASSUME_NONNULL_BEGIN

-@interface XPAdImageTool : NSObject
+@interface XPAdImageTool : PIBaseModel
 + (instancetype)shareImageTool;

 ///是否登录成功im
--- a/YuMi/CustomUI/InputView/InputView/QExtendBoardView.h
+++ b/YuMi/CustomUI/InputView/InputView/QExtendBoardView.h
@@ -9,7 +9,7 @@
 #import <UIKit/UIKit.h>


-@interface QExtendBoardItemModel : NSObject
+@interface QExtendBoardItemModel : PIBaseModel

 /**
 *  Cell图片
--- a/YuMi/CustomUI/InputView/InputView/QPhotoImageModel.h
+++ b/YuMi/CustomUI/InputView/InputView/QPhotoImageModel.h
@@ -9,7 +9,7 @@
 #import <TZImagePickerController/TZImagePickerController.h>
 NS_ASSUME_NONNULL_BEGIN

-@interface QPhotoImageModel : NSObject
+@interface QPhotoImageModel : PIBaseModel
 ///是否选中
@property (nonatomic,assign) BOOL isSelect;
 ///是否是原图
--- a/YuMi/CustomUI/ShareView/Model/XPShareInfoModel.h
+++ b/YuMi/CustomUI/ShareView/Model/XPShareInfoModel.h
@@ -17,7 +17,7 @@ typedef NS_ENUM(NSUInteger, ShareType) {
 	ShareType_User_Draw = 888,
 };

-@interface XPShareInfoModel : NSObject
+@interface XPShareInfoModel : PIBaseModel
 ///分享的标题
@property (nonatomic,copy) NSString *shareTitle;
 ///分享的内容
--- a/YuMi/CustomUI/UIImage/UIImage+Utils.h
+++ b/YuMi/CustomUI/UIImage/UIImage+Utils.h
@@ -51,4 +51,5 @@ typedef NS_ENUM(NSUInteger, GradientType) {


 -(UIImage *)compressWithMaxLength:(NSUInteger)maxLength;
+- (UIImage *)roundedImageWithCornerRadius:(CGFloat)cornerRadius size:(CGSize)size;
@end
--- a/YuMi/CustomUI/UIImage/UIImage+Utils.m
+++ b/YuMi/CustomUI/UIImage/UIImage+Utils.m
@@ -423,5 +423,13 @@
 		return self;
 	}
 }
-
+- (UIImage *)roundedImageWithCornerRadius:(CGFloat)cornerRadius size:(CGSize)size{
+    UIGraphicsBeginImageContextWithOptions(size, NO, 1);
+   UIBezierPath *clippingPath = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, size.width, size.height) cornerRadius:cornerRadius];
+   [clippingPath addClip];
+   [self drawInRect:CGRectMake(0, 0, size.width, size.height)];
+   UIImage *roundedImage = UIGraphicsGetImageFromCurrentImageContext();
+   UIGraphicsEndImageContext();
+   return roundedImage;
+}
@end
--- a/YuMi/Global/YUMIConstant.m
+++ b/YuMi/Global/YUMIConstant.m
@@ -50,7 +50,12 @@ NSString * const kFreeGiftCountdownNotification = @"kFreeGiftCountdownNotificati
 NSString * const KeyWithType(Pi_KeyType type) {
    BOOL isRelase  = NO;
 #ifdef DEBUG
-    isRelase = NO;
+    NSString *isProduction = [[NSUserDefaults standardUserDefaults]valueForKey:@"kIsProductionEnvironment"];
+    if([isProduction isEqualToString:@"YES"]){
+        isRelase = YES;
+    }else{
+        isRelase = NO;
+    }
 #else
    isRelase = YES;
 #endif
--- a/YuMi/Global/YUMIMacroUitls.h
+++ b/YuMi/Global/YUMIMacroUitls.h
@@ -48,16 +48,15 @@ isPhoneXSeries = [[UIApplication sharedApplication] delegate].window.safeAreaIns



-
-#define PI_App_Version @"2.2.1"
-#ifdef DEBUG
-#define API_HOST_URL [NSString stringWithFormat:@"%@%@",@"http://beta.api",@".pekolive.com"]
-
-#else
-
+///内置版本号
+#define PI_App_Version @"2.4.0"
+///渠道
+#define PI_App_Source @"appstore"
+//#define PI_App_Source @"pi_tf"
+///正式环境
 #define API_HOST_URL @"https://api.hfighting.com"
-
-#endif
+///测试环境
+#define API_HOST_TEST_URL [NSString stringWithFormat:@"%@%@",@"http://beta.api",@".pekolive.com"]

 #define API_Image_URL @"https://image.hfighting.com"

--- a/YuMi/Modules/YMLogin/Api/PILoginManager.m
+++ b/YuMi/Modules/YMLogin/Api/PILoginManager.m
@@ -47,6 +47,7 @@
        [Api getUserInfo:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
            if(code == 200){
                userInfo = [UserInfoModel modelWithDictionary:data.data];
+                [AccountInfoStorage instance].name = userInfo.nick;
                homeUserModel.nick = userInfo.nick;
                homeUserModel.avatar = userInfo.avatar;
                homeUserModel.isBindPhone = userInfo.isBindPhone;
@@ -55,37 +56,19 @@
        } uid:accountModel.uid];
    });
    
-    __block NSString *isFlag = @"";
+  

-    if(isLoginPhone == YES){
-        dispatch_group_enter(group);
-        dispatch_async(queue, ^{
-            [Api requestAuthorizationCodeInfo:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
-                if(code == 200){
-                    isFlag = [data.data boolValue] == YES ? @"1" : @"0" ;
-                }else{
-                    isFlag = @"2";
-                }
-                dispatch_group_leave(group);
-            }];
-        });
-    }
+    
    dispatch_group_notify(group, dispatch_get_main_queue(), ^{
        [XNDJTDDLoadingTool hideOnlyView:VC.view];
-        if ([[AccountInfoStorage instance] getTicket].length <= 0 || userInfo == nil || [isFlag isEqualToString:@"2"]) {
+        if ([[AccountInfoStorage instance] getTicket].length <= 0 || userInfo == nil) {
            [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"LoginPresenter1")];
            return;
        }
        [[AccountInfoStorage instance]saveHomeUserInfo:homeUserModel];
        if (userInfo.nick == nil || userInfo.avatar == nil) {
-            if([isFlag isEqualToString:@"0"]){
-                XPLoginAuthCodeVC *vc = [[XPLoginAuthCodeVC alloc]init];
-                vc.pi_isPush = YES;
-                [VC.navigationController pushViewController:vc animated:YES];
-            }else{
                LoginFullInfoViewController * FullVC = [[LoginFullInfoViewController alloc] init];
                [VC.navigationController pushViewController:FullVC animated:YES];
-            }
            return;
        }
        [XNDJTDDLoadingTool showSuccessWithMessage:YMLocalizedString(@"PKIDLoginViewController0")];
--- a/YuMi/Modules/YMLogin/Model/LoginAreaModel.h
+++ b/YuMi/Modules/YMLogin/Model/LoginAreaModel.h
@@ -9,17 +9,17 @@

 NS_ASSUME_NONNULL_BEGIN

-@interface LoginAreaModel : NSObject
+@interface LoginAreaModel : PIBaseModel
@property (nonatomic,copy) NSString *codeId;
@property (nonatomic,copy) NSString *name;
@property (nonatomic,copy) NSString *abbr;
-@property (nonatomic,copy) NSString *phone_area_code;
-@property (nonatomic,copy) NSString *pi_phoneAreaCode;
+@property (nonatomic,copy) NSString *code;
@property (nonatomic,copy) NSString *seq;
@property (nonatomic,copy) NSString *status;
@property (nonatomic,copy) NSString *region;
@property (nonatomic,copy) NSString *create_time;
@property (nonatomic,copy) NSString *update_time;
+@property (nonatomic,copy)  NSString * mcc;
@end

 NS_ASSUME_NONNULL_END
--- a/YuMi/Modules/YMLogin/Model/LoginAreaModel.m
+++ b/YuMi/Modules/YMLogin/Model/LoginAreaModel.m
@@ -8,7 +8,5 @@
 #import "LoginAreaModel.h"

@implementation LoginAreaModel
-+ (NSDictionary *)replacedKeyFromPropertyName {
-    return @{@"pi_phoneAreaCode":@"phoneAreaCode"};
-}
+
@end
--- a/YuMi/Modules/YMLogin/Model/ThirdUserInfo.h
+++ b/YuMi/Modules/YMLogin/Model/ThirdUserInfo.h
@@ -9,7 +9,7 @@

 NS_ASSUME_NONNULL_BEGIN

-@interface ThirdUserInfo : NSObject
+@interface ThirdUserInfo : PIBaseModel
 ///用户名
@property (nonatomic,copy) NSString *userName;
 ///头像的地址
--- a/YuMi/Modules/YMLogin/View/CustomView/LoginForgetEditView.m
+++ b/YuMi/Modules/YMLogin/View/CustomView/LoginForgetEditView.m
@@ -144,7 +144,8 @@
    if (!_codeView){
        _codeView = [UILabel new];
        _codeView.userInteractionEnabled = YES;
-        _codeView.attributedText = [self getChooseCodeText:@"+852"];
+        NSString *code = [NSString getCountryCode];
+        _codeView.attributedText = [self getChooseCodeText: code];
        
    }
    return _codeView;
--- a/YuMi/Modules/YMLogin/View/LoginBindPhoneViewController.m
+++ b/YuMi/Modules/YMLogin/View/LoginBindPhoneViewController.m
@@ -177,7 +177,8 @@
 	if (!_countryLabel) {
 		_countryLabel = [[UILabel alloc] init];
 		_countryLabel.font = [UIFont fontWithName:@"PingFang-SC-Medium" size:15];
-		_countryLabel.text = @"+852";
+        NSString *code = [NSString getCountryCode];
+		_countryLabel.text =  code;
 		_countryLabel.textColor = [DJDKMIMOMColor mainTextColor];
 		_countryLabel.backgroundColor = [UIColor clearColor];
 		_countryLabel.textAlignment = NSTextAlignmentCenter;
--- a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginAraeViewController.m
+++ b/YuMi/Modules/YMLogin/View/NewLogin/XPLoginAraeViewController.m
@@ -14,7 +14,7 @@
 #import "Api+Login.h"
 ///Third
 #import <Masonry/Masonry.h>
-@interface XPLoginAraeViewController ()<UITableViewDelegate,UITableViewDataSource>
+@interface XPLoginAraeViewController ()<UITableViewDelegate,UITableViewDataSource,XPLoginAreaTableViewCellDelegate>
@property (nonatomic,strong) UITableView *tableView;
@property (nonatomic,strong) NSMutableArray *listData;
@property (nonatomic,strong) NSMutableArray *titleList;
@@ -26,39 +26,49 @@
 	[super viewDidLoad];
 	[self initSubViews];
 	[self initSubViewConstraints];
-	[Api getPhoneAreaCodeList:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
-		if (code == 200) {
-			NSArray *list = [LoginAreaModel modelsWithArray:data.data];
-			[self.titleList removeAllObjects];
-			[self.listData removeAllObjects];
-			[self getLocalPlistWithList:list];
-		}
-	}];
+    [self getPhoneAreaCodeList];
 }
 #pragma mark - LoginVerifCodeProtocol

-(void)getPhoneAreaCodeListSuccess:(NSArray *)list{
-	[self hideHUD];
-	[self.titleList removeAllObjects];
-	[self.listData removeAllObjects];
-	[self getLocalPlistWithList:list];
-}
-(void)getPhoneAreaCodeListFail{
-	[self hideHUD];
-	NSBundle *bundle = [NSBundle mainBundle];
-	NSString *file = [bundle pathForResource:@"district" ofType:@"plist"];
-	NSArray *dictArray = [NSArray arrayWithContentsOfFile:file];
-
-	NSArray *list = [LoginAreaModel modelsWithArray:dictArray];
-	[self getLocalPlistWithList:list];
+-(void)getPhoneAreaCodeList{
+    // 获取文件路径
+    NSString *path = [[NSBundle mainBundle] pathForResource:@"pi_area_info" ofType:@"json"];
+    // 将文件数据化
+    NSData *data = [[NSData alloc] initWithContentsOfFile:path];
+    // 对数据进行JSON格式化并返回字典形式
+   NSDictionary *codeData = [NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingMutableLeaves error:nil];
+    NSArray *codeList = [LoginAreaModel modelsWithArray:codeData[@"RECORDS"]];
+    [self getLocalPlistWithList:codeList];
 }
 -(void)getLocalPlistWithList:(NSArray *)list{

-	NSArray * letterList = @[@"A",@"B",@"C",@"D",@"E",@"F",@"G",@"H",@"I",@"J",@"K",@"L",@"M",@"N",@"O",@"P",@"Q",@"R",@"S",@"T",@"U",@"V",@"W",@"X",@"Y",@"Z"];
+	NSArray * letterList = @[@"",@"A",@"B",@"C",@"D",@"E",@"F",@"G",@"H",@"I",@"J",@"K",@"L",@"M",@"N",@"O",@"P",@"Q",@"R",@"S",@"T",@"U",@"V",@"W",@"X",@"Y",@"Z"];
 	NSMutableArray *otherList = [NSMutableArray array];
+    NSMutableArray *defaultList = [NSMutableArray array];
+    LoginAreaModel *TwModel;
+    LoginAreaModel *HKModel ;
+    LoginAreaModel *SPModel ;
+    LoginAreaModel *MYModel ;
+    LoginAreaModel *ChinsModel ;
+    [self.titleList addObject:@""];
 	for (NSString *letter in letterList) {
 		NSMutableArray *modelList = [NSMutableArray array];
 		for (LoginAreaModel *model in list) {
+            if([model.code isEqualToString:@"886"]){
+                TwModel = model;
+            } 
+            if([model.code isEqualToString:@"852"]){
+                HKModel = model;
+            } 
+            if([model.code isEqualToString:@"65"]){
+                SPModel = model;
+            } 
+            if([model.code isEqualToString:@"60"]){
+                MYModel = model;
+            } 
+            if([model.code isEqualToString:@"86"]){
+                ChinsModel = model;
+            }
 			NSString *fristLetter = [model.name substringWithRange:NSMakeRange(0, 1)];
 			if([letter isEqualToString:fristLetter]){
 				[modelList addObject:model];
@@ -74,8 +84,26 @@
 			[self.listData addObject:modelList];
 		}
 	}
-	[self.listData addObject:otherList];
-	[self.titleList addObject:@"#"];
+    if(TwModel != nil){
+        [defaultList addObject:TwModel];
+    }
+    if(HKModel != nil){
+        [defaultList addObject:HKModel];
+    }
+    if(SPModel != nil){
+        [defaultList addObject:SPModel];
+    }
+    if(MYModel != nil){
+        [defaultList addObject:MYModel];
+    }
+    if(ChinsModel != nil){
+        [defaultList addObject:ChinsModel];
+    }
+    [self.listData insertObject:defaultList atIndex:0];
+    if(otherList.count > 0){
+        [self.listData addObject:otherList];
+        [self.titleList addObject:@"#"];
+    }
 	[self.tableView reloadData];
 }
 #pragma mark - UITableViewDelegate
@@ -96,6 +124,9 @@

 -(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
 	XPLoginAreaTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPLoginAreaTableViewCell class]) forIndexPath:indexPath];
+    if(cell.delegate == nil){
+        cell.delegate = self;
+    }
 	if(indexPath.section < self.listData.count){
 		NSArray *listModel = self.listData[indexPath.section];
 		if(indexPath.row < listModel.count){
@@ -104,13 +135,15 @@
 	}
 	return cell;
 }
-(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
-	LoginAreaModel *codeModel = self.listData[indexPath.section][indexPath.row];
-	if(self.delegate && [self.delegate respondsToSelector:@selector(chooseAreaCodeSuccess:)]){

-		[self.delegate chooseAreaCodeSuccess:codeModel.pi_phoneAreaCode ?: codeModel.phone_area_code];
-	}
-	[self.navigationController popViewControllerAnimated:YES];
+#pragma mark - XPLoginAreaTableViewCellDelegate
+- (void)didSelectModel:(LoginAreaModel *)model{
+    LoginAreaModel *codeModel = model;
+    if(self.delegate && [self.delegate respondsToSelector:@selector(chooseAreaCodeSuccess:)]){
+
+        [self.delegate chooseAreaCodeSuccess:codeModel.code];
+    }
+    [self.navigationController popViewControllerAnimated:YES];
 }
 #pragma mark - Private Method
 - (void)initSubViews {
--- a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginAreaTableViewCell.h
+++ b/YuMi/Modules/YMLogin/View/NewLogin/XPLoginAreaTableViewCell.h
@@ -6,13 +6,19 @@
 //

 #import <UIKit/UIKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
@class LoginAreaModel;
-@interface XPLoginAreaTableViewCell : UITableViewCell
+@protocol XPLoginAreaTableViewCellDelegate <NSObject>

-@property (nonatomic,strong) LoginAreaModel *areaModel;
+-(void)didSelectModel:(LoginAreaModel *_Nullable)model;

@end

+NS_ASSUME_NONNULL_BEGIN
+
+@interface XPLoginAreaTableViewCell : UITableViewCell
+
+@property (nonatomic,strong) LoginAreaModel *areaModel;
+@property(nonatomic,weak) id<XPLoginAreaTableViewCellDelegate>delegate;
+@end
+
 NS_ASSUME_NONNULL_END
--- a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginAreaTableViewCell.m
+++ b/YuMi/Modules/YMLogin/View/NewLogin/XPLoginAreaTableViewCell.m
@@ -14,6 +14,7 @@
@interface XPLoginAreaTableViewCell()
@property (nonatomic,strong) UILabel *areaVeiw;
@property (nonatomic,strong) UILabel *codeView;
+@property(nonatomic,strong) UIButton *clickBtn;
@end
@implementation XPLoginAreaTableViewCell
 - (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier {
@@ -30,6 +31,7 @@
 	self.selectionStyle = UITableViewCellSelectionStyleNone;
 	[self.contentView addSubview:self.areaVeiw];
 	[self.contentView addSubview:self.codeView];
+    [self.contentView addSubview:self.clickBtn];
 }
 - (void)initSubViewConstraints {
 	[self.areaVeiw mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -40,15 +42,21 @@
 		make.right.mas_equalTo(-kGetScaleWidth(15));
 		make.centerY.equalTo(self.contentView);
 	}];
+    [self.clickBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.left.bottom.equalTo(self.contentView);
+        make.right.mas_equalTo(-kGetScaleWidth(20));
+    }];
+}
+-(void)didClickBtnAction{
+    if(self.delegate && [self.delegate respondsToSelector:@selector(didSelectModel:)]){
+        [self.delegate didSelectModel:self.areaModel];
+    }
 }
 - (void)setAreaModel:(LoginAreaModel *)areaModel{
 	_areaModel = areaModel;
 	_areaVeiw.text = _areaModel.name;
-	if(_areaModel.pi_phoneAreaCode == nil){
-		_codeView.text = _areaModel.phone_area_code;
-		return;
-	}
-	_codeView.text = _areaModel.pi_phoneAreaCode;
+    _codeView.text = _areaModel.code;
+	
 }
 #pragma mark - 懒加载

@@ -70,5 +78,11 @@
 	}
 	return _codeView;
 }
-
+- (UIButton *)clickBtn{
+    if(!_clickBtn){
+        _clickBtn = [UIButton new];
+        [_clickBtn addTarget:self action:@selector(didClickBtnAction) forControlEvents:UIControlEventTouchUpInside];
+    }
+    return _clickBtn;
+}
@end
--- a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginInputView.m
+++ b/YuMi/Modules/YMLogin/View/NewLogin/XPLoginInputView.m
@@ -9,6 +9,7 @@
 #import "DJDKMIMOMColor.h"
 #import <Masonry.h>
 #import <ReactiveObjC.h>
+#import "LoginAreaModel.h"

@interface XPLoginInputView()

@@ -46,12 +47,16 @@
 	areaImageView.userInteractionEnabled = NO;

    /// 区号
+    NSString *code = [NSString getCountryCode];
    UIButton *areaCodeBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-    [areaCodeBtn setTitle:@"+852" forState:UIControlStateNormal];
+    [areaCodeBtn setTitle:code  forState:UIControlStateNormal];
    [areaCodeBtn setTitleColor:UIColorFromRGB(0x1F1B4F) forState:UIControlStateNormal];
    areaCodeBtn.titleLabel.font = kFontMedium(16);
 	_areaCodeBtn = areaCodeBtn;
 	areaCodeBtn.userInteractionEnabled = NO;
+   
+   
+       

 	UIStackView *areaStackView = [[UIStackView alloc] init];
 	areaStackView.axis = UILayoutConstraintAxisHorizontal;
--- a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginViewController.m
+++ b/YuMi/Modules/YMLogin/View/NewLogin/XPLoginViewController.m
@@ -80,7 +80,7 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy";
    
    [super viewDidLoad];
    [self createUI];
-    
+    [[NSNotificationCenter defaultCenter]postNotificationName:@"kInLoginVC" object:nil];
 }

 - (void)viewWillAppear:(BOOL)animated {
--- a/YuMi/Modules/YMMessage/Model/AttachmentModel.h
+++ b/YuMi/Modules/YMMessage/Model/AttachmentModel.h
@@ -616,7 +616,7 @@ typedef NS_ENUM(NSUInteger, CustomMessageTypeRoomAlbum) {
    ///所有房间
    Custom_Message_Sub_Room_Album = 1011,
 };
-@interface AttachmentModel : NSObject<NIMCustomAttachment>
+@interface AttachmentModel : PIBaseModel<NIMCustomAttachment>
@property (nonatomic,assign) int first;
@property (nonatomic,assign) int second;
@property (nonatomic, strong) id data;
--- a/YuMi/Modules/YMMessage/Model/ChatLimitModel.h
+++ b/YuMi/Modules/YMMessage/Model/ChatLimitModel.h
@@ -9,7 +9,7 @@

 NS_ASSUME_NONNULL_BEGIN

-@interface ChatLimitModel : NSObject
+@interface ChatLimitModel : PIBaseModel

@property (nonatomic, assign) BOOL chat;
@property (nonatomic, copy) NSString * message;
--- a/YuMi/Modules/YMMessage/Model/CustomMessage/XPKickUserModel.h
+++ b/YuMi/Modules/YMMessage/Model/CustomMessage/XPKickUserModel.h
@@ -9,7 +9,7 @@

 NS_ASSUME_NONNULL_BEGIN

-@interface XPKickUserModel : NSObject
+@interface XPKickUserModel : PIBaseModel
 ///安卓使用的是Uid  所以加了一个这样的属性
@property (nonatomic, assign) NSInteger uid;
 ///处理de uid
--- a/YuMi/Modules/YMMessage/Model/SessionContent/ContentApplicationShareModel.h
+++ b/YuMi/Modules/YMMessage/Model/SessionContent/ContentApplicationShareModel.h
@@ -8,7 +8,7 @@
 #import <Foundation/Foundation.h>

 NS_ASSUME_NONNULL_BEGIN
-@interface ContentApplicationShareModel : NSObject
+@interface ContentApplicationShareModel : PIBaseModel
 ///显示标题
@property (nonatomic,copy) NSString *title;
 ///立即进入
--- a/YuMi/Modules/YMMessage/Model/SessionContent/ContentLevelUpgradeModel.h
+++ b/YuMi/Modules/YMMessage/Model/SessionContent/ContentLevelUpgradeModel.h
@@ -9,7 +9,7 @@

 NS_ASSUME_NONNULL_BEGIN

-@interface ContentLevelUpgradeModel : NSObject
+@interface ContentLevelUpgradeModel : PIBaseModel
@property (nonatomic, copy) NSString *levelName;
 ///升到的等级
@property (nonatomic,assign) NSInteger levelSeq;
--- a/YuMi/Modules/YMMessage/Model/SessionContent/ContentOpenLiveInfoModel.h
+++ b/YuMi/Modules/YMMessage/Model/SessionContent/ContentOpenLiveInfoModel.h
@@ -9,7 +9,7 @@

 NS_ASSUME_NONNULL_BEGIN
@class ContentOpenLiveUserInfoModel;
-@interface ContentOpenLiveInfoModel : NSObject
+@interface ContentOpenLiveInfoModel : PIBaseModel

 ///用户的uid
@property (nonatomic,copy) NSString *uid;
@@ -18,7 +18,7 @@ NS_ASSUME_NONNULL_BEGIN

@end

-@interface ContentOpenLiveUserInfoModel : NSObject
+@interface ContentOpenLiveUserInfoModel : PIBaseModel
 ///显示名字
@property (nonatomic,copy) NSString *avatar;
 ///显示昵称
--- a/YuMi/Modules/YMMessage/Model/SessionContent/ContentRistAlertModel.h
+++ b/YuMi/Modules/YMMessage/Model/SessionContent/ContentRistAlertModel.h
@@ -9,7 +9,7 @@

 NS_ASSUME_NONNULL_BEGIN

-@interface ContentRistAlertModel : NSObject
+@interface ContentRistAlertModel : PIBaseModel
@property (nonatomic,strong) NSString *content;
@end

--- a/YuMi/Modules/YMMessage/Model/SessionContent/ContentSecretaryModel.h
+++ b/YuMi/Modules/YMMessage/Model/SessionContent/ContentSecretaryModel.h
@@ -42,7 +42,7 @@ typedef NS_ENUM(NSInteger, SecretaryRouterType) {
    SecretaryRouterType_Square_Topic = 75,
 };

-@interface ContentSecretaryModel : NSObject
+@interface ContentSecretaryModel : PIBaseModel
 ///最近回话列表需要显示的内容 推送的内容
@property (nonatomic,copy) NSString *msg;
 ///私聊消息需要显示的内容
--- a/YuMi/Modules/YMMessage/Model/SessionContent/ContentShareMonentsModel.h
+++ b/YuMi/Modules/YMMessage/Model/SessionContent/ContentShareMonentsModel.h
@@ -9,7 +9,7 @@

 NS_ASSUME_NONNULL_BEGIN

-@interface ContentShareMonentsModel : NSObject
+@interface ContentShareMonentsModel : PIBaseModel
 ///动态分享
@property (nonatomic,copy) NSString *dynamicId;
 ///话题id
--- a/YuMi/Modules/YMMessage/Model/SessionContent/ContentTreasureFairyModel.h
+++ b/YuMi/Modules/YMMessage/Model/SessionContent/ContentTreasureFairyModel.h
@@ -9,7 +9,7 @@

 NS_ASSUME_NONNULL_BEGIN

-@interface ContentTreasureFairyModel : NSObject
+@interface ContentTreasureFairyModel : PIBaseModel
 ///用户uid
@property (nonatomic,copy) NSString *uid;
 ///目标用户的uid
--- a/YuMi/Modules/YMMessage/Model/SessionContent/ContentTweetModel.h
+++ b/YuMi/Modules/YMMessage/Model/SessionContent/ContentTweetModel.h
@@ -9,7 +9,7 @@

 NS_ASSUME_NONNULL_BEGIN

-@interface ContentTweetModel : NSObject
+@interface ContentTweetModel : PIBaseModel
 ///跳转的地址
@property (nonatomic,copy) NSString *webUrl;
 ///标题
--- a/YuMi/Modules/YMMessage/Model/SessionSettingModel.h
+++ b/YuMi/Modules/YMMessage/Model/SessionSettingModel.h
@@ -18,7 +18,7 @@ typedef NS_ENUM(NSInteger, SessionSettingType) {
 	SessionSettingType_report
 };

-@interface SessionSettingModel : NSObject
+@interface SessionSettingModel : PIBaseModel
 ///显示标题
@property (nonatomic,copy) NSString *title;
 ///类型
--- a/YuMi/Modules/YMMessage/Model/SessionToolBar/MessageMenuModel.h
+++ b/YuMi/Modules/YMMessage/Model/SessionToolBar/MessageMenuModel.h
@@ -16,7 +16,7 @@ typedef NS_ENUM(NSInteger, MessageMenuType) {
 	MessageMenuType_Gift
 };

-@interface MessageMenuModel : NSObject
+@interface MessageMenuModel : PIBaseModel
 ///图片
@property (nonatomic,strong) NSString *imageName;
 ///类型
--- a/YuMi/Modules/YMMessage/View/FindNew/Model/FindNewGreetListModel.h
+++ b/YuMi/Modules/YMMessage/View/FindNew/Model/FindNewGreetListModel.h
@@ -9,7 +9,7 @@

 NS_ASSUME_NONNULL_BEGIN
@class FindNewGreetModel;
-@interface FindNewGreetListModel : NSObject
+@interface FindNewGreetListModel : PIBaseModel

 ///开始的
@property (nonatomic,copy) NSString * start;
@@ -19,7 +19,7 @@ NS_ASSUME_NONNULL_BEGIN
@end


-@interface FindNewGreetModel : NSObject
+@interface FindNewGreetModel : PIBaseModel
 ///id
@property (nonatomic,assign) NSInteger fId;
 ///消息
--- a/YuMi/Modules/YMMessage/View/FindNew/Model/FindNewGreetMessageModel.h
+++ b/YuMi/Modules/YMMessage/View/FindNew/Model/FindNewGreetMessageModel.h
@@ -9,7 +9,7 @@
 #import "YUMINNNN.h"
 NS_ASSUME_NONNULL_BEGIN

-@interface FindNewGreetMessageModel : NSObject
+@interface FindNewGreetMessageModel : PIBaseModel
 ///头像
@property (nonatomic,copy) NSString *avatar;
 ///用户uid
--- a/YuMi/Modules/YMMessage/View/FindNew/Model/FindNewUserInfoModel.h
+++ b/YuMi/Modules/YMMessage/View/FindNew/Model/FindNewUserInfoModel.h
@@ -9,7 +9,7 @@
 #import "YUMINNNN.h"
 NS_ASSUME_NONNULL_BEGIN

-@interface FindNewUserInfoModel : NSObject
+@interface FindNewUserInfoModel : PIBaseModel
 ///生日
@property(nonatomic,assign) long birth;
 ///头像
--- a/YuMi/Modules/YMMessage/View/SayHello/Model/SessionSayHelloCountModel.h
+++ b/YuMi/Modules/YMMessage/View/SayHello/Model/SessionSayHelloCountModel.h
@@ -9,7 +9,7 @@

 NS_ASSUME_NONNULL_BEGIN

-@interface SessionSayHelloCountModel : NSObject
+@interface SessionSayHelloCountModel : PIBaseModel
 ///有多少人想和你打招呼
@property (nonatomic,assign) NSInteger helloCount;
 ///是否可见
--- a/YuMi/Modules/YMMessage/View/SayHello/Model/SessionSayHelloLevelModel.h
+++ b/YuMi/Modules/YMMessage/View/SayHello/Model/SessionSayHelloLevelModel.h
@@ -9,7 +9,7 @@

 NS_ASSUME_NONNULL_BEGIN

-@interface SessionSayHelloLevelModel : NSObject
+@interface SessionSayHelloLevelModel : PIBaseModel
 ///当前主播评级
@property (nonatomic,copy) NSString *currentLevel;
 ///当前倍数
--- a/YuMi/Modules/YMMessage/View/SayHello/Model/SessionSayHelloListModel.h
+++ b/YuMi/Modules/YMMessage/View/SayHello/Model/SessionSayHelloListModel.h
@@ -9,7 +9,7 @@
 #import "YUMINNNN.h"
 NS_ASSUME_NONNULL_BEGIN

-@interface SessionSayHelloListModel : NSObject
+@interface SessionSayHelloListModel : PIBaseModel
 ///生日
@property(nonatomic,assign) long birth;
 ///uid
--- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageBaseModel.h
+++ b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageBaseModel.h
@@ -29,7 +29,7 @@ typedef NS_ENUM(NSInteger, SessionMessageType) {
 	SessionMessageType_UnSupport
 };

-@interface MessageBaseModel : NSObject
+@interface MessageBaseModel : PIBaseModel
 ///当前的消息类型
@property (nonatomic,strong) NIMMessage *message;
 ///大小
--- a/YuMi/Modules/YMMessage/View/SessionListHeadView/Model/XPSessionListFansPartyModel.h
+++ b/YuMi/Modules/YMMessage/View/SessionListHeadView/Model/XPSessionListFansPartyModel.h
@@ -9,7 +9,7 @@

 NS_ASSUME_NONNULL_BEGIN

-@interface XPSessionListFansPartyModel : NSObject
+@interface XPSessionListFansPartyModel : PIBaseModel

@property (nonatomic, copy) NSString *avatar;
@property (nonatomic, copy) NSString *uid;
--- a/YuMi/Modules/YMMessage/View/SessionListHeadView/XPSessionListHeadItem.h
+++ b/YuMi/Modules/YMMessage/View/SessionListHeadView/XPSessionListHeadItem.h
@@ -16,7 +16,7 @@ typedef NS_ENUM(NSUInteger, XPSessionListHeadItemType) {
    XPSessionListHeadItemType_MemgXin,//发现萌新
 };

-@interface XPSessionListHeadItem : NSObject
+@interface XPSessionListHeadItem : PIBaseModel

@property (nonatomic, copy) NSString *title;
@property (nonatomic, copy) NSString *imageName;
--- a/YuMi/Modules/YMMine/Model/AnchorFansTeam/XPMineAnchorFansTeamModel.h
+++ b/YuMi/Modules/YMMine/Model/AnchorFansTeam/XPMineAnchorFansTeamModel.h
@@ -9,7 +9,7 @@

 NS_ASSUME_NONNULL_BEGIN

-@interface XPMineAnchorFansTeamModel : NSObject
+@interface XPMineAnchorFansTeamModel : PIBaseModel

 ///头像
@property (nonatomic, copy) NSString *anchorAvatar;
--- a/YuMi/Modules/YMMine/Model/ExchangeAuthority/XPMineExchangeAuthorityModel.h
+++ b/YuMi/Modules/YMMine/Model/ExchangeAuthority/XPMineExchangeAuthorityModel.h
@@ -10,7 +10,7 @@
 #import "YUMINNNN.h"
 NS_ASSUME_NONNULL_BEGIN

-@interface XPMineExchangeAuthorityModel : NSObject
+@interface XPMineExchangeAuthorityModel : PIBaseModel
 ///用户id
@property (nonatomic,copy) NSString *uid;
 ///头像
--- a/YuMi/Modules/YMMine/Model/FootPrint/XPMineFootPrintModel.h
+++ b/YuMi/Modules/YMMine/Model/FootPrint/XPMineFootPrintModel.h
@@ -9,7 +9,7 @@

 NS_ASSUME_NONNULL_BEGIN

-@interface XPMineFootPrintModel : NSObject
+@interface XPMineFootPrintModel : PIBaseModel

@property (nonatomic, copy) NSString *roomUid;//房间uid
@property (nonatomic, copy) NSString *roomId;//房间id
--- a/YuMi/Modules/YMMine/Model/Friend/FansInfoModel.h
+++ b/YuMi/Modules/YMMine/Model/Friend/FansInfoModel.h
@@ -11,7 +11,7 @@

 NS_ASSUME_NONNULL_BEGIN

-@interface FansInfoModel : NSObject
+@interface FansInfoModel : PIBaseModel
 ///生日
@property(nonatomic,assign) long birth;
 ///头像
--- a/YuMi/Modules/YMMine/Model/Recharge/RechargeListModel.h
+++ b/YuMi/Modules/YMMine/Model/Recharge/RechargeListModel.h
@@ -9,7 +9,7 @@

 NS_ASSUME_NONNULL_BEGIN

-@interface RechargeListModel : NSObject
+@interface RechargeListModel : PIBaseModel
 ///充值的id
@property(nonatomic, strong) NSString *chargeProdId;
@property(nonatomic, strong) NSString *prodName;
--- a/YuMi/Modules/YMMine/Model/Recharge/WalletInfoModel.h
+++ b/YuMi/Modules/YMMine/Model/Recharge/WalletInfoModel.h
@@ -9,7 +9,7 @@

 NS_ASSUME_NONNULL_BEGIN

-@interface WalletInfoModel : NSObject
+@interface WalletInfoModel : PIBaseModel
 /// 用户 uid
@property(nonatomic, assign) NSInteger uid;
 /// 钻石数量
--- a/YuMi/Modules/YMMine/Model/RecordIncome/XPBindExtractInfoModel.h
+++ b/YuMi/Modules/YMMine/Model/RecordIncome/XPBindExtractInfoModel.h
@@ -9,7 +9,7 @@
 #import "XPWithdrawAccountModel.h"
 NS_ASSUME_NONNULL_BEGIN

-@interface XPBindExtractInfoModel : NSObject
+@interface XPBindExtractInfoModel : PIBaseModel
 ///提現信息
@property (nonatomic,strong) XPWithdrawAccountModel *account;
 //钱包当前金币数
--- a/YuMi/Modules/YMMine/Model/RecordIncome/XPExchangeDiamondsModel.h
+++ b/YuMi/Modules/YMMine/Model/RecordIncome/XPExchangeDiamondsModel.h
@@ -9,7 +9,7 @@

 NS_ASSUME_NONNULL_BEGIN

-@interface XPExchangeDiamondsModel : NSObject
+@interface XPExchangeDiamondsModel : PIBaseModel
@property (nonatomic,assign) double diamonds;//当前钱包
@property (nonatomic,assign) double golds;//当前钱包
@property (nonatomic,assign) double rate;//比率
--- a/YuMi/Modules/YMMine/Model/RecordIncome/XPIncomeRecordGoldDetailsModel.h
+++ b/YuMi/Modules/YMMine/Model/RecordIncome/XPIncomeRecordGoldDetailsModel.h
@@ -9,7 +9,7 @@
@class XPIncomeRecordGoldDetailItemModel;
 NS_ASSUME_NONNULL_BEGIN

-@interface XPIncomeRecordGoldDetailsModel : NSObject
+@interface XPIncomeRecordGoldDetailsModel : PIBaseModel
@property (nonatomic,copy) NSString *total;
@property (nonatomic,copy) NSString *totalRemainGolds;
@property (nonatomic,copy) NSString *totalEarnGolds;
@@ -23,7 +23,7 @@ NS_ASSUME_NONNULL_BEGIN
 NS_ASSUME_NONNULL_END


-@interface XPIncomeRecordGoldDetailItemModel : NSObject
+@interface XPIncomeRecordGoldDetailItemModel : PIBaseModel

@property (nonatomic,copy) NSString *uid;
@property (nonatomic,copy) NSString *nick;//昵称
--- a/YuMi/Modules/YMMine/Model/RecordIncome/XPIncomeRecordModel.h
+++ b/YuMi/Modules/YMMine/Model/RecordIncome/XPIncomeRecordModel.h
@@ -9,7 +9,7 @@

 NS_ASSUME_NONNULL_BEGIN

-@interface XPIncomeRecordModel : NSObject
+@interface XPIncomeRecordModel : PIBaseModel
@property (nonatomic,copy) NSString *uid;
@property (nonatomic,assign) double diamonds;
@property (nonatomic,assign) double crystals;
--- a/YuMi/Modules/YMMine/Model/RecordIncome/XPWithdrawAccountModel.h
+++ b/YuMi/Modules/YMMine/Model/RecordIncome/XPWithdrawAccountModel.h
@@ -9,7 +9,7 @@

 NS_ASSUME_NONNULL_BEGIN

-@interface XPWithdrawAccountModel : NSObject
+@interface XPWithdrawAccountModel : PIBaseModel
@property (nonatomic,copy) NSString *uid;
@property (nonatomic,copy) NSString *swift;
@property (nonatomic,copy) NSString *bankName;
--- a/YuMi/Modules/YMMine/Model/UserInfo/UserGiftWallInfoModel.h
+++ b/YuMi/Modules/YMMine/Model/UserInfo/UserGiftWallInfoModel.h
@@ -9,7 +9,7 @@

 NS_ASSUME_NONNULL_BEGIN

-@interface UserGiftWallInfoModel : NSObject
+@interface UserGiftWallInfoModel : PIBaseModel
 ///目标用户的uid
@property (nonatomic,copy) NSString *uid;
 ///价格
--- a/YuMi/Modules/YMMine/Model/UserInfo/XPMineUserInfoTagModel.h
+++ b/YuMi/Modules/YMMine/Model/UserInfo/XPMineUserInfoTagModel.h
@@ -9,7 +9,7 @@

 NS_ASSUME_NONNULL_BEGIN

-@interface XPMineUserInfoTagModel : NSObject
+@interface XPMineUserInfoTagModel : PIBaseModel
 ///
@property (nonatomic,copy) NSArray *groups;
 ///
@@ -22,7 +22,7 @@ NS_ASSUME_NONNULL_BEGIN
@end


-@interface XPMineUserInfoTagItemModel : NSObject
+@interface XPMineUserInfoTagItemModel : PIBaseModel
 ///
@property (nonatomic,copy) NSString *group;
 ///
--- a/YuMi/Modules/YMMine/Model/UserInfo/XPSoundCardModel.h
+++ b/YuMi/Modules/YMMine/Model/UserInfo/XPSoundCardModel.h
@@ -9,7 +9,7 @@

 NS_ASSUME_NONNULL_BEGIN

-@interface XPSoundCardModel : NSObject
+@interface XPSoundCardModel : PIBaseModel
@property (nonatomic,copy) NSString *uid;
 //音频七牛云url
@property (nonatomic,copy) NSString *audioUrl;
--- a/YuMi/Modules/YMMine/Model/Visitor/XPMineVisitorItemModel.h
+++ b/YuMi/Modules/YMMine/Model/Visitor/XPMineVisitorItemModel.h
@@ -9,7 +9,7 @@

 NS_ASSUME_NONNULL_BEGIN

-@interface XPMineVisitorItemModel : NSObject
+@interface XPMineVisitorItemModel : PIBaseModel
 ///生日
@property(nonatomic,assign) long birth;
@property (nonatomic, copy) NSString *avatar;
--- a/YuMi/Modules/YMMine/Model/Visitor/XPMineVisitorUnReadModel.h
+++ b/YuMi/Modules/YMMine/Model/Visitor/XPMineVisitorUnReadModel.h
@@ -9,7 +9,7 @@

 NS_ASSUME_NONNULL_BEGIN

-@interface XPMineVisitorUnReadModel : NSObject
+@interface XPMineVisitorUnReadModel : PIBaseModel

@property (nonatomic, assign) NSInteger visitNum;

--- a/YuMi/Modules/YMMine/Model/XPMaskManagerModel.h
+++ b/YuMi/Modules/YMMine/Model/XPMaskManagerModel.h
@@ -9,7 +9,7 @@

 NS_ASSUME_NONNULL_BEGIN

-@interface XPMaskManagerModel : NSObject
+@interface XPMaskManagerModel : PIBaseModel

@property (nonatomic,copy) NSString *uid;
@property (nonatomic,copy) NSString *roomId;
--- a/YuMi/Modules/YMMine/Model/XPMineFuntionItemModel.h
+++ b/YuMi/Modules/YMMine/Model/XPMineFuntionItemModel.h
@@ -9,7 +9,7 @@

 NS_ASSUME_NONNULL_BEGIN

-@interface XPMineFuntionItemModel : NSObject
+@interface XPMineFuntionItemModel : PIBaseModel

@property (nonatomic, assign) NSInteger centerStatus;
@property (nonatomic, copy) NSString *centerPic;
--- a/YuMi/Modules/YMMine/Model/XPMineItemModel.h
+++ b/YuMi/Modules/YMMine/Model/XPMineItemModel.h
@@ -37,7 +37,7 @@ typedef NS_ENUM(NSInteger, XPMineItemType) {
 };


-@interface XPMineItemModel : NSObject
+@interface XPMineItemModel : PIBaseModel
 ///图片的名字
@property (nonatomic,copy) NSString *itemImageName;
 ///名字
--- a/YuMi/Modules/YMMine/Model/XPMineNotificationItemModel.h
+++ b/YuMi/Modules/YMMine/Model/XPMineNotificationItemModel.h
@@ -9,7 +9,7 @@

 NS_ASSUME_NONNULL_BEGIN

-@interface XPMineNotificationItemModel : NSObject
+@interface XPMineNotificationItemModel : PIBaseModel
 /// 标题
@property (nonatomic, copy) NSString *title;
 /// 描述
--- a/YuMi/Modules/YMMine/Model/XPMineSettingItemModel.h
+++ b/YuMi/Modules/YMMine/Model/XPMineSettingItemModel.h
@@ -27,7 +27,7 @@ typedef NS_ENUM(NSInteger, XPMineSettingItemType){
    XPMineSettingItemType_Shield_management,///屏蔽管理
 };

-@interface XPMineSettingItemModel : NSObject
+@interface XPMineSettingItemModel : PIBaseModel
 ///标题
@property (nonatomic,copy) NSString *title;
 ///副标题
--- a/YuMi/Modules/YMMine/Model/XPMineUserInfoEditModel.h
+++ b/YuMi/Modules/YMMine/Model/XPMineUserInfoEditModel.h
@@ -19,7 +19,7 @@ typedef NS_ENUM(NSInteger, XPMineUserInfoEditType) {
    XPMineUserInfoEditType_Area,///地区
 };

-@interface XPMineUserInfoEditModel : NSObject
+@interface XPMineUserInfoEditModel : PIBaseModel
 ///类型
@property (nonatomic,assign) XPMineUserInfoEditType type;
 ///标题
--- a/YuMi/Modules/YMMine/View/DressUp/Model/CarModel.h
+++ b/YuMi/Modules/YMMine/View/DressUp/Model/CarModel.h
@@ -15,7 +15,7 @@ typedef enum {
 	Dressup_Car_Status_Ok = 3 //正常
 }DressupCarStatus;

-@interface CarModel : NSObject
+@interface CarModel : PIBaseModel
@property (nonatomic, assign) DressupCarStatus status; //状态
 ///座驾图片
@property (nonatomic, strong) NSString *pic;
--- a/YuMi/Modules/YMMine/View/DressUp/Model/ChatBubbleModel.h
+++ b/YuMi/Modules/YMMine/View/DressUp/Model/ChatBubbleModel.h
@@ -9,7 +9,7 @@

 NS_ASSUME_NONNULL_BEGIN

-@interface ChatBubbleModel : NSObject
+@interface ChatBubbleModel : PIBaseModel

 ///气泡id
@property (nonatomic, copy) NSString *bubbleId;
--- a/YuMi/Modules/YMMine/View/DressUp/Model/DressUpShopModel.h
+++ b/YuMi/Modules/YMMine/View/DressUp/Model/DressUpShopModel.h
@@ -9,7 +9,7 @@

 NS_ASSUME_NONNULL_BEGIN

-@interface DressUpShopModel : NSObject
+@interface DressUpShopModel : PIBaseModel

 ///座驾图片
@property (nonatomic, strong) NSString *pic;
--- a/YuMi/Modules/YMMine/View/DressUp/Model/HeadwearModel.h
+++ b/YuMi/Modules/YMMine/View/DressUp/Model/HeadwearModel.h
@@ -16,7 +16,7 @@ typedef NS_ENUM(NSInteger, DressupHeadWearStatus) {
 };


-@interface HeadwearModel : NSObject
+@interface HeadwearModel : PIBaseModel
 ///头饰id
@property (nonatomic, strong) NSString  *headwearId;
 ///是否是赠送
--- a/YuMi/Modules/YMMine/View/DressUp/Model/NameplateModel.h
+++ b/YuMi/Modules/YMMine/View/DressUp/Model/NameplateModel.h
@@ -9,7 +9,7 @@
 #import "YUMINNNN.h"
 NS_ASSUME_NONNULL_BEGIN

-@interface NameplateModel : NSObject
+@interface NameplateModel : PIBaseModel
 ///是否正在使用
@property (nonatomic, assign) BOOL  isUsing;
 ///id
--- a/YuMi/Modules/YMMine/View/DressUp/Model/NobleCardModel.h
+++ b/YuMi/Modules/YMMine/View/DressUp/Model/NobleCardModel.h
@@ -9,7 +9,7 @@

 NS_ASSUME_NONNULL_BEGIN

-@interface NobleCardModel : NSObject
+@interface NobleCardModel : PIBaseModel

 ///资料卡id
@property (nonatomic, copy) NSString *cardId;
--- a/YuMi/Modules/YMMine/View/GiveDiamond/Model/XPMineGiveDiamondDetailsModel.h
+++ b/YuMi/Modules/YMMine/View/GiveDiamond/Model/XPMineGiveDiamondDetailsModel.h
@@ -9,7 +9,7 @@

 NS_ASSUME_NONNULL_BEGIN

-@interface XPMineGiveDiamondDetailsModel : NSObject
+@interface XPMineGiveDiamondDetailsModel : PIBaseModel

 ///记录 id
@property (nonatomic, copy) NSString  *recordId;
--- a/YuMi/Modules/YMMine/View/GiveDiamond/Model/XPMineGiveDiamondModel.h
+++ b/YuMi/Modules/YMMine/View/GiveDiamond/Model/XPMineGiveDiamondModel.h
@@ -9,7 +9,7 @@

 NS_ASSUME_NONNULL_BEGIN

-@interface XPMineGiveDiamondModel : NSObject
+@interface XPMineGiveDiamondModel : PIBaseModel
 ///记录 id
@property (nonatomic, copy) NSString  *recordId;
 ///用户uid
--- a/YuMi/Modules/YMMine/View/GiveDiamond/Model/XPMineGiveDiamondSearchModel.h
+++ b/YuMi/Modules/YMMine/View/GiveDiamond/Model/XPMineGiveDiamondSearchModel.h
@@ -9,7 +9,7 @@

 NS_ASSUME_NONNULL_BEGIN

-@interface XPMineGiveDiamondSearchModel : NSObject
+@interface XPMineGiveDiamondSearchModel : PIBaseModel
 /**
   * 用户uid
   */
--- a/YuMi/Modules/YMMine/View/Guild/Model/ClanDetailInfoModel.h
+++ b/YuMi/Modules/YMMine/View/Guild/Model/ClanDetailInfoModel.h
@@ -10,7 +10,7 @@
 #import "GuildInfoModel.h"
 NS_ASSUME_NONNULL_BEGIN

-@interface ClanDetailInfoModel : NSObject
+@interface ClanDetailInfoModel : PIBaseModel
 ///家族信息
@property (nonatomic,strong) ClanInfoModel *clan;
 ///公会信息
--- a/YuMi/Modules/YMMine/View/Guild/Model/ClanInfoModel.h
+++ b/YuMi/Modules/YMMine/View/Guild/Model/ClanInfoModel.h
@@ -9,7 +9,7 @@

 NS_ASSUME_NONNULL_BEGIN

-@interface ClanInfoModel : NSObject
+@interface ClanInfoModel : PIBaseModel
 ///家族id
@property (nonatomic, copy) NSString *cid;
 /// 族长 uid
--- a/YuMi/Modules/YMMine/View/Guild/Model/ClanMemberDetailInfoModel.h
+++ b/YuMi/Modules/YMMine/View/Guild/Model/ClanMemberDetailInfoModel.h
@@ -11,14 +11,14 @@
 NS_ASSUME_NONNULL_BEGIN

@class ClanMemberInfoModel;
-@interface ClanMemberDetailInfoModel : NSObject
+@interface ClanMemberDetailInfoModel : PIBaseModel
 ///总的个数
@property (nonatomic,assign) NSInteger count;
 ///用户的实体
@property (nonatomic,strong) NSArray<ClanMemberInfoModel *> *members;
@end

-@interface ClanMemberInfoModel : NSObject
+@interface ClanMemberInfoModel : PIBaseModel
 ///头像
@property (nonatomic,copy) NSString *avatar;
 ///平台id
--- a/YuMi/Modules/YMMine/View/Guild/Model/GuildAuthModel.h
+++ b/YuMi/Modules/YMMine/View/Guild/Model/GuildAuthModel.h
@@ -9,7 +9,7 @@

 NS_ASSUME_NONNULL_BEGIN

-@interface GuildAuthModel : NSObject
+@interface GuildAuthModel : PIBaseModel
 ///标题
@property (nonatomic, copy) NSString *name;
 ///描述
--- a/YuMi/Modules/YMMine/View/Guild/Model/GuildInfoModel.h
+++ b/YuMi/Modules/YMMine/View/Guild/Model/GuildInfoModel.h
@@ -24,7 +24,7 @@ typedef NS_ENUM(NSInteger, GuildRoleType) {
 	GuildRoleType_Super_Admin
 };

-@interface GuildInfoModel : NSObject
+@interface GuildInfoModel : PIBaseModel
 ///模厅id
@property (nonatomic, copy) NSString *hallId;
 /// 模厅名称
--- a/YuMi/Modules/YMMine/View/Guild/Model/GuildMessageModel.h
+++ b/YuMi/Modules/YMMine/View/Guild/Model/GuildMessageModel.h
@@ -22,7 +22,7 @@ typedef NS_ENUM(NSInteger, MessageGuildState) {
 };

@class GuildMessageLayoutModel, GuildMessageRequestModel, GuildMessageLayoutInfoModel;
-@interface GuildMessageModel : NSObject
+@interface GuildMessageModel : PIBaseModel

@property (nonatomic,assign) MessageGuildState msgStatus;
 ///请求的时候需要的参数
@@ -43,7 +43,7 @@ typedef NS_ENUM(NSInteger, MessageGuildState) {


 ///约束的
-@interface GuildMessageLayoutModel : NSObject
+@interface GuildMessageLayoutModel : PIBaseModel
 ///显示的标题
@property (nonatomic,strong) GuildMessageLayoutInfoModel *title;
 ///显示的时间
@@ -53,7 +53,7 @@ typedef NS_ENUM(NSInteger, MessageGuildState) {
@end


-@interface GuildMessageLayoutInfoModel : NSObject
+@interface GuildMessageLayoutInfoModel : PIBaseModel
 ///显示内容
@property (strong, nonatomic) NSString *content;
 ///字体大小
@@ -68,7 +68,7 @@ typedef NS_ENUM(NSInteger, MessageGuildState) {
@property (strong, nonatomic) NSString *routerValue;
@end

-@interface GuildMessageRequestModel : NSObject
+@interface GuildMessageRequestModel : PIBaseModel
 ///家族的id
@property (nonatomic,copy) NSString *familyId;
 ///用户的id
--- a/YuMi/Modules/YMMine/View/Guild/Model/GuildSearchUserInfoModel.h
+++ b/YuMi/Modules/YMMine/View/Guild/Model/GuildSearchUserInfoModel.h
@@ -9,7 +9,7 @@
 #import "YUMINNNN.h"
 NS_ASSUME_NONNULL_BEGIN

-@interface GuildSearchUserInfoModel : NSObject
+@interface GuildSearchUserInfoModel : PIBaseModel
 ///用户的uid
@property (nonatomic,copy) NSString *uid;
 ///生日
--- a/YuMi/Modules/YMMine/View/Guild/Model/Income/GuildIncomeDetailModel.h
+++ b/YuMi/Modules/YMMine/View/Guild/Model/Income/GuildIncomeDetailModel.h
@@ -9,7 +9,7 @@

 NS_ASSUME_NONNULL_BEGIN

-@interface GuildIncomeDetailModel : NSObject
+@interface GuildIncomeDetailModel : PIBaseModel
 ///礼物名称
@property (nonatomic,copy) NSString *giftName;
 ///礼物价值
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
liyuhua	972f6d61ea	2.4.0版本发版此commit置顶	2023-12-11 16:14:02 +08:00
liyuhua	5e2c5080c5	修复bug	2023-12-11 16:11:56 +08:00
liyuhua	ce308df1b6	修复bug	2023-12-08 10:34:47 +08:00
liyuhua	6a3201135b	选择区号修改	2023-12-07 19:44:52 +08:00
liyuhua	6e8ead27dd	修复bug	2023-12-07 15:44:03 +08:00
liyuhua	a8bef5946e	修复bug	2023-12-06 17:40:56 +08:00
liyuhua	3afa60587a	优化地区	2023-12-04 18:42:38 +08:00
liyuhua	52e7d4ff7e	修复bug	2023-11-30 16:41:28 +08:00
liyuhua	566d8a3672	房间踢人逻辑优化	2023-11-28 16:50:45 +08:00
liyuhua	8dffff8492	修复贵族页无法充值钻石bug	2023-11-28 11:48:00 +08:00
liyuhua	398b4e5e81	寻爱优化	2023-11-27 14:53:52 +08:00
liyuhua	a19adac48e	优化	2023-11-24 14:50:14 +08:00
liyuhua	f9321a6586	2.3.0版本发版此commit置顶	2023-11-23 16:52:54 +08:00
liyuhua	411528467c	修复公屏乱跳问题	2023-11-23 16:04:15 +08:00
liyuhua	24d55bc807	修复bug	2023-11-23 10:56:01 +08:00
liyuhua	39b64f59b3	修复bug	2023-11-20 19:29:01 +08:00
liyuhua	cbd7b5cdbc	修复bug	2023-11-20 14:25:47 +08:00
liyuhua	d7f04e400a	优化打印信息	2023-11-15 17:25:09 +08:00
liyuhua	90eab408d0	活动改造	2023-11-15 16:49:59 +08:00
liyuhua	56103bb220	贵族飘屏动画更改	2023-11-15 14:16:01 +08:00
liyuhua	cee26a4c25	改造礼物面板bug修复	2023-11-14 17:00:16 +08:00
liyuhua	0f3dedd701	改造礼物面板	2023-11-14 15:07:28 +08:00
liyuhua	6e69623fe1	礼物面板更改	2023-11-13 16:42:34 +08:00
liyuhua	0161a860af	首页请求优化	2023-11-09 16:20:40 +08:00
liyuhua	92844a9619	新增调试工具	2023-11-09 15:26:14 +08:00
liyuhua	4285c2b6c7	修复bug	2023-11-08 16:08:13 +08:00
liyuhua	95a8cfc86d	升级trtc	2023-11-03 11:19:14 +08:00
liyuhua	47eab96f43	优化bug	2023-11-03 10:17:12 +08:00