增加动态表盘资源

diff --git a/code/sdk/application/wearable/nativeapp/nativeui/clock/clock.json b/code/sdk/application/wearable/nativeapp/nativeui/clock/clock.json
index 6a8f5bc..e206750 100644 (file)
--- a/code/sdk/application/wearable/nativeapp/nativeui/clock/clock.json
+++ b/code/sdk/application/wearable/nativeapp/nativeui/clock/clock.json
@@ -1,83 +1,237 @@
 {
-    "digitalClock": {
-        "digits": {
-            "commonfont": {
-                "time": {
-                    "hours": "12",
-                    "minutes": "30",
-                    "seconds": "45",
+    "Handclock": {
+        "commonHandclock": {
+            "commonhands": {
+                "hourHand": {
                     "coordinates": {
-                        "left": 155,
-                        "top": 120
+                        "HOUR_POINT_POSITION_X": 200,
+                        "HOUR_POINT_POSITION_Y": 87,
+                        "HOUR_POINT_CENTER_X": 12,
+                        "HOUR_POINT_CENTER_Y": 146
                     },
-                    "fontsize": 60
+                    "imagepath": "Handsfile.commonhand.hour_hand"
                 },
-                "data": {
-                    "date": "12月28号",
-                    "week": "星期四",
+                "minuteHand": {
                     "coordinates": {
-                        "left": 155,
-                        "top": 300
+                        "MINUTE_POINT_POSITION_X": 221,
+                        "MINUTE_POINT_POSITION_Y": 33,
+                        "MINUTE_POINT_CENTER_X": 12,
+                        "MINUTE_POINT_CENTER_Y": 200
                     },
-                    "fontsize": 50
-                },
-                "fonturl": "/user/res/dial/font/common/"
-            }
-        }
-    },
-    "pointerClock": {
-        "hands": {
-            "commonhand": {
-                "centralpoint": {
-                    "POINT_CENTER_X": 25,
-                    "POINT_CENTER_Y": 211,
-                    "POINT_POSITION_X": 202,
-                    "POINT_POSITION_Y": 16
+                    "imagepath": "Handsfile.commonhand.minute_hand"
                 },
-                "hourHand": {
-                    "image": "/user/res/dial/hand/common/hour_hand.bin",
+                "secondHand": {
                     "coordinates": {
-                        "SMALLCIRCLE_POSITION_X ": 202,
-                        "SMALLCIRCLE_POSITION_Y": 202
+                        "SECOND_POINT_POSITION_X": 221,
+                        "SECOND_POINT_POSITION_Y": 28,
+                        "SECOND_POINT_CENTER_X": 12,
+                        "SECOND_POINT_CENTER_Y": 205
+                    },
+                    "imagepath": "Handsfile.commonhand.second_hand"
+                }
+            },
+            "commondate": {
+                "textdisplay": {
+                    "displayformat": [
+                        "yyyy年mm月dd日",
+                        "mm月dd日",
+                        "yyyy/mm/dd",
+                        "yyyy.mm.dd",
+                        "mm/dd",
+                        "mm.dd",
+                        "Chinesecalendar"
+                    ],
+                    "font": "STYLE_TEXT_FONT",
+                    "fontsize": 30,
+                    "coordinates": {
+                        "left": 149,
+                        "top": 350
                     }
                 },
-                "minuteHand": {
-                    "image": "/user/res/dial/hand/common/minute_hand.bin",
+                "picturesdisplay": {
+                    "displayformat": [
+                        "yyyy年mm月dd日",
+                        "mm月dd日",
+                        "yyyy/mm/dd",
+                        "yyyy.mm.dd",
+                        "mm/dd",
+                        "mm.dd",
+                        "Chinesecalendar"
+                    ],
+                    "imagepath": "datefile.commondate",
                     "coordinates": {
-                        "MEDCIRCLE_POSITION_X": 202,
-                        "MEDCIRCLE_POSITION_Y": 202
+                        "left": 149,
+                        "top": 350
                     }
+                }
+            }
+        },
+        "commonweek": {
+            "textdisplay": {
+                "displayformat": {
+                    "weekformat": [
+                        "星期一",
+                        "星期二",
+                        "星期三",
+                        "星期四",
+                        "星期五",
+                        "星期六",
+                        "星期天"
+                    ],
+                    "zhouformat": [
+                        "周一",
+                        "周二",
+                        "周三",
+                        "周四",
+                        "周五",
+                        "周六",
+                        "周末"
+                    ]
                 },
-                "secondHand": {
-                    "image": "/user/res/dial/hand/common/second_hand.bin",
+                "font": "fontfile.SystemFONT",
+                "fontsize": 30,
+                "coordinates": {
+                    "left": 188,
+                    "top": 390
+                }
+            },
+            "picturesdisplay": {
+                "displayformat": {
+                    "weekformat": "星期",
+                    "zhouformat": "周"
+                },
+                "imagepath": "weekfile.commonweek",
+                "coordinates": {
+                    "left": 188,
+                    "top": 390
+                }
+            }
+        },
+        "commonbattery": {},
+        "commonheartrate": {},
+        "commonsteps": {},
+        "commonbackground": {
+            "commonStillpicture": {},
+            "commonDynamicvideo": {}
+        }
+    },
+    "digitalClock": {
+        "commondigits": {
+            "commontime": {
+                "timeformat": [
+                    "12format",
+                    "24format"
+                ],
+                "textdisplay": {
+                    "font": "fontfile.SystemFONT",
+                    "fontsize": 100,
                     "coordinates": {
-                        "BIGCIRCLE_POSITION_X": 202,
-                        "BIGCIRCLE_POSITION_Y": 202
+                        "left": 105,
+                        "top": 99
                     }
+                },
+                "picturesdisplay":{
+                    "imagepath": "weekfile.commonweek",
+                    "coordinates":{}
+                    
                 }
-            }
+            },
+            "commondata": {
+                "date": " ",
+                "week": {
+                    "Mon": "星期一"
+                },
+                "coordinates": {
+                    "left": 155,
+                    "top": 300
+                },
+                "fontsize": 50
+            },
+            "fonturl": "/user/res/dial/font/common/"
         }
     },
-    "ClcokBackground": {
-        "staticBackground": {
-            "url": [
-                "/res/dial/staticBackground/diao_user.bin",
-                "/res/dial/staticBackground/diao_momo.bin"
-            ]
+    "Resourcefile": {
+        "Handsfile": {
+            "commonhand": {
+                "hour_hand": "/user/res/dial/Handclock/commonHandclock/hour_hand.bin",
+                "minute_hand": "/user/res/dial/Handclock/commonHandclock/minute_hand.bin",
+                "second_hand": "/user/res/dial/Handclock/commonHandclock/second_hand.bin"
+            }
         },
-        "dynamicBackground": {
-            "url": [
-                "/res/dial/dynamicBackground/diao_user.mp4",
-                "/res/dial/dynamicBackground/diao_momo.mp4"
-            ]
+        "digitalfile": {
+            "commondigital": {
+                "0": "/user/res/dial/digitalClock/commonHandclock/0.bin",
+                "1": "/user/res/dial/digitalClock/commonHandclock/1.bin",
+                "2": "/user/res/dial/digitalClock/commonHandclock/2.bin",
+                "3": "/user/res/dial/digitalClock/commonHandclock/3.bin",
+                "4": "/user/res/dial/digitalClock/commonHandclock/4.bin",
+                "5": "/user/res/dial/digitalClock/commonHandclock/5.bin",
+                "6": "/user/res/dial/digitalClock/commonHandclock/6.bin",
+                "7": "/user/res/dial/digitalClock/commonHandclock/7.bin",
+                "8": "/user/res/dial/digitalClock/commonHandclock/8.bin",
+                "9": "/user/res/dial/digitalClock/commonHandclock/9.bin",
+                ":": "/user/res/dial/digitalClock/commonHandclock/colon.bin"
+            }
         },
-        "size": {
-            "width": 466,
-            "height": 466
+        "datefile": {
+            "commondate": {
+                "0": "/user/res/dial/date/commonHandclock/0.bin",
+                "1": "/user/res/dial/date/commonHandclock/1.bin",
+                "2": "/user/res/dial/date/commonHandclock/2.bin",
+                "3": "/user/res/dial/date/commonHandclock/3.bin",
+                "4": "/user/res/dial/date/commonHandclock/4.bin",
+                "5": "/user/res/dial/date/commonHandclock/5.bin",
+                "6": "/user/res/dial/date/commonHandclock/6.bin",
+                "7": "/user/res/dial/date/commonHandclock/7.bin",
+                "8": "/user/res/dial/date/commonHandclock/8.bin",
+                "9": "/user/res/dial/date/commonHandclock/9.bin",
+                "/": "/user/res/dial/date/commonHandclock/slash.bin",
+                ".": "/user/res/dial/date/commonHandclock/dot.bin",
+                "年": "/user/res/dial/date/commonHandclock/year.bin",
+                "月": "/user/res/dial/date/commonHandclock/month.bin",
+                "日": "/user/res/dial/date/commonHandclock/day.bin",
+                "一": "/user/res/dial/date/commonHandclock/yi.bin",
+                "二": "/user/res/dial/date/commonHandclock/er.bin",
+                "三": "/user/res/dial/date/commonHandclock/san.bin",
+                "四": "/user/res/dial/date/commonHandclock/si.bin",
+                "五": "/user/res/dial/date/commonHandclock/wu.bin",
+                "六": "/user/res/dial/date/commonHandclock/liu.bin",
+                "七": "/user/res/dial/date/commonHandclock/qi.bin",
+                "八": "/user/res/dial/date/commonHandclock/ba.bin",
+                "九": "/user/res/dial/date/commonHandclock/jiu.bin",
+                "十": "/user/res/dial/date/commonHandclock/shi.bin",
+                "冬": "/user/res/dial/date/commonHandclock/dong.bin",
+                "腊": "/user/res/dial/date/commonHandclock/la.bin"
+            }
         },
-        "coordinates": {
-            "left": 0,
-            "top": 0
+        "weekfile": {
+            "commonweek": {
+                "星期一": "/user/res/dial/week/commonHandclock/Monday.bin",
+                "星期二": "/user/res/dial/week/commonHandclock/Tuesday.bin",
+                "星期三": "/user/res/dial/week/commonHandclock/Wednesday.bin",
+                "星期四": "/user/res/dial/week/commonHandclock/Thursday.bin",
+                "星期五": "/user/res/dial/week/commonHandclock/Friday.bin",
+                "星期六": "/user/res/dial/week/commonHandclock/Saturday.bin",
+                "星期天": "/user/res/dial/week/commonHandclock/Sunday.bin",
+                "周一": "/user/res/dial/week/commonHandclock/zhou_Monday.bin",
+                "周二": "/user/res/dial/week/commonHandclock/zhou_Tuesday.bin",
+                "周三": "/user/res/dial/week/commonHandclock/zhou_Wednesday.bin",
+                "周四": "/user/res/dial/week/commonHandclock/zhou_Thursday.bin",
+                "周五": "/user/res/dial/week/commonHandclock/zhou_Friday.bin",
+                "周六": "/user/res/dial/week/commonHandclock/zhou_Saturday.bin",
+                "周日": "/user/res/dial/week/commonHandclock/zhou_Sunday.bin"
+            }
+        },
+        "fontfile": {
+            "SystemFONT": "STYLE_TEXT_FONT"
+        },
+        "backgroundfile": {
+            "Stillpicture": {
+                "momo表盘": "/user/res/dial/background/Stillpicture/momo.bin"
+            },
+            "Dynamicvideo": {
+                "momo动态表盘": "/user/res/dial/background/Dynamicvideo/momo.mp4"
+            }
         }
     }
 }
\ No newline at end of file

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/video/dial.mp4 b/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/video/dial.mp4
new file mode 100644 (file)
index 0000000..5d8a573
Binary files /dev/null and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fs/user/video/dial.mp4 differ