1.去掉冗余代码

创维盒子/双子星云手机/CloudPlayer/PlayerViewController.h

@@ -45,7 +45,6 @@
 
 @end
 
-@class AdvertItemModel;
 @class PlayerControlView;
 
 
@@ -75,11 +74,11 @@
 }
 
 @property(copy,nonatomic)NSString * _Nullable internetVideoPort;
-@property(copy,nonatomic)NSString *ip;
-@property(copy,nonatomic)NSString *deviceId;
+@property(copy,nonatomic)NSString * _Nullable ip;
+@property(copy,nonatomic)NSString * _Nullable deviceId;
 @property(nonatomic,assign)BOOL canControl;/*是否可以控制设备*/
 
-@property(strong,nonatomic)PlayerControlButTipView *PlayerControlButTipV;
+@property(strong,nonatomic)PlayerControlButTipView * _Nullable PlayerControlButTipV;
 /**
 * @brief vpnStatus 1：开启    0：关闭
 */
@@ -88,9 +87,9 @@
 /**
 * @brief internetHttp websocket指令通道连接
 */
-@property (nonatomic, copy) NSString *internetHttp;
+@property (nonatomic, copy) NSString * _Nullable internetHttp;
 
-@property (nonatomic, strong) RCLiveSteamManager *liveStreamManager;
+@property (nonatomic, strong) RCLiveSteamManager * _Nullable liveStreamManager;
 
 /**是否延迟发送打开app指令*/
 @property (nonatomic, assign) BOOL               delayPostOpenAppOrder;
@@ -119,51 +118,15 @@
 //主动断开链接  后台之类的
 @property (nonatomic, assign)BOOL needToDissconnectType;
 
-//上传文件用到
-@property (nonatomic, copy) NSString * _Nullable taskUid;
-@property (nonatomic, copy) NSString * _Nullable fileName;
-@property (nonatomic, strong) NSData * _Nullable AllFileData;
-@property (nonatomic, strong) NSMutableArray * _Nullable cutFileDataArr;
-@property (nonatomic, assign) NSInteger indexOfUploadFlie;
-@property (nonatomic, assign) NSInteger cutFileEachPieceSzie;
-@property (nonatomic, strong) uploadFileDataModel *curUploadFileDataMod;
-@property (nonatomic, assign) BOOL isSuspendUploadType;
-@property (nonatomic, assign) long curUploadPostion;//当前上次片的位置
-
-//备份文件用到
-@property (nonatomic, copy) NSString * _Nullable backupsTaskUid;
-@property (nonatomic, copy) NSString * _Nullable backupsFileName;
-@property (nonatomic, strong) NSData * _Nullable backupsAllFileData;
-@property (nonatomic, strong) NSMutableArray * _Nullable backupsCutFileDataArr;
-@property (nonatomic, assign) NSInteger backupsIndexOfUploadFlie;
-//@property (nonatomic, assign) NSInteger cutFileEachPieceSzie;
-@property (nonatomic, strong) photosBackupsTaskModel *curPhotosBackupsTaskMod;
-@property (nonatomic, assign) long curBackupsPostion;//当前上次片的位置
-
-//下载缩略图用到
-@property (nonatomic, copy) NSString * _Nullable downloadThumbnailTaskUid;
-@property (nonatomic, strong) couldPhoneFileModel *curDownloadThumbnailModel;
-
-//下载文件用到
-@property (nonatomic, copy) NSString * _Nullable downloadFileTaskUid;
-@property (nonatomic, strong) couldPhoneFileModel *curDownloadFileModel;
-
-//下载nas文件用到
-@property (nonatomic, copy) NSString*nasFullPath;
 
 @property(nonatomic,assign) BOOL isCodeSuspendAudioType;//手动暂停播放音乐
 
-/**
- * @brief 云手机类型  VIP星动云手机  SVIP星曜云手机  STAR 唔即云手机
- */
-//@property(copy,nonatomic)NSString *buyVipType;
 
 //最后一帧回调
 @property (nonatomic, copy) void (^block)(void);   //saveCIImageAction
 //返回回传 最后一帧
 @property (nonatomic, copy) void (^LastImageblock)(UIImage *image,NSString *deviceId,NSArray *cloudPhones);   //saveCIImageAction
-//弹窗广告点击
-@property (nonatomic, copy) void (^AdvertBlock)(AdvertItemModel *model);
+
 
 @property (nonatomic, weak) id<PlayerViewControllerDelegate> delegate;
 
