From 86efa7dec1ed6beb7d793eabb9d11e7a607729ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Thu, 25 Feb 2021 11:32:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=90=AF=E5=8A=A8?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=20=E5=A2=9E=E5=8A=A0=E4=BA=86=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E5=85=B3=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/gradle.xml                              |  1 -
 .idea/misc.xml                                |  2 +-
 app/src/main/AndroidManifest.xml              | 22 +++++++++++++------
 .../java/com/mogo/cloud/MoGoApplication.java  |  2 +-
 .../main/res/layout/activity_live_play.xml    |  2 +-
 .../cloud/passport/MoGoAiCloudClient.java     |  2 ++
 6 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 8116b81..1563bc1 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -26,7 +26,6 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
-        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index d79aadd..2887110 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -13,7 +13,7 @@
     <option name="HEAP_SIZE" value="1024" />
     <option name="LOCALE" value="zh_CN" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="12" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ebd1379..c13a281 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -25,7 +25,9 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity">
+        <activity
+            android:name=".MainActivity"
+            android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -35,22 +37,28 @@
 
         <activity
             android:name=".ConfigInfoActivity"
-            android:label="配置信息"/>
+            android:label="配置信息"
+            android:launchMode="singleTask" />
         <activity
             android:name=".LivePushActivity"
-            android:label="直播播放" />
+            android:label="直播播放"
+            android:launchMode="singleTask" />
         <activity
             android:name=".LivePlayActivity"
-            android:label="直播推送" />
+            android:label="直播推送"
+            android:launchMode="singleTask" />
         <activity
             android:name="com.mogo.cloud.network.NetworkActivity"
-            android:label="网络测试" />
+            android:label="网络测试"
+            android:launchMode="singleTask" />
         <activity
             android:name=".RealTimeActivity"
-            android:label="实时数据测试" />
+            android:label="实时数据测试"
+            android:launchMode="singleTask" />
         <activity
             android:name=".RoadConditionActivity"
-            android:label="路况服务" />
+            android:label="路况服务"
+            android:launchMode="singleTask" />
 
     </application>
 
diff --git a/app/src/main/java/com/mogo/cloud/MoGoApplication.java b/app/src/main/java/com/mogo/cloud/MoGoApplication.java
index ee50933..0e5fb06 100644
--- a/app/src/main/java/com/mogo/cloud/MoGoApplication.java
+++ b/app/src/main/java/com/mogo/cloud/MoGoApplication.java
@@ -42,7 +42,7 @@ public class MoGoApplication extends MultiDexApplication {
         // 设置是否是第三APP登录
         clientConfig.setThirdLogin(true);
         // 设置是否输出日志
-        clientConfig.setShowDebugLog(true);
+        clientConfig.setShowDebugLog(false);
         // 设置从蘑菇AI开放平台获取的APPKey
         clientConfig.setThirdPartyAppKey("wbvpzgar");
         // 设置AI云平台分配给三方应用的签名密钥，需要从AI云平台申请
diff --git a/app/src/main/res/layout/activity_live_play.xml b/app/src/main/res/layout/activity_live_play.xml
index d9099ef..ef99f19 100644
--- a/app/src/main/res/layout/activity_live_play.xml
+++ b/app/src/main/res/layout/activity_live_play.xml
@@ -17,7 +17,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:hint="请输入要查看的车机SN"
-        android:text="F803EB2046PZD00149"
+        android:text="F803BB2037EZD00074"
         android:textColor="#FFFF"
         app:layout_constraintBottom_toTopOf="@+id/liveToggleBtn"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClient.java b/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClient.java
index dfe214c..208e2d3 100644
--- a/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClient.java
+++ b/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClient.java
@@ -64,6 +64,8 @@ public class MoGoAiCloudClient {
         // 控制日志输出
         if (!mAiCloudClientConfig.isShowDebugLog()) {
             Logger.init(LogLevel.OFF);
+            // 关闭鉴权模块的日志
+            com.elegant.log.simplelog.Logger.init(com.elegant.log.simplelog.LogLevel.OFF);
         }
         // 刷新令牌
         refreshToken();