From 05dd0f86b54772ee1260f767f86146cb764076ff Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Thu, 21 Jan 2021 18:37:36 +0800 Subject: [PATCH] opt --- .idea/gradle.xml | 1 + app/build.gradle | 2 + app/src/main/AndroidManifest.xml | 4 +- .../java/com/mogo/cloud/PassPortActivity.java | 11 ++ .../com/mogo/cloud/network/ApiService.java | 2 - .../mogo/cloud/network/NetworkActivity.java | 28 ++++- .../res/layout/activity_pass_port_actvity.xml | 7 ++ foudations/mogo-commons/build.gradle | 8 +- modules/mogo-tanlu/build.gradle | 33 +++--- modules/mogo-tanlu/gradle.properties | 4 + .../mogo/cloud/ExampleInstrumentedTest.java | 26 ----- .../mogo-tanlu/src/main/AndroidManifest.xml | 2 +- .../java/com/mogo/cloud/UploadManager.java | 45 -------- .../com/mogo/cloud/impl/LoadUploadImpl.java | 13 --- .../com/mogo/cloud/tanlu/UploadManager.java | 101 ++++++++++++++++++ .../cloud/{ => tanlu}/api/ILoadUpload.java | 4 +- .../api/IRoadInfoSearchCallback.java | 5 +- .../{ => tanlu}/api/ITanluUploadCallback.java | 5 +- .../{ => tanlu}/bean/InformationBody.java | 2 +- .../{ => tanlu}/bean/MarkerExploreWay.java | 4 +- .../bean/MarkerExploreWayItem.java | 2 +- .../{ => tanlu}/bean/MarkerUserInfo.java | 2 +- .../{ => tanlu}/bean/RoadInfoRequest.java | 4 +- .../cloud/{ => tanlu}/bean/RoadInfos.java | 2 +- .../cloud/{ => tanlu}/bean/UploadResult.java | 2 +- .../{ => tanlu}/bean/location/Location.java | 2 +- .../bean/location/MarkerLocation.java | 2 +- .../bean/location/MogoLocation.java | 2 +- .../{ => tanlu}/constant/HttpConstant.java | 2 +- .../{ => tanlu}/net/TanluApiService.java | 6 +- .../java/com/mogo/cloud/ExampleUnitTest.java | 17 --- 31 files changed, 196 insertions(+), 154 deletions(-) create mode 100644 modules/mogo-tanlu/gradle.properties delete mode 100644 modules/mogo-tanlu/src/androidTest/java/com/mogo/cloud/ExampleInstrumentedTest.java delete mode 100644 modules/mogo-tanlu/src/main/java/com/mogo/cloud/UploadManager.java delete mode 100644 modules/mogo-tanlu/src/main/java/com/mogo/cloud/impl/LoadUploadImpl.java create mode 100644 modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/UploadManager.java rename modules/mogo-tanlu/src/main/java/com/mogo/cloud/{ => tanlu}/api/ILoadUpload.java (70%) rename modules/mogo-tanlu/src/main/java/com/mogo/cloud/{ => tanlu}/api/IRoadInfoSearchCallback.java (62%) rename modules/mogo-tanlu/src/main/java/com/mogo/cloud/{ => tanlu}/api/ITanluUploadCallback.java (61%) rename modules/mogo-tanlu/src/main/java/com/mogo/cloud/{ => tanlu}/bean/InformationBody.java (99%) rename modules/mogo-tanlu/src/main/java/com/mogo/cloud/{ => tanlu}/bean/MarkerExploreWay.java (98%) rename modules/mogo-tanlu/src/main/java/com/mogo/cloud/{ => tanlu}/bean/MarkerExploreWayItem.java (97%) rename modules/mogo-tanlu/src/main/java/com/mogo/cloud/{ => tanlu}/bean/MarkerUserInfo.java (99%) rename modules/mogo-tanlu/src/main/java/com/mogo/cloud/{ => tanlu}/bean/RoadInfoRequest.java (93%) rename modules/mogo-tanlu/src/main/java/com/mogo/cloud/{ => tanlu}/bean/RoadInfos.java (90%) rename modules/mogo-tanlu/src/main/java/com/mogo/cloud/{ => tanlu}/bean/UploadResult.java (92%) rename modules/mogo-tanlu/src/main/java/com/mogo/cloud/{ => tanlu}/bean/location/Location.java (90%) rename modules/mogo-tanlu/src/main/java/com/mogo/cloud/{ => tanlu}/bean/location/MarkerLocation.java (96%) rename modules/mogo-tanlu/src/main/java/com/mogo/cloud/{ => tanlu}/bean/location/MogoLocation.java (99%) rename modules/mogo-tanlu/src/main/java/com/mogo/cloud/{ => tanlu}/constant/HttpConstant.java (71%) rename modules/mogo-tanlu/src/main/java/com/mogo/cloud/{ => tanlu}/net/TanluApiService.java (88%) delete mode 100644 modules/mogo-tanlu/src/test/java/com/mogo/cloud/ExampleUnitTest.java diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 978f4dc..79d11f0 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -22,6 +22,7 @@ diff --git a/app/build.gradle b/app/build.gradle index 03bc2e5..50cb338 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -36,6 +36,8 @@ dependencies { implementation rootProject.ext.dependencies.androidxconstraintlayout implementation project(path: ':foudations:mogo-passport') implementation project(path: ':foudations:mogo-commons') + implementation project(path: ':modules:mogo-tanlu') + // implementation 'com.mogo.cloud:passport:1.0.0' implementation rootProject.ext.dependencies.rxjava implementation rootProject.ext.dependencies.rxandroid diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 93cd8d3..5fad0b2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -3,7 +3,7 @@ package="com.mogo.cloud"> diff --git a/app/src/main/java/com/mogo/cloud/PassPortActivity.java b/app/src/main/java/com/mogo/cloud/PassPortActivity.java index 14b8ad5..d6f870c 100644 --- a/app/src/main/java/com/mogo/cloud/PassPortActivity.java +++ b/app/src/main/java/com/mogo/cloud/PassPortActivity.java @@ -1,11 +1,13 @@ 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; /** @@ -17,6 +19,9 @@ public class PassPortActivity extends AppCompatActivity { private TextView tvSn; private TextView tvToken; + private Button btnJumpToNet; + + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -25,11 +30,17 @@ public class PassPortActivity extends AppCompatActivity { 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/java/com/mogo/cloud/network/ApiService.java b/app/src/main/java/com/mogo/cloud/network/ApiService.java index bfcf9da..0f35dca 100644 --- a/app/src/main/java/com/mogo/cloud/network/ApiService.java +++ b/app/src/main/java/com/mogo/cloud/network/ApiService.java @@ -1,7 +1,5 @@ package com.mogo.cloud.network; -import com.mogo.cloud.network.V2XRoadDataRes; - import java.util.Map; import io.reactivex.Observable; diff --git a/app/src/main/java/com/mogo/cloud/network/NetworkActivity.java b/app/src/main/java/com/mogo/cloud/network/NetworkActivity.java index 8efc828..0393a6c 100644 --- a/app/src/main/java/com/mogo/cloud/network/NetworkActivity.java +++ b/app/src/main/java/com/mogo/cloud/network/NetworkActivity.java @@ -1,6 +1,7 @@ package com.mogo.cloud.network; import android.os.Bundle; +import android.util.Log; import android.view.View; import android.widget.Button; import android.widget.TextView; @@ -10,6 +11,10 @@ import androidx.appcompat.app.AppCompatActivity; import com.google.gson.Gson; import com.mogo.cloud.R; import com.mogo.cloud.commons.network.RetrofitFactory; +import com.mogo.cloud.tanlu.UploadManager; +import com.mogo.cloud.tanlu.api.ITanluUploadCallback; +import com.mogo.cloud.tanlu.bean.InformationBody; +import com.mogo.cloud.tanlu.bean.UploadResult; import java.util.HashMap; @@ -38,16 +43,35 @@ public class NetworkActivity extends AppCompatActivity { tvResult = (TextView) findViewById(R.id.tv_result); apiService = RetrofitFactory.INSTANCE.getInstance("http://dzt-test.zhidaozhixing.com") .create(ApiService.class); + btn.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { tvResult.setText("结果显示"); - queryRoadData("ZD802C1938L10797"); - // queryHelpSignal("ZD802C1938L10797"); + // queryRoadData("ZD802C1938L10797"); +// queryHelpSignal("ZD802C1938L10797"); + + UploadManager.getInstance(NetworkActivity.this).loadUpload(new InformationBody(), new ITanluUploadCallback() { + @Override + public void onSuccess(UploadResult result) { + Log.d("liyz", "result.id = " + result.id); + } + + @Override + public void onFailure(int code) { + Log.d("liyz", " code = " + code); + } + + @Override + public void onError(Throwable e) { + Log.d("liyz", "onError e = " + e); + } + }); } }); } + public void queryRoadData(String sn) { if (apiService != null) { Map map = new HashMap<>(); diff --git a/app/src/main/res/layout/activity_pass_port_actvity.xml b/app/src/main/res/layout/activity_pass_port_actvity.xml index 7cd8d3b..4603219 100644 --- a/app/src/main/res/layout/activity_pass_port_actvity.xml +++ b/app/src/main/res/layout/activity_pass_port_actvity.xml @@ -29,4 +29,11 @@ android:text="Token：" android:textSize="20dp" /> +