人口显示修改

README.md

@@ -49,4 +49,12 @@
 2.Icon替换
 3.升级方式改变 通知栏->Dialog
 
+```
+
+
+### 2023-9-22 (1.0.9)
+
+```
+1.常住人口修改为户籍人口(户在人在)
+
 ```

app/release/output-metadata.json

@@ -10,8 +10,8 @@
     {
       "type": "SINGLE",
       "filters": [],
-      "versionCode": 8,
+      "versionCode": 10,
-      "versionName": "1.0.7",
+      "versionName": "1.0.9",
       "outputFile": "app-release.apk"
     }
   ]

build.gradle

@@ -55,8 +55,8 @@ ext {
     gCompileSdkVersion = 30
     gMinSdkVersion = 21
     gTargetSdkVersion = 30
-    gVersionCode = 8
+    gVersionCode = 10
-    gVersionName = '1.0.7'
+    gVersionName = '1.0.9'
     gBuildToolsVersion = "29.0.2"
 //    gVersionCode=26
 //    gVersionName='1.3.0'

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要显示的布局
      *

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;
         }
 

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();
+//        AreaSimpleBean bean1 = new AreaSimpleBean();
-        bean1.setId("1");
+//        bean1.setId("1");
-        bean1.setName("户籍人口");
+//        bean1.setName("户籍人口(户在人在)");
-
+//
-        AreaSimpleBean bean2 = new AreaSimpleBean();
+//        AreaSimpleBean bean2 = new AreaSimpleBean();
-        bean2.setId("2");
+//        bean2.setId("3");
-        bean2.setName("户籍人口(外出)");
+//        bean2.setName("外来人口");
-        mTypeList = new ArrayList<>();
+//        mTypeList = new ArrayList<>();
-        mTypeList.add(bean1);
+//        mTypeList.add(bean1);
-        mTypeList.add(bean2);
+//        mTypeList.add(bean2);
     }
 
 

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();
+//        AreaPopulaceBean.ItemBean pB1 = new AreaPopulaceBean.ItemBean();
-        pB1.setName("户籍人口(外出)");
+//        pB1.setName("户籍人口(外出)");
-        pB1.setCount(bean.getWaiChuHuJi() + "");
+//        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.setName("户籍人口(户在人在)");
-        pB6.setCount(bean.getHuJi() + "");
+//        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(pB6);//常住人口
-        mCountDatas.add(pB1);//户籍人口外出
+//        mCountDatas.add(pB1);//户籍人口外出
-        mCountDatas.add(pB5);//非户籍人口
+        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;

commonmodule/src/main/res/layout/activity_grid_data_populace.xml

@@ -183,7 +183,7 @@
 
                         <TextView
                             style="@style/item_data_digit_title"
-                            android:text="常住人口" />
+                            android:text="户籍人口(户在人在)" />
 
                         <TextView
                             android:id="@+id/tv_resident"
@@ -193,7 +193,7 @@
 
                     <LinearLayout
                         style="@style/item_data_digit_layout"
-                        android:layout_marginLeft="10dp">
+                        android:layout_marginLeft="20dp">
 
                         <TextView
                             style="@style/item_data_digit_title"
@@ -207,7 +207,7 @@
 
                     <LinearLayout
                         style="@style/item_data_digit_layout"
-                        android:layout_marginLeft="10dp">
+                        android:layout_marginLeft="20dp">
 
                         <TextView
                             style="@style/item_data_digit_title"
@@ -221,11 +221,11 @@
 
                     <LinearLayout
                         style="@style/item_data_digit_layout"
-                        android:layout_marginLeft="10dp">
+                        android:layout_marginLeft="20dp">
 
                         <TextView
                             style="@style/item_data_digit_title"
-                            android:text="易肇事肇祸精神障碍患者人数" />
+                            android:text="精神病障碍人数" />
 
                         <TextView
                             android:id="@+id/tv_mental"
@@ -235,11 +235,11 @@
 
                     <LinearLayout
                         style="@style/item_data_digit_layout"
-                        android:layout_marginLeft="10dp">
+                        android:layout_marginLeft="20dp">
 
                         <TextView
                             style="@style/item_data_digit_title"
-                            android:text="刑满释放人员" />
+                            android:text="刑满释放人数" />
 
                         <TextView
                             android:id="@+id/tv_release"
@@ -249,11 +249,11 @@
 
                     <LinearLayout
                         style="@style/item_data_digit_layout"
-                        android:layout_marginLeft="10dp">
+                        android:layout_marginLeft="20dp">
 
                         <TextView
                             style="@style/item_data_digit_title"
-                            android:text="邪教人员" />
+                            android:text="信教群众" />
 
                         <TextView
                             android:id="@+id/tv_heresy"
@@ -263,11 +263,11 @@
 
                     <LinearLayout
                         style="@style/item_data_digit_layout"
-                        android:layout_marginLeft="10dp">
+                        android:layout_marginLeft="20dp">
 
                         <TextView
                             style="@style/item_data_digit_title"
-                            android:text="吸毒人员" />
+                            android:text="管控吸毒人数" />
 
                         <TextView
                             android:id="@+id/tv_drug"

commonmodule/src/main/res/layout/activity_grid_data_populace_add.xml

@@ -102,7 +102,7 @@
 
                     <TextView
                         style="@style/item_title"
-                        android:text="常住人口" />
+                        android:text="户籍人口(户在人在)" />
 
 
                     <EditText
@@ -110,7 +110,7 @@
                         style="@style/item_content"
                         android:layout_gravity="center_vertical"
                         android:digits="@string/limit_phone"
-                        android:hint="请输入常住人口数量"
+                        android:hint="请输入户籍人口(户在人在)数量"
                         android:inputType="number" />
                 </LinearLayout>
 
@@ -169,7 +169,7 @@
 
                     <TextView
                         style="@style/item_title"
-                        android:text="易肇事肇祸精神障碍患者" />
+                        android:text="精神病障碍患者" />
 
 
                     <EditText
@@ -213,7 +213,7 @@
 
                     <TextView
                         style="@style/item_title"
-                        android:text="邪教人员" />
+                        android:text="信教群众" />
 
 
                     <EditText
@@ -221,7 +221,7 @@
                         style="@style/item_content"
                         android:layout_gravity="center_vertical"
                         android:digits="@string/limit_phone"
-                        android:hint="请输入邪教人员数量"
+                        android:hint="请输入信教群众数量"
                         android:inputType="number" />
                 </LinearLayout>
 
@@ -235,7 +235,7 @@
 
                     <TextView
                         style="@style/item_title"
-                        android:text="吸毒人员" />
+                        android:text="管控吸毒人员" />
 
 
                     <EditText
@@ -243,7 +243,7 @@
                         style="@style/item_content"
                         android:layout_gravity="center_vertical"
                         android:digits="@string/limit_phone"
-                        android:hint="请输入吸毒人员数量"
+                        android:hint="请输入管控吸毒人员数量"
                         android:inputType="number" />
                 </LinearLayout>
 

commonmodule/src/main/res/layout/activity_populace_area_list.xml

@@ -58,6 +58,7 @@
             <View
                 android:layout_width="1dp"
                 android:layout_height="match_parent"
+                android:visibility="gone"
                 android:background="@color/gray_line" />
 
             <TextView
@@ -72,6 +73,7 @@
                 android:maxLines="1"
                 android:minWidth="100dp"
                 android:paddingTop="5dp"
+                android:visibility="gone"
                 android:paddingBottom="5dp"
                 android:text="人口类型"
                 android:textColor="@color/black"

commonmodule/src/main/res/layout/fragment_populace_leader_statistics.xml

@@ -116,7 +116,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="总人口数"
-                            android:textSize="@dimen/text_14" />
+                            android:textSize="@dimen/text_12" />
 
                         <com.tenlionsoft.baselib.core.widget.views.TypeBoldTextView
                             android:id="@+id/tv_total_populace"
@@ -139,7 +139,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="占全市人口"
-                            android:textSize="@dimen/text_14" />
+                            android:textSize="@dimen/text_12" />
 
                         <com.tenlionsoft.baselib.core.widget.views.TypeBoldTextView
                             android:id="@+id/tv_populace_percent"
@@ -162,7 +162,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="事件率"
-                            android:textSize="@dimen/text_14" />
+                            android:textSize="@dimen/text_12" />
 
                         <com.tenlionsoft.baselib.core.widget.views.TypeBoldTextView
                             android:id="@+id/tv_populace_incident_percent"
@@ -186,7 +186,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="辖内社区/村"
-                            android:textSize="@dimen/text_14" />
+                            android:textSize="@dimen/text_12" />
 
                         <com.tenlionsoft.baselib.core.widget.views.TypeBoldTextView
                             android:id="@+id/tv_populace_community"

settings.gradle

@@ -3,7 +3,6 @@ include ':app'
 include ':mainmodule'
 include ':commandmodule'
 include ':moduleijkplayer'
-include ':modulemap'
 include ':chatmodule'
 include ':baselib'
 include ':commonmodule'