From 9ca73c3083bb0ec9927ae2817f46a737d0e2337b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Thu, 28 Jan 2021 10:26:47 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E6=B3=A8?= =?UTF-8?q?=E9=87=8A=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/gradle.xml | 1 - .idea/misc.xml | 2 +- .../shelved.patch | 135 ------------------ ...t_1_19_21_6_39_PM__Default_Changelist_.xml | 4 - .../java/com/mogo/cloud/MoGoApplication.java | 11 ++ 5 files changed, 12 insertions(+), 141 deletions(-) delete mode 100644 .idea/shelf/Uncommitted_changes_before_Update_at_1_19_21_6_39_PM_[Default_Changelist]/shelved.patch delete mode 100644 .idea/shelf/Uncommitted_changes_before_Update_at_1_19_21_6_39_PM__Default_Changelist_.xml diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 7abdbfc..54349e6 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -23,7 +23,6 @@ diff --git a/.idea/misc.xml b/.idea/misc.xml index 10608e0..42fab5f 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -13,7 +13,7 @@ - - diff --git a/.idea/shelf/Uncommitted_changes_before_Update_at_1_19_21_6_39_PM__Default_Changelist_.xml b/.idea/shelf/Uncommitted_changes_before_Update_at_1_19_21_6_39_PM__Default_Changelist_.xml deleted file mode 100644 index bb9b9db..0000000 --- a/.idea/shelf/Uncommitted_changes_before_Update_at_1_19_21_6_39_PM__Default_Changelist_.xml +++ /dev/null @@ -1,4 +0,0 @@ - - \ No newline at end of file diff --git a/app/src/main/java/com/mogo/cloud/MoGoApplication.java b/app/src/main/java/com/mogo/cloud/MoGoApplication.java index 17d2762..bcabd15 100644 --- a/app/src/main/java/com/mogo/cloud/MoGoApplication.java +++ b/app/src/main/java/com/mogo/cloud/MoGoApplication.java @@ -22,19 +22,29 @@ public class MoGoApplication extends MultiDexApplication { public void onCreate() { super.onCreate(); + // TODO 这里是模拟数据，真实情况需要传入真实的经纬度信息 Random random = new Random(); double randomLat = random.nextDouble(); double randomLon = random.nextDouble(); + // 配置云服务API MoGoAiCloudClientConfig clientConfig = new MoGoAiCloudClientConfig(); + // 设置网络环境：HTTP_DNS_ENV_QA、HTTP_DNS_ENV_RELEASE、HTTP_DNS_ENV_DEV clientConfig.setNetMode(MogoHttpDnsConfig.HTTP_DNS_ENV_QA); + // 设置是否是第三APP登录 clientConfig.setThirdLogin(true); + // 设置是否输出日志 clientConfig.setShowDebugLog(true); + // 设置是否上传当前位置信息 clientConfig.setNeedUploadCoordinatesDurationInTime(true); + // 设置从蘑菇AI开放平台获取的APPKey clientConfig.setThirdPartyAppKey("bydauto"); + // 设置车机设备的唯一标识（这些表识必须是通过后台录入的设备） clientConfig.setThirdPartyDeviceId("bydauto"); + // 设置循环检测间隔时间 clientConfig.setLoopCheckDelay(15 * 1000); + // 设置DNS经纬度位置 clientConfig.setIHttpDnsCurrentLocation(new IHttpDnsCurrentLocation() { @Nullable @Override @@ -43,6 +53,7 @@ public class MoGoApplication extends MultiDexApplication { } }); + // 初始化SDK，可以设置状态回调来监听 MoGoAiCloudClient.getInstance().init(this, clientConfig, null); } From 2376689b3cb69fa71774e30f748aa1414aa37856 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Thu, 28 Jan 2021 16:36:11 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A4=E7=89=8C?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/cloud/MainActivity.java | 42 ++++++++++++++++- .../java/com/mogo/cloud/PassPortActivity.java | 46 ------------------- app/src/main/res/layout/activity_main.xml | 18 +++++++- .../res/layout/activity_pass_port_actvity.xml | 39 ---------------- .../cloud/passport/MoGoAiCloudClient.java | 5 ++ .../com/mogo/cloud/passport/SpStorage.java | 29 ++++++++++++ 6 files changed, 91 insertions(+), 88 deletions(-) delete mode 100644 app/src/main/java/com/mogo/cloud/PassPortActivity.java delete mode 100644 app/src/main/res/layout/activity_pass_port_actvity.xml create mode 100644 foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/SpStorage.java diff --git a/app/src/main/java/com/mogo/cloud/MainActivity.java b/app/src/main/java/com/mogo/cloud/MainActivity.java index 0d69e37..532cf07 100644 --- a/app/src/main/java/com/mogo/cloud/MainActivity.java +++ b/app/src/main/java/com/mogo/cloud/MainActivity.java @@ -2,11 +2,15 @@ package com.mogo.cloud; import android.content.Intent; import android.os.Bundle; +import android.text.TextUtils; import android.widget.Button; +import android.widget.TextView; import androidx.appcompat.app.AppCompatActivity; import com.mogo.cloud.network.NetworkActivity; +import com.mogo.cloud.passport.IMoGoTokenCallback; +import com.mogo.cloud.passport.MoGoAiCloudClient; public class MainActivity extends AppCompatActivity { @@ -14,15 +18,32 @@ public class MainActivity extends AppCompatActivity { private Button btnJumpNetWorkPort; private Button btnJumpRealTime; + private TextView tvSn; + private TextView tvToken; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); + tvSn = findViewById(R.id.tvSn); + tvToken = findViewById(R.id.tvToken); + + initPassportInfo(); + btnJumpPassPort = findViewById(R.id.btnJumpPassPort); btnJumpPassPort.setOnClickListener(v -> { - Intent intent = new Intent(MainActivity.this, PassPortActivity.class); - startActivity(intent); + MoGoAiCloudClient.getInstance().refreshToken(new IMoGoTokenCallback() { + @Override + public void onTokenGot(String token, String sn) { + initPassportInfo(); + } + + @Override + public void onError(int code, String msg) { + + } + }); }); btnJumpNetWorkPort = findViewById(R.id.btnJumpNetWorkPort); @@ -37,4 +58,21 @@ public class MainActivity extends AppCompatActivity { startActivity(intent); }); } + + /** + * 初始化令牌信息 + */ + private void initPassportInfo() { + String sn = MoGoAiCloudClient.getInstance().getAiCloudClientConfig().getSn(); + String token = MoGoAiCloudClient.getInstance().getAiCloudClientConfig().getToken(); + + if (TextUtils.isEmpty(sn)) { + sn = "获取失败，请重试"; + } + if (TextUtils.isEmpty(token)) { + token = "获取失败，请重试"; + } + tvSn.setText("SN：" + sn); + tvToken.setText("Token：" + token); + } } \ No newline at end of file diff --git a/app/src/main/java/com/mogo/cloud/PassPortActivity.java b/app/src/main/java/com/mogo/cloud/PassPortActivity.java deleted file mode 100644 index d6f870c..0000000 --- a/app/src/main/java/com/mogo/cloud/PassPortActivity.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.mogo.cloud; - -import android.content.Intent; -import android.os.Bundle; -import android.widget.Button; -import android.widget.TextView; - -import androidx.appcompat.app.AppCompatActivity; - -import com.mogo.cloud.network.NetworkActivity; -import com.mogo.cloud.passport.MoGoAiCloudClient; - -/** - * 鉴权sdk测试页面 - */ -public class PassPortActivity extends AppCompatActivity { - - private Button btnRefreshToken; - private TextView tvSn; - private TextView tvToken; - - private Button btnJumpToNet; - - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_pass_port_actvity); - - btnRefreshToken = findViewById(R.id.btnRefreshToken); - tvSn = findViewById(R.id.tvSn); - tvToken = findViewById(R.id.tvToken); - btnJumpToNet = findViewById(R.id.btnJumpToNet); - - btnRefreshToken.setOnClickListener(v -> { - tvSn.setText("SN：" + MoGoAiCloudClient.getInstance().getAiCloudClientConfig().getSn()); - tvToken.setText("Token：" + MoGoAiCloudClient.getInstance().getAiCloudClientConfig().getToken()); - }); - - btnJumpToNet.setOnClickListener(v -> { - Intent intent = new Intent(this, NetworkActivity.class); - startActivity(intent); - }); - - } -} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 13e61b8..a6cf79b 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -10,11 +10,27 @@ android:layout_height="match_parent" android:orientation="vertical"> + + + +