From 7e66335ee164e4baee56ec9a622f9b9a02b7cb3b Mon Sep 17 00:00:00 2001 From: itgaojian Date: Thu, 15 Jun 2023 14:04:44 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BE=96=E5=8C=BA=E4=BA=BA=E5=8F=A3=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=BA=BA=E5=8F=A3=E7=B1=BB=E5=9E=8B=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 +- app/proguard-rules.pro | 5 +- app/release/output-metadata.json | 4 +- app/src/main/AndroidManifest.xml | 6 +-- .../commandclient/BaseMyApplication.java | 28 +++------- .../core/widget/views/ConditionAreaPopup.java | 11 ++-- .../ic_down_arrow_double_gray.png | Bin 0 -> 2651 bytes .../res/layout/popup_condition_layout.xml | 14 +++-- build.gradle | 5 +- .../populace/PopulaceAreaListActivity.java | 48 +++++++++++++++++- .../commonmodule/nets/GridApis.java | 1 + .../views/ConditionAreaGridPopup.java | 10 ++-- .../layout/activity_populace_area_list.xml | 27 +++++++++- 13 files changed, 112 insertions(+), 49 deletions(-) create mode 100644 baselib/src/main/res/drawable-xhdpi/ic_down_arrow_double_gray.png diff --git a/app/build.gradle b/app/build.gradle index ac6eae5..4b3a353 100644 --- a/app/build.gradle +++ b/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}" } diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 481bb43..b8c6d94 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -18,4 +18,7 @@ # If you keep the line number information, uncomment this to # hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file +#-renamesourcefileattribute SourceFile + +-dontwarn com.tencent.bugly.** +-keep public class com.tencent.bugly.**{*;} \ No newline at end of file diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index e736ec7..a57be37 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -10,8 +10,8 @@ { "type": "SINGLE", "filters": [], - "versionCode": 5, - "versionName": "1.0.4", + "versionCode": 6, + "versionName": "1.0.5", "outputFile": "app-release.apk" } ] diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a2e7567..e297b65 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -20,15 +20,15 @@ + android:value="72b5060a81" /> + android:value="1.0.4" /> + android:value="80f743be-cc04-4be3-9ea4-698ca95a4f0e" /> 6) { + DisplayMetrics displayMetrics = context.getResources().getDisplayMetrics(); + int height = (int) (displayMetrics.heightPixels * 0.5); + setHeight(height); + } mAdapter.addOnitemCheckChange((bean, isCheck, pos) -> { if (isCheck) { mAdapter.mSelBeans.clear(); diff --git a/baselib/src/main/res/drawable-xhdpi/ic_down_arrow_double_gray.png b/baselib/src/main/res/drawable-xhdpi/ic_down_arrow_double_gray.png new file mode 100644 index 0000000000000000000000000000000000000000..f6059e7eacf376262940d40e964639f2e33b10a4 GIT binary patch literal 2651 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 literal 0 HcmV?d00001 diff --git a/baselib/src/main/res/layout/popup_condition_layout.xml b/baselib/src/main/res/layout/popup_condition_layout.xml index 47b2a17..f61fc6b 100644 --- a/baselib/src/main/res/layout/popup_condition_layout.xml +++ b/baselib/src/main/res/layout/popup_condition_layout.xml @@ -1,14 +1,22 @@ + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 837f524..05509fd 100644 --- a/build.gradle +++ b/build.gradle @@ -55,8 +55,8 @@ ext { gCompileSdkVersion = 30 gMinSdkVersion = 21 gTargetSdkVersion = 30 - gVersionCode = 5 - gVersionName = '1.0.4' + gVersionCode = 6 + 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' } \ No newline at end of file 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 0996109..539e0b1 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 @@ -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 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 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()) diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/nets/GridApis.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/nets/GridApis.java index c19da60..e765955 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/nets/GridApis.java +++ b/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); /** diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/views/ConditionAreaGridPopup.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/views/ConditionAreaGridPopup.java index 0ec5e99..eb73a18 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/views/ConditionAreaGridPopup.java +++ b/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(); - int height = (int) (displayMetrics.heightPixels * 0.5); - setHeight(height); + if (mDatas.size() > 6) { + DisplayMetrics displayMetrics = context.getResources().getDisplayMetrics(); + int height = (int) (displayMetrics.heightPixels * 0.5); + setHeight(height); + } mAdapter.addOnitemCheckChange((bean, isCheck, pos) -> { if (isCheck) { mAdapter.mSelBeans.clear(); 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 aee7bfd..d2ad1b7 100644 --- a/commonmodule/src/main/res/layout/activity_populace_area_list.xml +++ b/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" /> + + + +