1.系统信息显示---进行中

创维盒子/双子星云手机.xcodeproj/project.pbxproj

@@ -165,6 +165,8 @@
 		6B05828A2B045E0B00D37290 /* uploadFileDataModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B0582882B045E0B00D37290 /* uploadFileDataModel.m */; };
 		6B2170882B1444CC00656670 /* allVersionView.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B2170862B1444CC00656670 /* allVersionView.h */; };
 		6B2170892B1444CC00656670 /* allVersionView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B2170872B1444CC00656670 /* allVersionView.m */; };
+		6B21708C2B14BDAA00656670 /* couldphoneSysInfoModel.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B21708A2B14BDAA00656670 /* couldphoneSysInfoModel.h */; };
+		6B21708D2B14BDAA00656670 /* couldphoneSysInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B21708B2B14BDAA00656670 /* couldphoneSysInfoModel.m */; };
 		6B3F96342AD2A15A008E349E /* netWorkManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B3F96322AD2A15A008E349E /* netWorkManager.h */; };
 		6B3F96352AD2A15A008E349E /* netWorkManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B3F96332AD2A15A008E349E /* netWorkManager.m */; };
 		6B3F963A2AD2AD0B008E349E /* newWorkInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B3F96392AD2AD0B008E349E /* newWorkInterface.h */; };
@@ -532,6 +534,8 @@
 		6B0582882B045E0B00D37290 /* uploadFileDataModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = uploadFileDataModel.m; sourceTree = "<group>"; };
 		6B2170862B1444CC00656670 /* allVersionView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = allVersionView.h; sourceTree = "<group>"; };
 		6B2170872B1444CC00656670 /* allVersionView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = allVersionView.m; sourceTree = "<group>"; };
+		6B21708A2B14BDAA00656670 /* couldphoneSysInfoModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = couldphoneSysInfoModel.h; sourceTree = "<group>"; };
+		6B21708B2B14BDAA00656670 /* couldphoneSysInfoModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = couldphoneSysInfoModel.m; sourceTree = "<group>"; };
 		6B3F96322AD2A15A008E349E /* netWorkManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = netWorkManager.h; sourceTree = "<group>"; };
 		6B3F96332AD2A15A008E349E /* netWorkManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = netWorkManager.m; sourceTree = "<group>"; };
 		6B3F96392AD2AD0B008E349E /* newWorkInterface.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = newWorkInterface.h; sourceTree = "<group>"; };
@@ -804,6 +808,8 @@
 				1810F8FE2AA1839C00322116 /* PhoneTimeInfoModel.m */,
 				6B7272552B0DAF7600C03F87 /* couldPhoneBaseInfoModel.h */,
 				6B7272562B0DAF7600C03F87 /* couldPhoneBaseInfoModel.m */,
+				6B21708A2B14BDAA00656670 /* couldphoneSysInfoModel.h */,
+				6B21708B2B14BDAA00656670 /* couldphoneSysInfoModel.m */,
 			);
 			path = Model;
 			sourceTree = "<group>";
@@ -1695,6 +1701,7 @@
 				6B0582892B045E0B00D37290 /* uploadFileDataModel.h in Headers */,
 				6BF52C972AD5546500A617DB /* SimplePing.h in Headers */,
 				6B3F96342AD2A15A008E349E /* netWorkManager.h in Headers */,
+				6B21708C2B14BDAA00656670 /* couldphoneSysInfoModel.h in Headers */,
 				6B72724F2B0B58E500C03F87 /* uploadFileRecordEditBottomView.h in Headers */,
 				184C8ADD2A949DBD00F26650 /* HWVersionModel.h in Headers */,
 				6B05826F2AFF692700D37290 /* photoPreViewBottomView.h in Headers */,
@@ -2069,6 +2076,7 @@
 				6B0582642AFF4B7D00D37290 /* PhotoPreviewViewController.m in Sources */,
 				A003F6B527D841EE00715CBF /* UIView+HWCategory.m in Sources */,
 				A003F6E227D8428200715CBF /* Const.m in Sources */,
+				6B21708D2B14BDAA00656670 /* couldphoneSysInfoModel.m in Sources */,
 				A08A94FE27E9A4E400C544BB /* BGTool.m in Sources */,
 				183AE6072A89CE3C00B11CB0 /* JSONModelClassProperty.m in Sources */,
 				6B0582862B0457C400D37290 /* uploadFileManager.m in Sources */,

创维盒子/双子星云手机/AppDelegate/Config/Notification.h

@@ -68,6 +68,9 @@
 /*获取云机基本信息通知*/
 #define getCouldPhoneBaseInfoNotification                 @"getCouldPhoneBaseInfoNot"
 
+/*获取云机系统信息通知*/
+#define getCouldPhoneSysInfoNotification                 @"getCouldPhoneSysInfoNot"
+
 #define PlayerViewControlBtnTouchBeganNotification        @"PlayerViewControlBtnTouchBeganNotification"        // 云手机推流界面 控制按钮开始点击
 #define PlayerViewControlBtnTouchEndNotification          @"PlayerViewControlBtnTouchEndNotification"        /// // 云手机推流界面 控制按钮结束点击
 ///

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

@@ -26,6 +26,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 //获取云机剩余空间
 @property (nonatomic,copy) void (^getBaseInfo)(void);
+
+//获取版本信息空间
+@property (nonatomic,copy) void (^getSysInfo)(void);
 @end
 
 NS_ASSUME_NONNULL_END

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

@@ -320,6 +320,11 @@
     //else if (4 == row){/*版本信息*/
     else if (2 == row){/*版本信息*/
         AboutViewController *vc = [[AboutViewController alloc] init];
+        vc.getSysInfo = ^{
+            if(self->_getSysInfo){
+                self->_getSysInfo();
+            }
+        };
         [self.navigationController pushViewController:vc animated:YES];
     //}else if (5 == row){/*更换设备*/
     }else if (3 == row){/*更换设备*/

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

@@ -11,7 +11,8 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface AboutViewController : BaseViewController
-
+//获取云机剩余空间
+@property (nonatomic,copy) void (^getSysInfo)(void);
 @end
 
 NS_ASSUME_NONNULL_END

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

@@ -327,5 +327,9 @@
         make.right.mas_equalTo(0);
         make.bottom.mas_equalTo(0);
     }];
+    
+    if(_getSysInfo){
+        _getSysInfo();
+    }
 }
 @end

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

@@ -6,6 +6,8 @@
 //
 
 #import "allVersionView.h"
+#import "couldphoneSysInfoModel.h"
+#import "connectDeviceManager.h"
 
 @interface allVersionView ()<UITableViewDelegate,UITableViewDataSource>
 {
@@ -13,7 +15,7 @@
 }
 @property(nonatomic,strong)UIView *whiteBgView;
 @property(nonatomic,strong)UITableView *tableView;
-
+@property(nonatomic,strong)couldphoneSysInfoModel *couldphoneSysInfoMod;
 @end
 
 @implementation allVersionView
@@ -21,6 +23,8 @@
 - (id)initWithFrame:(CGRect)frame{
     self = [super initWithFrame:frame];
     
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(getCouldPhoneBaseInfoFun:)  name:getCouldPhoneSysInfoNotification  object:nil];
+    
     [self drawAnyView];
     
     return self;
@@ -50,7 +54,7 @@
     [_whiteBgView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.mas_equalTo(20);
         make.right.mas_equalTo(-20);
-        make.height.mas_equalTo(2650);
+        make.height.mas_equalTo(260);
         make.centerY.mas_equalTo(self.center).offset(-20);
     }];
     
@@ -139,12 +143,33 @@
         
         cell.textLabel.font = [UIFont systemFontOfSize:12.0];
         cell.textLabel.textColor =  [UIColor hwColor:@"#666666" alpha:1.0];
+        
+        cell.detailTextLabel.font = [UIFont systemFontOfSize:14.0];
+        cell.detailTextLabel.textColor =  [UIColor hwColor:@"#0A132B" alpha:1.0];
     }
   
     if(row < dataArr.count){
         cell.textLabel.text = dataArr[row];
     }
     
+    if(_couldphoneSysInfoMod){
+        switch (row)
+        {
+            case 0:
+                cell.detailTextLabel.text = _couldphoneSysInfoMod.data.data.ImageVersion;
+                break;
+            case 1:
+                cell.detailTextLabel.text = _couldphoneSysInfoMod.data.data.AgentVersion.versionName;
+                break;
+            case 2:
+                //cell.detailTextLabel.text = _baseInfoModel.os_info;
+                break;
+            case 3:
+                //cell.detailTextLabel.text = _couldphoneSysInfoMod.data.data.sn;
+                cell.detailTextLabel.text = [connectDeviceManager shareInstance].DeviceThirdIdMod.data.sn;
+                break;
+        }
+    }
 
     return cell;
 }
@@ -152,4 +177,16 @@
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
     return 40;
 }
+
+- (void)getCouldPhoneBaseInfoFun:(NSNotification*)not
+{
+    _couldphoneSysInfoMod = [not object];
+    //HLog(@"%@",baseInfoModel);
+    
+    if(!_couldphoneSysInfoMod || ![_couldphoneSysInfoMod isKindOfClass:[couldphoneSysInfoModel class]]){
+        return;
+    }
+    
+    [self.tableView reloadData];
+}
 @end

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

@@ -0,0 +1,55 @@
+//
+//  couldphoneSysInfoModel.h
+//  隐私保护
+//
+//  Created by xd h on 2023/11/27.
+//
+
+#import "SuperModel.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+//{
+//    "data":{
+//        "data":{
+//            "AVVersion":"V_webrtc_2.9.2-beta12",
+//            "AgentVersion":{
+//                "versionCode":"1061",
+//                "versionName":"v2.7.96(dev_livebox)"
+//            },
+//            "ImageVersion":"google/sailfish/sailfish:12.0/NOF27D/user/release-keys",
+//            "privateTV":{
+//                "versionCode":"82",
+//                "versionName":"1.0.1"
+//            },
+//            "sn":"0333933700223250017273"
+//        },
+//        "msg":"success",
+//        "status":"0"
+//    },
+//    "type":"getSysInfo"
+//}
+
+@interface AgentVersionModel: SuperModel
+@property (nonatomic, copy) NSString* versionCode;
+@property (nonatomic, copy) NSString* versionName;
+@end
+
+
+@interface couldphoneSysInfoDataDataModel : SuperModel
+@property (nonatomic, copy) NSString* AVVersion;
+@property (nonatomic, copy) NSString* ImageVersion;
+@property (nonatomic, copy) NSString* sn;
+@property(nonatomic, strong)AgentVersionModel *AgentVersion;
+@end
+
+@interface couldphoneSysInfoDataModel : SuperModel
+@property(nonatomic, strong)couldphoneSysInfoDataDataModel *data;
+@end
+
+@interface couldphoneSysInfoModel : SuperModel
+@property(nonatomic, strong)couldphoneSysInfoDataModel *data;
+@property (nonatomic, copy) NSString* type;
+@end
+
+NS_ASSUME_NONNULL_END

创维盒子/双子星云手机/CloudPlayer/Model/couldphoneSysInfoModel.m

@@ -0,0 +1,24 @@
+//
+//  couldphoneSysInfoModel.m
+//  隐私保护
+//
+//  Created by xd h on 2023/11/27.
+//
+
+#import "couldphoneSysInfoModel.h"
+
+@implementation AgentVersionModel
+
+@end
+
+@implementation couldphoneSysInfoDataDataModel
+
+@end
+
+@implementation couldphoneSysInfoDataModel
+
+@end
+
+@implementation couldphoneSysInfoModel
+
+@end

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

@@ -24,6 +24,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 
 - (void)getCouldPhoneBaseInfoResponseFun:(NSDictionary *)dataDict;
+- (void)getCouldPhoneSysInfoResponseFun:(NSDictionary *)dataDict;
 @end
 
 NS_ASSUME_NONNULL_END

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

@@ -9,6 +9,7 @@
 #import "RCCommandHelp.h"
 #import "couldPhoneBaseInfoModel.h"
 #import "cachesFileManager.h"
+#import "couldphoneSysInfoModel.h"
 
 @implementation PlayerViewController (otherDelegate)
 
@@ -32,6 +33,11 @@
     [[NSNotificationCenter defaultCenter] postNotificationName:getCouldPhoneBaseInfoNotification object:model];
 }
 
+- (void)getCouldPhoneSysInfoResponseFun:(NSDictionary *)dataDict{
+    couldphoneSysInfoModel *model = [[couldphoneSysInfoModel alloc] initWithDictionary:dataDict error:nil];
+    [[NSNotificationCenter defaultCenter] postNotificationName:getCouldPhoneSysInfoNotification object:model];
+}
+
 #pragma mark 监听文件开始的的通知
 - (void)beginGotoUploadFileFun:(NSNotification *)notification
 {

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

@@ -704,6 +704,9 @@ ComontAlretViewControllerDelegate>
             else if ([messageType isEqualToString:@"getBaseInfo"]){/*获取云机的基本信息*/
                 [weakSelf getCouldPhoneBaseInfoResponseFun:dataDict];
             }
+            else if ([messageType isEqualToString:@"getSysInfo"]){/*获取云机的系统信息*/
+                [weakSelf getCouldPhoneSysInfoResponseFun:dataDict];
+            }
             
         } failure:^(NSError *error) {
             
@@ -1597,6 +1600,16 @@ NSDate *lastVideoTome;/*上一帧数据时间*/
         NSString *commondStr  = @"{\"type\":\"getBaseInfo\"}";
         [self send_data:commondStr];
     };
+    
+    
+#pragma mark 获取云机版本信息
+    nextVC.getSysInfo = ^{
+        
+        NSString *commondStr  = @"{\"type\":\"getSysInfo\"}";
+        [self send_data:commondStr];
+    };
+    
+    
 }
 
 #pragma mark 盒子第一次连接成功  给ws发送信息 单点登录 把其他账号挤下去