fix: 修复wifi设置页返回逻辑与多语言标点问题
1. 修正多语言文案中的逗号格式问题 2. 新增wifi页面来源参数,根据来源正确处理返回栈
This commit is contained in:
parent
9d0287733e
commit
400fdf60a5
@ -1511,7 +1511,7 @@
|
||||
},
|
||||
{
|
||||
"key": "100303",
|
||||
"zh": "获取到{0}条消杀数据,正在上传,请稍后",
|
||||
"zh": "获取到{0}条消杀数据,正在上传,请稍后",
|
||||
"en": "Uploading {0} elimination records,please wait..."
|
||||
}
|
||||
|
||||
|
||||
@ -19,6 +19,7 @@ namespace Kill.UI.Pages
|
||||
int comefrom=0;
|
||||
public void Init(Action<string> wifiInfoCallback,int comefrom=0)
|
||||
{
|
||||
this.comefrom=comefrom;
|
||||
callback = wifiInfoCallback;
|
||||
UIManager.Instance.RegisterBackAction(Back);
|
||||
backButton.onClick.RemoveAllListeners();
|
||||
@ -38,6 +39,8 @@ namespace Kill.UI.Pages
|
||||
{
|
||||
if(comefrom==0)
|
||||
UIManager.Instance.RegisterBackAction(GetComponentInParent<DeviceInfoPage>().Back);
|
||||
else
|
||||
UIManager.Instance.ClearBackAction();
|
||||
Destroy(gameObject);
|
||||
}
|
||||
|
||||
|
||||
@ -1791,7 +1791,7 @@ namespace Kill.UI.Pages
|
||||
}
|
||||
SetWifiPage wifiPage=Instantiate(setWifiPage, transform);
|
||||
wifiPage.gameObject.SetActive(true);
|
||||
wifiPage.Init(null);
|
||||
wifiPage.Init(null,1);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user