From 7ac2dd72a170ea2bcd8b5f4234cc8179370db489 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Wed, 20 Jan 2021 15:18:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E9=9B=86=E6=88=90=E4=BB=A4?=
 =?UTF-8?q?=E7=89=8C=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |  4 +-
 app/src/main/AndroidManifest.xml              |  1 +
 .../java/com/mogo/cloud/MoGoApplication.java  | 37 +++++++++++++++++
 .../java/com/mogo/cloud/PassPortActivity.java | 40 ++-----------------
 .../cloud/passport/MoGoAiCloudClient.java     |  2 +
 5 files changed, 46 insertions(+), 38 deletions(-)
 create mode 100644 app/src/main/java/com/mogo/cloud/MoGoApplication.java

diff --git a/app/build.gradle b/app/build.gradle
index 8655739..7e93573 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -30,7 +30,7 @@ dependencies {
     implementation rootProject.ext.dependencies.androidxappcompat
     implementation rootProject.ext.dependencies.androidxconstraintlayout
 
-//    implementation project(path: ':foudations:mogo-passport')
-    implementation 'com.mogo.cloud:passport:1.0.0'
+    implementation project(path: ':foudations:mogo-passport')
+//    implementation 'com.mogo.cloud:passport:1.0.0'
 
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index fa86e94..b7affc2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,6 +3,7 @@
     package="com.mogo.cloud">
 
     <application
+        android:name=".MoGoApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
diff --git a/app/src/main/java/com/mogo/cloud/MoGoApplication.java b/app/src/main/java/com/mogo/cloud/MoGoApplication.java
new file mode 100644
index 0000000..3f4ef94
--- /dev/null
+++ b/app/src/main/java/com/mogo/cloud/MoGoApplication.java
@@ -0,0 +1,37 @@
+package com.mogo.cloud;
+
+import android.app.Application;
+
+import com.mogo.cloud.httpdns.MogoHttpDnsConfig;
+import com.mogo.cloud.passport.MoGoAiCloudClient;
+import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
+
+import java.util.Random;
+
+/**
+ *
+ */
+public class MoGoApplication extends Application {
+    @Override
+    public void onCreate() {
+        super.onCreate();
+
+        Random random = new Random();
+        double randomLat = random.nextDouble();
+        double randomLon = random.nextDouble();
+
+        MoGoAiCloudClientConfig clientConfig = new MoGoAiCloudClientConfig();
+        clientConfig.setNetMode(MogoHttpDnsConfig.HTTP_DNS_ENV_QA);
+        clientConfig.setThirdLogin(true);
+        clientConfig.setShowDebugLog(true);
+        clientConfig.setThirdPartyAppKey("bydauto");
+        clientConfig.setThirdPartyDeviceId("bydauto");
+        clientConfig.setLat(randomLat);
+        clientConfig.setLon(randomLon);
+        clientConfig.setCityCode("010");
+        clientConfig.setLoopCheckDelay(15 * 1000);
+
+        MoGoAiCloudClient.getInstance().init(this, clientConfig);
+
+    }
+}
diff --git a/app/src/main/java/com/mogo/cloud/PassPortActivity.java b/app/src/main/java/com/mogo/cloud/PassPortActivity.java
index 8984454..1a00e0b 100644
--- a/app/src/main/java/com/mogo/cloud/PassPortActivity.java
+++ b/app/src/main/java/com/mogo/cloud/PassPortActivity.java
@@ -7,12 +7,7 @@ import android.widget.TextView;
 
 import androidx.appcompat.app.AppCompatActivity;
 
-import com.mogo.cloud.httpdns.MogoHttpDnsConfig;
-import com.mogo.cloud.passport.IMoGoTokenCallback;
 import com.mogo.cloud.passport.MoGoAiCloudClient;
-import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
-
-import java.util.Random;
 
 /**
  * 鉴权sdk测试页面
@@ -27,8 +22,6 @@ public class PassPortActivity extends AppCompatActivity {
     private TextView tvSn;
     private TextView tvToken;
 
-    private MoGoAiCloudClient mMoGoAiCloudClient;
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -41,35 +34,10 @@ public class PassPortActivity extends AppCompatActivity {
         tvSn = findViewById(R.id.tvSn);
         tvToken = findViewById(R.id.tvToken);
 
-        Random random = new Random();
-        double randomLat = random.nextDouble();
-        double randomLon = random.nextDouble();
-
-        MoGoAiCloudClientConfig clientConfig = new MoGoAiCloudClientConfig();
-        clientConfig.setNetMode(MogoHttpDnsConfig.HTTP_DNS_ENV_QA);
-        clientConfig.setThirdLogin(true);
-        clientConfig.setShowDebugLog(true);
-        clientConfig.setThirdPartyAppKey("bydauto");
-        clientConfig.setThirdPartyDeviceId("bydauto");
-        clientConfig.setLat(randomLat);
-        clientConfig.setLon(randomLon);
-        clientConfig.setCityCode("010");
-        clientConfig.setLoopCheckDelay(15 * 1000);
-
-        mMoGoAiCloudClient = MoGoAiCloudClient.getInstance().init(this, clientConfig);
-
-        btnRefreshToken.setOnClickListener(v -> mMoGoAiCloudClient.refreshToken(new IMoGoTokenCallback() {
-            @Override
-            public void onTokenGot(String token, String sn) {
-                tvSn.setText(sn);
-                tvToken.setText(token);
-            }
-
-            @Override
-            public void onError(int code, String msg) {
-
-            }
-        }));
+        btnRefreshToken.setOnClickListener(v -> {
+            tvSn.setText(MoGoAiCloudClient.getInstance().getAiCloudClientConfig().getSn());
+            tvToken.setText(MoGoAiCloudClient.getInstance().getAiCloudClientConfig().getToken());
+        });
 
     }
 }
\ No newline at end of file
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 d376695..f26e2f3 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
@@ -55,6 +55,8 @@ public class MoGoAiCloudClient {
         mAiCloudClientConfig = aiCloudClientConfig;
         // 设置鉴权的网络环境
         LoginManager.getInstance(context).setNetEnviron(aiCloudClientConfig.getNetMode());
+        // 刷新令牌
+        refreshToken(null);
         return sInstance;
     }