|
|
@@ -83,8 +83,7 @@ abstract class BaseFragmentActivity<DB : ViewDataBinding> : FragmentActivity(),
|
|
|
ActivityManagers.instance.addActivity(this)
|
|
|
initSmartRefresh()
|
|
|
val params: ViewGroup.LayoutParams = LinearLayout.LayoutParams(
|
|
|
- LinearLayout.LayoutParams.MATCH_PARENT,
|
|
|
- LinearLayout.LayoutParams.MATCH_PARENT, 1.0f
|
|
|
+ LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT, 1.0f
|
|
|
)
|
|
|
binding.root.layoutParams = params
|
|
|
bindingBase.llytContent.addView(binding.root)
|
|
|
@@ -277,8 +276,7 @@ abstract class BaseFragmentActivity<DB : ViewDataBinding> : FragmentActivity(),
|
|
|
fun showFragment(viewId: Int, f: Fragment) {
|
|
|
try {
|
|
|
val ft = supportFragmentManager.beginTransaction()
|
|
|
- if (showFragment != null)
|
|
|
- ft.hide(showFragment!!)
|
|
|
+ if (showFragment != null) ft.hide(showFragment!!)
|
|
|
if (f.isAdded) {
|
|
|
ft.show(f)
|
|
|
} else {
|
|
|
@@ -313,7 +311,8 @@ abstract class BaseFragmentActivity<DB : ViewDataBinding> : FragmentActivity(),
|
|
|
taskFragment.onDialogClickListener = {
|
|
|
if (TextUtils.isEmpty(bean.ext).not()) {
|
|
|
if (TextUtils.equals("C", bean.businessID)) {
|
|
|
- val url = AccountConfig.TRAINREPORT_URL + bean.ext
|
|
|
+ val url =
|
|
|
+ AccountConfig.TRAINREPORT_URL + "?userId=" + User.getUserId() + "&time=" + bean.ext + "&userToken=" + User.getToken()
|
|
|
JumpUtil.jumpActivityWithUrl(
|
|
|
RouterUrlCommon.WEB_VIEW_INTERACTION_JS, url, mContext
|
|
|
)
|