优化地图页点位渲染速度

修改首页土壤地块详情对接接口
修改首页02角色显示对呀区县

app/src/main/java/com/zztrapp/zztrapp/bean/GetGbqyjbqkBean.java

+package com.zztrapp.zztrapp.bean;
+
+/**
+ * Describe 污染地块详情
+ * Created by Bby on 2022/12/15
+ * Email bby0856@163.com
+ */
+public class GetGbqyjbqkBean {
+
+    private Object id;
+    private Integer wrdkid;
+    private String wrdkbm;
+    private String syqdwmc;
+    private Object tdsyqr;
+    private String gsyyzzh;
+    private String wrdkdz;
+    private String yzbm;
+    private String wrdkzxjd;
+    private String wrdkzxwd;
+    private String zbsm;
+    private String dkszfw;
+    private String zdmj;
+    private String frdb;
+    private String syqdlxr;
+    private String syqdwlxdh;
+    private Object syqdwlxsj;
+    private Object fax;
+    private Object email;
+    private Object bz;
+    private String flag;
+    private String tsamp;
+    private Object jcXtbs;
+    private Integer tdsyqrlx;
+    private String qdHstdsqysj;
+    private Integer qrTdsyqrlx;
+    private String qrTdsyqr;
+    private String qrGsyyzzh;
+    private Integer xzydlx;
+    private Object dlkjxxtjPic;
+    private Object dkljxxtjShape;
+    private Object qdyy;
+    private Object qyyyQt;
+    private Integer dkghytlx;
+    private String dkghytxm;
+    private Object dkghytqt;
+    private Object userId;
+    private Object proportion;
+    private String isManyLandUser;
+    private String isQrManyLandUser;
+    private Object manyLandUser;
+    private Object qrManyLandUser;
+    private String hylbStr;
+
+    public Object getId() {
+        return id;
+    }
+
+    public void setId(Object id) {
+        this.id = id;
+    }
+
+    public Integer getWrdkid() {
+        return wrdkid;
+    }
+
+    public void setWrdkid(Integer wrdkid) {
+        this.wrdkid = wrdkid;
+    }
+
+    public String getWrdkbm() {
+        return wrdkbm;
+    }
+
+    public void setWrdkbm(String wrdkbm) {
+        this.wrdkbm = wrdkbm;
+    }
+
+    public String getSyqdwmc() {
+        return syqdwmc;
+    }
+
+    public void setSyqdwmc(String syqdwmc) {
+        this.syqdwmc = syqdwmc;
+    }
+
+    public Object getTdsyqr() {
+        return tdsyqr;
+    }
+
+    public void setTdsyqr(Object tdsyqr) {
+        this.tdsyqr = tdsyqr;
+    }
+
+    public String getGsyyzzh() {
+        return gsyyzzh;
+    }
+
+    public void setGsyyzzh(String gsyyzzh) {
+        this.gsyyzzh = gsyyzzh;
+    }
+
+    public String getWrdkdz() {
+        return wrdkdz;
+    }
+
+    public void setWrdkdz(String wrdkdz) {
+        this.wrdkdz = wrdkdz;
+    }
+
+    public String getYzbm() {
+        return yzbm;
+    }
+
+    public void setYzbm(String yzbm) {
+        this.yzbm = yzbm;
+    }
+
+    public String getWrdkzxjd() {
+        return wrdkzxjd;
+    }
+
+    public void setWrdkzxjd(String wrdkzxjd) {
+        this.wrdkzxjd = wrdkzxjd;
+    }
+
+    public String getWrdkzxwd() {
+        return wrdkzxwd;
+    }
+
+    public void setWrdkzxwd(String wrdkzxwd) {
+        this.wrdkzxwd = wrdkzxwd;
+    }
+
+    public String getZbsm() {
+        return zbsm;
+    }
+
+    public void setZbsm(String zbsm) {
+        this.zbsm = zbsm;
+    }
+
+    public String getDkszfw() {
+        return dkszfw;
+    }
+
+    public void setDkszfw(String dkszfw) {
+        this.dkszfw = dkszfw;
+    }
+
+    public String getZdmj() {
+        return zdmj;
+    }
+
+    public void setZdmj(String zdmj) {
+        this.zdmj = zdmj;
+    }
+
+    public String getFrdb() {
+        return frdb;
+    }
+
+    public void setFrdb(String frdb) {
+        this.frdb = frdb;
+    }
+
+    public String getSyqdlxr() {
+        return syqdlxr;
+    }
+
+    public void setSyqdlxr(String syqdlxr) {
+        this.syqdlxr = syqdlxr;
+    }
+
+    public String getSyqdwlxdh() {
+        return syqdwlxdh;
+    }
+
+    public void setSyqdwlxdh(String syqdwlxdh) {
+        this.syqdwlxdh = syqdwlxdh;
+    }
+
+    public Object getSyqdwlxsj() {
+        return syqdwlxsj;
+    }
+
+    public void setSyqdwlxsj(Object syqdwlxsj) {
+        this.syqdwlxsj = syqdwlxsj;
+    }
+
+    public Object getFax() {
+        return fax;
+    }
+
+    public void setFax(Object fax) {
+        this.fax = fax;
+    }
+
+    public Object getEmail() {
+        return email;
+    }
+
+    public void setEmail(Object email) {
+        this.email = email;
+    }
+
+    public Object getBz() {
+        return bz;
+    }
+
+    public void setBz(Object bz) {
+        this.bz = bz;
+    }
+
+    public String getFlag() {
+        return flag;
+    }
+
+    public void setFlag(String flag) {
+        this.flag = flag;
+    }
+
+    public String getTsamp() {
+        return tsamp;
+    }
+
+    public void setTsamp(String tsamp) {
+        this.tsamp = tsamp;
+    }
+
+    public Object getJcXtbs() {
+        return jcXtbs;
+    }
+
+    public void setJcXtbs(Object jcXtbs) {
+        this.jcXtbs = jcXtbs;
+    }
+
+    public Integer getTdsyqrlx() {
+        return tdsyqrlx;
+    }
+
+    public void setTdsyqrlx(Integer tdsyqrlx) {
+        this.tdsyqrlx = tdsyqrlx;
+    }
+
+    public String getQdHstdsqysj() {
+        return qdHstdsqysj;
+    }
+
+    public void setQdHstdsqysj(String qdHstdsqysj) {
+        this.qdHstdsqysj = qdHstdsqysj;
+    }
+
+    public Integer getQrTdsyqrlx() {
+        return qrTdsyqrlx;
+    }
+
+    public void setQrTdsyqrlx(Integer qrTdsyqrlx) {
+        this.qrTdsyqrlx = qrTdsyqrlx;
+    }
+
+    public String getQrTdsyqr() {
+        return qrTdsyqr;
+    }
+
+    public void setQrTdsyqr(String qrTdsyqr) {
+        this.qrTdsyqr = qrTdsyqr;
+    }
+
+    public String getQrGsyyzzh() {
+        return qrGsyyzzh;
+    }
+
+    public void setQrGsyyzzh(String qrGsyyzzh) {
+        this.qrGsyyzzh = qrGsyyzzh;
+    }
+
+    public Integer getXzydlx() {
+        return xzydlx;
+    }
+
+    public void setXzydlx(Integer xzydlx) {
+        this.xzydlx = xzydlx;
+    }
+
+    public Object getDlkjxxtjPic() {
+        return dlkjxxtjPic;
+    }
+
+    public void setDlkjxxtjPic(Object dlkjxxtjPic) {
+        this.dlkjxxtjPic = dlkjxxtjPic;
+    }
+
+    public Object getDkljxxtjShape() {
+        return dkljxxtjShape;
+    }
+
+    public void setDkljxxtjShape(Object dkljxxtjShape) {
+        this.dkljxxtjShape = dkljxxtjShape;
+    }
+
+    public Object getQdyy() {
+        return qdyy;
+    }
+
+    public void setQdyy(Object qdyy) {
+        this.qdyy = qdyy;
+    }
+
+    public Object getQyyyQt() {
+        return qyyyQt;
+    }
+
+    public void setQyyyQt(Object qyyyQt) {
+        this.qyyyQt = qyyyQt;
+    }
+
+    public Integer getDkghytlx() {
+        return dkghytlx;
+    }
+
+    public void setDkghytlx(Integer dkghytlx) {
+        this.dkghytlx = dkghytlx;
+    }
+
+    public String getDkghytxm() {
+        return dkghytxm;
+    }
+
+    public void setDkghytxm(String dkghytxm) {
+        this.dkghytxm = dkghytxm;
+    }
+
+    public Object getDkghytqt() {
+        return dkghytqt;
+    }
+
+    public void setDkghytqt(Object dkghytqt) {
+        this.dkghytqt = dkghytqt;
+    }
+
+    public Object getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Object userId) {
+        this.userId = userId;
+    }
+
+    public Object getProportion() {
+        return proportion;
+    }
+
+    public void setProportion(Object proportion) {
+        this.proportion = proportion;
+    }
+
+    public String getIsManyLandUser() {
+        return isManyLandUser;
+    }
+
+    public void setIsManyLandUser(String isManyLandUser) {
+        this.isManyLandUser = isManyLandUser;
+    }
+
+    public String getIsQrManyLandUser() {
+        return isQrManyLandUser;
+    }
+
+    public void setIsQrManyLandUser(String isQrManyLandUser) {
+        this.isQrManyLandUser = isQrManyLandUser;
+    }
+
+    public Object getManyLandUser() {
+        return manyLandUser;
+    }
+
+    public void setManyLandUser(Object manyLandUser) {
+        this.manyLandUser = manyLandUser;
+    }
+
+    public Object getQrManyLandUser() {
+        return qrManyLandUser;
+    }
+
+    public void setQrManyLandUser(Object qrManyLandUser) {
+        this.qrManyLandUser = qrManyLandUser;
+    }
+
+    public String getHylbStr() {
+        return hylbStr;
+    }
+
+    public void setHylbStr(String hylbStr) {
+        this.hylbStr = hylbStr;
+    }
+}

