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 d852ff7..5fad0b2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -3,7 +3,7 @@ package="com.mogo.cloud"> + + + + \ No newline at end of file diff --git a/app/src/main/java/com/mogo/cloud/MainActivity.java b/app/src/main/java/com/mogo/cloud/MainActivity.java index 48a9ab8..0d69e37 100644 --- a/app/src/main/java/com/mogo/cloud/MainActivity.java +++ b/app/src/main/java/com/mogo/cloud/MainActivity.java @@ -12,6 +12,7 @@ public class MainActivity extends AppCompatActivity { private Button btnJumpPassPort; private Button btnJumpNetWorkPort; + private Button btnJumpRealTime; @Override protected void onCreate(Bundle savedInstanceState) { @@ -29,5 +30,11 @@ public class MainActivity extends AppCompatActivity { Intent intent = new Intent(MainActivity.this, NetworkActivity.class); startActivity(intent); }); + + btnJumpRealTime = findViewById(R.id.btnJumpRealTime); + btnJumpRealTime.setOnClickListener(v -> { + Intent intent = new Intent(MainActivity.this, RealTimeActivity.class); + startActivity(intent); + }); } } \ 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 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/RealTimeActivity.java b/app/src/main/java/com/mogo/cloud/RealTimeActivity.java new file mode 100644 index 0000000..ff3d378 --- /dev/null +++ b/app/src/main/java/com/mogo/cloud/RealTimeActivity.java @@ -0,0 +1,19 @@ +package com.mogo.cloud; + +import android.os.Bundle; + +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; + +/** + * @author liujing + * @description 描述 + * @since: 2021/1/21 + */ +public class RealTimeActivity extends AppCompatActivity { + @Override + protected void onCreate(@Nullable Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_real_time); + } +} 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 78dd1bf..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_main.xml b/app/src/main/res/layout/activity_main.xml index 8b7d4b2..13e61b8 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -21,6 +21,12 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:text="跳转网络基础测试" /> + +