Merge branch 'fix_webview' into 6.5.3

This commit is contained in:
2023-06-25 15:50:04 +08:00
7 changed files with 420 additions and 4 deletions

View File

@@ -110,10 +110,10 @@ public class WebViewActivity extends AbsActivity {
}
//真实屏幕高度-(ft_title的高度+导航栏高度)
//屏蔽掉是因为在线客服页面 AndroidBug5497Workaround会失效
/* int height = DeviceUtils.getScreenRealHeight(mContext) - DpUtil.dp2px(72) - getCurrentNavigationBarHeight(mContext);
int height = DeviceUtils.getScreenRealHeight(mContext) - DpUtil.dp2px(72) - getCurrentNavigationBarHeight(mContext);
if (!navigationGestureEnabled(mContext)) {
view.loadUrl("javascript:window.androidObject.setHeight(" + height + ",0,false)");
}*/
}
}
});

View File

@@ -38,6 +38,7 @@ public class RouteUtil {
public static final String PATH_FANSACTIVITY = "/main/FansActivity";
public static final String PATH_MYWEBVIEWACTIVTITY2 = "/main/MyWebViewActivity2";
public static final String PATH_LOGIN = "/main/LoginActivity";
public static final String PATH_CS = "/main/CustomerServiceWebViewActivity";
public static void forwardFansActivity(String uid) {
ARouter.getInstance().build(PATH_FANSACTIVITY)
@@ -251,4 +252,13 @@ public class RouteUtil {
ARouter.getInstance().build(PATH_FACEBOOKACTIVITY)
.navigation();
}
/**
* 客服页面
*/
public static void forwardCustomerService(String url){
ARouter.getInstance().build(PATH_CS)
.withString(Constants.URL,url)
.navigation();
}
}