huangxiaodong преди 1 година
родител
ревизия
79c7233169

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

@@ -2782,7 +2782,7 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 8;
+				CURRENT_PROJECT_VERSION = 9;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2861,7 +2861,7 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 8;
+				CURRENT_PROJECT_VERSION = 9;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",

+ 1 - 1
创维盒子/双子星云手机/Class/Set/uploadFile/fileTransfeSet/backupsSetViewController.m

@@ -213,7 +213,7 @@
          
     }
     else if(model.curBackupsState == backupsStateUploading
-          || model.curBackupsState == backupsStateSuspend
+          //|| model.curBackupsState == backupsStateSuspend
        )
         {
          

+ 2 - 1
创维盒子/双子星云手机/Class/Set/uploadFile/photoView/uploadFileBottomView.m

@@ -42,7 +42,8 @@
     
     _uploadFileRoutelabel = [[UILabel alloc] init];
     _uploadFileRoutelabel.font = [UIFont systemFontOfSize:14.0];
-    _uploadFileRoutelabel.textColor = [UIColor hwColor:@"#959799" alpha:1.0];
+    //_uploadFileRoutelabel.textColor = [UIColor hwColor:@"#959799" alpha:1.0];
+    _uploadFileRoutelabel.textColor =[UIColor hwColor:@"#01B7EA" alpha:1.0];
     [self addSubview:_uploadFileRoutelabel];
     [self setSavePathDataFun];
     

+ 1 - 1
创维盒子/双子星云手机/CloudPlayer/View/PlayerView.m

@@ -71,7 +71,7 @@ ShowImageViewDelegate>{
                   inRect:CGRectMake(0, 0, glkshowImageView.drawableWidth, glkshowImageView.drawableHeight)
                 fromRect:[ciImage extent]];
     
-    //[self->glkshowImageView display];
+    [self->glkshowImageView display];
 }
 
 - (void)showIMage

+ 1 - 1
创维盒子/双子星云手机/zh-Hans.lproj/Localizable.strings

@@ -383,7 +383,7 @@
 "disk_save_extract_tip"   = "磁盘安全拔出";
 "disk_insertion_tip"   = "磁盘插入";
 "disk_insertion_pop_title"   = "已插入";
-"disk_insertion_pop_tip"   = "不要直接拔出U盘,请到文件管理安全弹出避免造成磁盘损害,数据丢失的风险";
+"disk_insertion_pop_tip"   = "在移除U盘之前,请在文件管理器“安全弹出”\n避免直接拔出,造成磁盘损害和数据丢失";
 "disk_insertion_pop_tip_sub1" = "01桌面";
 "disk_insertion_pop_tip_sub2" = "02文件管理";
 "disk_insertion_pop_tip_sub3" = "03文件设置";