辖区人口添加人口类型筛选条件

app/build.gradle

@@ -62,5 +62,5 @@ dependencies {
     //状态栏
     implementation 'androidx.appcompat:appcompat:1.3.1'
     //其中latest.release指代最新Bugly SDK版本号，也可以指定明确的版本号，例如2.2.0
-    implementation 'com.tencent.bugly:crashreport:3.4.4'
+    implementation "com.tencent.bugly:crashreport:${rootProject.ext.gBugly}"
 }

app/proguard-rules.pro

@@ -19,3 +19,6 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+
+-dontwarn com.tencent.bugly.**
+-keep public class com.tencent.bugly.**{*;}

app/release/output-metadata.json

@@ -10,8 +10,8 @@
     {
       "type": "SINGLE",
       "filters": [],
-      "versionCode": 5,
+      "versionCode": 6,
-      "versionName": "1.0.4",
+      "versionName": "1.0.5",
       "outputFile": "app-release.apk"
     }
   ]

app/src/main/AndroidManifest.xml

@@ -20,15 +20,15 @@
         <!-- 配置APP ID -->
         <meta-data
             android:name="BUGLY_APPID"
-            android:value="09594f12ad" />
+            android:value="72b5060a81" />
         <!-- 配置APP版本号 -->
         <meta-data
             android:name="BUGLY_APP_VERSION"
-            android:value="1.0.0" />
+            android:value="1.0.4" />
         <!-- 配置APP渠道号 -->
         <meta-data
             android:name="BUGLY_APP_CHANNEL"
-            android:value="68e6f412-277d-4e2a-9683-80dd0d35ac50" />
+            android:value="80f743be-cc04-4be3-9ea4-698ca95a4f0e" />
         <!-- 配置Bugly调试模式（true或者false）-->
         <meta-data
             android:name="BUGLY_ENABLE_DEBUG"

app/src/main/java/com/tengshisoft/commandclient/BaseMyApplication.java

@@ -2,27 +2,14 @@ package com.tengshisoft.commandclient;
 
 import android.app.ActivityManager;
 import android.content.Context;
-import android.os.Build;
+
+import androidx.appcompat.app.AppCompatDelegate;
 
 import com.alibaba.android.arouter.launcher.ARouter;
-import com.baidu.location.BDLocation;
 import com.baidu.mapapi.CoordType;
 import com.baidu.mapapi.SDKInitializer;
-import com.huawei.ecterminalsdk.base.TsdkLocalAddress;
-import com.huawei.ecterminalsdk.models.TsdkManager;
 import com.tencent.bugly.crashreport.CrashReport;
-import com.tengshisoft.chatmodule.beans.ServiceSettingBeanV2;
-import com.tengshisoft.chatmodule.hwclud.manager.CallMgrV2;
-import com.tengshisoft.chatmodule.hwclud.manager.LoginMangerV2;
-import com.tengshisoft.chatmodule.hwclud.manager.MeetingMgrV2;
-import com.tengshisoft.chatmodule.hwclud.notification.CallFunc;
-import com.tengshisoft.chatmodule.hwclud.notification.ConfFunc;
-import com.tengshisoft.chatmodule.hwclud.receiver.LoginReceiver;
-import com.tengshisoft.chatmodule.hwclud.serivce.ServiceManger;
-import com.tengshisoft.chatmodule.hwclud.utils.DeviceManager;
-import com.tengshisoft.chatmodule.hwclud.utils.GMUtil;
 import com.tenlionsoft.baselib.app.BaseAppContext;
-import com.tenlionsoft.baselib.core.retrofit_net.BaseUrlApi;
 import com.tenlionsoft.baselib.utils.AppUtils;
 import com.tenlionsoft.baselib.utils.FileUtils;
 import com.tenlionsoft.baselib.utils.LogUtils;
@@ -31,9 +18,6 @@ import com.tenlionsoft.baselib.utils.Utils;
 import java.io.IOException;
 import java.util.List;
 
