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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
18401019693 2024-01-24 15:47:31 +08:00
commit 7e7616ef29
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/src/main/java/com/yunbao/common/activity/AbsActivity.java
View File

@ -383,6 +383,12 @@ public abstract class AbsActivity extends AppCompatActivity {
} }
} }
public boolean isKefu(String url){ public boolean isKefu(String url){
if(url.contains("kefu")){
return true;
}
if(url.contains("https://newkf.yaoulive.com/")){
return true;
}
return url.startsWith("https://kefu.yaoulive.com"); return url.startsWith("https://kefu.yaoulive.com");
} }
} }

4
common/src/main/java/com/yunbao/common/utils/AndroidBug5497Workaround.java
View File

@ -9,6 +9,8 @@ import android.view.ViewTreeObserver;
import android.view.inputmethod.InputMethodManager; import android.view.inputmethod.InputMethodManager;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import com.yunbao.common.activity.AbsActivity;
/** /**
* 修复全屏WebView输入法遮挡输入框的问题 * 修复全屏WebView输入法遮挡输入框的问题
* <a href="https://github.com/madebycm/AndroidBug5497Workaround/tree/master">GitHub</a> * <a href="https://github.com/madebycm/AndroidBug5497Workaround/tree/master">GitHub</a>
@ -72,7 +74,7 @@ public class AndroidBug5497Workaround {
int heightDifference = usableHeightSansKeyboard - usableHeightNow; int heightDifference = usableHeightSansKeyboard - usableHeightNow;
if (heightDifference > (usableHeightSansKeyboard / 4)) { if (heightDifference > (usableHeightSansKeyboard / 4)) {
// keyboard probably just became visible // keyboard probably just became visible
frameLayoutParams.height = usableHeightSansKeyboard - heightDifference; frameLayoutParams.height = usableHeightSansKeyboard - heightDifference - AbsActivity.getCurrentNavigationBarHeight((Activity) mChildOfContent.getContext());
} else { } else {
// keyboard probably just became hidden // keyboard probably just became hidden
frameLayoutParams.height = usableHeightSansKeyboard; frameLayoutParams.height = usableHeightSansKeyboard;

12
main/src/main/java/com/yunbao/main/activity/CustomerServiceWebViewActivity.java
View File

@ -81,9 +81,8 @@ public class CustomerServiceWebViewActivity extends AbsActivity {
if (getNavigationBarHeight(mContext) != 0) { if (getNavigationBarHeight(mContext) != 0) {
params.bottomMargin = getNavigationBarHeight(mContext); params.bottomMargin = getNavigationBarHeight(mContext);
}*/ }*/
AndroidBug5497Workaround.assistActivity(rootView);
//mWebView.setLayoutParams(params); //mWebView.setLayoutParams(params);
mWebView.setOverScrollMode(View.OVER_SCROLL_NEVER); // mWebView.setOverScrollMode(View.OVER_SCROLL_IF_CONTENT_SCROLLS);
mWebView.setWebViewClient(new WebViewClient() { mWebView.setWebViewClient(new WebViewClient() {
@Override @Override
public boolean shouldOverrideUrlLoading(WebView view, String url) { public boolean shouldOverrideUrlLoading(WebView view, String url) {
@ -172,13 +171,12 @@ public class CustomerServiceWebViewActivity extends AbsActivity {
String appCachePath = mContext.getCacheDir().getAbsolutePath(); String appCachePath = mContext.getCacheDir().getAbsolutePath();
// mWebView.getSettings().setAppCachePath(appCachePath); // mWebView.getSettings().setAppCachePath(appCachePath);
mWebView.getSettings().setAllowFileAccess(true); mWebView.getSettings().setAllowFileAccess(true);
mWebView.getSettings().setUseWideViewPort(true); // 关键点 //mWebView.getSettings().setUseWideViewPort(true); // 关键点
mWebView.getSettings().setAllowFileAccess(true); // 允许访问文件 mWebView.getSettings().setAllowFileAccess(true); // 允许访问文件
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { mWebView.getSettings().setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
mWebView.getSettings().setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
}
mWebView.loadUrl(url); mWebView.loadUrl(url);
AndroidBug5497Workaround.assistActivity(mWebView);
} }
private void openImageChooserActivity(ValueCallback<Uri> valueCallback) { private void openImageChooserActivity(ValueCallback<Uri> valueCallback) {
@ -250,7 +248,7 @@ public class CustomerServiceWebViewActivity extends AbsActivity {
finish(); finish();
return; return;
} }
ToastUtil.showDebug("调用js userBackShowPraise"); ToastUtil.show("调用js userBackShowPraise");
mWebView.loadUrl("javascript:userBackShowPraise()"); mWebView.loadUrl("javascript:userBackShowPraise()");
} }