@@ -172,13 +135,10 @@ typedef void(^sureActionBlock)(UIAlertController *alertView);
 typedef void(^cancelActionBlock)(UIAlertController *alertController);
 typedef void(^completiongeBlock) (int stats , NSString *backData);
 
-/*更新云手机分辨率*/
-- (void)updatePhoneReslotings;
 
-- (void)addLoadingWithTipsView:(NSString *)tipsStr;
 -(void)showNewIndicator;
 -(void)removeNewIndicator;
-- (void)removeLoadingWithTipsView;
+
 -(void)initAlertWithTitle:(NSString *_Nullable)title message:(NSString *)message sureActionBlock:(sureActionBlock)sureActionBlock;
 - (void)saveCIImageAction:(NSString *)deviceId;
 - (void)toStopRecoder;
@@ -189,20 +149,14 @@ typedef void(^completiongeBlock) (int stats , NSString *backData);
 - (BOOL)initVideoServer;
 - (void)connectVideoServer;
 - (NSArray *)getAllIvar:(id)object;
-- (void)updatemPlayerView;
+
 - (void)tryAgain;
 - (void)requestIFrame;
 - (void)disconnectVideoServer;
 - (void)send_data:(NSString *)dataStr;
-- (void)toUpdateDeviceUse;
-- (void)phoneSelectWithIndex:(NSInteger)index;
-- (void)exitPlayerView;/*退出推拉流*/
 
-/**清除试用广告*/
-- (void)extensionClearTrialAD;
 
-- (void)showYearCardNoTime;
-- (void)showChangPhoneTipsWithPhone:(NSInteger)index;
+
 
 #pragma mark - 提示框
 - (void)showAlertWithTitle:(NSAttributedString*_Nullable)atbTitle

创维盒子/双子星云手机/CloudPlayer/PlayerViewController.mm

@@ -2383,56 +2383,7 @@ static int  couneeee = 0;
         [mPlayerView setPoMas_makeWithImageRate:tempRate isOpenVirtual:YES isUsageMode:NO];
     }
 }
-#pragma mark------------------------------------------------------------------------------------------------------------------
-#pragma mark-提示 loading 相关
-#pragma mark-添加带有文字loading
-- (void)addLoadingWithTipsView:(NSString *)tipsStr
-{
-    if (loadingWithTipsView)
-    {
-        [loadingWithTipsView removeFromSuperview];
-        loadingWithTipsView = nil;
-    }
-    loadingWithTipsView = [self loadingViewWithTipsStr:tipsStr];
-    
-    [self.view addSubview:loadingWithTipsView];
-}
-
-- (void)removeLoadingWithTipsView
-{
-    if (loadingWithTipsView)
-    {
-        [loadingWithTipsView removeFromSuperview];
-        loadingWithTipsView = nil;
-    }
-}
-
-- (UIView *)loadingViewWithTipsStr:(NSString*)tipsStr
-{
-    UIView *bgView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_W, SCREEN_H)];
-    [bgView setBackgroundColor:RGBACOLOR(0, 0, 0, 0.5)];
-    
-    FLAnimatedImage *image = [FLAnimatedImage animatedImageWithGIFData:[NSData dataWithContentsOfURL:[[NSBundle mainBundle] URLForResource:@"loadingWhiteGif" withExtension:@"gif"]]];
-    
-    FLAnimatedImageView  *upView =  [[FLAnimatedImageView alloc] init];
-    [upView setFrame:CGRectMake((SCREEN_W - 65.f)/2.f, (SCREEN_H - 65.f)/2.f, 65.f, 65.f)];
-    [upView setContentMode:UIViewContentModeScaleAspectFill];
-    [upView setBackgroundColor:[ UIColor clearColor]];
-    upView.animatedImage = image;
-    [bgView addSubview:upView];
-    
-    /*标签文字*/
-    UILabel *tipsLabel = [[UILabel alloc] initWithFrame:CGRectMake((SCREEN_W - 100.f)/2.f, (SCREEN_H - 65.f)/2.f + 65.f + 10.f, 100.f*AUTOSCALE, 20.f)];
-    [tipsLabel setText:tipsStr];
-    [tipsLabel setBackgroundColor:[UIColor clearColor]];
-    [tipsLabel setTextColor:[UIColor whiteColor]];
-    [tipsLabel setFont:[UIFont systemFontOfSize:14.f]];
-    [tipsLabel setTextAlignment:(NSTextAlignmentCenter)];
-    
-    [bgView addSubview:tipsLabel];
-    
-    return bgView;
-}
+#pragma mark---------------
 
 #pragma mark-添加loading
 -(void)showNewIndicator