gengxin

diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/album/icon_del_all_bg.png b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/album/icon_del_all_bg.png
index 6dc8f8e..30dbe63 100644 (file)
Binary files a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/album/icon_del_all_bg.png and b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/album/icon_del_all_bg.png differ

diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_bear/_icon_bear.png b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_bear/_icon_bear.png
deleted file mode 100644 (file)
index ca6c914..0000000
Binary files a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_bear/_icon_bear.png and /dev/null differ

diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/dolphin_watch_360.json b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/dolphin_watch_360.json
deleted file mode 100644 (file)
index b3dd14d..0000000
--- a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/dial_dolphin/dolphin_watch_360.json
+++ /dev/null
@@ -1,343 +0,0 @@
-{
-  "name": "dolphin",
-  "preview_img": "R:/png/dial_dolphin/icon_dial_dolphin_360.png",
-  "bg_img": "R:/png/dial_dolphin/icon_dolphin_360.png",
-  "configurable": 0,
-  "element_ll": [
-    {
-      "element_pos": {
-        "x": 50,
-        "y": 75
-      },
-      "element_cnt": 1,
-      "act_type": 1,
-      "layer": 0,
-      "element_dsc_ll": [
-        {
-          "element_type": 1,
-          "element_name": "数字时钟",
-          "img_cnt": 4,
-          "img_ll": [
-            {
-              "img_type": 10,
-              "img_pos": {
-                "x": 0,
-                "y": 0
-              },
-              "sub_img_cnt": 10,
-              "sub_img_ll": [
-                {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_0.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_1.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_2.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_3.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_4.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_5.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_6.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_7.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_8.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_9.png"
-                }
-              ]
-            },
-                       {
-              "img_type": 11,
-              "img_pos": {
-                "x": 37,
-                "y": 0
-              },
-              "sub_img_cnt": 10,
-              "sub_img_ll": [
-                {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_0.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_1.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_2.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_3.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_4.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_5.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_6.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_7.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_8.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_9.png"
-                }
-              ]
-            },
-                       {
-              "img_type": 12,
-              "img_pos": {
-                "x": 0,
-                "y": 67
-              },
-              "sub_img_cnt": 10,
-              "sub_img_ll": [
-                {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_0.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_1.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_2.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_3.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_4.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_5.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_6.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_7.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_8.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_9.png"
-                }
-              ]
-            }, 
-                       {
-              "img_type": 13,
-              "img_pos": {
-                "x": 37,
-                "y": 67
-              },
-              "sub_img_cnt": 10,
-              "sub_img_ll": [
-                {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_0.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_1.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_2.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_3.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_4.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_5.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_6.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_7.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_8.png"
-                },
-                               {
-                  "sub_img": "R:/png/dial_dolphin/icon_dolphin_digital_9.png"
-                }
-              ]
-            }
-          ],
-          "label_cnt": 0,
-                 "label_ll": [
-                       {
-              "label_type": 5,
-              "text": "",
-              "text_color": {
-                "r": 255,
-                "g": 255,
-                "b": 255
-              },
-              "text_pos": {
-                "x": 25,
-                "y": 190
-              },
-              "font_size": 20
-            }
-          ],
-          "bar": {
-            "bar_type": 0,
-            "bar_pos": {
-              "x": 8,
-              "y": 9
-            },
-            "bar_color": {
-              "r": 77,
-              "g": 88,
-              "b": 99
-            },
-            "bar_w": 11,
-            "bar_h": 12
-          }
-        }
-      ]
-    },
-    {
-      "element_pos": {
-        "x": 50,
-        "y": 210
-      },
-      "element_cnt": 1,
-      "act_type": 5,
-      "layer": 0,
-      "element_dsc_ll": [
-        {
-          "element_type": 5,
-          "element_name": "日期",
-          "img_cnt": 0,
-          "img_ll": [
-          ],
-          "label_cnt": 3,
-          "label_ll": [
-            {
-              "label_type": 8,
-              "text": "",
-              "text_color": {
-                "r": 255,
-                "g": 255,
-                "b": 255
-              },
-              "text_pos": {
-                "x": 0,
-                "y": 0
-              },
-              "font_size": 30
-            },
-                       {
-              "label_type": 10,
-              "text": "-",
-              "text_color": {
-                "r": 255,
-                "g": 255,
-                "b": 255
-              },
-              "text_pos": {
-                "x": 35,
-                "y": 0
-              },
-              "font_size": 30
-            },
-                       {
-              "label_type": 9,
-              "text": "",
-              "text_color": {
-                "r": 255,
-                "g": 255,
-                "b": 255
-              },
-              "text_pos": {
-                "x": 45,
-                "y": 0
-              },
-              "font_size": 30
-            }
-          ],
-          "bar": {
-            "bar_type": 0,
-            "bar_pos": {
-              "x": 8,
-              "y": 9
-            },
-            "bar_color": {
-              "r": 77,
-              "g": 88,
-              "b": 99
-            },
-            "bar_w": 11,
-            "bar_h": 12
-          }
-        }
-      ]
-    },
-       {
-      "element_pos": {
-        "x": 50,
-        "y": 245
-      },
-      "element_cnt": 1,
-      "act_type": 4,
-      "layer": 0,
-      "element_dsc_ll": [
-        {
-          "element_type": 4,
-          "element_name": "星期",
-          "img_cnt": 0,
-          "img_ll": [
-          ],
-          "label_cnt": 1,
-          "label_ll": [
-            {
-              "label_type": 5,
-              "text": "",
-              "text_color": {
-                "r": 255,
-                "g": 255,
-                "b": 255
-              },
-              "text_pos": {
-                "x": 0,
-                "y": 0
-              },
-              "font_size": 30
-            }
-          ],
-          "bar": {
-            "bar_type": 0,
-            "bar_pos": {
-              "x": 8,
-              "y": 9
-            },
-            "bar_color": {
-              "r": 77,
-              "g": 88,
-              "b": 99
-            },
-            "bar_w": 11,
-            "bar_h": 12
-          }
-        }
-      ]
-    }
-  ]
-}

diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/album/icon_del_all_bg.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/album/icon_del_all_bg.png
index 6dc8f8e..6202432 100644 (file)
Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/album/icon_del_all_bg.png and b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/album/icon_del_all_bg.png differ

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/album/album.c b/2.sdk/sdk/gui/lv_watch/lv_apps/album/album.c
index c4198fe..56f59eb 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/album/album.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/album/album.c
@@ -749,7 +749,7 @@ static lv_obj_t * album_photo_bg_create(lv_obj_t * par)
         lv_label_set_text_id(label_nophoto, WATCH_TEXT_ID_NOPHOTO);
         //lv_obj_align(label_nophoto, NULL, LV_ALIGN_IN_BOTTOM_MID, 10, -20);
         //lv_obj_add_style(label_nophoto, LV_LABEL_PART_MAIN, &lv_watch_font20_black);
-        lv_obj_add_style(label_nophoto, LV_LABEL_PART_MAIN, &lv_watch_font30_black);
+        lv_obj_add_style(label_nophoto, LV_LABEL_PART_MAIN, &lv_watch_font26_black); // &lv_watch_font30_black);
         lv_obj_align(label_nophoto, NULL, LV_ALIGN_CENTER, 0, 0);
         lv_obj_set_click(label_nophoto, false);
 
@@ -1206,7 +1206,7 @@ static void album_setting_delete_create(lv_obj_t * par, uint8_t del_one)
     else
         lv_label_set_text_id(label_q, WATCH_TEXT_ID_DEL_ALL_PHOTO_Q);
     if(lv_lang_act() == LANG_CH)
-        lv_obj_add_style(label_q, LV_LABEL_PART_MAIN, &lv_watch_font30_black);
+        lv_obj_add_style(label_q, LV_LABEL_PART_MAIN, &lv_watch_font26_black); // &lv_watch_font30_black);
     else
         lv_obj_add_style(label_q, LV_LABEL_PART_MAIN, &lv_watch_font20_black);
     //lv_obj_align(label_q, img_to_del, LV_ALIGN_OUT_BOTTOM_MID, 0, 15);
@@ -1224,7 +1224,7 @@ static void album_setting_delete_create(lv_obj_t * par, uint8_t del_one)
     lv_watch_set_free_num(btn_cancel, num);
     lv_obj_t * label_cancel = lv_label_create(btn_cancel, NULL);
     lv_label_set_text_id(label_cancel, WATCH_TEXT_ID_CANCEL);
-    lv_obj_add_style(label_cancel, LV_LABEL_PART_MAIN, &lv_watch_font30);
+    lv_obj_add_style(label_cancel, LV_LABEL_PART_MAIN, &lv_watch_font26_black); // &lv_watch_font30);
 
     lv_obj_t * btn_ok = lv_btn_create(bg, btn_cancel);
     lv_obj_set_style_local_bg_color(btn_ok, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_MAKE(0xFF, 0x6F, 0x91));
@@ -1278,7 +1278,7 @@ static void album_delete_success_create()
     lv_obj_align(img_suc, NULL, LV_ALIGN_IN_TOP_MID, 0, LV_VER_RES / 4);
 
     lv_obj_t * label = lv_label_create(cont_bg, NULL);
-    lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font30);
+    lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font26); // &lv_watch_font30);
     lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
     lv_label_set_text_id(label, WATCH_TEXT_ID_DEL_SUCCESS);
     lv_obj_align(label, img_suc, LV_ALIGN_OUT_BOTTOM_MID, 0, 10);
@@ -1304,7 +1304,7 @@ static void album_photo_share_confirm_create(lv_obj_t * par, voice_msg_contact_t
     memset(str, 0, 64);
     if(LANG_CH == lv_lang_act()) {
         snprintf(str, 64, "%s%s?", (char *)lv_lang_get_text(WATCH_TEXT_ID_SEND_TO), contact->name);
-        lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font30_black);
+        lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font26_black); // &lv_watch_font30_black);
     } else {
         snprintf(str, 64, "%s %s?", (char *)lv_lang_get_text(WATCH_TEXT_ID_SEND_TO), contact->name);
         lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font20_black);
@@ -1325,7 +1325,7 @@ static void album_photo_share_confirm_create(lv_obj_t * par, voice_msg_contact_t
     lv_obj_set_event_cb(btn_cancel, album_share_cancel_btn_event_cb);
     lv_obj_t * label_cancel = lv_label_create(btn_cancel, NULL);
     lv_label_set_text_id(label_cancel, WATCH_TEXT_ID_CANCEL);
-    lv_obj_add_style(label_cancel, LV_LABEL_PART_MAIN, &lv_watch_font30);
+    lv_obj_add_style(label_cancel, LV_LABEL_PART_MAIN, &lv_watch_font26_black); // &lv_watch_font30);
 
     lv_obj_t * btn_ok = lv_btn_create(bg, btn_cancel);
     lv_obj_set_style_local_bg_color(btn_ok, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_MAKE(0xFF, 0x6F, 0x91));