Merge branch 'master' into Private-X_1.4.4_AppStore

# Conflicts:
#	创维盒子/code/AppDelegate/SceneDelegate.m
#	创维盒子/code/Class/Guide/LoginType1ViewController.h
#	创维盒子/code/Class/Guide/LoginType1ViewController.m
#	创维盒子/code/Class/Guide/ScanToLoginViewController.h
#	创维盒子/code/Class/Guide/ScanToLoginViewController.m
#	创维盒子/code/zh-Hans.lproj/Localizable.strings

创维盒子/Pods/TZImagePickerController/TZImagePickerController/TZImagePickerController/TZImageManager.m

@@ -117,7 +117,7 @@ static dispatch_once_t onceToken;
     if (!self.sortAscendingByModificationDate) {
         option.sortDescriptors = @[[NSSortDescriptor sortDescriptorWithKey:@"creationDate" ascending:self.sortAscendingByModificationDate]];
     }
-    PHFetchResult *smartAlbums = [PHAssetCollection fetchAssetCollectionsWithType:PHAssetCollectionTypeSmartAlbum subtype:PHAssetCollectionSubtypeAlbumRegular options:nil];
+    PHFetchResult *smartAlbums = [PHAssetCollection fetchAssetCollectionsWithType:PHAssetCollectionTypeSmartAlbum subtype:PHAssetCollectionSubtypeAny options:nil];
     for (PHAssetCollection *collection in smartAlbums) {
         // 有可能是PHCollectionList类的的对象，过滤掉
         if (![collection isKindOfClass:[PHAssetCollection class]]) continue;
@@ -152,7 +152,7 @@ static dispatch_once_t onceToken;
     }
     // 我的照片流 1.6.10重新加入..
     PHFetchResult *myPhotoStreamAlbum = [PHAssetCollection fetchAssetCollectionsWithType:PHAssetCollectionTypeAlbum subtype:PHAssetCollectionSubtypeAlbumMyPhotoStream options:nil];
-    PHFetchResult *smartAlbums = [PHAssetCollection fetchAssetCollectionsWithType:PHAssetCollectionTypeSmartAlbum subtype:PHAssetCollectionSubtypeAlbumRegular options:nil];
+    PHFetchResult *smartAlbums = [PHAssetCollection fetchAssetCollectionsWithType:PHAssetCollectionTypeSmartAlbum subtype:PHAssetCollectionSubtypeAny options:nil];
     PHFetchResult *topLevelUserCollections = [PHCollectionList fetchTopLevelUserCollectionsWithOptions:nil];
     PHFetchResult *syncedAlbums = [PHAssetCollection fetchAssetCollectionsWithType:PHAssetCollectionTypeAlbum subtype:PHAssetCollectionSubtypeAlbumSyncedAlbum options:nil];
     PHFetchResult *sharedAlbums = [PHAssetCollection fetchAssetCollectionsWithType:PHAssetCollectionTypeAlbum subtype:PHAssetCollectionSubtypeAlbumCloudShared options:nil];

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

@@ -56,6 +56,8 @@
 
 @property(nonatomic,strong) RTCFileLogger *WebRtcLogger;//webRTC日志
 
+@property (nonatomic, assign)  BOOL needToShowReStratSucType;//是否要显示从前成功
+@property (nonatomic, assign)  BOOL didShowBoxHeartbeatAlertType;//心跳异常弹框是否显示过
 +(AppDelegate*)sharedAppDelegate;
 
 #pragma mark 更换设备 重新设置地址
@@ -63,5 +65,7 @@
 
 #pragma mark 监听网络变化
 -(void)MonitorNetworkChangesFun;
+
+- (BOOL)didShowImageRenewViewFun;
 @end
 

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

@@ -23,6 +23,10 @@
 #import <WebRTC/AMediaStream.h>
 #import "pingManager.h"
 #import "nasUploadFileManager.h"
+#import "imageVersionRenewTipView.h"
+#import "imageVersionUpdateDoneView.h"
+#import "imageVersionUpdateFailView.h"
+
 
 @interface AppDelegate ()<JJExceptionHandle,WXApiDelegate>
 {
@@ -120,7 +124,7 @@
     
     
     //启动后台保活
-    [AudioSessionObject shareManager];
+    //[AudioSessionObject shareManager];
     [self MonitorNetworkChangesFun];
     
 #ifdef DEBUG
@@ -485,4 +489,19 @@
     [SDImageCache sharedImageCache].config.diskCacheReadingOptions = NSDataReadingMappedIfSafe;
 }
 
+
+- (BOOL)didShowImageRenewViewFun{
+    
+    NSArray *subViews = ksharedAppDelegate.window.subviews;
+    
+    for (UIView*view in subViews) {
+        if([view isKindOfClass:[imageVersionRenewTipView class]]
+           ||[view isKindOfClass:[imageVersionUpdateDoneView class]]
+           ||[view isKindOfClass:[imageVersionUpdateFailView class]]){
+            return YES;
+        }
+    }
+
+    return NO;
+}
 @end

