yutou/pdlivexp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix_webview' into 6.5.3

Browse Source
This commit is contained in:
zlzw
2023-06-25 15:50:04 +08:00
parent 9741be743c 9c57f0bd96
commit f3ff37aea7
7 changed files with 420 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/src/main/java/com/yunbao/common/activity/WebViewActivity.java
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)");
}*/
}
}
});

10
common/src/main/java/com/yunbao/common/utils/RouteUtil.java
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();
}
}

77
common/src/main/res/layout/activity_webview_cs.xml Normal file
View File

@@ -0,0 +1,77 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/rootView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<View
android:id="@+id/v_spacing"
android:layout_width="match_parent"
android:layout_height="24dp"
android:visibility="gone" />
<FrameLayout
android:id="@+id/ft_title"
android:layout_width="match_parent"
android:layout_height="72dp"
android:paddingTop="24dp"
android:background="@color/white">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
android:id="@+id/titleView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerHorizontal="true"
android:gravity="center"
android:textColor="@color/textColor"
android:textSize="18sp"
android:textStyle="bold" />
<ImageView
android:id="@+id/btn_back"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_centerVertical="true"
android:onClick="backClick"
android:padding="9dp"
android:src="@mipmap/icon_back"
android:tint="@color/textColor" />
<ImageView
android:id="@+id/btn_edit"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_alignParentRight="true"
android:layout_marginRight="6dp"
android:padding="11dp"
android:src="@mipmap/icon_user_home_edit"
android:tint="@color/white"
android:visibility="gone" />
</RelativeLayout>
</FrameLayout>
<ProgressBar
android:id="@+id/progressbar"
style="@android:style/Widget.ProgressBar.Horizontal"
android:layout_width="match_parent"
android:layout_height="3dp"
android:progressDrawable="@drawable/bg_horizontal_progressbar"
android:visibility="gone" />
<FrameLayout
android:id="@+id/webView_root"
android:layout_width="match_parent"
android:layout_marginBottom="15dp"
android:layout_height="match_parent">
<WebView
android:id="@+id/webView"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</FrameLayout>
</LinearLayout>