Просмотр исходного кода

1.icon
2.重启盒子
3.版本检测接口

huangxiaodong лет назад: 2
Родитель
Сommit
41ec3d3a11
23 измененных файлов с 168 добавлено и 185 удалено
  1. BIN
      创维盒子/双子星云手机/Assets.xcassets/AppIcon.appiconset/1024*1024.png
  2. 118 132
      创维盒子/双子星云手机/Assets.xcassets/AppIcon.appiconset/Contents.json
  3. BIN
      创维盒子/双子星云手机/Assets.xcassets/AppIcon.appiconset/icon-1024.png
  4. BIN
      创维盒子/双子星云手机/Assets.xcassets/AppIcon.appiconset/icon-20@2x.png
  5. BIN
      创维盒子/双子星云手机/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png
  6. BIN
      创维盒子/双子星云手机/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png
  7. BIN
      创维盒子/双子星云手机/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png
  8. BIN
      创维盒子/双子星云手机/Assets.xcassets/AppIcon.appiconset/icon-38@2x.png
  9. BIN
      创维盒子/双子星云手机/Assets.xcassets/AppIcon.appiconset/icon-38@3x.png
  10. BIN
      创维盒子/双子星云手机/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png
  11. BIN
      创维盒子/双子星云手机/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png
  12. BIN
      创维盒子/双子星云手机/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png
  13. BIN
      创维盒子/双子星云手机/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png
  14. BIN
      创维盒子/双子星云手机/Assets.xcassets/AppIcon.appiconset/icon-64@2x.png
  15. BIN
      创维盒子/双子星云手机/Assets.xcassets/AppIcon.appiconset/icon-64@3x.png
  16. BIN
      创维盒子/双子星云手机/Assets.xcassets/AppIcon.appiconset/icon-68@2x.png
  17. BIN
      创维盒子/双子星云手机/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png
  18. BIN
      创维盒子/双子星云手机/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png
  19. 3 0
      创维盒子/双子星云手机/Class/Set/MySetViewController.h
  20. 7 28
      创维盒子/双子星云手机/Class/Set/MySetViewController.m
  21. 27 25
      创维盒子/双子星云手机/Class/Set/appUpdate/AboutViewController.m
  22. 6 0
      创维盒子/双子星云手机/CloudPlayer/PlayerViewController.mm
  23. 7 0
      创维盒子/双子星云手机/netWork/newWorkInterface.h

BIN
创维盒子/双子星云手机/Assets.xcassets/AppIcon.appiconset/1024*1024.png


