Browse Source

首次安装应用,上传文件,WiFi切换流量后,未显示悬浮提示

huangxiaodong 7 months ago
parent
commit
7c4729e027

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

@@ -6159,7 +6159,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 17;
+				CURRENT_PROJECT_VERSION = 18;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -6241,7 +6241,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 17;
+				CURRENT_PROJECT_VERSION = 18;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (

+ 67 - 57
创维盒子/双子星云手机/AppDelegate/AppDelegate.m

@@ -243,75 +243,85 @@
     [[AFNetworkReachabilityManager sharedManager] setReachabilityStatusChangeBlock:^(AFNetworkReachabilityStatus status) {
         HLog(@"Reachability: %@", AFStringFromNetworkReachabilityStatus(status));
 
-        [[NSNotificationCenter defaultCenter] postNotificationName:NetWorkChangeNotification object:nil];
+        mainBlock((^{
+            //[[iToast makeText:[[NSString alloc] initWithFormat:@"Reachability:%@",AFStringFromNetworkReachabilityStatus(status)] ] show];
+            [[NSNotificationCenter defaultCenter] postNotificationName:NetWorkChangeNotification object:nil];
+        }));
         
         //网络切换
-        if(status == AFNetworkReachabilityStatusReachableViaWiFi){//检测到起切换wifi 重新ping一下
-            [[pingManager shareManager] startPingDeviceIpFun];
-        }
-        else {//非wifi链接
-            [pingManager shareManager].isPingOk = NO;
-        }
+        [self handelNetWorkChangeFunBy:status];
         
-        //是否备份中 处理切换网络环境 用户无感备份切换
-        if(([nasBackupsManager shareInstance].curPhotosBackupsTaskMod
-           && [nasBackupsManager shareInstance].curPhotosBackupsTaskMod.curBackupsState == backupsStateUploading)
-           || [nasBackupsManager shareInstance].isWifiNeedReBackupsType){
-            
-            //1.先暂停备份
-            [[nasBackupsManager shareInstance] suspendBackupsFileFun];
-            
-            //2.重新开启备份
-            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-                [[nasBackupsManager shareInstance] reBackupsFileFun];
-            });
-        }
+    }];
+
+    [[AFNetworkReachabilityManager sharedManager] startMonitoring];
+}
+
+#pragma mark 处理网络切换情况
+- (void)handelNetWorkChangeFunBy:(AFNetworkReachabilityStatus)status
+{
+    if(status == AFNetworkReachabilityStatusReachableViaWiFi){//检测到起切换wifi 重新ping一下
+        [[pingManager shareManager] startPingDeviceIpFun];
+    }
+    else {//非wifi链接
+        [pingManager shareManager].isPingOk = NO;
+    }
+    
+    //是否备份中 处理切换网络环境 用户无感备份切换
+    if(([nasBackupsManager shareInstance].curPhotosBackupsTaskMod
+       && [nasBackupsManager shareInstance].curPhotosBackupsTaskMod.curBackupsState == backupsStateUploading)
+       || [nasBackupsManager shareInstance].isWifiNeedReBackupsType){
         
-        //是否上传中 处理切换网络环境 用户无感上传切换
-        BOOL needToReUploadTaskType = [nasUploadFileManager shareInstance].needToReUploadTaskType;
-        if(needToReUploadTaskType){//如果网络层先保存 这里为YES
-            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        //1.先暂停备份
+        [[nasBackupsManager shareInstance] suspendBackupsFileFun];
+        
+        //2.重新开启备份
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(8 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            [[nasBackupsManager shareInstance] reBackupsFileFun];
+        });
+    }
+    
+    //是否上传中 处理切换网络环境 用户无感上传切换
+    BOOL needToReUploadTaskType = [nasUploadFileManager shareInstance].needToReUploadTaskType;
+    if(needToReUploadTaskType){//如果网络层先保存 这里为YES
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(8 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            [[nasUploadFileManager shareInstance] reUploadFileFunByNetWork];
+        });
+    }
+    else{
+        //有可能是网络变化先收到通知
+        if([nasUploadFileManager shareInstance].uploadingArr.count > 0){
+            [[nasUploadFileManager shareInstance] saveUploadingTaskByNetWorkErrorFun];
+            //因为不知道是网络变化通知快 还是传输快 这里5秒后重新传
+            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(8 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
                 [[nasUploadFileManager shareInstance] reUploadFileFunByNetWork];
             });
         }
