Skip to content

Y
YGOMobile
Commit 8bd79231 authored by fallenstardust's avatar fallenstardust
Browse files
Options

fix

parent 73ec03da
Hide whitespace changes
Inline Side-by-side
Showing with 61 additions and 59 deletions
mobile/assets/changelog.html
View file @ 8bd79231
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
<pre> <pre>
更新： 更新：
1.更新ygo内核； 1.更新ygo内核；
2.完善卡组编辑；
优化： 优化：
1.启动ygo时增加tips； 1.启动ygo时增加tips；
2.完善版本号显示； 2.完善版本号显示；
......
mobile/src/main/java/cn/garymb/ygomobile/ui/plus/ServiceDuelAssistant.java
View file @ 8bd79231
...@@ -39,7 +39,7 @@ public class ServiceDuelAssistant extends Service { ...@@ -39,7 +39,7 @@ public class ServiceDuelAssistant extends Service {
//是否可以移除悬浮窗上面的视图 //是否可以移除悬浮窗上面的视图
private boolean isdis = false; private boolean isdis = false;
String[] passwordPrefix = {"M,", "T,", "PR,", "AI,", "M#", "T#", "PR#", "S#", "AI#"}; String[] passwordPrefix = {"M,", "T,", "PR,", "AI,", "LF2,","M#", "T#", "PR#", "S#", "AI#","LF2#"};
//private List<Card> lc; //private List<Card> lc;
......
mobile/src/mycard/java/cn/garymb/ygomobile/ui/plus/X5WebView.java
View file @ 8bd79231
package cn.garymb.ygomobile.ui.plus; package cn.garymb.ygomobile.ui.plus;
import android.annotation.SuppressLint; import android.annotation.*;
import android.content.Context; import android.content.*;
import android.graphics.Canvas; import android.graphics.*;
import android.util.AttributeSet; import android.os.*;
import android.view.View; import android.util.*;
import android.view.*;
import com.tencent.smtt.sdk.WebSettings; import android.widget.*;
import com.tencent.smtt.sdk.WebView; import com.tencent.smtt.sdk.*;
import com.tencent.smtt.sdk.WebViewClient;
public class X5WebView extends WebView { public class X5WebView extends WebView {
private WebViewClient client = new WebViewClient() { private WebViewClient client = new WebViewClient() {
/** /**
* 防止加载网页时调起系统浏览器 * 防止加载网页时调起系统浏览器
*/ */
public boolean shouldOverrideUrlLoading(WebView view, String url) { public boolean shouldOverrideUrlLoading(WebView view, String url) {
view.loadUrl(url); view.loadUrl(url);
return true; return true;
} }
}; };
@SuppressLint("SetJavaScriptEnabled")
public X5WebView(Context arg0, AttributeSet arg1) {
super(arg0, arg1);
this.setWebViewClient(client);
// this.setWebChromeClient(chromeClient);
// WebStorage webStorage = WebStorage.getInstance();
initWebViewSettings();
this.getView().setClickable(true);
}
@SuppressLint("SetJavaScriptEnabled") private void initWebViewSettings() {
public X5WebView(Context arg0, AttributeSet arg1) { WebSettings webSetting = this.getSettings();
super(arg0, arg1); webSetting.setJavaScriptEnabled(true);
this.setWebViewClient(client); webSetting.setJavaScriptCanOpenWindowsAutomatically(true);
// this.setWebChromeClient(chromeClient); webSetting.setAllowFileAccess(true);
// WebStorage webStorage = WebStorage.getInstance(); //webSetting.setLayoutAlgorithm(LayoutAlgorithm.NARROW_COLUMNS);
initWebViewSettings(); webSetting.setSupportZoom(true);
this.getView().setClickable(true); webSetting.setBuiltInZoomControls(true);
} webSetting.setUseWideViewPort(true);
//禁止多窗口
webSetting.setSupportMultipleWindows(false);
// webSetting.setLoadWithOverviewMode(true);
webSetting.setAppCacheEnabled(true);
// webSetting.setDatabaseEnabled(true);
webSetting.setDomStorageEnabled(true);
webSetting.setGeolocationEnabled(true);
webSetting.setAppCacheMaxSize(Long.MAX_VALUE);
// webSetting.setPageCacheCapacity(IX5WebSettings.DEFAULT_CACHE_CAPACITY);
webSetting.setPluginState(WebSettings.PluginState.ON_DEMAND);
// webSetting.setRenderPriority(WebSettings.RenderPriority.HIGH);
webSetting.setCacheMode(WebSettings.LOAD_NO_CACHE);
private void initWebViewSettings() { // this.getSettingsExtension().setPageCacheCapacity(IX5WebSettings.DEFAULT_CACHE_CAPACITY);//extension
WebSettings webSetting = this.getSettings(); // settings 的设计
webSetting.setJavaScriptEnabled(true); }
webSetting.setJavaScriptCanOpenWindowsAutomatically(true);
webSetting.setAllowFileAccess(true);
//webSetting.setLayoutAlgorithm(LayoutAlgorithm.NARROW_COLUMNS);
webSetting.setSupportZoom(true);
webSetting.setBuiltInZoomControls(true);
webSetting.setUseWideViewPort(true);
webSetting.setSupportMultipleWindows(false);
// webSetting.setLoadWithOverviewMode(true);
webSetting.setAppCacheEnabled(true);
// webSetting.setDatabaseEnabled(true);
webSetting.setDomStorageEnabled(true);
webSetting.setGeolocationEnabled(true);
webSetting.setAppCacheMaxSize(Long.MAX_VALUE);
// webSetting.setPageCacheCapacity(IX5WebSettings.DEFAULT_CACHE_CAPACITY);
webSetting.setPluginState(WebSettings.PluginState.ON_DEMAND);
// webSetting.setRenderPriority(WebSettings.RenderPriority.HIGH);
webSetting.setCacheMode(WebSettings.LOAD_NO_CACHE);
webSetting.setDatabaseEnabled(true);
webSetting.setPluginState(WebSettings.PluginState.ON_DEMAND);
}
@Override @Override
protected boolean drawChild(Canvas canvas, View child, long drawingTime) { protected boolean drawChild(Canvas canvas, View child, long drawingTime) {
/*boolean ret = super.drawChild(canvas, child, drawingTime); /*boolean ret = super.drawChild(canvas, child, drawingTime);
canvas.save(); canvas.save();
Paint paint = new Paint(); Paint paint = new Paint();
...@@ -78,13 +79,13 @@ public class X5WebView extends WebView { ...@@ -78,13 +79,13 @@ public class X5WebView extends WebView {
canvas.drawText(Build.MODEL, 10, 200, paint); canvas.drawText(Build.MODEL, 10, 200, paint);
canvas.restore(); canvas.restore();
return ret;*/ return ret;*/
return super.drawChild(canvas, child, drawingTime); return super.drawChild(canvas,child,drawingTime);
} }
public X5WebView(Context arg0) { public X5WebView(Context arg0) {
super(arg0); super(arg0);
setBackgroundColor(85621); setBackgroundColor(85621);
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment