pakin/taobin_project
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 1 Packages Wiki Activity Actions

Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece

Browse source
This commit is contained in:
wanlop run 2024-08-28 15:19:09 +07:00
commit d8c905041f
36 changed files with 166 additions and 211 deletions
Download patch file Download diff file Expand all files Collapse all files

6
inter/aus/xml/page_catalog_group_milk.lxml
View file

@ -9305,7 +9305,7 @@
Var PD_CODE2 = "##-##-##-####"
Var PD_CODE3 = "51-03-03-0047"
; begin lang
Var aliasName[0] = "Mint MILK \nBISCOFF VOLCANO"
Var aliasName[0] = "MINT MILK \nBISCOFF VOLCANO"
Var aliasDesc[0] = "Mint Syrup, Milk,\nSugar, Biscof"
Var aliasName[1] = ""
Var aliasDesc[1] = ""
@ -9400,9 +9400,9 @@
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<LanguageGroup>
<LanguageSlot1>Mint MILK \nBISCOFF VOLCANO</LanguageSlot1>
<LanguageSlot1>MINT MILK \nBISCOFF VOLCANO</LanguageSlot1>
<LanguageSlot2></LanguageSlot2>
<LanguageSlot3>Mint MILK \nBISCOFF VOLCANO</LanguageSlot3>
<LanguageSlot3>MINT MILK \nBISCOFF VOLCANO</LanguageSlot3>
<LanguageSlot4></LanguageSlot4>
<LanguageSlot5></LanguageSlot5>
<LanguageSlot6></LanguageSlot6>

8
inter/aus/xml/page_check_member.lxml
View file

@ -536,12 +536,8 @@
Var Tel2DFlag = 0
Var Tel2D = TelephoneNumber
Trim Tel2D 1
If Tel2D = "0" Then
Var Tel2DFlag = 1
EndIf
Var verifyNumberEV = CountryRootPath + "/xml/verify_number.ev"
TRY verifyNumberEV
If Tel2DFlag = 1 Then

8
inter/aus/xml/page_collect_point_1.lxml
View file

@ -553,12 +553,8 @@
Var Tel2DFlag = 0
Var Tel2D = TelephoneNumber
Trim Tel2D 1
If Tel2D = "0" Then
Var Tel2DFlag = 1
EndIf
Var verifyNumberEV = CountryRootPath + "/xml/verify_number.ev"
TRY verifyNumberEV
If Tel2DFlag = 1 Then

130
inter/aus/xml/page_show_error.lxml
View file

@ -29,7 +29,68 @@
LED LedDoorLid Off 255 255 255 255
EndIf
Function 2
DEBUGVAR MachineStage
DEBUGVAR stop_now
Var DirImage = "ROOT/taobin_project/inter/aus/image/vending_error_en"
If MachineStage = "mcu-upgrade" Then
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
If NeedUpgrade = "true" Then
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
DEBUGVAR MachineStage
If MachineStage = "close-maintenance" Then
DEBUGVAR stop_now
If stop_now = "true" Then
Var DirImage = CountryRootPath + "image/vending_error_en"
Else
Var show_error_normal = "Enable"
Var show_error_sp1 = "Invisible"
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
EndIf
If MachineStage = "drink-failed" Then
If stop_now = "true" Then
Var DirImage = CountryRootPath + "image/vending_error_en"
Else
Var show_error_normal = "Enable"
Var show_error_sp1 = "Invisible"
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
EndIf
If NETCORE_LOST_CNT > 0 Then
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
If NETCORE_EVENT_CNT_X >= 30 Then
Var NETCORE_EVENT_CNT_X = 0
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
Var MaintenanceCard = 20
Random MaintenanceCard
Var index = 1 + MaintenanceCard
DEBUGVAR DirImage
Var RandomImage = "ROOT/taobin_project/image/close_en/Frame" + index
Var RandomImage = RandomImage + ".png"
DEBUGVAR RandomImage
DEBUGVAR Seeker
DEBUGVAR DoorCupPosition
DEBUGVAR DoorLidPosition
DEBUGVAR EmergencyStop
Var TimeOut = 0
Var textStep = 0
@ -188,76 +249,11 @@
Var ButtonLanguageListYPosition = 640
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
Function 2
Open "ROOT/taobin_project/inter/aus/xml/page_show_error.lxml"
Refresh
</EventLanguageOnChange>
<Function2>
DEBUGVAR MachineStage
DEBUGVAR stop_now
Var DirImage = "ROOT/taobin_project/inter/aus/image/vending_error_en"
If MachineStage = "mcu-upgrade" Then
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
If NeedUpgrade = "true" Then
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
DEBUGVAR MachineStage
If MachineStage = "close-maintenance" Then
DEBUGVAR stop_now
If stop_now = "true" Then
Var DirImage = CountryRootPath + "image/vending_error_en"
Else
Var show_error_normal = "Enable"
Var show_error_sp1 = "Invisible"
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
EndIf
If MachineStage = "drink-failed" Then
If stop_now = "true" Then
Var DirImage = CountryRootPath + "image/vending_error_en"
Else
Var show_error_normal = "Enable"
Var show_error_sp1 = "Invisible"
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
EndIf
If NETCORE_LOST_CNT > 0 Then
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
If NETCORE_EVENT_CNT_X >= 30 Then
Var NETCORE_EVENT_CNT_X = 0
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
Var MaintenanceCard = 20
Random MaintenanceCard
Var index = 1 + MaintenanceCard
DEBUGVAR DirImage
Var RandomImage = "ROOT/taobin_project/image/close_en/Frame" + index
Var RandomImage = RandomImage + ".png"
DEBUGVAR RandomImage
DEBUGVAR Seeker
DEBUGVAR DoorCupPosition
DEBUGVAR DoorLidPosition
DEBUGVAR EmergencyStop
</Function2>
<Image>
<State> show_error_normal </State>
<X> 69 </X>

