diff --git a/image/collectiing_en/bn_confirm.png b/image/collectiing_en/bn_confirm.png new file mode 100644 index 00000000..171ee120 Binary files /dev/null and b/image/collectiing_en/bn_confirm.png differ diff --git a/image/collectiing_en/bp_confirm.png b/image/collectiing_en/bp_confirm.png new file mode 100644 index 00000000..22b94d8f Binary files /dev/null and b/image/collectiing_en/bp_confirm.png differ diff --git a/image/complete/img2.png b/image/complete/img2.png new file mode 100644 index 00000000..46be81f5 Binary files /dev/null and b/image/complete/img2.png differ diff --git a/image/complete_en/img2.png b/image/complete_en/img2.png new file mode 100644 index 00000000..a0538918 Binary files /dev/null and b/image/complete_en/img2.png differ diff --git a/image/consent/alpha.png b/image/consent/alpha.png new file mode 100644 index 00000000..f653b2a5 Binary files /dev/null and b/image/consent/alpha.png differ diff --git a/image/consent/img_all.png b/image/consent/img_all.png new file mode 100644 index 00000000..74b64db1 Binary files /dev/null and b/image/consent/img_all.png differ diff --git a/image/consent/img_popup1.png b/image/consent/img_popup1.png new file mode 100644 index 00000000..64c833ee Binary files /dev/null and b/image/consent/img_popup1.png differ diff --git a/image/consent_en/alpha.png b/image/consent_en/alpha.png new file mode 100644 index 00000000..f653b2a5 Binary files /dev/null and b/image/consent_en/alpha.png differ diff --git a/image/consent_en/bn_accept.png b/image/consent_en/bn_accept.png new file mode 100644 index 00000000..34a4af51 Binary files /dev/null and b/image/consent_en/bn_accept.png differ diff --git a/image/consent_en/bn_decline.png b/image/consent_en/bn_decline.png new file mode 100644 index 00000000..25fe9d7d Binary files /dev/null and b/image/consent_en/bn_decline.png differ diff --git a/image/consent_en/bp_accept.png b/image/consent_en/bp_accept.png new file mode 100644 index 00000000..bcf397d3 Binary files /dev/null and b/image/consent_en/bp_accept.png differ diff --git a/image/consent_en/bp_decline.png b/image/consent_en/bp_decline.png new file mode 100644 index 00000000..8a0f7e98 Binary files /dev/null and b/image/consent_en/bp_decline.png differ diff --git a/image/consent_en/img1.png b/image/consent_en/img1.png new file mode 100644 index 00000000..6ea40be5 Binary files /dev/null and b/image/consent_en/img1.png differ diff --git a/image/consent_en/img_all.png b/image/consent_en/img_all.png new file mode 100644 index 00000000..f97ccd79 Binary files /dev/null and b/image/consent_en/img_all.png differ diff --git a/image/consent_en/img_popup1.png b/image/consent_en/img_popup1.png new file mode 100644 index 00000000..1b81b004 Binary files /dev/null and b/image/consent_en/img_popup1.png differ diff --git a/image/display_get_free/alpha.png b/image/display_get_free/alpha.png new file mode 100644 index 00000000..f653b2a5 Binary files /dev/null and b/image/display_get_free/alpha.png differ diff --git a/image/display_get_free/bn_accept.png b/image/display_get_free/bn_accept.png new file mode 100644 index 00000000..582eddcb Binary files /dev/null and b/image/display_get_free/bn_accept.png differ diff --git a/image/display_get_free/bp_accept.png b/image/display_get_free/bp_accept.png new file mode 100644 index 00000000..19e88108 Binary files /dev/null and b/image/display_get_free/bp_accept.png differ diff --git a/image/display_get_free/img_popup1.png b/image/display_get_free/img_popup1.png new file mode 100644 index 00000000..eee0fead Binary files /dev/null and b/image/display_get_free/img_popup1.png differ diff --git a/image/display_get_free_en/alpha.png b/image/display_get_free_en/alpha.png new file mode 100644 index 00000000..f653b2a5 Binary files /dev/null and b/image/display_get_free_en/alpha.png differ diff --git a/image/display_get_free_en/bn_accept.png b/image/display_get_free_en/bn_accept.png new file mode 100644 index 00000000..ae5099ce Binary files /dev/null and b/image/display_get_free_en/bn_accept.png differ diff --git a/image/display_get_free_en/bp_accept.png b/image/display_get_free_en/bp_accept.png new file mode 100644 index 00000000..3c2f78ab Binary files /dev/null and b/image/display_get_free_en/bp_accept.png differ diff --git a/image/display_get_free_en/img_popup1.png b/image/display_get_free_en/img_popup1.png new file mode 100644 index 00000000..58c5eac1 Binary files /dev/null and b/image/display_get_free_en/img_popup1.png differ diff --git a/image/display_point/alpha.png b/image/display_point/alpha.png new file mode 100644 index 00000000..f653b2a5 Binary files /dev/null and b/image/display_point/alpha.png differ diff --git a/image/display_point/bn_close.png b/image/display_point/bn_close.png new file mode 100644 index 00000000..582eddcb Binary files /dev/null and b/image/display_point/bn_close.png differ diff --git a/image/display_point/bp_close.png b/image/display_point/bp_close.png new file mode 100644 index 00000000..92966e14 Binary files /dev/null and b/image/display_point/bp_close.png differ diff --git a/image/display_point/btn_stamp_10.png b/image/display_point/btn_stamp_10.png new file mode 100644 index 00000000..9c7c5b38 Binary files /dev/null and b/image/display_point/btn_stamp_10.png differ diff --git a/image/display_point/btn_stamp_11.png b/image/display_point/btn_stamp_11.png new file mode 100644 index 00000000..343da912 Binary files /dev/null and b/image/display_point/btn_stamp_11.png differ diff --git a/image/display_point/btn_stamp_2.png b/image/display_point/btn_stamp_2.png new file mode 100644 index 00000000..12386916 Binary files /dev/null and b/image/display_point/btn_stamp_2.png differ diff --git a/image/display_point/btn_stamp_3.png b/image/display_point/btn_stamp_3.png new file mode 100644 index 00000000..05e42c3b Binary files /dev/null and b/image/display_point/btn_stamp_3.png differ diff --git a/image/display_point/btn_stamp_4.png b/image/display_point/btn_stamp_4.png new file mode 100644 index 00000000..4eccc6af Binary files /dev/null and b/image/display_point/btn_stamp_4.png differ diff --git a/image/display_point/btn_stamp_5.png b/image/display_point/btn_stamp_5.png new file mode 100644 index 00000000..66e56026 Binary files /dev/null and b/image/display_point/btn_stamp_5.png differ diff --git a/image/display_point/btn_stamp_6.png b/image/display_point/btn_stamp_6.png new file mode 100644 index 00000000..21fe456a Binary files /dev/null and b/image/display_point/btn_stamp_6.png differ diff --git a/image/display_point/btn_stamp_7.png b/image/display_point/btn_stamp_7.png new file mode 100644 index 00000000..81effa96 Binary files /dev/null and b/image/display_point/btn_stamp_7.png differ diff --git a/image/display_point/btn_stamp_8.png b/image/display_point/btn_stamp_8.png new file mode 100644 index 00000000..d4ae1c9d Binary files /dev/null and b/image/display_point/btn_stamp_8.png differ diff --git a/image/display_point/btn_stamp_9.png b/image/display_point/btn_stamp_9.png new file mode 100644 index 00000000..b1c7d85d Binary files /dev/null and b/image/display_point/btn_stamp_9.png differ diff --git a/image/display_point/btn_stamp_free.png b/image/display_point/btn_stamp_free.png new file mode 100644 index 00000000..a2b0731e Binary files /dev/null and b/image/display_point/btn_stamp_free.png differ diff --git a/image/display_point/btp_stamp_1.png b/image/display_point/btp_stamp_1.png new file mode 100644 index 00000000..7dad4040 Binary files /dev/null and b/image/display_point/btp_stamp_1.png differ diff --git a/image/display_point/btp_stamp_2.png b/image/display_point/btp_stamp_2.png new file mode 100644 index 00000000..62553a7a Binary files /dev/null and b/image/display_point/btp_stamp_2.png differ diff --git a/image/display_point/btp_stamp_free.png b/image/display_point/btp_stamp_free.png new file mode 100644 index 00000000..a2b0731e Binary files /dev/null and b/image/display_point/btp_stamp_free.png differ diff --git a/image/display_point/img_popup1.png b/image/display_point/img_popup1.png new file mode 100644 index 00000000..e41c74fa Binary files /dev/null and b/image/display_point/img_popup1.png differ diff --git a/image/display_point/n_Free.png b/image/display_point/n_Free.png new file mode 100644 index 00000000..b266d3c6 Binary files /dev/null and b/image/display_point/n_Free.png differ diff --git a/image/display_point_en/alpha.png b/image/display_point_en/alpha.png new file mode 100644 index 00000000..f653b2a5 Binary files /dev/null and b/image/display_point_en/alpha.png differ diff --git a/image/display_point_en/bn_close.png b/image/display_point_en/bn_close.png new file mode 100644 index 00000000..7e1b45ac Binary files /dev/null and b/image/display_point_en/bn_close.png differ diff --git a/image/display_point_en/bp_close.png b/image/display_point_en/bp_close.png new file mode 100644 index 00000000..3c2f78ab Binary files /dev/null and b/image/display_point_en/bp_close.png differ diff --git a/image/display_point_en/btp_stamp_1.png b/image/display_point_en/btp_stamp_1.png new file mode 100644 index 00000000..384f3477 Binary files /dev/null and b/image/display_point_en/btp_stamp_1.png differ diff --git a/image/display_point_en/btp_stamp_10.png b/image/display_point_en/btp_stamp_10.png new file mode 100644 index 00000000..c4372f9c Binary files /dev/null and b/image/display_point_en/btp_stamp_10.png differ diff --git a/image/display_point_en/btp_stamp_11.png b/image/display_point_en/btp_stamp_11.png new file mode 100644 index 00000000..84b827b2 Binary files /dev/null and b/image/display_point_en/btp_stamp_11.png differ diff --git a/image/display_point_en/btp_stamp_2.png b/image/display_point_en/btp_stamp_2.png new file mode 100644 index 00000000..18cfacb0 Binary files /dev/null and b/image/display_point_en/btp_stamp_2.png differ diff --git a/image/display_point_en/btp_stamp_3.png b/image/display_point_en/btp_stamp_3.png new file mode 100644 index 00000000..02e020f1 Binary files /dev/null and b/image/display_point_en/btp_stamp_3.png differ diff --git a/image/display_point_en/btp_stamp_4.png b/image/display_point_en/btp_stamp_4.png new file mode 100644 index 00000000..71c29ea0 Binary files /dev/null and b/image/display_point_en/btp_stamp_4.png differ diff --git a/image/display_point_en/btp_stamp_5.png b/image/display_point_en/btp_stamp_5.png new file mode 100644 index 00000000..54304ee8 Binary files /dev/null and b/image/display_point_en/btp_stamp_5.png differ diff --git a/image/display_point_en/btp_stamp_6.png b/image/display_point_en/btp_stamp_6.png new file mode 100644 index 00000000..e8749a51 Binary files /dev/null and b/image/display_point_en/btp_stamp_6.png differ diff --git a/image/display_point_en/btp_stamp_7.png b/image/display_point_en/btp_stamp_7.png new file mode 100644 index 00000000..5ba1624e Binary files /dev/null and b/image/display_point_en/btp_stamp_7.png differ diff --git a/image/display_point_en/btp_stamp_8.png b/image/display_point_en/btp_stamp_8.png new file mode 100644 index 00000000..b9be822f Binary files /dev/null and b/image/display_point_en/btp_stamp_8.png differ diff --git a/image/display_point_en/btp_stamp_9.png b/image/display_point_en/btp_stamp_9.png new file mode 100644 index 00000000..75eb3f21 Binary files /dev/null and b/image/display_point_en/btp_stamp_9.png differ diff --git a/image/display_point_en/btp_stamp_free.png b/image/display_point_en/btp_stamp_free.png new file mode 100644 index 00000000..e64cedd0 Binary files /dev/null and b/image/display_point_en/btp_stamp_free.png differ diff --git a/image/display_point_en/img2.png b/image/display_point_en/img2.png new file mode 100644 index 00000000..4eacd51a Binary files /dev/null and b/image/display_point_en/img2.png differ diff --git a/image/display_point_en/img_popup1.png b/image/display_point_en/img_popup1.png new file mode 100644 index 00000000..6e1b1c5e Binary files /dev/null and b/image/display_point_en/img_popup1.png differ diff --git a/image/page_lid_straw/text2.png b/image/page_lid_straw/text2.png new file mode 100644 index 00000000..c6442564 Binary files /dev/null and b/image/page_lid_straw/text2.png differ diff --git a/image/page_lid_straw_en/bn_ok.png b/image/page_lid_straw_en/bn_ok.png new file mode 100644 index 00000000..b6ce114a Binary files /dev/null and b/image/page_lid_straw_en/bn_ok.png differ diff --git a/image/page_lid_straw_en/bp_ok.png b/image/page_lid_straw_en/bp_ok.png new file mode 100644 index 00000000..fb1a2e1d Binary files /dev/null and b/image/page_lid_straw_en/bp_ok.png differ diff --git a/image/page_lid_straw_en/img3.png b/image/page_lid_straw_en/img3.png new file mode 100644 index 00000000..57f2b76b Binary files /dev/null and b/image/page_lid_straw_en/img3.png differ diff --git a/image/page_lid_straw_en/text2.png b/image/page_lid_straw_en/text2.png new file mode 100644 index 00000000..aa6bbd42 Binary files /dev/null and b/image/page_lid_straw_en/text2.png differ diff --git a/xml/menu_gen.py b/xml/menu_gen.py index 96a4f595..a7b35048 100644 --- a/xml/menu_gen.py +++ b/xml/menu_gen.py @@ -85,7 +85,7 @@ out_xml( '\t "bound" \r\n') out_xml( '\t KanitMediumTTF \r\n') out_xml( '\t 0x322B26 \r\n') - out_xml( '\t $' + product_code[i] + '.Name2 \r\n') + out_xml( '\t $' + product_code[i] + '.Name \r\n') out_xml( '\t\r\n') out_xml( '\t\r\n') diff --git a/xml/page_board.xml b/xml/page_board.xml index 66478156..beabf754 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -8,6 +8,8 @@ SoundVolume TopView "hide" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/topview_button_back_main.xml" + Var taobin_version = "1.00" @@ -175,7 +177,6 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/topview_button_back_main.xml" Open "ROOT/xml/service_menu.xml" diff --git a/xml/page_catalog.xml b/xml/page_catalog.xml index 25fd7823..cea5e0bc 100644 --- a/xml/page_catalog.xml +++ b/xml/page_catalog.xml @@ -33,6 +33,8 @@ 1000 + ;SAVELOG SoundPlaying + If countDownRetrun > 0 Then Var countDownRetrun = countDownRetrun - 1 EndIf diff --git a/xml/page_catalog_choose_drink1.xml b/xml/page_catalog_choose_drink1.xml index e95196a6..d35bdbe4 100644 --- a/xml/page_catalog_choose_drink1.xml +++ b/xml/page_catalog_choose_drink1.xml @@ -415,7 +415,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-02-0006.Name2 + $11-99-02-0006.Name 60 @@ -444,7 +444,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-02-0001.Name2 + $11-99-02-0001.Name 317 @@ -473,7 +473,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-02-0003.Name2 + $11-99-02-0003.Name 574 @@ -502,7 +502,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-02-0007.Name2 + $11-99-02-0007.Name 831 @@ -531,7 +531,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-02-0002.Name2 + $11-99-02-0002.Name 60 @@ -560,7 +560,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-01-0004.Name2 + $11-99-01-0004.Name 317 @@ -589,7 +589,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-02-0020.Name2 + $11-99-02-0020.Name 574 @@ -618,7 +618,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-02-0017.Name2 + $11-99-02-0017.Name 831 @@ -647,7 +647,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-01-0017.Name2 + $11-99-01-0017.Name 60 @@ -676,7 +676,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-02-0018.Name2 + $11-99-02-0018.Name 317 diff --git a/xml/page_catalog_choose_drink2.xml b/xml/page_catalog_choose_drink2.xml index 8e3b0ba4..945f81d9 100644 --- a/xml/page_catalog_choose_drink2.xml +++ b/xml/page_catalog_choose_drink2.xml @@ -509,7 +509,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-01-0010.Name2 + $11-99-01-0010.Name 60 @@ -538,7 +538,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-01-0001.Name2 + $11-99-01-0001.Name 317 @@ -567,7 +567,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-01-0002.Name2 + $11-99-01-0002.Name 574 @@ -596,7 +596,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-01-0004.Name2 + $11-99-01-0004.Name 831 @@ -625,7 +625,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-01-0007.Name2 + $11-99-01-0007.Name 60 @@ -654,7 +654,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-01-0017.Name2 + $11-99-01-0017.Name 317 @@ -683,7 +683,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-01-0003.Name2 + $11-99-01-0003.Name 574 @@ -712,7 +712,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-02-0006.Name2 + $11-99-02-0006.Name 831 @@ -741,7 +741,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-02-0024.Name2 + $11-99-02-0024.Name 60 @@ -770,7 +770,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-02-0001.Name2 + $11-99-02-0001.Name 317 @@ -799,7 +799,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-02-0003.Name2 + $11-99-02-0003.Name 574 @@ -828,7 +828,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-02-0007.Name2 + $11-99-02-0007.Name 831 @@ -857,7 +857,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-02-0030.Name2 + $11-99-02-0030.Name 60 @@ -886,7 +886,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-02-0002.Name2 + $11-99-02-0002.Name 317 diff --git a/xml/page_catalog_choose_drink2_ext.xml b/xml/page_catalog_choose_drink2_ext.xml index bfcdac23..c0b32807 100644 --- a/xml/page_catalog_choose_drink2_ext.xml +++ b/xml/page_catalog_choose_drink2_ext.xml @@ -606,7 +606,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-01-0010.Name2 + $11-99-01-0010.Name 60 @@ -635,7 +635,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-01-0001.Name2 + $11-99-01-0001.Name 317 @@ -664,7 +664,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-01-0002.Name2 + $11-99-01-0002.Name 574 @@ -693,7 +693,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-01-0004.Name2 + $11-99-01-0004.Name 831 @@ -722,7 +722,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-01-0007.Name2 + $11-99-01-0007.Name 60 @@ -751,7 +751,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-01-0017.Name2 + $11-99-01-0017.Name 317 @@ -780,7 +780,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-01-0003.Name2 + $11-99-01-0003.Name 574 @@ -809,7 +809,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-02-0006.Name2 + $11-99-02-0006.Name 831 @@ -838,7 +838,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-02-0024.Name2 + $11-99-02-0024.Name 60 @@ -867,7 +867,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-02-0001.Name2 + $11-99-02-0001.Name 317 @@ -896,7 +896,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-02-0003.Name2 + $11-99-02-0003.Name 574 @@ -925,7 +925,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-02-0006.Name2 + $11-99-02-0006.Name 831 @@ -954,7 +954,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-02-0024.Name2 + $11-99-02-0024.Name 60 @@ -983,7 +983,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-02-0001.Name2 + $11-99-02-0001.Name 317 @@ -1012,7 +1012,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-02-0003.Name2 + $11-99-02-0003.Name 574 @@ -1041,7 +1041,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-02-0007.Name2 + $11-99-02-0007.Name 831 @@ -1070,7 +1070,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-02-0030.Name2 + $11-99-02-0030.Name 60 @@ -1099,7 +1099,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-02-0002.Name2 + $11-99-02-0002.Name 317 diff --git a/xml/page_catalog_choose_drink3.xml b/xml/page_catalog_choose_drink3.xml index d72a2106..d8c93c4c 100644 --- a/xml/page_catalog_choose_drink3.xml +++ b/xml/page_catalog_choose_drink3.xml @@ -319,7 +319,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-01-0014.Name2 + $11-99-01-0014.Name 60 @@ -348,7 +348,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-01-0012.Name2 + $11-99-01-0012.Name 317 @@ -377,7 +377,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-01-0011.Name2 + $11-99-01-0011.Name 574 @@ -406,7 +406,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-02-0004.Name2 + $11-99-02-0004.Name 831 @@ -435,7 +435,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-02-0014.Name2 + $11-99-02-0014.Name 60 @@ -464,7 +464,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-02-0010.Name2 + $11-99-02-0010.Name 317 diff --git a/xml/page_catalog_choose_drink4.xml b/xml/page_catalog_choose_drink4.xml index 6e67c35b..a4bcd390 100644 --- a/xml/page_catalog_choose_drink4.xml +++ b/xml/page_catalog_choose_drink4.xml @@ -273,7 +273,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-01-0006.Name2 + $11-99-01-0006.Name 60 @@ -302,7 +302,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-01-0017.Name2 + $11-99-01-0017.Name 317 @@ -331,7 +331,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-02-0005.Name2 + $11-99-02-0005.Name 574 @@ -360,7 +360,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-02-0031.Name2 + $11-99-02-0031.Name 831 diff --git a/xml/page_catalog_choose_drink5.xml b/xml/page_catalog_choose_drink5.xml index a8c3efb5..3cb8dea7 100644 --- a/xml/page_catalog_choose_drink5.xml +++ b/xml/page_catalog_choose_drink5.xml @@ -369,7 +369,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-01-0009.Name2 + $11-99-01-0009.Name 60 @@ -398,7 +398,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-02-0016.Name2 + $11-99-02-0016.Name 317 @@ -427,7 +427,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-02-0017.Name2 + $11-99-02-0017.Name 574 @@ -456,7 +456,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-02-0020.Name2 + $11-99-02-0020.Name 831 @@ -485,7 +485,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-02-0021.Name2 + $11-99-02-0021.Name 60 @@ -514,7 +514,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-02-0023.Name2 + $11-99-02-0023.Name 317 @@ -543,7 +543,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-02-0022.Name2 + $11-99-02-0022.Name 574 @@ -572,7 +572,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-02-0011.Name2 + $11-99-02-0011.Name 831 diff --git a/xml/page_catalog_choose_drink6.xml b/xml/page_catalog_choose_drink6.xml index 1bfdff3f..09b051f1 100644 --- a/xml/page_catalog_choose_drink6.xml +++ b/xml/page_catalog_choose_drink6.xml @@ -321,7 +321,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-02-0018.Name2 + $11-99-02-0018.Name 60 @@ -350,7 +350,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-02-0018.Name2 + $11-99-02-0018.Name 317 @@ -379,7 +379,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-02-0025.Name2 + $11-99-02-0025.Name 574 @@ -408,7 +408,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-02-0032.Name2 + $11-99-02-0032.Name 831 @@ -437,7 +437,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-02-0026.Name2 + $11-99-02-0026.Name 60 @@ -466,7 +466,7 @@ "bound" KanitMediumTTF 0x322B26 - $11-99-02-0009.Name2 + $11-99-02-0009.Name 317 diff --git a/xml/page_collect_point_3.xml b/xml/page_collect_point_3.xml index 3bceec00..ed0177fe 100644 --- a/xml/page_collect_point_3.xml +++ b/xml/page_collect_point_3.xml @@ -20,8 +20,89 @@ Var CoffeePointStr = CoffeePoint SAVELOG TelephoneNumber + + If show_eng = "true" Then + Var DirImage = "ROOT/taobin_project/image/display_point_en" + Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png" + + Else + Var DirImage = "ROOT/taobin_project/image/display_point" + Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png" + EndIf + + Var stamp1 = "ROOT/taobin_project/image/display_point_en/btp_stamp_1.png" + + If CoffeePoint >= 2 Then + Var stamp2 = "ROOT/taobin_project/image/display_point_en/btp_stamp_2.png" + Else + Var stamp2 = "ROOT/taobin_project/image/display_point/btn_stamp_2.png" + EndIf + + If CoffeePoint >= 3 Then + Var stamp3 = "ROOT/taobin_project/image/display_point_en/btp_stamp_3.png" + Else + Var stamp3 = "ROOT/taobin_project/image/display_point/btn_stamp_3.png" + EndIf + + If CoffeePoint >= 4 Then + Var stamp4 = "ROOT/taobin_project/image/display_point_en/btp_stamp_4.png" + Else + Var stamp4 = "ROOT/taobin_project/image/display_point/btn_stamp_4.png" + EndIf + + If CoffeePoint >= 5 Then + Var stamp5 = "ROOT/taobin_project/image/display_point_en/btp_stamp_5.png" + Else + Var stamp5 = "ROOT/taobin_project/image/display_point/btn_stamp_5.png" + EndIf + + If CoffeePoint >= 6 Then + Var stamp6 = "ROOT/taobin_project/image/display_point_en/btp_stamp_6.png" + Else + Var stamp6 = "ROOT/taobin_project/image/display_point/btn_stamp_6.png" + EndIf + + If CoffeePoint >= 7 Then + Var stamp7 = "ROOT/taobin_project/image/display_point_en/btp_stamp_7.png" + Else + Var stamp7 = "ROOT/taobin_project/image/display_point/btn_stamp_7.png" + EndIf + + If CoffeePoint >= 8 Then + Var stamp8 = "ROOT/taobin_project/image/display_point_en/btp_stamp_8.png" + Else + Var stamp8 = "ROOT/taobin_project/image/display_point/btn_stamp_8.png" + EndIf + + If CoffeePoint >= 9 Then + Var stamp9 = "ROOT/taobin_project/image/display_point_en/btp_stamp_9.png" + Else + Var stamp9 = "ROOT/taobin_project/image/display_point/btn_stamp_9.png" + EndIf + + + If CoffeePoint >= 10 Then + Var stamp10 = "ROOT/taobin_project/image/display_point_en/btp_stamp_10.png" + Else + Var stamp10 = "ROOT/taobin_project/image/display_point/btn_stamp_10.png" + EndIf + + If CoffeePoint >= 11 Then + Var stamp11 = "ROOT/taobin_project/image/display_point_en/btp_stamp_11.png" + Else + Var stamp11 = "ROOT/taobin_project/image/display_point/btn_stamp_11.png" + EndIf + + + Var stamp_free = "ROOT/taobin_project/image/display_point/btp_stamp_free.png" + + If CoffeePoint == 11 Then + Var Timeout = 8 + EndIf + + ; for test + ;Var CoffeePoint = CoffeePoint + 1 - 1000 @@ -43,7 +124,11 @@ Var Timeout = Timeout + 1 If Timeout > 10 Then ; goto lid straw - Open "ROOT/taobin_project/xml/page_lid_straw.xml" + If CoffeePoint == 11 Then + Open "ROOT/taobin_project/xml/page_display_get_free.xml" + Else + Open "ROOT/taobin_project/xml/page_lid_straw.xml" + EndIf EndIf TimerReset @@ -83,44 +168,101 @@ - 252 - 666 - "ROOT/taobin_project/image/display_point/text1.png" + 0 + 380 + "ROOT/taobin_project/image/display_point/alpha.png" + + + +; + + 158 + 665 + Var( DirImage + "/img_popup1.png" ) + + +; + + 253 + 992 + stamp1 - 452 - 743 - "ROOT/taobin_project/image/display_point/text2.png" + 445 + 992 + stamp2 - - 323 - 825 - "ROOT/taobin_project/image/display_point/text3.png" + 637 + 992 + stamp3 +; + + 253 + 1152 + stamp4 + -; + + 445 + 1152 + stamp5 + + + 637 + 1152 + stamp6 + + +; + + 253 + 1322 + stamp7 + + + + 445 + 1322 + stamp8 + + + + 637 + 1322 + stamp9 + + +; + + 253 + 1463 + stamp10 + + + + 445 + 1463 + stamp11 + + + + 637 + 1463 + stamp_free + - - 420 - 638 - 56 - KanitBoldTTF - 0x513C2F - TelephoneNumber - Telnum - - - - - 323 - 865 - 434 - Center - 64 - KanitSemiBoldTTF - 0xDE794E - CoffeePoint - +; +; 420 +; 638 +; 56 +; KanitBoldTTF +; 0x513C2F +; TelephoneNumber +; Telnum +; +; +; +; +; 323 +; 865 +; 434 +; Center +; 64 +; KanitSemiBoldTTF +; 0xDE794E +; CoffeePoint +; ; diff --git a/xml/page_display_get_free.xml b/xml/page_display_get_free.xml new file mode 100644 index 00000000..4e5303e5 --- /dev/null +++ b/xml/page_display_get_free.xml @@ -0,0 +1,126 @@ + + "Enable" + 1080 + 1920 + "0xeae6e1" + SoundVolume + + + ; On open + Var Timeout = 0 + If show_eng = "true" Then + Var DirImage = "ROOT/taobin_project/image/display_get_free_en" + Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png" + + Else + Var DirImage = "ROOT/taobin_project/image/display_get_free" + Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png" + EndIf + + 1000 + + + Var CountDownBrewing = CountDownBrewing - 1 + + ; run test; + ;If CountDownBrewing = 40 Then + ; Open "ROOT/taobin_project/xml/page_drinkok.xml" + ;EndIf + ;If CountDownBrewing = 0 Then + ; Open "ROOT/taobin_project/xml/page_drinkok.xml" + ;EndIf + + Var ShowCountDownBrewing = CountDownBrewing + + ;Open "ROOT/taobin_project/xml/page_collect_point_3.xml" + + Var Timeout = Timeout + 1 + If Timeout > 10 Then + ; goto lid straw + Open "ROOT/taobin_project/xml/page_lid_straw.xml" + EndIf + + TimerReset + Refresh + + + + + + + + Open "/media/bt/xml/security_alarm.xml" + + + + ; + + + + + + If MachineStage = "drink-success" Then + Var MachineState_Result = 1 + EndIf + + If MachineStage = "drink-failed" Then + Var MachineState_Result = 2 + EndIf + + + + + 0 + 0 + "ROOT/taobin_project/image/ad_medium_2.png" + + + + + 0 + 380 + "ROOT/taobin_project/image/display_get_free/alpha.png" + + + + 158 + 665 + Var( DirImage + "/img_popup1.png" ) + + + + + +; + + 751 + 413 + "ROOT/taobin_project/image/page_doing/img2.png" + +; + + XPosiShowCountDownBrew + 470 + End + 153 + 88 + RobotoBold + 0x513C2F + ShowCountDownBrewing + + + + + \ No newline at end of file diff --git a/xml/page_drinkfail.xml b/xml/page_drinkfail.xml index 79798f72..a1adf932 100644 --- a/xml/page_drinkfail.xml +++ b/xml/page_drinkfail.xml @@ -11,6 +11,14 @@ Var LidState = "Enable" Var StarwState = "Enable" + If show_eng = "true" Then + Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment" + Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png" + + Else + Var DirImage = "ROOT/taobin_project/image/page_payment" + Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png" + EndIf 800 diff --git a/xml/page_drinkok.xml b/xml/page_drinkok.xml index 08865dea..a9b4839f 100644 --- a/xml/page_drinkok.xml +++ b/xml/page_drinkok.xml @@ -11,6 +11,13 @@ Var StarwState = "Enable" Var videoEnd = 0 + If show_eng = "true" Then + Var DirImage = "ROOT/taobin_project/image/complete_en/" + + Else + Var DirImage = "ROOT/taobin_project/image/complete/" + EndIf + 1000 @@ -32,9 +39,10 @@ ; Old + - 119 - 508 - "ROOT/taobin_project/image/complete/img1.png" + 0 + 547 + Var( DirImage + "/img2.png" ) + + + + + 0 + 1886 + 20 + 1080 + end + RobotoBlack + 0x513C2F + countClick2 + + diff --git a/xml/page_lid_straw.xml b/xml/page_lid_straw.xml index 9ffaf466..cfd146dc 100644 --- a/xml/page_lid_straw.xml +++ b/xml/page_lid_straw.xml @@ -11,7 +11,7 @@ Var StarwState = "Enable" Var LidStrawCountDown = 15 - + If show_eng = "true" Then Var DirImage = "ROOT/taobin_project/image/page_lid_straw_en" @@ -169,7 +169,7 @@ 751 413 - "ROOT/taobin_project/image/page_doing/img2.png" + page_doing_show_time_image ; diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index 93e2a382..75331321 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -154,9 +154,11 @@ If show_eng = "true" Then Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment" + Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png" Else Var DirImage = "ROOT/taobin_project/image/page_payment" + Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png" EndIf @@ -703,11 +705,16 @@ If countClick2 = 5 Then Var MachineStage = "make-drink" + ;MakeDrinkV1 SelectDrink SelectSugarID ;Open "ROOT/taobin_project/xml/page_show_consent.xml" - Open "ROOT/taobin_project/xml/page_thankyou.xml" + ;Open "ROOT/taobin_project/xml/page_drinkok.xml" + ;Open "ROOT/taobin_project/xml/page_thankyou.xml" - Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_back_to_error.xml" + Var CoffeePoint = 11 + Open "ROOT/taobin_project/xml/page_collect_point_3.xml" + + ;Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_back_to_error.xml" EndIf Refresh diff --git a/xml/page_thankyou.xml b/xml/page_thankyou.xml index 540906e8..23208a15 100644 --- a/xml/page_thankyou.xml +++ b/xml/page_thankyou.xml @@ -63,7 +63,7 @@ 751 413 - "ROOT/taobin_project/image/page_thankyou/img2.png" + page_doing_show_time_image ; diff --git a/xml/topview_button_back_main.xml b/xml/topview_button_back_main.xml index 818c522d..80ef81a3 100644 --- a/xml/topview_button_back_main.xml +++ b/xml/topview_button_back_main.xml @@ -3,7 +3,6 @@ 1080 1920 - TopView "show"