From a21695b466b1c5045e210c343317d3efb3239b1d Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Thu, 23 Jul 2020 10:37:02 +0800
Subject: [PATCH 1/3] bugfix

---
 .../main/java/com/mogo/module/media/presenter/KwPresenter.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/presenter/KwPresenter.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/presenter/KwPresenter.java
index f783c4d80c..60810062c4 100644
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/presenter/KwPresenter.java
+++ b/modules/mogo-module-media/src/main/java/com/mogo/module/media/presenter/KwPresenter.java
@@ -67,6 +67,9 @@ public class KwPresenter extends BaseMediaPresenter<IMusicView> {
         });
 
         kwapi.registerPlayerStatusListener((playerStatus, music) -> {
+            if ( music == null ) {
+                return;
+            }
             Log.d(TAG, "onPlayerStatusListener: " + playerStatus + " music: " + music.name);
             switch (playerStatus) {
                 case BUFFERING:

From 15a5e1268307f265afa00436e7964d4c30d43623 Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Thu, 23 Jul 2020 10:39:40 +0800
Subject: [PATCH 2/3] opt

---
 .../java/com/mogo/base/services/passport/PassportManager.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/passport/PassportManager.java b/foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/passport/PassportManager.java
index 98298019e3..e84d8d98e9 100644
--- a/foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/passport/PassportManager.java
+++ b/foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/passport/PassportManager.java
@@ -11,6 +11,7 @@ import com.mogo.service.passport.IMogoTicketCallback;
 import com.mogo.utils.logger.Logger;
 import com.zhidao.accountsdk.manager.CarPadClientManagerImpl;
 import com.zhidao.accountsdk.manager.TicketInfoCallback;
+import com.zhidao.accountsdk.network.NetEnvironManager;
 import com.zhidao.tcloginsdk.LoginManager;
 
 public
@@ -94,7 +95,8 @@ class PassportManager implements IMogoPassportManager {
             // 演示环境用 qa 的
             mode = DebugConfig.NET_MODE_QA;
         }
-        LoginManager.getInstance( context ).setNetEnviron( mode );
+        NetEnvironManager.instance().setEnviron( mode );
+//        LoginManager.getInstance( context ).setNetEnviron( mode );
         LoginManager.getInstance( context ).login(true, DebugConfig.getProductFlavor());
     }
 }

From 173d9a58b0dcc95d8c34fc2e91ae93d9d7595d23 Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Thu, 23 Jul 2020 10:57:49 +0800
Subject: [PATCH 3/3] opt:

---
 .idea/misc.xml                                                | 2 +-
 foudations/mogo-base-services-sdk/build.gradle                | 2 +-
 .../java/com/mogo/base/services/passport/PassportManager.java | 4 +---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index cd77a1f062..21e99e2dc0 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,7 +4,7 @@
     <asm skipDebug="false" skipFrames="false" skipCode="false" expandFrames="false" />
     <groovy codeStyle="LEGACY" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
 </project>
\ No newline at end of file
diff --git a/foudations/mogo-base-services-sdk/build.gradle b/foudations/mogo-base-services-sdk/build.gradle
index 7f78e77ec2..ded359d730 100644
--- a/foudations/mogo-base-services-sdk/build.gradle
+++ b/foudations/mogo-base-services-sdk/build.gradle
@@ -34,7 +34,7 @@ dependencies {
     // 长链
     implementation 'com.zhidao.socket:built-in-socket:1.0.13'
     // passport
-    implementation 'com.zhidao.tcloginsdk:tclogin:1.0.7.3'
+    implementation 'com.zhidao.tcloginsdk:tclogin:1.0.8'
 
     annotationProcessor 'com.elegant.spi:compiler:1.0.3'
 
diff --git a/foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/passport/PassportManager.java b/foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/passport/PassportManager.java
index e84d8d98e9..98298019e3 100644
--- a/foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/passport/PassportManager.java
+++ b/foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/passport/PassportManager.java
@@ -11,7 +11,6 @@ import com.mogo.service.passport.IMogoTicketCallback;
 import com.mogo.utils.logger.Logger;
 import com.zhidao.accountsdk.manager.CarPadClientManagerImpl;
 import com.zhidao.accountsdk.manager.TicketInfoCallback;
-import com.zhidao.accountsdk.network.NetEnvironManager;
 import com.zhidao.tcloginsdk.LoginManager;
 
 public
@@ -95,8 +94,7 @@ class PassportManager implements IMogoPassportManager {
             // 演示环境用 qa 的
             mode = DebugConfig.NET_MODE_QA;
         }
-        NetEnvironManager.instance().setEnviron( mode );
-//        LoginManager.getInstance( context ).setNetEnviron( mode );
+        LoginManager.getInstance( context ).setNetEnviron( mode );
         LoginManager.getInstance( context ).login(true, DebugConfig.getProductFlavor());
     }
 }