From cae91d5ae8ddcad41beb16bf3ea57032756174bf Mon Sep 17 00:00:00 2001
From: Admin <Dana_Lee1016@126.com>
Date: 星期三, 24 二月 2021 10:40:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
app/src/main/java/safeluck/drive/evaluation/receiver/ShutdownBroadcastReceiver.java | 2 +-
app/src/main/java/safeluck/drive/evaluation/receiver/ReBootBroadcastReceiver.java | 2 +-
app/build.gradle | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index 774d346..5128a18 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@
applicationId "safeluck.drive.evaluation"
minSdkVersion 21
targetSdkVersion 28
- versionCode 3
- versionName "1.3"
+ versionCode 4
+ versionName "1.0.4"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
ndk {
diff --git a/app/src/main/java/safeluck/drive/evaluation/receiver/ReBootBroadcastReceiver.java b/app/src/main/java/safeluck/drive/evaluation/receiver/ReBootBroadcastReceiver.java
index bf67a38..d331938 100644
--- a/app/src/main/java/safeluck/drive/evaluation/receiver/ReBootBroadcastReceiver.java
+++ b/app/src/main/java/safeluck/drive/evaluation/receiver/ReBootBroadcastReceiver.java
@@ -26,7 +26,7 @@
deviceWorkMCU.event = 0;
deviceWorkMCU.timeout = Constant.SHUTDOWN_TIME;
MyLog.i(TAG,"閲嶅惎骞挎挱");
-// AYSdk.getInstance().sendCmd(0x8010,gson.toJson(deviceWorkMCU));
+ AYSdk.getInstance().sendCmd(0x8010,gson.toJson(deviceWorkMCU));
}
}
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/receiver/ShutdownBroadcastReceiver.java b/app/src/main/java/safeluck/drive/evaluation/receiver/ShutdownBroadcastReceiver.java
index 4fefba8..cdd825e 100644
--- a/app/src/main/java/safeluck/drive/evaluation/receiver/ShutdownBroadcastReceiver.java
+++ b/app/src/main/java/safeluck/drive/evaluation/receiver/ShutdownBroadcastReceiver.java
@@ -23,7 +23,7 @@
deviceWorkMCU.event = 1;
deviceWorkMCU.timeout = Constant.SHUTDOWN_TIME;
MyLog.i(TAG,"鍏虫満骞挎挱");
-// AYSdk.getInstance().sendCmd(0x8010,gson.toJson(deviceWorkMCU));
+ AYSdk.getInstance().sendCmd(0x8010,gson.toJson(deviceWorkMCU));
}
}
}
--
Gitblit v1.8.0