1.恢复出厂设置完成

创维盒子/双子星云手机/Assets.xcassets/Set/icon_Restore_Factory.imageset/Contents.json

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

创维盒子/双子星云手机/Assets.xcassets/Set/icon_Restore_Factory_big.imageset/Contents.json

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

创维盒子/双子星云手机/Assets.xcassets/Set/icon_common_problem.imageset/Contents.json

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

创维盒子/双子星云手机/Class/ComontAlretViewController.h

@@ -28,8 +28,9 @@ typedef void (^CommonAlert_ClickCancelBtn) (void);
 @interface ComontAlretViewController : BaseViewController
 @property (nonatomic,weak)id <ComontAlretViewControllerDelegate> delegate;
 
-- (id)initWithTiTle:(NSString *)title msg:(NSString *)msg cancelTitle:(NSString *)cancelTitle okTitle:(NSString *)okTitle isOkBtnHighlight:(BOOL)okBtnHighlight didClickOk:(CommonAlert_ClickOkBtn)ok didClickCancel:(CommonAlert_ClickCancelBtn)Cancel;
+- (id)initWithTiTle:(NSString *)title msg:(NSString *)msg imageStr:(NSString *)images cancelTitle:(NSString *)cancelTitle okTitle:(NSString *)okTitle isOkBtnHighlight:(BOOL)okBtnHighlight didClickOk:(CommonAlert_ClickOkBtn)ok didClickCancel:(CommonAlert_ClickCancelBtn)Cancel;
 
+- (void)setButtonCountdownFun:(NSInteger)second;
 
 @end
 

创维盒子/双子星云手机/Class/ComontAlretViewController.m

@@ -11,12 +11,17 @@
 @interface ComontAlretViewController (){
     NSString *titleStr;
     NSString *msgStr;
+    NSString *imageStr;
     NSString *cancelTitleStr;
     NSString *okTitleStr;
     BOOL isOkBtnHighlight;
     
     CommonAlert_ClickOkBtn didClickOkBtn;
     CommonAlert_ClickCancelBtn didClickCanaelBtn;
+    
+    //扩展 按钮倒计时
+    NSInteger countdownSeconds;
+    NSTimer *curTimer;
 }
 
 @end
@@ -24,11 +29,12 @@
 @implementation ComontAlretViewController
 @synthesize delegate;
 
-- (id)initWithTiTle:(NSString *)title msg:(NSString *)msg cancelTitle:(NSString *)cancelTitle okTitle:(NSString *)okTitle isOkBtnHighlight:(BOOL)okBtnHighlight didClickOk:(CommonAlert_ClickOkBtn)ok didClickCancel:(CommonAlert_ClickCancelBtn)Cancel{
+- (id)initWithTiTle:(NSString *)title msg:(NSString *)msg imageStr:(NSString *)image cancelTitle:(NSString *)cancelTitle okTitle:(NSString *)okTitle isOkBtnHighlight:(BOOL)okBtnHighlight didClickOk:(CommonAlert_ClickOkBtn)ok didClickCancel:(CommonAlert_ClickCancelBtn)Cancel{
     self = [super init];
     
     titleStr = title;
     msgStr = msg;
+    imageStr = image;
     cancelTitleStr = cancelTitle;
     okTitleStr = okTitle;
     isOkBtnHighlight = okBtnHighlight;
@@ -56,12 +62,32 @@
     [bgView.layer setCornerRadius:8.f];
     
     [self.view addSubview:bgView];
+        
     [bgView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.centerY.equalTo(self.view.mas_centerY).offset(10*HAUTOSCALE);
         make.centerX.equalTo(self.view.mas_centerX);
         make.width.mas_equalTo(300.f);
     }];
     
+    CGFloat curTop = 30.0;
+    
+    //图片
+    UIImageView *topImageView = [[UIImageView alloc] init];
+    //topImageView.backgroundColor = [UIColor redColor];
+    
+    if(imageStr && imageStr.length > 0){
+        topImageView.image = [UIImage imageNamed:imageStr];
+        [bgView addSubview:topImageView];
+        [topImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.width.mas_equalTo(80.f);
+            make.height.mas_equalTo(80.f);
+            make.centerX.equalTo(bgView.mas_centerX);;
+            make.top.mas_equalTo(curTop);
+        }];
+        
+        curTop = 30 + 80 + 10.0;
+    }
+    
     /*主标题*/
     UILabel *titleLabel = [[UILabel alloc] init];
     [titleLabel setTextColor:HW0A132BColor];
