diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0e0de0e..d78a6fa 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,6 +14,13 @@ android:networkSecurityConfig="@xml/network_security_config" android:theme="@style/Theme.LifelineTest2"> + + + + + diff --git a/app/src/main/java/com/example/lifeline_test2/BootReceiver.java b/app/src/main/java/com/example/lifeline_test2/BootReceiver.java new file mode 100644 index 0000000..7aeab4d --- /dev/null +++ b/app/src/main/java/com/example/lifeline_test2/BootReceiver.java @@ -0,0 +1,18 @@ +package com.example.lifeline_test2; + +import android.app.ActivityManager; +import android.content.BroadcastReceiver; +import android.content.Context; +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())){ + ActivityManager am = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE); + if(am!=null) { + am.clearApplicationUserData(); + } + } + } +} diff --git a/app/src/main/java/com/example/lifeline_test2/MainActivity.java b/app/src/main/java/com/example/lifeline_test2/MainActivity.java index ffdd69d..f47ccc6 100644 --- a/app/src/main/java/com/example/lifeline_test2/MainActivity.java +++ b/app/src/main/java/com/example/lifeline_test2/MainActivity.java @@ -1,5 +1,6 @@ package com.example.lifeline_test2; +import android.app.ActivityManager; import android.app.PendingIntent; import android.content.BroadcastReceiver; import android.content.Context; @@ -89,7 +90,8 @@ protected void onCreate(Bundle savedInstanceState) { webView.setWebViewClient(new WebViewClient()); CookieManager.getInstance().setAcceptCookie(true); CookieManager.getInstance().setAcceptThirdPartyCookies(webView,true); -// webView.loadUrl("http://10.23.107.10:8000/kioskvideo"); + + //webView.loadUrl("http://10.23.107.10:8000/kioskvideo"); webView.loadUrl("http://192.168.0.114:8000/kioskvideo"); //webView.loadUrl("file:///android_asset/index.html"); @@ -157,7 +159,7 @@ protected void onCreate(Bundle savedInstanceState) { } ESCPOS_Printer printer = new ESCPOS_Printer(usbDeviceConnection, usbEndpoint); - printer.logo(AppCompatResources.getDrawable(this, R.drawable.logo)); + printer.logo(AppCompatResources.getDrawable(this, R.drawable.updatedlogocropped)); printer.printFormatted(text); printer.feed(5); printer.cut(); diff --git a/app/src/main/res/drawable/updatedlogo.jpg b/app/src/main/res/drawable/updatedlogo.jpg new file mode 100644 index 0000000..8a9ea9b Binary files /dev/null and b/app/src/main/res/drawable/updatedlogo.jpg differ diff --git a/app/src/main/res/drawable/updatedlogocropped.jpg b/app/src/main/res/drawable/updatedlogocropped.jpg new file mode 100644 index 0000000..1b6bf04 Binary files /dev/null and b/app/src/main/res/drawable/updatedlogocropped.jpg differ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0884498..13a3dbb 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,3 +1,3 @@ - Lifeline-Test2 + Lifeline Production \ No newline at end of file