app/src/main/java/com/zztrapp/zztrapp/http/HttpApi.java

@@ -9,8 +9,8 @@ package com.zztrapp.zztrapp.http;
 public class HttpApi {
     //public static final String BASE_URL = "https://123.160.223.44:7443/trzz-java/";//密评
 //public static final String BASE_URL = "http://39.104.75.126:8061/trzz-java/";// 环境域名001
-//    public static final String BASE_URL = "http://123.160.223.44:82/trzz-java/";// 环境域名002
-    public static final String BASE_URL = "http://127.0.0.1/trzz-java/";// 环境域名003
+    public static final String BASE_URL = "http://123.160.223.44:82/trzz-java/";// 环境域名002
+//    public static final String BASE_URL = "http://127.0.0.1/trzz-java/";// 环境域名003
 
     //-------------------首页-------------------
     public static final String INDEX_LIST = "app/index/list";//index列表查询
@@ -45,6 +45,7 @@ public class HttpApi {
     public static final String MAP_INFO = "app/map/gis/getGISWrdkInfo";//污染地块-详情
     public static final String MAP_HCST = "app/map/gis/nchcstzlHcstsbzlypg";//黑臭水体
     public static final String MAP_NCSHWSCLSS = "app/map/gis/ncshwszlNcshwsclsstz";//农村生活污水处理设施
+    public static final String GET_GBQYJDQK = "jsyd/getGbqyjbqk";//污染地块查看详情的时候
 
 
     //-------------------通用-------------------

app/src/main/java/com/zztrapp/zztrapp/http/HttpMethods.java

@@ -13,6 +13,7 @@ import com.zztrapp.zztrapp.bean.ChoosePopItemBean;
 import com.zztrapp.zztrapp.bean.CreateUserBean;
 import com.zztrapp.zztrapp.bean.FileBean;
 import com.zztrapp.zztrapp.bean.GetAppNameBean;
+import com.zztrapp.zztrapp.bean.GetGbqyjbqkBean;
 import com.zztrapp.zztrapp.bean.GetTreeListBean;
 import com.zztrapp.zztrapp.bean.HeiChouShuiTiIndexBean;
 import com.zztrapp.zztrapp.bean.HttpResult;
@@ -113,7 +114,7 @@ public class HttpMethods {
             @Override
             public void log(String message) {
 //                打印retrofit日志
-                KLog.e("HttpLogInfo", message);
+                KLog.e("HttpLogInfo："+message);
             }
         });
         loggingInterceptor.setLevel(HttpLoggingInterceptor.Level.BODY);
@@ -442,7 +443,12 @@ public class HttpMethods {
         Observable observable = ZztrService.mapNcshwsclss(authorization, map);
         toSubscribe(observable, subscriber);
     }
-
+    public void getGbqyjbqk(ProgressSubscriber<HttpResult<GetGbqyjbqkBean>> subscriber, String wrdkid) {
+        initCommonParameter();
+        map.put("wrdkid", wrdkid);
+        Observable observable = ZztrService.getGbqyjbqk(authorization, map);
+        toSubscribe(observable, subscriber);
+    }
     //-------------------通用-------------------
     public void queryPageHcstList(ProgressSubscriber<HttpResult<BlackWaterTasksBean>> subscriber, int pageNo, int pageSize, String searchText, int isKfbj) {
         initCommonParameter();

app/src/main/java/com/zztrapp/zztrapp/http/ZztrService.java

@@ -7,6 +7,7 @@ import com.zztrapp.zztrapp.bean.ChoosePopItemBean;
 import com.zztrapp.zztrapp.bean.CreateUserBean;
 import com.zztrapp.zztrapp.bean.FileBean;
 import com.zztrapp.zztrapp.bean.GetAppNameBean;
+import com.zztrapp.zztrapp.bean.GetGbqyjbqkBean;
 import com.zztrapp.zztrapp.bean.GetTreeListBean;
 import com.zztrapp.zztrapp.bean.HeiChouShuiTiIndexBean;
 import com.zztrapp.zztrapp.bean.HttpResult;
@@ -148,6 +149,9 @@ public interface ZztrService {
     @GET(HttpApi.MAP_NCSHWSCLSS)
     Observable<HttpResult<List<MapNcshwsclssListBean>>> mapNcshwsclss(@Header("X-Access-Token") String token, @QueryMap Map<String, Object> map);
 
+    @GET(HttpApi.GET_GBQYJDQK)
+    Observable<HttpResult<GetGbqyjbqkBean>> getGbqyjbqk(@Header("X-Access-Token") String token, @QueryMap Map<String, Object> map);
+
 
     //-------------------通用-------------------
     @GET(HttpApi.HCST_LIST)

app/src/main/java/com/zztrapp/zztrapp/ui/index/IndexFragment.java

@@ -33,6 +33,7 @@ import com.zztrapp.zztrapp.ui.index.activity.WsclssListActivity;
 import com.zztrapp.zztrapp.ui.index.activity.ZdjgdwListActivity;
 import com.zztrapp.zztrapp.ui.index.adapter.IndexAdapter;
 import com.zztrapp.zztrapp.utilcode.klogs.KLog;
+import com.zztrapp.zztrapp.utilcode.util.SPUtils;
 import com.zztrapp.zztrapp.utilcode.util.ToastUtils;
 import com.zztrapp.zztrapp.widget.MyOptionPicker;
 
@@ -97,6 +98,9 @@ public class IndexFragment extends Fragment {
         binding.address.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
+                String userXz = SPUtils.getInstance().getString("userXz");
+                if (userXz.equals("02")) return;
+
                 binding.addressIcon.setRotation(180);
                 picker.setData(xzqxList);
                 if (xzqxList.size() > 0) {
@@ -241,13 +245,27 @@ public class IndexFragment extends Fragment {
                     choosePopItemBean.setCode("");
                     xzqxList.add(choosePopItemBean);
                     xzqxList.addAll(httpResult.getResult());
-                    //说明地区数据有变动，重置数据
-                    if (oleXzqxListSize != xzqxList.size()) {
-                        selectOption = 0;
-                        isShowDialog = false;
-                        countyCode = "";
-                        binding.addressHint.setText("全部地区");
-                        loadIndexList();
+
+                    String userXz = SPUtils.getInstance().getString("userXz");
+                    String departIds = SPUtils.getInstance().getString("departIds");
+
+                    if (userXz.equals("02")) {
+                        binding.addressIcon.setVisibility(View.GONE);
+                        for (int i = 0; i < xzqxList.size(); i++) {
+                            if (xzqxList.get(i).getCode().equals(departIds)) {
+                                binding.addressHint.setText(xzqxList.get(i).getName());
+                            }
+                        }
+                    } else {
+                        binding.addressIcon.setVisibility(View.GONE);
+                        //说明地区数据有变动，重置数据
+                        if (oleXzqxListSize != xzqxList.size()) {
+                            selectOption = 0;
+                            isShowDialog = false;
+                            countyCode = "";
+                            binding.addressHint.setText("全部地区");
+                            loadIndexList();
+                        }
                     }
                 } else {
                     ToastUtils.make().setGravity(Gravity.CENTER, 0, 0).show(httpResult.getMessage());

app/src/main/java/com/zztrapp/zztrapp/ui/index/activity/WrdkListActivity.java

@@ -132,6 +132,7 @@ public class WrdkListActivity extends BaseActivity {
                 intent.putExtra("jumpType", 2);//1编辑 2查看详情
                 intent.putExtra("navName", "详情");//1编辑 2查看详情
                 intent.putExtra("detail", list.get(position));
+                intent.putExtra("wrdkid", list.get(position).getWrdkid()+"");
                 startActivity(intent);
             }
         });

app/src/main/java/com/zztrapp/zztrapp/ui/mine/activity/LoginActivity.java

@@ -125,12 +125,10 @@ public class LoginActivity extends BaseActivity {
 //                    createUser();
                     SPUtils.getInstance().put("isLogin", true);
                     SPUtils.getInstance().put("userName", result.getUserInfo().getUsername());
-//                    SPUtils.getInstance().put("parcelName",  result.getUserInfo().getWrdkmc());
                     SPUtils.getInstance().put("realname", result.getUserInfo().getRealname());
-//                    String address =  result.getUserInfo().getProvinceName() +  result.getUserInfo().getCityName() +  result.getUserInfo().getCountyName();
-//                    SPUtils.getInstance().put("address", address);
+                    SPUtils.getInstance().put("userXz", result.getUserInfo().getUserXz());
+                    SPUtils.getInstance().put("departIds", result.getUserInfo().getDepartIds());
                     Intent intent = new Intent(LoginActivity.this, MainActivity.class);
-//                    SPUtils.getInstance().put("userType",  result.getUserInfo().getUserType());//0是土地使用权人，1是市质控
                     startActivity(intent);
                     finish();
                 } else {