|
@@ -40,7 +40,6 @@ import com.tofly.route.bean.XjzBean;
|
|
|
import com.tofly.route.bean.builds.GroupDeptBean;
|
|
|
import com.tofly.route.bean.repair.RepairUserVo;
|
|
|
import com.tofly.route.module.map.MapLoadHelper;
|
|
|
-import com.tofly.route.module.sign.ui.UiSign;
|
|
|
import com.tofly.route.ui.imp.HdysImpl;
|
|
|
import com.tofly.route.ui.view.XjUserListView;
|
|
|
import com.tofly.route.util.AmapUtils.AmapLocationHelper;
|
|
@@ -56,8 +55,10 @@ import org.json.JSONException;
|
|
|
|
|
|
import java.io.IOException;
|
|
|
import java.util.ArrayList;
|
|
|
+import java.util.HashMap;
|
|
|
import java.util.HashSet;
|
|
|
import java.util.List;
|
|
|
+import java.util.Map;
|
|
|
import java.util.Set;
|
|
|
|
|
|
import butterknife.BindView;
|
|
@@ -132,7 +133,7 @@ public class HdysActivity extends LatteActivity implements MapLoadHelper {
|
|
|
baseMapController.loadBaseMap(mapView);
|
|
|
amapLocationHelper = new AmapLocationHelper(this, mapView);
|
|
|
amapLocationHelper.startLocating();
|
|
|
- amapLocationHelper.setMapLocationListener((location, addr, projLoc,longPoint) -> {
|
|
|
+ amapLocationHelper.setMapLocationListener((location, addr, projLoc, longPoint) -> {
|
|
|
mLocation = projLoc;
|
|
|
mapView.setViewpointCenterAsync(projLoc);
|
|
|
baseMapController.setProjLoc(projLoc);
|
|
@@ -161,9 +162,9 @@ public class HdysActivity extends LatteActivity implements MapLoadHelper {
|
|
|
}
|
|
|
|
|
|
|
|
|
- double lat = Double.valueOf(latAndLon[0]);
|
|
|
- double lng = Double.valueOf(latAndLon[1]);
|
|
|
- startSeartchLocation(lng,lat);
|
|
|
+ double lat = Double.valueOf(latAndLon[0]);
|
|
|
+ double lng = Double.valueOf(latAndLon[1]);
|
|
|
+ startSeartchLocation(lng, lat);
|
|
|
initRenderSymbol(location);
|
|
|
} else {
|
|
|
ToastUtil.showToast("不可超过数量的个数");
|
|
@@ -235,7 +236,7 @@ public class HdysActivity extends LatteActivity implements MapLoadHelper {
|
|
|
super.handleMessage(msg);
|
|
|
if (msg.what == SUCCESS) {
|
|
|
|
|
|
-
|
|
|
+
|
|
|
} else if (msg.what == FALSE) {
|
|
|
|
|
|
|
|
@@ -248,6 +249,7 @@ public class HdysActivity extends LatteActivity implements MapLoadHelper {
|
|
|
|
|
|
|
|
|
* 通过坐标 解析当前坐标对应地址
|
|
|
+ *
|
|
|
* @param lon
|
|
|
* @param lat
|
|
|
*/
|
|
@@ -312,16 +314,27 @@ public class HdysActivity extends LatteActivity implements MapLoadHelper {
|
|
|
}
|
|
|
hdslBean.setPlanNum(Integer.parseInt(etNum.getText().toString()));
|
|
|
hdslBean.setRatifyTime(Double.valueOf(etHdys.getText().toString()));
|
|
|
+
|
|
|
+
|
|
|
+ List<Map<String, String>> mapList = new ArrayList<>();
|
|
|
if (!TextUtils.isEmpty(etPhone.getText()))
|
|
|
hdslBean.setPhone(etPhone.getText().toString());
|
|
|
if (points != null && points.size() > 0) {
|
|
|
for (Point point : points) {
|
|
|
List<Double> p = new ArrayList<>();
|
|
|
+ Map<String, String> jsonLocation = new HashMap<>();
|
|
|
p.add(point.getX());
|
|
|
p.add(point.getY());
|
|
|
+ jsonLocation.put("x", String.valueOf(point.getX()));
|
|
|
+ jsonLocation.put("y", String.valueOf(point.getY()));
|
|
|
pointList.add(p);
|
|
|
+ mapList.add(jsonLocation);
|
|
|
+
|
|
|
}
|
|
|
- hdslBean.setLngLats(JSON.toJSONString(pointList));
|
|
|
+ String lngLats = JSON.toJSONString(mapList);
|
|
|
+
|
|
|
+ Log.e("TAG", "checkData: ---------------lngLats:"+lngLats );
|
|
|
+ hdslBean.setLngLats(lngLats);
|
|
|
}
|
|
|
isSuccess = true;
|
|
|
}
|