diff --git a/app/src/main/java/com/xjjk/healthyclients/fragment/EmergencyFragment.kt b/app/src/main/java/com/xjjk/healthyclients/fragment/EmergencyFragment.kt index 1065d63..d9f8142 100644 --- a/app/src/main/java/com/xjjk/healthyclients/fragment/EmergencyFragment.kt +++ b/app/src/main/java/com/xjjk/healthyclients/fragment/EmergencyFragment.kt @@ -19,6 +19,8 @@ import androidx.core.util.Consumer import androidx.lifecycle.Lifecycle import androidx.lifecycle.lifecycleScope import androidx.lifecycle.repeatOnLifecycle +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView import com.amap.api.location.AMapLocation import com.amap.api.location.AMapLocationClient import com.amap.api.location.AMapLocationClientOption @@ -35,6 +37,8 @@ import com.amap.api.maps.model.Marker import com.amap.api.maps.model.MarkerOptions import com.amap.api.maps.model.MyLocationStyle import com.permissionx.guolindev.PermissionX +import com.tencent.qcloud.tuicore.util.SPUtils +import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants.CHAT_IS_LIAISON_USER import com.tencent.qcloud.tuikit.tuichat.bean.EmployeeBean import com.tencent.qcloud.tuikit.tuichat.bean.ExpertBean import com.tencent.qcloud.tuikit.tuichat.bean.GroupMemberBean @@ -57,11 +61,6 @@ import com.xjjk.healthyclients.utils.IMInputActionSettingUtils import com.xjjk.healthyclients.utils.MapUtils import com.xjjk.healthyclients.utils.SystemFuntion.goNavigation import com.xjjk.healthyclients.utils.TUIUtils -import androidx.recyclerview.widget.LinearLayoutManager -import androidx.recyclerview.widget.RecyclerView -import com.tencent.qcloud.tuicore.util.SPUtils -import com.tencent.qcloud.tuicore.util.ToastUtil -import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants.CHAT_IS_LIAISON_USER import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.async import kotlinx.coroutines.flow.collectLatest @@ -418,7 +417,7 @@ class EmergencyFragment : R.id.fragment_emergency_paramedic -> { mViewModel.getParticipatedOrders { result -> if (result.records.isNullOrEmpty()) { - ToastUtil.toastLongMessage("暂无参与的应急就医工单") + showToast("暂无参与的应急就医工单") } else if(result.records.size == 1){ mViewModel.getActualGroupMemberList(result.records[0].sessionId, successCall = {groupMemberBeans-> IMInputActionSettingUtils.createEmergencySetting() diff --git a/app/src/main/java/com/xjjk/healthyclients/ui/activity/WebActivity.kt b/app/src/main/java/com/xjjk/healthyclients/ui/activity/WebActivity.kt index 3bbc1fb..c6192e0 100644 --- a/app/src/main/java/com/xjjk/healthyclients/ui/activity/WebActivity.kt +++ b/app/src/main/java/com/xjjk/healthyclients/ui/activity/WebActivity.kt @@ -65,6 +65,7 @@ class WebActivity : BaseVMBActivity(R.layout.a .ready() .go(getUrl()) mAgentWeb.agentWebSettings.webSettings.javaScriptEnabled = true + mAgentWeb.agentWebSettings.webSettings.cacheMode = WebSettings.LOAD_NO_CACHE mAgentWeb.jsInterfaceHolder.addJavaObject("android", androidInterface) } @@ -109,11 +110,13 @@ class WebActivity : BaseVMBActivity(R.layout.a override fun onBackEvent() { if (!mAgentWeb.back()) { if (jsAffirmBack.isNullOrEmpty()) { + mAgentWeb.webCreator.webView?.stopLoading() super.onBackEvent() } else { mAgentWeb.jsAccessEntrace.quickCallJs("interceptBack", { value -> if ("1" != value) { + mAgentWeb.webCreator.webView?.stopLoading() finish() } }) @@ -272,14 +275,10 @@ class WebActivity : BaseVMBActivity(R.layout.a } } } - var isRefresh = false override fun onResume() { mAgentWeb.webLifeCycle.onResume() - if (getUrl().contains("motionClock")&&isRefresh) {//动打卡链接,同步微信步数再次刷新界面 - mAgentWeb.urlLoader.reload() - } super.onResume() } @@ -292,7 +291,6 @@ class WebActivity : BaseVMBActivity(R.layout.a override fun onPause() { mAgentWeb.webLifeCycle.onPause() - isRefresh = true super.onPause() }