NEWUI: add vending info v2, WIP tasks selector
This commit is contained in:
Pakin
parent
466c3a711a
commit
673dc1603a
26 changed files with 1029 additions and 50 deletions
|
|
@ -46,11 +46,11 @@
|
|||
Var info_text_13Y = info_13Y + 18
|
||||
|
||||
Var info_text_14Y = info_14Y + 18
|
||||
|
||||
|
||||
|
||||
Var info2_startX = 550
|
||||
Var info2_text_startX = info2_startX + 22
|
||||
|
||||
|
||||
Var temphot = "น้ำร้อน องศา "
|
||||
Var temphot = temphot + BrewTemp
|
||||
Var temphot = temphot + " C"
|
||||
|
|
@ -64,16 +64,16 @@
|
|||
Else
|
||||
Var tempice = tempice + " เต็มถัง "
|
||||
EndIf
|
||||
|
||||
Var configfile = "CFG = " + ConfigNumer
|
||||
|
||||
Var configfile = "CFG = " + ConfigNumer
|
||||
|
||||
|
||||
Var ice_version_text = " ICE version " + IceVersion
|
||||
Var brew_version_text = "Server status " + NetworkStatus
|
||||
|
||||
Var show_version = brew_version_text
|
||||
Var show_version = brew_version_text
|
||||
|
||||
Var show_boxid = "[ " + BoxID
|
||||
Var show_boxid = "[ " + BoxID
|
||||
Var show_boxid = show_boxid + " ]"
|
||||
|
||||
Var ShowVersionAll = BrewMachineFirmwareVersion + " | "
|
||||
|
|
@ -86,7 +86,7 @@
|
|||
Var Timeout = 0
|
||||
Var IDFullNameEng = "เสียบบัตร แล้วกดอ่าน "
|
||||
|
||||
Var Text1_6 = "Door/Lid/Straw : " + Service_LidStraw
|
||||
Var Text1_6 = "Door/Lid/Straw : " + Service_LidStraw
|
||||
Var Text2_6 = "ฝา : " + Lid1Status
|
||||
|
||||
var Text1_7 = "CellSite :" + CellSite
|
||||
|
|
@ -95,10 +95,10 @@
|
|||
var Text2_7 = Text2_7 + SignalStrengthLevel
|
||||
var Text2_7 = Text2_7 + "]"
|
||||
|
||||
|
||||
|
||||
Cart "DeleteMenuID" "ALL"
|
||||
|
||||
|
||||
|
||||
Var Text1_8 = "IP " + MobileIPNetwork
|
||||
|
||||
|
||||
|
|
@ -136,7 +136,7 @@
|
|||
Var AndroidBoardTempMax = AndroidBoardTemp15
|
||||
Else
|
||||
Var AndroidBoardTempMax = AndroidBoardTemp16
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
Var Text2_9 = "CPUH: "
|
||||
Var Text2_9 = Text2_9 + AndroidBoardTempMax
|
||||
|
|
@ -150,21 +150,21 @@
|
|||
|
||||
DEBUGVAR AndroidTouchScreenHeartBeat
|
||||
|
||||
|
||||
|
||||
Var CanResetTouch = 0
|
||||
Var CountDownReset = 0
|
||||
Var strTouchScreen = " Reset Touch : disable."
|
||||
|
||||
|
||||
|
||||
Var MainMenuBlockCount = 2
|
||||
</EventOpen>
|
||||
<Timeout> 1000 </Timeout>
|
||||
<EventTimeout>
|
||||
<EventTimeout>
|
||||
|
||||
|
||||
Var Timeout = Timeout + 1
|
||||
If Timeout > 15 Then
|
||||
Open "ROOT/taobin_project/xml/page_board.xml"
|
||||
Open "ROOT/taobin_project/xml/page_board.xml"
|
||||
EndIf
|
||||
|
||||
If GoToCamera = 1 Then
|
||||
|
|
@ -177,10 +177,10 @@
|
|||
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
|
||||
EndIf
|
||||
|
||||
If GoToCamera > 0 Then
|
||||
If GoToCamera > 0 Then
|
||||
Var GoToCamera = GoToCamera - 1
|
||||
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
DEBUGVAR AdvertiseProfile
|
||||
|
||||
|
|
@ -203,11 +203,11 @@
|
|||
Var CountDownCheckCamera = 5
|
||||
If Not#CameraSettingStatus = "" Then
|
||||
If CameraCount = 1 Then
|
||||
|
||||
|
||||
CameraSetting "usbfront" "default" "Rotate=90,Resolution=1280x720,scaleX=1.0,scaleY=0.65"
|
||||
EndIf
|
||||
EndIf
|
||||
Else
|
||||
Else
|
||||
Var CountDownCheckCamera = CountDownCheckCamera - 1
|
||||
EndIf
|
||||
|
||||
|
|
@ -232,7 +232,7 @@
|
|||
Var AndroidBoardTempMax = AndroidBoardTemp15
|
||||
Else
|
||||
Var AndroidBoardTempMax = AndroidBoardTemp16
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
Var Text2_9 = "CPUH: "
|
||||
Var Text2_9 = Text2_9 + AndroidBoardTempMax
|
||||
|
|
@ -256,12 +256,12 @@
|
|||
Var strTouchScreen = " Reset Touch : " + CountDownReset
|
||||
Var CanResetTouch = 1
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
Refresh
|
||||
TimerReset
|
||||
|
||||
</EventTimeout>
|
||||
|
||||
</EventTimeout>
|
||||
|
||||
|
||||
<Image>
|
||||
|
|
@ -331,34 +331,34 @@
|
|||
DEBUGVAR str_sim_on
|
||||
If str_sim_on = "1" Then
|
||||
;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
|
||||
|
||||
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.xml"
|
||||
|
||||
|
||||
|
||||
TopView "show"
|
||||
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
|
||||
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
READ_FILE "/mnt/sdcard/coffeevending/.test_menu" str_test_menu
|
||||
DEBUGVAR str_test_menu
|
||||
If str_test_menu = "1" Then
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
|
||||
|
||||
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.xml"
|
||||
|
||||
|
||||
|
||||
TopView "show"
|
||||
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
|
||||
|
||||
EndIf
|
||||
|
||||
|
||||
If CountTouchButton = 7 Then
|
||||
;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
|
||||
|
||||
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.xml"
|
||||
|
||||
|
||||
|
||||
TopView "show"
|
||||
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
|
||||
|
|
@ -410,7 +410,7 @@
|
|||
|
||||
;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
|
||||
;OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_camera.xml"
|
||||
|
||||
|
||||
;TopView "show"
|
||||
;Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
|
||||
</EventClick>
|
||||
|
|
@ -594,11 +594,11 @@
|
|||
<X> info1_startX </X>
|
||||
<Y> info_8Y </Y>
|
||||
<Filename> "ROOT/taobin_project/image/tab_1.png" </Filename>
|
||||
<EventClick>
|
||||
<EventClick>
|
||||
CameraService "filter-remove-all"
|
||||
CameraService "add-filter=mClass=9,mSubclass=4"
|
||||
CameraService "add-filter=USB Camera"
|
||||
|
||||
|
||||
CameraService "Start"
|
||||
</EventClick>
|
||||
</Image>
|
||||
|
|
@ -608,11 +608,11 @@
|
|||
<X> info2_startX </X>
|
||||
<Y> info_8Y </Y>
|
||||
<Filename> "ROOT/taobin_project/image/tab_1.png" </Filename>
|
||||
<EventClick>
|
||||
<EventClick>
|
||||
|
||||
|
||||
If CameraCount = 1 Then
|
||||
|
||||
|
||||
CameraSetting "usbfront" "default" "Rotate=90,Resolution=1280x720,scaleX=1.0,scaleY=1.0"
|
||||
EndIf
|
||||
|
||||
|
|
@ -645,7 +645,7 @@
|
|||
<X> info1_startX </X>
|
||||
<Y> info_9Y </Y>
|
||||
<Filename> "ROOT/taobin_project/image/tab_1.png" </Filename>
|
||||
<EventClick>
|
||||
<EventClick>
|
||||
</EventClick>
|
||||
</Image>
|
||||
|
||||
|
|
@ -654,7 +654,7 @@
|
|||
<X> info2_startX </X>
|
||||
<Y> info_9Y </Y>
|
||||
<Filename> "ROOT/taobin_project/image/tab_1.png" </Filename>
|
||||
<EventClick>
|
||||
<EventClick>
|
||||
</EventClick>
|
||||
</Image>
|
||||
|
||||
|
|
@ -682,7 +682,7 @@
|
|||
<X> info1_startX </X>
|
||||
<Y> info_10Y </Y>
|
||||
<Filename> "ROOT/taobin_project/image/tab_1.png" </Filename>
|
||||
<EventClick>
|
||||
<EventClick>
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
|
||||
|
||||
OpenInst 2 "ROOT/taobin_project/xml/page_identity_verification.xml"
|
||||
|
|
@ -705,8 +705,8 @@
|
|||
<X> info2_startX </X>
|
||||
<Y> info_10Y </Y>
|
||||
<Filename> "ROOT/taobin_project/image/tab_1.png" </Filename>
|
||||
<EventClick>
|
||||
|
||||
<EventClick>
|
||||
|
||||
|
||||
;Open "ROOT/taobin_project/xml/test_qr.xml"
|
||||
</EventClick>
|
||||
|
|
@ -718,7 +718,7 @@
|
|||
<X> info2_startX </X>
|
||||
<Y> info_11Y </Y>
|
||||
<Filename> "ROOT/taobin_project/image/tab_1.png" </Filename>
|
||||
<EventClick>
|
||||
<EventClick>
|
||||
; reset
|
||||
If CountTouchButton > 4 Then
|
||||
Var CountTouchButton = 0
|
||||
|
|
@ -735,7 +735,7 @@
|
|||
|
||||
Var ACCString !assigned SprintFmt("ACC: "%s"\r\n", TelephoneNumber)
|
||||
DEBUGVAR ACCString
|
||||
|
||||
|
||||
If show_eng = "true" Then
|
||||
Var LangString = "LANG: "EN"\r\n"
|
||||
Else
|
||||
|
|
@ -762,7 +762,7 @@
|
|||
Var GameInstalled = "-"
|
||||
CheckApp "com.NDF.taobin" GameInstalled
|
||||
DEBUGVAR GameInstalled
|
||||
|
||||
|
||||
If GameInstalled = "true" Then
|
||||
RunApp "com.NDF.taobin"
|
||||
EndIf
|
||||
|
|
@ -788,7 +788,7 @@
|
|||
<X> info1_startX </X>
|
||||
<Y> info_11Y </Y>
|
||||
<Filename> "ROOT/taobin_project/image/tab_1.png" </Filename>
|
||||
<EventClick>
|
||||
<EventClick>
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
|
||||
|
||||
OpenInst 2 "ROOT/taobin_project/xml/sometime/top_spender.xml"
|
||||
|
|
@ -813,7 +813,7 @@
|
|||
<X> info1_startX </X>
|
||||
<Y> info_12Y </Y>
|
||||
<Filename> "ROOT/taobin_project/image/tab_1.png" </Filename>
|
||||
<EventClick>
|
||||
<EventClick>
|
||||
If CanResetTouch = 1 Then
|
||||
|
||||
ResetTouch
|
||||
|
|
@ -844,8 +844,8 @@
|
|||
Var return = "Invisible"
|
||||
EndIf
|
||||
) </State>
|
||||
<EventClick>
|
||||
|
||||
<EventClick>
|
||||
|
||||
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_enable_credit_card.xml"
|
||||
|
||||
</EventClick>
|
||||
|
|
@ -866,7 +866,41 @@
|
|||
) </State>
|
||||
<Value> "Enable CreditCard" </Value>
|
||||
</Text>
|
||||
|
||||
|
||||
;EnableNewBrewUI
|
||||
<Image>
|
||||
<X> info2_startX </X>
|
||||
<Y> info_13Y </Y>
|
||||
<Filename> "ROOT/taobin_project/image/tab_1.png" </Filename>
|
||||
<State> eval(
|
||||
If EnableNewBrewUI = "true" Then
|
||||
Var return = "Enable"
|
||||
Else
|
||||
Var return = "Invisible"
|
||||
EndIf
|
||||
) </State>
|
||||
<EventClick>
|
||||
|
||||
Open "/mnt/sdcard/coffeevending/taobin_project/xml/vending_info2.xml"
|
||||
|
||||
</EventClick>
|
||||
</Image>
|
||||
|
||||
<Text>
|
||||
<X> info2_text_startX </X>
|
||||
<Y> info_text_13Y </Y>
|
||||
<Size> 30 </Size>
|
||||
<Font> fontType1 </Font>
|
||||
<Color> 0x000000 </Color>
|
||||
<State> eval(
|
||||
If EnableNewBrewUI = "true" Then
|
||||
Var return = "Enable"
|
||||
Else
|
||||
Var return = "Invisible"
|
||||
EndIf
|
||||
) </State>
|
||||
<Value> "New ui V2" </Value>
|
||||
</Text>
|
||||
|
||||
;<QRCode>
|
||||
;<X> 930 </X>
|
||||
|
|
@ -888,8 +922,8 @@
|
|||
<FilenamePress> "ROOT/taobin_project/image/bp_cancel.png" </FilenamePress>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
Open "ROOT/taobin_project/xml/page_board.xml"
|
||||
<EventClick>
|
||||
Open "ROOT/taobin_project/xml/page_board.xml"
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue