Merge remote-tracking branch 'origin/master'

Admin

2021-02-24 cae91d5ae8ddcad41beb16bf3ea57032756174bf

Merge remote-tracking branch 'origin/master'

 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 {

 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));
        }
    }
}

 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));
        }
    }
}