Merge remote-tracking branch 'origin/master'

app/src/main/java/com/mogo/cloud/network/NetworkActivity.java

@@ -37,6 +37,7 @@ public class NetworkActivity extends AppCompatActivity {
     private Button btn;
     private TextView tvResult;
     private ApiService apiService;
+    private static final String TAG = "NetworkActivity";
 
 
     @Override
@@ -55,7 +56,9 @@ public class NetworkActivity extends AppCompatActivity {
                 queryRoadData("ZD802C1938L10797");
 //                queryHelpSignal("ZD802C1938L10797");
 
+                //上报路况到服务端
 //                uploadRoadInfo();
+                //查询路况
 //                queryRoad();
             }
         });
@@ -72,17 +75,18 @@ public class NetworkActivity extends AppCompatActivity {
         UploadManager.getInstance(NetworkActivity.this).queryRoadInfoByLocationInfo(null , new IRoadInfoSearchCallback() {
             @Override
             public void onSuccess(RoadInfos result) {
-                Log.d("liyz", "queryRoad size() = " + result.getData().size());
+                Log.d(TAG, "queryRoad size() = " + result.getData().size());
+                tvResult.setText(new Gson().toJson(result));
             }
 
             @Override
             public void onFailure(int code) {
-                Log.d("liyz", "queryRoad code = " + code);
+                Log.d(TAG, "queryRoad code = " + code);
             }
 
             @Override
             public void onError(Throwable e) {
-                Log.d("liyz", "queryRoad e = " + e);
+                Log.d(TAG, "queryRoad e = " + e);
             }
         });
     }
@@ -92,17 +96,18 @@ public class NetworkActivity extends AppCompatActivity {
         UploadManager.getInstance(NetworkActivity.this).loadUpload(new InformationBody(), new ITanluUploadCallback() {
             @Override
             public void onSuccess(UploadResult result) {
-                Log.d("liyz", "uploadRoadInfo result.id = " + result.id);
+                Log.d(TAG, "uploadRoadInfo result.id = " + result.id);
+                tvResult.setText("onSuccess - " + result.id + "");
             }
 
             @Override
             public void onFailure(int code) {
-                Log.d("liyz", " uploadRoadInfo code = " + code);
+                Log.d(TAG, " uploadRoadInfo code = " + code);
             }
 
             @Override
             public void onError(Throwable e) {
-                Log.d("liyz", "uploadRoadInfo onError e = " + e);
+                Log.d(TAG, "uploadRoadInfo onError e = " + e);
             }
         });
     }

modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/UploadManager.java

@@ -120,12 +120,16 @@ public class UploadManager {
         Location location = new Location();
         location.setLat(39.968317);
         location.setLon(116.410892);
-        RoadInfoRequest request = new RoadInfoRequest(location, "", list, false, false);
+        RoadInfoRequest request = new RoadInfoRequest(location, "中关村", list, false, false);
 
             Map<String, Object> map = new HashMap<>();
             map.put("sn", "F803EB2046PZD00228");
             map.put("data", GsonUtil.jsonFromObject(request));
 
+//        Map<String, Object> map = new HashMap<>();
+//        map.put("sn", MoGoAiCloudClient.getInstance().getAiCloudClientConfig().getSn());
+//        map.put("data", GsonUtil.jsonFromObject(roadInfoRequest));
+
             apiService.queryRoadInfos(map)
                     .subscribeOn(Schedulers.io())
                     .observeOn(AndroidSchedulers.mainThread())

modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/bean/RoadInfoRequest.java

@@ -11,8 +11,8 @@ import java.util.ArrayList;
  */
 public class RoadInfoRequest {
 
-    private Location location; //没有定位信息，可传空对象。如果没有，服务端将更加文字逆序成经纬度查询
-    private String inputText;
+    private Location location; //没有定位信息，可传空对象。如果没有，服务端将根据文字逆序成经纬度查询
+    private String inputText; //必须是有效的地理信息，否则可能会报错
     private ArrayList<String> poiTypes;
     private boolean onlyFocus;
     private boolean onlySameCity;
@@ -33,6 +33,14 @@ public class RoadInfoRequest {
         this.location = location;
     }
 
+    public String getInputText() {
+        return inputText;
+    }
+
+    public void setInputText(String inputText) {
+        this.inputText = inputText;
+    }
+
     public ArrayList<String> getPoiTypes() {
         return poiTypes;
     }
@@ -57,13 +65,5 @@ public class RoadInfoRequest {
         this.onlySameCity = onlySameCity;
     }
 
-    @Override
-    public String toString() {
-        return "RoadInfoRequest{" +
-                "location=" + location +
-                ", poiTypes=" + poiTypes +
-                ", onlyFocus=" + onlyFocus +
-                ", onlySameCity=" + onlySameCity +
-                '}';
-    }
+
 }