1.1.4.4 封板

创维盒子/code/AppDelegate/PrefixHeader.pch

@@ -112,16 +112,16 @@ isBangsScreen; \
 //#define shareService   @"http://testprivacy.phone.androidscloud.com:1801/h5/#/pages/fileSharing/index?productType=Private-X&token="
 
 //预生产环境
-#define CloudService   @"http://testprivacy.phone.androidscloud.com:10900"
-#define shareService   @"http://testprivacy.phone.androidscloud.com:10900/h5/#/pages/fileSharing/index?productType=Private-X&token="
+//#define CloudService   @"http://testprivacy.phone.androidscloud.com:10900"
+//#define shareService   @"http://testprivacy.phone.androidscloud.com:10900/h5/#/pages/fileSharing/index?productType=Private-X&token="
 
 //生产环境 弃用
 //弃用 #define CloudService   @"http://hiboxde.armclouding.com:7780"
 //弃用 #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"

创维盒子/code/Class/Set/previewFile/previewImageOrVideoViewController.m

@@ -1022,6 +1022,17 @@
         timeArrModel.list = (NSArray<NASFilePicDataArrModel>*)afterFilterArr;
     }
     
+    
+    //2.检测是否有空数据组 有则去掉
+    NSMutableArray *newFilterArr = [NSMutableArray new];
+    for (NASFilePicTimeArrModel *timeArrModel in NASFilePicMod.data.fileList) {
+        if(timeArrModel.list.count > 0){
+            [newFilterArr addObject:timeArrModel];
+        }
+    }
+    
+    NASFilePicMod.data.fileList = (NSArray<NASFilePicTimeArrModel>*)newFilterArr;
+    
     [self handelNetDataAfterFilterDataBy:NASFilePicMod];
 }
 

创维盒子/code/webRtc/webRtcPlayerViewController.m

@@ -1356,24 +1356,24 @@
             }
             
             //FPS
-            __block NSString*lostDataStr = [[NSString alloc] initWithFormat:@"总包数：%ld --总丢包数：%ld--3秒接受到包数：%ld---3秒丢包数：%ld---3秒丢包率:%0.2f%%",lasPacketsReceived,lastAlllostData,(NSInteger)NsecondReceivedData,(NSInteger)NsecondLostData,prelostRate];
-            
-            webrtcServerModel * webrtcServerMod = ksharedAppDelegate.bestWebrtcServerModel;
-            NSMutableString *signallingUrl = [[NSMutableString alloc] initWithFormat:@"当前使用：%@:%@--\n%@:%@--%.0fms\n\n",webrtcServerMod.signallingIp,webrtcServerMod.signallingPort,webrtcServerMod.turnIp,webrtcServerMod.turnPort,webrtcServerMod.delayedms];
-           
-            for (webrtcServerModel *model in ksharedAppDelegate.DeviceWebRtcMsgMod.data.webrtcServerList) {
-                NSString *curStr = [[NSMutableString alloc] initWithFormat:@"%@:%@--\n%@:%@--%.0fms\n",model.signallingIp,model.signallingPort,model.turnIp,model.turnPort,model.delayedms];
-                
-                [signallingUrl appendString:curStr];
-            }
-            
-            
-            
-            lostDataStr = [[NSString alloc] initWithFormat:@"%@\n%@",lostDataStr,signallingUrl];
-            
-            mainBlock(^{
-                self->_testLostLabel.text = lostDataStr;
-            });
+//            __block NSString*lostDataStr = [[NSString alloc] initWithFormat:@"总包数：%ld --总丢包数：%ld--3秒接受到包数：%ld---3秒丢包数：%ld---3秒丢包率:%0.2f%%",lasPacketsReceived,lastAlllostData,(NSInteger)NsecondReceivedData,(NSInteger)NsecondLostData,prelostRate];
+//            
+//            webrtcServerModel * webrtcServerMod = ksharedAppDelegate.bestWebrtcServerModel;
+//            NSMutableString *signallingUrl = [[NSMutableString alloc] initWithFormat:@"当前使用：%@:%@--\n%@:%@--%.0fms\n\n",webrtcServerMod.signallingIp,webrtcServerMod.signallingPort,webrtcServerMod.turnIp,webrtcServerMod.turnPort,webrtcServerMod.delayedms];
+//           
+//            for (webrtcServerModel *model in ksharedAppDelegate.DeviceWebRtcMsgMod.data.webrtcServerList) {
+//                NSString *curStr = [[NSMutableString alloc] initWithFormat:@"%@:%@--\n%@:%@--%.0fms\n",model.signallingIp,model.signallingPort,model.turnIp,model.turnPort,model.delayedms];
+//                
+//                [signallingUrl appendString:curStr];
+//            }
+//            
+//            
+//            
+//            lostDataStr = [[NSString alloc] initWithFormat:@"%@\n%@",lostDataStr,signallingUrl];
+//            
+//            mainBlock(^{
+//                self->_testLostLabel.text = lostDataStr;
+//            });
             
         }
     }

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

@@ -5770,7 +5770,7 @@
 				CODE_SIGN_ENTITLEMENTS = "计算器.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 32;
+				CURRENT_PROJECT_VERSION = 39;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -5854,7 +5854,7 @@
 				CODE_SIGN_ENTITLEMENTS = "计算器.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 32;
+				CURRENT_PROJECT_VERSION = 39;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -6052,7 +6052,7 @@
 				CODE_SIGN_ENTITLEMENTS = "隐私保护.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 31;
+				CURRENT_PROJECT_VERSION = 40;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -6131,7 +6131,7 @@
 				CODE_SIGN_ENTITLEMENTS = "隐私保护.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 31;
+				CURRENT_PROJECT_VERSION = 40;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",