From c8c7227c806e47a6f0befc39f6a59378819db944 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Tue, 19 Jan 2021 20:47:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=BA=86=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/gradle.xml                              |  1 -
 app/build.gradle                              |  4 +++
 .../java/com/mogo/cloud/PassPortActivity.java | 28 ++++++++-----------
 foudations/mogo-passport/build.gradle         |  4 +++
 .../passport/MoGoAiCloudClientConfig.java     | 10 +++----
 5 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 1634ba9..4e16521 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -18,7 +18,6 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
-        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/app/build.gradle b/app/build.gradle
index 9c55eea..5d21daa 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -19,6 +19,10 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {
diff --git a/app/src/main/java/com/mogo/cloud/PassPortActivity.java b/app/src/main/java/com/mogo/cloud/PassPortActivity.java
index 59ae8c8..eec13d7 100644
--- a/app/src/main/java/com/mogo/cloud/PassPortActivity.java
+++ b/app/src/main/java/com/mogo/cloud/PassPortActivity.java
@@ -33,6 +33,7 @@ public class PassPortActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_pass_port_actvity);
+
         etAppKey = findViewById(R.id.etAppKey);
         etDevicesId = findViewById(R.id.etDevicesId);
         etSignSecret = findViewById(R.id.etSignSecret);
@@ -45,28 +46,21 @@ public class PassPortActivity extends AppCompatActivity {
         clientConfig.setThirdLogin(true);
         clientConfig.setThirdPartyAppKey("f8xx");
         clientConfig.setThirdPartyDeviceId("f8xx");
-        clientConfig.setThirdPartySignSecret("f8xx");
-        clientConfig.setThirdPartyAppKey("6bbe7e0e1ecd8e2f8dc336e1678a2791");
 
         mMoGoAiCloudClient = MoGoAiCloudClient.getInstance().init(this,clientConfig);
 
-        btnRefreshToken.setOnClickListener(new View.OnClickListener() {
+        btnRefreshToken.setOnClickListener(v -> mMoGoAiCloudClient.refreshToken(new IMoGoTokenCallback() {
             @Override
-            public void onClick(View 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) {
-
-                    }
-                });
+            public void onTokenGot(String token, String sn) {
+                tvSn.setText(sn);
+                tvToken.setText(token);
             }
-        });
+
+            @Override
+            public void onError(int code, String msg) {
+
+            }
+        }));
 
     }
 }
\ No newline at end of file
diff --git a/foudations/mogo-passport/build.gradle b/foudations/mogo-passport/build.gradle
index fe8cc88..48f8453 100644
--- a/foudations/mogo-passport/build.gradle
+++ b/foudations/mogo-passport/build.gradle
@@ -20,6 +20,10 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {
diff --git a/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClientConfig.java b/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClientConfig.java
index ce7c73e..215923d 100644
--- a/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClientConfig.java
+++ b/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClientConfig.java
@@ -33,16 +33,16 @@ public class MoGoAiCloudClientConfig {
     /**
      * 设备ID
      */
-    private String thirdPartyDeviceId;
+    private String thirdPartyDeviceId = "";
     /**
      * APP key
      */
-    private String thirdPartyAppKey;
+    private String thirdPartyAppKey = "";
 
     /**
      * 签名信息
      */
-    private String thirdPartySignSecret;
+    private String thirdPartySignSecret = "";
 
     /**
      * 是否是第三方登录
@@ -52,12 +52,12 @@ public class MoGoAiCloudClientConfig {
     /**
      * 服务器分配给应用的令牌，用于网络请求校验
      */
-    String token;
+    String token = "";
 
     /**
      * 服务器根据设备ID 分配的SN，用于网络请求校验
      */
-    String sn;
+    String sn = "";
 
     public String getThirdPartyDeviceId() {
         return thirdPartyDeviceId;