diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..0eda3b9
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,9 @@
+[submodule "mod_utils"]
+ path = mod_utils
+ url = git@e.coding.net:slackz/ykbox/mod_utils.git
+[submodule "mod_signageapi"]
+ path = mod_signageapi
+ url = git@e.coding.net:slackz/ykbox/mod_signageapi.git
+[submodule "mod_serialport"]
+ path = mod_serialport
+ url = git@e.coding.net:slackz/ykbox/mod_serialport.git
diff --git a/fullshow/build.gradle b/fullshow/build.gradle
index 290953f..4c918ec 100644
--- a/fullshow/build.gradle
+++ b/fullshow/build.gradle
@@ -4,13 +4,13 @@ plugins {
android {
namespace 'cn.ykbox.fullshow'
- compileSdk 33
+ compileSdk 34
buildToolsVersion "30.0.3"
defaultConfig {
applicationId "cn.ykbox.fullshow"
minSdk 21
- targetSdk 33
+ targetSdk 34
versionCode 1
versionName "1.0"
@@ -45,7 +45,7 @@ dependencies {
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
implementation project(':signageapi')
- implementation project(':signageutil')
+ implementation project(':utils')
implementation 'com.blankj:utilcodex:1.31.1'
implementation 'io.github.youth5201314:banner:2.2.2'
diff --git a/fullshow/src/main/AndroidManifest.xml b/fullshow/src/main/AndroidManifest.xml
index 2c76375..dbd3bcc 100644
--- a/fullshow/src/main/AndroidManifest.xml
+++ b/fullshow/src/main/AndroidManifest.xml
@@ -16,10 +16,20 @@
android:theme="@style/Theme.Classtv.Fullscreen">
-
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/fullshow/src/main/java/cn/ykbox/fullshow/BaseActivity.java b/fullshow/src/main/java/cn/ykbox/fullshow/BaseActivity.java
index 170ceed..eea24dc 100644
--- a/fullshow/src/main/java/cn/ykbox/fullshow/BaseActivity.java
+++ b/fullshow/src/main/java/cn/ykbox/fullshow/BaseActivity.java
@@ -24,9 +24,9 @@ public class BaseActivity extends AppCompatActivity {
super.onResume();
Log.d(TAG, "onResume " + this);
- PlatformFactory.getInstance().hideNavBar(true);
- PlatformFactory.getInstance().setSlideShowNavBar(false);
- PlatformFactory.getInstance().setSlideShowNotificationBar(false);
+// PlatformFactory.getInstance().hideNavBar(true);
+// PlatformFactory.getInstance().setSlideShowNavBar(false);
+// PlatformFactory.getInstance().setSlideShowNotificationBar(false);
hideSystemUI();
}
@@ -36,8 +36,8 @@ public class BaseActivity extends AppCompatActivity {
showSystemUI();
Log.d(TAG, "onPause " + this);
- PlatformFactory.getInstance().hideNavBar(false);
- PlatformFactory.getInstance().setSlideShowNotificationBar(true);
+// PlatformFactory.getInstance().hideNavBar(false);
+// PlatformFactory.getInstance().setSlideShowNotificationBar(true);
}
@Override
diff --git a/fullshow/src/main/java/cn/ykbox/fullshow/BootBroadcastReceiver.java b/fullshow/src/main/java/cn/ykbox/fullshow/BootBroadcastReceiver.java
new file mode 100644
index 0000000..e93a7aa
--- /dev/null
+++ b/fullshow/src/main/java/cn/ykbox/fullshow/BootBroadcastReceiver.java
@@ -0,0 +1,24 @@
+package cn.ykbox.fullshow;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+import com.blankj.utilcode.util.ServiceUtils;
+
+import cn.ykbox.utils.Log;
+
+public class BootBroadcastReceiver extends BroadcastReceiver {
+
+ private static final String TAG = "BootReceiver";
+ static final String ACTION = "android.intent.action.BOOT_COMPLETED";
+
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ if (intent.getAction().equals(ACTION)) {
+ Intent myIntent = new Intent(context, FullscreenActivity.class);
+ myIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ context.startActivity(myIntent);
+ }
+ }
+}
diff --git a/fullshow/src/main/java/cn/ykbox/fullshow/FullscreenActivity.java b/fullshow/src/main/java/cn/ykbox/fullshow/FullscreenActivity.java
index 8356d53..f28ead7 100644
--- a/fullshow/src/main/java/cn/ykbox/fullshow/FullscreenActivity.java
+++ b/fullshow/src/main/java/cn/ykbox/fullshow/FullscreenActivity.java
@@ -27,7 +27,6 @@ import com.youth.banner.holder.BannerImageHolder;
import com.youth.banner.indicator.CircleIndicator;
import cn.ykbox.fullshow.databinding.ActivityFullscreenBinding;
-import cn.ykbox.signageutil.LongClickUtils;
/**
* An example full-screen activity that shows and hides the system UI (i.e.
diff --git a/mod_serialport b/mod_serialport
new file mode 160000
index 0000000..8693f49
--- /dev/null
+++ b/mod_serialport
@@ -0,0 +1 @@
+Subproject commit 8693f491b92783fdf0513296c0aa457163162a23
diff --git a/mod_signageapi b/mod_signageapi
new file mode 160000
index 0000000..5936687
--- /dev/null
+++ b/mod_signageapi
@@ -0,0 +1 @@
+Subproject commit 59366874da9f81267acc91fd0ddfccf1091287fd
diff --git a/mod_utils b/mod_utils
new file mode 160000
index 0000000..581c997
--- /dev/null
+++ b/mod_utils
@@ -0,0 +1 @@
+Subproject commit 581c997cd0ee56a72d11cb0c70a1d74916c21c71
diff --git a/settings.gradle b/settings.gradle
index be789a7..e2c2566 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,24 +1,7 @@
-include ':app_classtv'
-include ':app_sinclass'
-include ':app_sinclassclient'
-include ':app_sinclasspad'
-include ':app_sinclasspad2'
-include ':app_startap'
-include ':bjcast'
-include ':cccl'
-include ':signageapi'
-include ':signageui'
-include ':signageui_test'
-include ':signageutil'
-include ':serialport'
-include ':serviceecd'
-include ':demo_coaface'
-include ':demo_ysapi'
-include ':demo_serial'
-include ':demo_serviceecd'
-include ':demo_twoscreen'
include ':fullshow'
-include ':demo_cccl'
-include ':app_launcher'
-include ':updater'
-include ':app_sinclasspad3'
+include ':utils'
+project(':utils').projectDir = new File("mod_utils/utils")
+include ':signageapi'
+project(':signageapi').projectDir = new File("mod_signageapi/signageapi")
+include ':serialport'
+project(':serialport').projectDir = new File("mod_serialport/serialport")
\ No newline at end of file