diff --git a/README.md b/README.md index c65ec85..e33b239 100644 --- a/README.md +++ b/README.md @@ -49,4 +49,12 @@ 2.Icon替换 3.升级方式改变 通知栏->Dialog +``` + + +### 2023-9-22 (1.0.9) + +``` +1.常住人口修改为户籍人口(户在人在) + ``` \ No newline at end of file diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index 0ec9688..8ad025d 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -10,8 +10,8 @@ { "type": "SINGLE", "filters": [], - "versionCode": 8, - "versionName": "1.0.7", + "versionCode": 10, + "versionName": "1.0.9", "outputFile": "app-release.apk" } ] diff --git a/build.gradle b/build.gradle index 85b5b20..cda9633 100644 --- a/build.gradle +++ b/build.gradle @@ -55,8 +55,8 @@ ext { gCompileSdkVersion = 30 gMinSdkVersion = 21 gTargetSdkVersion = 30 - gVersionCode = 8 - gVersionName = '1.0.7' + gVersionCode = 10 + gVersionName = '1.0.9' gBuildToolsVersion = "29.0.2" // gVersionCode=26 // gVersionName='1.3.0' diff --git a/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/ui/LazyloadFragment.java b/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/ui/LazyloadFragment.java index e7111a5..737c285 100644 --- a/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/ui/LazyloadFragment.java +++ b/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/ui/LazyloadFragment.java @@ -1,11 +1,13 @@ package com.tengshisoft.chatmodule.hwclud.ui; +import android.content.Context; import android.os.Bundle; import android.text.TextUtils; import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.view.inputmethod.InputMethodManager; import com.tenlionsoft.baselib.utils.ToastUtils; @@ -162,7 +164,12 @@ public abstract class LazyloadFragment extends Fragment { ToastUtils.show(message); } } - + protected void hideSoftKeyboard(View view,Context ctx) { + InputMethodManager imm = (InputMethodManager) ctx.getSystemService(Context.INPUT_METHOD_SERVICE); + if (view != null) { + imm.hideSoftInputFromWindow(view.getWindowToken(), 0); + } + } /** * 设置Fragment要显示的布局 * 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 6cffd56..484cb63 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 @@ -312,7 +312,7 @@ public class GridDataPopulaceAddActivity extends BaseActivity { } String resident = mEtResident.getText().toString().trim(); if (TextUtils.isEmpty(resident)) { - ToastUtils.show("请输入常住人口数量"); + ToastUtils.show("请输入户籍人口(户在人在)数量"); return false; } diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/populace/PopulaceAreaListActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/populace/PopulaceAreaListActivity.java index 57b87b0..abfc8a6 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/populace/PopulaceAreaListActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/populace/PopulaceAreaListActivity.java @@ -148,7 +148,7 @@ public class PopulaceAreaListActivity extends BaseActivity { mRlvComponents.addItemDecoration(new ItemSplitDivider(mActivity, LinearLayoutManager.VERTICAL, 1, Color.parseColor("#BFBFBF"))); mSrlContent.setOnRefreshListener(v -> doRefresh()); mSrlContent.setOnLoadMoreListener(v -> doLoadMore()); - mTvType.setOnClickListener(v -> onShowTypeSelect()); +// mTvType.setOnClickListener(v -> onShowTypeSelect()); setStateView(13); mAdapter.addOnItemClickListener(v -> ARouter.getInstance() @@ -255,16 +255,16 @@ public class PopulaceAreaListActivity extends BaseActivity { } }); //初始化选择 - AreaSimpleBean bean1 = new AreaSimpleBean(); - bean1.setId("1"); - bean1.setName("户籍人口"); - - AreaSimpleBean bean2 = new AreaSimpleBean(); - bean2.setId("2"); - bean2.setName("户籍人口(外出)"); - mTypeList = new ArrayList<>(); - mTypeList.add(bean1); - mTypeList.add(bean2); +// AreaSimpleBean bean1 = new AreaSimpleBean(); +// bean1.setId("1"); +// bean1.setName("户籍人口(户在人在)"); +// +// AreaSimpleBean bean2 = new AreaSimpleBean(); +// bean2.setId("3"); +// bean2.setName("外来人口"); +// mTypeList = new ArrayList<>(); +// mTypeList.add(bean1); +// mTypeList.add(bean2); } diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/fragments/PopulaceLeaderStatisticsFragment.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/fragments/PopulaceLeaderStatisticsFragment.java index 4cbb03f..daead51 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/fragments/PopulaceLeaderStatisticsFragment.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/fragments/PopulaceLeaderStatisticsFragment.java @@ -160,9 +160,9 @@ public class PopulaceLeaderStatisticsFragment extends BaseFragment { pB.setCount(bean.getDangYuan() + ""); - AreaPopulaceBean.ItemBean pB1 = new AreaPopulaceBean.ItemBean(); - pB1.setName("户籍人口(外出)"); - pB1.setCount(bean.getWaiChuHuJi() + ""); +// AreaPopulaceBean.ItemBean pB1 = new AreaPopulaceBean.ItemBean(); +// pB1.setName("户籍人口(外出)"); +// pB1.setCount(bean.getWaiChuHuJi() + ""); AreaPopulaceBean.ItemBean pB2 = new AreaPopulaceBean.ItemBean(); @@ -180,12 +180,13 @@ public class PopulaceLeaderStatisticsFragment extends BaseFragment { pB4.setCount(bean.getChuZhongYiShang() + ""); AreaPopulaceBean.ItemBean pB5 = new AreaPopulaceBean.ItemBean(); - pB5.setName("非户籍人口"); + pB5.setName("外来人口"); pB5.setCount(bean.getChangZhu() + ""); AreaPopulaceBean.ItemBean pB6 = new AreaPopulaceBean.ItemBean(); - pB6.setName("户籍人口"); - pB6.setCount(bean.getHuJi() + ""); + pB6.setName("户籍人口(户在人在)"); +// pB6.setCount(bean.getHuJi() + bean.getWaiChuHuJi() + ""); + pB6.setCount(bean.getHuJi() + ""); AreaPopulaceBean.ItemBean pB7 = new AreaPopulaceBean.ItemBean(); pB7.setName("汉族人口"); @@ -194,9 +195,9 @@ public class PopulaceLeaderStatisticsFragment extends BaseFragment { mCountDatas.add(pB7);//汉族 mCountDatas.add(pB2);//男性 mCountDatas.add(pB3);//女性 - mCountDatas.add(pB6);//户籍人口 - mCountDatas.add(pB1);//户籍人口外出 - mCountDatas.add(pB5);//非户籍人口 + mCountDatas.add(pB6);//常住人口 +// mCountDatas.add(pB1);//户籍人口外出 + mCountDatas.add(pB5);//外来人口 mCountDatas.add(pB);//党员 mCountDatas.add(pB4); mPopulaceCountAdapter.setData(mCountDatas); @@ -317,7 +318,7 @@ public class PopulaceLeaderStatisticsFragment extends BaseFragment { ConditionAllAreaPopup areaPopup = new ConditionAllAreaPopup(mActivity, UserLgUtils.getUserFullAreaName(), UserLgUtils.getUserAreaLevel()); - areaPopup.setOnListPopupItemClickListener((areaNames, areaCode,level) -> { + areaPopup.setOnListPopupItemClickListener((areaNames, areaCode, level) -> { mTvArea.setText(areaNames); //刷新数据 mCurrentAreaCode = areaCode; diff --git a/commonmodule/src/main/res/layout/activity_grid_data_populace.xml b/commonmodule/src/main/res/layout/activity_grid_data_populace.xml index b233599..76945a7 100644 --- a/commonmodule/src/main/res/layout/activity_grid_data_populace.xml +++ b/commonmodule/src/main/res/layout/activity_grid_data_populace.xml @@ -183,7 +183,7 @@ + android:text="户籍人口(户在人在)" /> + android:layout_marginLeft="20dp"> + android:layout_marginLeft="20dp"> + android:layout_marginLeft="20dp"> + android:text="精神病障碍人数" /> + android:layout_marginLeft="20dp"> + android:text="刑满释放人数" /> + android:layout_marginLeft="20dp"> + android:text="信教群众" /> + android:layout_marginLeft="20dp"> + android:text="管控吸毒人数" /> + android:text="户籍人口(户在人在)" /> @@ -169,7 +169,7 @@ + android:text="精神病障碍患者" /> + android:text="信教群众" /> @@ -235,7 +235,7 @@ + android:text="管控吸毒人员" /> diff --git a/commonmodule/src/main/res/layout/activity_populace_area_list.xml b/commonmodule/src/main/res/layout/activity_populace_area_list.xml index d2ad1b7..208e331 100644 --- a/commonmodule/src/main/res/layout/activity_populace_area_list.xml +++ b/commonmodule/src/main/res/layout/activity_populace_area_list.xml @@ -58,6 +58,7 @@ + android:textSize="@dimen/text_12" /> + android:textSize="@dimen/text_12" /> + android:textSize="@dimen/text_12" /> + android:textSize="@dimen/text_12" />