@@ -75,7 +101,7 @@
         [titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
             make.left.mas_equalTo(8.f);
             make.right.mas_equalTo(-8.f);
-            make.top.mas_equalTo(30.f);
+            make.top.mas_equalTo(curTop);
         }];
     }
     
@@ -95,7 +121,7 @@
             if (titleStr.length > 0){
                 make.top.equalTo(titleLabel.mas_bottom).offset(15.f);
             }else{
-                make.top.mas_equalTo(30.f);
+                make.top.mas_equalTo(curTop);
             }
         }];
     }
@@ -134,6 +160,7 @@
     [cancelBtn.titleLabel setFont:[UIFont systemFontOfSize:16.f]];
     [cancelBtn.layer setCornerRadius:8.f];
     cancelBtn.clipsToBounds = YES;
+    cancelBtn.tag = 999;
     [bgView addSubview:cancelBtn];
     [cancelBtn mas_makeConstraints:^(MASConstraintMaker *make) {
         if (okTitleStr.length > 0){
@@ -220,6 +247,53 @@
     }];
 }
 
+
+- (void)setButtonCountdownFun:(NSInteger)second
+{
+    UIButton *but = [self.view viewWithTag:999];
+    
+    if(but && [but isKindOfClass:[UIButton class]]){
+        
+        countdownSeconds = second;
+        [but setEnabled:NO];
+        but.alpha = 0.5;
+        
+        NSString *curTitle = cancelTitleStr;
+        curTitle = [[NSString alloc] initWithFormat:@"%@(%ld)",curTitle,countdownSeconds];
+        [but setTitle:curTitle forState:UIControlStateNormal];
+        
+        [curTimer invalidate];
+        curTimer = [NSTimer scheduledTimerWithTimeInterval:1 target:self selector:@selector(handleCountdownFun) userInfo:nil repeats:YES];
+    }
+}
+
+- (void)handleCountdownFun
+{
+    if(countdownSeconds >= 1){
+        countdownSeconds --;
+        
+        UIButton *but = [self.view viewWithTag:999];
+        NSString *curTitle = cancelTitleStr;
+        curTitle = [[NSString alloc] initWithFormat:@"%@(%ld)",curTitle,countdownSeconds];
+        [but setTitle:curTitle forState:UIControlStateNormal];
+    }
+    else{
+        [curTimer invalidate];
+        
+        [self dismissViewControllerAnimated:NO completion:^{
+            if ([self->delegate respondsToSelector:@selector(CommonAlertokBtnClickPressed)]){
+                [self->delegate CommonAlertokBtnClickPressed];
+            }
+            
+            if(self->didClickOkBtn){
+                self->didClickOkBtn();
+            }
+        }];
+    }
+}
+
+
+
 /*
 #pragma mark - Navigation
 

创维盒子/双子星云手机/Class/Set/MySetViewController.h

@@ -19,6 +19,10 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic,copy) void (^needToReboot)(void);
 //tv投屏
 @property (nonatomic,copy) void (^needToTVP2P)(void);
+//恢复出厂盒子
+@property (nonatomic,copy) void (^needToReset)(void);
+//恢复出厂盒子 时间到了
+@property (nonatomic,copy) void (^needToResetAndOk)(void);
 @end
 
 NS_ASSUME_NONNULL_END

创维盒子/双子星云手机/Class/Set/MySetViewController.m

@@ -19,6 +19,7 @@
 #import "ComontAlretViewController.h"
 #import "ModifyPWDFirstViewController.h"
 #import "TipsQRCodeForChangeDeviceViewController.h"
+#import "connectDeviceManager.h"
 
 @interface MySetViewController ()<HelpDownScrollViewDelegate,UITableViewDelegate,UITableViewDataSource,ComontAlretViewControllerDelegate>
 {
@@ -83,6 +84,7 @@
     /*弹窗提示TV投屏*/
     ComontAlretViewController *nextVC = [[ComontAlretViewController alloc] initWithTiTle:NSLocalizedString(@"my_set_TVP2P_Open_title",nil)
                                                                                      msg:NSLocalizedString(@"my_set_TVP2P_Open_Subtitle",nil)
+                                                                                imageStr:nil
                                                                              cancelTitle:NSLocalizedString(@"my_set_TVP2P_Open_sure",nil)
                                                                                  okTitle:nil isOkBtnHighlight:NO
                                                                               didClickOk:^{
@@ -145,7 +147,6 @@
             _tableView.sectionHeaderTopPadding = 0;
         }
         
-        //TV投屏 阿胡说暂不做
         [_tableView setTableFooterView:[self tableFoorView]];
     }
     