-        else{
-            //有可能是网络变化先收到通知
-            if([nasUploadFileManager shareInstance].uploadingArr.count > 0){
-                [[nasUploadFileManager shareInstance] saveUploadingTaskByNetWorkErrorFun];
-                //因为不知道是网络变化通知快 还是传输快 这里5秒后重新传
-                dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-                    [[nasUploadFileManager shareInstance] reUploadFileFunByNetWork];
-                });
-            }
-        }
-        
-        HLog(@"hxd 1111")
-        //是否下载中 处理切换网络环境 用户无感下载切换
-        BOOL needToReDownloadTaskType = [nasDownloadFileManager shareInstance].needToReDownloadTaskType;
-        if(needToReDownloadTaskType){//如果网络层先保存 这里为YES
-            HLog(@"hxd 2222")
-            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+    }
+    
+    //HLog(@"hxd 1111")
+    //是否下载中 处理切换网络环境 用户无感下载切换
+    BOOL needToReDownloadTaskType = [nasDownloadFileManager shareInstance].needToReDownloadTaskType;
+    if(needToReDownloadTaskType){//如果网络层先保存 这里为YES
+        //HLog(@"hxd 2222")
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(8 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            [[nasDownloadFileManager shareInstance] reDownloadloadFileFunByNetWork];
+        });
+    }
+    else{
+        //HLog(@"hxd 3333")
+        //有可能是网络变化先收到通知
+        if([nasDownloadFileManager shareInstance].downLoadFileModelDataArr.count > 0){
+            //HLog(@"hxd 4444")
+            [[nasDownloadFileManager shareInstance] saveDownloadloadingTaskByNetWorkErrorFun];
+            //因为不知道是网络变化通知快 还是传输快 这里5秒后重新传
+            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(8 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
                 [[nasDownloadFileManager shareInstance] reDownloadloadFileFunByNetWork];
             });
         }
-        else{
-            HLog(@"hxd 3333")
-            //有可能是网络变化先收到通知
-            if([nasDownloadFileManager shareInstance].downLoadFileModelDataArr.count > 0){
-                HLog(@"hxd 4444")
-                [[nasDownloadFileManager shareInstance] saveDownloadloadingTaskByNetWorkErrorFun];
-                //因为不知道是网络变化通知快 还是传输快 这里5秒后重新传
-                dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-                    [[nasDownloadFileManager shareInstance] reDownloadloadFileFunByNetWork];
-                });
-            }
-        }
-        
-    }];
-
-    [[AFNetworkReachabilityManager sharedManager] startMonitoring];
+    }
 }
 
+
 #pragma mark 多国语言相关
 -(void)setLanguagesFun{
     NSArray *arLanguages = [[NSUserDefaults standardUserDefaults] objectForKey:@"AppleLanguages"];

+ 2 - 1
创维盒子/双子星云手机/Vendor/DFPlayer/supplement/DFPlayerTool.m

@@ -70,7 +70,8 @@ static DFPlayerNetworkStatus _networkStatus;
 }
 
 + (void)stopMonitoringNetwork{
-    [[AFNetworkReachabilityManager sharedManager] stopMonitoring];
+    //hxd del 20241104项目里需要 检测网络 不能被第三方停止 
+    //[[AFNetworkReachabilityManager sharedManager] stopMonitoring];
 }
 
 + (DFPlayerNetworkStatus)networkStatus{