-import androidx.annotation.RequiresApi;
-import androidx.appcompat.app.AppCompatDelegate;
-
 import cn.leo.magic.screen.MagicScreenAdapter;
 
 /**
@@ -86,28 +70,28 @@ public class BaseMyApplication extends BaseAppContext {
             String[] list_inDir = getAssets().list(inDir);
             assert list_inDir != null;
             for (String fileName :
-                list_inDir) {
+                    list_inDir) {
                 FileUtils.copyAssetToFiles(inDir, fileName);
             }
 
             String[] list_smDir = getAssets().list(smDir);
             assert list_smDir != null;
             for (String fileName :
-                list_smDir) {
+                    list_smDir) {
                 FileUtils.copyAssetToFiles(smDir, fileName);
             }
 
             String[] list_root = getAssets().list(root);
             assert list_root != null;
             for (String fileName :
-                list_root) {
+                    list_root) {
                 FileUtils.copyAssetToFiles(root, fileName);
             }
 
             String[] list_smRoot = getAssets().list(smRoot);
             assert list_smRoot != null;
             for (String fileName :
-                list_smRoot) {
+                    list_smRoot) {
                 FileUtils.copyAssetToFiles(smRoot, fileName);
             }
         } catch (IOException e) {

baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/ConditionAreaPopup.java

@@ -5,15 +5,12 @@ import android.graphics.Color;
 import android.util.DisplayMetrics;
 import android.view.Gravity;
 import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
 
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.tenlionsoft.baselib.R;
 import com.tenlionsoft.baselib.core.beans.AreaSimpleBean;
-import com.tenlionsoft.baselib.core.widget.base.ConditionAdapter;
 import com.tenlionsoft.baselib.core.widget.base.ConditionAreaAdapter;
 
 import java.util.ArrayList;
@@ -49,9 +46,11 @@ public class ConditionAreaPopup extends BasePopupWindow {
 
         setBackgroundColor(Color.parseColor("#11000000"));
         setPopupGravity(Gravity.BOTTOM | Gravity.CENTER);
-        DisplayMetrics displayMetrics = context.getResources().getDisplayMetrics();
+        if (mDatas.size() > 6) {
-        int height = (int) (displayMetrics.heightPixels * 0.5);
+            DisplayMetrics displayMetrics = context.getResources().getDisplayMetrics();
-        setHeight(height);
+            int height = (int) (displayMetrics.heightPixels * 0.5);
+            setHeight(height);
+        }
         mAdapter.addOnitemCheckChange((bean, isCheck, pos) -> {
             if (isCheck) {
                 mAdapter.mSelBeans.clear();

baselib/src/main/res/layout/popup_condition_layout.xml

@@ -1,14 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
+    android:background="@drawable/shp_rectangle_white"
     android:orientation="vertical">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rlv_conditions"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
-        android:background="@drawable/shp_rectangle_white"
+        android:layout_weight="1"
+
         android:padding="5dp" />
+
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="20dp"
+        android:layout_gravity="center"
+        android:scaleType="fitCenter"
+        android:src="@drawable/ic_down_arrow_double_gray" />
 </LinearLayout>

build.gradle

@@ -55,8 +55,8 @@ ext {
     gCompileSdkVersion = 30
     gMinSdkVersion = 21
     gTargetSdkVersion = 30
-    gVersionCode = 5
+    gVersionCode = 6
-    gVersionName = '1.0.4'
+    gVersionName = '1.0.5'
     gBuildToolsVersion = "29.0.2"
 //    gVersionCode=26
 //    gVersionName='1.3.0'
@@ -128,4 +128,5 @@ ext {
     magicIndicator = '1.7.0'
     //图表
     mpAndroidChart = 'v3.1.0'
+    gBugly = '4.1.9.2'
 }

commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/populace/PopulaceAreaListActivity.java

@@ -81,6 +81,8 @@ public class PopulaceAreaListActivity extends BaseActivity {
     TextView mTvArea3;
     @BindView(R2.id.tv_total)
     TextView mTvTotal;
+    @BindView(R2.id.tv_type)
+    TextView mTvType;
     private Unbinder mBind;
     private List<CensusPersonBean.RowsBean> mDatas;
     private CensusPersonAdapter mAdapter;
@@ -98,6 +100,8 @@ public class PopulaceAreaListActivity extends BaseActivity {
     private String mCurrentAreaCode = PathConfig.DEFAULT_AREA_2_CODE;
     private String mSelAreaCode = "";
     private AreaGridListBean.RowsBean mSelGrid;
+    private String mType = "";// 1户籍人口  2户籍人口外出  3非户籍人口
+    private List<AreaSimpleBean> mTypeList;
 
     @Override
     protected int setLayoutId() {
@@ -134,7 +138,7 @@ public class PopulaceAreaListActivity extends BaseActivity {
         mRlTitleBar.setBackgroundColor(getResources().getColor(R.color.white));
         mIvAppSearchIcon.setVisibility(View.GONE);
         mTvAppBack.setBackgroundResource(R.drawable.ic_back_black);
-
+        mEtSearchKey.setHint("请输入姓名或身份证号码查询");
         refreshView(STATE_LOAD_SUCCESS);
         mIvAppSearchIcon.setVisibility(View.VISIBLE);
         mDatas = new ArrayList<>();
@@ -144,9 +148,10 @@ 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());
         setStateView(13);
 
-   mAdapter.addOnItemClickListener(v -> ARouter.getInstance()
+        mAdapter.addOnItemClickListener(v -> ARouter.getInstance()
                 .build(PathConfig.PATH_MODULE_COMMON_ACTIVITY_POPULACE_DETAIL)
                 .withString("id", v.getBasePopulationInfoId())
                 .navigation());
@@ -249,6 +254,44 @@ public class PopulaceAreaListActivity extends BaseActivity {
                 getGridList();
             }
         });
+        //初始化选择
+        AreaSimpleBean bean1 = new AreaSimpleBean();
+        bean1.setId("1");
+        bean1.setName("户籍人口");
+
+        AreaSimpleBean bean2 = new AreaSimpleBean();
+        bean2.setId("2");
+        bean2.setName("户籍人口(外出)");
+        AreaSimpleBean bean3 = new AreaSimpleBean();
+        bean3.setId("3");
+        bean3.setName("非户籍人口");
+        mTypeList = new ArrayList<>();
+        mTypeList.add(bean1);
+        mTypeList.add(bean2);
+        mTypeList.add(bean3);
+    }
+
+
+    /**
+     * 选择type
+     */
+    private void onShowTypeSelect() {
+        ConditionAreaPopup conditionPopup = new ConditionAreaPopup(mActivity, mTypeList);
+        conditionPopup.setOnListPopupItemClickListener((bean, isCheck, pos) -> {
+            if (isCheck) {
+                //选中了
+                mType = bean.getId();
+                mTvType.setText(bean.getName());
+            } else {
+                //清除了选项
+                mTvType.setText("人口类型");
+                mType = "";
+            }
+            mDialog.show();
+            doRefresh();
+            conditionPopup.dismiss();
+        });
+        conditionPopup.showPopupWindow(mTvType);
     }
 
     /**
@@ -333,6 +376,7 @@ public class PopulaceAreaListActivity extends BaseActivity {
                         mSelAreaCode,
                         mSelGrid == null ? "" : mSelGrid.getGridId(),
                         mCurrentPage + "",
+                        mType,
                         UserLgUtils.getToken())
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())

commonmodule/src/main/java/com/tengshisoft/commonmodule/nets/GridApis.java

@@ -1167,6 +1167,7 @@ public interface GridApis {
             @Query("areaCode") String areaCode,
             @Query("gridId") String gridId,
             @Query("page") String page,
+            @Query("type") String type,
             @Header("token") String token);
 
     /**

commonmodule/src/main/java/com/tengshisoft/commonmodule/views/ConditionAreaGridPopup.java

@@ -12,8 +12,6 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.tengshisoft.commonmodule.adapters.ConditionAreaGridAdapter;
 import com.tengshisoft.commonmodule.beans.AreaGridListBean;
 import com.tenlionsoft.baselib.R;
-import com.tenlionsoft.baselib.core.beans.AreaSimpleBean;
-import com.tenlionsoft.baselib.core.widget.base.ConditionAreaAdapter;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -48,9 +46,11 @@ public class ConditionAreaGridPopup extends BasePopupWindow {
 
         setBackgroundColor(Color.parseColor("#11000000"));
         setPopupGravity(Gravity.BOTTOM | Gravity.CENTER);
-        DisplayMetrics displayMetrics = context.getResources().getDisplayMetrics();
+        if (mDatas.size() > 6) {
-        int height = (int) (displayMetrics.heightPixels * 0.5);
+            DisplayMetrics displayMetrics = context.getResources().getDisplayMetrics();
-        setHeight(height);
+            int height = (int) (displayMetrics.heightPixels * 0.5);
+            setHeight(height);
+        }
         mAdapter.addOnitemCheckChange((bean, isCheck, pos) -> {
             if (isCheck) {
                 mAdapter.mSelBeans.clear();

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

@@ -29,7 +29,7 @@
                 android:padding="5dp"
                 android:text="人口总数:0"
                 android:textColor="@color/black"
-                android:textSize="@dimen/text_16"
+                android:textSize="@dimen/text_14"
                 android:textStyle="bold" />
 
             <View
@@ -41,7 +41,7 @@
                 android:id="@+id/tv_grid"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
+                android:layout_weight="0.8"
                 android:clickable="true"
                 android:drawableRight="@drawable/ic_arrow_sort_gray"
                 android:focusable="true"
@@ -54,6 +54,29 @@
                 android:textColor="@color/black"
                 android:textSize="14dp"
                 android:textStyle="bold" />
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="match_parent"
+                android:background="@color/gray_line" />
+
+            <TextView
+                android:id="@+id/tv_type"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="0.8"
+                android:clickable="true"
+                android:drawableRight="@drawable/ic_arrow_sort_gray"
+                android:focusable="true"
+                android:gravity="center"
+                android:maxLines="1"
+                android:minWidth="100dp"
+                android:paddingTop="5dp"
+                android:paddingBottom="5dp"
+                android:text="人口类型"
+                android:textColor="@color/black"
+                android:textSize="14dp"
+                android:textStyle="bold" />
         </LinearLayout>
 
         <include layout="@layout/layout_search_item" />