+ 118 - 132
创维盒子/双子星云手机/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,134 +1,120 @@
 {
-  "images" : [
-    {
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "20x20"
-    },
-    {
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "20x20"
-    },
-    {
-      "idiom" : "iphone",
-      "scale" : "1x",
-      "size" : "29x29"
-    },
-    {
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "29x29"
-    },
-    {
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "29x29"
-    },
-    {
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "40x40"
-    },
-    {
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "40x40"
-    },
-    {
-      "idiom" : "iphone",
-      "scale" : "1x",
-      "size" : "57x57"
-    },
-    {
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "57x57"
-    },
-    {
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "60x60"
-    },
-    {
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "60x60"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "20x20"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "20x20"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "29x29"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "29x29"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "40x40"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "40x40"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "50x50"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "50x50"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "72x72"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "72x72"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "76x76"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "76x76"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "83.5x83.5"
-    },
-    {
-      "filename" : "1024*1024.png",
-      "idiom" : "ios-marketing",
-      "scale" : "1x",
-      "size" : "1024x1024"
+    "images": [
+        {
+            "size": "20x20",
+            "idiom": "universal",
+            "filename": "icon-20@2x.png",
+            "scale": "2x",
+            "platform": "ios"
+        },
+        {
+            "size": "20x20",
+            "idiom": "universal",
+            "filename": "icon-20@3x.png",
+            "scale": "3x",
+            "platform": "ios"
+        },
+        {
+            "size": "29x29",
+            "idiom": "universal",
+            "filename": "icon-29@2x.png",
+            "scale": "2x",
+            "platform": "ios"
+        },
+        {
+            "size": "29x29",
+            "idiom": "universal",
+            "filename": "icon-29@3x.png",
+            "scale": "3x",
+            "platform": "ios"
+        },
+        {
+            "size": "38x38",
+            "idiom": "universal",
+            "filename": "icon-38@2x.png",
+            "scale": "2x",
+            "platform": "ios"
+        },
+        {
+            "size": "38x38",
+            "idiom": "universal",
+            "filename": "icon-38@3x.png",
+            "scale": "3x",
+            "platform": "ios"
+        },
+        {
+            "size": "40x40",
+            "idiom": "universal",
+            "filename": "icon-40@2x.png",
+            "scale": "2x",
+            "platform": "ios"
+        },
+        {
+            "size": "40x40",
+            "idiom": "universal",
+            "filename": "icon-40@3x.png",
+            "scale": "3x",
+            "platform": "ios"
+        },
+        {
+            "size": "60x60",
+            "idiom": "universal",
+            "filename": "icon-60@2x.png",
+            "scale": "2x",
+            "platform": "ios"
+        },
+        {
+            "size": "60x60",
+            "idiom": "universal",
+            "filename": "icon-60@3x.png",
+            "scale": "3x",
+            "platform": "ios"
+        },
+        {
+            "size": "64x64",
+            "idiom": "universal",
+            "filename": "icon-64@2x.png",
+            "scale": "2x",
+            "platform": "ios"
+        },
+        {
+            "size": "64x64",
+            "idiom": "universal",
+            "filename": "icon-64@3x.png",
+            "scale": "3x",
+            "platform": "ios"
+        },
+        {
+            "size": "68x68",
+            "idiom": "universal",
+            "filename": "icon-68@2x.png",
+            "scale": "2x",
+            "platform": "ios"
+        },
+        {
+            "size": "76x76",
+            "idiom": "universal",
+            "filename": "icon-76@2x.png",
+            "scale": "2x",
+            "platform": "ios"
+        },
+        {
+            "size": "83.5x83.5",
+            "idiom": "universal",
+            "filename": "icon-83.5@2x.png",
+            "scale": "2x",
+            "platform": "ios"
+        },
+        {
+            "size": "1024x1024",
+            "idiom": "universal",
+            "filename": "icon-1024.png",
+            "scale": "1x",
+            "platform": "ios"
+        }
+    ],
+    "info": {
+        "version": 1,
+        "author": "icon.wuruihong.com"
     }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
+}

BIN
创维盒子/双子星云手机/Assets.xcassets/AppIcon.appiconset/icon-1024.png


BIN
创维盒子/双子星云手机/Assets.xcassets/AppIcon.appiconset/icon-20@2x.png


BIN
创维盒子/双子星云手机/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png


BIN
创维盒子/双子星云手机/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png


BIN
创维盒子/双子星云手机/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png


BIN
创维盒子/双子星云手机/Assets.xcassets/AppIcon.appiconset/icon-38@2x.png


BIN
创维盒子/双子星云手机/Assets.xcassets/AppIcon.appiconset/icon-38@3x.png


BIN
创维盒子/双子星云手机/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png


BIN
创维盒子/双子星云手机/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png


BIN
创维盒子/双子星云手机/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png


BIN
创维盒子/双子星云手机/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png


BIN
创维盒子/双子星云手机/Assets.xcassets/AppIcon.appiconset/icon-64@2x.png


BIN
创维盒子/双子星云手机/Assets.xcassets/AppIcon.appiconset/icon-64@3x.png


BIN
创维盒子/双子星云手机/Assets.xcassets/AppIcon.appiconset/icon-68@2x.png


BIN
创维盒子/双子星云手机/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png


BIN
创维盒子/双子星云手机/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png


+ 3 - 0
创维盒子/双子星云手机/Class/Set/MySetViewController.h

@@ -14,6 +14,9 @@ NS_ASSUME_NONNULL_BEGIN
  * @brief  云机状态( 0:不存在 1:有效时间 2:有效时间不足 3:过期未回收 )   1、2为VIP状态  0、3 非VIP状态
  */
 @property(nonatomic, assign)NSInteger whetherPhoneStatus;
+
+//重启盒子
+@property (nonatomic,copy) void (^needToReboot)(void);
 @end
 
 NS_ASSUME_NONNULL_END

+ 7 - 28
创维盒子/双子星云手机/Class/Set/MySetViewController.m

@@ -115,7 +115,9 @@
         if (@available(iOS 15.0, *)) {
             _tableView.sectionHeaderTopPadding = 0;
         }
-        [_tableView setTableFooterView:[self tableFoorView]];
+        
+        //TV投屏 阿胡说暂不做
+        //[_tableView setTableFooterView:[self tableFoorView]];
     }
     
     return _tableView;
@@ -243,33 +245,10 @@
 
 - (void)okBtnClickPressed{
 //    /*重启云手机*/
-//    [self showNewIndicatorWithCanBack:YES canTouch:NO];
-//    CloudPhoneModel *model = [UseAccountManage shareInstance].cloudPhoneListModel.diskInfo.firstObject;
-//    [[UseAccountManage shareInstance] CommonGetWithCallBackCode:GetPhonereboot
-//                                                     Parameters:@{@"userCardId":[NSNumber numberWithInteger:model.userCardId]}
-//                                                        success:^(id  _Nonnull responseObject) {
-//                                                            HLog(@"%@", responseObject);
-//                                                          [self removeNewIndicator];
-//
-//                                                          SuperModel *model = [[SuperModel alloc] initWithDictionary:responseObject error:nil];
-//
-//                                                           if (model.status && model.status.integerValue == 0) {
-//                                                               if (model.msg.length > 0){
-//                                                                   [[iToast makeText:model.msg] show];
-//                                                               }else{
-//                                                                   [[iToast makeText:NSLocalizedString(@"my_set_no_restart_phone_ok_tips",nil)] show];
-//                                                               }
-//                                                           }
-//                                                           else
-//                                                           {
-//                                                               [[iToast makeText:model.msg] show];
-//                                                           }
-//
-//                                                        } failure:^(NSError * _Nonnull error) {
-//                                                          HLog(@"%@", error);
-//                                                            [[iToast makeText:@"网络异常,请稍后重试!"] show];
-//                                                            [self removeNewIndicator];
-//                                                        }];
+//  通过指令通道发送 {"type":"reboot"}
+    if(_needToReboot){
+        _needToReboot();
+    }
 }
 
 @end

+ 27 - 25
创维盒子/双子星云手机/Class/Set/appUpdate/AboutViewController.m

@@ -13,6 +13,8 @@
 #import "CloudPhoneAPI.h"
 #import <MJExtension.h>
 #import "CustomerWebViewController.h"
+#import "netWorkManager.h"
+#import "SuperModel.h"
 
 @interface AboutViewController ()
 
@@ -182,31 +184,31 @@
     [self showNewIndicatorHaveStrWithCanBack:YES canTouch:NO showText:NSLocalizedString(@"app_update_checking",nil)];
 
     NSMutableDictionary *paraDict = [NSMutableDictionary dictionary];
-    [paraDict setValue:@"ios" forKey:@"os"];
-    NSString *appID = [[NSBundle mainBundle] bundleIdentifier];
-    [paraDict setValue:appID forKey:@"packageName"];
-//    [[UseAccountManage shareInstance] CommonGetWithCallBackCode:AppVersionCheckAPI Parameters:paraDict success:^(id  _Nonnull responseObject) {
-//        HLog(@"%@", responseObject);
-//      [self removeNewIndicatorHaveStr];
-//
-//      SuperModel *model = [[SuperModel alloc] initWithDictionary:responseObject error:nil];
-//
-//       if (model.status && model.status.integerValue == 0) {
-//
-//           HWVersionModel *model = [HWVersionModel mj_objectWithKeyValues:responseObject[@"data"]];
-//           self.versionModel = model;
-//           [self checkVersion];
-//       }
-//       else
-//       {
-//           [[iToast makeText:model.msg] show];
-//       }
-//
-//    } failure:^(NSError * _Nonnull error) {
-//      HLog(@"%@", error);
-//        [[iToast makeText:@"网络异常,请稍后重试!"] show];
-//      [self removeNewIndicatorHaveStr];
-//    }];
+    [paraDict setValue:@"ios" forKey:@"type"];
+    [paraDict setValue:@"skyworth" forKey:@"source"];
+    
+    [[netWorkManager shareInstance] CommonGetWithCallBackCode:upgradeNewVersion Parameters:paraDict success:^(id  _Nonnull responseObject) {
+        HLog(@"%@", responseObject);
+      [self removeNewIndicatorHaveStr];
+
+      SuperModel *model = [[SuperModel alloc] initWithDictionary:responseObject error:nil];
+
+       if (model.status == 0) {
+
+           HWVersionModel *model = [HWVersionModel mj_objectWithKeyValues:responseObject[@"data"]];
+           self.versionModel = model;
+           [self checkVersion];
+       }
+       else
+       {
+           [[iToast makeText:model.msg] show];
+       }
+
+    } failure:^(NSError * _Nonnull error) {
+      HLog(@"%@", error);
+        [[iToast makeText:@"网络异常,请稍后重试!"] show];
+      [self removeNewIndicatorHaveStr];
+    }];
 }
 
 - (void)versionCheckBtnClick {

+ 6 - 0
创维盒子/双子星云手机/CloudPlayer/PlayerViewController.mm

@@ -1403,6 +1403,12 @@ NSDate *lastVideoTome;/*上一帧数据时间*/
     nextVC.whetherPhoneStatus = phoneTimeInfoDataModel.data.whetherPhoneStatus;
     [self.navigationController pushViewController:nextVC animated:YES];
     self.isNeedRecyclResource = NO;
+    
+    //{"type":"reboot"}
+    nextVC.needToReboot = ^{
+        NSString *commondStr  = @"{\"type\":\"reboot\"}";
+        [self send_data:commondStr];
+    };
 }
 
 #pragma mark - PlayerControlViewDelegate---控制器按键

+ 7 - 0
创维盒子/双子星云手机/netWork/newWorkInterface.h

@@ -22,4 +22,11 @@
  返回数据模型 */
 #define updateCardInfo  @"/box/updateCardInfo"
 
+/*3 调用升级接口   get请求
+输入参数     type  OS:ios
+输入参数     source  stealth:隐私盒子,skyworth:创维盒子
+ 
+ 返回数据模型 */
+#define upgradeNewVersion  @"/box/upgrade/new/version"
+
 #endif /* newWorkInterface_h */