@@ -158,9 +159,9 @@
 }
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
-    //return 7;
+    return 7;
     //return 6;//去掉隐藏进程
-    return 5;//去掉更换icon
+     //return 5;//去掉更换icon
 }
 
 - (MineViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
@@ -217,7 +218,13 @@
         [cell.titleLabel setText:NSLocalizedString(@"my_set_no_change_phone",nil)];
         [cell.mImageView setImage:[UIImage imageNamed:@"icon_change_ohone"]];
     //}else if (row == 6){
-    }else if (row == 4){
+    }else if (row == 4){/*常见问题*/
+        [cell.titleLabel setText:NSLocalizedString(@"my_set_no_common_problem",nil)];
+        [cell.mImageView setImage:[UIImage imageNamed:@"icon_common_problem"]];
+    }else if (row == 5){/*回复出厂*/
+        [cell.titleLabel setText:NSLocalizedString(@"my_set_no_Restore_Factory",nil)];
+        [cell.mImageView setImage:[UIImage imageNamed:@"icon_Restore_Factory"]];
+    }else if (row == 6){/*重启空间*/
         [cell.titleLabel setText:NSLocalizedString(@"my_set_no_restart_phone",nil)];
         [cell.mImageView setImage:[UIImage imageNamed:@"icon-gengxin"]];
         /*下圆角*/
@@ -266,11 +273,15 @@
     }else if (3 == row){/*更换设备*/
         TipsQRCodeForChangeDeviceViewController *vc = [[TipsQRCodeForChangeDeviceViewController alloc] init];
         [self.navigationController pushViewController:vc animated:YES];
-//    }else if (6 == row){/*重启空间*/
-    }else if (4 == row){/*重启空间*/
+    }else if (4 == row){/*常见问题*/
+        [[iToast makeText:@"常见问题待接入"] show];
+    }else if (5 == row){/*恢复出厂*/
+        [self RestoreFactoryAleartFun];
+    }else if (6 == row){/*重启空间*/
         /*弹窗提示重启*/
         ComontAlretViewController *nextVC = [[ComontAlretViewController alloc] initWithTiTle:NSLocalizedString(@"my_set_no_restart_phone_tips",nil)
                                                                                          msg:nil
+                                                                                    imageStr:nil
                                                                                  cancelTitle:NSLocalizedString(@"other_cancel",nil)
                                                                                      okTitle:NSLocalizedString(@"my_set_no_restart_phone_btn_ok",nil) isOkBtnHighlight:NO
                                                                                   didClickOk:^{
@@ -297,4 +308,106 @@
     [[iToast makeText:NSLocalizedString(@"player_link_rebooting_Tips",nil)] show];
 }
 
+#pragma mark 点击恢复出厂
+- (void)RestoreFactoryAleartFun
+{
+    KWeakSelf
+    /*弹窗提示恢复出厂*/
+    ComontAlretViewController *nextVC = [[ComontAlretViewController alloc] initWithTiTle:NSLocalizedString(@"my_set_no_Restore_Factory_tips",nil)
+                                                                                     msg:NSLocalizedString(@"my_set_no_Restore_Factory_msg",nil)
+                                                                                imageStr:@"icon_Restore_Factory_big"
+                                                                             cancelTitle:NSLocalizedString(@"my_set_TVP2P_Open_sure",nil)
+                                                                                 okTitle:NSLocalizedString(@"other_cancel",nil) isOkBtnHighlight:YES
+                                                                              didClickOk:^{
+        
+    } didClickCancel:^{
+        //点击确定
+        [weakSelf gotoResetFun];
+    }];
+    nextVC.modalPresentationStyle = UIModalPresentationCustom;
+    
+    [self presentViewController:nextVC animated:YES completion:^{
+        nextVC.view.superview.backgroundColor = [UIColor clearColor];
+    }];
+}
+
+#pragma mark 点击了恢复出厂
+- (void)gotoResetFun
+{
+    if(_needToReset){
+        _needToReset();
+    }
+    
+    [self RestoreFactoryingFun];
+}
+
+#pragma mark 恢复出厂中
+- (void)RestoreFactoryingFun
+{
+    KWeakSelf
+    /*弹窗提示恢复出厂*/
+    ComontAlretViewController *nextVC = [[ComontAlretViewController alloc] initWithTiTle:NSLocalizedString(@"my_set_no_Restore_Factorying_tips",nil)
+                                                                                     msg:NSLocalizedString(@"my_set_no_Restore_Factorying_msg",nil)
+                                                                                imageStr:nil
+                                                                             cancelTitle:NSLocalizedString(@"my_set_no_Restore_Factorying",nil)
+                                                                                 okTitle:nil
+                                                                        isOkBtnHighlight:NO
+                                                                              didClickOk:^{
+        [weakSelf RestoreFactoryCompleteFun];
+    } didClickCancel:^{
+    
+    }];
+    
+    [nextVC setButtonCountdownFun:180];//90
+    
+    nextVC.modalPresentationStyle = UIModalPresentationCustom;
+    
+    [self presentViewController:nextVC animated:YES completion:^{
+        nextVC.view.superview.backgroundColor = [UIColor clearColor];
+    }];
+}
+
+#pragma mark 恢复出厂倒计时结束
+- (void)RestoreFactoryCompleteFun
+{
+    KWeakSelf
+    //瑞云发起重连
+    NSString *snStr = [connectDeviceManager shareInstance].DeviceThirdIdMod.data.sn;
+    if(snStr){
+        [[connectDeviceManager shareInstance] getThridMsgBySN:snStr needReconnect:YES didNetEnd:^(bool didSuc) {
+            if(didSuc){
+                if(self->_needToResetAndOk){
+                    self->_needToResetAndOk();
+                }
+            }
+            else{
+                [weakSelf RestoreFactoryCompleteFun];
+                return;
+            }
+        }];
+    }
+    
+    
+    /*弹窗提示恢复出厂*/
+    ComontAlretViewController *nextVC = [[ComontAlretViewController alloc] initWithTiTle:NSLocalizedString(@"my_set_no_Restore_Factory_ok_tips",nil)
+                                                                                     msg:NSLocalizedString(@"my_set_no_Restore_Factory_ok_msg",nil)
+                                                                                imageStr:nil
+                                                                             cancelTitle:NSLocalizedString(@"my_set_no_Restore_FactoryOK",nil)
+                                                                                 okTitle:nil
+                                                                        isOkBtnHighlight:NO
+                                                                              didClickOk:^{
+        
+    } didClickCancel:^{
+        [weakSelf.navigationController popViewControllerAnimated:YES];
+    }];
+    
+    
+    
+    nextVC.modalPresentationStyle = UIModalPresentationCustom;
+    
+    [self presentViewController:nextVC animated:YES completion:^{
+        nextVC.view.superview.backgroundColor = [UIColor clearColor];
+    }];
+}
+
 @end

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

@@ -150,6 +150,7 @@ ComontAlretViewControllerDelegate>
 @property (nonatomic, copy)   NSString*LogoutTimerStr;//单点登出时间
 @property (nonatomic, assign) BOOL needShowLogoutDelayType;//是否是延时显示单点登出
 @property (nonatomic, assign) BOOL isRebootIngType;//是否为重启中
+@property (nonatomic, assign) BOOL isResetingType;//是否为恢复出厂中
 @end
 
 @implementation PlayerViewController
@@ -207,11 +208,22 @@ ComontAlretViewControllerDelegate>
     mySelf   = self;
     haveBack = NO;
     
+    [self   startCheckThridRuiYunTimerFun];
+}
+
+#pragma mark 启动检测瑞云的timer
+ - (void)startCheckThridRuiYunTimerFun
+{
+    if(_checkThridConnectTimer ){
+        [_checkThridConnectTimer invalidate];
+    }
+    
+    _checkThridConnectNum = 0;
+    
     _checkThridConnectTimer = [NSTimer scheduledTimerWithTimeInterval:1 target:self selector:@selector(checkThridRuiYunFun) userInfo:nil repeats:YES];
     [[NSRunLoop currentRunLoop] addTimer:_checkThridConnectTimer forMode:NSRunLoopCommonModes];
 }
 
-
 #pragma mark 检测融云链接是否完成
 - (void)checkThridRuiYunFun{
     
@@ -1142,6 +1154,16 @@ ComontAlretViewControllerDelegate>
                 _isRebootIngType = NO;
             }
             
+            //重启后重连 出来的
+            if(_isResetingType){
+                mainBlock(^{
+                    [[iToast makeText:NSLocalizedString(@"my_set_no_Restore_Factorying_tips",nil)] show];
+                });
+                _isResetingType = NO;
+            }
+            
+            
+            
             //  报链接失败 后面又连接上了
             if(linkFailAlretVC){
                 mainBlock(^{
@@ -1531,6 +1553,25 @@ NSDate *lastVideoTome;/*上一帧数据时间*/
         NSString *commondStr  = @"{\"type\":\"wakeupTV\"}";
         [self send_data:commondStr];
     };
+    
+#pragma mark 恢复出厂盒子
+    nextVC.needToReset = ^{
+        
+        NSString *commondStr  = @"{\"type\":\"reset\"}";
+        [self send_data:commondStr];
+        
+        //最后一帧 没显示正在重启问题
+        //self->_canShowImgAndVoiceType = YES;
+        self->_isResetingType = YES;
+        
+    };
+    
+#pragma mark 恢复出厂盒子 ok
+        nextVC.needToResetAndOk = ^{
+            [self startCheckThridRuiYunTimerFun];
+        };
+        
+    
 }
 
 #pragma mark 盒子第一次连接成功  给ws发送信息 单点登录 把其他账号挤下去
@@ -1630,6 +1671,7 @@ NSDate *lastVideoTome;/*上一帧数据时间*/
     /*弹窗提示重启*/
     logoutAlertVC = [[ComontAlretViewController alloc] initWithTiTle:NSLocalizedString(@"single_sign_on_Tips_logout",nil)
                                                                                      msg:_LogoutTimerStr
+                                                                                imageStr:nil
                                                                              cancelTitle:NSLocalizedString(@"single_sign_on_exit",nil)
                                                                                  okTitle:NSLocalizedString(@"single_sign_on_login_again",nil) isOkBtnHighlight:YES
                                                                               didClickOk:^{
@@ -1928,6 +1970,13 @@ NSDate *lastVideoTome;/*上一帧数据时间*/
         return;
     }
     
+    if(_isResetingType){
+        if(![self isPlayerViewIsTopVCFun]){
+            [[iToast makeText:NSLocalizedString(@"my_set_no_Restore_Factorying_tips",nil)] show];
+        }
+        return;
+    }
+    
     if([self isPlayerViewIsTopVCFun]){
         
         //等下再发
@@ -1946,6 +1995,7 @@ NSDate *lastVideoTome;/*上一帧数据时间*/
     
     linkFailAlretVC= [[ComontAlretViewController alloc] initWithTiTle:NSLocalizedString(@"player_link_fail_title",nil)
                                                                                       msg:linkErrTip
+                                                                                 imageStr:nil
                                                                               cancelTitle:NSLocalizedString(@"single_sign_on_exit",nil)
                                                                                   okTitle:NSLocalizedString(@"player_link_fail_tryAgain",nil) isOkBtnHighlight:YES
                                                                                didClickOk:^{
@@ -1985,7 +2035,7 @@ BOOL inReconnect = NO;
             }
             
             //重启后重连 出来的 不显示
-            if(!self->_isRebootIngType){
+            if(!self->_isRebootIngType && !self->_isResetingType){
                 /*链接失败*/
                 [[iToast makeText:NSLocalizedString(@"player_link_fail_tip",nil)] show];
             }

创维盒子/双子星云手机/zh-Hans.lproj/Localizable.strings

@@ -240,3 +240,15 @@
 "input_pwd_forget_secret_key" = "忘记秘钥";
 
 "guide_qrcoede_open_album" = "打开相册";
+
+"my_set_no_common_problem" = "常见问题";
+"my_set_no_Restore_Factory" = "恢复出厂";
+
+"my_set_no_Restore_Factory_tips" = "你确定要恢复出厂？";
+"my_set_no_Restore_Factory_msg" = "可能导致数据丢失、应用丢失和设置重置，需谨慎操作。";
+"my_set_no_Restore_Factorying_tips" = "恢复出厂设置中";
+"my_set_no_Restore_Factorying_msg" = "正在恢复出厂设置中，期间请勿操作。";
+"my_set_no_Restore_Factorying" = "恢复中";
+"my_set_no_Restore_Factory_ok_tips" = "恢复出厂设置成功";
+"my_set_no_Restore_Factory_ok_msg" = "恢复完成，将跳转到首页。";
+"my_set_no_Restore_FactoryOK" = "好的";