Commit 518ef4a0 authored by liusheng's avatar liusheng

Merge branch '11a-dev' into cc-dev

parents 525af62e 626ea440
...@@ -86,20 +86,19 @@ class CommonWebViewFragment : XPageFragment() { ...@@ -86,20 +86,19 @@ class CommonWebViewFragment : XPageFragment() {
} }
override fun onResume() { override fun onResume() {
Log.e("====onResume","====")
agentWeb?.getWebLifeCycle()?.onResume() agentWeb?.getWebLifeCycle()?.onResume()
super.onResume() super.onResume()
refreshLogin() refreshLogin()
agentWeb?.jsAccessEntrace
?.quickCallJs("onResume")
} }
private fun refreshLogin() { private fun refreshLogin() {
LoginUtils.token?.let { LoginUtils.token?.let {
Log.e("refreshLogin","===token:"+LoginUtils.token)
agentWeb?.getJsAccessEntrace() agentWeb?.getJsAccessEntrace()
?.quickCallJs("userToken", it) ?.quickCallJs("userToken", it)
} ?: let { } ?: let {
Log.e("clearToken","===token")
agentWeb?.getJsAccessEntrace() agentWeb?.getJsAccessEntrace()
?.quickCallJs("clearToken") ?.quickCallJs("clearToken")
} }
......
...@@ -12,7 +12,7 @@ object HttpConfig { ...@@ -12,7 +12,7 @@ object HttpConfig {
* 主页h5 * 主页h5
*/ */
val UI_MAIN_URL = "https://test-cc-tt-front.orangenet.org.cn/#" //测试 val UI_MAIN_URL = "https://test-cc-tt-front.orangenet.org.cn/#" //测试
//val UI_MAIN_URL = "http://10.3.0.217:8080/#" //val UI_MAIN_URL = "http://10.3.64.200:8080/#"
//val UI_MAIN_URL = "https://cc-tt-front.srccwl.com/#" //生产 //val UI_MAIN_URL = "https://cc-tt-front.srccwl.com/#" //生产
//隐私协议地址 //隐私协议地址
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment