diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7e04497..304e5d7 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -66,10 +66,6 @@
android:launchMode="singleTask"
android:screenOrientation="landscape"
android:windowSoftInputMode="stateHidden" />
-
{
- 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);
diff --git a/app/src/main/java/com/mogo/cloud/network/NetworkActivity.java b/app/src/main/java/com/mogo/cloud/network/NetworkActivity.java
deleted file mode 100644
index cd0ea7a..0000000
--- a/app/src/main/java/com/mogo/cloud/network/NetworkActivity.java
+++ /dev/null
@@ -1,180 +0,0 @@
-package com.mogo.cloud.network;
-
-import android.os.Bundle;
-import android.view.View;
-import android.widget.Button;
-import android.widget.TextView;
-
-import com.google.gson.Gson;
-import com.mogo.cloud.R;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import io.reactivex.Observer;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.schedulers.Schedulers;
-
-import static com.mogo.cloud.network.NetConstants.GEOFENCE_HOST;
-import static com.mogo.cloud.network.NetConstants.REALTIME_LOCATION_HOST;
-
-import androidx.appcompat.app.AppCompatActivity;
-
-/**
- * created by wujifei on 2021/1/21 12:26
- * describe:
- */
-public class NetworkActivity extends AppCompatActivity {
- private Button btn;
- private TextView tvResult;
- private ApiService apiService;
- private static final String TAG = "NetworkActivity";
-
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_network);
- btn = (Button) findViewById(R.id.btn);
- tvResult = (TextView) findViewById(R.id.tv_result);
-
-
- btn.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View view) {
- tvResult.setText("结果显示");
- queryRoadData("ZD802C1938L10797");
-// queryHelpSignal("F803EB2046PZD00006");
- }
- });
- }
-
- public void queryRoadData(String sn) {
- apiService = RetrofitFactory.INSTANCE.getInstance(GEOFENCE_HOST)
- .create(ApiService.class);
- if (apiService != null) {
- Map map = new HashMap<>();
- map.put("sn", sn);
- apiService.queryRoadDataOfVehiclesRecommend(map)
- .subscribeOn(Schedulers.io())
- .observeOn(AndroidSchedulers.mainThread())
- .subscribe(new Observer>() {
- @Override
- public void onSubscribe(Disposable d) {
-
- }
-
- @Override
- public void onNext(BaseData value) {
- tvResult.setText(formatJson(new Gson().toJson(value)));
- System.out.println(formatJson(new Gson().toJson(value)));
- }
-
- @Override
- public void onError(Throwable e) {
- tvResult.setText(e.toString());
- System.out.println(e);
- }
-
- @Override
- public void onComplete() {
-
- }
- });
- }
- }
-
- public void queryHelpSignal(String sn) {
- apiService = RetrofitFactory.INSTANCE.getInstance(REALTIME_LOCATION_HOST)
- .create(ApiService.class);
- if (apiService != null) {
- Map map = new HashMap<>();
- map.put("sn", sn);
- apiService.queryHelpSignal(map)
- .subscribeOn(Schedulers.io())
- .observeOn(AndroidSchedulers.mainThread())
- .subscribe(new Observer>() {
- @Override
- public void onSubscribe(Disposable d) {
-
- }
-
- @Override
- public void onNext(BaseData value) {
- tvResult.setText(formatJson(new Gson().toJson(value)));
- System.out.println(formatJson(new Gson().toJson(value)));
- }
-
- @Override
- public void onError(Throwable e) {
- tvResult.setText(e.toString());
- System.out.println(e);
- }
-
- @Override
- public void onComplete() {
-
- }
- });
- }
- }
-
-
- public static String formatJson(String jsonStr) {
- if (null == jsonStr || "".equals(jsonStr))
- return "";
- StringBuilder sb = new StringBuilder();
- char last = '\0';
- char current = '\0';
- int indent = 0;
- boolean isInQuotationMarks = false;
- for (int i = 0; i < jsonStr.length(); i++) {
- last = current;
- current = jsonStr.charAt(i);
- switch (current) {
- case '"':
- if (last != '\\') {
- isInQuotationMarks = !isInQuotationMarks;
- }
- sb.append(current);
- break;
- case '{':
- case '[':
- sb.append(current);
- if (!isInQuotationMarks) {
- sb.append('\n');
- indent++;
- addIndentBlank(sb, indent);
- }
- break;
- case '}':
- case ']':
- if (!isInQuotationMarks) {
- sb.append('\n');
- indent--;
- addIndentBlank(sb, indent);
- }
- sb.append(current);
- break;
- case ',':
- sb.append(current);
- if (last != '\\' && !isInQuotationMarks) {
- sb.append('\n');
- addIndentBlank(sb, indent);
- }
- break;
- default:
- sb.append(current);
- }
- }
-
- return sb.toString();
- }
-
- private static void addIndentBlank(StringBuilder sb, int indent) {
- for (int i = 0; i < indent; i++) {
- sb.append('\t');
- }
- }
-}
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 7879c78..a2556c4 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -54,12 +54,6 @@
android:layout_height="match_parent"
android:text="查看配置信息" />
-
-