|
|
@@ -3,10 +3,13 @@ package com.sheep.gamegroup.view.activity;
|
|
|
import android.annotation.SuppressLint;
|
|
|
import android.app.Activity;
|
|
|
import android.os.Build;
|
|
|
+import android.os.Handler;
|
|
|
+import android.os.Looper;
|
|
|
import android.util.Log;
|
|
|
import android.view.KeyEvent;
|
|
|
import android.view.View;
|
|
|
import android.widget.TextView;
|
|
|
+import android.widget.Toast;
|
|
|
|
|
|
import com.bun.miitmdid.core.MdidSdkHelper;
|
|
|
import com.sheep.gamegroup.absBase.BaseActivity;
|
|
|
@@ -49,7 +52,6 @@ public class ActXianWanWeb extends BaseActivity {
|
|
|
private WebSettings webViewSettings;
|
|
|
private Activity activity;
|
|
|
private XianWanEntity xianWanEntity;
|
|
|
-
|
|
|
@Override
|
|
|
protected int getLayoutId() {
|
|
|
return R.layout.activity_guide_on_hook;
|
|
|
@@ -85,7 +87,6 @@ public class ActXianWanWeb extends BaseActivity {
|
|
|
webViewSettings.setJavaScriptEnabled(true);
|
|
|
webViewSettings.setJavaScriptCanOpenWindowsAutomatically(true);
|
|
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
|
|
|
-// webViewSettings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
|
|
|
}
|
|
|
Log.i("OkHttpUrl",xianWanEntity.getJsUrl());
|
|
|
initJsData();
|
|
|
@@ -149,7 +150,7 @@ public class ActXianWanWeb extends BaseActivity {
|
|
|
public void onPageFinished(WebView view, String url) {
|
|
|
super.onPageFinished(view, url);
|
|
|
loadJs();
|
|
|
- // loadTestJs();
|
|
|
+ // loadTestJs();
|
|
|
}
|
|
|
});
|
|
|
|
|
|
@@ -161,15 +162,18 @@ public class ActXianWanWeb extends BaseActivity {
|
|
|
return true;
|
|
|
}
|
|
|
return false;
|
|
|
- });
|
|
|
- String sret = null;
|
|
|
+ });
|
|
|
+
|
|
|
if (Build.VERSION.SDK_INT > Build.VERSION_CODES.P) {
|
|
|
-
|
|
|
- int ret = MdidSdkHelper.InitSdk(this, true, (isSupport, supplier) -> {
|
|
|
- mWebView.loadUrl(assemblyData(supplier.getOAID()));
|
|
|
- });
|
|
|
- sret= Integer.toString(ret);
|
|
|
+ int ret = MdidSdkHelper.InitSdk(ActXianWanWeb.this, true, (isSupport, supplier)
|
|
|
+ ->
|
|
|
+ mWebView.post(() -> {
|
|
|
+ mWebView. loadUrl(assemblyData(supplier.getOAID()));
|
|
|
+ })
|
|
|
+ );
|
|
|
+ LogUtil.logI("get oaid result:" + ret);
|
|
|
} else {
|
|
|
+ //Toast.makeText(ActXianWanWeb.this, "网络异常!请重新启动", Toast.LENGTH_LONG).show();
|
|
|
mWebView.loadUrl(assemblyData(""));
|
|
|
}
|
|
|
}
|