小游戏优化

Podfile

@@ -11,6 +11,7 @@ target 'YuMi' do
   pod 'FBSDKLoginKit'
   pod 'FBSDKCoreKit'
   pod 'FBSDKShareKit'
+  pod 'LineSDKSwift'
   # 滑动标签栏
   pod 'JXCategoryView'
   pod 'JXPagingView/Pager'
@@ -39,7 +40,7 @@ target 'YuMi' do
   pod 'IQKeyboardManager'
   pod 'TZImagePickerController'
   #TRTC
-  pod 'TXLiteAVSDK_TRTC', '~> 11.4.14445'
+  pod 'TXLiteAVSDK_TRTC', '~> 11.4.14530'
   #vap礼物动画
   pod 'QGVAPlayer'
   #上传音乐
@@ -61,10 +62,10 @@ target 'YuMi' do
 	pod 'SVGAPlayer'
 
 	pod 'GoogleSignIn'
-	pod 'mob_linksdk_pro'
+	#pod 'mob_linksdk_pro'
 	pod 'mob_sharesdk'
 	pod 'mob_sharesdk/ShareSDKPlatforms/Apple'
-	pod 'mob_sharesdk/ShareSDKPlatforms/Line'
+	#pod 'mob_sharesdk/ShareSDKPlatforms/Line'
 	pod 'mob_sharesdk/ShareSDKExtension'
   
   pod 'UMCommon'

YuMi.xcodeproj/project.pbxproj

@@ -206,6 +206,10 @@
 		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 */; };
+		234F44E32B3EA4F900E2B532 /* PILineManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 234F44E22B3EA4F900E2B532 /* PILineManager.swift */; };
+		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 +301,44 @@
 		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 */; };
+		23A03F2D2B4408CD0094227A /* pi_room_lucky_gift.svga in Resources */ = {isa = PBXBuildFile; fileRef = 23A03F2C2B4408CD0094227A /* pi_room_lucky_gift.svga */; };
 		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 +349,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 +1876,13 @@
 		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; };
