From 6c69c38b320e5314d979bd564889d1dae8b61f19 Mon Sep 17 00:00:00 2001 From: MrZ_26 <1046101471@qq.com> Date: Tue, 22 Mar 2022 02:39:26 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E7=95=8C=E9=9D=A2=E5=8F=AF?= =?UTF-8?q?=E9=80=89=E9=9A=90=E8=97=8F=E9=82=AE=E7=AE=B1=20close=20#639?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- parts/language/lang_en.lua | 1 + parts/language/lang_es.lua | 1 + parts/language/lang_fr.lua | 1 + parts/language/lang_id.lua | 1 + parts/language/lang_ja.lua | 1 + parts/language/lang_pt.lua | 1 + parts/language/lang_symbol.lua | 3 ++- parts/language/lang_zh.lua | 1 + parts/language/lang_zh_grass.lua | 1 + parts/language/lang_zh_trad.lua | 1 + parts/scenes/login.lua | 14 +++++++++----- 11 files changed, 20 insertions(+), 6 deletions(-) diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index c2e1ddc2..bb2a2149 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -687,6 +687,7 @@ return{ register="Sign Up", email="Email Address", password="Password", + showEmail="Show Email", keepPW="Remember me", login="Log In", }, diff --git a/parts/language/lang_es.lua b/parts/language/lang_es.lua index 4f394ade..0be36cca 100644 --- a/parts/language/lang_es.lua +++ b/parts/language/lang_es.lua @@ -550,6 +550,7 @@ return{ register="Registrarse", email="Correo Elec.", password="Contraseña", + -- showEmail="Show Email", keepPW="Recordar credenciales", login="Entrar", }, diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index 2c4e3f11..fa3cf503 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -641,6 +641,7 @@ return{ register="Enregistrement", email="E-mail", password="Mot de passe", + -- showEmail="Show Email", -- keepPW="Remember me", login="Connexion", }, diff --git a/parts/language/lang_id.lua b/parts/language/lang_id.lua index c9986d90..fa3c4188 100644 --- a/parts/language/lang_id.lua +++ b/parts/language/lang_id.lua @@ -689,6 +689,7 @@ return{ register="Daftar", email="Alamat Email", password="Password", + -- showEmail="Show Email", keepPW="Ingat Saya", login="Masuk", }, diff --git a/parts/language/lang_ja.lua b/parts/language/lang_ja.lua index 87fbac7a..de9ec9c4 100644 --- a/parts/language/lang_ja.lua +++ b/parts/language/lang_ja.lua @@ -689,6 +689,7 @@ return{ register="サインアップ", email="Eメールアドレス", password="パスワード", + -- showEmail="Show Email", keepPW="常にログイン", login="ログイン", }, diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index 70c6b73a..4d2341b4 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -677,6 +677,7 @@ return{ register="Registrar", email="Endereço De Email", password="Senha", + -- showEmail="Show Email", -- keepPW="Remember me", login="Log in", }, diff --git a/parts/language/lang_symbol.lua b/parts/language/lang_symbol.lua index 5f55c4a8..bfc2325e 100644 --- a/parts/language/lang_symbol.lua +++ b/parts/language/lang_symbol.lua @@ -488,7 +488,8 @@ return{ register="Sign up", email="@", password="*", - -- keepPW="I", + showEmail="?", + keepPW="!", login="Log in", }, register={ diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index 25574d94..334b8e80 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -687,6 +687,7 @@ return{ register="注册", email="邮箱", password="密码", + showEmail="显示邮箱", keepPW="保存密码", login="登录", }, diff --git a/parts/language/lang_zh_grass.lua b/parts/language/lang_zh_grass.lua index 64364185..c13c9d81 100644 --- a/parts/language/lang_zh_grass.lua +++ b/parts/language/lang_zh_grass.lua @@ -685,6 +685,7 @@ return{ register="登记", email="电子邮件地址", password="密码", + showEmail="显示电子邮件", keepPW="记得我吗", login="登录", }, diff --git a/parts/language/lang_zh_trad.lua b/parts/language/lang_zh_trad.lua index 804d3a59..cd847655 100644 --- a/parts/language/lang_zh_trad.lua +++ b/parts/language/lang_zh_trad.lua @@ -687,6 +687,7 @@ return{ register="註冊", email="電郵", password="密碼", + showEmail="顯示郵箱", keepPW="保存密碼", login="登錄", }, diff --git a/parts/scenes/login.lua b/parts/scenes/login.lua index cad2c514..18692cd5 100644 --- a/parts/scenes/login.lua +++ b/parts/scenes/login.lua @@ -2,6 +2,7 @@ local emailBox=WIDGET.newInputBox{name='email',x=380,y=200,w=500,h=60,limit=128} local passwordBox=WIDGET.newInputBox{name='password',x=380,y=300,w=620,h=60,secret=true,regex="[ -~]",limit=64} local savePW=false +local showEmail=true local function _login() local email,password=emailBox:getText(),passwordBox:getText() @@ -25,19 +26,22 @@ function scene.sceneInit() local data=loadFile('conf/account','-canSkip') if data then savePW=true + showEmail=false + emailBox.secret=true emailBox:setText(data[1]) passwordBox:setText(data[2]) end end scene.widgetList={ - WIDGET.newText{name='title', x=80, y=50,font=70,align='L'}, - WIDGET.newButton{name='register',x=1140,y=100,w=170,h=80,color='lY',code=function()SCN.swapTo('register','swipeR')end}, + WIDGET.newText{name='title', x=80, y=50,font=70,align='L'}, + WIDGET.newButton{name='register', x=1140,y=100,w=170,h=80,color='lY',code=function()SCN.swapTo('register','swipeR')end}, emailBox, passwordBox, - WIDGET.newSwitch{name='keepPW', x=900, y=420,disp=function()return savePW end,code=function()savePW=not savePW end}, - WIDGET.newKey{name='login', x=1140,y=540,w=170,h=80,font=40,code=_login}, - WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,sound='back',font=60,fText=CHAR.icon.back,code=backScene}, + WIDGET.newSwitch{name='showEmail',x=550, y=420,disp=function()return showEmail end,code=function()showEmail=not showEmail emailBox.secret=not showEmail end}, + WIDGET.newSwitch{name='keepPW', x=900, y=420,disp=function()return savePW end,code=function()savePW=not savePW end}, + WIDGET.newKey{name='login', x=1140,y=540,w=170,h=80,font=40,code=_login}, + WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,sound='back',font=60,fText=CHAR.icon.back,code=backScene}, } return scene