diff --git a/app_dashboard/build.gradle b/app_dashboard/build.gradle index 4c3b700..75c66f4 100644 --- a/app_dashboard/build.gradle +++ b/app_dashboard/build.gradle @@ -19,7 +19,6 @@ android { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } - // sign the application signingConfigs { release { @@ -51,7 +50,6 @@ android { viewBinding true } - android.applicationVariants.all { variant -> def docDir = rootProject.getRootDir().getAbsolutePath() + "/../apk/dashboard" def releaseDir = rootProject.getRootDir().getAbsolutePath() + "/../apk/dashboard" diff --git a/app_dashboard/src/main/java/cn/ykbox/dashboard/activity/BuildingDashboardActivity.java b/app_dashboard/src/main/java/cn/ykbox/dashboard/activity/BuildingDashboardActivity.java index 1fcc5ae..0c9834b 100644 --- a/app_dashboard/src/main/java/cn/ykbox/dashboard/activity/BuildingDashboardActivity.java +++ b/app_dashboard/src/main/java/cn/ykbox/dashboard/activity/BuildingDashboardActivity.java @@ -33,6 +33,7 @@ import java.util.Calendar; import cn.ykbox.dashboard.ConfigReader; import cn.ykbox.dashboard.databinding.ActivityBuildingDashboardBinding; import cn.ykbox.dashboard.receiver.CommandBroadcastReceiver; +import cn.ykbox.dashboard.serial.SerialControlDevices; public class BuildingDashboardActivity extends FullscreenActivity { private final static String TAG = "DashboardActivity"; diff --git a/app_dashboard/src/main/java/cn/ykbox/dashboard/activity/FullscreenActivity.java b/app_dashboard/src/main/java/cn/ykbox/dashboard/activity/FullscreenActivity.java index 0ed32c8..860948a 100644 --- a/app_dashboard/src/main/java/cn/ykbox/dashboard/activity/FullscreenActivity.java +++ b/app_dashboard/src/main/java/cn/ykbox/dashboard/activity/FullscreenActivity.java @@ -110,7 +110,7 @@ public class FullscreenActivity extends AppCompatActivity { hide(); } else { show(); - delayedHide(30000); + delayedHide(20000); } } diff --git a/app_dashboard/src/main/java/cn/ykbox/dashboard/activity/StartActivity.java b/app_dashboard/src/main/java/cn/ykbox/dashboard/activity/StartActivity.java index 87934dc..8390669 100644 --- a/app_dashboard/src/main/java/cn/ykbox/dashboard/activity/StartActivity.java +++ b/app_dashboard/src/main/java/cn/ykbox/dashboard/activity/StartActivity.java @@ -12,6 +12,7 @@ import androidx.core.view.ViewCompat; import androidx.core.view.WindowInsetsCompat; import cn.ykbox.dashboard.R; +import cn.ykbox.dashboard.serial.SerialControlDevices; public class StartActivity extends AppCompatActivity { private Context mContext; @@ -19,6 +20,10 @@ public class StartActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + + // 开机后手动发送一次开启电源指令 + SerialControlDevices.sendCommand("/dev/ttyS2", 9600, "ACEAB400ED"); + mContext = this; EdgeToEdge.enable(this); setContentView(R.layout.activity_start); @@ -39,4 +44,5 @@ public class StartActivity extends AppCompatActivity { } }, 3000); } + } \ No newline at end of file