+		234F44E22B3EA4F900E2B532 /* PILineManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PILineManager.swift; sourceTree = "<group>"; };
+		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,8 +2067,10 @@
 		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>"; };
+		23A03F2C2B4408CD0094227A /* pi_room_lucky_gift.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = pi_room_lucky_gift.svga; sourceTree = "<group>"; };
 		23A439722AA1CF7C002E6039 /* XPNewHomeHeadView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPNewHomeHeadView.h; sourceTree = "<group>"; };
 		23A439732AA1CF7C002E6039 /* XPNewHomeHeadView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPNewHomeHeadView.m; sourceTree = "<group>"; };
 		23B2AEBF2A64E9C200543D17 /* LoginForgetEditView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginForgetEditView.h; sourceTree = "<group>"; };
@@ -2035,6 +2081,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 +2155,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 +4216,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 +4599,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 +4652,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 +4794,8 @@
 		189DD5A726DFA09700AB55B1 /* Tools */ = {
 			isa = PBXGroup;
 			children = (
+				234F44E12B3EA4DC00E2B532 /* YMLine */,
+				23CEFC082AFB8FC100576D89 /* sdkContent */,
 				23FF255C2ABA8EEE0064E904 /* PIIAPTool */,
 				23E9EA9B2A84C42B00B792F2 /* SGYProgressView */,
 				23E9E9AB2A81E8E900B792F2 /* Event */,
@@ -5265,6 +5372,14 @@
 			path = UILabel;
 			sourceTree = "<group>";
 		};
+		234F44E12B3EA4DC00E2B532 /* YMLine */ = {
+			isa = PBXGroup;
+			children = (
+				234F44E22B3EA4F900E2B532 /* PILineManager.swift */,
+			);
+			path = YMLine;
+			sourceTree = "<group>";
+		};
 		236B2E1B2AA0786E003967A8 /* Library */ = {
 			isa = PBXGroup;
 			children = (
@@ -5597,6 +5712,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 +6579,7 @@
 		BFB922F5D81845AC32D1E1ED /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				23E56B3B2B03564B00C8DAC9 /* CoreTelephony.framework */,
 				E87888F32738C30E00BF1D57 /* StoreKit.framework */,
 				186A531826FC591100D67B2C /* libresolv.tbd */,
 				CACF623970097D653132D69A /* Pods_YuMi.framework */,
@@ -8463,6 +8756,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 */,
@@ -9083,6 +9378,7 @@
 		E8A1E45C276220B100B294CA /* Resources */ = {
 			isa = PBXGroup;
 			children = (
+				23A03F2C2B4408CD0094227A /* pi_room_lucky_gift.svga */,
 				23FF256F2ABD456C0064E904 /* pi_home_new_play.svga */,
 				23FF25612ABAE6310064E904 /* pi_room_game_fine_love.svga */,
 				232C444A2AB4363200D4B2ED /* pi_room_tarrow_h5_banner.svga */,
@@ -9427,6 +9723,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 +10239,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 +10579,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 +10610,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 +10643,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 */,
@@ -10354,6 +10659,7 @@
 				E80EC87128ACD84000D133C5 /* emoji_160@2x.png in Resources */,
 				23E9EB252A84E98300B792F2 /* pi_new_mine_info_online.svga in Resources */,
 				23FF42652AA5AC040055733C /* home_heat.gif in Resources */,
+				23A03F2D2B4408CD0094227A /* pi_room_lucky_gift.svga in Resources */,
 				E80EC86D28ACD84000D133C5 /* emoji_35@2x.png in Resources */,
 				E80EC86528ACD84000D133C5 /* emoji_03@2x.png in Resources */,
 				E80EC85B28ACD84000D133C5 /* emoji_69@2x.png in Resources */,
@@ -10384,6 +10690,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 +10734,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 +10754,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 +10765,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 +10860,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 +10917,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 +11029,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 +11053,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 +11086,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 +11110,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 +11127,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 +11178,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 +11187,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 +11320,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 +11397,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 +11437,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 +11457,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 +11649,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 +11715,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 +11741,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 +11788,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 +11797,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 +11828,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 +11864,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 */,
@@ -11542,6 +11876,7 @@
 				238B37D62AC55A2C00BFC9D5 /* XPTreasureFairyTrialsView.m in Sources */,
 				E82109AD26F1C8A000FC3319 /* CountDownHelper.m in Sources */,
 				E878B8582835F0D300E22DCF /* MonentsInteractiveModel.m in Sources */,
+				234F44E32B3EA4F900E2B532 /* PILineManager.swift in Sources */,
 				E87DF4E42A42CAD2009C1185 /* XPHomeSearchNavView.m in Sources */,
 				9BD2ECCE288F829600F5CD9A /* XPMineFootPrintViewController.m in Sources */,
 				9B4E920028E57A620033419E /* XPGiftHeadTypeView.m in Sources */,
@@ -11551,6 +11886,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 +11954,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 +12027,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,10 +12217,11 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 20.20.0;
+				MARKETING_VERSION = 20.20.7;
 				PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				SWIFT_OBJC_BRIDGING_HEADER = "";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
 			};
@@ -11914,10 +12253,11 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 20.20.0;
+				MARKETING_VERSION = 20.20.7;
 				PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				SWIFT_OBJC_BRIDGING_HEADER = "";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
 			};

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"

YuMi/Appdelegate/AppDelegate+ThirdConfig.m

@@ -26,10 +26,14 @@
 
 #import <Bugly/Bugly.h>
 
+#import "YuMi-swift.h"
+
 
 UIKIT_EXTERN NSString * kYouMiNumberCountKey;
 UIKIT_EXTERN NSString * adImageName;
 
+
+
 @implementation AppDelegate (ThirdConfig)
 
 
@@ -104,7 +108,7 @@ UIKIT_EXTERN NSString * adImageName;
 }
 - (void)configShareSDK {
 
-  
+    [PILineLoginManager registerLine];
 
 	[ShareSDK registPlatforms:^(SSDKRegister *platformsRegister) {
 		///faceBook

YuMi/Appdelegate/AppDelegate.m

@@ -19,6 +19,7 @@
 #import <GoogleSignIn/GoogleSignIn.h>
 #import "XPLoginViewController.h"
 #import "AccountModel.h"
+#import "YuMi-swift.h"
 @import Firebase;
 UIKIT_EXTERN NSString * const kOpenRoomNotification;
 
@@ -106,8 +107,10 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification;
 
 ///URL Scheme跳转
 -(BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary<NSString *,id> *)options{
-   
-    
+    NSString *bundleID = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleIdentifier"];
+    if ([url.scheme isEqualToString:[NSString stringWithFormat:@"line3rdp.%@",bundleID]]) {
+            return [PILineLoginManager applicationOpenurl:app open:url];
+        }
     
     NSString *text = [url query];
     if(text.length){

YuMi/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "1024＊1024.png",
+      "filename" : "1024.png",
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"

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
+  }
+}

YuMi/Assets.xcassets/yna/AcrossRoomPK/room_across_pk_assist.imageset/Contents.json

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

YuMi/Assets.xcassets/yna/AcrossRoomPK/room_across_pk_onlookers.imageset/Contents.json

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

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
+  }
+}

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;

YuMi/Config/ClientConfig.m

@@ -37,12 +37,35 @@
 }
 
 - (void)clientInit {
-	self.canOpen = NO;
+	
+#ifdef DEBUG
+        self.canOpen = YES;
+#else
+    if(isEnterprise == YES){
+        self.canOpen = NO;
+    }else{
+        self.canOpen = YES;
+    }
+            
+#endif
 	[Api clientInitConfig:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
 		if (code == 200) {
 			self.retryCount = 0;
 			NSDictionary * initData = data.data;
-			self.canOpen = ![initData[@"aModel"] boolValue];
+            
+#ifdef DEBUG
+            
+            self.canOpen = ![initData[@"aModel"] boolValue];
+            
+#else
+            if(isEnterprise == YES){
+                self.canOpen = ![initData[@"aModel"] boolValue];
+            }else{
+                self.canOpen = YES;
+            }
+#endif
+            
+            
 			self.iosPhoneBind = [initData[@"iosPhoneBind"] boolValue];
 			//糖果树配置
 			self.openCandyTree = [initData[@"openBoxSwitch"] boolValue];

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;
 ///房间表情的数据

YuMi/Config/ClientRedPacketModel.h

@@ -11,7 +11,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 //@class
 
-@interface ClientRedPacketModel : NSObject
+@interface ClientRedPacketModel : PIBaseModel
 
 ///红包开关
 @property (nonatomic, assign) BOOL open;

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;

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

YuMi/CustomUI/InputView/InputView/QExtendBoardView.h

@@ -9,7 +9,7 @@
 #import <UIKit/UIKit.h>
 
 
-@interface QExtendBoardItemModel : NSObject
+@interface QExtendBoardItemModel : PIBaseModel
 
 /**
  *  Cell图片

YuMi/CustomUI/InputView/InputView/QInputPhototCell.m

@@ -76,10 +76,10 @@
 		self.numberLabel.hidden = !imageInfo.isSelect;
 		self.chooseButton.selected = imageInfo.isSelect;
 		if (!imageInfo.originImage) {
-			[[TZImageManager manager] getPhotoWithAsset:imageInfo.assetInfo.asset photoWidth:200 completion:^(UIImage *photo, NSDictionary *info, BOOL isDegraded) {
+			[[TZImageManager manager] getPhotoWithAsset:imageInfo.assetInfo.asset completion:^(UIImage *photo, NSDictionary *info, BOOL isDegraded) {
 				 self.logoImageView.image = photo;
 				 self.imageInfo.originImage = photo;
-				UIImage * image = [photo compressWithMaxLength:1024 * 10];
+				UIImage * image = [photo compressWithMaxLength:1024 * 30];
 				self.imageInfo.compressImage = image;
 			 } progressHandler:nil networkAccessAllowed:NO];
 		} else {

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;
 ///是否是原图

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;
 ///分享的内容

YuMi/CustomUI/ShareView/XPShareView.m

@@ -161,6 +161,7 @@
           UIPasteboard *pasteboard = [UIPasteboard generalPasteboard];
           [pasteboard setString:urlString];
           [XNDJTDDLoadingTool showSuccessWithMessage:YMLocalizedString(@"XPShareView0")];
+       
         [TTPopup dismiss];
         return;
     }
@@ -177,8 +178,20 @@
             [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPShareView2")];
             return;
         }
-        FBtype = PlatformOfLine;
-        [shareParams SSDKSetupLineParamsByText:encodedUrl image:nil type:SSDKContentTypeAuto];
+        NSString*contentKey= [encodedUrl stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet characterSetWithCharactersInString:@"`#%^{}\"[]|\\<> "].invertedSet];
+        NSString*contentType =@"text";
+        NSString*urlString = [NSString stringWithFormat:@"line://msg/%@/%@",contentType, contentKey];
+
+        [[UIApplication sharedApplication]openURL:[NSURL URLWithString:urlString] options:@{} completionHandler:^(BOOL success) {
+            
+        }];
+
+        if (self.delegate && [self.delegate respondsToSelector:@selector(shareView:didSuccess:)]) {
+            [self.delegate shareView:self didSuccess:self.shareInfo];
+        }
+        
+//        FBtype = PlatformOfLine;
+//        [shareParams SSDKSetupLineParamsByText:encodedUrl image:nil type:SSDKContentTypeAuto];
     } else {
         title = YMLocalizedString(@"XPShareView3");
         platformType = SSDKPlatformTypeFacebook;

YuMi/CustomUI/UIImage/UIImage+Utils.h

@@ -51,4 +51,6 @@ typedef NS_ENUM(NSUInteger, GradientType) {
 
 
 -(UIImage *)compressWithMaxLength:(NSUInteger)maxLength;
+- (UIImage *)roundedImageWithCornerRadius:(CGFloat)cornerRadius size:(CGSize)size;
+
 @end

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

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
@@ -60,7 +65,7 @@ NSString * const KeyWithType(Pi_KeyType type) {
         NSDictionary * dic = @{
                 @(KeyType_PasswordEncode)           : @"1ea53d260ecf11e7b56e00163e046a26",
                 @(KeyType_NTESQuickLoginBusinessId) : @"09c1214706c34f4798d3f05d86148608",
-                @(KeyType_Agora)                    : @"7ae1a8dabe7a44a9a67c829faa409e70",
+                @(KeyType_Agora)                    : @"f8713b6ec98c4c01adaf34cb4fa091b1",
                 @(KeyType_TRTC)                     : @"1400741885",
                 @(KeyType_NetEase)                  : @"1c3b8c6bf8467d8e4c33a004dbec5c94",
                 @(keyType_YiDunBussinessId)         : @"yinyouApnsDebug",

YuMi/Global/YUMIMacroUitls.h

@@ -48,16 +48,15 @@ isPhoneXSeries = [[UIApplication sharedApplication] delegate].window.safeAreaIns
 
 
 
-
-#define PI_App_Version @"2.2.0"
-#ifdef DEBUG
-#define API_HOST_URL [NSString stringWithFormat:@"%@%@",@"http://beta.api",@".pekolive.com"]
-
-#else
-
+///内置版本号
+#define PI_App_Version @"2.5.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"
 

YuMi/Info.plist

@@ -54,7 +54,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9</string>
+	<string>2</string>
 	<key>FacebookAppID</key>
 	<string>1266232494209868</string>
 	<key>FacebookClientToken</key>

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")];

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

YuMi/Modules/YMLogin/Model/LoginAreaModel.m

@@ -8,7 +8,5 @@
 #import "LoginAreaModel.h"
 
 @implementation LoginAreaModel
-+ (NSDictionary *)replacedKeyFromPropertyName {
-    return @{@"pi_phoneAreaCode":@"phoneAreaCode"};
-}
+
 @end

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;
 ///头像的地址

YuMi/Modules/YMLogin/Presenter/LoginPresenter.h

@@ -25,6 +25,8 @@ NS_ASSUME_NONNULL_BEGIN
 -(void)thirdLoginByGoogleWithPresentingViewController:(UIViewController *)presentingViewController configuration:(GIDConfiguration *)configuration;
 ///第三方登录，fb登录
 -(void)thirdLoginByFBWithPresentingViewController:(UIViewController *)presentingViewController;
+///第三方登录，line登录
+-(void)thirdLoginByLine:(UIViewController *)presentingViewController;
 @end
 
 NS_ASSUME_NONNULL_END

YuMi/Modules/YMLogin/Presenter/LoginPresenter.m

@@ -23,7 +23,7 @@
 
 #import <FBSDKCoreKit/FBSDKCoreKit.h>
 #import <FBSDKLoginKit/FBSDKLoginKit.h>
-
+#import "YuMi-swift.h"
 
 @implementation LoginPresenter
 - (void)dealloc{
@@ -159,6 +159,30 @@
     } showLoading:YES] openid:openid unionid:unionid access_token:access_token type:[NSString stringWithFormat:@"%lu", (unsigned long)type]];
     
     
+}
+-(void)thirdLoginByLine:(UIViewController *)presentingViewController {
+    PILineLoginManager *line = [PILineLoginManager getSharedInstance];
+    [XNDJTDDLoadingTool showOnlyView:kWindow];
+     [line loginLineFromController:presentingViewController completeWithError:^(LineLoginResultStatus loginStatus, NSString * _Nullable token, NSString * _Nullable userId, NSString * _Nullable emali, NSError * _Nullable error) {
+         
+         if (loginStatus == LineLoginResultStatusSuccess) {
+             ThirdUserInfo * userInfo = [[ThirdUserInfo alloc] init];
+             NSString * openid = userId.length > 0 ? userId : @"";
+             NSString * access_token = token.length > 0 ? token : @"";
+             NSString * unionid = userId.length > 0 ? userId : @"";
+             userInfo.openid = openid;
+             userInfo.access_token = access_token;
+             userInfo.unionid = unionid;
+             [AccountInfoStorage instance].thirdUserInfo = userInfo;
+             [self loginWithThirdPartWithType:ThirdLoginType_Line];
+         } else if (loginStatus == LineLoginResultStatusCancelled) {
+             [XNDJTDDLoadingTool hideOnlyView:kWindow];
+             [[self getView] showErrorToast:YMLocalizedString(@"LoginPresenter0")];
+         } else if (loginStatus == LineLoginResultStatusError) {
+             [XNDJTDDLoadingTool hideOnlyView:kWindow];
+             [[self getView] showErrorToast:YMLocalizedString(@"LoginPresenter1")];
+         }
+     }];
 }
 -(void)thirdLoginByFBWithPresentingViewController:(UIViewController *)presentingViewController {
     [FBSDKProfile enableUpdatesOnAccessTokenChange:YES];

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;

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;

YuMi/Modules/YMLogin/View/LoginForgetPasswordViewController.m

@@ -47,7 +47,8 @@
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-    self.pi_phoneAreaCode = @"852";
+    NSString *code = [NSString getCountryCode];
+     self.pi_phoneAreaCode = [code stringByReplacingOccurrencesOfString:@"+" withString:@""];
 	[self initSubViews];
 	[self initSubViewConstraints];
 	[self initEvents];

YuMi/Modules/YMLogin/View/NewLogin/XPForgetPwdViewController.m

@@ -44,7 +44,8 @@
 }
 
 - (void)viewDidLoad {
-	self.pi_phoneAreaCode = @"852";
+    NSString *code = [NSString getCountryCode];
+     self.pi_phoneAreaCode = [code stringByReplacingOccurrencesOfString:@"+" withString:@""];
 
     [super viewDidLoad];
     [self createUI];

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 {

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

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

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,13 +47,17 @@
 	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;
 	areaStackView.distribution = UIStackViewDistributionFill;

YuMi/Modules/YMLogin/View/NewLogin/XPLoginPhoneViewController.m

@@ -67,7 +67,8 @@
 
 - (void)viewDidLoad {
     self.selectType = 0;
-	self.pi_phoneAreaCode = @"852";
+    NSString *code = [NSString getCountryCode];
+     self.pi_phoneAreaCode = [code stringByReplacingOccurrencesOfString:@"+" withString:@""];
     [super viewDidLoad];
     [self createUI];
     [self racBind];

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 {
@@ -105,11 +105,24 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy";
     [self.authBubbleView addSubview:self.authBubbleLabel];
     
     if (@available(iOS 13.0, *)) {
-    [self.stackView addArrangedSubview:self.appleButton];
+#ifdef DEBUG
+        
+        
+        
+        [self.stackView addArrangedSubview:self.appleButton];
+        
+        
+        
+#else
+        if(isEnterprise == YES){
+            [self.stackView addArrangedSubview:self.appleButton];
+        }
+#endif
+        
     }
     [self.stackView addArrangedSubview:self.googleButtonView];
-	[self.stackView addArrangedSubview:self.fbButtonView];
-	[self.stackView addArrangedSubview:self.lineButtonView];
+    [self.stackView addArrangedSubview:self.fbButtonView];
+    [self.stackView addArrangedSubview:self.lineButtonView];
     
     
     [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -159,11 +172,28 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy";
         make.left.mas_equalTo(8);
         make.bottom.mas_equalTo(self.authBubbleView).mas_offset(-6);
     }];
+    if (@available(iOS 13.0, *)) {
+#ifdef DEBUG
+        
+        
+        [self.appleButton mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.width.mas_equalTo(kGetScaleWidth(295));
+            make.height.mas_equalTo(kGetScaleWidth(46));
+        }];
+        
+        
+        
+#else
+        if(isEnterprise == YES){
+            [self.appleButton mas_makeConstraints:^(MASConstraintMaker *make) {
+                make.width.mas_equalTo(kGetScaleWidth(295));
+                make.height.mas_equalTo(kGetScaleWidth(46));
+            }];
+        }
+#endif
+        
+    }
     
-	[self.appleButton mas_makeConstraints:^(MASConstraintMaker *make) {
-		make.width.mas_equalTo(kGetScaleWidth(295));
-        make.height.mas_equalTo(kGetScaleWidth(46));
-	}];
     [self.googleButtonView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.width.mas_equalTo(kGetScaleWidth(295));
         make.height.mas_equalTo(kGetScaleWidth(46));
@@ -222,22 +252,25 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy";
 }
 
 - (void)loginDidClick:(UIButton *)sender {
-	if (self.agreeBtn.selected) {
-		ThirdLoginType type = sender.tag - 1000;
-		if(type == ThirdLoginType_Gmail){
-			[self.presenter thirdLoginByGoogleWithPresentingViewController:self configuration:self.configuration];
-			return;
+    if (self.agreeBtn.selected) {
+        ThirdLoginType type = sender.tag - 1000;
+        if(type == ThirdLoginType_Gmail){
+            [self.presenter thirdLoginByGoogleWithPresentingViewController:self configuration:self.configuration];
+            return;
         }else if(type == ThirdLoginType_FB){
             [self.presenter thirdLoginByFBWithPresentingViewController:self];
             return;
+        }else if(type == ThirdLoginType_Line){
+            [self.presenter thirdLoginByLine:self];
+            return;
         }
-		[self.presenter thirdLoginWithType:type];
+        [self.presenter thirdLoginWithType:type];
         
-	} else {
+    } else {
         [UIView animateWithDuration:0.5 animations:^{
             self.authBubbleView.alpha = 1.0;
         }];
-	}
+    }
     
 }
 
@@ -276,9 +309,9 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy";
 /// 点击一键登录
 - (void)quickLoginBtnClicked {
     if (self.agreeBtn.isSelected) {
-		XPLoginPhoneViewController *phoneVC = [[XPLoginPhoneViewController alloc] init];
-		[self.navigationController pushViewController:phoneVC animated:YES];
-		[StatisticsServiceHelper trackEventWithKey:StatisticsServiceEventLoginPhoneClick];
+        XPLoginPhoneViewController *phoneVC = [[XPLoginPhoneViewController alloc] init];
+        [self.navigationController pushViewController:phoneVC animated:YES];
+        [StatisticsServiceHelper trackEventWithKey:StatisticsServiceEventLoginPhoneClick];
     } else {
         [UIView animateWithDuration:0.5 animations:^{
             self.authBubbleView.alpha = 1.0;
@@ -375,14 +408,14 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy";
 }
 
 - (UIStackView *)stackView {
-	if (!_stackView) {
-		_stackView = [[UIStackView alloc] init];
-		_stackView.axis = UILayoutConstraintAxisVertical;
-		_stackView.distribution = UIStackViewDistributionFillEqually;
-		_stackView.alignment = UIStackViewAlignmentFill;
-		_stackView.spacing = kGetScaleWidth(16);
-	}
-	return _stackView;
+    if (!_stackView) {
+        _stackView = [[UIStackView alloc] init];
+        _stackView.axis = UILayoutConstraintAxisVertical;
+        _stackView.distribution = UIStackViewDistributionFillEqually;
+        _stackView.alignment = UIStackViewAlignmentFill;
+        _stackView.spacing = kGetScaleWidth(16);
+    }
+    return _stackView;
 }
 
 - (UILabel *)authBubbleLabel {
@@ -396,9 +429,9 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy";
 }
 
 - (UIButton *)fbButtonView {
-	if (!_fbButtonView) {
-		_fbButtonView = [UIButton buttonWithType:UIButtonTypeCustom];
-		[_fbButtonView setImage: [UIImage imageNamed:@"login_facebook"] forState:UIControlStateNormal];
+    if (!_fbButtonView) {
+        _fbButtonView = [UIButton buttonWithType:UIButtonTypeCustom];
+        [_fbButtonView setImage: [UIImage imageNamed:@"login_facebook"] forState:UIControlStateNormal];
         [_fbButtonView setTitle:YMLocalizedString(@"XPLoginViewController14") forState:UIControlStateNormal];
         _fbButtonView.titleLabel.font = kFontMedium(16);
         [_fbButtonView setTitleColor:UIColorFromRGB(0x6D6B89) forState:UIControlStateNormal];
@@ -406,16 +439,16 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy";
         _fbButtonView.backgroundColor = UIColorFromRGB(0xF3F5FA);
         _fbButtonView.layer.cornerRadius = kGetScaleWidth(46)/2;
         _fbButtonView.layer.masksToBounds = YES;
-		_fbButtonView.tag = 1000 + ThirdLoginType_FB;
-		[_fbButtonView addTarget:self action:@selector(loginDidClick:) forControlEvents:UIControlEventTouchUpInside];
-	}
-	return _fbButtonView;
+        _fbButtonView.tag = 1000 + ThirdLoginType_FB;
+        [_fbButtonView addTarget:self action:@selector(loginDidClick:) forControlEvents:UIControlEventTouchUpInside];
+    }
+    return _fbButtonView;
 }
 
 - (UIButton *)googleButtonView {
-	if (!_googleButtonView) {
-		_googleButtonView = [UIButton buttonWithType:UIButtonTypeCustom];
-		[_googleButtonView setImage: [UIImage imageNamed:@"login_gmail"] forState:UIControlStateNormal];
+    if (!_googleButtonView) {
+        _googleButtonView = [UIButton buttonWithType:UIButtonTypeCustom];
+        [_googleButtonView setImage: [UIImage imageNamed:@"login_gmail"] forState:UIControlStateNormal];
         [_googleButtonView setTitle:YMLocalizedString(@"XPLoginViewController13") forState:UIControlStateNormal];
         _googleButtonView.titleLabel.font = kFontMedium(16);
         [_googleButtonView setTitleColor:UIColorFromRGB(0x6D6B89) forState:UIControlStateNormal];
@@ -423,16 +456,16 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy";
         _googleButtonView.backgroundColor = UIColorFromRGB(0xF3F5FA);
         _googleButtonView.layer.cornerRadius = kGetScaleWidth(46)/2;
         _googleButtonView.layer.masksToBounds = YES;
-		_googleButtonView.tag = 1000 + ThirdLoginType_Gmail;
-		[_googleButtonView addTarget:self action:@selector(loginDidClick:) forControlEvents:UIControlEventTouchUpInside];
-	}
-	return _googleButtonView;
+        _googleButtonView.tag = 1000 + ThirdLoginType_Gmail;
+        [_googleButtonView addTarget:self action:@selector(loginDidClick:) forControlEvents:UIControlEventTouchUpInside];
+    }
+    return _googleButtonView;
 }
 
 - (UIButton *)lineButtonView {
-	if (!_lineButtonView) {
-		_lineButtonView = [UIButton buttonWithType:UIButtonTypeCustom];
-		[_lineButtonView setImage: [UIImage imageNamed:@"login_line"] forState:UIControlStateNormal];
+    if (!_lineButtonView) {
+        _lineButtonView = [UIButton buttonWithType:UIButtonTypeCustom];
+        [_lineButtonView setImage: [UIImage imageNamed:@"login_line"] forState:UIControlStateNormal];
         [_lineButtonView setTitle:YMLocalizedString(@"XPLoginViewController15") forState:UIControlStateNormal];
         _lineButtonView.titleLabel.font = kFontMedium(16);
         [_lineButtonView setTitleColor:UIColorFromRGB(0x6D6B89) forState:UIControlStateNormal];
@@ -440,10 +473,10 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy";
         _lineButtonView.backgroundColor = UIColorFromRGB(0xF3F5FA);
         _lineButtonView.layer.cornerRadius = kGetScaleWidth(46)/2;
         _lineButtonView.layer.masksToBounds = YES;
-		_lineButtonView.tag = 1000 + ThirdLoginType_Line;
-		[_lineButtonView addTarget:self action:@selector(loginDidClick:) forControlEvents:UIControlEventTouchUpInside];
-	}
-	return _lineButtonView;
+        _lineButtonView.tag = 1000 + ThirdLoginType_Line;
+        [_lineButtonView addTarget:self action:@selector(loginDidClick:) forControlEvents:UIControlEventTouchUpInside];
+    }
+    return _lineButtonView;
 }
 - (UIButton *)appleButton {
     if (!_appleButton) {
@@ -464,18 +497,18 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy";
 
 
 - (GIDConfiguration *)configuration{
-	if (!_configuration){
-		NSString * number = [AESUtils aesDecrypt:@"ScLBu7ctIiyGCKPro3Jj6XMdsdCCpNT9L4wyjHEF+bguqubkXNSayFBGMKmoDwe1hjfAc958XSaBdMyEaFXLO38Bwq3xURYVNpgEM4b14zg="];
-		_configuration = [[GIDConfiguration alloc] initWithClientID:number];
-	}
-	return _configuration;
+    if (!_configuration){
+        NSString * number = [AESUtils aesDecrypt:@"ScLBu7ctIiyGCKPro3Jj6XMdsdCCpNT9L4wyjHEF+bguqubkXNSayFBGMKmoDwe1hjfAc958XSaBdMyEaFXLO38Bwq3xURYVNpgEM4b14zg="];
+        _configuration = [[GIDConfiguration alloc] initWithClientID:number];
+    }
+    return _configuration;
 }
 - (UIImageView *)bgImageView{
     if(!_bgImageView){
         _bgImageView = [[UIImageView alloc]init];
         _bgImageView.image = kImage(@"pi_app_logo_new_bg");
         _bgImageView.contentMode = 2;
-        }
+    }
     return _bgImageView;
 }
 - (UIImageView *)logoView{

YuMi/Modules/YMLogin/View/XPLoginVerifBindPhoneViewController.m

@@ -54,7 +54,8 @@
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-    self.pi_phoneAreaCode = @"852";
+    NSString *code = [NSString getCountryCode];
+     self.pi_phoneAreaCode = [code stringByReplacingOccurrencesOfString:@"+" withString:@""];
     [self initSubViews];
     [self initSubViewConstraints];
     [self setConfigs];

YuMi/Modules/YMMessage/Api/Api+Message.h

@@ -12,7 +12,8 @@ NS_ASSUME_NONNULL_BEGIN
 @interface Api (Message)
 
 + (void)getChatLimit:(HttpRequestHelperCompletion)complection receiverUid:(NSString *)receiverUid ;
-
+///获取私聊限制接口
++(void)getPrivateChatCheck:(HttpRequestHelperCompletion)complection content:(NSString *)content toUid:(NSString *)toUid;
 @end
 
 NS_ASSUME_NONNULL_END

YuMi/Modules/YMMessage/Api/Api+Message.m

@@ -13,5 +13,8 @@
 	NSString * fang = [NSString stringFromBase64String:@"cHJpdmF0ZUNoYXQvbGltaXQ="];///privateChat/limit
     [self makeRequest:fang method:HttpRequestHelperMethodGET completion:complection, __FUNCTION__, receiverUid,nil];
 }
-
+///获取私聊限制接口
++(void)getPrivateChatCheck:(HttpRequestHelperCompletion)complection content:(NSString *)content toUid:(NSString *)toUid{
+    [self makeRequest:@"privateChat/check" method:HttpRequestHelperMethodGET completion:complection, __FUNCTION__, content,toUid,nil];
+}
 @end

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;

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;

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

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;
 ///立即进入

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;

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;
 ///显示昵称

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
 

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;
 ///私聊消息需要显示的内容

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

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

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;
 ///标题

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;
 ///类型

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;
 ///类型

YuMi/Modules/YMMessage/Presenter/MessagePresenter.h

@@ -24,6 +24,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 // 获取用户信息
 - (void)getUserInfoWithUid:(NSString *)uid;
+
 @end
 
 NS_ASSUME_NONNULL_END

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;
 ///消息

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

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;
 ///头像

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;
 ///是否可见

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;
 ///当前倍数

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

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;
 ///大小

YuMi/Modules/YMMessage/View/Session/SessionViewController.m

@@ -77,7 +77,7 @@
 ///P
 #import "MessagePresenter.h"
 #import "MessageProtocol.h"
-
+#import "Api+Message.h"
 
 @interface SessionViewController ()<MessageProtocol, UITableViewDelegate, UITableViewDataSource, NIMChatManagerDelegate, NIMConversationManagerDelegate, NIMMediaManagerDelegate, MessageCellDelegate, TZImagePickerControllerDelegate, SessionNavViewDelegate, SessionRiskViewDelegate,QInputBarViewDelegate, QInputBarViewDataSource,InputBoardDataSource ,InputBoardDelegate , QEmotionBoardViewDelegate, QinputPhotoViewDelegate, SessionUserInfoTableViewCellDelegate, UIImagePickerControllerDelegate, UINavigationControllerDelegate>
 
@@ -746,31 +746,60 @@
 }
 
 - (void)didFailRetry:(NIMMessage *)message {
-	if (message.isReceivedMsg) {
-		[[NIMSDK sharedSDK].chatManager fetchMessageAttachment:message error:nil];
-	} else {
-		[[NIMSDK sharedSDK].chatManager resendMessage:message error:nil];
-	}
+    [Api getPrivateChatCheck:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
+        if(code == 200){
+            if (message.isReceivedMsg) {
+                [[NIMSDK sharedSDK].chatManager fetchMessageAttachment:message error:nil];
+            } else {
+                [[NIMSDK sharedSDK].chatManager resendMessage:message error:nil];
+            }
+            return;
+        }
+        [self showErrorToast:msg];
+    } content:@"" toUid:self.session.sessionId];
+	
 }
 
 - (void)sendTextMessage:(NSString *)text {
-	NIMMessage *message = [NIMMessageMaker msgWithText:text];
-	[[[NIMSDK sharedSDK] chatManager] sendMessage:message toSession:self.session error:nil];
+    [Api getPrivateChatCheck:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
+        if(code == 200){
+            NIMMessage *message = [NIMMessageMaker msgWithText:text];
+            [[[NIMSDK sharedSDK] chatManager] sendMessage:message toSession:self.session error:nil];
+            return;
+        }
+        [self showErrorToast:msg];
+    } content:text toUid:self.session.sessionId];
+    
+    
 }
 
 - (void)audioRecordCompletion:(NSString *)recordPath {
-	NIMMessage *message = [NIMMessageMaker msgWithAudio:recordPath];
-	[[[NIMSDK sharedSDK] chatManager] sendMessage:message toSession:self.session error:nil];
+    [Api getPrivateChatCheck:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
+        if(code == 200){
+            NIMMessage *message = [NIMMessageMaker msgWithAudio:recordPath];
+            [[[NIMSDK sharedSDK] chatManager] sendMessage:message toSession:self.session error:nil];
+            return;
+        }
+        [self showErrorToast:msg];
+    } content:@"" toUid:self.session.sessionId];
+	
 }
 
 #pragma mark - TZImagePickerControllerDelegate
 - (void)imagePickerController:(TZImagePickerController *)picker didFinishPickingPhotos:(NSArray<UIImage *> *)photos sourceAssets:(NSArray *)assets isSelectOriginalPhoto:(BOOL)isSelectOriginalPhoto infos:(NSArray<NSDictionary *> *)infos {
 	[photos enumerateObjectsUsingBlock:^(UIImage * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
 		if (obj) {
-			// 构造出具体会话
-			NIMMessage * message = [NIMMessageMaker msgWithImage:obj];
-			// 发送消息
-			[[NIMSDK sharedSDK].chatManager sendMessage:message toSession:self.session error:nil];
+            [Api getPrivateChatCheck:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
+                if(code == 200){
+                    // 构造出具体会话
+                    NIMMessage * message = [NIMMessageMaker msgWithImage:obj];
+                    // 发送消息
+                    [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:self.session error:nil];
+                    return;
+                }
+                [self showErrorToast:msg];
+            } content:@"" toUid:self.session.sessionId];
+			
 		}
 	}];
 }
@@ -1024,11 +1053,18 @@
 		if (image == nil){
 			continue;
 		}
-
+        // 发送消息
 		NIMMessage * message = [NIMMessageMaker msgWithImage:image];
-		// 发送消息
-		[[NIMSDK sharedSDK].chatManager sendMessage:message toSession:self.session error:nil];
-		[view resetChoosePhotos];
+        [Api getPrivateChatCheck:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
+            if(code == 200){
+                [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:self.session error:nil];
+                [view resetChoosePhotos];
+                return;
+            }
+            [self showErrorToast:msg];
+        } content:@"" toUid:self.session.sessionId];
+		
+		
 	}
 }
 
@@ -1051,10 +1087,17 @@
 		if (picker.sourceType == UIImagePickerControllerSourceTypeCamera) {
 			UIImageWriteToSavedPhotosAlbum(selectedPhoto, nil, nil, nil);
 		}
-		// 构造出具体会话
-		NIMMessage * message = [NIMMessageMaker msgWithImage:selectedPhoto];
-		// 发送消息
-		[[NIMSDK sharedSDK].chatManager sendMessage:message toSession:self.session error:nil];
+        [Api getPrivateChatCheck:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
+            if(code == 200){
+                // 构造出具体会话
+                NIMMessage * message = [NIMMessageMaker msgWithImage:selectedPhoto];
+                // 发送消息
+                [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:self.session error:nil];
+                return;
+            }
+            [self showErrorToast:msg];
+        } content:@"" toUid:self.session.sessionId];
+		
 	}
 	[picker dismissViewControllerAnimated:YES completion:^{}];
 }

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;

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;

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;