Pārlūkot izejas kodu

1.去掉引导页

huangxiaodong 3 mēneši atpakaļ
vecāks
revīzija
006af5fcd6

+ 37 - 35
创维盒子/code/Class/Guide/GuideViewController.m

@@ -47,16 +47,17 @@
 - (void)viewDidAppear:(BOOL)animated{
     [super viewDidAppear:animated];
     
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(4 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        [self startMoveView];
-    });
+//    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(4 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+//        [self startMoveView];
+//    });
 }
 
 - (void)startMoveView{
 
-    CGFloat x = bgScrView.contentOffset.x;
-    NSInteger index = (x+1)/self.view.width;
-    if (index >= 4){
+//    CGFloat x = bgScrView.contentOffset.x;
+//    NSInteger index = (x+1)/self.view.width;
+//    if (index >= 4)
+    {
         /*记录已经用户引导*/
         [HWDataManager setBoolWithKey:Const_Have_Show_Guide value:YES];
         
@@ -136,12 +137,13 @@
         }
         
         
-    }else{
-        [bgScrView setContentOffset:CGPointMake((index + 1)*self.view.width, 0) animated:YES];
-        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(4 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-            [self startMoveView];
-        });
     }
+//    else{
+//        [bgScrView setContentOffset:CGPointMake((index + 1)*self.view.width, 0) animated:YES];
+//        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(4 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+//            [self startMoveView];
+//        });
+//    }
 }
 
 - (void)drawAnyView{
@@ -154,34 +156,34 @@
     [bgScrView setPagingEnabled:YES];
 //    [bgScrView setUserInteractionEnabled:NO];
     bgScrView.delegate = self;
-    [bgScrView setContentSize:CGSizeMake(5*self.view.width,self.view.height)];
+    [bgScrView setContentSize:CGSizeMake(1*self.view.width,self.view.height)];
     [bgScrView setClipsToBounds:YES];
     [self.view addSubview:bgScrView];
     
-    guideView0 = [[GuideView alloc] initWithTips:NSLocalizedString(@"guide_middle_tips_0",nil)
-                                       imageName:@"guide_middle_0_icon"
-                                           index:0];
-    guideView1 = [[GuideView alloc] initWithTips:NSLocalizedString(@"guide_middle_tips_1",nil)
-                                       imageName:@"guide_middle_1_icon"
-                                           index:1];
-    guideView2 = [[GuideView alloc] initWithTips:NSLocalizedString(@"guide_middle_tips_2",nil)
-                                       imageName:@"guide_middle_2_icon"
-                                           index:2];
-    guideView3 = [[GuideView alloc] initWithTips:NSLocalizedString(@"guide_middle_tips_3",nil)
-                                       imageName:@"guide_middle_3_icon"
-                                           index:3];
-    
-    guideView0.frame = CGRectMake(0*self.view.width, 0, self.view.width,self.view.height);
-    guideView1.frame = CGRectMake(1*self.view.width, 0, self.view.width,self.view.height);
-    guideView2.frame = CGRectMake(2*self.view.width, 0, self.view.width,self.view.height);
-    guideView3.frame = CGRectMake(3*self.view.width, 0, self.view.width,self.view.height);
-    
-    [bgScrView addSubview:guideView0];
-    [bgScrView addSubview:guideView1];
-    [bgScrView addSubview:guideView2];
-    [bgScrView addSubview:guideView3];
+//    guideView0 = [[GuideView alloc] initWithTips:NSLocalizedString(@"guide_middle_tips_0",nil)
+//                                       imageName:@"guide_middle_0_icon"
+//                                           index:0];
+//    guideView1 = [[GuideView alloc] initWithTips:NSLocalizedString(@"guide_middle_tips_1",nil)
+//                                       imageName:@"guide_middle_1_icon"
+//                                           index:1];
+//    guideView2 = [[GuideView alloc] initWithTips:NSLocalizedString(@"guide_middle_tips_2",nil)
+//                                       imageName:@"guide_middle_2_icon"
+//                                           index:2];
+//    guideView3 = [[GuideView alloc] initWithTips:NSLocalizedString(@"guide_middle_tips_3",nil)
+//                                       imageName:@"guide_middle_3_icon"
+//                                           index:3];
+//    
+//    guideView0.frame = CGRectMake(0*self.view.width, 0, self.view.width,self.view.height);
+//    guideView1.frame = CGRectMake(1*self.view.width, 0, self.view.width,self.view.height);
+//    guideView2.frame = CGRectMake(2*self.view.width, 0, self.view.width,self.view.height);
+//    guideView3.frame = CGRectMake(3*self.view.width, 0, self.view.width,self.view.height);
+//    
+//    [bgScrView addSubview:guideView0];
+//    [bgScrView addSubview:guideView1];
+//    [bgScrView addSubview:guideView2];
+//    [bgScrView addSubview:guideView3];
     
-    guideLastView = [[GuideLastView alloc] initWithFrame:CGRectMake(4*self.view.width, 0, self.view.width,self.view.height)];
+    guideLastView = [[GuideLastView alloc] initWithFrame:CGRectMake(0*self.view.width, 0, self.view.width,self.view.height)];
     [bgScrView addSubview:guideLastView];
     
     KWeakSelf

+ 2 - 2
创维盒子/code/en.lproj/Localizable.strings

@@ -290,9 +290,9 @@
 "my_set_about_version_tap_sn"   = "SN number";
 "my_set_about_version_tap_av"   = "AV version number";
 "my_set_Privacy_Model"   = "Privacy Mode";
-"my_set_Privacy_Model_tip"   = "In the privacy mode, you can set a password,Login disguise, flip to exit, and hide background processes to protect your privacy.";
+"my_set_Privacy_Model_tip"   = "In the privacy mode, you can set a password, flip to exit, and hide background processes to protect your privacy.";
 "my_set_Privacy_Mode_set"   = "Privacy Settings";
-"my_set_Privacy_Mode_tip1"   = "In the privacy mode, you can set a password, Login disguise,flip to exit, and hide background processes to protect your privacy.";
+"my_set_Privacy_Mode_tip1"   = "In the privacy mode, you can set a password,flip to exit, and hide background processes to protect your privacy.";
 "my_set_Privacy_Mode_tip2"   = "If you have not turned on privacy mode, you can turn it on in the Settings.";
 "my_set_Privacy_Mode_open"   = "Turn on privacy mode";
 "my_set_no_change_login"   = "Login disguise";

+ 2 - 2
创维盒子/code/zh-Hans.lproj/Localizable.strings

@@ -285,9 +285,9 @@
 "my_set_about_version_tap_sn"   = "SN号";
 "my_set_about_version_tap_av"   = "AV版本号";
 "my_set_Privacy_Model"   = "隐私模式";
-"my_set_Privacy_Model_tip"   = "隐私模式下,具有设置登录密码、登录伪装、翻转退出等保护您个人信息安全的功能";
+"my_set_Privacy_Model_tip"   = "隐私模式下,具有设置登录密码、翻转退出等保护您个人信息安全的功能";
 "my_set_Privacy_Mode_set"   = "隐私模式设置";
-"my_set_Privacy_Mode_tip1"   = "隐私模式下,具有设置登录密码、登录伪装、翻转退出等保护您个人信息安全的功能";
+"my_set_Privacy_Mode_tip1"   = "隐私模式下,具有设置登录密码、翻转退出等保护您个人信息安全的功能";
 "my_set_Privacy_Mode_tip2"   = "若未选择开启隐私模式,可到设置中开启";
 "my_set_Privacy_Mode_open"   = "开启隐私模式";
 "my_set_no_change_login"   = "登录伪装";

+ 2 - 2
创维盒子/code/zh-Hant.lproj/Localizable.strings

@@ -289,9 +289,9 @@
 "my_set_about_version_tap_sn"   = "SN號";
 "my_set_about_version_tap_av"   = "AV版本號";
 "my_set_Privacy_Model"   = "隱私模式";
-"my_set_Privacy_Model_tip"   = "隱私模式下,具有設置密碼登録,登録偽裝,翻轉退出及行程隱藏等保護您個人資訊安全的功能";
+"my_set_Privacy_Model_tip"   = "隱私模式下,具有設置密碼登録,翻轉退出及行程隱藏等保護您個人資訊安全的功能";
 "my_set_Privacy_Mode_set"   = "隱私模式設定";
-"my_set_Privacy_Mode_tip1"   = "隱私模式下,具有設置密碼登録,登録偽裝,翻轉退出及行程隱藏等保護您個人資訊安全的功能";
+"my_set_Privacy_Mode_tip1"   = "隱私模式下,具有設置密碼登録,翻轉退出及行程隱藏等保護您個人資訊安全的功能";
 "my_set_Privacy_Mode_tip2"   = "若未選擇開啟隱私模式,可到設定中開啟";
 "my_set_Privacy_Mode_open"   = "開啟隱私模式";
 "my_set_no_change_login"   = "登録偽裝";