xiugai

diff --git a/2.sdk/gui/lv_watch/lv_apps/launcher/launcher.c b/2.sdk/gui/lv_watch/lv_apps/launcher/launcher.c
index 5875271..5dce292 100644 (file)
--- a/2.sdk/gui/lv_watch/lv_apps/launcher/launcher.c
+++ b/2.sdk/gui/lv_watch/lv_apps/launcher/launcher.c
@@ -49,7 +49,7 @@ static void launcher_drop_pull_prepare_destory(lv_obj_t * activity_obj);
  **********************/
 static lv_signal_cb_t  ancestor_launcher_tileview_scrl_signal;
 static lv_point_t * menu_valid_pos = NULL;
-//static const lv_point_t dp_valid_pos[] = {{0, 0}, {1, 0}, {2, 0}};
+static const lv_point_t dp_valid_pos[] = {{0, 0}, {1, 0}, {2, 0}};
 /**********************
  *      MACROS
  **********************/
@@ -599,7 +599,7 @@ static void launcher_drop_down_bar_create(lv_obj_t * activity_obj)
     ext->leds[1] = NULL;
     ext->leds[2] = NULL;
 
-    //lv_tileview_set_valid_positions(tileview, dp_valid_pos, 3);
+    lv_tileview_set_valid_positions(tileview, dp_valid_pos, 3);
     lv_tileview_set_edge_flash(tileview, true);
     lv_tileview_set_anim_time(tileview, 50);
     lv_tileview_set_tab_switch_limit(tileview, 60);
@@ -799,7 +799,7 @@ static lv_obj_t * sport_create(lv_obj_t * activity_obj)
     ext->leds[2] = NULL;
     ext->pedometer_dot = NULL;
     ext->pull_up_start = 0;
-    //lv_tileview_set_valid_positions(tileview, dp_valid_pos, 3);
+    lv_tileview_set_valid_positions(tileview, dp_valid_pos, 3);
     lv_tileview_set_edge_flash(tileview, true);
     lv_tileview_set_anim_time(tileview, 60);
     lv_page_set_scrollbar_mode(tileview, LV_SCROLLBAR_MODE_OFF);
@@ -809,23 +809,26 @@ static lv_obj_t * sport_create(lv_obj_t * activity_obj)
         ancestor_launcher_tileview_scrl_signal = lv_obj_get_signal_cb(lv_page_get_scrollable(tileview));
     lv_obj_set_signal_cb(lv_page_get_scrollable(tileview), launcher_pull_up_tileview_scrl_signal);
 
-    lv_obj_t * tab;
+    //lv_obj_t * tab;
 #if USE_LV_WATCH_BODYINFO != 0
-    tab = bodyinfo_create(tileview, 0);
-    LV_ASSERT_MEM(tab);
-    if(tab == NULL) return NULL;
+       bodyinfo_create(tileview, 0);
+    //tab = bodyinfo_create(tileview, 0);
+    //LV_ASSERT_MEM(tab);
+    //if(tab == NULL) return NULL;
 #endif
 
 #if USE_LV_WATCH_PEDOMETER != 0
-    tab = pedometer_create(tileview, 1);
-    LV_ASSERT_MEM(tab);
-    if(tab == NULL) return NULL;
+       pedometer_create(tileview, 1);
+    //tab = pedometer_create(tileview, 1);
+    //LV_ASSERT_MEM(tab);
+    //if(tab == NULL) return NULL;
 #endif
 
 #if USE_LV_WATCH_RECORD != 0
-    tab = record_create(tileview, 2);
-    LV_ASSERT_MEM(tab);
-    if(tab == NULL) return NULL;
+       record_create(tileview, 2);
+    //tab = record_create(tileview, 2);
+    //LV_ASSERT_MEM(tab);
+    //if(tab == NULL) return NULL;
 #endif
     lv_tileview_set_valid_positions(tileview, pu_valid_pos, sizeof(pu_valid_pos) / sizeof(pu_valid_pos[0]));
     lv_tileview_set_tile_act(tileview, 1, 0, false);