Merge branch 'master' of forthrd.ddns.net:/1TBHDD/ikong/taobin_project

This commit is contained in:
miggaze 2021-11-12 10:41:00 +07:00
commit 01d01908c8
6 changed files with 498 additions and 512 deletions

View file

@ -627,7 +627,8 @@
Var countClick = 0
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_free.xml"
;OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_collect_point_1.xml"
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_tel_number_mask.xml"
TopView "show"
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"

File diff suppressed because it is too large Load diff

View file

@ -72,9 +72,19 @@
Var Timeout = Timeout + 1
If Timeout > 20 Then
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
If Timeout = 18 Then
Var date_time_str = ""
STRDATETIME date_time_str
Var date_time_str = "/mnt/sdcard/scn_" + date_time_str
Var date_time_str = date_time_str + ".png"
DEBUGVAR date_time_str
SCREEN_CAP date_time_str
EndIf
TimerReset
Refresh
</EventTimeout>

View file

@ -149,36 +149,12 @@
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var Timeout = 0
StrLen TelephoneNumber TelNumLen
If TelNumLen < 10 Then
Var TelephoneNumber = TelephoneNumber + "8"
Var ShowTextNumber = "Invisible"
Trim TelephoneNumber 10
TimerReset
Refresh
StrLen TelephoneNumber TelNumLen
If TelNumLen >= 10 Then
Var Tel_Confirm_State = "Enable"
EndIf
Var ShowErrorText = "Invisible"
If TelNumLen = 7 Then
Var number7 = "8"
EndIf
If TelNumLen = 8 Then
Var number8 = "8"
EndIf
If TelNumLen = 9 Then
Var number9 = "8"
EndIf
If TelNumLen = 10 Then
Var number10 = "8"
EndIf
EndIf
Var date_time_str = ""
STRDATETIME date_time_str
Var date_time_str = "/mnt/sdcard/scn_" + date_time_str
Var date_time_str = date_time_str + ".png"
DEBUGVAR date_time_str
SCREEN_CAP date_time_str
</EventClick>
</Button>

View file

@ -299,17 +299,20 @@
DEBUGVAR toppingID3price2
DEBUGVAR BrewParam
Var SugarState1 = "Enable"
Var SugarState2 = "Enable"
Var SugarState3 = "Enable"
Var SugarState4 = "Enable"
Var SugarState5 = "Enable"
If BugFlag = 1 Then
Else
Var SugarState1 = "Enable"
Var SugarState2 = "Enable"
Var SugarState3 = "Enable"
Var SugarState4 = "Enable"
Var SugarState5 = "Enable"
STRCONTAIN "9701" BrewParam IgnoreLidStraw
DEBUGVAR BrewParam
@ -864,6 +867,8 @@
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
DEBUGVAR SugarState1
If ShiftSugarStep = 1 Then
Var SugarState1 = "PressForever"
@ -1321,7 +1326,11 @@
Else
Var LidState = "Press"
EndIf
DEBUGVAR SugarState1
Refresh
</EventClick>
</Button>
@ -1597,8 +1606,8 @@
SAVELOG PriceDrinkTmp
Var Timeout = 0
Refresh
</Function1>

View file

@ -95,7 +95,7 @@
Var RandomPromotionMyworld = 0
Var RandomSalePackage = 0
Var XMLPageVersion = "5.71"
Var XMLPageVersion = "5.73"
</EventOpen>