Compare commits
No commits in common. "362b422db31763db25f06f7061748a4b21bd77c4" and "a2180dfaea0d2de73bced46b7e6e0fb48b068539" have entirely different histories.
362b422db3
...
a2180dfaea
@ -19,7 +19,6 @@
|
||||
android:exported="true">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.BOOT_COMPLETED" />
|
||||
<action android:name="android.intent.action.LOCKED_BOOT_COMPLETED" />
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<activity
|
||||
|
||||
@ -8,7 +8,7 @@ import android.content.Intent;
|
||||
public class BootReceiver extends BroadcastReceiver {
|
||||
@Override
|
||||
public void onReceive(Context context, Intent intent){
|
||||
if(Intent.ACTION_BOOT_COMPLETED.equals(intent.getAction()) || Intent.ACTION_LOCKED_BOOT_COMPLETED.equals(intent.getAction())){
|
||||
if(Intent.ACTION_BOOT_COMPLETED.equals(intent.getAction())){
|
||||
ActivityManager am = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
|
||||
if(am!=null) {
|
||||
am.clearApplicationUserData();
|
||||
|
||||
@ -128,34 +128,6 @@ public class MainActivity extends AppCompatActivity {
|
||||
CookieManager.getInstance().setAcceptCookie(true);
|
||||
CookieManager.getInstance().setAcceptThirdPartyCookies(webView,true);
|
||||
|
||||
<<<<<<< HEAD
|
||||
WebView webView = new WebView(this);
|
||||
setContentView(webView);
|
||||
|
||||
WebSettings webSettings = webView.getSettings();
|
||||
webSettings.setJavaScriptEnabled(true);
|
||||
webSettings.setDomStorageEnabled(true);
|
||||
|
||||
webView.addJavascriptInterface(new WebAppInterface(this), "AndroidPrinter");
|
||||
webView.getSettings().setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
|
||||
webView.setWebViewClient(new WebViewClient());
|
||||
|
||||
CookieManager.getInstance().setAcceptCookie(true);
|
||||
CookieManager.getInstance().setAcceptThirdPartyCookies(webView, true);
|
||||
|
||||
// 🔒 Stop rubber band effect + hide scrollbars
|
||||
webView.setOverScrollMode(WebView.OVER_SCROLL_NEVER);
|
||||
webView.setVerticalScrollBarEnabled(false);
|
||||
webView.setHorizontalScrollBarEnabled(false);
|
||||
|
||||
// webView.loadUrl("http://10.23.107.10:8000/kioskvideo");
|
||||
|
||||
|
||||
webView.loadUrl("http://192.168.0.108:8000/kioskvideo");
|
||||
//webView.loadUrl("file:///android_asset/index.html");
|
||||
findUsbPrinter();
|
||||
}
|
||||
=======
|
||||
webView.loadUrl("http://10.23.107.10:8000/kioskvideo");
|
||||
|
||||
// webView.loadUrl("http://192.168.0.114:8000/kioskvideo");
|
||||
@ -163,7 +135,6 @@ public class MainActivity extends AppCompatActivity {
|
||||
|
||||
findUsbPrinter();
|
||||
}
|
||||
>>>>>>> a2180dfaea0d2de73bced46b7e6e0fb48b068539
|
||||
|
||||
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user