创维盒子/双子星云手机/AppDelegate/PrefixHeader.pch

@@ -108,8 +108,8 @@ isBangsScreen; \
 //弃用 #define shareService   @"http://testprivacy.phone.armclouding.com:1801/h5/#/pages/fileSharing/index?productType=Private-X&token="
 
 //创维盒子 测试地址 正在使用
-#define CloudService   @"http://testprivacy.phone.androidscloud.com:1801"
-#define shareService   @"http://testprivacy.phone.androidscloud.com:1801/h5/#/pages/fileSharing/index?productType=Private-X&token="
+//#define CloudService   @"http://testprivacy.phone.androidscloud.com:1801"
+//#define shareService   @"http://testprivacy.phone.androidscloud.com:1801/h5/#/pages/fileSharing/index?productType=Private-X&token="
 
 //预生产环境
 //#define CloudService   @"http://testprivacy.phone.androidscloud.com:10900"
@@ -120,8 +120,8 @@ isBangsScreen; \
 //弃用 #define shareService   @"http://hiboxde.armclouding.com:7780/h5/#/pages/fileSharing/index?productType=Private-X&token="
 
 //生产环境 1.4.3 开始使用
-//#define CloudService   @"http://hiboxde.androidscloud.com:7780"
-//#define shareService   @"http://hiboxde.androidscloud.com:7780/h5/#/pages/fileSharing/index?productType=Private-X&token="
+#define CloudService   @"http://hiboxde.androidscloud.com:7780"
+#define shareService   @"http://hiboxde.androidscloud.com:7780/h5/#/pages/fileSharing/index?productType=Private-X&token="
 
 
 #define AESCODEKEEYY @"fvO8gAfNSr1tbdQe"

创维盒子/双子星云手机/AppDelegate/SceneDelegate.m

@@ -63,6 +63,8 @@
 #import "imageVersionUpdateDoneView.h"
 #import "imageVersionUpdateFailView.h"
 #import "LoginType1ViewController.h"
+#import "privacyModeTipViewController.h"
+
 
 @interface SceneDelegate ()<SetUsePWDViewControllerDelegate,GuideViewControllerDelegate,UITabBarControllerDelegate>
 {
@@ -443,6 +445,13 @@
 //        self.window.rootViewController = nextVCNav;
     }
     else{
+        //1、重启、恢复出厂设备、首次设置密码 3个情况下8分钟之内不弹
+        long seconds =  [iTools getNowTimeStamp];
+        NSNumber *secondsNum = [NSNumber numberWithLong:seconds];
+        if(secondsNum){
+            [HWDataManager  setNumberWithKey:stringKeyAddSn(@"disenable_type2_BoxHeartbeat") value:secondsNum];
+        }
+        
         /*没有设置密码*/
         SetPWDFirstViewController *qrCodeVC = [[SetPWDFirstViewController alloc] init];
         BaseNavigationController *qrCodeVCNav = [[BaseNavigationController alloc] initWithRootViewController:qrCodeVC];
@@ -673,6 +682,8 @@
 - (void)sceneDidEnterBackground:(UIScene *)scene  API_AVAILABLE(ios(13.0)){
     HLog(@"sceneDidEnterBackground")
     
+    ksharedAppDelegate.didShowBoxHeartbeatAlertType = NO;
+    
     BOOL isPrivacyMode = [HWDataManager getBoolWithKey:Const_Have_Add_Device_Privacy_Mode];
     
     if(ksharedAppDelegate.DeviceThirdIdMod){
@@ -1630,7 +1641,7 @@
 #pragma mark 弹框流程 1 强制盒子更新弹窗
 - (void)handelUpgradeInfoFun
 {
-    //self.otaUpgradeInfoModel.data.status = 201;
+    //self.otaUpgradeInfoModel.data.status = 1;
     if(self.otaUpgradeInfoModel.data.status < 1){  //-1=没有更新 0=下载中
         //2. APP版本更新弹窗
         [self checkVersionFun];
@@ -1746,6 +1757,13 @@
             [weakSelf otaUpdateNowFun];
         });
     }];
+    
+    //1.点击更新 标志 30分别 不谈 心跳弹框
+    long seconds =  [iTools getNowTimeStamp];
+    NSNumber *secondsNum = [NSNumber numberWithLong:seconds];
+    if(secondsNum){
+        [HWDataManager  setNumberWithKey:stringKeyAddSn(@"disenable_type1_BoxHeartbeat") value:secondsNum];
+    }
 }
 
 #pragma mark 弹框流程 1 OTA升级完成

创维盒子/code/Assets.xcassets/Base/logo_pic.imageset/Contents.json

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