更换图片logo

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/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

@@ -10,6 +10,8 @@
 #import <NIMSDK/NIMSDK.h>
 #import <ShareSDK/ShareSDK.h>
 #import <UserNotifications/UNUserNotificationCenter.h>
+#import <UserNotifications/UserNotifications.h>
+
 ///Tool
 #import "YUMIConstant.h"
 #import "CustomAttachmentDecoder.h"
@@ -23,13 +25,19 @@
 #import "XCCurrentVCStackManager.h"
 #import "ClientConfig.h"
 #import <Adjust/Adjust.h>
+#import <UserNotifications/UserNotifications.h>
+
 
 #import <Bugly/Bugly.h>
 
+#import "YuMi-swift.h"
+
 
 UIKIT_EXTERN NSString * kYouMiNumberCountKey;
 UIKIT_EXTERN NSString * adImageName;
 
+
+
 @implementation AppDelegate (ThirdConfig)
 
 
@@ -40,6 +48,24 @@ UIKIT_EXTERN NSString * adImageName;
 	[self initEmojiData];
     [self configAdjust];
     [self configBugly];
+    [self registerNot];
+}
+-(void)registerNot{
+    if (@available(iOS 10.0, *)) {
+                UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
+                [center requestAuthorizationWithOptions:(UNAuthorizationOptionAlert | UNAuthorizationOptionBadge | UNAuthorizationOptionSound) completionHandler:^(BOOL granted, NSError * _Nullable error) {
+                    if (granted) {
+                        [center getNotificationSettingsWithCompletionHandler:^(UNNotificationSettings * _Nonnull settings) {
+                            if (settings.authorizationStatus == UNAuthorizationStatusAuthorized){
+                                dispatch_async(dispatch_get_main_queue(), ^{
+                                    [[UIApplication sharedApplication] registerForRemoteNotifications];
+                                });
+                            }
+                        }];
+                    }
+                }];
+            }
+   
 }
 /**
  崩溃收集 Bugly
@@ -69,7 +95,15 @@ UIKIT_EXTERN NSString * adImageName;
 	//推荐在程序启动的时候初始化 NIMSDK
 	NSString *appKey        = KeyWithType(KeyType_NetEase);
 	NIMSDKOption *option    = [NIMSDKOption optionWithAppKey:appKey];
+#ifdef DEBUG
+    option.apnsCername = @"pikoDevelopPush";
+#else
     option.apnsCername = @"newPiko";
+#endif
+ 
+    
+
+    
 	[[NIMSDK sharedSDK] registerWithOption:option];
 	
 	// NIM SDK初始化
@@ -104,7 +138,7 @@ UIKIT_EXTERN NSString * adImageName;
 }
 - (void)configShareSDK {
 
-  
+    [PILineLoginManager registerLine];
 
 	[ShareSDK registPlatforms:^(SSDKRegister *platformsRegister) {
 		///faceBook

YuMi/Appdelegate/AppDelegate.m

@@ -19,6 +19,8 @@
 #import <GoogleSignIn/GoogleSignIn.h>
 #import "XPLoginViewController.h"
 #import "AccountModel.h"
+#import "YuMi-swift.h"
+#import "SessionViewController.h"
 @import Firebase;
 UIKIT_EXTERN NSString * const kOpenRoomNotification;
 
@@ -104,10 +106,42 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification;
 	[[NIMSDK sharedSDK] updateApnsToken:deviceToken ];
 }
 
+- (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo fetchCompletionHandler:(void (^)(UIBackgroundFetchResult))completionHandler{
+   
+    NSString *data = userInfo[@"data"];
+    if(data){
+        NSDictionary *dataDic = [data mj_JSONObject];
+        NSString *userId = dataDic[@"uid"];
+        if(userId){
+            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                [[NSNotificationCenter defaultCenter]postNotificationName:kOpenRoomNotification object:nil userInfo:@{@"type":@"kOpenChat",@"uid":userId,@"isNoAttention":@(YES)}];
+            ClientConfig *config = [ClientConfig shareConfig];
+            config.pushChatId = userId;
+           
+            });
+            return;
+        }
+    }
+    
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        NSString *userId = userInfo[@"uid"];
+        if(userId){
+            [[NSNotificationCenter defaultCenter]postNotificationName:kOpenRoomNotification object:nil userInfo:@{@"type":@"kOpenChat",@"uid":userId,@"isNoAttention":@(YES)}];
+            ClientConfig *config = [ClientConfig shareConfig];
+            config.pushChatId = userId;
+        }
+       });
+   
+   
+    
+}
+
 ///URL Scheme跳转
 -(BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary<NSString *,id> *)options{
-   
-    
+    NSString *bundleID = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleIdentifier"];
+    if ([url.scheme isEqualToString:[NSString stringWithFormat:@"line3rdp.%@",bundleID]]) {
+            return [PILineLoginManager applicationOpenurl:app open:url];
+        }
     
     NSString *text = [url query];
     if(text.length){

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

@@ -1,16 +1,15 @@
 {
   "images" : [
     {
+      "filename" : "room_across_pk_assist.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "room_menu_send_bg@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "room_menu_send_bg@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

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/Activity/pi_room_activity_click_arrow.imageset/Contents.json

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

YuMi/Assets.xcassets/yna/Broadcast/pi_room_activity_choose_play_arrow.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "pi_room_activity_choose_play_arrow@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "pi_room_activity_choose_play_arrow@3x.png",
+      "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/Assets.xcassets/yna/Menu/pi_room_menu_bottom_send_bg.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "pi_room_menu_bottom_send_bg.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "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;
@@ -29,6 +29,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, copy) NSString *__nullable roomId;
 ///用户id，用于外部h5跳转到聊天页面
 @property (nonatomic, copy) NSString *__nullable chatId;
+///用户id，推送跳转到聊天页面
+@property (nonatomic, copy) NSString *__nullable pushChatId;
 ///表情---
 @property (nonatomic, copy) NSString *version;
 @property (nonatomic, copy) NSString *zipMd5;

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

@@ -143,12 +143,6 @@
         [TTPopup dismiss];
         return;
     };
-    
-    if([self isInstallClient:[self getSharePlatformType:item.type]] == NO){
-        [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPShareView9")];
-        [TTPopup dismiss];
-        return;
-    }
     if (item.type == XPShareItemTagAppFriends) {
         [TTPopup dismiss];
         XPMineShareViewController * shareVC = [[XPMineShareViewController alloc] init];
@@ -161,10 +155,15 @@
           UIPasteboard *pasteboard = [UIPasteboard generalPasteboard];
           [pasteboard setString:urlString];
           [XNDJTDDLoadingTool showSuccessWithMessage:YMLocalizedString(@"XPShareView0")];
+       
+        [TTPopup dismiss];
+        return;
+    }
+    if([self isInstallClient:[self getSharePlatformType:item.type]] == NO){
+        [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPShareView9")];
         [TTPopup dismiss];
         return;
     }
-    
     
     self.shareInfo.shareType = item.type;
     
@@ -177,8 +176,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/CustomUI/VagueImageView/UIImage+ImageEffects.h

@@ -103,5 +103,6 @@
 - (UIImage *)applyTintEffectWithColor:(UIColor *)tintColor;
 
 - (UIImage *)applyBlurWithRadius:(CGFloat)blurRadius tintColor:(UIColor *)tintColor saturationDeltaFactor:(CGFloat)saturationDeltaFactor maskImage:(UIImage *)maskImage;
-
+///为图片增加毛玻璃,value模糊程度
++(UIImage *)setBlurImage:(UIImage *)image value:(CGFloat)value;
 @end

YuMi/CustomUI/VagueImageView/UIImage+ImageEffects.m

@@ -273,6 +273,37 @@
 
     return outputImage;
 }
++(UIImage *)setBlurImage:(UIImage *)image value:(CGFloat)value{
 
 
+    CIContext *context = [CIContext contextWithOptions:nil];
+    CIImage * sourceImage = [CIImage imageWithCGImage:image.CGImage];//将图片转换成CIImage
+
+    ///图片仿射滤镜
+
+    CIFilter * clamp = [CIFilter filterWithName:@"CIAffineClamp"];//设置绘制类型
+
+    [clamp setValue:sourceImage forKey:kCIInputImageKey];//设置要绘制的图片
+
+    CIImage *clampResult = [clamp valueForKey:kCIOutputImageKey];
+
+    ///高斯模糊滤镜
+
+    CIFilter* gaussianBlur = [CIFilter filterWithName:@"CIGaussianBlur"];
+
+    [gaussianBlur setValue:clampResult forKey:kCIInputImageKey];
+
+    [gaussianBlur setValue:[NSNumber numberWithFloat:value] forKey:@"inputRadius"];//设置模糊值
+
+    CIImage * gaussianBlurResult = [gaussianBlur valueForKey:kCIOutputImageKey];
+
+    ///转化获取图片
+
+    CGImageRef cgImage = [context createCGImage:gaussianBlurResult fromRect:[sourceImage extent]];
+
+    UIImage * resultImage = [UIImage imageWithCGImage:cgImage];
+    return resultImage;
+ 
+}
+
 @end

YuMi/Global/YUMIConstant.m

@@ -50,7 +50,12 @@ NSString * const kFreeGiftCountdownNotification = @"kFreeGiftCountdownNotificati
 NSString * const KeyWithType(Pi_KeyType type) {
     BOOL isRelase  = NO;
 #ifdef DEBUG
+    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",
@@ -92,7 +97,7 @@ NSString * const KeyWithType(Pi_KeyType type) {
 			@(KeyType_NTESQuickLoginBusinessId) : @"sCsa0RnuPYtEeE+efSDuHRYEfCObccfLfAK/Sn1LC8X/YifkZfyHNlCts1syZE3R",///60cdaa83aa654e5ea184de7160b4073d
             @(KeyType_TRTC)                     : @"Phn3JPi/ZvZ7zVM099Q3dg==",///1400600174
 			///h+GaKZVuHTQz0wEHbg8HLaUTL9mCjNDRcRo1OJTESWhiE/lzcnvMEv00/dxu8cOq
-			@(KeyType_NetEase)                  : @"d55LVCUFT72SVZskbk1L3ZCVjG+tRnUnOqAGuG04kb9uz+qIvbyudhJLDmbOFDtE",///14ef7a0d0a84cb49bae1c22d78cf1ddf
+			@(KeyType_NetEase)                  : @"d55LVCUFT72SVZskbk1L3ZCVjG+tRnUnOqAGuG04kb9uz+qIvbyudhJLDmbOFDtE",///d4d74e9ba6ac3364ccc7526ea4791215
 			@(keyType_YiDunBussinessId)         : @"tl2ZVgj6Mrf9lhoJ9ikxgu8tHJoloM5pxk+hsHIB4pulU6r531Qc7Ol5X8QR5Jy0",
             @(KeyType_FacePwdEncode)            : @"mjaN83evhuwnbE4yEiLQpvH7sALhxCuJ6aPjPlq5amVpHsQtSdbgri3JoHqf/I9+",///1ea53d260ecf11e7b56e00163e046a26
 			@(KeyType_GuildUidKey)              : @"umyLNHTFzWIPw2FWQcYIeQ==",

YuMi/Global/YUMIMacroUitls.h

@@ -48,16 +48,15 @@ isPhoneXSeries = [[UIApplication sharedApplication] delegate].window.safeAreaIns
 
 
 
-
-#define PI_App_Version @"2.2.1"
-#ifdef DEBUG
-#define API_HOST_URL [NSString stringWithFormat:@"%@%@",@"http://beta.api",@".pekolive.com"]
-
-#else
-
+///内置版本号
+#define PI_App_Version @"2.6.3"
+///渠道
+#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];
 		}
 	}
+    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,11 +135,13 @@
 	}
 	return cell;
 }
--(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
-	LoginAreaModel *codeModel = self.listData[indexPath.section][indexPath.row];
+
+#pragma mark - XPLoginAreaTableViewCellDelegate
+- (void)didSelectModel:(LoginAreaModel *)model{
+    LoginAreaModel *codeModel = model;
     if(self.delegate && [self.delegate respondsToSelector:@selector(chooseAreaCodeSuccess:)]){
 
-		[self.delegate chooseAreaCodeSuccess:codeModel.pi_phoneAreaCode ?: codeModel.phone_area_code];
+        [self.delegate chooseAreaCodeSuccess:codeModel.code];
     }
     [self.navigationController popViewControllerAnimated:YES];
 }

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 {
@@ -260,6 +260,9 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy";
         }else if(type == ThirdLoginType_FB){
             [self.presenter thirdLoginByFBWithPresentingViewController:self];
             return;
+        }else if(type == ThirdLoginType_Line){
+            [self.presenter thirdLoginByLine:self];
+            return;
         }
         [self.presenter thirdLoginWithType:type];
         

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

@@ -96,8 +96,7 @@ typedef NS_ENUM(NSUInteger, CustomMessageType) {
     CustomMessageType_Gift_Compound = 93,
 	///涂鸦礼物
 	CustomMessageType_Graffiti_Gift = 94,
-	///星级厨房飘屏
-	CustomMessageType_Graffiti_Star_Kitchen = 95,
+	
     ///免费礼物倒计时重置时间
     CustomMessageType_Free_Gift_Star_Reset_Time = 96,
     ///精灵密藏
@@ -110,6 +109,12 @@ typedef NS_ENUM(NSUInteger, CustomMessageType) {
     CustomMessageType_Common_H5 = 100,
     ///房间相册
     CustomMessageType_Room_Album = 101,
+    ///守护星球
+    CustomMessageType_Guardian_Planet = 102,
+    ///通用公屏信息
+    CustomMessageType_General_Public_Screen = 103,
+    ///疯狂动物园飘屏
+    CustomMessageType_Graffiti_Star_Kitchen = 104,
 };
 
 
@@ -543,12 +548,11 @@ typedef NS_ENUM(NSUInteger, CustomMessageGraffitiGift) {
 
 //first = CustomMessageType_Graffiti_Star_Kitchen
 typedef NS_ENUM(NSUInteger, CustomMessageGraffitiStarKitchen) {
-	/// // 星级厨房礼物房间飘屏通知
-	Custom_Message_Sub_Star_Kitchen_Room = 950,
+
 	/// // 星级厨房礼物全服飘屏通知
-	Custom_Message_Sub_Star_Kitchen_Server = 951,
+	Custom_Message_Sub_Star_Kitchen_Server = 1041,
     /// // 星级厨房礼物全服飘屏通知
-    Custom_Message_Sub_Star_Kitchen_FullScreen = 952,
+    Custom_Message_Sub_Star_Kitchen_FullScreen = 1042,
 };
 ///夺宝精灵 CustomMessageType_Treasure_Fairy = 97,
 typedef NS_ENUM(NSInteger, CustomMessageTreasureFairy) {
@@ -616,7 +620,21 @@ typedef NS_ENUM(NSUInteger, CustomMessageTypeRoomAlbum) {
     ///所有房间
     Custom_Message_Sub_Room_Album = 1011,
 };
-@interface AttachmentModel : NSObject<NIMCustomAttachment>
+//CustomMessageType_Guardian_Planet = 102,
+typedef NS_ENUM(NSUInteger, CustomMessageTypeGuardianPlanet) {
+    ///所有房间
+    Custom_Message_Sub_Guardian_Planet_One_Room = 1021,//单房间
+    Custom_Message_Sub_Guardian_Planet_All_Room = 1022,///全部房间
+};
+///通用公屏信息
+//CustomMessageType_General_Public_Screen = 10000,
+typedef NS_ENUM(NSUInteger, CustomMessageTypeGeneralPublicScreen) {
+    ///所有房间
+    Custom_Message_Sub_General_Public_Screen_One_Room = 1031,//单房间
+    Custom_Message_Sub_General_Public_Screen_All_Room = 1032,///全部房间
+};
+
+@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/MessageContentTweetView.m

@@ -71,7 +71,7 @@
     
     
     CGFloat desHeight = [model.desc boundingRectWithSize:CGSizeMake(240, CGFLOAT_MAX) options:NSStringDrawingUsesFontLeading | NSStringDrawingUsesLineFragmentOrigin
-                                            attributes:[self messageTextAttibutes:[UIFont systemFontOfSize:13] color:[DJDKMIMOMColor mainTextColor]] context:nil].size.height;
+                                            attributes:[self messageTextAttibutes:[UIFont systemFontOfSize:13] color:[DJDKMIMOMColor mainTextColor]] context:nil].size.height + 10;
     [self.subTitleLabel mas_updateConstraints:^(MASConstraintMaker *make) {
         make.height.mas_equalTo(desHeight);
     }];

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>
 
@@ -203,7 +203,7 @@
 - (void)loadAlbumPhotos {
 	@kWeakify(self);
 	[YYUtility checkAssetsLibrayAvailable:^{
-		@kStrongify(self);
+	
 
 	} denied:^{
 
@@ -746,31 +746,66 @@
 }
 
 - (void)didFailRetry:(NIMMessage *)message {
+    [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 {
+    [Api getPrivateChatCheck:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
+        if(code == 200){
             NIMMessage *message = [NIMMessageMaker msgWithText:text];
+            message.apnsPayload = @{@"uid": [AccountInfoStorage instance].getUid //表明该条消息的发送者的账号或者消息所属的群组 ID
+                                  };
             [[[NIMSDK sharedSDK] chatManager] sendMessage:message toSession:self.session error:nil];
+            return;
+        }
+        [self showErrorToast:msg];
+    } content:text toUid:self.session.sessionId];
+    
+    
 }
 
 - (void)audioRecordCompletion:(NSString *)recordPath {
+    [Api getPrivateChatCheck:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
+        if(code == 200){
             NIMMessage *message = [NIMMessageMaker msgWithAudio:recordPath];
+            message.apnsPayload = @{@"uid": [AccountInfoStorage instance].getUid //表明该条消息的发送者的账号或者消息所属的群组 ID
+                                  };
             [[[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) {
+            [Api getPrivateChatCheck:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
+                if(code == 200){
                     // 构造出具体会话
                     NIMMessage * message = [NIMMessageMaker msgWithImage:obj];
+                    message.apnsPayload = @{@"uid": [AccountInfoStorage instance].getUid //表明该条消息的发送者的账号或者消息所属的群组 ID
+                                          };
                     // 发送消息
                     [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:self.session error:nil];
+                    return;
+                }
+                [self showErrorToast:msg];
+            } content:@"" toUid:self.session.sessionId];
+			
 		}
 	}];
 }
@@ -956,7 +991,9 @@
 	[TTPopup alertWithConfig:config confirmHandler:^{
 		NSURL *url = [NSURL URLWithString:UIApplicationOpenSettingsURLString];
 		if ([[UIApplication sharedApplication] canOpenURL:url]) {
-			[[UIApplication sharedApplication] openURL:url];
+            [[UIApplication sharedApplication] openURL:url options:@{} completionHandler:^(BOOL success) {
+                
+            }];
 		}
 	} cancelHandler:^{
 	}];
@@ -1024,11 +1061,20 @@
 		if (image == nil){
 			continue;
 		}
-
-		NIMMessage * message = [NIMMessageMaker msgWithImage:image];
         // 发送消息
+		NIMMessage * message = [NIMMessageMaker msgWithImage:image];
+        [Api getPrivateChatCheck:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
+            if(code == 200){
+                message.apnsPayload = @{@"uid": [AccountInfoStorage instance].getUid //表明该条消息的发送者的账号或者消息所属的群组 ID
+                                      };
                 [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:self.session error:nil];
                 [view resetChoosePhotos];
+                return;
+            }
+            [self showErrorToast:msg];
+        } content:@"" toUid:self.session.sessionId];
+		
+		
 	}
 }
 
@@ -1051,10 +1097,19 @@
 		if (picker.sourceType == UIImagePickerControllerSourceTypeCamera) {
 			UIImageWriteToSavedPhotosAlbum(selectedPhoto, nil, nil, nil);
 		}
+        [Api getPrivateChatCheck:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
+            if(code == 200){
                 // 构造出具体会话
                 NIMMessage * message = [NIMMessageMaker msgWithImage:selectedPhoto];
+                message.apnsPayload = @{@"uid": [AccountInfoStorage instance].getUid //表明该条消息的发送者的账号或者消息所属的群组 ID
+                                      };
                 // 发送消息
                 [[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;

YuMi/Modules/YMMine/Model/ExchangeAuthority/XPMineExchangeAuthorityModel.h

@@ -10,7 +10,7 @@
 #import "YUMINNNN.h"
 NS_ASSUME_NONNULL_BEGIN
 
-@interface XPMineExchangeAuthorityModel : NSObject
+@interface XPMineExchangeAuthorityModel : PIBaseModel
 ///用户id
 @property (nonatomic,copy) NSString *uid;
 ///头像

YuMi/Modules/YMMine/Model/FootPrint/XPMineFootPrintModel.h

@@ -9,7 +9,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface XPMineFootPrintModel : NSObject
+@interface XPMineFootPrintModel : PIBaseModel
 
 @property (nonatomic, copy) NSString *roomUid;//房间uid
 @property (nonatomic, copy) NSString *roomId;//房间id

YuMi/Modules/YMMine/Model/Friend/FansInfoModel.h

@@ -11,7 +11,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface FansInfoModel : NSObject
+@interface FansInfoModel : PIBaseModel
 ///生日
 @property(nonatomic,assign) long birth;
 ///头像

YuMi/Modules/YMMine/Model/Recharge/RechargeListModel.h

@@ -9,7 +9,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface RechargeListModel : NSObject
+@interface RechargeListModel : PIBaseModel
 ///充值的id
 @property(nonatomic, strong) NSString *chargeProdId;
 @property(nonatomic, strong) NSString *prodName;

YuMi/Modules/YMMine/Model/Recharge/WalletInfoModel.h

@@ -9,7 +9,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface WalletInfoModel : NSObject
+@interface WalletInfoModel : PIBaseModel
 /// 用户 uid
 @property(nonatomic, assign) NSInteger uid;
 /// 钻石数量