fixed conflict
This commit is contained in:
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user