From 96f67c05ae52d29324bb9d769f3c321e0c468778 Mon Sep 17 00:00:00 2001 From: itgaojian Date: Fri, 25 Aug 2023 17:23:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=96=B0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/release/output-metadata.json | 4 ++-- .../activitys/populace/GridDataPlaceActivity.java | 2 +- .../activitys/populace/GridDataPlaceDetailActivity.java | 2 +- .../activitys/populace/GridDataPopulaceActivity.java | 2 +- .../activitys/populace/GridDataPopulaceAddActivity.java | 1 + .../src/main/res/layout/activity_grid_data_place_detail.xml | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index d482420..0ec9688 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -10,8 +10,8 @@ { "type": "SINGLE", "filters": [], - "versionCode": 7, - "versionName": "1.0.6", + "versionCode": 8, + "versionName": "1.0.7", "outputFile": "app-release.apk" } ] 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 8cc3d5e..d40c158 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 @@ -136,7 +136,7 @@ public class GridDataPlaceActivity extends BaseActivity { mTvType.setOnClickListener(v -> onShowType()); mTvPageOptions.setOnClickListener(v -> ARouter.getInstance() .build(PathConfig.PATH_MODULE_COMMON_ACTIVITY_COMMAND_GRID_DATA_PLACE_ADD) - .navigation()); + .navigation(mActivity,12345)); mDatas = new ArrayList<>(); mSrlContent.setOnRefreshListener(refreshLayout -> refreshData()); mSrlContent.setOnLoadMoreListener(refreshLayout -> loadMore()); diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/populace/GridDataPlaceDetailActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/populace/GridDataPlaceDetailActivity.java index e785c69..7d83a92 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/populace/GridDataPlaceDetailActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/populace/GridDataPlaceDetailActivity.java @@ -64,7 +64,7 @@ public class GridDataPlaceDetailActivity extends BaseActivity { @BindView(R2.id.tv_grid) public TextView mTvGrid; @BindView(R2.id.tv_name) - public EditText mTvName; + public TextView mTvName; @BindView(R2.id.tv_type) public TextView mTvType; @BindView(R2.id.tmv_map) 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 5e33c8b..c438182 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 @@ -128,7 +128,7 @@ public class GridDataPopulaceActivity extends BaseActivity { }); mTvReport.setOnClickListener(v -> ARouter.getInstance() .build(PathConfig.PATH_MODULE_COMMON_ACTIVITY_COMMAND_GRID_DATA_POPULACE_ADD) - .navigation()); + .navigation(mActivity,1234)); mBtnEdit.setOnClickListener(v -> ARouter.getInstance() .build(PathConfig.PATH_MODULE_COMMON_ACTIVITY_COMMAND_GRID_DATA_POPULACE_ADD) .withString("id", mId) 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 023cb3c..6cffd56 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 @@ -240,6 +240,7 @@ public class GridDataPopulaceAddActivity extends BaseActivity { public void onNext(@NonNull SuccessBean successBean) { dialog.dismiss(); ToastUtils.show("添加成功"); + setResult(RESULT_OK); finish(); } diff --git a/commonmodule/src/main/res/layout/activity_grid_data_place_detail.xml b/commonmodule/src/main/res/layout/activity_grid_data_place_detail.xml index b6b7c76..534f568 100644 --- a/commonmodule/src/main/res/layout/activity_grid_data_place_detail.xml +++ b/commonmodule/src/main/res/layout/activity_grid_data_place_detail.xml @@ -87,7 +87,7 @@ android:text="企事业单位(小区)名称" /> -