diff --git a/SquareLineProj/ESP32S3_UI.sll b/SquareLineProj/ESP32S3_UI.sll index 503ce8e..8446e68 100644 --- a/SquareLineProj/ESP32S3_UI.sll +++ b/SquareLineProj/ESP32S3_UI.sll @@ -12,7 +12,7 @@ "board": "ESP32-S3-LCD-EV-BOARD", "board_version": "1.0.1", "editor_version": "1.5.1", - "image": "/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjL/wAARCAHgAyADASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD3aiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKAIjcIrEENwcUn2lPRqryf6xvqabQBa+0p6NR9pT0aqtFAFr7Sno1H2lPRqq0UAWvtKejUfaU9GqrRQBa+0p6NR9pT0aqtFAFr7Sno1H2lPRqq0UAWvtKejUfaU9GqrRQBa+0p6NR9pT0aqtFAFr7Sno1H2lPRqq0UAWvtKejUfaU9GqrRQBa+0p6NR9pT0aqtFAFr7Sno1H2lPRqq0UAWvtKejUfaU9GqrRQBa+0p6NR9pT0aqtFAFr7Sno1H2lPRqq0UAWvtKejUfaU9GqrRQBa+0p6NR9pT0aqtFAFr7Sno1H2lPRqq0UAWvtKejUfaU9GqrRQBa+0p6NR9pT0aqtFAF8HcoI7jNLTY/wDVr9BTqACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAoyf6xvqabTpP9Y31NNoAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKAL0f+rX6CnU2P8A1a/QU6gAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKAKMn+sb6mm06T/WN9TWVrGs2+kW++U5kb7qjqaqEJTkoxV2yZTjCLlJ2Rp0V51P4z1CSQmNVRfQk/0xUX/CX6p6x/8Aj3/xVegspxLWy+8895rhk939x6VRXmv/AAl+qesf/j3/AMVR/wAJfqnrH/49/wDFU/7JxPZfeH9rYbu/uPSqK81/4S/VPWP/AMe/+Ko/4S/VPWP/AMe/+Ko/snE9l94f2thu7+49KorzX/hL9U9Y/wDx7/4qj/hL9U9Y/wDx7/4qj+ycT2X3h/a2G7v7j0qivNf+Ev1T1j/8e/8AiqP+Ev1T1j/8e/8AiqP7JxPZfeH9rYbu/uPSqK81/wCEv1T1j/8AHv8A4qj/AIS/VPWP/wAe/wDiqP7JxPZfeH9rYbu/uPSqK81/4S/VPWP/AMe/+Ko/4S/VPWP/AMe/+Ko/snE9l94f2thu7+49KorzX/hL9U9Y/wDx7/4qj/hL9U9Y/wDx7/4qj+ycT2X3h/a2G7v7j0qivNf+Ev1T1j/8e/8AiqP+Ev1T1j/8e/8AiqP7JxPZfeH9rYbu/uPSqK81/wCEv1T1j/8AHv8A4qj/AIS/VPWP/wAe/wDiqP7JxPZfeH9rYbu/uPSqK81/4S/VPWP/AMe/+Ko/4S/VPWP/AMe/+Ko/snE9l94f2thu7+49Korz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KACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAoyf6xvqabVqK286R2YkIGPTvVj7HB/c/U0AZtFaX2OD+5+po+xwf3P1NAGbRWl9jg/ufqaPscH9z9TQBm0VpfY4P7n6mj7HB/c/U0AZtFaX2OD+5+po+xwf3P1NAGbRWl9jg/ufqaPscH9z9TQBm0VpfY4P7n6mj7HB/c/U0AZtFaX2OD+5+po+xwf3P1NAGbRWl9jg/ufqaPscH9z9TQBm0VpfY4P7n6mj7HB/c/U0AZtFaX2OD+5+po+xwf3P1NAGbRWl9jg/ufqaPscH9z9TQBm0VpfY4P7n6mj7HB/c/U0AZtFaX2OD+5+po+xwf3P1NAGbRWl9jg/ufqaPscH9z9TQBm0VpfY4P7n6mj7HB/c/U0AZtFaX2OD+5+po+xwf3P1NAGbRWl9jg/ufqaPscH9z9TQBm0VpfY4P7n6mj7HB/c/U0AZtFaX2OD+5+pqrc23k4ZSSh9e1AE0f+rX6CnU2P/Vr9BTqACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAkg/1X/Am/malqOD/AFX/AAJv5mpKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACoLz/j1f8P51PUF5/x6v+H86AI4/wDVr9BTqbH/AKtfoKdQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFAEsH+q/wCBN/M1JUcH+q/4E38zUlABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABUF5/x6v+H86nqC8/49X/AA/nQBHH/q1+gp1Nj/1a/QU6gAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKAJYP9V/wJv5mpKjg/1X/Am/makoAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKgvP+PV/w/nU9QXn/AB6v+H86AI4/9Wv0FOpsf+rX6CnUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQBLB/qv+BN/M1JUcH+q/4E38zUlABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABUF5/x6v8Ah/Op6gvP+PV/w/nQBHH/AKtfoKdTY/8AVr9BTqACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAlg/wBV/wACb+ZqSo4P9V/wJv5mpKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACoLz/AI9X/D+dT1Bef8er/h/OgCOP/Vr9BTqbH/q1+gp1ABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUASwf6r/gTfzNSVHB/qv8AgTfz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Q16mGzecZWrar8TzMRlEJRvR0f4HiFdb4E0a4vNSa/C7YIAVDt0LkYwPwJ/Suph+HeiRSh3a7lA/geQY/QA/rXT29vDaW6QW8SxRIMKijAFa4zNYTpunS6mWDyucKiqVehXTTx/G5PsBVmOCKL7qjPqetSUV4J7oUUUUAFFFFABRRRQAyb/USf7p/lWT2rWm/wBRJ/un+VZPagC9H/q1+gp1Nj/1a/QU6gAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKAKMn+sb6mprW4ELFW+4e/oahk4lcf7RptAGr58X/AD0T/vql86L/AJ6p/wB9CsmigDW86L/nqn/fQo86L/nqn/fQrJooA1vOi/56p/30KPOi/wCeqf8AfQrJooA1vOi/56p/30KPOi/56p/30KyaKANbzov+eqf99Cjzov8Anqn/AH0KyaKANbzov+eqf99Cjzov+eqf99CsmigC7dXSlDHGck9SOlUqKKAAEggjqORWlFdRyL8zBW7g8Vm0UAa3nRf89U/76FHnRf8APVP++hWTRQBredF/z1T/AL6FHnRf89U/76FZNFAGt50X/PVP++hR50X/AD1T/voVk0UAa3nRf89U/wC+hR50X/PVP++hWTRQBredF/z1T/voUedF/wA9U/76FZNFAGt50X/PVP8AvoUedF/z1T/voVk0UAa3nRf89U/76FHnRf8APVP++hWTRQBredF/z1T/AL6FHnRf89U/76FZNFAGt50X/PVP++hR50X/AD1T/voVk0UAa3nRf89U/wC+hR50X/PVP++hWTRQBdurpShjjOSepHSqVFFAF6P/AFa/QU6mx/6tfoKdQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFACtZxsxYs2Sc9aT7DF/ef8xVmigCt9hi/vP8AmKPsMX95/wAxVmigCt9hi/vP+Yo+wxf3n/MVZooArfYYv7z/AJij7DF/ef8AMVZooArfYYv7z/mKPsMX95/zFWaKAK32GL+8/wCYo+wxf3n/ADFWaKAK32GL+8/5ij7DF/ef8xVmigCt9hi/vP8AmKPsMX95/wAxVmoLy9tdOtXur25htrdMb5p5AiLk4GSeByQPxoAb9hi/vP8AmKPsMX95/wAxVePxBosumy6jHq9g9jE2yS5W5QxI3HBbOAfmXjPcetGn+INF1adoNO1ewvJlXeY7e5SRguQM4Uk4yRz70AWPsMX95/zFH2GL+8/5irNZ0viDRbfUhp02r2Ed8WVBbPcoJSzY2jaTnJyMDHORQBY+wxf3n/MUfYYv7z/mKiuta0qxuha3ep2dvcGIzCGadUfywCS+Cc7QFYk9PlPpUkOp6fczxwQX1tLNLALmOOOVWZ4icCQAHJUn+LpQAv2GL+8/5ij7DF/ef8xUV1rWlWN0LW71Ozt7gxGYQzTqj+WASXwTnaArEnp8p9KtwzRXMEc8EqSwyqHjkjYMrqRkEEcEEd6AIfsMX95/zFH2GL+8/wCYqzRQBW+wxf3n/MUfYYv7z/mKs0UAVvsMX95/zFH2GL+8/wCYqzRQBW+wxf3n/MUfYYv7z/mKs0UAVvsMX95/zFH2GL+8/wCYqzRQBW+wxf3n/MUfYYv7z/mKs0UAVvsMX95/zFH2GL+8/wCYqzRQBW+wxf3n/MUfYYv7z/mKs0UAVQNqgDsMUtFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAWaKKKACsBPFCX2pSWOj2M9+1vceRdz5EUNuwOGBZuWYeig/UVv1mXXh/TLvUYtRe2Ed9GQRcwsYpCAfusykFl4+6cj2oA06KKKACiiigAooooAKKKKACiiigArlfGGraVpl1pMdxof8AbGszyuNLt1gVnEigMWDtxGoITLdR1wQpx1VZWtaBa639lkkkmtryzl821vLZgssLfxAEggqw4ZSCCOo4GADyjx1pGvTeG/E/ijV7W20lbqztrb+zYJvNZmW5TEkzjCswAIUjPysBxg57T4q/6F4Ll122/dappcsUtldLw8TNIiMB6qykgqcg9wcCrd/8PtP1ay1ODUdT1a6m1FY45rl51DBI2VkVUVRGACpOdmfnfn5jV5fCsc2pWd7qmqX+qmzYyW8N35Iijk7SbY40DMBnBbO3JIweaALXie8n07wnrN7ayeXcW9jPNE+AdrqhIODweQOtZ3grTbIeAtNRrdJBqFmlxe+b+8NzJKgMjSFslixJznPHHQAV01c5beD4bDzodO1bU7HTpZWkOn27xiJN33lQlC8ak5OEZcFiV20AcJ4+07S/Dj+IJE1e2s4tW0pV/su500yRStEBHH5DgqFZcphfm253kYAw/QbyDQfHWg/2tJ9hCeDLeGVrgFFicSjhyeE5GPmxyQOpAPrEMS28EcKFysahAZHLsQBjlmJJPuSSafQB5Ddy2Wn6L8RtP14INXvJ7m4t4p08yWe38v8A0dk4JdUKseM+XtJO3Br0LwX/AMiL4e/7Blt/6KWtLU9Pi1bSbzTp2dYbuB4JGjIDBXUqSMgjOD6UaZp8Wk6TZ6dAztDaQJBG0hBYqihQTgAZwPSgC1RRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAVqKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAs0UUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFAFaiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKAP/Z", + "image": "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OBkn3qdWDKGUgqRkEdDQAjosiFWGQayWXa7L/dOK2KyZf9fJ/vH+dADK0rP/AI9U/H+dZtaVn/x6p+P86AJ6KKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooApX/WL8f6VTq5f9Yvx/pVOgC9H/q1+gp1Nj/1a/QU6gAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKAKMn+sb6mp7H/AI+G/wB3+oqCT/WN9TU9j/x8H/d/rQBoV5Y9hpK33iWPV/CN9qF5cajI9tLHpbsWjKIF2z7cKNwbncMda9TooA88TwbrvlafftMk2ovp0FtepLqNxb/vIwcPvhPzn5iCCOcZBGTma78F6qtlaRW8tveXaWxhlvrm+uoJslmb70bEyIC3CseMdea72igDjbXwxrHh2W2k0GaxuB/Z8FjcR3pePcYQwSRSob+82Vx6c1P8Pknj8PXSXUqy3C6neCWRV2h2898kDsCe1dXRQBweo+D9Q8X+KZpfE7IPD9k2LHT4ZTi4bH+tkIwe5AH9Mlrvg/Q9c8MX11o81wt74ejTfp88j/vosn/UsO4Azz9PXC9fRQAVky/6+T/eP861qyJeZpP940ANrSs/+PVPx/nWbWlZ/wDHqn4/zoAnooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigClf8AWL8f6VTq5f8AWL8f6VToAvR/6tfoKdTY/wDVr9BTqACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAoyf6xvqaRWKOGU4IpZP9Y31NNoAvLfpj5kYH25pft8X91/yFZzOiDLsqj3OKb9og/57R/8AfQoA0/t8X91/yFH2+L+6/wCQrM+0Qf8APaP/AL6FH2iD/ntH/wB9CgDT+3xf3X/IUfb4v7r/AJCsz7RB/wA9o/8A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", "export_temp_image": false, "force_export_images": false, "flat_export": false, @@ -25,7 +25,7 @@ "uiExportFolderPath": "D:\\yuwell_workspace\\FluxDC\\SquareLineProj\\Export", "projectExportFolderPath": "D:\\yuwell_workspace\\FluxDC\\SquareLineProj\\Export", "custom_variable_prefix": "uic", - "backup_cnt": 672, + "backup_cnt": 716, "autosave_cnt": 0, "group_color_cnt": 0, "lvgl_version": "8.3.6", @@ -42,5 +42,5 @@ "drive_fatfs_path": "", "naming": "_Screen_Name", "naming_force_lowercase": false, - "nidcnt": 1000333 + "nidcnt": 1000419 } \ No newline at end of file diff --git a/SquareLineProj/ESP32S3_UI.spj b/SquareLineProj/ESP32S3_UI.spj index 3c9a545..e385a61 100644 --- a/SquareLineProj/ESP32S3_UI.spj +++ b/SquareLineProj/ESP32S3_UI.spj @@ -5067,7 +5067,6 @@ }, { "nid": 90, - "flags": 1048576, "strtype": "OBJECT/Flags", "InheritedType": 1 }, @@ -10498,6 +10497,12 @@ "strval": "True", "InheritedType": 2 }, + { + "nid": 210, + "strtype": "OBJECT/Gesture_bubble", + "strval": "False", + "InheritedType": 2 + }, { "nid": 225, "strtype": "OBJECT/Scrolling", @@ -10595,9 +10600,86 @@ "strtype": "PANEL/Style_scrollbar", "strval": "lv.PART.SCROLLBAR, Rectangle, Pad", "InheritedType": 11 + }, + { + "disabled": false, + "nid": 1000343, + "strtype": "_event/EventHandler", + "strval": "GESTURE_RIGHT(GESTURE)", + "childs": [ + { + "nid": 1000344, + "strtype": "_event/name", + "strval": "Event19", + "InheritedType": 10 + }, + { + "nid": 1000345, + "strtype": "_event/condition_C", + "strval": "", + "InheritedType": 10 + }, + { + "nid": 1000346, + "strtype": "_event/condition_P", + "strval": "", + "InheritedType": 10 + }, + { + "nid": 1000347, + "strtype": "_event/action", + "strval": "CHANGE SCREEN", + "childs": [ + { + "nid": 1000348, + "strtype": "CHANGE SCREEN/Name", + "strval": "CHANGE SCREEN", + "InheritedType": 10 + }, + { + "nid": 1000349, + "strtype": "CHANGE SCREEN/Call", + "strval": "ChangeScreen( <{Screen_to}>, lv.SCR_LOAD_ANIM.<{Fade_mode}>, <{Speed}>, <{Delay}>)", + "InheritedType": 10 + }, + { + "nid": 1000350, + "strtype": "CHANGE SCREEN/CallC", + "strval": "_ui_screen_change( &<{Screen_to}>, LV_SCR_LOAD_ANIM_<{Fade_mode}>, <{Speed}>, <{Delay}>, &<{Screen_to}>_screen_init);", + "InheritedType": 10 + }, + { + "nid": 1000351, + "strtype": "CHANGE SCREEN/Screen_to", + "strval": "GUID91019577-1043855S6802337", + "InheritedType": 9 + }, + { + "nid": 1000352, + "strtype": "CHANGE SCREEN/Fade_mode", + "strval": "MOVE_RIGHT", + "InheritedType": 3 + }, + { + "nid": 1000353, + "strtype": "CHANGE SCREEN/Speed", + "integer": 500, + "InheritedType": 6 + }, + { + "nid": 1000354, + "strtype": "CHANGE SCREEN/Delay", + "InheritedType": 6 + } + ], + "InheritedType": 10 + } + ], + "InheritedType": 4 } ], - "saved_objtypeKey": "PANEL" + "saved_objtypeKey": "PANEL", + "tree_closed": true } ], "isPage": true, @@ -11241,26 +11323,1612 @@ "InheritedType": 4 } ], - "saved_objtypeKey": "PANEL" + "saved_objtypeKey": "PANEL", + "tree_closed": true }, { - "guid": "GUID68457805-1074964S502337", - "deepid": 1673712429, + "guid": "GUID29190245-383943S10592472", + "deepid": -272247948, "children": [ { - "guid": "GUID91783852-1074400S1872337", - "deepid": 869159998, + "guid": "GUID68457805-1074964S502337", + "deepid": 1673712429, + "children": [ + { + "guid": "GUID91783852-1074400S1872337", + "deepid": 869159998, + "dont_export": false, + "locked": false, + "properties": [ + { + "nid": 865091847, + "strtype": "OBJECT/Name", + "strval": "labelCapability", + "InheritedType": 10 + }, + { + "nid": -197868522, + "strtype": "OBJECT/Layout", + "InheritedType": 1 + }, + { + "Flow": 0, + "Wrap": false, + "Reversed": false, + "MainAlignment": 0, + "CrossAlignment": 0, + "TrackAlignment": 0, + "LayoutType": 0, + "nid": 450051477, + "strtype": "OBJECT/Layout_type", + "strval": "No_layout", + "InheritedType": 13 + }, + { + "nid": -1956739590, + "strtype": "OBJECT/Transform", + "InheritedType": 1 + }, + { + "nid": 413184084, + "flags": 17, + "strtype": "OBJECT/Position", + "intarray": [ + -122, + -75 + ], + "InheritedType": 7 + }, + { + "nid": 2004358725, + "flags": 51, + "strtype": "OBJECT/Size", + "intarray": [ + 1, + 1 + ], + "InheritedType": 7 + }, + { + "nid": -1637643197, + "strtype": "OBJECT/Align", + "strval": "CENTER", + "InheritedType": 3 + }, + { + "nid": 1442608072, + "flags": 1048576, + "strtype": "OBJECT/Flags", + "InheritedType": 1 + }, + { + "nid": 2018565250, + "strtype": "OBJECT/Clickable", + "strval": "False", + "InheritedType": 2 + }, + { + "nid": 225, + "flags": 1048576, + "strtype": "OBJECT/Scrolling", + "InheritedType": 1 + }, + { + "nid": -935829052, + "strtype": "OBJECT/Scrollbar_mode", + "strval": "AUTO", + "InheritedType": 3 + }, + { + "nid": -692656105, + "strtype": "OBJECT/Scroll_direction", + "strval": "ALL", + "InheritedType": 3 + }, + { + "nid": 314, + "strtype": "OBJECT/Scroll_snap_x", + "strval": "NONE", + "InheritedType": 3 + }, + { + "nid": 315, + "strtype": "OBJECT/Scroll_snap_y", + "strval": "NONE", + "InheritedType": 3 + }, + { + "nid": -560083055, + "flags": 1048576, + "strtype": "OBJECT/States", + "InheritedType": 1 + }, + { + "nid": -311805035, + "strtype": "LABEL/Label", + "InheritedType": 1 + }, + { + "nid": 1490620979, + "strtype": "LABEL/Long_mode", + "strval": "WRAP", + "InheritedType": 3 + }, + { + "nid": -1050904509, + "strtype": "LABEL/Text", + "strval": "电量:", + "InheritedType": 10 + }, + { + "part": "lv.PART.MAIN", + "childs": [ + { + "nid": -643529762, + "strtype": "_style/StyleState", + "strval": "DEFAULT", + "childs": [ + { + "nid": 1335993275, + "strtype": "_style/Text_Font", + "strval": "MiSansM", + "InheritedType": 3 + } + ], + "InheritedType": 1 + } + ], + "nid": -1096561524, + "strtype": "LABEL/Style_main", + "strval": "lv.PART.MAIN, Text, Rectangle, Pad, Transform", + "InheritedType": 11 + }, + { + "nid": 2079565383, + "strtype": "LABEL/Recolor", + "strval": "False", + "InheritedType": 2 + } + ], + "saved_objtypeKey": "LABEL" + }, + { + "guid": "GUID84962695-1072941S8992337", + "deepid": 53259638, + "dont_export": false, + "locked": false, + "properties": [ + { + "nid": 919741213, + "strtype": "OBJECT/Name", + "strval": "barBattery", + "InheritedType": 10 + }, + { + "nid": -1789056315, + "strtype": "OBJECT/Layout", + "InheritedType": 1 + }, + { + "Flow": 0, + "Wrap": false, + "Reversed": false, + "MainAlignment": 0, + "CrossAlignment": 0, + "TrackAlignment": 0, + "LayoutType": 0, + "nid": -1382350425, + "strtype": "OBJECT/Layout_type", + "strval": "No_layout", + "InheritedType": 13 + }, + { + "nid": 949069050, + "strtype": "OBJECT/Transform", + "InheritedType": 1 + }, + { + "nid": 11898335, + "flags": 17, + "strtype": "OBJECT/Position", + "intarray": [ + -16, + -77 + ], + "InheritedType": 7 + }, + { + "nid": 1747606209, + "flags": 17, + "strtype": "OBJECT/Size", + "intarray": [ + 158, + 15 + ], + "InheritedType": 7 + }, + { + "nid": -1862400039, + "strtype": "OBJECT/Align", + "strval": "CENTER", + "InheritedType": 3 + }, + { + "nid": -244716042, + "strtype": "OBJECT/Flags", + "InheritedType": 1 + }, + { + "nid": 225, + "flags": 1048576, + "strtype": "OBJECT/Scrolling", + "InheritedType": 1 + }, + { + "nid": 314, + "strtype": "OBJECT/Scroll_snap_x", + "strval": "NONE", + "InheritedType": 3 + }, + { + "nid": 315, + "strtype": "OBJECT/Scroll_snap_y", + "strval": "NONE", + "InheritedType": 3 + }, + { + "nid": -1680431827, + "flags": 1048576, + "strtype": "OBJECT/States", + "InheritedType": 1 + }, + { + "nid": 850628648, + "strtype": "BAR/Bar", + "InheritedType": 1 + }, + { + "nid": 1539585685, + "strtype": "BAR/Range", + "intarray": [ + 0, + 2048 + ], + "InheritedType": 7 + }, + { + "nid": 298518648, + "strtype": "BAR/Value", + "integer": 100, + "InheritedType": 6 + }, + { + "nid": 911487593, + "strtype": "BAR/Mode", + "strval": "NORMAL", + "InheritedType": 3 + }, + { + "nid": 1368862879, + "strtype": "BAR/Value_start", + "InheritedType": 6 + }, + { + "part": "lv.PART.MAIN", + "childs": [], + "nid": 1086817690, + "strtype": "BAR/Style_main", + "strval": "lv.PART.MAIN, Rectangle, Pad, Anim1, Transform", + "InheritedType": 11 + }, + { + "part": "lv.PART.INDICATOR", + "childs": [], + "nid": 187787010, + "strtype": "BAR/Style_indicator", + "strval": "lv.PART.INDICATOR, Rectangle", + "InheritedType": 11 + } + ], + "saved_objtypeKey": "BAR" + }, + { + "guid": "GUID17356524-6152S361468", + "deepid": 957377512, + "dont_export": false, + "locked": false, + "properties": [ + { + "nid": 10, + "strtype": "OBJECT/Name", + "strval": "spinboxBattery", + "InheritedType": 10 + }, + { + "nid": 20, + "strtype": "OBJECT/Layout", + "InheritedType": 1 + }, + { + "Flow": 0, + "Wrap": false, + "Reversed": false, + "MainAlignment": 0, + "CrossAlignment": 0, + "TrackAlignment": 0, + "LayoutType": 0, + "nid": 30, + "strtype": "OBJECT/Layout_type", + "strval": "No_layout", + "InheritedType": 13 + }, + { + "nid": 40, + "strtype": "OBJECT/Transform", + "InheritedType": 1 + }, + { + "nid": 50, + "flags": 17, + "strtype": "OBJECT/Position", + "intarray": [ + 110, + -75 + ], + "InheritedType": 7 + }, + { + "nid": 60, + "flags": 17, + "strtype": "OBJECT/Size", + "intarray": [ + 60, + 40 + ], + "InheritedType": 7 + }, + { + "nid": 70, + "strtype": "OBJECT/Align", + "strval": "CENTER", + "InheritedType": 3 + }, + { + "nid": 90, + "flags": 1048576, + "strtype": "OBJECT/Flags", + "InheritedType": 1 + }, + { + "nid": 225, + "flags": 1048576, + "strtype": "OBJECT/Scrolling", + "InheritedType": 1 + }, + { + "nid": 314, + "strtype": "OBJECT/Scroll_snap_x", + "strval": "NONE", + "InheritedType": 3 + }, + { + "nid": 315, + "strtype": "OBJECT/Scroll_snap_y", + "strval": "NONE", + "InheritedType": 3 + }, + { + "nid": 320, + "flags": 1048576, + "strtype": "OBJECT/States", + "InheritedType": 1 + }, + { + "nid": 1010, + "strtype": "SPINBOX/Spinbox", + "InheritedType": 1 + }, + { + "nid": 1020, + "strtype": "SPINBOX/Digit_format", + "intarray": [ + 4, + 0 + ], + "InheritedType": 7 + }, + { + "nid": 1030, + "strtype": "SPINBOX/Range", + "intarray": [ + 0, + 3000, + 1 + ], + "InheritedType": 7 + }, + { + "nid": 1040, + "strtype": "SPINBOX/Value", + "integer": 500, + "InheritedType": 6 + }, + { + "part": "lv.PART.MAIN", + "childs": [ + { + "nid": 10000, + "strtype": "_style/StyleState", + "strval": "DEFAULT", + "childs": [ + { + "nid": 10430, + "strtype": "_style/Text_Align", + "strval": "LEFT", + "InheritedType": 3 + }, + { + "nid": 10450, + "strtype": "_style/Text_Font", + "strval": "montserrat_16", + "InheritedType": 3 + } + ], + "InheritedType": 1 + } + ], + "nid": 1050, + "strtype": "SPINBOX/Style_main", + "strval": "lv.PART.MAIN, Rectangle, Pad, Text, Transform", + "InheritedType": 11 + }, + { + "part": "lv.PART.CURSOR", + "childs": [], + "nid": 1060, + "strtype": "SPINBOX/Style_cursor", + "strval": "lv.PART.CURSOR, Rectangle, Text", + "InheritedType": 11 + } + ], + "saved_objtypeKey": "SPINBOX" + }, + { + "guid": "GUID81809211-1079832S4082337", + "deepid": 268258741, + "dont_export": false, + "locked": false, + "properties": [ + { + "nid": -1668519401, + "strtype": "OBJECT/Name", + "strval": "labelMaxSample", + "InheritedType": 10 + }, + { + "nid": 1978486860, + "strtype": "OBJECT/Layout", + "InheritedType": 1 + }, + { + "Flow": 0, + "Wrap": false, + "Reversed": false, + "MainAlignment": 0, + "CrossAlignment": 0, + "TrackAlignment": 0, + "LayoutType": 0, + "nid": 558569613, + "strtype": "OBJECT/Layout_type", + "strval": "No_layout", + "InheritedType": 13 + }, + { + "nid": 711080784, + "strtype": "OBJECT/Transform", + "InheritedType": 1 + }, + { + "nid": -1924324910, + "flags": 17, + "strtype": "OBJECT/Position", + "intarray": [ + -78, + -42 + ], + "InheritedType": 7 + }, + { + "nid": 171618568, + "flags": 51, + "strtype": "OBJECT/Size", + "intarray": [ + 1, + 1 + ], + "InheritedType": 7 + }, + { + "nid": 1783340582, + "strtype": "OBJECT/Align", + "strval": "CENTER", + "InheritedType": 3 + }, + { + "nid": -1627248870, + "flags": 1048576, + "strtype": "OBJECT/Flags", + "InheritedType": 1 + }, + { + "nid": 97695196, + "strtype": "OBJECT/Clickable", + "strval": "False", + "InheritedType": 2 + }, + { + "nid": 225, + "flags": 1048576, + "strtype": "OBJECT/Scrolling", + "InheritedType": 1 + }, + { + "nid": 1423682927, + "strtype": "OBJECT/Scrollbar_mode", + "strval": "AUTO", + "InheritedType": 3 + }, + { + "nid": -906151951, + "strtype": "OBJECT/Scroll_direction", + "strval": "ALL", + "InheritedType": 3 + }, + { + "nid": 314, + "strtype": "OBJECT/Scroll_snap_x", + "strval": "NONE", + "InheritedType": 3 + }, + { + "nid": 315, + "strtype": "OBJECT/Scroll_snap_y", + "strval": "NONE", + "InheritedType": 3 + }, + { + "nid": 137541273, + "flags": 1048576, + "strtype": "OBJECT/States", + "InheritedType": 1 + }, + { + "nid": 912536965, + "strtype": "LABEL/Label", + "InheritedType": 1 + }, + { + "nid": 2119687207, + "strtype": "LABEL/Long_mode", + "strval": "WRAP", + "InheritedType": 3 + }, + { + "nid": 1835737453, + "strtype": "LABEL/Text", + "strval": "最大采样值:2048", + "InheritedType": 10 + }, + { + "part": "lv.PART.MAIN", + "childs": [ + { + "nid": 1587427825, + "strtype": "_style/StyleState", + "strval": "DEFAULT", + "childs": [ + { + "nid": 1463435632, + "strtype": "_style/Text_Font", + "strval": "MiSansM", + "InheritedType": 3 + } + ], + "InheritedType": 1 + } + ], + "nid": 1919519797, + "strtype": "LABEL/Style_main", + "strval": "lv.PART.MAIN, Text, Rectangle, Pad, Transform", + "InheritedType": 11 + }, + { + "nid": -428006805, + "strtype": "LABEL/Recolor", + "strval": "False", + "InheritedType": 2 + } + ], + "saved_objtypeKey": "LABEL" + }, + { + "guid": "GUID13795121-1084667S1512337", + "deepid": -167881204, + "dont_export": false, + "locked": false, + "properties": [ + { + "nid": 1108593925, + "strtype": "OBJECT/Name", + "strval": "labelVolume", + "InheritedType": 10 + }, + { + "nid": -1201853877, + "strtype": "OBJECT/Layout", + "InheritedType": 1 + }, + { + "Flow": 0, + "Wrap": false, + "Reversed": false, + "MainAlignment": 0, + "CrossAlignment": 0, + "TrackAlignment": 0, + "LayoutType": 0, + "nid": -822709989, + "strtype": "OBJECT/Layout_type", + "strval": "No_layout", + "InheritedType": 13 + }, + { + "nid": 143484152, + "strtype": "OBJECT/Transform", + "InheritedType": 1 + }, + { + "nid": -967980200, + "flags": 17, + "strtype": "OBJECT/Position", + "intarray": [ + -79, + -14 + ], + "InheritedType": 7 + }, + { + "nid": 95088487, + "flags": 51, + "strtype": "OBJECT/Size", + "intarray": [ + 1, + 1 + ], + "InheritedType": 7 + }, + { + "nid": 403499736, + "strtype": "OBJECT/Align", + "strval": "CENTER", + "InheritedType": 3 + }, + { + "nid": -9088230, + "flags": 1048576, + "strtype": "OBJECT/Flags", + "InheritedType": 1 + }, + { + "nid": -1452038887, + "strtype": "OBJECT/Clickable", + "strval": "False", + "InheritedType": 2 + }, + { + "nid": 225, + "flags": 1048576, + "strtype": "OBJECT/Scrolling", + "InheritedType": 1 + }, + { + "nid": -2051444900, + "strtype": "OBJECT/Scrollbar_mode", + "strval": "AUTO", + "InheritedType": 3 + }, + { + "nid": -2096142888, + "strtype": "OBJECT/Scroll_direction", + "strval": "ALL", + "InheritedType": 3 + }, + { + "nid": 314, + "strtype": "OBJECT/Scroll_snap_x", + "strval": "NONE", + "InheritedType": 3 + }, + { + "nid": 315, + "strtype": "OBJECT/Scroll_snap_y", + "strval": "NONE", + "InheritedType": 3 + }, + { + "nid": -542997288, + "flags": 1048576, + "strtype": "OBJECT/States", + "InheritedType": 1 + }, + { + "nid": -2059893805, + "strtype": "LABEL/Label", + "InheritedType": 1 + }, + { + "nid": -1166928997, + "strtype": "LABEL/Long_mode", + "strval": "WRAP", + "InheritedType": 3 + }, + { + "nid": -1140497767, + "strtype": "LABEL/Text", + "strval": "总电量:2500mAh", + "InheritedType": 10 + }, + { + "part": "lv.PART.MAIN", + "childs": [ + { + "nid": 137283441, + "strtype": "_style/StyleState", + "strval": "DEFAULT", + "childs": [ + { + "nid": 1666047265, + "strtype": "_style/Text_Font", + "strval": "MiSansM", + "InheritedType": 3 + } + ], + "InheritedType": 1 + } + ], + "nid": -947955184, + "strtype": "LABEL/Style_main", + "strval": "lv.PART.MAIN, Text, Rectangle, Pad, Transform", + "InheritedType": 11 + }, + { + "nid": 1009557712, + "strtype": "LABEL/Recolor", + "strval": "False", + "InheritedType": 2 + } + ], + "saved_objtypeKey": "LABEL" + }, + { + "guid": "GUID26406120-1085231S4532337", + "deepid": 1738065160, + "dont_export": false, + "locked": false, + "properties": [ + { + "nid": -75128106, + "strtype": "OBJECT/Name", + "strval": "labelMaxVoltage", + "InheritedType": 10 + }, + { + "nid": 1945083574, + "strtype": "OBJECT/Layout", + "InheritedType": 1 + }, + { + "Flow": 0, + "Wrap": false, + "Reversed": false, + "MainAlignment": 0, + "CrossAlignment": 0, + "TrackAlignment": 0, + "LayoutType": 0, + "nid": -369547649, + "strtype": "OBJECT/Layout_type", + "strval": "No_layout", + "InheritedType": 13 + }, + { + "nid": 1952677657, + "strtype": "OBJECT/Transform", + "InheritedType": 1 + }, + { + "nid": 2053067246, + "flags": 17, + "strtype": "OBJECT/Position", + "intarray": [ + -98, + 13 + ], + "InheritedType": 7 + }, + { + "nid": -833488983, + "flags": 51, + "strtype": "OBJECT/Size", + "intarray": [ + 1, + 1 + ], + "InheritedType": 7 + }, + { + "nid": -1211379080, + "strtype": "OBJECT/Align", + "strval": "CENTER", + "InheritedType": 3 + }, + { + "nid": -36591727, + "flags": 1048576, + "strtype": "OBJECT/Flags", + "InheritedType": 1 + }, + { + "nid": 1608511260, + "strtype": "OBJECT/Clickable", + "strval": "False", + "InheritedType": 2 + }, + { + "nid": 225, + "flags": 1048576, + "strtype": "OBJECT/Scrolling", + "InheritedType": 1 + }, + { + "nid": 729579658, + "strtype": "OBJECT/Scrollbar_mode", + "strval": "AUTO", + "InheritedType": 3 + }, + { + "nid": 92512652, + "strtype": "OBJECT/Scroll_direction", + "strval": "ALL", + "InheritedType": 3 + }, + { + "nid": 314, + "strtype": "OBJECT/Scroll_snap_x", + "strval": "NONE", + "InheritedType": 3 + }, + { + "nid": 315, + "strtype": "OBJECT/Scroll_snap_y", + "strval": "NONE", + "InheritedType": 3 + }, + { + "nid": -1605691527, + "flags": 1048576, + "strtype": "OBJECT/States", + "InheritedType": 1 + }, + { + "nid": -806996954, + "strtype": "LABEL/Label", + "InheritedType": 1 + }, + { + "nid": -1291009648, + "strtype": "LABEL/Long_mode", + "strval": "WRAP", + "InheritedType": 3 + }, + { + "nid": -1134620862, + "strtype": "LABEL/Text", + "strval": "总电压:4.2V", + "InheritedType": 10 + }, + { + "part": "lv.PART.MAIN", + "childs": [ + { + "nid": 686351266, + "strtype": "_style/StyleState", + "strval": "DEFAULT", + "childs": [ + { + "nid": 1562395578, + "strtype": "_style/Text_Font", + "strval": "MiSansM", + "InheritedType": 3 + } + ], + "InheritedType": 1 + } + ], + "nid": 1424858751, + "strtype": "LABEL/Style_main", + "strval": "lv.PART.MAIN, Text, Rectangle, Pad, Transform", + "InheritedType": 11 + }, + { + "nid": 492191043, + "strtype": "LABEL/Recolor", + "strval": "False", + "InheritedType": 2 + } + ], + "saved_objtypeKey": "LABEL" + }, + { + "guid": "GUID22615733-1086359S6972337", + "deepid": -1247825409, + "dont_export": false, + "locked": false, + "properties": [ + { + "nid": 87686146, + "strtype": "OBJECT/Name", + "strval": "labelSampleVoltage", + "InheritedType": 10 + }, + { + "nid": 824572603, + "strtype": "OBJECT/Layout", + "InheritedType": 1 + }, + { + "Flow": 0, + "Wrap": false, + "Reversed": false, + "MainAlignment": 0, + "CrossAlignment": 0, + "TrackAlignment": 0, + "LayoutType": 0, + "nid": -1139163685, + "strtype": "OBJECT/Layout_type", + "strval": "No_layout", + "InheritedType": 13 + }, + { + "nid": -323873647, + "strtype": "OBJECT/Transform", + "InheritedType": 1 + }, + { + "nid": -127134059, + "flags": 17, + "strtype": "OBJECT/Position", + "intarray": [ + -102, + 55 + ], + "InheritedType": 7 + }, + { + "nid": -178172030, + "flags": 51, + "strtype": "OBJECT/Size", + "intarray": [ + 1, + 1 + ], + "InheritedType": 7 + }, + { + "nid": 1989563315, + "strtype": "OBJECT/Align", + "strval": "CENTER", + "InheritedType": 3 + }, + { + "nid": -607481982, + "flags": 1048576, + "strtype": "OBJECT/Flags", + "InheritedType": 1 + }, + { + "nid": 1642233309, + "strtype": "OBJECT/Clickable", + "strval": "False", + "InheritedType": 2 + }, + { + "nid": 225, + "flags": 1048576, + "strtype": "OBJECT/Scrolling", + "InheritedType": 1 + }, + { + "nid": 736552269, + "strtype": "OBJECT/Scrollbar_mode", + "strval": "AUTO", + "InheritedType": 3 + }, + { + "nid": 1093470579, + "strtype": "OBJECT/Scroll_direction", + "strval": "ALL", + "InheritedType": 3 + }, + { + "nid": 314, + "strtype": "OBJECT/Scroll_snap_x", + "strval": "NONE", + "InheritedType": 3 + }, + { + "nid": 315, + "strtype": "OBJECT/Scroll_snap_y", + "strval": "NONE", + "InheritedType": 3 + }, + { + "nid": -1523487714, + "flags": 1048576, + "strtype": "OBJECT/States", + "InheritedType": 1 + }, + { + "nid": 928064472, + "strtype": "LABEL/Label", + "InheritedType": 1 + }, + { + "nid": 1882861347, + "strtype": "LABEL/Long_mode", + "strval": "WRAP", + "InheritedType": 3 + }, + { + "nid": -177034414, + "strtype": "LABEL/Text", + "strval": "采样电压:", + "InheritedType": 10 + }, + { + "part": "lv.PART.MAIN", + "childs": [ + { + "nid": 1886209314, + "strtype": "_style/StyleState", + "strval": "DEFAULT", + "childs": [ + { + "nid": 2137234285, + "strtype": "_style/Text_Font", + "strval": "MiSansM", + "InheritedType": 3 + } + ], + "InheritedType": 1 + } + ], + "nid": 1962437264, + "strtype": "LABEL/Style_main", + "strval": "lv.PART.MAIN, Text, Rectangle, Pad, Transform", + "InheritedType": 11 + }, + { + "nid": -1993714593, + "strtype": "LABEL/Recolor", + "strval": "False", + "InheritedType": 2 + } + ], + "saved_objtypeKey": "LABEL" + }, + { + "guid": "GUID74327713-1087471S7432337", + "deepid": -1247825409, + "dont_export": false, + "locked": false, + "properties": [ + { + "nid": 1515541283, + "strtype": "OBJECT/Name", + "strval": "labelSampleVolume", + "InheritedType": 10 + }, + { + "nid": -1563600190, + "strtype": "OBJECT/Layout", + "InheritedType": 1 + }, + { + "Flow": 0, + "Wrap": false, + "Reversed": false, + "MainAlignment": 0, + "CrossAlignment": 0, + "TrackAlignment": 0, + "LayoutType": 0, + "nid": 97169631, + "strtype": "OBJECT/Layout_type", + "strval": "No_layout", + "InheritedType": 13 + }, + { + "nid": 485043393, + "strtype": "OBJECT/Transform", + "InheritedType": 1 + }, + { + "nid": -89346038, + "flags": 17, + "strtype": "OBJECT/Position", + "intarray": [ + -101, + 77 + ], + "InheritedType": 7 + }, + { + "nid": -1326913734, + "flags": 51, + "strtype": "OBJECT/Size", + "intarray": [ + 1, + 1 + ], + "InheritedType": 7 + }, + { + "nid": -2140624415, + "strtype": "OBJECT/Align", + "strval": "CENTER", + "InheritedType": 3 + }, + { + "nid": -1972349119, + "flags": 1048576, + "strtype": "OBJECT/Flags", + "InheritedType": 1 + }, + { + "nid": 1967723589, + "strtype": "OBJECT/Clickable", + "strval": "False", + "InheritedType": 2 + }, + { + "nid": 225, + "flags": 1048576, + "strtype": "OBJECT/Scrolling", + "InheritedType": 1 + }, + { + "nid": 1203349293, + "strtype": "OBJECT/Scrollbar_mode", + "strval": "AUTO", + "InheritedType": 3 + }, + { + "nid": -1439359449, + "strtype": "OBJECT/Scroll_direction", + "strval": "ALL", + "InheritedType": 3 + }, + { + "nid": 314, + "strtype": "OBJECT/Scroll_snap_x", + "strval": "NONE", + "InheritedType": 3 + }, + { + "nid": 315, + "strtype": "OBJECT/Scroll_snap_y", + "strval": "NONE", + "InheritedType": 3 + }, + { + "nid": 1512965946, + "flags": 1048576, + "strtype": "OBJECT/States", + "InheritedType": 1 + }, + { + "nid": 678363713, + "strtype": "LABEL/Label", + "InheritedType": 1 + }, + { + "nid": 824821819, + "strtype": "LABEL/Long_mode", + "strval": "WRAP", + "InheritedType": 3 + }, + { + "nid": 262756394, + "strtype": "LABEL/Text", + "strval": "采样电量:", + "InheritedType": 10 + }, + { + "part": "lv.PART.MAIN", + "childs": [ + { + "nid": -1137737673, + "strtype": "_style/StyleState", + "strval": "DEFAULT", + "childs": [ + { + "nid": -674874767, + "strtype": "_style/Text_Font", + "strval": "MiSansM", + "InheritedType": 3 + } + ], + "InheritedType": 1 + } + ], + "nid": 96558785, + "strtype": "LABEL/Style_main", + "strval": "lv.PART.MAIN, Text, Rectangle, Pad, Transform", + "InheritedType": 11 + }, + { + "nid": -1385540334, + "strtype": "LABEL/Recolor", + "strval": "False", + "InheritedType": 2 + } + ], + "saved_objtypeKey": "LABEL" + }, + { + "guid": "GUID36997511-1087472S6562337", + "deepid": 747797161, + "dont_export": false, + "locked": false, + "properties": [ + { + "nid": -1622047938, + "strtype": "OBJECT/Name", + "strval": "labelCurrentVoltage", + "InheritedType": 10 + }, + { + "nid": 2137485119, + "strtype": "OBJECT/Layout", + "InheritedType": 1 + }, + { + "Flow": 0, + "Wrap": false, + "Reversed": false, + "MainAlignment": 0, + "CrossAlignment": 0, + "TrackAlignment": 0, + "LayoutType": 0, + "nid": -575187408, + "strtype": "OBJECT/Layout_type", + "strval": "No_layout", + "InheritedType": 13 + }, + { + "nid": 1386359110, + "strtype": "OBJECT/Transform", + "InheritedType": 1 + }, + { + "nid": 2101572253, + "flags": 17, + "strtype": "OBJECT/Position", + "intarray": [ + 18, + 54 + ], + "InheritedType": 7 + }, + { + "nid": -1129261090, + "flags": 51, + "strtype": "OBJECT/Size", + "intarray": [ + 1, + 1 + ], + "InheritedType": 7 + }, + { + "nid": 42517829, + "strtype": "OBJECT/Align", + "strval": "CENTER", + "InheritedType": 3 + }, + { + "nid": -979720959, + "flags": 1048576, + "strtype": "OBJECT/Flags", + "InheritedType": 1 + }, + { + "nid": 367553774, + "strtype": "OBJECT/Clickable", + "strval": "False", + "InheritedType": 2 + }, + { + "nid": 225, + "flags": 1048576, + "strtype": "OBJECT/Scrolling", + "InheritedType": 1 + }, + { + "nid": -1534924129, + "strtype": "OBJECT/Scrollbar_mode", + "strval": "AUTO", + "InheritedType": 3 + }, + { + "nid": -780942351, + "strtype": "OBJECT/Scroll_direction", + "strval": "ALL", + "InheritedType": 3 + }, + { + "nid": 314, + "strtype": "OBJECT/Scroll_snap_x", + "strval": "NONE", + "InheritedType": 3 + }, + { + "nid": 315, + "strtype": "OBJECT/Scroll_snap_y", + "strval": "NONE", + "InheritedType": 3 + }, + { + "nid": 1709741879, + "flags": 1048576, + "strtype": "OBJECT/States", + "InheritedType": 1 + }, + { + "nid": 1260700413, + "strtype": "LABEL/Label", + "InheritedType": 1 + }, + { + "nid": 37441566, + "strtype": "LABEL/Long_mode", + "strval": "WRAP", + "InheritedType": 3 + }, + { + "nid": -2013974212, + "strtype": "LABEL/Text", + "strval": "3.3v", + "InheritedType": 10 + }, + { + "part": "lv.PART.MAIN", + "childs": [ + { + "nid": 359029589, + "strtype": "_style/StyleState", + "strval": "DEFAULT", + "childs": [ + { + "nid": 635676786, + "strtype": "_style/Text_Color", + "intarray": [ + 128, + 128, + 128, + 255 + ], + "InheritedType": 7 + } + ], + "InheritedType": 1 + } + ], + "nid": -1483874232, + "strtype": "LABEL/Style_main", + "strval": "lv.PART.MAIN, Text, Rectangle, Pad, Transform", + "InheritedType": 11 + }, + { + "nid": 897431607, + "strtype": "LABEL/Recolor", + "strval": "False", + "InheritedType": 2 + } + ], + "saved_objtypeKey": "LABEL" + }, + { + "guid": "GUID13059458-1088584S2092337", + "deepid": 747797161, + "dont_export": false, + "locked": false, + "properties": [ + { + "nid": 1358131900, + "strtype": "OBJECT/Name", + "strval": "labelCurrentVolume", + "InheritedType": 10 + }, + { + "nid": -257740745, + "strtype": "OBJECT/Layout", + "InheritedType": 1 + }, + { + "Flow": 0, + "Wrap": false, + "Reversed": false, + "MainAlignment": 0, + "CrossAlignment": 0, + "TrackAlignment": 0, + "LayoutType": 0, + "nid": 667803252, + "strtype": "OBJECT/Layout_type", + "strval": "No_layout", + "InheritedType": 13 + }, + { + "nid": -811323271, + "strtype": "OBJECT/Transform", + "InheritedType": 1 + }, + { + "nid": 218889384, + "flags": 17, + "strtype": "OBJECT/Position", + "intarray": [ + 19, + 75 + ], + "InheritedType": 7 + }, + { + "nid": 999163837, + "flags": 51, + "strtype": "OBJECT/Size", + "intarray": [ + 1, + 1 + ], + "InheritedType": 7 + }, + { + "nid": 1854109068, + "strtype": "OBJECT/Align", + "strval": "CENTER", + "InheritedType": 3 + }, + { + "nid": 1168851209, + "flags": 1048576, + "strtype": "OBJECT/Flags", + "InheritedType": 1 + }, + { + "nid": -207598223, + "strtype": "OBJECT/Clickable", + "strval": "False", + "InheritedType": 2 + }, + { + "nid": 225, + "flags": 1048576, + "strtype": "OBJECT/Scrolling", + "InheritedType": 1 + }, + { + "nid": 1533685023, + "strtype": "OBJECT/Scrollbar_mode", + "strval": "AUTO", + "InheritedType": 3 + }, + { + "nid": 1655830843, + "strtype": "OBJECT/Scroll_direction", + "strval": "ALL", + "InheritedType": 3 + }, + { + "nid": 314, + "strtype": "OBJECT/Scroll_snap_x", + "strval": "NONE", + "InheritedType": 3 + }, + { + "nid": 315, + "strtype": "OBJECT/Scroll_snap_y", + "strval": "NONE", + "InheritedType": 3 + }, + { + "nid": -643429353, + "flags": 1048576, + "strtype": "OBJECT/States", + "InheritedType": 1 + }, + { + "nid": -873763573, + "strtype": "LABEL/Label", + "InheritedType": 1 + }, + { + "nid": -1150307820, + "strtype": "LABEL/Long_mode", + "strval": "WRAP", + "InheritedType": 3 + }, + { + "nid": 337814500, + "strtype": "LABEL/Text", + "strval": "580mAh", + "InheritedType": 10 + }, + { + "part": "lv.PART.MAIN", + "childs": [ + { + "nid": 1830825894, + "strtype": "_style/StyleState", + "strval": "DEFAULT", + "childs": [ + { + "nid": 1670401666, + "strtype": "_style/Text_Color", + "intarray": [ + 128, + 128, + 128, + 255 + ], + "InheritedType": 7 + } + ], + "InheritedType": 1 + } + ], + "nid": 452926536, + "strtype": "LABEL/Style_main", + "strval": "lv.PART.MAIN, Text, Rectangle, Pad, Transform", + "InheritedType": 11 + }, + { + "nid": 678960570, + "strtype": "LABEL/Recolor", + "strval": "False", + "InheritedType": 2 + } + ], + "saved_objtypeKey": "LABEL" + } + ], "dont_export": false, "locked": false, "properties": [ { - "nid": 865091847, + "nid": 414359833, "strtype": "OBJECT/Name", - "strval": "labelCapability", + "strval": "panelUpBody", + "childs": [ + { + "nid": 15, + "strtype": "_codename/Codename", + "strval": "panelUpBody", + "InheritedType": 10 + } + ], "InheritedType": 10 }, { - "nid": -197868522, + "nid": 848275485, "strtype": "OBJECT/Layout", "InheritedType": 1 }, @@ -11272,54 +12940,48 @@ "CrossAlignment": 0, "TrackAlignment": 0, "LayoutType": 0, - "nid": 450051477, + "nid": -1615993246, "strtype": "OBJECT/Layout_type", "strval": "No_layout", "InheritedType": 13 }, { - "nid": -1956739590, + "nid": 555697464, "strtype": "OBJECT/Transform", "InheritedType": 1 }, { - "nid": 413184084, + "nid": -1362065079, "flags": 17, "strtype": "OBJECT/Position", "intarray": [ - -122, - -75 + 0, + -111 ], "InheritedType": 7 }, { - "nid": 2004358725, - "flags": 51, + "nid": 119160427, + "flags": 17, "strtype": "OBJECT/Size", "intarray": [ - 1, - 1 + 310, + 221 ], "InheritedType": 7 }, { - "nid": -1637643197, + "nid": 943797682, "strtype": "OBJECT/Align", "strval": "CENTER", "InheritedType": 3 }, { - "nid": 1442608072, + "nid": 971780970, "flags": 1048576, "strtype": "OBJECT/Flags", "InheritedType": 1 }, - { - "nid": 2018565250, - "strtype": "OBJECT/Clickable", - "strval": "False", - "InheritedType": 2 - }, { "nid": 225, "flags": 1048576, @@ -11327,13 +12989,19 @@ "InheritedType": 1 }, { - "nid": -935829052, + "nid": 2046246140, + "strtype": "OBJECT/Scrollable", + "strval": "False", + "InheritedType": 2 + }, + { + "nid": 1941755163, "strtype": "OBJECT/Scrollbar_mode", "strval": "AUTO", "InheritedType": 3 }, { - "nid": -692656105, + "nid": -1909046483, "strtype": "OBJECT/Scroll_direction", "strval": "ALL", "InheritedType": 3 @@ -11351,1572 +13019,156 @@ "InheritedType": 3 }, { - "nid": -560083055, + "nid": -990900184, "flags": 1048576, "strtype": "OBJECT/States", "InheritedType": 1 }, - { - "nid": -311805035, - "strtype": "LABEL/Label", - "InheritedType": 1 - }, - { - "nid": 1490620979, - "strtype": "LABEL/Long_mode", - "strval": "WRAP", - "InheritedType": 3 - }, - { - "nid": -1050904509, - "strtype": "LABEL/Text", - "strval": "电量:", - "InheritedType": 10 - }, { "part": "lv.PART.MAIN", "childs": [ { - "nid": -643529762, + "nid": -5167452, "strtype": "_style/StyleState", "strval": "DEFAULT", "childs": [ { - "nid": 1335993275, - "strtype": "_style/Text_Font", - "strval": "MiSansM", - "InheritedType": 3 + "nid": -837396839, + "strtype": "_style/Bg_Color", + "intarray": [ + 255, + 255, + 255, + 255 + ], + "InheritedType": 7 } ], "InheritedType": 1 } ], - "nid": -1096561524, - "strtype": "LABEL/Style_main", - "strval": "lv.PART.MAIN, Text, Rectangle, Pad, Transform", - "InheritedType": 11 - }, - { - "nid": 2079565383, - "strtype": "LABEL/Recolor", - "strval": "False", - "InheritedType": 2 - } - ], - "saved_objtypeKey": "LABEL" - }, - { - "guid": "GUID84962695-1072941S8992337", - "deepid": 53259638, - "dont_export": false, - "locked": false, - "properties": [ - { - "nid": 919741213, - "strtype": "OBJECT/Name", - "strval": "barBattery", - "InheritedType": 10 - }, - { - "nid": -1789056315, - "strtype": "OBJECT/Layout", - "InheritedType": 1 - }, - { - "Flow": 0, - "Wrap": false, - "Reversed": false, - "MainAlignment": 0, - "CrossAlignment": 0, - "TrackAlignment": 0, - "LayoutType": 0, - "nid": -1382350425, - "strtype": "OBJECT/Layout_type", - "strval": "No_layout", - "InheritedType": 13 - }, - { - "nid": 949069050, - "strtype": "OBJECT/Transform", - "InheritedType": 1 - }, - { - "nid": 11898335, - "flags": 17, - "strtype": "OBJECT/Position", - "intarray": [ - -16, - -77 - ], - "InheritedType": 7 - }, - { - "nid": 1747606209, - "flags": 17, - "strtype": "OBJECT/Size", - "intarray": [ - 158, - 15 - ], - "InheritedType": 7 - }, - { - "nid": -1862400039, - "strtype": "OBJECT/Align", - "strval": "CENTER", - "InheritedType": 3 - }, - { - "nid": -244716042, - "strtype": "OBJECT/Flags", - "InheritedType": 1 - }, - { - "nid": 225, - "flags": 1048576, - "strtype": "OBJECT/Scrolling", - "InheritedType": 1 - }, - { - "nid": 314, - "strtype": "OBJECT/Scroll_snap_x", - "strval": "NONE", - "InheritedType": 3 - }, - { - "nid": 315, - "strtype": "OBJECT/Scroll_snap_y", - "strval": "NONE", - "InheritedType": 3 - }, - { - "nid": -1680431827, - "flags": 1048576, - "strtype": "OBJECT/States", - "InheritedType": 1 - }, - { - "nid": 850628648, - "strtype": "BAR/Bar", - "InheritedType": 1 - }, - { - "nid": 1539585685, - "strtype": "BAR/Range", - "intarray": [ - 0, - 2048 - ], - "InheritedType": 7 - }, - { - "nid": 298518648, - "strtype": "BAR/Value", - "integer": 100, - "InheritedType": 6 - }, - { - "nid": 911487593, - "strtype": "BAR/Mode", - "strval": "NORMAL", - "InheritedType": 3 - }, - { - "nid": 1368862879, - "strtype": "BAR/Value_start", - "InheritedType": 6 - }, - { - "part": "lv.PART.MAIN", - "childs": [], - "nid": 1086817690, - "strtype": "BAR/Style_main", - "strval": "lv.PART.MAIN, Rectangle, Pad, Anim1, Transform", - "InheritedType": 11 - }, - { - "part": "lv.PART.INDICATOR", - "childs": [], - "nid": 187787010, - "strtype": "BAR/Style_indicator", - "strval": "lv.PART.INDICATOR, Rectangle", - "InheritedType": 11 - } - ], - "saved_objtypeKey": "BAR" - }, - { - "guid": "GUID17356524-6152S361468", - "deepid": 957377512, - "dont_export": false, - "locked": false, - "properties": [ - { - "nid": 10, - "strtype": "OBJECT/Name", - "strval": "spinboxBattery", - "InheritedType": 10 - }, - { - "nid": 20, - "strtype": "OBJECT/Layout", - "InheritedType": 1 - }, - { - "Flow": 0, - "Wrap": false, - "Reversed": false, - "MainAlignment": 0, - "CrossAlignment": 0, - "TrackAlignment": 0, - "LayoutType": 0, - "nid": 30, - "strtype": "OBJECT/Layout_type", - "strval": "No_layout", - "InheritedType": 13 - }, - { - "nid": 40, - "strtype": "OBJECT/Transform", - "InheritedType": 1 - }, - { - "nid": 50, - "flags": 17, - "strtype": "OBJECT/Position", - "intarray": [ - 110, - -75 - ], - "InheritedType": 7 - }, - { - "nid": 60, - "flags": 17, - "strtype": "OBJECT/Size", - "intarray": [ - 60, - 40 - ], - "InheritedType": 7 - }, - { - "nid": 70, - "strtype": "OBJECT/Align", - "strval": "CENTER", - "InheritedType": 3 - }, - { - "nid": 90, - "flags": 1048576, - "strtype": "OBJECT/Flags", - "InheritedType": 1 - }, - { - "nid": 225, - "flags": 1048576, - "strtype": "OBJECT/Scrolling", - "InheritedType": 1 - }, - { - "nid": 314, - "strtype": "OBJECT/Scroll_snap_x", - "strval": "NONE", - "InheritedType": 3 - }, - { - "nid": 315, - "strtype": "OBJECT/Scroll_snap_y", - "strval": "NONE", - "InheritedType": 3 - }, - { - "nid": 320, - "flags": 1048576, - "strtype": "OBJECT/States", - "InheritedType": 1 - }, - { - "nid": 1010, - "strtype": "SPINBOX/Spinbox", - "InheritedType": 1 - }, - { - "nid": 1020, - "strtype": "SPINBOX/Digit_format", - "intarray": [ - 4, - 0 - ], - "InheritedType": 7 - }, - { - "nid": 1030, - "strtype": "SPINBOX/Range", - "intarray": [ - 0, - 3000, - 1 - ], - "InheritedType": 7 - }, - { - "nid": 1040, - "strtype": "SPINBOX/Value", - "integer": 500, - "InheritedType": 6 - }, - { - "part": "lv.PART.MAIN", - "childs": [ - { - "nid": 10000, - "strtype": "_style/StyleState", - "strval": "DEFAULT", - "childs": [ - { - "nid": 10430, - "strtype": "_style/Text_Align", - "strval": "LEFT", - "InheritedType": 3 - }, - { - "nid": 10450, - "strtype": "_style/Text_Font", - "strval": "montserrat_16", - "InheritedType": 3 - } - ], - "InheritedType": 1 - } - ], - "nid": 1050, - "strtype": "SPINBOX/Style_main", + "nid": 205038625, + "strtype": "PANEL/Style_main", "strval": "lv.PART.MAIN, Rectangle, Pad, Text, Transform", "InheritedType": 11 }, { - "part": "lv.PART.CURSOR", + "part": "lv.PART.SCROLLBAR", "childs": [], - "nid": 1060, - "strtype": "SPINBOX/Style_cursor", - "strval": "lv.PART.CURSOR, Rectangle, Text", + "nid": 1382278878, + "strtype": "PANEL/Style_scrollbar", + "strval": "lv.PART.SCROLLBAR, Rectangle, Pad", "InheritedType": 11 } ], - "saved_objtypeKey": "SPINBOX" - }, - { - "guid": "GUID81809211-1079832S4082337", - "deepid": 268258741, - "dont_export": false, - "locked": false, - "properties": [ - { - "nid": -1668519401, - "strtype": "OBJECT/Name", - "strval": "labelMaxSample", - "InheritedType": 10 - }, - { - "nid": 1978486860, - "strtype": "OBJECT/Layout", - "InheritedType": 1 - }, - { - "Flow": 0, - "Wrap": false, - "Reversed": false, - "MainAlignment": 0, - "CrossAlignment": 0, - "TrackAlignment": 0, - "LayoutType": 0, - "nid": 558569613, - "strtype": "OBJECT/Layout_type", - "strval": "No_layout", - "InheritedType": 13 - }, - { - "nid": 711080784, - "strtype": "OBJECT/Transform", - "InheritedType": 1 - }, - { - "nid": -1924324910, - "flags": 17, - "strtype": "OBJECT/Position", - "intarray": [ - -78, - -42 - ], - "InheritedType": 7 - }, - { - "nid": 171618568, - "flags": 51, - "strtype": "OBJECT/Size", - "intarray": [ - 1, - 1 - ], - "InheritedType": 7 - }, - { - "nid": 1783340582, - "strtype": "OBJECT/Align", - "strval": "CENTER", - "InheritedType": 3 - }, - { - "nid": -1627248870, - "flags": 1048576, - "strtype": "OBJECT/Flags", - "InheritedType": 1 - }, - { - "nid": 97695196, - "strtype": "OBJECT/Clickable", - "strval": "False", - "InheritedType": 2 - }, - { - "nid": 225, - "flags": 1048576, - "strtype": "OBJECT/Scrolling", - "InheritedType": 1 - }, - { - "nid": 1423682927, - "strtype": "OBJECT/Scrollbar_mode", - "strval": "AUTO", - "InheritedType": 3 - }, - { - "nid": -906151951, - "strtype": "OBJECT/Scroll_direction", - "strval": "ALL", - "InheritedType": 3 - }, - { - "nid": 314, - "strtype": "OBJECT/Scroll_snap_x", - "strval": "NONE", - "InheritedType": 3 - }, - { - "nid": 315, - "strtype": "OBJECT/Scroll_snap_y", - "strval": "NONE", - "InheritedType": 3 - }, - { - "nid": 137541273, - "flags": 1048576, - "strtype": "OBJECT/States", - "InheritedType": 1 - }, - { - "nid": 912536965, - "strtype": "LABEL/Label", - "InheritedType": 1 - }, - { - "nid": 2119687207, - "strtype": "LABEL/Long_mode", - "strval": "WRAP", - "InheritedType": 3 - }, - { - "nid": 1835737453, - "strtype": "LABEL/Text", - "strval": "最大采样值:2048", - "InheritedType": 10 - }, - { - "part": "lv.PART.MAIN", - "childs": [ - { - "nid": 1587427825, - "strtype": "_style/StyleState", - "strval": "DEFAULT", - "childs": [ - { - "nid": 1463435632, - "strtype": "_style/Text_Font", - "strval": "MiSansM", - "InheritedType": 3 - } - ], - "InheritedType": 1 - } - ], - "nid": 1919519797, - "strtype": "LABEL/Style_main", - "strval": "lv.PART.MAIN, Text, Rectangle, Pad, Transform", - "InheritedType": 11 - }, - { - "nid": -428006805, - "strtype": "LABEL/Recolor", - "strval": "False", - "InheritedType": 2 - } - ], - "saved_objtypeKey": "LABEL" - }, - { - "guid": "GUID13795121-1084667S1512337", - "deepid": -167881204, - "dont_export": false, - "locked": false, - "properties": [ - { - "nid": 1108593925, - "strtype": "OBJECT/Name", - "strval": "labelVolume", - "InheritedType": 10 - }, - { - "nid": -1201853877, - "strtype": "OBJECT/Layout", - "InheritedType": 1 - }, - { - "Flow": 0, - "Wrap": false, - "Reversed": false, - "MainAlignment": 0, - "CrossAlignment": 0, - "TrackAlignment": 0, - "LayoutType": 0, - "nid": -822709989, - "strtype": "OBJECT/Layout_type", - "strval": "No_layout", - "InheritedType": 13 - }, - { - "nid": 143484152, - "strtype": "OBJECT/Transform", - "InheritedType": 1 - }, - { - "nid": -967980200, - "flags": 17, - "strtype": "OBJECT/Position", - "intarray": [ - -79, - -14 - ], - "InheritedType": 7 - }, - { - "nid": 95088487, - "flags": 51, - "strtype": "OBJECT/Size", - "intarray": [ - 1, - 1 - ], - "InheritedType": 7 - }, - { - "nid": 403499736, - "strtype": "OBJECT/Align", - "strval": "CENTER", - "InheritedType": 3 - }, - { - "nid": -9088230, - "flags": 1048576, - "strtype": "OBJECT/Flags", - "InheritedType": 1 - }, - { - "nid": -1452038887, - "strtype": "OBJECT/Clickable", - "strval": "False", - "InheritedType": 2 - }, - { - "nid": 225, - "flags": 1048576, - "strtype": "OBJECT/Scrolling", - "InheritedType": 1 - }, - { - "nid": -2051444900, - "strtype": "OBJECT/Scrollbar_mode", - "strval": "AUTO", - "InheritedType": 3 - }, - { - "nid": -2096142888, - "strtype": "OBJECT/Scroll_direction", - "strval": "ALL", - "InheritedType": 3 - }, - { - "nid": 314, - "strtype": "OBJECT/Scroll_snap_x", - "strval": "NONE", - "InheritedType": 3 - }, - { - "nid": 315, - "strtype": "OBJECT/Scroll_snap_y", - "strval": "NONE", - "InheritedType": 3 - }, - { - "nid": -542997288, - "flags": 1048576, - "strtype": "OBJECT/States", - "InheritedType": 1 - }, - { - "nid": -2059893805, - "strtype": "LABEL/Label", - "InheritedType": 1 - }, - { - "nid": -1166928997, - "strtype": "LABEL/Long_mode", - "strval": "WRAP", - "InheritedType": 3 - }, - { - "nid": -1140497767, - "strtype": "LABEL/Text", - "strval": "总电量:2500mAh", - "InheritedType": 10 - }, - { - "part": "lv.PART.MAIN", - "childs": [ - { - "nid": 137283441, - "strtype": "_style/StyleState", - "strval": "DEFAULT", - "childs": [ - { - "nid": 1666047265, - "strtype": "_style/Text_Font", - "strval": "MiSansM", - "InheritedType": 3 - } - ], - "InheritedType": 1 - } - ], - "nid": -947955184, - "strtype": "LABEL/Style_main", - "strval": "lv.PART.MAIN, Text, Rectangle, Pad, Transform", - "InheritedType": 11 - }, - { - "nid": 1009557712, - "strtype": "LABEL/Recolor", - "strval": "False", - "InheritedType": 2 - } - ], - "saved_objtypeKey": "LABEL" - }, - { - "guid": "GUID26406120-1085231S4532337", - "deepid": 1738065160, - "dont_export": false, - "locked": false, - "properties": [ - { - "nid": -75128106, - "strtype": "OBJECT/Name", - "strval": "labelMaxVoltage", - "InheritedType": 10 - }, - { - "nid": 1945083574, - "strtype": "OBJECT/Layout", - "InheritedType": 1 - }, - { - "Flow": 0, - "Wrap": false, - "Reversed": false, - "MainAlignment": 0, - "CrossAlignment": 0, - "TrackAlignment": 0, - "LayoutType": 0, - "nid": -369547649, - "strtype": "OBJECT/Layout_type", - "strval": "No_layout", - "InheritedType": 13 - }, - { - "nid": 1952677657, - "strtype": "OBJECT/Transform", - "InheritedType": 1 - }, - { - "nid": 2053067246, - "flags": 17, - "strtype": "OBJECT/Position", - "intarray": [ - -98, - 13 - ], - "InheritedType": 7 - }, - { - "nid": -833488983, - "flags": 51, - "strtype": "OBJECT/Size", - "intarray": [ - 1, - 1 - ], - "InheritedType": 7 - }, - { - "nid": -1211379080, - "strtype": "OBJECT/Align", - "strval": "CENTER", - "InheritedType": 3 - }, - { - "nid": -36591727, - "flags": 1048576, - "strtype": "OBJECT/Flags", - "InheritedType": 1 - }, - { - "nid": 1608511260, - "strtype": "OBJECT/Clickable", - "strval": "False", - "InheritedType": 2 - }, - { - "nid": 225, - "flags": 1048576, - "strtype": "OBJECT/Scrolling", - "InheritedType": 1 - }, - { - "nid": 729579658, - "strtype": "OBJECT/Scrollbar_mode", - "strval": "AUTO", - "InheritedType": 3 - }, - { - "nid": 92512652, - "strtype": "OBJECT/Scroll_direction", - "strval": "ALL", - "InheritedType": 3 - }, - { - "nid": 314, - "strtype": "OBJECT/Scroll_snap_x", - "strval": "NONE", - "InheritedType": 3 - }, - { - "nid": 315, - "strtype": "OBJECT/Scroll_snap_y", - "strval": "NONE", - "InheritedType": 3 - }, - { - "nid": -1605691527, - "flags": 1048576, - "strtype": "OBJECT/States", - "InheritedType": 1 - }, - { - "nid": -806996954, - "strtype": "LABEL/Label", - "InheritedType": 1 - }, - { - "nid": -1291009648, - "strtype": "LABEL/Long_mode", - "strval": "WRAP", - "InheritedType": 3 - }, - { - "nid": -1134620862, - "strtype": "LABEL/Text", - "strval": "总电压:4.2V", - "InheritedType": 10 - }, - { - "part": "lv.PART.MAIN", - "childs": [ - { - "nid": 686351266, - "strtype": "_style/StyleState", - "strval": "DEFAULT", - "childs": [ - { - "nid": 1562395578, - "strtype": "_style/Text_Font", - "strval": "MiSansM", - "InheritedType": 3 - } - ], - "InheritedType": 1 - } - ], - "nid": 1424858751, - "strtype": "LABEL/Style_main", - "strval": "lv.PART.MAIN, Text, Rectangle, Pad, Transform", - "InheritedType": 11 - }, - { - "nid": 492191043, - "strtype": "LABEL/Recolor", - "strval": "False", - "InheritedType": 2 - } - ], - "saved_objtypeKey": "LABEL" - }, - { - "guid": "GUID22615733-1086359S6972337", - "deepid": -1247825409, - "dont_export": false, - "locked": false, - "properties": [ - { - "nid": 87686146, - "strtype": "OBJECT/Name", - "strval": "labelSampleVoltage", - "InheritedType": 10 - }, - { - "nid": 824572603, - "strtype": "OBJECT/Layout", - "InheritedType": 1 - }, - { - "Flow": 0, - "Wrap": false, - "Reversed": false, - "MainAlignment": 0, - "CrossAlignment": 0, - "TrackAlignment": 0, - "LayoutType": 0, - "nid": -1139163685, - "strtype": "OBJECT/Layout_type", - "strval": "No_layout", - "InheritedType": 13 - }, - { - "nid": -323873647, - "strtype": "OBJECT/Transform", - "InheritedType": 1 - }, - { - "nid": -127134059, - "flags": 17, - "strtype": "OBJECT/Position", - "intarray": [ - -102, - 55 - ], - "InheritedType": 7 - }, - { - "nid": -178172030, - "flags": 51, - "strtype": "OBJECT/Size", - "intarray": [ - 1, - 1 - ], - "InheritedType": 7 - }, - { - "nid": 1989563315, - "strtype": "OBJECT/Align", - "strval": "CENTER", - "InheritedType": 3 - }, - { - "nid": -607481982, - "flags": 1048576, - "strtype": "OBJECT/Flags", - "InheritedType": 1 - }, - { - "nid": 1642233309, - "strtype": "OBJECT/Clickable", - "strval": "False", - "InheritedType": 2 - }, - { - "nid": 225, - "flags": 1048576, - "strtype": "OBJECT/Scrolling", - "InheritedType": 1 - }, - { - "nid": 736552269, - "strtype": "OBJECT/Scrollbar_mode", - "strval": "AUTO", - "InheritedType": 3 - }, - { - "nid": 1093470579, - "strtype": "OBJECT/Scroll_direction", - "strval": "ALL", - "InheritedType": 3 - }, - { - "nid": 314, - "strtype": "OBJECT/Scroll_snap_x", - "strval": "NONE", - "InheritedType": 3 - }, - { - "nid": 315, - "strtype": "OBJECT/Scroll_snap_y", - "strval": "NONE", - "InheritedType": 3 - }, - { - "nid": -1523487714, - "flags": 1048576, - "strtype": "OBJECT/States", - "InheritedType": 1 - }, - { - "nid": 928064472, - "strtype": "LABEL/Label", - "InheritedType": 1 - }, - { - "nid": 1882861347, - "strtype": "LABEL/Long_mode", - "strval": "WRAP", - "InheritedType": 3 - }, - { - "nid": -177034414, - "strtype": "LABEL/Text", - "strval": "采样电压:", - "InheritedType": 10 - }, - { - "part": "lv.PART.MAIN", - "childs": [ - { - "nid": 1886209314, - "strtype": "_style/StyleState", - "strval": "DEFAULT", - "childs": [ - { - "nid": 2137234285, - "strtype": "_style/Text_Font", - "strval": "MiSansM", - "InheritedType": 3 - } - ], - "InheritedType": 1 - } - ], - "nid": 1962437264, - "strtype": "LABEL/Style_main", - "strval": "lv.PART.MAIN, Text, Rectangle, Pad, Transform", - "InheritedType": 11 - }, - { - "nid": -1993714593, - "strtype": "LABEL/Recolor", - "strval": "False", - "InheritedType": 2 - } - ], - "saved_objtypeKey": "LABEL" - }, - { - "guid": "GUID74327713-1087471S7432337", - "deepid": -1247825409, - "dont_export": false, - "locked": false, - "properties": [ - { - "nid": 1515541283, - "strtype": "OBJECT/Name", - "strval": "labelSampleVolume", - "InheritedType": 10 - }, - { - "nid": -1563600190, - "strtype": "OBJECT/Layout", - "InheritedType": 1 - }, - { - "Flow": 0, - "Wrap": false, - "Reversed": false, - "MainAlignment": 0, - "CrossAlignment": 0, - "TrackAlignment": 0, - "LayoutType": 0, - "nid": 97169631, - "strtype": "OBJECT/Layout_type", - "strval": "No_layout", - "InheritedType": 13 - }, - { - "nid": 485043393, - "strtype": "OBJECT/Transform", - "InheritedType": 1 - }, - { - "nid": -89346038, - "flags": 17, - "strtype": "OBJECT/Position", - "intarray": [ - -101, - 77 - ], - "InheritedType": 7 - }, - { - "nid": -1326913734, - "flags": 51, - "strtype": "OBJECT/Size", - "intarray": [ - 1, - 1 - ], - "InheritedType": 7 - }, - { - "nid": -2140624415, - "strtype": "OBJECT/Align", - "strval": "CENTER", - "InheritedType": 3 - }, - { - "nid": -1972349119, - "flags": 1048576, - "strtype": "OBJECT/Flags", - "InheritedType": 1 - }, - { - "nid": 1967723589, - "strtype": "OBJECT/Clickable", - "strval": "False", - "InheritedType": 2 - }, - { - "nid": 225, - "flags": 1048576, - "strtype": "OBJECT/Scrolling", - "InheritedType": 1 - }, - { - "nid": 1203349293, - "strtype": "OBJECT/Scrollbar_mode", - "strval": "AUTO", - "InheritedType": 3 - }, - { - "nid": -1439359449, - "strtype": "OBJECT/Scroll_direction", - "strval": "ALL", - "InheritedType": 3 - }, - { - "nid": 314, - "strtype": "OBJECT/Scroll_snap_x", - "strval": "NONE", - "InheritedType": 3 - }, - { - "nid": 315, - "strtype": "OBJECT/Scroll_snap_y", - "strval": "NONE", - "InheritedType": 3 - }, - { - "nid": 1512965946, - "flags": 1048576, - "strtype": "OBJECT/States", - "InheritedType": 1 - }, - { - "nid": 678363713, - "strtype": "LABEL/Label", - "InheritedType": 1 - }, - { - "nid": 824821819, - "strtype": "LABEL/Long_mode", - "strval": "WRAP", - "InheritedType": 3 - }, - { - "nid": 262756394, - "strtype": "LABEL/Text", - "strval": "采样电量:", - "InheritedType": 10 - }, - { - "part": "lv.PART.MAIN", - "childs": [ - { - "nid": -1137737673, - "strtype": "_style/StyleState", - "strval": "DEFAULT", - "childs": [ - { - "nid": -674874767, - "strtype": "_style/Text_Font", - "strval": "MiSansM", - "InheritedType": 3 - } - ], - "InheritedType": 1 - } - ], - "nid": 96558785, - "strtype": "LABEL/Style_main", - "strval": "lv.PART.MAIN, Text, Rectangle, Pad, Transform", - "InheritedType": 11 - }, - { - "nid": -1385540334, - "strtype": "LABEL/Recolor", - "strval": "False", - "InheritedType": 2 - } - ], - "saved_objtypeKey": "LABEL" - }, - { - "guid": "GUID36997511-1087472S6562337", - "deepid": 747797161, - "dont_export": false, - "locked": false, - "properties": [ - { - "nid": -1622047938, - "strtype": "OBJECT/Name", - "strval": "labelCurrentVoltage", - "InheritedType": 10 - }, - { - "nid": 2137485119, - "strtype": "OBJECT/Layout", - "InheritedType": 1 - }, - { - "Flow": 0, - "Wrap": false, - "Reversed": false, - "MainAlignment": 0, - "CrossAlignment": 0, - "TrackAlignment": 0, - "LayoutType": 0, - "nid": -575187408, - "strtype": "OBJECT/Layout_type", - "strval": "No_layout", - "InheritedType": 13 - }, - { - "nid": 1386359110, - "strtype": "OBJECT/Transform", - "InheritedType": 1 - }, - { - "nid": 2101572253, - "flags": 17, - "strtype": "OBJECT/Position", - "intarray": [ - 18, - 54 - ], - "InheritedType": 7 - }, - { - "nid": -1129261090, - "flags": 51, - "strtype": "OBJECT/Size", - "intarray": [ - 1, - 1 - ], - "InheritedType": 7 - }, - { - "nid": 42517829, - "strtype": "OBJECT/Align", - "strval": "CENTER", - "InheritedType": 3 - }, - { - "nid": -979720959, - "flags": 1048576, - "strtype": "OBJECT/Flags", - "InheritedType": 1 - }, - { - "nid": 367553774, - "strtype": "OBJECT/Clickable", - "strval": "False", - "InheritedType": 2 - }, - { - "nid": 225, - "flags": 1048576, - "strtype": "OBJECT/Scrolling", - "InheritedType": 1 - }, - { - "nid": -1534924129, - "strtype": "OBJECT/Scrollbar_mode", - "strval": "AUTO", - "InheritedType": 3 - }, - { - "nid": -780942351, - "strtype": "OBJECT/Scroll_direction", - "strval": "ALL", - "InheritedType": 3 - }, - { - "nid": 314, - "strtype": "OBJECT/Scroll_snap_x", - "strval": "NONE", - "InheritedType": 3 - }, - { - "nid": 315, - "strtype": "OBJECT/Scroll_snap_y", - "strval": "NONE", - "InheritedType": 3 - }, - { - "nid": 1709741879, - "flags": 1048576, - "strtype": "OBJECT/States", - "InheritedType": 1 - }, - { - "nid": 1260700413, - "strtype": "LABEL/Label", - "InheritedType": 1 - }, - { - "nid": 37441566, - "strtype": "LABEL/Long_mode", - "strval": "WRAP", - "InheritedType": 3 - }, - { - "nid": -2013974212, - "strtype": "LABEL/Text", - "strval": "3.3v", - "InheritedType": 10 - }, - { - "part": "lv.PART.MAIN", - "childs": [ - { - "nid": 359029589, - "strtype": "_style/StyleState", - "strval": "DEFAULT", - "childs": [ - { - "nid": 635676786, - "strtype": "_style/Text_Color", - "intarray": [ - 128, - 128, - 128, - 255 - ], - "InheritedType": 7 - } - ], - "InheritedType": 1 - } - ], - "nid": -1483874232, - "strtype": "LABEL/Style_main", - "strval": "lv.PART.MAIN, Text, Rectangle, Pad, Transform", - "InheritedType": 11 - }, - { - "nid": 897431607, - "strtype": "LABEL/Recolor", - "strval": "False", - "InheritedType": 2 - } - ], - "saved_objtypeKey": "LABEL" - }, - { - "guid": "GUID13059458-1088584S2092337", - "deepid": 747797161, - "dont_export": false, - "locked": false, - "properties": [ - { - "nid": 1358131900, - "strtype": "OBJECT/Name", - "strval": "labelCurrentVolume", - "InheritedType": 10 - }, - { - "nid": -257740745, - "strtype": "OBJECT/Layout", - "InheritedType": 1 - }, - { - "Flow": 0, - "Wrap": false, - "Reversed": false, - "MainAlignment": 0, - "CrossAlignment": 0, - "TrackAlignment": 0, - "LayoutType": 0, - "nid": 667803252, - "strtype": "OBJECT/Layout_type", - "strval": "No_layout", - "InheritedType": 13 - }, - { - "nid": -811323271, - "strtype": "OBJECT/Transform", - "InheritedType": 1 - }, - { - "nid": 218889384, - "flags": 17, - "strtype": "OBJECT/Position", - "intarray": [ - 19, - 75 - ], - "InheritedType": 7 - }, - { - "nid": 999163837, - "flags": 51, - "strtype": "OBJECT/Size", - "intarray": [ - 1, - 1 - ], - "InheritedType": 7 - }, - { - "nid": 1854109068, - "strtype": "OBJECT/Align", - "strval": "CENTER", - "InheritedType": 3 - }, - { - "nid": 1168851209, - "flags": 1048576, - "strtype": "OBJECT/Flags", - "InheritedType": 1 - }, - { - "nid": -207598223, - "strtype": "OBJECT/Clickable", - "strval": "False", - "InheritedType": 2 - }, - { - "nid": 225, - "flags": 1048576, - "strtype": "OBJECT/Scrolling", - "InheritedType": 1 - }, - { - "nid": 1533685023, - "strtype": "OBJECT/Scrollbar_mode", - "strval": "AUTO", - "InheritedType": 3 - }, - { - "nid": 1655830843, - "strtype": "OBJECT/Scroll_direction", - "strval": "ALL", - "InheritedType": 3 - }, - { - "nid": 314, - "strtype": "OBJECT/Scroll_snap_x", - "strval": "NONE", - "InheritedType": 3 - }, - { - "nid": 315, - "strtype": "OBJECT/Scroll_snap_y", - "strval": "NONE", - "InheritedType": 3 - }, - { - "nid": -643429353, - "flags": 1048576, - "strtype": "OBJECT/States", - "InheritedType": 1 - }, - { - "nid": -873763573, - "strtype": "LABEL/Label", - "InheritedType": 1 - }, - { - "nid": -1150307820, - "strtype": "LABEL/Long_mode", - "strval": "WRAP", - "InheritedType": 3 - }, - { - "nid": 337814500, - "strtype": "LABEL/Text", - "strval": "580mAh", - "InheritedType": 10 - }, - { - "part": "lv.PART.MAIN", - "childs": [ - { - "nid": 1830825894, - "strtype": "_style/StyleState", - "strval": "DEFAULT", - "childs": [ - { - "nid": 1670401666, - "strtype": "_style/Text_Color", - "intarray": [ - 128, - 128, - 128, - 255 - ], - "InheritedType": 7 - } - ], - "InheritedType": 1 - } - ], - "nid": 452926536, - "strtype": "LABEL/Style_main", - "strval": "lv.PART.MAIN, Text, Rectangle, Pad, Transform", - "InheritedType": 11 - }, - { - "nid": 678960570, - "strtype": "LABEL/Recolor", - "strval": "False", - "InheritedType": 2 - } - ], - "saved_objtypeKey": "LABEL" + "saved_objtypeKey": "PANEL", + "tree_closed": true } ], "dont_export": false, "locked": false, "properties": [ { - "nid": 414359833, + "nid": -1531911258, "strtype": "OBJECT/Name", - "strval": "panelUpBody", + "strval": "panelBody", "childs": [ { "nid": 15, "strtype": "_codename/Codename", - "strval": "panelUpBody", + "strval": "panelBody", "InheritedType": 10 } ], "InheritedType": 10 }, { - "nid": 848275485, + "nid": -496845328, "strtype": "OBJECT/Layout", "InheritedType": 1 }, { - "Flow": 0, + "Flow": 1, "Wrap": false, "Reversed": false, "MainAlignment": 0, "CrossAlignment": 0, "TrackAlignment": 0, "LayoutType": 0, - "nid": -1615993246, + "nid": -217582846, "strtype": "OBJECT/Layout_type", "strval": "No_layout", "InheritedType": 13 }, { - "nid": 555697464, + "nid": -1812766391, "strtype": "OBJECT/Transform", "InheritedType": 1 }, { - "nid": -1362065079, + "nid": 1793054557, "flags": 17, "strtype": "OBJECT/Position", "intarray": [ - 0, - -73 + 1, + 20 ], "InheritedType": 7 }, { - "nid": 119160427, + "nid": 1925058054, "flags": 17, "strtype": "OBJECT/Size", "intarray": [ - 310, - 221 + 320, + 430 ], "InheritedType": 7 }, { - "nid": 943797682, + "nid": 441628642, "strtype": "OBJECT/Align", "strval": "CENTER", "InheritedType": 3 }, { - "nid": 971780970, - "flags": 1048576, + "nid": -758499423, "strtype": "OBJECT/Flags", "InheritedType": 1 }, { - "nid": 225, - "flags": 1048576, - "strtype": "OBJECT/Scrolling", - "InheritedType": 1 + "nid": -1532115052, + "strtype": "OBJECT/Event_bubble", + "strval": "True", + "InheritedType": 2 }, { - "nid": 2046246140, - "strtype": "OBJECT/Scrollable", + "nid": 210, + "strtype": "OBJECT/Gesture_bubble", "strval": "False", "InheritedType": 2 }, { - "nid": 1941755163, + "nid": 225, + "strtype": "OBJECT/Scrolling", + "InheritedType": 1 + }, + { + "nid": 290, + "strtype": "OBJECT/Scroll_one", + "strval": "True", + "InheritedType": 2 + }, + { + "nid": 2241500, "strtype": "OBJECT/Scrollbar_mode", - "strval": "AUTO", + "strval": "ACTIVE", "InheritedType": 3 }, { - "nid": -1909046483, + "nid": -351647856, "strtype": "OBJECT/Scroll_direction", - "strval": "ALL", + "strval": "VER", "InheritedType": 3 }, { @@ -12932,7 +13184,7 @@ "InheritedType": 3 }, { - "nid": -990900184, + "nid": -1816140143, "flags": 1048576, "strtype": "OBJECT/States", "InheritedType": 1 @@ -12941,26 +13193,47 @@ "part": "lv.PART.MAIN", "childs": [ { - "nid": -5167452, + "nid": -996078068, "strtype": "_style/StyleState", "strval": "DEFAULT", "childs": [ { - "nid": -837396839, + "nid": 1807566844, + "strtype": "_style/Bg_Radius", + "InheritedType": 6 + }, + { + "nid": 1018864566, "strtype": "_style/Bg_Color", "intarray": [ - 255, - 255, - 255, + 230, + 230, + 230, 255 ], "InheritedType": 7 + }, + { + "nid": 1075737104, + "strtype": "_style/Border width", + "InheritedType": 6 + }, + { + "nid": -1838506246, + "strtype": "_style/Padding", + "intarray": [ + 0, + 0, + 30, + 0 + ], + "InheritedType": 7 } ], "InheritedType": 1 } ], - "nid": 205038625, + "nid": -594413961, "strtype": "PANEL/Style_main", "strval": "lv.PART.MAIN, Rectangle, Pad, Text, Transform", "InheritedType": 11 @@ -12968,10 +13241,86 @@ { "part": "lv.PART.SCROLLBAR", "childs": [], - "nid": 1382278878, + "nid": -943473739, "strtype": "PANEL/Style_scrollbar", "strval": "lv.PART.SCROLLBAR, Rectangle, Pad", "InheritedType": 11 + }, + { + "disabled": false, + "nid": 1000383, + "strtype": "_event/EventHandler", + "strval": "GESTURE_RIGHT(GESTURE)", + "childs": [ + { + "nid": 1000384, + "strtype": "_event/name", + "strval": "Event24", + "InheritedType": 10 + }, + { + "nid": 1000385, + "strtype": "_event/condition_C", + "strval": "", + "InheritedType": 10 + }, + { + "nid": 1000386, + "strtype": "_event/condition_P", + "strval": "", + "InheritedType": 10 + }, + { + "nid": 1000387, + "strtype": "_event/action", + "strval": "CHANGE SCREEN", + "childs": [ + { + "nid": 1000388, + "strtype": "CHANGE SCREEN/Name", + "strval": "CHANGE SCREEN", + "InheritedType": 10 + }, + { + "nid": 1000389, + "strtype": "CHANGE SCREEN/Call", + "strval": "ChangeScreen( <{Screen_to}>, lv.SCR_LOAD_ANIM.<{Fade_mode}>, <{Speed}>, <{Delay}>)", + "InheritedType": 10 + }, + { + "nid": 1000390, + "strtype": "CHANGE SCREEN/CallC", + "strval": "_ui_screen_change( &<{Screen_to}>, LV_SCR_LOAD_ANIM_<{Fade_mode}>, <{Speed}>, <{Delay}>, &<{Screen_to}>_screen_init);", + "InheritedType": 10 + }, + { + "nid": 1000391, + "strtype": "CHANGE SCREEN/Screen_to", + "strval": "GUID29001849-1058010S5552337", + "InheritedType": 9 + }, + { + "nid": 1000392, + "strtype": "CHANGE SCREEN/Fade_mode", + "strval": "MOVE_RIGHT", + "InheritedType": 3 + }, + { + "nid": 1000393, + "strtype": "CHANGE SCREEN/Speed", + "integer": 500, + "InheritedType": 6 + }, + { + "nid": 1000394, + "strtype": "CHANGE SCREEN/Delay", + "InheritedType": 6 + } + ], + "InheritedType": 10 + } + ], + "InheritedType": 4 } ], "saved_objtypeKey": "PANEL" @@ -13703,220 +14052,366 @@ "InheritedType": 4 } ], - "saved_objtypeKey": "PANEL" + "saved_objtypeKey": "PANEL", + "tree_closed": true }, { - "guid": "GUID44718145-502809S803463", - "deepid": 31528723, - "dont_export": false, - "locked": false, - "properties": [ - { - "nid": 10, - "strtype": "OBJECT/Name", - "strval": "textAreaContent", - "InheritedType": 10 - }, - { - "nid": 20, - "strtype": "OBJECT/Layout", - "InheritedType": 1 - }, - { - "Flow": 0, - "Wrap": false, - "Reversed": false, - "MainAlignment": 0, - "CrossAlignment": 0, - "TrackAlignment": 0, - "LayoutType": 0, - "nid": 30, - "strtype": "OBJECT/Layout_type", - "strval": "No_layout", - "InheritedType": 13 - }, - { - "nid": 40, - "strtype": "OBJECT/Transform", - "InheritedType": 1 - }, - { - "nid": 50, - "flags": 17, - "strtype": "OBJECT/Position", - "intarray": [ - 0, - -10 - ], - "InheritedType": 7 - }, - { - "nid": 60, - "flags": 17, - "strtype": "OBJECT/Size", - "intarray": [ - 299, - 334 - ], - "InheritedType": 7 - }, - { - "nid": 70, - "strtype": "OBJECT/Align", - "strval": "CENTER", - "InheritedType": 3 - }, - { - "nid": 90, - "strtype": "OBJECT/Flags", - "InheritedType": 1 - }, - { - "nid": 225, - "strtype": "OBJECT/Scrolling", - "InheritedType": 1 - }, - { - "nid": 300, - "strtype": "OBJECT/Scrollbar_mode", - "strval": "AUTO", - "InheritedType": 3 - }, - { - "nid": 310, - "strtype": "OBJECT/Scroll_direction", - "strval": "ALL", - "InheritedType": 3 - }, - { - "nid": 314, - "strtype": "OBJECT/Scroll_snap_x", - "strval": "NONE", - "InheritedType": 3 - }, - { - "nid": 315, - "strtype": "OBJECT/Scroll_snap_y", - "strval": "NONE", - "InheritedType": 3 - }, - { - "nid": 320, - "flags": 1048576, - "strtype": "OBJECT/States", - "InheritedType": 1 - }, - { - "nid": 1010, - "strtype": "TEXTAREA/TextArea", - "InheritedType": 1 - }, - { - "nid": 1020, - "strtype": "TEXTAREA/Text", - "strval": "Device Name: Pulse Flow Detection Controller\\n-----------------------------------------------------\\nSoftware Version: 20250304.1.0A\\n Hardware Version: 20250302.1.0A\\n-----------------------------------------------------\\nMain Control Chip: esp32-s3-wroom\\n IDF Version: Ver 5.2\\n RAM Size: 8MB\\n Flash Size: 4MB\\n-----------------------------------------------------\\nScreen Size: 320-480px 3.5-inch\\n Interface Type: intel-8080 parallel port\\n Pixel Frequency: 20MHz\\n Touch Screen Controller: ft6336U\\n Display Controller: ILI9488 (compatible with ST7789)\\nDisplay Framework: LVGL\\n Version: Version 8.2.0\\n-----------------------------------------------------\\nBattery Information:\\n Capacity: 2500mAh\\n Voltage: 2.7V-4.2V\\n Charging Current: 0.5C\\n-----------------------------------------------------\\nSoftware Server Address: sunme.top\\n Technical Support: 13345203604\\n Name: Wang Xiangen\\nDesign Date: 2025.3.7\\n Address: Danyang City, Jiangsu Province", - "InheritedType": 10 - }, - { - "nid": 1030, - "strtype": "TEXTAREA/Placeholder", - "strval": "Placeholder...", - "InheritedType": 10 - }, - { - "nid": 1040, - "strtype": "TEXTAREA/One_line_mode", - "strval": "False", - "InheritedType": 2 - }, - { - "nid": 1050, - "strtype": "TEXTAREA/Password_mode", - "strval": "False", - "InheritedType": 2 - }, - { - "nid": 1060, - "strtype": "TEXTAREA/Accepted_characters", - "strval": "", - "InheritedType": 10 - }, - { - "nid": 1070, - "strtype": "TEXTAREA/Max_text_length", - "integer": 98989898, - "InheritedType": 6 - }, - { - "part": "lv.PART.MAIN", - "childs": [ - { - "nid": 10000, - "strtype": "_style/StyleState", - "strval": "DEFAULT", - "childs": [ - { - "nid": 10450, - "strtype": "_style/Text_Font", - "strval": "montserrat_14", - "InheritedType": 3 - } - ], - "InheritedType": 1 - } - ], - "nid": 1080, - "strtype": "TEXTAREA/Style_main", - "strval": "lv.PART.MAIN, Text, Rectangle, Pad, Transform", - "InheritedType": 11 - }, - { - "part": "lv.PART.SELECTED", - "childs": [], - "nid": 1090, - "strtype": "TEXTAREA/Style_selected", - "strval": "lv.PART.SELECTED, Text, Rectangle", - "InheritedType": 11 - }, - { - "part": "lv.PART.CURSOR", - "childs": [], - "nid": 1100, - "strtype": "TEXTAREA/Style_cursor", - "strval": "lv.PART.CURSOR, Text, Rectangle", - "InheritedType": 11 - }, - { - "part": "lv.PART_TEXTAREA.PLACEHOLDER", - "childs": [], - "nid": 1110, - "strtype": "TEXTAREA/Style_placeholder", - "strval": "lv.PART_TEXTAREA.PLACEHOLDER, Text", - "InheritedType": 11 - }, - { - "nid": 1120, - "strtype": "TEXTAREA/TextAlign", - "strval": "TOP_LEFT", - "InheritedType": 3 - } - ], - "saved_objtypeKey": "TEXTAREA" - }, - { - "guid": "GUID52822724-16928S811466", - "deepid": 1038880550, + "guid": "GUID57296570-383954S1000472", + "deepid": -272247948, "children": [ { - "guid": "GUID43730090-16930S15372466", - "deepid": -431483035, + "guid": "GUID44718145-502809S803463", + "deepid": 31528723, "dont_export": false, "locked": false, "properties": [ { "nid": 10, "strtype": "OBJECT/Name", - "strval": "labelBackToHome", + "strval": "textAreaContent", + "InheritedType": 10 + }, + { + "nid": 20, + "strtype": "OBJECT/Layout", + "InheritedType": 1 + }, + { + "Flow": 0, + "Wrap": false, + "Reversed": false, + "MainAlignment": 0, + "CrossAlignment": 0, + "TrackAlignment": 0, + "LayoutType": 0, + "nid": 30, + "strtype": "OBJECT/Layout_type", + "strval": "No_layout", + "InheritedType": 13 + }, + { + "nid": 40, + "strtype": "OBJECT/Transform", + "InheritedType": 1 + }, + { + "nid": 50, + "flags": 17, + "strtype": "OBJECT/Position", + "intarray": [ + -1, + -52 + ], + "InheritedType": 7 + }, + { + "nid": 60, + "flags": 17, + "strtype": "OBJECT/Size", + "intarray": [ + 299, + 334 + ], + "InheritedType": 7 + }, + { + "nid": 70, + "strtype": "OBJECT/Align", + "strval": "CENTER", + "InheritedType": 3 + }, + { + "nid": 90, + "strtype": "OBJECT/Flags", + "InheritedType": 1 + }, + { + "nid": 225, + "strtype": "OBJECT/Scrolling", + "InheritedType": 1 + }, + { + "nid": 300, + "strtype": "OBJECT/Scrollbar_mode", + "strval": "AUTO", + "InheritedType": 3 + }, + { + "nid": 310, + "strtype": "OBJECT/Scroll_direction", + "strval": "ALL", + "InheritedType": 3 + }, + { + "nid": 314, + "strtype": "OBJECT/Scroll_snap_x", + "strval": "NONE", + "InheritedType": 3 + }, + { + "nid": 315, + "strtype": "OBJECT/Scroll_snap_y", + "strval": "NONE", + "InheritedType": 3 + }, + { + "nid": 320, + "flags": 1048576, + "strtype": "OBJECT/States", + "InheritedType": 1 + }, + { + "nid": 1010, + "strtype": "TEXTAREA/TextArea", + "InheritedType": 1 + }, + { + "nid": 1020, + "strtype": "TEXTAREA/Text", + "strval": "Device Name: Pulse Flow Detection Controller\\n-----------------------------------------------------\\nSoftware Version: 20250304.1.0A\\n Hardware Version: 20250302.1.0A\\n-----------------------------------------------------\\nMain Control Chip: esp32-s3-wroom\\n IDF Version: Ver 5.2\\n RAM Size: 8MB\\n Flash Size: 4MB\\n-----------------------------------------------------\\nScreen Size: 320-480px 3.5-inch\\n Interface Type: intel-8080 parallel port\\n Pixel Frequency: 20MHz\\n Touch Screen Controller: ft6336U\\n Display Controller: ILI9488 (compatible with ST7789)\\nDisplay Framework: LVGL\\n Version: Version 8.2.0\\n-----------------------------------------------------\\nBattery Information:\\n Capacity: 2500mAh\\n Voltage: 2.7V-4.2V\\n Charging Current: 0.5C\\n-----------------------------------------------------\\nSoftware Server Address: sunme.top\\n Technical Support: 13345203604\\n Name: Wang Xiangen\\nDesign Date: 2025.3.7\\n Address: Danyang City, Jiangsu Province", + "InheritedType": 10 + }, + { + "nid": 1030, + "strtype": "TEXTAREA/Placeholder", + "strval": "Placeholder...", + "InheritedType": 10 + }, + { + "nid": 1040, + "strtype": "TEXTAREA/One_line_mode", + "strval": "False", + "InheritedType": 2 + }, + { + "nid": 1050, + "strtype": "TEXTAREA/Password_mode", + "strval": "False", + "InheritedType": 2 + }, + { + "nid": 1060, + "strtype": "TEXTAREA/Accepted_characters", + "strval": "", + "InheritedType": 10 + }, + { + "nid": 1070, + "strtype": "TEXTAREA/Max_text_length", + "integer": 98989898, + "InheritedType": 6 + }, + { + "part": "lv.PART.MAIN", + "childs": [ + { + "nid": 10000, + "strtype": "_style/StyleState", + "strval": "DEFAULT", + "childs": [ + { + "nid": 10450, + "strtype": "_style/Text_Font", + "strval": "montserrat_14", + "InheritedType": 3 + } + ], + "InheritedType": 1 + } + ], + "nid": 1080, + "strtype": "TEXTAREA/Style_main", + "strval": "lv.PART.MAIN, Text, Rectangle, Pad, Transform", + "InheritedType": 11 + }, + { + "part": "lv.PART.SELECTED", + "childs": [], + "nid": 1090, + "strtype": "TEXTAREA/Style_selected", + "strval": "lv.PART.SELECTED, Text, Rectangle", + "InheritedType": 11 + }, + { + "part": "lv.PART.CURSOR", + "childs": [], + "nid": 1100, + "strtype": "TEXTAREA/Style_cursor", + "strval": "lv.PART.CURSOR, Text, Rectangle", + "InheritedType": 11 + }, + { + "part": "lv.PART_TEXTAREA.PLACEHOLDER", + "childs": [], + "nid": 1110, + "strtype": "TEXTAREA/Style_placeholder", + "strval": "lv.PART_TEXTAREA.PLACEHOLDER, Text", + "InheritedType": 11 + }, + { + "nid": 1120, + "strtype": "TEXTAREA/TextAlign", + "strval": "TOP_LEFT", + "InheritedType": 3 + } + ], + "saved_objtypeKey": "TEXTAREA" + }, + { + "guid": "GUID52822724-16928S811466", + "deepid": 1038880550, + "children": [ + { + "guid": "GUID43730090-16930S15372466", + "deepid": -431483035, + "dont_export": false, + "locked": false, + "properties": [ + { + "nid": 10, + "strtype": "OBJECT/Name", + "strval": "labelBackToHome", + "InheritedType": 10 + }, + { + "nid": 20, + "strtype": "OBJECT/Layout", + "InheritedType": 1 + }, + { + "Flow": 0, + "Wrap": false, + "Reversed": false, + "MainAlignment": 0, + "CrossAlignment": 0, + "TrackAlignment": 0, + "LayoutType": 0, + "nid": 30, + "strtype": "OBJECT/Layout_type", + "strval": "No_layout", + "InheritedType": 13 + }, + { + "nid": 40, + "strtype": "OBJECT/Transform", + "InheritedType": 1 + }, + { + "nid": 50, + "flags": 17, + "strtype": "OBJECT/Position", + "intarray": [ + 0, + 0 + ], + "InheritedType": 7 + }, + { + "nid": 60, + "flags": 51, + "strtype": "OBJECT/Size", + "intarray": [ + 1, + 1 + ], + "InheritedType": 7 + }, + { + "nid": 70, + "strtype": "OBJECT/Align", + "strval": "CENTER", + "InheritedType": 3 + }, + { + "nid": 90, + "flags": 1048576, + "strtype": "OBJECT/Flags", + "InheritedType": 1 + }, + { + "nid": 110, + "strtype": "OBJECT/Clickable", + "strval": "False", + "InheritedType": 2 + }, + { + "nid": 225, + "flags": 1048576, + "strtype": "OBJECT/Scrolling", + "InheritedType": 1 + }, + { + "nid": 300, + "strtype": "OBJECT/Scrollbar_mode", + "strval": "AUTO", + "InheritedType": 3 + }, + { + "nid": 310, + "strtype": "OBJECT/Scroll_direction", + "strval": "ALL", + "InheritedType": 3 + }, + { + "nid": 314, + "strtype": "OBJECT/Scroll_snap_x", + "strval": "NONE", + "InheritedType": 3 + }, + { + "nid": 315, + "strtype": "OBJECT/Scroll_snap_y", + "strval": "NONE", + "InheritedType": 3 + }, + { + "nid": 320, + "flags": 1048576, + "strtype": "OBJECT/States", + "InheritedType": 1 + }, + { + "nid": 1010, + "strtype": "LABEL/Label", + "InheritedType": 1 + }, + { + "nid": 1020, + "strtype": "LABEL/Long_mode", + "strval": "WRAP", + "InheritedType": 3 + }, + { + "nid": 1030, + "strtype": "LABEL/Text", + "strval": "Back To Home", + "InheritedType": 10 + }, + { + "part": "lv.PART.MAIN", + "childs": [], + "nid": 1040, + "strtype": "LABEL/Style_main", + "strval": "lv.PART.MAIN, Text, Rectangle, Pad, Transform", + "InheritedType": 11 + }, + { + "nid": 1050, + "strtype": "LABEL/Recolor", + "strval": "False", + "InheritedType": 2 + } + ], + "saved_objtypeKey": "LABEL" + } + ], + "dont_export": false, + "locked": false, + "properties": [ + { + "nid": 10, + "strtype": "OBJECT/Name", + "strval": "buttonBackToHome", "InheritedType": 10 }, { @@ -13948,17 +14443,17 @@ "strtype": "OBJECT/Position", "intarray": [ 0, - 0 + 156 ], "InheritedType": 7 }, { "nid": 60, - "flags": 51, + "flags": 17, "strtype": "OBJECT/Size", "intarray": [ - 1, - 1 + 271, + 50 ], "InheritedType": 7 }, @@ -13974,12 +14469,6 @@ "strtype": "OBJECT/Flags", "InheritedType": 1 }, - { - "nid": 110, - "strtype": "OBJECT/Clickable", - "strval": "False", - "InheritedType": 2 - }, { "nid": 225, "flags": 1048576, @@ -14016,121 +14505,191 @@ "strtype": "OBJECT/States", "InheritedType": 1 }, - { - "nid": 1010, - "strtype": "LABEL/Label", - "InheritedType": 1 - }, - { - "nid": 1020, - "strtype": "LABEL/Long_mode", - "strval": "WRAP", - "InheritedType": 3 - }, - { - "nid": 1030, - "strtype": "LABEL/Text", - "strval": "Back To Home", - "InheritedType": 10 - }, { "part": "lv.PART.MAIN", "childs": [], - "nid": 1040, - "strtype": "LABEL/Style_main", - "strval": "lv.PART.MAIN, Text, Rectangle, Pad, Transform", + "nid": 1010, + "strtype": "BUTTON/Style_main", + "strval": "lv.PART.MAIN, Rectangle, Pad, Text, Transform", "InheritedType": 11 }, { - "nid": 1050, - "strtype": "LABEL/Recolor", - "strval": "False", - "InheritedType": 2 + "disabled": false, + "nid": 1000022, + "strtype": "_event/EventHandler", + "strval": "CLICKED", + "childs": [ + { + "nid": 1000023, + "strtype": "_event/name", + "strval": "Event7", + "InheritedType": 10 + }, + { + "nid": 1000024, + "strtype": "_event/condition_C", + "strval": "", + "InheritedType": 10 + }, + { + "nid": 1000025, + "strtype": "_event/condition_P", + "strval": "", + "InheritedType": 10 + }, + { + "nid": 1000026, + "strtype": "_event/action", + "strval": "CHANGE SCREEN", + "childs": [ + { + "nid": 1000027, + "strtype": "CHANGE SCREEN/Name", + "strval": "CHANGE SCREEN", + "InheritedType": 10 + }, + { + "nid": 1000028, + "strtype": "CHANGE SCREEN/Call", + "strval": "ChangeScreen( <{Screen_to}>, lv.SCR_LOAD_ANIM.<{Fade_mode}>, <{Speed}>, <{Delay}>)", + "InheritedType": 10 + }, + { + "nid": 1000029, + "strtype": "CHANGE SCREEN/CallC", + "strval": "_ui_screen_change( &<{Screen_to}>, LV_SCR_LOAD_ANIM_<{Fade_mode}>, <{Speed}>, <{Delay}>, &<{Screen_to}>_screen_init);", + "InheritedType": 10 + }, + { + "nid": 1000030, + "strtype": "CHANGE SCREEN/Screen_to", + "strval": "GUID91019577-1043855S6802337", + "InheritedType": 9 + }, + { + "nid": 1000031, + "strtype": "CHANGE SCREEN/Fade_mode", + "strval": "MOVE_TOP", + "InheritedType": 3 + }, + { + "nid": 1000032, + "strtype": "CHANGE SCREEN/Speed", + "integer": 300, + "InheritedType": 6 + }, + { + "nid": 1000033, + "strtype": "CHANGE SCREEN/Delay", + "InheritedType": 6 + } + ], + "InheritedType": 10 + } + ], + "InheritedType": 4 } ], - "saved_objtypeKey": "LABEL" + "saved_objtypeKey": "BUTTON", + "tree_closed": true } ], "dont_export": false, "locked": false, "properties": [ { - "nid": 10, + "nid": -1531911258, "strtype": "OBJECT/Name", - "strval": "buttonBackToHome", + "strval": "panelBody2", "InheritedType": 10 }, { - "nid": 20, + "nid": -496845328, "strtype": "OBJECT/Layout", "InheritedType": 1 }, { - "Flow": 0, + "Flow": 1, "Wrap": false, "Reversed": false, "MainAlignment": 0, "CrossAlignment": 0, "TrackAlignment": 0, "LayoutType": 0, - "nid": 30, + "nid": -217582846, "strtype": "OBJECT/Layout_type", "strval": "No_layout", "InheritedType": 13 }, { - "nid": 40, + "nid": -1812766391, "strtype": "OBJECT/Transform", "InheritedType": 1 }, { - "nid": 50, + "nid": 1793054557, "flags": 17, "strtype": "OBJECT/Position", "intarray": [ - -3, - 195 + 1, + 20 ], "InheritedType": 7 }, { - "nid": 60, + "nid": 1925058054, "flags": 17, "strtype": "OBJECT/Size", "intarray": [ - 271, - 50 + 320, + 430 ], "InheritedType": 7 }, { - "nid": 70, + "nid": 441628642, "strtype": "OBJECT/Align", "strval": "CENTER", "InheritedType": 3 }, { - "nid": 90, - "flags": 1048576, + "nid": -758499423, "strtype": "OBJECT/Flags", "InheritedType": 1 }, + { + "nid": -1532115052, + "strtype": "OBJECT/Event_bubble", + "strval": "True", + "InheritedType": 2 + }, + { + "nid": 210, + "strtype": "OBJECT/Gesture_bubble", + "strval": "False", + "InheritedType": 2 + }, { "nid": 225, - "flags": 1048576, "strtype": "OBJECT/Scrolling", "InheritedType": 1 }, { - "nid": 300, + "nid": 290, + "strtype": "OBJECT/Scroll_one", + "strval": "True", + "InheritedType": 2 + }, + { + "nid": 2241500, "strtype": "OBJECT/Scrollbar_mode", - "strval": "AUTO", + "strval": "ACTIVE", "InheritedType": 3 }, { - "nid": 310, + "nid": -351647856, "strtype": "OBJECT/Scroll_direction", - "strval": "ALL", + "strval": "VER", "InheritedType": 3 }, { @@ -14146,86 +14705,135 @@ "InheritedType": 3 }, { - "nid": 320, + "nid": -1816140143, "flags": 1048576, "strtype": "OBJECT/States", "InheritedType": 1 }, { "part": "lv.PART.MAIN", - "childs": [], - "nid": 1010, - "strtype": "BUTTON/Style_main", + "childs": [ + { + "nid": -996078068, + "strtype": "_style/StyleState", + "strval": "DEFAULT", + "childs": [ + { + "nid": 1807566844, + "strtype": "_style/Bg_Radius", + "InheritedType": 6 + }, + { + "nid": 1018864566, + "strtype": "_style/Bg_Color", + "intarray": [ + 230, + 230, + 230, + 255 + ], + "InheritedType": 7 + }, + { + "nid": 1075737104, + "strtype": "_style/Border width", + "InheritedType": 6 + }, + { + "nid": -1838506246, + "strtype": "_style/Padding", + "intarray": [ + 0, + 0, + 30, + 0 + ], + "InheritedType": 7 + } + ], + "InheritedType": 1 + } + ], + "nid": -594413961, + "strtype": "PANEL/Style_main", "strval": "lv.PART.MAIN, Rectangle, Pad, Text, Transform", "InheritedType": 11 }, + { + "part": "lv.PART.SCROLLBAR", + "childs": [], + "nid": -943473739, + "strtype": "PANEL/Style_scrollbar", + "strval": "lv.PART.SCROLLBAR, Rectangle, Pad", + "InheritedType": 11 + }, { "disabled": false, - "nid": 1000022, + "nid": 1000383, "strtype": "_event/EventHandler", - "strval": "CLICKED", + "strval": "GESTURE_RIGHT(GESTURE)", "childs": [ { - "nid": 1000023, + "nid": 1000384, "strtype": "_event/name", - "strval": "Event7", + "strval": "Event24", "InheritedType": 10 }, { - "nid": 1000024, + "nid": 1000385, "strtype": "_event/condition_C", "strval": "", "InheritedType": 10 }, { - "nid": 1000025, + "nid": 1000386, "strtype": "_event/condition_P", "strval": "", "InheritedType": 10 }, { - "nid": 1000026, + "nid": 1000387, "strtype": "_event/action", "strval": "CHANGE SCREEN", "childs": [ { - "nid": 1000027, + "nid": 1000388, "strtype": "CHANGE SCREEN/Name", "strval": "CHANGE SCREEN", "InheritedType": 10 }, { - "nid": 1000028, + "nid": 1000389, "strtype": "CHANGE SCREEN/Call", "strval": "ChangeScreen( <{Screen_to}>, lv.SCR_LOAD_ANIM.<{Fade_mode}>, <{Speed}>, <{Delay}>)", "InheritedType": 10 }, { - "nid": 1000029, + "nid": 1000390, "strtype": "CHANGE SCREEN/CallC", "strval": "_ui_screen_change( &<{Screen_to}>, LV_SCR_LOAD_ANIM_<{Fade_mode}>, <{Speed}>, <{Delay}>, &<{Screen_to}>_screen_init);", "InheritedType": 10 }, { - "nid": 1000030, + "nid": 1000391, "strtype": "CHANGE SCREEN/Screen_to", - "strval": "GUID91019577-1043855S6802337", + "strval": "GUID29001849-1058010S5552337", "InheritedType": 9 }, { - "nid": 1000031, + "nid": 1000392, "strtype": "CHANGE SCREEN/Fade_mode", - "strval": "MOVE_TOP", + "strval": "MOVE_RIGHT", "InheritedType": 3 }, { - "nid": 1000032, + "nid": 1000393, "strtype": "CHANGE SCREEN/Speed", - "integer": 300, + "integer": 500, "InheritedType": 6 }, { - "nid": 1000033, + "nid": 1000394, "strtype": "CHANGE SCREEN/Delay", "InheritedType": 6 } @@ -14236,7 +14844,7 @@ "InheritedType": 4 } ], - "saved_objtypeKey": "BUTTON" + "saved_objtypeKey": "PANEL" } ], "isPage": true, @@ -15225,6 +15833,12 @@ "strval": "True", "InheritedType": 2 }, + { + "nid": 210, + "strtype": "OBJECT/Gesture_bubble", + "strval": "False", + "InheritedType": 2 + }, { "nid": 225, "strtype": "OBJECT/Scrolling", @@ -15322,9 +15936,86 @@ "strtype": "PANEL/Style_scrollbar", "strval": "lv.PART.SCROLLBAR, Rectangle, Pad", "InheritedType": 11 + }, + { + "disabled": false, + "nid": 1000395, + "strtype": "_event/EventHandler", + "strval": "GESTURE_RIGHT(GESTURE)", + "childs": [ + { + "nid": 1000396, + "strtype": "_event/name", + "strval": "Event25", + "InheritedType": 10 + }, + { + "nid": 1000397, + "strtype": "_event/condition_C", + "strval": "", + "InheritedType": 10 + }, + { + "nid": 1000398, + "strtype": "_event/condition_P", + "strval": "", + "InheritedType": 10 + }, + { + "nid": 1000399, + "strtype": "_event/action", + "strval": "CHANGE SCREEN", + "childs": [ + { + "nid": 1000400, + "strtype": "CHANGE SCREEN/Name", + "strval": "CHANGE SCREEN", + "InheritedType": 10 + }, + { + "nid": 1000401, + "strtype": "CHANGE SCREEN/Call", + "strval": "ChangeScreen( <{Screen_to}>, lv.SCR_LOAD_ANIM.<{Fade_mode}>, <{Speed}>, <{Delay}>)", + "InheritedType": 10 + }, + { + "nid": 1000402, + "strtype": "CHANGE SCREEN/CallC", + "strval": "_ui_screen_change( &<{Screen_to}>, LV_SCR_LOAD_ANIM_<{Fade_mode}>, <{Speed}>, <{Delay}>, &<{Screen_to}>_screen_init);", + "InheritedType": 10 + }, + { + "nid": 1000403, + "strtype": "CHANGE SCREEN/Screen_to", + "strval": "GUID22162269-416535S899470", + "InheritedType": 9 + }, + { + "nid": 1000404, + "strtype": "CHANGE SCREEN/Fade_mode", + "strval": "MOVE_RIGHT", + "InheritedType": 3 + }, + { + "nid": 1000405, + "strtype": "CHANGE SCREEN/Speed", + "integer": 500, + "InheritedType": 6 + }, + { + "nid": 1000406, + "strtype": "CHANGE SCREEN/Delay", + "InheritedType": 6 + } + ], + "InheritedType": 10 + } + ], + "InheritedType": 4 } ], - "saved_objtypeKey": "PANEL" + "saved_objtypeKey": "PANEL", + "tree_closed": true }, { "guid": "GUID57907189-416471S269470", @@ -19338,6 +20029,12 @@ "strval": "True", "InheritedType": 2 }, + { + "nid": 210, + "strtype": "OBJECT/Gesture_bubble", + "strval": "False", + "InheritedType": 2 + }, { "nid": 225, "strtype": "OBJECT/Scrolling", @@ -19435,9 +20132,86 @@ "strtype": "PANEL/Style_scrollbar", "strval": "lv.PART.SCROLLBAR, Rectangle, Pad", "InheritedType": 11 + }, + { + "disabled": false, + "nid": 1000407, + "strtype": "_event/EventHandler", + "strval": "GESTURE_RIGHT(GESTURE)", + "childs": [ + { + "nid": 1000408, + "strtype": "_event/name", + "strval": "Event26", + "InheritedType": 10 + }, + { + "nid": 1000409, + "strtype": "_event/condition_C", + "strval": "", + "InheritedType": 10 + }, + { + "nid": 1000410, + "strtype": "_event/condition_P", + "strval": "", + "InheritedType": 10 + }, + { + "nid": 1000411, + "strtype": "_event/action", + "strval": "CHANGE SCREEN", + "childs": [ + { + "nid": 1000412, + "strtype": "CHANGE SCREEN/Name", + "strval": "CHANGE SCREEN", + "InheritedType": 10 + }, + { + "nid": 1000413, + "strtype": "CHANGE SCREEN/Call", + "strval": "ChangeScreen( <{Screen_to}>, lv.SCR_LOAD_ANIM.<{Fade_mode}>, <{Speed}>, <{Delay}>)", + "InheritedType": 10 + }, + { + "nid": 1000414, + "strtype": "CHANGE SCREEN/CallC", + "strval": "_ui_screen_change( &<{Screen_to}>, LV_SCR_LOAD_ANIM_<{Fade_mode}>, <{Speed}>, <{Delay}>, &<{Screen_to}>_screen_init);", + "InheritedType": 10 + }, + { + "nid": 1000415, + "strtype": "CHANGE SCREEN/Screen_to", + "strval": "GUID29001849-1058010S5552337", + "InheritedType": 9 + }, + { + "nid": 1000416, + "strtype": "CHANGE SCREEN/Fade_mode", + "strval": "MOVE_RIGHT", + "InheritedType": 3 + }, + { + "nid": 1000417, + "strtype": "CHANGE SCREEN/Speed", + "integer": 500, + "InheritedType": 6 + }, + { + "nid": 1000418, + "strtype": "CHANGE SCREEN/Delay", + "InheritedType": 6 + } + ], + "InheritedType": 10 + } + ], + "InheritedType": 4 } ], - "saved_objtypeKey": "PANEL" + "saved_objtypeKey": "PANEL", + "tree_closed": true } ], "isPage": true, @@ -20776,7 +21550,8 @@ "InheritedType": 4 } ], - "saved_objtypeKey": "PANEL" + "saved_objtypeKey": "PANEL", + "tree_closed": true } ], "dont_export": false, @@ -20848,6 +21623,12 @@ "strval": "True", "InheritedType": 2 }, + { + "nid": 210, + "strtype": "OBJECT/Gesture_bubble", + "strval": "False", + "InheritedType": 2 + }, { "nid": 225, "strtype": "OBJECT/Scrolling", @@ -20885,7 +21666,6 @@ }, { "nid": -1816140143, - "flags": 1048576, "strtype": "OBJECT/States", "InheritedType": 1 }, @@ -20945,6 +21725,82 @@ "strtype": "PANEL/Style_scrollbar", "strval": "lv.PART.SCROLLBAR, Rectangle, Pad", "InheritedType": 11 + }, + { + "disabled": false, + "nid": 1000359, + "strtype": "_event/EventHandler", + "strval": "GESTURE_RIGHT(GESTURE)", + "childs": [ + { + "nid": 1000360, + "strtype": "_event/name", + "strval": "Event23", + "InheritedType": 10 + }, + { + "nid": 1000361, + "strtype": "_event/condition_C", + "strval": "", + "InheritedType": 10 + }, + { + "nid": 1000362, + "strtype": "_event/condition_P", + "strval": "", + "InheritedType": 10 + }, + { + "nid": 1000363, + "strtype": "_event/action", + "strval": "CHANGE SCREEN", + "childs": [ + { + "nid": 1000364, + "strtype": "CHANGE SCREEN/Name", + "strval": "CHANGE SCREEN", + "InheritedType": 10 + }, + { + "nid": 1000365, + "strtype": "CHANGE SCREEN/Call", + "strval": "ChangeScreen( <{Screen_to}>, lv.SCR_LOAD_ANIM.<{Fade_mode}>, <{Speed}>, <{Delay}>)", + "InheritedType": 10 + }, + { + "nid": 1000366, + "strtype": "CHANGE SCREEN/CallC", + "strval": "_ui_screen_change( &<{Screen_to}>, LV_SCR_LOAD_ANIM_<{Fade_mode}>, <{Speed}>, <{Delay}>, &<{Screen_to}>_screen_init);", + "InheritedType": 10 + }, + { + "nid": 1000367, + "strtype": "CHANGE SCREEN/Screen_to", + "strval": "GUID91019577-1043855S6802337", + "InheritedType": 9 + }, + { + "nid": 1000368, + "strtype": "CHANGE SCREEN/Fade_mode", + "strval": "MOVE_RIGHT", + "InheritedType": 3 + }, + { + "nid": 1000369, + "strtype": "CHANGE SCREEN/Speed", + "integer": 500, + "InheritedType": 6 + }, + { + "nid": 1000370, + "strtype": "CHANGE SCREEN/Delay", + "InheritedType": 6 + } + ], + "InheritedType": 10 + } + ], + "InheritedType": 4 } ], "saved_objtypeKey": "PANEL" @@ -22051,7 +22907,8 @@ "InheritedType": 11 } ], - "saved_objtypeKey": "PANEL" + "saved_objtypeKey": "PANEL", + "tree_closed": true }, { "guid": "GUID52991056-416682S30629470", @@ -22611,7 +23468,8 @@ "InheritedType": 11 } ], - "saved_objtypeKey": "PANEL" + "saved_objtypeKey": "PANEL", + "tree_closed": true }, { "guid": "GUID84733093-416680S378470", @@ -23208,6 +24066,12 @@ "strval": "True", "InheritedType": 2 }, + { + "nid": 210, + "strtype": "OBJECT/Gesture_bubble", + "strval": "False", + "InheritedType": 2 + }, { "nid": 225, "strtype": "OBJECT/Scrolling", @@ -23305,6 +24169,82 @@ "strtype": "PANEL/Style_scrollbar", "strval": "lv.PART.SCROLLBAR, Rectangle, Pad", "InheritedType": 11 + }, + { + "disabled": false, + "nid": 1000383, + "strtype": "_event/EventHandler", + "strval": "GESTURE_RIGHT(GESTURE)", + "childs": [ + { + "nid": 1000384, + "strtype": "_event/name", + "strval": "Event24", + "InheritedType": 10 + }, + { + "nid": 1000385, + "strtype": "_event/condition_C", + "strval": "", + "InheritedType": 10 + }, + { + "nid": 1000386, + "strtype": "_event/condition_P", + "strval": "", + "InheritedType": 10 + }, + { + "nid": 1000387, + "strtype": "_event/action", + "strval": "CHANGE SCREEN", + "childs": [ + { + "nid": 1000388, + "strtype": "CHANGE SCREEN/Name", + "strval": "CHANGE SCREEN", + "InheritedType": 10 + }, + { + "nid": 1000389, + "strtype": "CHANGE SCREEN/Call", + "strval": "ChangeScreen( <{Screen_to}>, lv.SCR_LOAD_ANIM.<{Fade_mode}>, <{Speed}>, <{Delay}>)", + "InheritedType": 10 + }, + { + "nid": 1000390, + "strtype": "CHANGE SCREEN/CallC", + "strval": "_ui_screen_change( &<{Screen_to}>, LV_SCR_LOAD_ANIM_<{Fade_mode}>, <{Speed}>, <{Delay}>, &<{Screen_to}>_screen_init);", + "InheritedType": 10 + }, + { + "nid": 1000391, + "strtype": "CHANGE SCREEN/Screen_to", + "strval": "GUID29001849-1058010S5552337", + "InheritedType": 9 + }, + { + "nid": 1000392, + "strtype": "CHANGE SCREEN/Fade_mode", + "strval": "MOVE_RIGHT", + "InheritedType": 3 + }, + { + "nid": 1000393, + "strtype": "CHANGE SCREEN/Speed", + "integer": 500, + "InheritedType": 6 + }, + { + "nid": 1000394, + "strtype": "CHANGE SCREEN/Delay", + "InheritedType": 6 + } + ], + "InheritedType": 10 + } + ], + "InheritedType": 4 } ], "saved_objtypeKey": "PANEL" @@ -23536,7 +24476,7 @@ "uiExportFolderPath": "D:\\yuwell_workspace\\FluxDC\\SquareLineProj\\Export", "projectExportFolderPath": "D:\\yuwell_workspace\\FluxDC\\SquareLineProj\\Export", "custom_variable_prefix": "uic", - "backup_cnt": 671, + "backup_cnt": 715, "autosave_cnt": 0, "group_color_cnt": 0, "lvgl_version": "8.3.6", @@ -23553,7 +24493,7 @@ "drive_fatfs_path": "", "naming": "_Screen_Name", "naming_force_lowercase": false, - "nidcnt": 1000333, + "nidcnt": 1000419, "BitDepth": 16, "Name": "ESP32S3_UI" } diff --git a/SquareLineProj/Export/screens/ui_pageBattery.c b/SquareLineProj/Export/screens/ui_pageBattery.c index bca9b09..566182c 100644 --- a/SquareLineProj/Export/screens/ui_pageBattery.c +++ b/SquareLineProj/Export/screens/ui_pageBattery.c @@ -33,11 +33,30 @@ void ui_pageBattery_screen_init(void) lv_label_set_text(ui_pageBattery_labelBattery, "电池"); lv_obj_set_style_text_font(ui_pageBattery_labelBattery, &ui_font_MiSansM, LV_PART_MAIN | LV_STATE_DEFAULT); - ui_pageBattery_panelUpBody = lv_obj_create(ui_pageBattery); + ui_pageBattery_panelBody = lv_obj_create(ui_pageBattery); + lv_obj_set_width(ui_pageBattery_panelBody, 320); + lv_obj_set_height(ui_pageBattery_panelBody, 430); + lv_obj_set_x(ui_pageBattery_panelBody, 1); + lv_obj_set_y(ui_pageBattery_panelBody, 20); + lv_obj_set_align(ui_pageBattery_panelBody, LV_ALIGN_CENTER); + lv_obj_add_flag(ui_pageBattery_panelBody, LV_OBJ_FLAG_EVENT_BUBBLE | LV_OBJ_FLAG_SCROLL_ONE); /// Flags + lv_obj_clear_flag(ui_pageBattery_panelBody, LV_OBJ_FLAG_GESTURE_BUBBLE); /// Flags + lv_obj_set_scrollbar_mode(ui_pageBattery_panelBody, LV_SCROLLBAR_MODE_ACTIVE); + lv_obj_set_scroll_dir(ui_pageBattery_panelBody, LV_DIR_VER); + lv_obj_set_style_radius(ui_pageBattery_panelBody, 0, LV_PART_MAIN | LV_STATE_DEFAULT); + lv_obj_set_style_bg_color(ui_pageBattery_panelBody, lv_color_hex(0xE6E6E6), LV_PART_MAIN | LV_STATE_DEFAULT); + lv_obj_set_style_bg_opa(ui_pageBattery_panelBody, 255, LV_PART_MAIN | LV_STATE_DEFAULT); + lv_obj_set_style_border_width(ui_pageBattery_panelBody, 0, LV_PART_MAIN | LV_STATE_DEFAULT); + lv_obj_set_style_pad_left(ui_pageBattery_panelBody, 0, LV_PART_MAIN | LV_STATE_DEFAULT); + lv_obj_set_style_pad_right(ui_pageBattery_panelBody, 0, LV_PART_MAIN | LV_STATE_DEFAULT); + lv_obj_set_style_pad_top(ui_pageBattery_panelBody, 30, LV_PART_MAIN | LV_STATE_DEFAULT); + lv_obj_set_style_pad_bottom(ui_pageBattery_panelBody, 0, LV_PART_MAIN | LV_STATE_DEFAULT); + + ui_pageBattery_panelUpBody = lv_obj_create(ui_pageBattery_panelBody); lv_obj_set_width(ui_pageBattery_panelUpBody, 310); lv_obj_set_height(ui_pageBattery_panelUpBody, 221); lv_obj_set_x(ui_pageBattery_panelUpBody, 0); - lv_obj_set_y(ui_pageBattery_panelUpBody, -73); + lv_obj_set_y(ui_pageBattery_panelUpBody, -111); lv_obj_set_align(ui_pageBattery_panelUpBody, LV_ALIGN_CENTER); lv_obj_clear_flag(ui_pageBattery_panelUpBody, LV_OBJ_FLAG_SCROLLABLE); /// Flags lv_obj_set_style_bg_color(ui_pageBattery_panelUpBody, lv_color_hex(0xFFFFFF), LV_PART_MAIN | LV_STATE_DEFAULT); @@ -143,6 +162,8 @@ void ui_pageBattery_screen_init(void) lv_obj_set_style_text_opa(ui_pageBattery_labelCurrentVolume, 255, LV_PART_MAIN | LV_STATE_DEFAULT); lv_obj_add_event_cb(ui_pageBattery_panelHeader, ui_event_pageBattery_panelHeader, LV_EVENT_ALL, NULL); + lv_obj_add_event_cb(ui_pageBattery_panelBody, ui_event_pageBattery_panelBody, LV_EVENT_ALL, NULL); + uic_pageBattery_panelBody = ui_pageBattery_panelBody; uic_pageBattery_panelUpBody = ui_pageBattery_panelUpBody; } diff --git a/SquareLineProj/Export/screens/ui_pageDebug.c b/SquareLineProj/Export/screens/ui_pageDebug.c index c8e8270..88aeeec 100644 --- a/SquareLineProj/Export/screens/ui_pageDebug.c +++ b/SquareLineProj/Export/screens/ui_pageDebug.c @@ -44,6 +44,7 @@ void ui_pageDebug_screen_init(void) lv_obj_set_y(ui_pageDebug_panelBody, 20); lv_obj_set_align(ui_pageDebug_panelBody, LV_ALIGN_CENTER); lv_obj_add_flag(ui_pageDebug_panelBody, LV_OBJ_FLAG_EVENT_BUBBLE | LV_OBJ_FLAG_SCROLL_ONE); /// Flags + lv_obj_clear_flag(ui_pageDebug_panelBody, LV_OBJ_FLAG_GESTURE_BUBBLE); /// Flags lv_obj_set_scrollbar_mode(ui_pageDebug_panelBody, LV_SCROLLBAR_MODE_ACTIVE); lv_obj_set_scroll_dir(ui_pageDebug_panelBody, LV_DIR_VER); lv_obj_set_style_radius(ui_pageDebug_panelBody, 0, LV_PART_MAIN | LV_STATE_DEFAULT); @@ -138,6 +139,7 @@ void ui_pageDebug_screen_init(void) lv_obj_add_event_cb(ui_pageDebug_labelBack, ui_event_pageDebug_labelBack, LV_EVENT_ALL, NULL); lv_obj_add_event_cb(ui_pageDebug_panelHeader, ui_event_pageDebug_panelHeader, LV_EVENT_ALL, NULL); + lv_obj_add_event_cb(ui_pageDebug_panelBody, ui_event_pageDebug_panelBody, LV_EVENT_ALL, NULL); lv_obj_add_event_cb(ui_pageDebug_buttonFluxRead, ui_event_pageDebug_buttonFluxRead, LV_EVENT_ALL, NULL); lv_obj_add_event_cb(ui_pageDebug_buttonClearTextarea, ui_event_pageDebug_buttonClearTextarea, LV_EVENT_ALL, NULL); uic_pageDebug_dropdownFunctionCode = ui_pageDebug_dropdownFunctionCode; diff --git a/SquareLineProj/Export/screens/ui_pageDebugChoice.c b/SquareLineProj/Export/screens/ui_pageDebugChoice.c index 71af1b6..dcda6a4 100644 --- a/SquareLineProj/Export/screens/ui_pageDebugChoice.c +++ b/SquareLineProj/Export/screens/ui_pageDebugChoice.c @@ -47,6 +47,7 @@ void ui_pageDebugChoice_screen_init(void) lv_obj_set_flex_flow(ui_pageDebugChoice_panelBody, LV_FLEX_FLOW_COLUMN); lv_obj_set_flex_align(ui_pageDebugChoice_panelBody, LV_FLEX_ALIGN_START, LV_FLEX_ALIGN_START, LV_FLEX_ALIGN_START); lv_obj_add_flag(ui_pageDebugChoice_panelBody, LV_OBJ_FLAG_EVENT_BUBBLE | LV_OBJ_FLAG_SCROLL_ONE); /// Flags + lv_obj_clear_flag(ui_pageDebugChoice_panelBody, LV_OBJ_FLAG_GESTURE_BUBBLE); /// Flags lv_obj_set_scrollbar_mode(ui_pageDebugChoice_panelBody, LV_SCROLLBAR_MODE_ACTIVE); lv_obj_set_scroll_dir(ui_pageDebugChoice_panelBody, LV_DIR_VER); lv_obj_set_style_radius(ui_pageDebugChoice_panelBody, 0, LV_PART_MAIN | LV_STATE_DEFAULT); @@ -91,5 +92,6 @@ void ui_pageDebugChoice_screen_init(void) lv_obj_add_event_cb(ui_pageDebugChoice_imageHome, ui_event_pageDebugChoice_imageHome, LV_EVENT_ALL, NULL); lv_obj_add_event_cb(ui_pageDebugChoice_pannelHeader, ui_event_pageDebugChoice_pannelHeader, LV_EVENT_ALL, NULL); lv_obj_add_event_cb(ui_pageDebugChoice_panelRecord, ui_event_pageDebugChoice_panelRecord, LV_EVENT_ALL, NULL); + lv_obj_add_event_cb(ui_pageDebugChoice_panelBody, ui_event_pageDebugChoice_panelBody, LV_EVENT_ALL, NULL); } diff --git a/SquareLineProj/Export/screens/ui_pageDeviceInformation.c b/SquareLineProj/Export/screens/ui_pageDeviceInformation.c index e9e4d5e..227714b 100644 --- a/SquareLineProj/Export/screens/ui_pageDeviceInformation.c +++ b/SquareLineProj/Export/screens/ui_pageDeviceInformation.c @@ -39,11 +39,30 @@ void ui_pageDeviceInformation_screen_init(void) lv_obj_set_style_text_font(ui_pageDeviceInformation_lableDeviceInformation, &ui_font_MiSansM, LV_PART_MAIN | LV_STATE_DEFAULT); - ui_pageDeviceInformation_textAreaContent = lv_textarea_create(ui_pageDeviceInformation); + ui_pageDeviceInformation_panelBody2 = lv_obj_create(ui_pageDeviceInformation); + lv_obj_set_width(ui_pageDeviceInformation_panelBody2, 320); + lv_obj_set_height(ui_pageDeviceInformation_panelBody2, 430); + lv_obj_set_x(ui_pageDeviceInformation_panelBody2, 1); + lv_obj_set_y(ui_pageDeviceInformation_panelBody2, 20); + lv_obj_set_align(ui_pageDeviceInformation_panelBody2, LV_ALIGN_CENTER); + lv_obj_add_flag(ui_pageDeviceInformation_panelBody2, LV_OBJ_FLAG_EVENT_BUBBLE | LV_OBJ_FLAG_SCROLL_ONE); /// Flags + lv_obj_clear_flag(ui_pageDeviceInformation_panelBody2, LV_OBJ_FLAG_GESTURE_BUBBLE); /// Flags + lv_obj_set_scrollbar_mode(ui_pageDeviceInformation_panelBody2, LV_SCROLLBAR_MODE_ACTIVE); + lv_obj_set_scroll_dir(ui_pageDeviceInformation_panelBody2, LV_DIR_VER); + lv_obj_set_style_radius(ui_pageDeviceInformation_panelBody2, 0, LV_PART_MAIN | LV_STATE_DEFAULT); + lv_obj_set_style_bg_color(ui_pageDeviceInformation_panelBody2, lv_color_hex(0xE6E6E6), LV_PART_MAIN | LV_STATE_DEFAULT); + lv_obj_set_style_bg_opa(ui_pageDeviceInformation_panelBody2, 255, LV_PART_MAIN | LV_STATE_DEFAULT); + lv_obj_set_style_border_width(ui_pageDeviceInformation_panelBody2, 0, LV_PART_MAIN | LV_STATE_DEFAULT); + lv_obj_set_style_pad_left(ui_pageDeviceInformation_panelBody2, 0, LV_PART_MAIN | LV_STATE_DEFAULT); + lv_obj_set_style_pad_right(ui_pageDeviceInformation_panelBody2, 0, LV_PART_MAIN | LV_STATE_DEFAULT); + lv_obj_set_style_pad_top(ui_pageDeviceInformation_panelBody2, 30, LV_PART_MAIN | LV_STATE_DEFAULT); + lv_obj_set_style_pad_bottom(ui_pageDeviceInformation_panelBody2, 0, LV_PART_MAIN | LV_STATE_DEFAULT); + + ui_pageDeviceInformation_textAreaContent = lv_textarea_create(ui_pageDeviceInformation_panelBody2); lv_obj_set_width(ui_pageDeviceInformation_textAreaContent, 299); lv_obj_set_height(ui_pageDeviceInformation_textAreaContent, 334); - lv_obj_set_x(ui_pageDeviceInformation_textAreaContent, 0); - lv_obj_set_y(ui_pageDeviceInformation_textAreaContent, -10); + lv_obj_set_x(ui_pageDeviceInformation_textAreaContent, -1); + lv_obj_set_y(ui_pageDeviceInformation_textAreaContent, -52); lv_obj_set_align(ui_pageDeviceInformation_textAreaContent, LV_ALIGN_CENTER); lv_textarea_set_text(ui_pageDeviceInformation_textAreaContent, "Device Name: Pulse Flow Detection Controller\n-----------------------------------------------------\nSoftware Version: 20250304.1.0A\n Hardware Version: 20250302.1.0A\n-----------------------------------------------------\nMain Control Chip: esp32-s3-wroom\n IDF Version: Ver 5.2\n RAM Size: 8MB\n Flash Size: 4MB\n-----------------------------------------------------\nScreen Size: 320-480px 3.5-inch\n Interface Type: intel-8080 parallel port\n Pixel Frequency: 20MHz\n Touch Screen Controller: ft6336U\n Display Controller: ILI9488 (compatible with ST7789)\nDisplay Framework: LVGL\n Version: Version 8.2.0\n-----------------------------------------------------\nBattery Information:\n Capacity: 2500mAh\n Voltage: 2.7V-4.2V\n Charging Current: 0.5C\n-----------------------------------------------------\nSoftware Server Address: sunme.top\n Technical Support: 13345203604\n Name: Wang Xiangen\nDesign Date: 2025.3.7\n Address: Danyang City, Jiangsu Province"); @@ -51,11 +70,11 @@ void ui_pageDeviceInformation_screen_init(void) lv_obj_set_style_text_font(ui_pageDeviceInformation_textAreaContent, &lv_font_montserrat_14, LV_PART_MAIN | LV_STATE_DEFAULT); - ui_pageDeviceInformation_buttonBackToHome = lv_btn_create(ui_pageDeviceInformation); + ui_pageDeviceInformation_buttonBackToHome = lv_btn_create(ui_pageDeviceInformation_panelBody2); lv_obj_set_width(ui_pageDeviceInformation_buttonBackToHome, 271); lv_obj_set_height(ui_pageDeviceInformation_buttonBackToHome, 50); - lv_obj_set_x(ui_pageDeviceInformation_buttonBackToHome, -3); - lv_obj_set_y(ui_pageDeviceInformation_buttonBackToHome, 195); + lv_obj_set_x(ui_pageDeviceInformation_buttonBackToHome, 0); + lv_obj_set_y(ui_pageDeviceInformation_buttonBackToHome, 156); lv_obj_set_align(ui_pageDeviceInformation_buttonBackToHome, LV_ALIGN_CENTER); ui_pageDeviceInformation_labelBackToHome = lv_label_create(ui_pageDeviceInformation_buttonBackToHome); @@ -69,5 +88,6 @@ void ui_pageDeviceInformation_screen_init(void) NULL); lv_obj_add_event_cb(ui_pageDeviceInformation_buttonBackToHome, ui_event_pageDeviceInformation_buttonBackToHome, LV_EVENT_ALL, NULL); + lv_obj_add_event_cb(ui_pageDeviceInformation_panelBody2, ui_event_pageDeviceInformation_panelBody2, LV_EVENT_ALL, NULL); } diff --git a/SquareLineProj/Export/screens/ui_pageSDCard.c b/SquareLineProj/Export/screens/ui_pageSDCard.c index b2fde73..e7dfc94 100644 --- a/SquareLineProj/Export/screens/ui_pageSDCard.c +++ b/SquareLineProj/Export/screens/ui_pageSDCard.c @@ -42,6 +42,7 @@ void ui_pageSDCard_screen_init(void) lv_obj_set_y(ui_pageSDCard_panelBody, 20); lv_obj_set_align(ui_pageSDCard_panelBody, LV_ALIGN_CENTER); lv_obj_add_flag(ui_pageSDCard_panelBody, LV_OBJ_FLAG_EVENT_BUBBLE | LV_OBJ_FLAG_SCROLL_ONE); /// Flags + lv_obj_clear_flag(ui_pageSDCard_panelBody, LV_OBJ_FLAG_GESTURE_BUBBLE); /// Flags lv_obj_set_scrollbar_mode(ui_pageSDCard_panelBody, LV_SCROLLBAR_MODE_ACTIVE); lv_obj_set_scroll_dir(ui_pageSDCard_panelBody, LV_DIR_VER); lv_obj_set_style_radius(ui_pageSDCard_panelBody, 0, LV_PART_MAIN | LV_STATE_DEFAULT); @@ -136,6 +137,7 @@ void ui_pageSDCard_screen_init(void) lv_obj_add_event_cb(ui_pageSDCard_panelHeader, ui_event_pageSDCard_panelHeader, LV_EVENT_ALL, NULL); lv_obj_add_event_cb(ui_pageSDCard_buttonReadSDCard, ui_event_pageSDCard_buttonReadSDCard, LV_EVENT_ALL, NULL); + lv_obj_add_event_cb(ui_pageSDCard_panelBody, ui_event_pageSDCard_panelBody, LV_EVENT_ALL, NULL); uic_pageSDCard_panelSDCardFree = ui_pageSDCard_panelSDCardFree; } diff --git a/SquareLineProj/Export/screens/ui_pageSetting.c b/SquareLineProj/Export/screens/ui_pageSetting.c index 1f86dc9..6aaa429 100644 --- a/SquareLineProj/Export/screens/ui_pageSetting.c +++ b/SquareLineProj/Export/screens/ui_pageSetting.c @@ -44,6 +44,7 @@ void ui_pageSetting_screen_init(void) lv_obj_set_flex_flow(ui_pageSetting_panelBody, LV_FLEX_FLOW_COLUMN); lv_obj_set_flex_align(ui_pageSetting_panelBody, LV_FLEX_ALIGN_START, LV_FLEX_ALIGN_START, LV_FLEX_ALIGN_START); lv_obj_add_flag(ui_pageSetting_panelBody, LV_OBJ_FLAG_EVENT_BUBBLE | LV_OBJ_FLAG_SCROLL_ONE); /// Flags + lv_obj_clear_flag(ui_pageSetting_panelBody, LV_OBJ_FLAG_GESTURE_BUBBLE); /// Flags lv_obj_set_scrollbar_mode(ui_pageSetting_panelBody, LV_SCROLLBAR_MODE_ACTIVE); lv_obj_set_scroll_dir(ui_pageSetting_panelBody, LV_DIR_VER); lv_obj_set_style_radius(ui_pageSetting_panelBody, 0, LV_PART_MAIN | LV_STATE_DEFAULT); @@ -302,6 +303,7 @@ void ui_pageSetting_screen_init(void) lv_obj_add_event_cb(ui_pageSetting_pannelDeviceInformation, ui_event_pageSetting_pannelDeviceInformation, LV_EVENT_ALL, NULL); lv_obj_add_event_cb(ui_pageSetting_panelSDCard, ui_event_pageSetting_panelSDCard, LV_EVENT_ALL, NULL); + lv_obj_add_event_cb(ui_pageSetting_panelBody, ui_event_pageSetting_panelBody, LV_EVENT_ALL, NULL); uic_pageSetting_labelDeviceType = ui_pageSetting_labelDeviceType; uic_pageSetting_panelSDCard = ui_pageSetting_panelSDCard; diff --git a/SquareLineProj/Export/screens/ui_pageWifiConnect.c b/SquareLineProj/Export/screens/ui_pageWifiConnect.c index 6c1d343..60ef479 100644 --- a/SquareLineProj/Export/screens/ui_pageWifiConnect.c +++ b/SquareLineProj/Export/screens/ui_pageWifiConnect.c @@ -47,6 +47,7 @@ void ui_pageWifiConnect_screen_init(void) lv_obj_set_flex_flow(ui_pageWifiConnect_pannelBody, LV_FLEX_FLOW_COLUMN); lv_obj_set_flex_align(ui_pageWifiConnect_pannelBody, LV_FLEX_ALIGN_START, LV_FLEX_ALIGN_START, LV_FLEX_ALIGN_START); lv_obj_add_flag(ui_pageWifiConnect_pannelBody, LV_OBJ_FLAG_EVENT_BUBBLE | LV_OBJ_FLAG_SCROLL_ONE); /// Flags + lv_obj_clear_flag(ui_pageWifiConnect_pannelBody, LV_OBJ_FLAG_GESTURE_BUBBLE); /// Flags lv_obj_set_scrollbar_mode(ui_pageWifiConnect_pannelBody, LV_SCROLLBAR_MODE_ACTIVE); lv_obj_set_scroll_dir(ui_pageWifiConnect_pannelBody, LV_DIR_VER); lv_obj_set_style_radius(ui_pageWifiConnect_pannelBody, 0, LV_PART_MAIN | LV_STATE_DEFAULT); @@ -149,5 +150,6 @@ void ui_pageWifiConnect_screen_init(void) lv_obj_add_event_cb(ui_pageWifiConnect_buttonSearchWifi, ui_event_pageWifiConnect_buttonSearchWifi, LV_EVENT_ALL, NULL); lv_obj_add_event_cb(ui_pageWifiConnect_buttonConnectWifi, ui_event_pageWifiConnect_buttonConnectWifi, LV_EVENT_ALL, NULL); + lv_obj_add_event_cb(ui_pageWifiConnect_pannelBody, ui_event_pageWifiConnect_pannelBody, LV_EVENT_ALL, NULL); } diff --git a/SquareLineProj/Export/ui.c b/SquareLineProj/Export/ui.c index a37fade..149b45a 100644 --- a/SquareLineProj/Export/ui.c +++ b/SquareLineProj/Export/ui.c @@ -58,6 +58,7 @@ lv_obj_t * ui_pageSetting_panelHeader; void ui_event_pageSetting_imageHome(lv_event_t * e); lv_obj_t * ui_pageSetting_imageHome; lv_obj_t * ui_pageSetting_labelSetting; +void ui_event_pageSetting_panelBody(lv_event_t * e); lv_obj_t * ui_pageSetting_panelBody; void ui_event_pageSetting_panelWifi(lv_event_t * e); lv_obj_t * ui_pageSetting_panelWifi; @@ -99,6 +100,8 @@ void ui_event_pageBattery_panelHeader(lv_event_t * e); lv_obj_t * ui_pageBattery_panelHeader; lv_obj_t * ui_pageBattery_labelBack; lv_obj_t * ui_pageBattery_labelBattery; +void ui_event_pageBattery_panelBody(lv_event_t * e); +lv_obj_t * ui_pageBattery_panelBody; lv_obj_t * ui_pageBattery_panelUpBody; lv_obj_t * ui_pageBattery_labelCapability; lv_obj_t * ui_pageBattery_barBattery; @@ -111,6 +114,7 @@ lv_obj_t * ui_pageBattery_labelSampleVolume; lv_obj_t * ui_pageBattery_labelCurrentVoltage; lv_obj_t * ui_pageBattery_labelCurrentVolume; // CUSTOM VARIABLES +lv_obj_t * uic_pageBattery_panelBody; lv_obj_t * uic_pageBattery_panelUpBody; // SCREEN: ui_pageDeviceInformation @@ -121,6 +125,8 @@ lv_obj_t * ui_pageDeviceInformation_pannelHeader; void ui_event_pageDeviceInformation_labelBack(lv_event_t * e); lv_obj_t * ui_pageDeviceInformation_labelBack; lv_obj_t * ui_pageDeviceInformation_lableDeviceInformation; +void ui_event_pageDeviceInformation_panelBody2(lv_event_t * e); +lv_obj_t * ui_pageDeviceInformation_panelBody2; lv_obj_t * ui_pageDeviceInformation_textAreaContent; void ui_event_pageDeviceInformation_buttonBackToHome(lv_event_t * e); lv_obj_t * ui_pageDeviceInformation_buttonBackToHome; @@ -135,6 +141,7 @@ lv_obj_t * ui_pageDebug_panelHeader; lv_obj_t * ui_pageDebug_labelDebug; void ui_event_pageDebug_labelBack(lv_event_t * e); lv_obj_t * ui_pageDebug_labelBack; +void ui_event_pageDebug_panelBody(lv_event_t * e); lv_obj_t * ui_pageDebug_panelBody; lv_obj_t * ui_pageDebug_textAreaContent; lv_obj_t * ui_pageDebug_checkBoxWifi; @@ -159,6 +166,7 @@ lv_obj_t * ui_pageWifiConnect_pannelHeader; lv_obj_t * ui_pageWifiConnect_labelHeaderTitle; void ui_event_pageWifiConnect_labelBack(lv_event_t * e); lv_obj_t * ui_pageWifiConnect_labelBack; +void ui_event_pageWifiConnect_pannelBody(lv_event_t * e); lv_obj_t * ui_pageWifiConnect_pannelBody; void ui_event_pageWifiConnect_dropdownWifiName(lv_event_t * e); lv_obj_t * ui_pageWifiConnect_dropdownWifiName; @@ -185,6 +193,7 @@ lv_obj_t * ui_pageDebugChoice_pannelHeader; void ui_event_pageDebugChoice_imageHome(lv_event_t * e); lv_obj_t * ui_pageDebugChoice_imageHome; lv_obj_t * ui_pageDebugChoice_labelHeaderTitle; +void ui_event_pageDebugChoice_panelBody(lv_event_t * e); lv_obj_t * ui_pageDebugChoice_panelBody; void ui_event_pageDebugChoice_panelRecord(lv_event_t * e); lv_obj_t * ui_pageDebugChoice_panelRecord; @@ -199,6 +208,7 @@ void ui_event_pageSDCard_panelHeader(lv_event_t * e); lv_obj_t * ui_pageSDCard_panelHeader; lv_obj_t * ui_pageSDCard_labelHeaderTitle; lv_obj_t * ui_pageSDCard_labelBack; +void ui_event_pageSDCard_panelBody(lv_event_t * e); lv_obj_t * ui_pageSDCard_panelBody; lv_obj_t * ui_pageSDCard_panelSDCardFree; lv_obj_t * ui_pageSDCard_arcSDCardFree; @@ -294,6 +304,16 @@ void ui_event_pageSetting_imageHome(lv_event_t * e) } } +void ui_event_pageSetting_panelBody(lv_event_t * e) +{ + lv_event_code_t event_code = lv_event_get_code(e); + + if(event_code == LV_EVENT_GESTURE && lv_indev_get_gesture_dir(lv_indev_get_act()) == LV_DIR_RIGHT) { + lv_indev_wait_release(lv_indev_get_act()); + _ui_screen_change(&ui_pageHome, LV_SCR_LOAD_ANIM_MOVE_RIGHT, 500, 0, &ui_pageHome_screen_init); + } +} + void ui_event_pageSetting_panelWifi(lv_event_t * e) { lv_event_code_t event_code = lv_event_get_code(e); @@ -366,6 +386,16 @@ void ui_event_pageBattery_panelHeader(lv_event_t * e) } } +void ui_event_pageBattery_panelBody(lv_event_t * e) +{ + lv_event_code_t event_code = lv_event_get_code(e); + + if(event_code == LV_EVENT_GESTURE && lv_indev_get_gesture_dir(lv_indev_get_act()) == LV_DIR_RIGHT) { + lv_indev_wait_release(lv_indev_get_act()); + _ui_screen_change(&ui_pageSetting, LV_SCR_LOAD_ANIM_MOVE_RIGHT, 500, 0, &ui_pageSetting_screen_init); + } +} + void ui_event_pageDeviceInformation_pannelHeader(lv_event_t * e) { lv_event_code_t event_code = lv_event_get_code(e); @@ -384,6 +414,16 @@ void ui_event_pageDeviceInformation_labelBack(lv_event_t * e) } } +void ui_event_pageDeviceInformation_panelBody2(lv_event_t * e) +{ + lv_event_code_t event_code = lv_event_get_code(e); + + if(event_code == LV_EVENT_GESTURE && lv_indev_get_gesture_dir(lv_indev_get_act()) == LV_DIR_RIGHT) { + lv_indev_wait_release(lv_indev_get_act()); + _ui_screen_change(&ui_pageSetting, LV_SCR_LOAD_ANIM_MOVE_RIGHT, 500, 0, &ui_pageSetting_screen_init); + } +} + void ui_event_pageDeviceInformation_buttonBackToHome(lv_event_t * e) { lv_event_code_t event_code = lv_event_get_code(e); @@ -411,6 +451,16 @@ void ui_event_pageDebug_labelBack(lv_event_t * e) } } +void ui_event_pageDebug_panelBody(lv_event_t * e) +{ + lv_event_code_t event_code = lv_event_get_code(e); + + if(event_code == LV_EVENT_GESTURE && lv_indev_get_gesture_dir(lv_indev_get_act()) == LV_DIR_RIGHT) { + lv_indev_wait_release(lv_indev_get_act()); + _ui_screen_change(&ui_pageDebugChoice, LV_SCR_LOAD_ANIM_MOVE_RIGHT, 500, 0, &ui_pageDebugChoice_screen_init); + } +} + void ui_event_pageDebug_buttonFluxRead(lv_event_t * e) { lv_event_code_t event_code = lv_event_get_code(e); @@ -447,6 +497,16 @@ void ui_event_pageWifiConnect_labelBack(lv_event_t * e) } } +void ui_event_pageWifiConnect_pannelBody(lv_event_t * e) +{ + lv_event_code_t event_code = lv_event_get_code(e); + + if(event_code == LV_EVENT_GESTURE && lv_indev_get_gesture_dir(lv_indev_get_act()) == LV_DIR_RIGHT) { + lv_indev_wait_release(lv_indev_get_act()); + _ui_screen_change(&ui_pageSetting, LV_SCR_LOAD_ANIM_MOVE_RIGHT, 500, 0, &ui_pageSetting_screen_init); + } +} + void ui_event_pageWifiConnect_dropdownWifiName(lv_event_t * e) { lv_event_code_t event_code = lv_event_get_code(e); @@ -501,6 +561,16 @@ void ui_event_pageDebugChoice_imageHome(lv_event_t * e) } } +void ui_event_pageDebugChoice_panelBody(lv_event_t * e) +{ + lv_event_code_t event_code = lv_event_get_code(e); + + if(event_code == LV_EVENT_GESTURE && lv_indev_get_gesture_dir(lv_indev_get_act()) == LV_DIR_RIGHT) { + lv_indev_wait_release(lv_indev_get_act()); + _ui_screen_change(&ui_pageHome, LV_SCR_LOAD_ANIM_MOVE_RIGHT, 500, 0, &ui_pageHome_screen_init); + } +} + void ui_event_pageDebugChoice_panelRecord(lv_event_t * e) { lv_event_code_t event_code = lv_event_get_code(e); @@ -519,6 +589,16 @@ void ui_event_pageSDCard_panelHeader(lv_event_t * e) } } +void ui_event_pageSDCard_panelBody(lv_event_t * e) +{ + lv_event_code_t event_code = lv_event_get_code(e); + + if(event_code == LV_EVENT_GESTURE && lv_indev_get_gesture_dir(lv_indev_get_act()) == LV_DIR_RIGHT) { + lv_indev_wait_release(lv_indev_get_act()); + _ui_screen_change(&ui_pageSetting, LV_SCR_LOAD_ANIM_MOVE_RIGHT, 500, 0, &ui_pageSetting_screen_init); + } +} + void ui_event_pageSDCard_buttonReadSDCard(lv_event_t * e) { lv_event_code_t event_code = lv_event_get_code(e); diff --git a/SquareLineProj/Export/ui.h b/SquareLineProj/Export/ui.h index 13829ae..fc54d76 100644 --- a/SquareLineProj/Export/ui.h +++ b/SquareLineProj/Export/ui.h @@ -66,6 +66,7 @@ extern lv_obj_t * ui_pageSetting_panelHeader; void ui_event_pageSetting_imageHome(lv_event_t * e); extern lv_obj_t * ui_pageSetting_imageHome; extern lv_obj_t * ui_pageSetting_labelSetting; +void ui_event_pageSetting_panelBody(lv_event_t * e); extern lv_obj_t * ui_pageSetting_panelBody; void ui_event_pageSetting_panelWifi(lv_event_t * e); extern lv_obj_t * ui_pageSetting_panelWifi; @@ -107,6 +108,8 @@ void ui_event_pageBattery_panelHeader(lv_event_t * e); extern lv_obj_t * ui_pageBattery_panelHeader; extern lv_obj_t * ui_pageBattery_labelBack; extern lv_obj_t * ui_pageBattery_labelBattery; +void ui_event_pageBattery_panelBody(lv_event_t * e); +extern lv_obj_t * ui_pageBattery_panelBody; extern lv_obj_t * ui_pageBattery_panelUpBody; extern lv_obj_t * ui_pageBattery_labelCapability; extern lv_obj_t * ui_pageBattery_barBattery; @@ -119,6 +122,7 @@ extern lv_obj_t * ui_pageBattery_labelSampleVolume; extern lv_obj_t * ui_pageBattery_labelCurrentVoltage; extern lv_obj_t * ui_pageBattery_labelCurrentVolume; // CUSTOM VARIABLES +extern lv_obj_t * uic_pageBattery_panelBody; extern lv_obj_t * uic_pageBattery_panelUpBody; // SCREEN: ui_pageDeviceInformation @@ -129,6 +133,8 @@ extern lv_obj_t * ui_pageDeviceInformation_pannelHeader; void ui_event_pageDeviceInformation_labelBack(lv_event_t * e); extern lv_obj_t * ui_pageDeviceInformation_labelBack; extern lv_obj_t * ui_pageDeviceInformation_lableDeviceInformation; +void ui_event_pageDeviceInformation_panelBody2(lv_event_t * e); +extern lv_obj_t * ui_pageDeviceInformation_panelBody2; extern lv_obj_t * ui_pageDeviceInformation_textAreaContent; void ui_event_pageDeviceInformation_buttonBackToHome(lv_event_t * e); extern lv_obj_t * ui_pageDeviceInformation_buttonBackToHome; @@ -143,6 +149,7 @@ extern lv_obj_t * ui_pageDebug_panelHeader; extern lv_obj_t * ui_pageDebug_labelDebug; void ui_event_pageDebug_labelBack(lv_event_t * e); extern lv_obj_t * ui_pageDebug_labelBack; +void ui_event_pageDebug_panelBody(lv_event_t * e); extern lv_obj_t * ui_pageDebug_panelBody; extern lv_obj_t * ui_pageDebug_textAreaContent; extern lv_obj_t * ui_pageDebug_checkBoxWifi; @@ -167,6 +174,7 @@ extern lv_obj_t * ui_pageWifiConnect_pannelHeader; extern lv_obj_t * ui_pageWifiConnect_labelHeaderTitle; void ui_event_pageWifiConnect_labelBack(lv_event_t * e); extern lv_obj_t * ui_pageWifiConnect_labelBack; +void ui_event_pageWifiConnect_pannelBody(lv_event_t * e); extern lv_obj_t * ui_pageWifiConnect_pannelBody; void ui_event_pageWifiConnect_dropdownWifiName(lv_event_t * e); extern lv_obj_t * ui_pageWifiConnect_dropdownWifiName; @@ -193,6 +201,7 @@ extern lv_obj_t * ui_pageDebugChoice_pannelHeader; void ui_event_pageDebugChoice_imageHome(lv_event_t * e); extern lv_obj_t * ui_pageDebugChoice_imageHome; extern lv_obj_t * ui_pageDebugChoice_labelHeaderTitle; +void ui_event_pageDebugChoice_panelBody(lv_event_t * e); extern lv_obj_t * ui_pageDebugChoice_panelBody; void ui_event_pageDebugChoice_panelRecord(lv_event_t * e); extern lv_obj_t * ui_pageDebugChoice_panelRecord; @@ -207,6 +216,7 @@ void ui_event_pageSDCard_panelHeader(lv_event_t * e); extern lv_obj_t * ui_pageSDCard_panelHeader; extern lv_obj_t * ui_pageSDCard_labelHeaderTitle; extern lv_obj_t * ui_pageSDCard_labelBack; +void ui_event_pageSDCard_panelBody(lv_event_t * e); extern lv_obj_t * ui_pageSDCard_panelBody; extern lv_obj_t * ui_pageSDCard_panelSDCardFree; extern lv_obj_t * ui_pageSDCard_arcSDCardFree; diff --git a/SquareLineProj/Export/ui_events.c b/SquareLineProj/Export/ui_events.c index ccb0de5..2fc9bb6 100644 --- a/SquareLineProj/Export/ui_events.c +++ b/SquareLineProj/Export/ui_events.c @@ -124,3 +124,8 @@ void on_buttonReadSDCard_clicked(lv_event_t * e) { // Your code here } + +void on_switchWifiShow_clicked(lv_event_t * e) +{ + // Your code here +} diff --git a/SquareLineProj/backup/ESP32S3_UI_backup00.zip b/SquareLineProj/backup/ESP32S3_UI_backup00.zip index 6198edc..1382705 100644 Binary files a/SquareLineProj/backup/ESP32S3_UI_backup00.zip and b/SquareLineProj/backup/ESP32S3_UI_backup00.zip differ diff --git a/SquareLineProj/backup/ESP32S3_UI_backup01.zip b/SquareLineProj/backup/ESP32S3_UI_backup01.zip index 3cc15cd..59359ff 100644 Binary files a/SquareLineProj/backup/ESP32S3_UI_backup01.zip and b/SquareLineProj/backup/ESP32S3_UI_backup01.zip differ diff --git a/SquareLineProj/backup/ESP32S3_UI_backup02.zip b/SquareLineProj/backup/ESP32S3_UI_backup02.zip index dc8b4bd..a4e5c86 100644 Binary files a/SquareLineProj/backup/ESP32S3_UI_backup02.zip and b/SquareLineProj/backup/ESP32S3_UI_backup02.zip differ diff --git a/SquareLineProj/backup/ESP32S3_UI_backup03.zip b/SquareLineProj/backup/ESP32S3_UI_backup03.zip index 587ffca..521f97c 100644 Binary files a/SquareLineProj/backup/ESP32S3_UI_backup03.zip and b/SquareLineProj/backup/ESP32S3_UI_backup03.zip differ diff --git a/SquareLineProj/backup/ESP32S3_UI_backup04.zip b/SquareLineProj/backup/ESP32S3_UI_backup04.zip index a3509b3..cf3ede3 100644 Binary files a/SquareLineProj/backup/ESP32S3_UI_backup04.zip and b/SquareLineProj/backup/ESP32S3_UI_backup04.zip differ diff --git a/SquareLineProj/backup/ESP32S3_UI_backup05.zip b/SquareLineProj/backup/ESP32S3_UI_backup05.zip index e154bd4..f79fa17 100644 Binary files a/SquareLineProj/backup/ESP32S3_UI_backup05.zip and b/SquareLineProj/backup/ESP32S3_UI_backup05.zip differ diff --git a/SquareLineProj/backup/ESP32S3_UI_backup06.zip b/SquareLineProj/backup/ESP32S3_UI_backup06.zip index 15432e5..fd75fa4 100644 Binary files a/SquareLineProj/backup/ESP32S3_UI_backup06.zip and b/SquareLineProj/backup/ESP32S3_UI_backup06.zip differ diff --git a/SquareLineProj/backup/ESP32S3_UI_backup07.zip b/SquareLineProj/backup/ESP32S3_UI_backup07.zip index 87ce6ac..178a62c 100644 Binary files a/SquareLineProj/backup/ESP32S3_UI_backup07.zip and b/SquareLineProj/backup/ESP32S3_UI_backup07.zip differ diff --git a/SquareLineProj/backup/ESP32S3_UI_backup08.zip b/SquareLineProj/backup/ESP32S3_UI_backup08.zip index 379375f..62a4466 100644 Binary files a/SquareLineProj/backup/ESP32S3_UI_backup08.zip and b/SquareLineProj/backup/ESP32S3_UI_backup08.zip differ diff --git a/SquareLineProj/backup/ESP32S3_UI_backup09.zip b/SquareLineProj/backup/ESP32S3_UI_backup09.zip index edc2acf..ad8f5b7 100644 Binary files a/SquareLineProj/backup/ESP32S3_UI_backup09.zip and b/SquareLineProj/backup/ESP32S3_UI_backup09.zip differ diff --git a/components/FluxButton/FluxButton.c b/components/FluxButton/FluxButton.c index cfd7cac..b85bf2e 100644 --- a/components/FluxButton/FluxButton.c +++ b/components/FluxButton/FluxButton.c @@ -55,15 +55,24 @@ static void button_event_cb(void *arg, void *data) break; case BUTTON_CMD_CENTER_KEY: - /*ʼ԰*/ - lv_event_send(ui_pageHome_buttonStartTest, LV_EVENT_CLICKED, NULL); - + if (lv_scr_act()==ui_pageHome) + { /*ʼ԰*/ + lv_event_send(ui_pageHome_buttonStartTest, LV_EVENT_CLICKED, NULL); + }else{ + lv_scr_load_anim(ui_pageHome, LV_SCR_LOAD_ANIM_OUT_TOP, 400, 0, false); + } break; case BUTTON_CMD_LEFT_KEY: - lv_event_send(ui_pageHome_buttonMinus, LV_EVENT_CLICKED, NULL); + if (lv_scr_act()==ui_pageHome) + { + lv_event_send(ui_pageHome_buttonMinus, LV_EVENT_CLICKED, NULL); + } break; case BUTTON_CMD_RIGHT_KEY: - lv_event_send(ui_pageHome_buttonAdd, LV_EVENT_CLICKED, NULL); + if (lv_scr_act()==ui_pageHome) + { + lv_event_send(ui_pageHome_buttonAdd, LV_EVENT_CLICKED, NULL); + } break; } } diff --git a/components/FluxSD/FluxSD.c b/components/FluxSD/FluxSD.c index 879944a..0818efc 100644 --- a/components/FluxSD/FluxSD.c +++ b/components/FluxSD/FluxSD.c @@ -134,7 +134,7 @@ static esp_err_t s_example_read_file(const char *path) uint64_t total_bytes = 0; uint64_t free_bytes = 0; float free_percent = 0; - + void flux_sd_init(void) { esp_err_t ret; @@ -182,6 +182,9 @@ void flux_sd_init(void) sdmmc_card_print_info(stdout, card); + // esp_vfs_fat_register(MOUNT_POINT, card,) + + /*ļд*/ const char *file_hello = MOUNT_POINT"/hello.txt"; char data[EXAMPLE_MAX_CHAR_SIZE]; @@ -192,16 +195,6 @@ void flux_sd_init(void) return; } -#if 0 - esp_vfs_fat_info(MOUNT_POINT,&total_bytes,&free_bytes); - - free_percent = (float)free_bytes / (float)total_bytes * 100; - - printf("Total space: %llu\n", total_bytes); - printf("Free space: %llu\n", free_bytes); - printf("Free percent: %.3f\n", free_percent); -#endif - } diff --git a/components/FluxSD/FluxSD.h b/components/FluxSD/FluxSD.h index 38bc2f7..bb00aac 100644 --- a/components/FluxSD/FluxSD.h +++ b/components/FluxSD/FluxSD.h @@ -26,6 +26,9 @@ typedef struct { } pin_configuration_t; +static esp_err_t s_example_read_file(const char *path); +static esp_err_t s_example_write_file(const char *path, char *data); + void check_sd_card_pins(pin_configuration_t *config, const int pin_count); void flux_sd_init(void); diff --git a/components/FluxUI/screens/ui_pageBattery.c b/components/FluxUI/screens/ui_pageBattery.c index bca9b09..566182c 100644 --- a/components/FluxUI/screens/ui_pageBattery.c +++ b/components/FluxUI/screens/ui_pageBattery.c @@ -33,11 +33,30 @@ void ui_pageBattery_screen_init(void) lv_label_set_text(ui_pageBattery_labelBattery, "电池"); lv_obj_set_style_text_font(ui_pageBattery_labelBattery, &ui_font_MiSansM, LV_PART_MAIN | LV_STATE_DEFAULT); - ui_pageBattery_panelUpBody = lv_obj_create(ui_pageBattery); + ui_pageBattery_panelBody = lv_obj_create(ui_pageBattery); + lv_obj_set_width(ui_pageBattery_panelBody, 320); + lv_obj_set_height(ui_pageBattery_panelBody, 430); + lv_obj_set_x(ui_pageBattery_panelBody, 1); + lv_obj_set_y(ui_pageBattery_panelBody, 20); + lv_obj_set_align(ui_pageBattery_panelBody, LV_ALIGN_CENTER); + lv_obj_add_flag(ui_pageBattery_panelBody, LV_OBJ_FLAG_EVENT_BUBBLE | LV_OBJ_FLAG_SCROLL_ONE); /// Flags + lv_obj_clear_flag(ui_pageBattery_panelBody, LV_OBJ_FLAG_GESTURE_BUBBLE); /// Flags + lv_obj_set_scrollbar_mode(ui_pageBattery_panelBody, LV_SCROLLBAR_MODE_ACTIVE); + lv_obj_set_scroll_dir(ui_pageBattery_panelBody, LV_DIR_VER); + lv_obj_set_style_radius(ui_pageBattery_panelBody, 0, LV_PART_MAIN | LV_STATE_DEFAULT); + lv_obj_set_style_bg_color(ui_pageBattery_panelBody, lv_color_hex(0xE6E6E6), LV_PART_MAIN | LV_STATE_DEFAULT); + lv_obj_set_style_bg_opa(ui_pageBattery_panelBody, 255, LV_PART_MAIN | LV_STATE_DEFAULT); + lv_obj_set_style_border_width(ui_pageBattery_panelBody, 0, LV_PART_MAIN | LV_STATE_DEFAULT); + lv_obj_set_style_pad_left(ui_pageBattery_panelBody, 0, LV_PART_MAIN | LV_STATE_DEFAULT); + lv_obj_set_style_pad_right(ui_pageBattery_panelBody, 0, LV_PART_MAIN | LV_STATE_DEFAULT); + lv_obj_set_style_pad_top(ui_pageBattery_panelBody, 30, LV_PART_MAIN | LV_STATE_DEFAULT); + lv_obj_set_style_pad_bottom(ui_pageBattery_panelBody, 0, LV_PART_MAIN | LV_STATE_DEFAULT); + + ui_pageBattery_panelUpBody = lv_obj_create(ui_pageBattery_panelBody); lv_obj_set_width(ui_pageBattery_panelUpBody, 310); lv_obj_set_height(ui_pageBattery_panelUpBody, 221); lv_obj_set_x(ui_pageBattery_panelUpBody, 0); - lv_obj_set_y(ui_pageBattery_panelUpBody, -73); + lv_obj_set_y(ui_pageBattery_panelUpBody, -111); lv_obj_set_align(ui_pageBattery_panelUpBody, LV_ALIGN_CENTER); lv_obj_clear_flag(ui_pageBattery_panelUpBody, LV_OBJ_FLAG_SCROLLABLE); /// Flags lv_obj_set_style_bg_color(ui_pageBattery_panelUpBody, lv_color_hex(0xFFFFFF), LV_PART_MAIN | LV_STATE_DEFAULT); @@ -143,6 +162,8 @@ void ui_pageBattery_screen_init(void) lv_obj_set_style_text_opa(ui_pageBattery_labelCurrentVolume, 255, LV_PART_MAIN | LV_STATE_DEFAULT); lv_obj_add_event_cb(ui_pageBattery_panelHeader, ui_event_pageBattery_panelHeader, LV_EVENT_ALL, NULL); + lv_obj_add_event_cb(ui_pageBattery_panelBody, ui_event_pageBattery_panelBody, LV_EVENT_ALL, NULL); + uic_pageBattery_panelBody = ui_pageBattery_panelBody; uic_pageBattery_panelUpBody = ui_pageBattery_panelUpBody; } diff --git a/components/FluxUI/screens/ui_pageDebug.c b/components/FluxUI/screens/ui_pageDebug.c index c8e8270..88aeeec 100644 --- a/components/FluxUI/screens/ui_pageDebug.c +++ b/components/FluxUI/screens/ui_pageDebug.c @@ -44,6 +44,7 @@ void ui_pageDebug_screen_init(void) lv_obj_set_y(ui_pageDebug_panelBody, 20); lv_obj_set_align(ui_pageDebug_panelBody, LV_ALIGN_CENTER); lv_obj_add_flag(ui_pageDebug_panelBody, LV_OBJ_FLAG_EVENT_BUBBLE | LV_OBJ_FLAG_SCROLL_ONE); /// Flags + lv_obj_clear_flag(ui_pageDebug_panelBody, LV_OBJ_FLAG_GESTURE_BUBBLE); /// Flags lv_obj_set_scrollbar_mode(ui_pageDebug_panelBody, LV_SCROLLBAR_MODE_ACTIVE); lv_obj_set_scroll_dir(ui_pageDebug_panelBody, LV_DIR_VER); lv_obj_set_style_radius(ui_pageDebug_panelBody, 0, LV_PART_MAIN | LV_STATE_DEFAULT); @@ -138,6 +139,7 @@ void ui_pageDebug_screen_init(void) lv_obj_add_event_cb(ui_pageDebug_labelBack, ui_event_pageDebug_labelBack, LV_EVENT_ALL, NULL); lv_obj_add_event_cb(ui_pageDebug_panelHeader, ui_event_pageDebug_panelHeader, LV_EVENT_ALL, NULL); + lv_obj_add_event_cb(ui_pageDebug_panelBody, ui_event_pageDebug_panelBody, LV_EVENT_ALL, NULL); lv_obj_add_event_cb(ui_pageDebug_buttonFluxRead, ui_event_pageDebug_buttonFluxRead, LV_EVENT_ALL, NULL); lv_obj_add_event_cb(ui_pageDebug_buttonClearTextarea, ui_event_pageDebug_buttonClearTextarea, LV_EVENT_ALL, NULL); uic_pageDebug_dropdownFunctionCode = ui_pageDebug_dropdownFunctionCode; diff --git a/components/FluxUI/screens/ui_pageDebugChoice.c b/components/FluxUI/screens/ui_pageDebugChoice.c index 71af1b6..dcda6a4 100644 --- a/components/FluxUI/screens/ui_pageDebugChoice.c +++ b/components/FluxUI/screens/ui_pageDebugChoice.c @@ -47,6 +47,7 @@ void ui_pageDebugChoice_screen_init(void) lv_obj_set_flex_flow(ui_pageDebugChoice_panelBody, LV_FLEX_FLOW_COLUMN); lv_obj_set_flex_align(ui_pageDebugChoice_panelBody, LV_FLEX_ALIGN_START, LV_FLEX_ALIGN_START, LV_FLEX_ALIGN_START); lv_obj_add_flag(ui_pageDebugChoice_panelBody, LV_OBJ_FLAG_EVENT_BUBBLE | LV_OBJ_FLAG_SCROLL_ONE); /// Flags + lv_obj_clear_flag(ui_pageDebugChoice_panelBody, LV_OBJ_FLAG_GESTURE_BUBBLE); /// Flags lv_obj_set_scrollbar_mode(ui_pageDebugChoice_panelBody, LV_SCROLLBAR_MODE_ACTIVE); lv_obj_set_scroll_dir(ui_pageDebugChoice_panelBody, LV_DIR_VER); lv_obj_set_style_radius(ui_pageDebugChoice_panelBody, 0, LV_PART_MAIN | LV_STATE_DEFAULT); @@ -91,5 +92,6 @@ void ui_pageDebugChoice_screen_init(void) lv_obj_add_event_cb(ui_pageDebugChoice_imageHome, ui_event_pageDebugChoice_imageHome, LV_EVENT_ALL, NULL); lv_obj_add_event_cb(ui_pageDebugChoice_pannelHeader, ui_event_pageDebugChoice_pannelHeader, LV_EVENT_ALL, NULL); lv_obj_add_event_cb(ui_pageDebugChoice_panelRecord, ui_event_pageDebugChoice_panelRecord, LV_EVENT_ALL, NULL); + lv_obj_add_event_cb(ui_pageDebugChoice_panelBody, ui_event_pageDebugChoice_panelBody, LV_EVENT_ALL, NULL); } diff --git a/components/FluxUI/screens/ui_pageDeviceInformation.c b/components/FluxUI/screens/ui_pageDeviceInformation.c index e9e4d5e..227714b 100644 --- a/components/FluxUI/screens/ui_pageDeviceInformation.c +++ b/components/FluxUI/screens/ui_pageDeviceInformation.c @@ -39,11 +39,30 @@ void ui_pageDeviceInformation_screen_init(void) lv_obj_set_style_text_font(ui_pageDeviceInformation_lableDeviceInformation, &ui_font_MiSansM, LV_PART_MAIN | LV_STATE_DEFAULT); - ui_pageDeviceInformation_textAreaContent = lv_textarea_create(ui_pageDeviceInformation); + ui_pageDeviceInformation_panelBody2 = lv_obj_create(ui_pageDeviceInformation); + lv_obj_set_width(ui_pageDeviceInformation_panelBody2, 320); + lv_obj_set_height(ui_pageDeviceInformation_panelBody2, 430); + lv_obj_set_x(ui_pageDeviceInformation_panelBody2, 1); + lv_obj_set_y(ui_pageDeviceInformation_panelBody2, 20); + lv_obj_set_align(ui_pageDeviceInformation_panelBody2, LV_ALIGN_CENTER); + lv_obj_add_flag(ui_pageDeviceInformation_panelBody2, LV_OBJ_FLAG_EVENT_BUBBLE | LV_OBJ_FLAG_SCROLL_ONE); /// Flags + lv_obj_clear_flag(ui_pageDeviceInformation_panelBody2, LV_OBJ_FLAG_GESTURE_BUBBLE); /// Flags + lv_obj_set_scrollbar_mode(ui_pageDeviceInformation_panelBody2, LV_SCROLLBAR_MODE_ACTIVE); + lv_obj_set_scroll_dir(ui_pageDeviceInformation_panelBody2, LV_DIR_VER); + lv_obj_set_style_radius(ui_pageDeviceInformation_panelBody2, 0, LV_PART_MAIN | LV_STATE_DEFAULT); + lv_obj_set_style_bg_color(ui_pageDeviceInformation_panelBody2, lv_color_hex(0xE6E6E6), LV_PART_MAIN | LV_STATE_DEFAULT); + lv_obj_set_style_bg_opa(ui_pageDeviceInformation_panelBody2, 255, LV_PART_MAIN | LV_STATE_DEFAULT); + lv_obj_set_style_border_width(ui_pageDeviceInformation_panelBody2, 0, LV_PART_MAIN | LV_STATE_DEFAULT); + lv_obj_set_style_pad_left(ui_pageDeviceInformation_panelBody2, 0, LV_PART_MAIN | LV_STATE_DEFAULT); + lv_obj_set_style_pad_right(ui_pageDeviceInformation_panelBody2, 0, LV_PART_MAIN | LV_STATE_DEFAULT); + lv_obj_set_style_pad_top(ui_pageDeviceInformation_panelBody2, 30, LV_PART_MAIN | LV_STATE_DEFAULT); + lv_obj_set_style_pad_bottom(ui_pageDeviceInformation_panelBody2, 0, LV_PART_MAIN | LV_STATE_DEFAULT); + + ui_pageDeviceInformation_textAreaContent = lv_textarea_create(ui_pageDeviceInformation_panelBody2); lv_obj_set_width(ui_pageDeviceInformation_textAreaContent, 299); lv_obj_set_height(ui_pageDeviceInformation_textAreaContent, 334); - lv_obj_set_x(ui_pageDeviceInformation_textAreaContent, 0); - lv_obj_set_y(ui_pageDeviceInformation_textAreaContent, -10); + lv_obj_set_x(ui_pageDeviceInformation_textAreaContent, -1); + lv_obj_set_y(ui_pageDeviceInformation_textAreaContent, -52); lv_obj_set_align(ui_pageDeviceInformation_textAreaContent, LV_ALIGN_CENTER); lv_textarea_set_text(ui_pageDeviceInformation_textAreaContent, "Device Name: Pulse Flow Detection Controller\n-----------------------------------------------------\nSoftware Version: 20250304.1.0A\n Hardware Version: 20250302.1.0A\n-----------------------------------------------------\nMain Control Chip: esp32-s3-wroom\n IDF Version: Ver 5.2\n RAM Size: 8MB\n Flash Size: 4MB\n-----------------------------------------------------\nScreen Size: 320-480px 3.5-inch\n Interface Type: intel-8080 parallel port\n Pixel Frequency: 20MHz\n Touch Screen Controller: ft6336U\n Display Controller: ILI9488 (compatible with ST7789)\nDisplay Framework: LVGL\n Version: Version 8.2.0\n-----------------------------------------------------\nBattery Information:\n Capacity: 2500mAh\n Voltage: 2.7V-4.2V\n Charging Current: 0.5C\n-----------------------------------------------------\nSoftware Server Address: sunme.top\n Technical Support: 13345203604\n Name: Wang Xiangen\nDesign Date: 2025.3.7\n Address: Danyang City, Jiangsu Province"); @@ -51,11 +70,11 @@ void ui_pageDeviceInformation_screen_init(void) lv_obj_set_style_text_font(ui_pageDeviceInformation_textAreaContent, &lv_font_montserrat_14, LV_PART_MAIN | LV_STATE_DEFAULT); - ui_pageDeviceInformation_buttonBackToHome = lv_btn_create(ui_pageDeviceInformation); + ui_pageDeviceInformation_buttonBackToHome = lv_btn_create(ui_pageDeviceInformation_panelBody2); lv_obj_set_width(ui_pageDeviceInformation_buttonBackToHome, 271); lv_obj_set_height(ui_pageDeviceInformation_buttonBackToHome, 50); - lv_obj_set_x(ui_pageDeviceInformation_buttonBackToHome, -3); - lv_obj_set_y(ui_pageDeviceInformation_buttonBackToHome, 195); + lv_obj_set_x(ui_pageDeviceInformation_buttonBackToHome, 0); + lv_obj_set_y(ui_pageDeviceInformation_buttonBackToHome, 156); lv_obj_set_align(ui_pageDeviceInformation_buttonBackToHome, LV_ALIGN_CENTER); ui_pageDeviceInformation_labelBackToHome = lv_label_create(ui_pageDeviceInformation_buttonBackToHome); @@ -69,5 +88,6 @@ void ui_pageDeviceInformation_screen_init(void) NULL); lv_obj_add_event_cb(ui_pageDeviceInformation_buttonBackToHome, ui_event_pageDeviceInformation_buttonBackToHome, LV_EVENT_ALL, NULL); + lv_obj_add_event_cb(ui_pageDeviceInformation_panelBody2, ui_event_pageDeviceInformation_panelBody2, LV_EVENT_ALL, NULL); } diff --git a/components/FluxUI/screens/ui_pageSDCard.c b/components/FluxUI/screens/ui_pageSDCard.c index b2fde73..e7dfc94 100644 --- a/components/FluxUI/screens/ui_pageSDCard.c +++ b/components/FluxUI/screens/ui_pageSDCard.c @@ -42,6 +42,7 @@ void ui_pageSDCard_screen_init(void) lv_obj_set_y(ui_pageSDCard_panelBody, 20); lv_obj_set_align(ui_pageSDCard_panelBody, LV_ALIGN_CENTER); lv_obj_add_flag(ui_pageSDCard_panelBody, LV_OBJ_FLAG_EVENT_BUBBLE | LV_OBJ_FLAG_SCROLL_ONE); /// Flags + lv_obj_clear_flag(ui_pageSDCard_panelBody, LV_OBJ_FLAG_GESTURE_BUBBLE); /// Flags lv_obj_set_scrollbar_mode(ui_pageSDCard_panelBody, LV_SCROLLBAR_MODE_ACTIVE); lv_obj_set_scroll_dir(ui_pageSDCard_panelBody, LV_DIR_VER); lv_obj_set_style_radius(ui_pageSDCard_panelBody, 0, LV_PART_MAIN | LV_STATE_DEFAULT); @@ -136,6 +137,7 @@ void ui_pageSDCard_screen_init(void) lv_obj_add_event_cb(ui_pageSDCard_panelHeader, ui_event_pageSDCard_panelHeader, LV_EVENT_ALL, NULL); lv_obj_add_event_cb(ui_pageSDCard_buttonReadSDCard, ui_event_pageSDCard_buttonReadSDCard, LV_EVENT_ALL, NULL); + lv_obj_add_event_cb(ui_pageSDCard_panelBody, ui_event_pageSDCard_panelBody, LV_EVENT_ALL, NULL); uic_pageSDCard_panelSDCardFree = ui_pageSDCard_panelSDCardFree; } diff --git a/components/FluxUI/screens/ui_pageSetting.c b/components/FluxUI/screens/ui_pageSetting.c index 1f86dc9..6aaa429 100644 --- a/components/FluxUI/screens/ui_pageSetting.c +++ b/components/FluxUI/screens/ui_pageSetting.c @@ -44,6 +44,7 @@ void ui_pageSetting_screen_init(void) lv_obj_set_flex_flow(ui_pageSetting_panelBody, LV_FLEX_FLOW_COLUMN); lv_obj_set_flex_align(ui_pageSetting_panelBody, LV_FLEX_ALIGN_START, LV_FLEX_ALIGN_START, LV_FLEX_ALIGN_START); lv_obj_add_flag(ui_pageSetting_panelBody, LV_OBJ_FLAG_EVENT_BUBBLE | LV_OBJ_FLAG_SCROLL_ONE); /// Flags + lv_obj_clear_flag(ui_pageSetting_panelBody, LV_OBJ_FLAG_GESTURE_BUBBLE); /// Flags lv_obj_set_scrollbar_mode(ui_pageSetting_panelBody, LV_SCROLLBAR_MODE_ACTIVE); lv_obj_set_scroll_dir(ui_pageSetting_panelBody, LV_DIR_VER); lv_obj_set_style_radius(ui_pageSetting_panelBody, 0, LV_PART_MAIN | LV_STATE_DEFAULT); @@ -302,6 +303,7 @@ void ui_pageSetting_screen_init(void) lv_obj_add_event_cb(ui_pageSetting_pannelDeviceInformation, ui_event_pageSetting_pannelDeviceInformation, LV_EVENT_ALL, NULL); lv_obj_add_event_cb(ui_pageSetting_panelSDCard, ui_event_pageSetting_panelSDCard, LV_EVENT_ALL, NULL); + lv_obj_add_event_cb(ui_pageSetting_panelBody, ui_event_pageSetting_panelBody, LV_EVENT_ALL, NULL); uic_pageSetting_labelDeviceType = ui_pageSetting_labelDeviceType; uic_pageSetting_panelSDCard = ui_pageSetting_panelSDCard; diff --git a/components/FluxUI/screens/ui_pageWifiConnect.c b/components/FluxUI/screens/ui_pageWifiConnect.c index 6c1d343..60ef479 100644 --- a/components/FluxUI/screens/ui_pageWifiConnect.c +++ b/components/FluxUI/screens/ui_pageWifiConnect.c @@ -47,6 +47,7 @@ void ui_pageWifiConnect_screen_init(void) lv_obj_set_flex_flow(ui_pageWifiConnect_pannelBody, LV_FLEX_FLOW_COLUMN); lv_obj_set_flex_align(ui_pageWifiConnect_pannelBody, LV_FLEX_ALIGN_START, LV_FLEX_ALIGN_START, LV_FLEX_ALIGN_START); lv_obj_add_flag(ui_pageWifiConnect_pannelBody, LV_OBJ_FLAG_EVENT_BUBBLE | LV_OBJ_FLAG_SCROLL_ONE); /// Flags + lv_obj_clear_flag(ui_pageWifiConnect_pannelBody, LV_OBJ_FLAG_GESTURE_BUBBLE); /// Flags lv_obj_set_scrollbar_mode(ui_pageWifiConnect_pannelBody, LV_SCROLLBAR_MODE_ACTIVE); lv_obj_set_scroll_dir(ui_pageWifiConnect_pannelBody, LV_DIR_VER); lv_obj_set_style_radius(ui_pageWifiConnect_pannelBody, 0, LV_PART_MAIN | LV_STATE_DEFAULT); @@ -149,5 +150,6 @@ void ui_pageWifiConnect_screen_init(void) lv_obj_add_event_cb(ui_pageWifiConnect_buttonSearchWifi, ui_event_pageWifiConnect_buttonSearchWifi, LV_EVENT_ALL, NULL); lv_obj_add_event_cb(ui_pageWifiConnect_buttonConnectWifi, ui_event_pageWifiConnect_buttonConnectWifi, LV_EVENT_ALL, NULL); + lv_obj_add_event_cb(ui_pageWifiConnect_pannelBody, ui_event_pageWifiConnect_pannelBody, LV_EVENT_ALL, NULL); } diff --git a/components/FluxUI/ui.c b/components/FluxUI/ui.c index a37fade..149b45a 100644 --- a/components/FluxUI/ui.c +++ b/components/FluxUI/ui.c @@ -58,6 +58,7 @@ lv_obj_t * ui_pageSetting_panelHeader; void ui_event_pageSetting_imageHome(lv_event_t * e); lv_obj_t * ui_pageSetting_imageHome; lv_obj_t * ui_pageSetting_labelSetting; +void ui_event_pageSetting_panelBody(lv_event_t * e); lv_obj_t * ui_pageSetting_panelBody; void ui_event_pageSetting_panelWifi(lv_event_t * e); lv_obj_t * ui_pageSetting_panelWifi; @@ -99,6 +100,8 @@ void ui_event_pageBattery_panelHeader(lv_event_t * e); lv_obj_t * ui_pageBattery_panelHeader; lv_obj_t * ui_pageBattery_labelBack; lv_obj_t * ui_pageBattery_labelBattery; +void ui_event_pageBattery_panelBody(lv_event_t * e); +lv_obj_t * ui_pageBattery_panelBody; lv_obj_t * ui_pageBattery_panelUpBody; lv_obj_t * ui_pageBattery_labelCapability; lv_obj_t * ui_pageBattery_barBattery; @@ -111,6 +114,7 @@ lv_obj_t * ui_pageBattery_labelSampleVolume; lv_obj_t * ui_pageBattery_labelCurrentVoltage; lv_obj_t * ui_pageBattery_labelCurrentVolume; // CUSTOM VARIABLES +lv_obj_t * uic_pageBattery_panelBody; lv_obj_t * uic_pageBattery_panelUpBody; // SCREEN: ui_pageDeviceInformation @@ -121,6 +125,8 @@ lv_obj_t * ui_pageDeviceInformation_pannelHeader; void ui_event_pageDeviceInformation_labelBack(lv_event_t * e); lv_obj_t * ui_pageDeviceInformation_labelBack; lv_obj_t * ui_pageDeviceInformation_lableDeviceInformation; +void ui_event_pageDeviceInformation_panelBody2(lv_event_t * e); +lv_obj_t * ui_pageDeviceInformation_panelBody2; lv_obj_t * ui_pageDeviceInformation_textAreaContent; void ui_event_pageDeviceInformation_buttonBackToHome(lv_event_t * e); lv_obj_t * ui_pageDeviceInformation_buttonBackToHome; @@ -135,6 +141,7 @@ lv_obj_t * ui_pageDebug_panelHeader; lv_obj_t * ui_pageDebug_labelDebug; void ui_event_pageDebug_labelBack(lv_event_t * e); lv_obj_t * ui_pageDebug_labelBack; +void ui_event_pageDebug_panelBody(lv_event_t * e); lv_obj_t * ui_pageDebug_panelBody; lv_obj_t * ui_pageDebug_textAreaContent; lv_obj_t * ui_pageDebug_checkBoxWifi; @@ -159,6 +166,7 @@ lv_obj_t * ui_pageWifiConnect_pannelHeader; lv_obj_t * ui_pageWifiConnect_labelHeaderTitle; void ui_event_pageWifiConnect_labelBack(lv_event_t * e); lv_obj_t * ui_pageWifiConnect_labelBack; +void ui_event_pageWifiConnect_pannelBody(lv_event_t * e); lv_obj_t * ui_pageWifiConnect_pannelBody; void ui_event_pageWifiConnect_dropdownWifiName(lv_event_t * e); lv_obj_t * ui_pageWifiConnect_dropdownWifiName; @@ -185,6 +193,7 @@ lv_obj_t * ui_pageDebugChoice_pannelHeader; void ui_event_pageDebugChoice_imageHome(lv_event_t * e); lv_obj_t * ui_pageDebugChoice_imageHome; lv_obj_t * ui_pageDebugChoice_labelHeaderTitle; +void ui_event_pageDebugChoice_panelBody(lv_event_t * e); lv_obj_t * ui_pageDebugChoice_panelBody; void ui_event_pageDebugChoice_panelRecord(lv_event_t * e); lv_obj_t * ui_pageDebugChoice_panelRecord; @@ -199,6 +208,7 @@ void ui_event_pageSDCard_panelHeader(lv_event_t * e); lv_obj_t * ui_pageSDCard_panelHeader; lv_obj_t * ui_pageSDCard_labelHeaderTitle; lv_obj_t * ui_pageSDCard_labelBack; +void ui_event_pageSDCard_panelBody(lv_event_t * e); lv_obj_t * ui_pageSDCard_panelBody; lv_obj_t * ui_pageSDCard_panelSDCardFree; lv_obj_t * ui_pageSDCard_arcSDCardFree; @@ -294,6 +304,16 @@ void ui_event_pageSetting_imageHome(lv_event_t * e) } } +void ui_event_pageSetting_panelBody(lv_event_t * e) +{ + lv_event_code_t event_code = lv_event_get_code(e); + + if(event_code == LV_EVENT_GESTURE && lv_indev_get_gesture_dir(lv_indev_get_act()) == LV_DIR_RIGHT) { + lv_indev_wait_release(lv_indev_get_act()); + _ui_screen_change(&ui_pageHome, LV_SCR_LOAD_ANIM_MOVE_RIGHT, 500, 0, &ui_pageHome_screen_init); + } +} + void ui_event_pageSetting_panelWifi(lv_event_t * e) { lv_event_code_t event_code = lv_event_get_code(e); @@ -366,6 +386,16 @@ void ui_event_pageBattery_panelHeader(lv_event_t * e) } } +void ui_event_pageBattery_panelBody(lv_event_t * e) +{ + lv_event_code_t event_code = lv_event_get_code(e); + + if(event_code == LV_EVENT_GESTURE && lv_indev_get_gesture_dir(lv_indev_get_act()) == LV_DIR_RIGHT) { + lv_indev_wait_release(lv_indev_get_act()); + _ui_screen_change(&ui_pageSetting, LV_SCR_LOAD_ANIM_MOVE_RIGHT, 500, 0, &ui_pageSetting_screen_init); + } +} + void ui_event_pageDeviceInformation_pannelHeader(lv_event_t * e) { lv_event_code_t event_code = lv_event_get_code(e); @@ -384,6 +414,16 @@ void ui_event_pageDeviceInformation_labelBack(lv_event_t * e) } } +void ui_event_pageDeviceInformation_panelBody2(lv_event_t * e) +{ + lv_event_code_t event_code = lv_event_get_code(e); + + if(event_code == LV_EVENT_GESTURE && lv_indev_get_gesture_dir(lv_indev_get_act()) == LV_DIR_RIGHT) { + lv_indev_wait_release(lv_indev_get_act()); + _ui_screen_change(&ui_pageSetting, LV_SCR_LOAD_ANIM_MOVE_RIGHT, 500, 0, &ui_pageSetting_screen_init); + } +} + void ui_event_pageDeviceInformation_buttonBackToHome(lv_event_t * e) { lv_event_code_t event_code = lv_event_get_code(e); @@ -411,6 +451,16 @@ void ui_event_pageDebug_labelBack(lv_event_t * e) } } +void ui_event_pageDebug_panelBody(lv_event_t * e) +{ + lv_event_code_t event_code = lv_event_get_code(e); + + if(event_code == LV_EVENT_GESTURE && lv_indev_get_gesture_dir(lv_indev_get_act()) == LV_DIR_RIGHT) { + lv_indev_wait_release(lv_indev_get_act()); + _ui_screen_change(&ui_pageDebugChoice, LV_SCR_LOAD_ANIM_MOVE_RIGHT, 500, 0, &ui_pageDebugChoice_screen_init); + } +} + void ui_event_pageDebug_buttonFluxRead(lv_event_t * e) { lv_event_code_t event_code = lv_event_get_code(e); @@ -447,6 +497,16 @@ void ui_event_pageWifiConnect_labelBack(lv_event_t * e) } } +void ui_event_pageWifiConnect_pannelBody(lv_event_t * e) +{ + lv_event_code_t event_code = lv_event_get_code(e); + + if(event_code == LV_EVENT_GESTURE && lv_indev_get_gesture_dir(lv_indev_get_act()) == LV_DIR_RIGHT) { + lv_indev_wait_release(lv_indev_get_act()); + _ui_screen_change(&ui_pageSetting, LV_SCR_LOAD_ANIM_MOVE_RIGHT, 500, 0, &ui_pageSetting_screen_init); + } +} + void ui_event_pageWifiConnect_dropdownWifiName(lv_event_t * e) { lv_event_code_t event_code = lv_event_get_code(e); @@ -501,6 +561,16 @@ void ui_event_pageDebugChoice_imageHome(lv_event_t * e) } } +void ui_event_pageDebugChoice_panelBody(lv_event_t * e) +{ + lv_event_code_t event_code = lv_event_get_code(e); + + if(event_code == LV_EVENT_GESTURE && lv_indev_get_gesture_dir(lv_indev_get_act()) == LV_DIR_RIGHT) { + lv_indev_wait_release(lv_indev_get_act()); + _ui_screen_change(&ui_pageHome, LV_SCR_LOAD_ANIM_MOVE_RIGHT, 500, 0, &ui_pageHome_screen_init); + } +} + void ui_event_pageDebugChoice_panelRecord(lv_event_t * e) { lv_event_code_t event_code = lv_event_get_code(e); @@ -519,6 +589,16 @@ void ui_event_pageSDCard_panelHeader(lv_event_t * e) } } +void ui_event_pageSDCard_panelBody(lv_event_t * e) +{ + lv_event_code_t event_code = lv_event_get_code(e); + + if(event_code == LV_EVENT_GESTURE && lv_indev_get_gesture_dir(lv_indev_get_act()) == LV_DIR_RIGHT) { + lv_indev_wait_release(lv_indev_get_act()); + _ui_screen_change(&ui_pageSetting, LV_SCR_LOAD_ANIM_MOVE_RIGHT, 500, 0, &ui_pageSetting_screen_init); + } +} + void ui_event_pageSDCard_buttonReadSDCard(lv_event_t * e) { lv_event_code_t event_code = lv_event_get_code(e); diff --git a/components/FluxUI/ui.h b/components/FluxUI/ui.h index 13829ae..fc54d76 100644 --- a/components/FluxUI/ui.h +++ b/components/FluxUI/ui.h @@ -66,6 +66,7 @@ extern lv_obj_t * ui_pageSetting_panelHeader; void ui_event_pageSetting_imageHome(lv_event_t * e); extern lv_obj_t * ui_pageSetting_imageHome; extern lv_obj_t * ui_pageSetting_labelSetting; +void ui_event_pageSetting_panelBody(lv_event_t * e); extern lv_obj_t * ui_pageSetting_panelBody; void ui_event_pageSetting_panelWifi(lv_event_t * e); extern lv_obj_t * ui_pageSetting_panelWifi; @@ -107,6 +108,8 @@ void ui_event_pageBattery_panelHeader(lv_event_t * e); extern lv_obj_t * ui_pageBattery_panelHeader; extern lv_obj_t * ui_pageBattery_labelBack; extern lv_obj_t * ui_pageBattery_labelBattery; +void ui_event_pageBattery_panelBody(lv_event_t * e); +extern lv_obj_t * ui_pageBattery_panelBody; extern lv_obj_t * ui_pageBattery_panelUpBody; extern lv_obj_t * ui_pageBattery_labelCapability; extern lv_obj_t * ui_pageBattery_barBattery; @@ -119,6 +122,7 @@ extern lv_obj_t * ui_pageBattery_labelSampleVolume; extern lv_obj_t * ui_pageBattery_labelCurrentVoltage; extern lv_obj_t * ui_pageBattery_labelCurrentVolume; // CUSTOM VARIABLES +extern lv_obj_t * uic_pageBattery_panelBody; extern lv_obj_t * uic_pageBattery_panelUpBody; // SCREEN: ui_pageDeviceInformation @@ -129,6 +133,8 @@ extern lv_obj_t * ui_pageDeviceInformation_pannelHeader; void ui_event_pageDeviceInformation_labelBack(lv_event_t * e); extern lv_obj_t * ui_pageDeviceInformation_labelBack; extern lv_obj_t * ui_pageDeviceInformation_lableDeviceInformation; +void ui_event_pageDeviceInformation_panelBody2(lv_event_t * e); +extern lv_obj_t * ui_pageDeviceInformation_panelBody2; extern lv_obj_t * ui_pageDeviceInformation_textAreaContent; void ui_event_pageDeviceInformation_buttonBackToHome(lv_event_t * e); extern lv_obj_t * ui_pageDeviceInformation_buttonBackToHome; @@ -143,6 +149,7 @@ extern lv_obj_t * ui_pageDebug_panelHeader; extern lv_obj_t * ui_pageDebug_labelDebug; void ui_event_pageDebug_labelBack(lv_event_t * e); extern lv_obj_t * ui_pageDebug_labelBack; +void ui_event_pageDebug_panelBody(lv_event_t * e); extern lv_obj_t * ui_pageDebug_panelBody; extern lv_obj_t * ui_pageDebug_textAreaContent; extern lv_obj_t * ui_pageDebug_checkBoxWifi; @@ -167,6 +174,7 @@ extern lv_obj_t * ui_pageWifiConnect_pannelHeader; extern lv_obj_t * ui_pageWifiConnect_labelHeaderTitle; void ui_event_pageWifiConnect_labelBack(lv_event_t * e); extern lv_obj_t * ui_pageWifiConnect_labelBack; +void ui_event_pageWifiConnect_pannelBody(lv_event_t * e); extern lv_obj_t * ui_pageWifiConnect_pannelBody; void ui_event_pageWifiConnect_dropdownWifiName(lv_event_t * e); extern lv_obj_t * ui_pageWifiConnect_dropdownWifiName; @@ -193,6 +201,7 @@ extern lv_obj_t * ui_pageDebugChoice_pannelHeader; void ui_event_pageDebugChoice_imageHome(lv_event_t * e); extern lv_obj_t * ui_pageDebugChoice_imageHome; extern lv_obj_t * ui_pageDebugChoice_labelHeaderTitle; +void ui_event_pageDebugChoice_panelBody(lv_event_t * e); extern lv_obj_t * ui_pageDebugChoice_panelBody; void ui_event_pageDebugChoice_panelRecord(lv_event_t * e); extern lv_obj_t * ui_pageDebugChoice_panelRecord; @@ -207,6 +216,7 @@ void ui_event_pageSDCard_panelHeader(lv_event_t * e); extern lv_obj_t * ui_pageSDCard_panelHeader; extern lv_obj_t * ui_pageSDCard_labelHeaderTitle; extern lv_obj_t * ui_pageSDCard_labelBack; +void ui_event_pageSDCard_panelBody(lv_event_t * e); extern lv_obj_t * ui_pageSDCard_panelBody; extern lv_obj_t * ui_pageSDCard_panelSDCardFree; extern lv_obj_t * ui_pageSDCard_arcSDCardFree; diff --git a/components/FluxUI/ui_events.c b/components/FluxUI/ui_events.c index 7a4e8e6..ace8abf 100644 --- a/components/FluxUI/ui_events.c +++ b/components/FluxUI/ui_events.c @@ -125,7 +125,7 @@ void on_buttonStartTest_clicked(lv_event_t * e) // Your code here /* start to test */ lv_obj_clear_flag(ui_pageHome_spinnerStateBusy, LV_OBJ_FLAG_HIDDEN); - + }