From 6af0017efe712a0881845157ca0883788f21de94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Wed, 3 Nov 2021 16:32:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20AndroidX=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/deploymentTargetDropDown.xml | 17 ----------------- .../java/com/mogo/cloud/BaseLiveActivity.java | 1 - .../java/com/mogo/cloud/MoGoApplication.java | 2 +- .../main/res/layout/actitity_config_info.xml | 4 ++-- app/src/main/res/layout/activity_live_play.xml | 4 ++-- .../res/layout/activity_live_play_and_push.xml | 4 ++-- build.gradle | 2 +- 7 files changed, 8 insertions(+), 26 deletions(-) delete mode 100644 .idea/deploymentTargetDropDown.xml diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml deleted file mode 100644 index 4116d78..0000000 --- a/.idea/deploymentTargetDropDown.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/java/com/mogo/cloud/BaseLiveActivity.java b/app/src/main/java/com/mogo/cloud/BaseLiveActivity.java index 8083210..15419f0 100644 --- a/app/src/main/java/com/mogo/cloud/BaseLiveActivity.java +++ b/app/src/main/java/com/mogo/cloud/BaseLiveActivity.java @@ -6,7 +6,6 @@ import android.view.SurfaceHolder; import android.view.SurfaceView; import android.widget.EditText; import android.widget.TextView; -import android.widget.Toast; import android.widget.ToggleButton; import androidx.appcompat.app.AppCompatActivity; diff --git a/app/src/main/java/com/mogo/cloud/MoGoApplication.java b/app/src/main/java/com/mogo/cloud/MoGoApplication.java index 026c7bc..85c0b59 100644 --- a/app/src/main/java/com/mogo/cloud/MoGoApplication.java +++ b/app/src/main/java/com/mogo/cloud/MoGoApplication.java @@ -59,7 +59,7 @@ public class MoGoApplication extends MultiDexApplication { // 设置AI云平台分配给三方应用的签名密钥，需要从AI云平台申请 // 设置车机设备的唯一标识（这些表识必须是通过后台录入的设备） // TODO 这里使用的是测试的sn - clientConfig.setThirdPartyDeviceId("B95ACB94DF240C88"); + clientConfig.setThirdPartyDeviceId("89E6886710D22ACC"); // 设置应用服务AppId 长链、鉴权 //todo 需要卸载智慧驾驶、行车记录仪 clientConfig.setServiceAppId("com.mogo.launcher"); // 设置循环检测间隔时间 diff --git a/app/src/main/res/layout/actitity_config_info.xml b/app/src/main/res/layout/actitity_config_info.xml index 3811fd5..e95d3c6 100644 --- a/app/src/main/res/layout/actitity_config_info.xml +++ b/app/src/main/res/layout/actitity_config_info.xml @@ -1,5 +1,5 @@ - @@ -13,4 +13,4 @@ android:textSize="20dp" tools:text="测试数据测试数据测试数据测试数据测试数据测试数据测试数据测试数据测试数据测试数据测试数据测试数据测试数据测试数据测试数据测试数据" /> - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_live_play.xml b/app/src/main/res/layout/activity_live_play.xml index 532de62..cd74680 100644 --- a/app/src/main/res/layout/activity_live_play.xml +++ b/app/src/main/res/layout/activity_live_play.xml @@ -1,5 +1,5 @@ - @@ -38,4 +38,4 @@ android:text="wifi State :0" app:layout_constraintRight_toRightOf="parent" app:layout_constraintBottom_toBottomOf="parent" /> - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_live_play_and_push.xml b/app/src/main/res/layout/activity_live_play_and_push.xml index 17d186f..6ec99ea 100644 --- a/app/src/main/res/layout/activity_live_play_and_push.xml +++ b/app/src/main/res/layout/activity_live_play_and_push.xml @@ -1,5 +1,5 @@ - @@ -139,4 +139,4 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toRightOf="parent" /> - \ No newline at end of file + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 9fe9103..abcca87 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ apply from: "config.gradle" buildscript { - ext.kotlin_version = '1.4.20' + ext.kotlin_version = "1.4.31" repositories { maven { url 'http://maven.aliyun.com/nexus/content/groups/public/'