diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/BaseUrlApi.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/BaseUrlApi.java index 5fcb9bb..c7e0388 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/BaseUrlApi.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/BaseUrlApi.java @@ -20,8 +20,8 @@ public class BaseUrlApi { public static final String SYS_VISITS = "visits/";/*信访系统*/ public static final String BASE_MAIN_IP = IP + SYS_USERCENTER; -// public static final String BASE_CASE_IP = IP + SYS_CASE; - public static final String BASE_CASE_IP = "http://192.168.0.120:9000/" + SYS_CASE; + public static final String BASE_CASE_IP = IP + SYS_CASE; +// public static final String BASE_CASE_IP = "http://192.168.0.120:9000/" + SYS_CASE; public static final String BASE_CASE_LOCAL_IP = "http://49.233.36.36:58099/case/"; public static final String BASE_LIBRARY_IP = IP + SYS_LIBRARY; public static final String BASE_TASK_IP = IP + SYS_TASK; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/populace/GridDataPlaceActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/populace/GridDataPlaceActivity.java index 96ae35b..8cc3d5e 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/populace/GridDataPlaceActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/populace/GridDataPlaceActivity.java @@ -124,7 +124,7 @@ public class GridDataPlaceActivity extends BaseActivity { mTvGrid.setHint("请选择"); mTvGrid.setOnClickListener(v -> { if (mAreaLevel != 4) { - ToastUtils.show("请先选择社区、村"); + ToastUtils.show("当前区域必须为社区、村"); return; } if (mGridList != null && mGridList.size() > 0) { diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/populace/GridDataPlaceAddActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/populace/GridDataPlaceAddActivity.java index 6c07de6..3ee0718 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/populace/GridDataPlaceAddActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/populace/GridDataPlaceAddActivity.java @@ -124,7 +124,7 @@ public class GridDataPlaceAddActivity extends BaseActivity { mBind = ButterKnife.bind(this); initMap(); - mTvArea3.setOnClickListener(v -> onShowArea()); +// mTvArea3.setOnClickListener(v -> onShowArea()); mTvGrid.setOnClickListener(v -> { if (TextUtils.isEmpty(mSelAreaCode)) { ToastUtils.show("请先选择所在地区"); @@ -141,6 +141,9 @@ public class GridDataPlaceAddActivity extends BaseActivity { .navigation(mActivity, 16)); mId = getIntent().getStringExtra("id"); + mSelAreaCode = UserLgUtils.getUserAreaCode(); + mSelAreaName = UserLgUtils.getUserFullAreaName(); + mTvArea3.setText(UserLgUtils.getUserFullAreaName()); if (TextUtils.isEmpty(mId)) { refreshView(STATE_LOAD_SUCCESS); mTvBaseTitle.setText("企事业单位信息新增"); diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/populace/GridDataPopulaceActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/populace/GridDataPopulaceActivity.java index f5f5269..5e33c8b 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/populace/GridDataPopulaceActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/populace/GridDataPopulaceActivity.java @@ -117,7 +117,7 @@ public class GridDataPopulaceActivity extends BaseActivity { mTvGrid.setHint("请选择"); mTvGrid.setOnClickListener(v -> { if (mAreaLevel != 4) { - ToastUtils.show("请先选择社区、村"); + ToastUtils.show("当前区域必须为社区、村"); return; } if (mGridList != null && mGridList.size() > 0) { diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/populace/GridDataPopulaceAddActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/populace/GridDataPopulaceAddActivity.java index 2fe5324..023cb3c 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/populace/GridDataPopulaceAddActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/populace/GridDataPopulaceAddActivity.java @@ -89,7 +89,7 @@ public class GridDataPopulaceAddActivity extends BaseActivity { public void initData() { ButterKnife.bind(this); mId = getIntent().getStringExtra("id"); - mTvArea3.setOnClickListener(v -> onShowArea()); +// mTvArea3.setOnClickListener(v -> onShowArea()); mTvGrid.setOnClickListener(v -> { if (TextUtils.isEmpty(mSelAreaCode)) { ToastUtils.show("请先选择区域"); @@ -107,6 +107,9 @@ public class GridDataPopulaceAddActivity extends BaseActivity { doEdit(); } }); + mSelAreaCode = UserLgUtils.getUserAreaCode(); + mSelAreaName = UserLgUtils.getUserFullAreaName(); + mTvArea3.setText(UserLgUtils.getUserFullAreaName()); if (TextUtils.isEmpty(mId)) { mTvBaseTitle.setText("网格人口情况信息录入"); refreshView(STATE_LOAD_SUCCESS);