8
inter/aus/xml/verify_number.ev Normal file
View file

@ -0,0 +1,8 @@
Var Tel2D = TelephoneNumber
Trim Tel2D 1
If Tel2D = "0" Then
Var Tel2DFlag = 1
EndIf

13
inter/hkg/xml/page_check_member.lxml
View file

@ -536,17 +536,8 @@
Var Tel2DFlag = 0
Var Tel2D = TelephoneNumber
Trim Tel2D 1
If Tel2D = "0" Then
Var Tel2DFlag = 1
Else
; inter-accept-no-zero
If CountryName = "HongKong" Then
Var Tel2DFlag = 1
EndIf
EndIf
Var verifyNumberEV = CountryRootPath + "/xml/verify_number.ev"
TRY verifyNumberEV
If Tel2DFlag = 1 Then

13
inter/hkg/xml/page_collect_point_1.lxml
View file

@ -852,17 +852,8 @@
Var Tel2DFlag = 0
Var Tel2D = TelephoneNumber
Trim Tel2D 1
If Tel2D = "0" Then
Var Tel2DFlag = 1
Else
; inter-accept-no-zero
If CountryName = "HongKong" Then
Var Tel2DFlag = 1
EndIf
EndIf
Var verifyNumberEV = CountryRootPath + "/xml/verify_number.ev"
TRY verifyNumberEV
If Tel2DFlag = 1 Then

3
inter/hkg/xml/verify_number.ev Normal file
View file

@ -0,0 +1,3 @@
; inter-accept-no-zero
Var Tel2DFlag = 1

8
inter/mys/xml/page_check_member.lxml
View file

@ -536,12 +536,8 @@
Var Tel2DFlag = 0
Var Tel2D = TelephoneNumber
Trim Tel2D 1
If Tel2D = "0" Then
Var Tel2DFlag = 1
EndIf
Var verifyNumberEV = CountryRootPath + "/xml/verify_number.ev"
TRY verifyNumberEV
If Tel2DFlag = 1 Then

7
inter/mys/xml/verify_number.ev Normal file
View file

@ -0,0 +1,7 @@
Var Tel2D = TelephoneNumber
Trim Tel2D 1
If Tel2D = "0" Then
Var Tel2DFlag = 1
EndIf

13
inter/sgp/xml/page_check_member.lxml
View file

@ -536,17 +536,8 @@
Var Tel2DFlag = 0
Var Tel2D = TelephoneNumber
Trim Tel2D 1
If Tel2D = "0" Then
Var Tel2DFlag = 1
Else
; inter-accept-no-zero
If CountryName = "Singapore" Then
Var Tel2DFlag = 1
EndIf
EndIf
Var verifyNumberEV = CountryRootPath + "/xml/verify_number.ev"
TRY verifyNumberEV
If Tel2DFlag = 1 Then

13
inter/sgp/xml/page_collect_point_1.lxml
View file

@ -911,17 +911,8 @@
Var Tel2DFlag = 0
Var Tel2D = TelephoneNumber
Trim Tel2D 1
If Tel2D = "0" Then
Var Tel2DFlag = 1
Else
; inter-accept-no-zero
If CountryName = "Singapore" Then
Var Tel2DFlag = 1
EndIf
EndIf
Var verifyNumberEV = CountryRootPath + "/xml/verify_number.ev"
TRY verifyNumberEV
If Tel2DFlag = 1 Then

3
inter/sgp/xml/verify_number.ev Normal file
View file

@ -0,0 +1,3 @@
; inter-accept-no-zero
Var Tel2DFlag = 1

8
inter/uae_dubai/xml/page_check_member.lxml
View file

@ -536,12 +536,8 @@
Var Tel2DFlag = 0
Var Tel2D = TelephoneNumber
Trim Tel2D 1
If Tel2D = "0" Then
Var Tel2DFlag = 1
EndIf
Var verifyNumberEV = CountryRootPath + "/xml/verify_number.ev"
TRY verifyNumberEV
If Tel2DFlag = 1 Then

7
inter/uae_dubai/xml/verify_number.ev Normal file
View file

@ -0,0 +1,7 @@
Var Tel2D = TelephoneNumber
Trim Tel2D 1
If Tel2D = "0" Then
Var Tel2DFlag = 1
EndIf