Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into wso
This commit is contained in:
commit
a7fb727db5
384 changed files with 8780 additions and 7552 deletions
|
|
@ -98,6 +98,8 @@
|
|||
Var OpunThinTTF = "ROOT/taobin_project/font/Opun/Opun-Thin.ttf"
|
||||
Var OpunBoldTTF = "ROOT/taobin_project/font/Opun/Opun-Bold.ttf"
|
||||
|
||||
Var NotoSansThaiBold = "ROOT/taobin_project/font/Noto_Sans_Thai/NotoSansThai-Bold.ttf"
|
||||
|
||||
Var KanitSemiBoldTTF = "ROOT/taobin_project/font/Kanit/Kanit-Medium.ttf"
|
||||
|
||||
Var BlinkStar = "ROOT/taobin_project/image/animation/blink_star.gif"
|
||||
|
|
@ -667,6 +669,7 @@
|
|||
Var UsePepsiTheme = 0
|
||||
|
||||
Var NoTrickPriceProfile = 0
|
||||
Var NeedRefreshProfile = 0
|
||||
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
|
||||
|
||||
|
|
@ -1631,7 +1634,7 @@ PRICE "Reset" "-"
|
|||
</EventUnitTest7>
|
||||
|
||||
<EventUnitTest8>
|
||||
Var XMLProfile = "Discount50"
|
||||
Var XMLProfile = "General"
|
||||
Var TimeProfilePrice = 0
|
||||
|
||||
</EventUnitTest8>
|
||||
|
|
@ -2327,5 +2330,46 @@ PRICE "Reset" "-"
|
|||
<Value> ShowNetworkProblemText </Value>
|
||||
</Text>
|
||||
|
||||
<Button>
|
||||
<X> 0 </X>
|
||||
<Y> 1870 </Y>
|
||||
<State> eval(
|
||||
If LangProcess = "LoadConfig" Then
|
||||
Var return = "Enable"
|
||||
Else
|
||||
Var return = "Invisible"
|
||||
EndIf
|
||||
) </State>
|
||||
<Color> "0xFFFF00" </Color>
|
||||
<Width> 1080 </Width>
|
||||
<Height> 60 </Height>
|
||||
<EventClick>
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
<Text>
|
||||
<State> eval(
|
||||
If LangProcess = "LoadConfig" Then
|
||||
Var return = "Enable"
|
||||
Else
|
||||
Var return = "Invisible"
|
||||
EndIf
|
||||
) </State>
|
||||
<X> 5 </X>
|
||||
<Y> 1880 </Y>
|
||||
<Size> 24 </Size>
|
||||
<Align> Center </Align>
|
||||
<Width> 1080 </Width>
|
||||
<Font> RobotoRegular </Font>
|
||||
<Color> 0x000000 </Color>
|
||||
<Value> eval(
|
||||
If LangProcess = "LoadConfig" Then
|
||||
Var return = "Loading ..."
|
||||
Else
|
||||
Var return = ""
|
||||
EndIf
|
||||
) </Value>
|
||||
</Text>
|
||||
|
||||
|
||||
</Page>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue