diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 54349e6..7abdbfc 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -23,6 +23,7 @@
+
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 20dcc6f..af8d6e2 100644
--- a/app/src/main/java/com/mogo/cloud/network/NetworkActivity.java
+++ b/app/src/main/java/com/mogo/cloud/network/NetworkActivity.java
@@ -13,8 +13,10 @@ import com.mogo.cloud.R;
import com.mogo.cloud.commons.network.BaseData;
import com.mogo.cloud.commons.network.RetrofitFactory;
import com.mogo.cloud.tanlu.UploadManager;
+import com.mogo.cloud.tanlu.api.IRoadInfoSearchCallback;
import com.mogo.cloud.tanlu.api.ITanluUploadCallback;
import com.mogo.cloud.tanlu.bean.InformationBody;
+import com.mogo.cloud.tanlu.bean.RoadInfos;
import com.mogo.cloud.tanlu.bean.UploadResult;
@@ -52,6 +54,9 @@ public class NetworkActivity extends AppCompatActivity {
tvResult.setText("结果显示");
queryRoadData("ZD802C1938L10797");
// queryHelpSignal("ZD802C1938L10797");
+
+// uploadRoadInfo();
+// queryRoad();
}
});
@@ -60,9 +65,47 @@ public class NetworkActivity extends AppCompatActivity {
atomicInteger.getAndIncrement();
atomicInteger.incrementAndGet();
-
}
+ public void queryRoad() {
+ UploadManager.getInstance(NetworkActivity.this).init();
+ UploadManager.getInstance(NetworkActivity.this).queryRoadInfoByLocationInfo(null , new IRoadInfoSearchCallback() {
+ @Override
+ public void onSuccess(RoadInfos result) {
+ Log.d("liyz", "queryRoad size() = " + result.getData().size());
+ }
+
+ @Override
+ public void onFailure(int code) {
+ Log.d("liyz", "queryRoad code = " + code);
+ }
+
+ @Override
+ public void onError(Throwable e) {
+ Log.d("liyz", "queryRoad e = " + e);
+ }
+ });
+ }
+
+ public void uploadRoadInfo() {
+ UploadManager.getInstance(NetworkActivity.this).init();
+ UploadManager.getInstance(NetworkActivity.this).loadUpload(new InformationBody(), new ITanluUploadCallback() {
+ @Override
+ public void onSuccess(UploadResult result) {
+ Log.d("liyz", "uploadRoadInfo result.id = " + result.id);
+ }
+
+ @Override
+ public void onFailure(int code) {
+ Log.d("liyz", " uploadRoadInfo code = " + code);
+ }
+
+ @Override
+ public void onError(Throwable e) {
+ Log.d("liyz", "uploadRoadInfo onError e = " + e);
+ }
+ });
+ }
public void queryRoadData(String sn) {
if (apiService != null) {
diff --git a/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClientConfig.java b/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClientConfig.java
index 498252f..2e73472 100644
--- a/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClientConfig.java
+++ b/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClientConfig.java
@@ -175,6 +175,7 @@ public class MoGoAiCloudClientConfig {
* @return Token信息
*/
public String getToken() {
+
if (TextUtils.isEmpty(token)) {
Logger.e(TAG, "Token 获取失败……");
}
diff --git a/modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/UploadManager.java b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/UploadManager.java
index f274ef7..4f97dce 100644
--- a/modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/UploadManager.java
+++ b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/UploadManager.java
@@ -19,6 +19,7 @@ import com.mogo.utils.logger.Logger;
import com.mogo.utils.network.RequestOptions;
import com.mogo.utils.network.utils.GsonUtil;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import io.reactivex.Observable;
@@ -57,6 +58,11 @@ public class UploadManager {
return sInstance;
}
+ public void init () {
+ apiService = RetrofitFactory.INSTANCE.getInstance("http://dzt-test.zhidaozhixing.com")
+ .create(TanluApiService.class);
+ }
+
/**
*
* @param informationBody
@@ -64,9 +70,6 @@ public class UploadManager {
*
*/
public void loadUpload(InformationBody informationBody, ITanluUploadCallback callback) {
- apiService = RetrofitFactory.INSTANCE.getInstance("http://dzt-test.zhidaozhixing.com")
- .create(TanluApiService.class);
-
Gson gson = new Gson();
Map map = new HashMap<>();
// map.put("sn", MoGoAiCloudClient.getInstance().getAiCloudClientConfig().getSn()); //TODO
@@ -87,7 +90,7 @@ public class UploadManager {
@Override
public void onNext(UploadResult result) {
- Log.d(TAG, "onNext -----> ");
+ Log.d(TAG, "onNext id = -----> " + result.id);
callback.onSuccess(result);
}
@@ -111,10 +114,17 @@ public class UploadManager {
* @param callback
*/
public void queryRoadInfoByLocationInfo(RoadInfoRequest roadInfoRequest, IRoadInfoSearchCallback callback) {
+ ArrayList list = new ArrayList();
+ list.add("10007");
+
+ Location location = new Location();
+ location.setLat(39.968317);
+ location.setLon(116.410892);
+ RoadInfoRequest request = new RoadInfoRequest(location, "", list, false, false);
Map map = new HashMap<>();
map.put("sn", "F803EB2046PZD00228");
- map.put("data", GsonUtil.jsonFromObject(roadInfoRequest));
+ map.put("data", GsonUtil.jsonFromObject(request));
apiService.queryRoadInfos(map)
.subscribeOn(Schedulers.io())
diff --git a/modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/bean/RoadInfoRequest.java b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/bean/RoadInfoRequest.java
index 2800b62..9de1163 100644
--- a/modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/bean/RoadInfoRequest.java
+++ b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/bean/RoadInfoRequest.java
@@ -11,13 +11,15 @@ import java.util.ArrayList;
*/
public class RoadInfoRequest {
- private Location location;
+ private Location location; //没有定位信息,可传空对象。如果没有,服务端将更加文字逆序成经纬度查询
+ private String inputText;
private ArrayList poiTypes;
private boolean onlyFocus;
private boolean onlySameCity;
- public RoadInfoRequest(Location location, ArrayList poiTypes, boolean onlyFocus, boolean onlySameCity) {
+ public RoadInfoRequest(Location location, String inputText, ArrayList poiTypes, boolean onlyFocus, boolean onlySameCity) {
this.location = location;
+ this.inputText = inputText;
this.poiTypes = poiTypes;
this.onlyFocus = onlyFocus;
this.onlySameCity = onlySameCity;