From 7115f1fe8552e97ad45016e9809d0276f62195d3 Mon Sep 17 00:00:00 2001 From: itgaojian Date: Wed, 21 Jun 2023 16:51:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E5=8A=A8=E4=BA=BA=E5=8F=A3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- baselib/build.gradle | 2 +- .../baselib/app/BaseAppContext.java | 7 +- .../baselib/constant/PathConfig.java | 11 +- .../core/beans/PersonFlowSearchBean.java | 428 ++++++ .../baselib/core/beans/PersonSearchBean.java | 3 + .../update/service/DownloadService.java | 2 +- .../baselib/core/retrofit_net/BaseUrlApi.java | 1 + .../core/retrofit_net/api/BaseApiService.java | 7 + .../baselib/core/widget/PhotoActivity.java | 2 +- .../core/widget/TakeVideoActivity.java | 2 +- .../core/widget/base/BaseActivity.java | 28 +- .../core/widget/views/AddCarPersonDialog.java | 2 +- .../core/widget/views/AddPersonDialog.java | 2 +- .../core/widget/views/AppraiseDialog.java | 2 +- .../core/widget/views/AreaChooseDialog.java | 2 +- .../core/widget/views/BaseAreaListDialog.java | 2 +- .../widget/views/ButtomDialogCommentView.java | 2 +- .../widget/views/CenterBaseInputView.java | 2 +- .../views/CenterChooseAreaDialogView.java | 2 +- .../widget/views/CenterGridPhoneListView.java | 2 +- .../widget/views/CenterInputChooseView.java | 2 +- .../core/widget/views/CenterInputView.java | 2 +- .../widget/views/CenterInputViewBase.java | 2 +- .../widget/views/CenterTextAndInputView.java | 2 +- .../widget/views/CenterTimeAndIntputView.java | 2 +- .../core/widget/views/ChangePwdDialog.java | 2 +- .../core/widget/views/CorrectionDialog.java | 2 +- .../core/widget/views/LimitEmojiEditText.java | 2 +- .../widget/views/SearchPersonDialogView.java | 2 +- .../core/widget/views/TypeBoldTextView.java | 10 +- .../baselib/utils/ExceptionHandler.java | 10 +- .../tenlionsoft/baselib/utils/TimeUtils.java | 22 +- .../tenlionsoft/baselib/utils/ToastUtils.java | 17 + .../res/drawable-xhdpi/ic_arrow_sort_gray.png | Bin baselib/src/main/res/layout/base_activity.xml | 2 +- baselib/src/main/res/layout/item_search.xml | 2 + baselib/src/main/res/values-v26/style.xml | 2 +- baselib/src/main/res/values-v27/style.xml | 2 +- baselib/src/main/res/values/attrs.xml | 10 +- baselib/src/main/res/values/styles.xml | 2 +- .../activity/AddressListActivity.java | 2 +- .../activity/AddressListSearchActivity.java | 2 +- .../activity/AddressUserDetailActivity.java | 2 +- .../activity/CallSingleActivity.java | 2 +- .../chatmodule/activity/ChatActivity.java | 2 +- .../activity/InvitedPointCallActivity.java | 2 +- .../activity/ParticipantsActivityV2.java | 2 +- .../activity/SponsorMeetingActivity.java | 2 +- .../hwclud/manager/LoginMangerV2.java | 2 +- .../hwclud/serivce/AuxSendService.java | 2 +- .../hwclud/serivce/FloatingViewService.java | 2 +- .../hwclud/serivce/MinimizeService.java | 2 +- .../hwclud/serivce/ServiceNotifyV2.java | 2 +- .../hwclud/ui/AuxMeetingFragment.java | 2 +- .../hwclud/ui/BaseMvpActivityV2.java | 2 +- .../hwclud/ui/LazyloadFragment.java | 2 +- .../chatmodule/hwclud/ui/SvcVideoFragment.kt | 2 +- .../chatmodule/hwclud/utils/HuaweiUtils.java | 2 +- .../chatmodule/hwclud/utils/PhoneUtil.java | 2 +- .../chatmodule/hwclud/utils/UIUtil.java | 2 +- .../keeplive/services/VoipReceiver.java | 2 +- commonmodule/src/main/AndroidManifest.xml | 12 + .../cases/IncidentArchiveListActivity.java | 2 +- .../IncidentCenterCheckDetailActivity.java | 2 +- .../IncidentCenterCheckListActivity.java | 2 +- .../cases/IncidentCheckDetailActivity.java | 2 +- .../cases/IncidentCheckListActivity.java | 2 +- .../cases/IncidentComponentSelActivity.java | 2 +- .../IncidentDeferExamineDetailActivity.java | 2 +- .../IncidentDeferExamineListActivity.java | 2 +- .../cases/IncidentDetailActivity.java | 2 +- .../cases/IncidentDoneListActivity.java | 2 +- .../activitys/cases/IncidentEditActivity.java | 2 +- .../cases/IncidentHandleActivity.java | 2 +- .../cases/IncidentHandleListActivity.java | 2 +- .../activitys/cases/IncidentListActivity.java | 2 +- .../IncidentOverseeDetailOrReplyActivity.java | 2 +- .../cases/IncidentReportActivity.java | 9 +- .../cases/IncidentReturnRecordActivity.java | 2 +- .../IncidentReturnRecordAddActivity.java | 2 +- .../cases/IncidentSpecialActivity.java | 2 +- .../cases/IncidentSpecialDeptActivity.java | 2 +- .../TaskConverIncidentReportActivity.java | 2 +- .../checkwork/AttendanceActivity.java | 2 +- .../department/BindGridActivity.java | 2 +- .../department/ChooseDeptActivity.java | 2 +- .../ChooseDeptKnowLedgeActivity.java | 2 +- .../department/ChooseDeptUserActivity.java | 2 +- .../department/ChooseGridActivity.java | 2 +- .../department/ChooseOrgAreaActivity.java | 2 +- .../department/ChoosePersonActivity.java | 2 +- .../journal/JournalDetailActivity.java | 2 +- .../journal/JournalEditActivity.java | 2 +- .../journal/JournalListActivity.java | 2 +- .../journal/JournalReportActivity.java | 2 +- .../logs/StatisticsGridActivity.java | 2 +- .../notice/NoticeDetailActivity.java | 196 +++ .../activitys/notice/NoticeListActivity.java | 186 +++ .../repository/KnowLedgeAskAddActivity.java | 2 +- .../KnowLedgeAskDetailActivity.java | 2 +- .../repository/KnowLedgeDetailActivity.java | 2 +- .../repository/KnowLedgeListActivity.java | 2 +- .../KnowLedgeManageAddActivity.java | 2 +- .../KnowLedgeManageDetailActivity.java | 2 +- .../KnowLedgeManageListActivity.java | 2 +- .../usercenter/ForgetPwdActivity.java | 2 +- .../usercenter/UserCenterActivity.java | 2 +- .../usercenter/UserCenterFragment.java | 2 +- .../usercenter/UserInfoActivity.java | 2 +- .../adapters/NoticeListAdapter.java | 54 + .../commonmodule/beans/MigrantDetailBean.java | 306 +++++ .../commonmodule/beans/NoticeDetailBean.java | 149 +++ .../commonmodule/beans/NoticeListBean.java | 181 +++ .../commonmodule/beans/SaveFloatingBean.java | 178 +++ .../IncidentGridStatisticsFragment.java | 6 +- .../fragments/KnowLedgeDeptListFragment.java | 2 +- .../KnowLedgeListByDeptFragment.java | 2 +- .../fragments/KnowLedgeListFragment.java | 2 +- .../PopulaceGridStatisticsFragment.java | 11 +- .../holders/NoticeListHolder.java | 34 + .../commonmodule/nets/GridApis.java | 20 + .../ic_incident_statistics_bg.jpg | Bin 50767 -> 51760 bytes .../ic_statistics_radio_bg.9.png | Bin 3420 -> 3088 bytes .../ic_statistics_radio_bg_no_sel.png | Bin 0 -> 161 bytes .../res/drawable/switch_statistics_img.xml | 2 +- ...vity_grid_incident_statistics_viewpage.xml | 2 +- .../res/layout/activity_notice_detail.xml | 84 ++ .../main/res/layout/activity_notice_list.xml | 32 + .../fragment_grid_incident_statistics.xml | 14 +- .../fragment_grid_populace_statistics.xml | 98 +- .../src/main/res/layout/item_notice.xml | 67 + .../activitys/BindPersonToHouseActivity.java | 2 +- .../activitys/BuildingAddActivity.java | 2 +- .../activitys/BuildingDetailActivity.java | 2 +- .../activitys/BuildingEditActivity.java | 2 +- .../activitys/BuildingListActivity.java | 2 +- .../activitys/BuildingManagerAddActivity.java | 2 +- .../BuildingManagerDetailActivity.java | 2 +- .../BuildingManagerEditActivity.java | 2 +- .../activitys/CommunityAddActivity.java | 2 +- .../activitys/CommunityAreaAddActivity.java | 2 +- .../CommunityAreaDescAddActivity.java | 2 +- .../CommunityAreaDescEditActivity.java | 2 +- .../CommunityAreaDetailActivity.java | 2 +- .../activitys/CommunityAreaEditActivity.java | 2 +- .../activitys/CommunityAreaListActivity.java | 2 +- .../activitys/CommunityDescAddActivity.java | 2 +- .../activitys/CommunityDescEditActivity.java | 2 +- .../activitys/CommunityDetailActivity.java | 2 +- .../activitys/CommunityEditActivity.java | 2 +- .../activitys/CommunityManageActivity.java | 2 +- .../activitys/FamilyMemberAddActivity.java | 2 +- .../activitys/FamilyMemberDetailActivity.java | 2 +- .../activitys/FamilyMemberEditActivity.java | 2 +- .../activitys/HirerDetailActivity.java | 2 +- .../building/activitys/HirerEditActivity.java | 2 +- .../activitys/HouseDetailActivity.java | 2 +- .../building/activitys/HouseEditActivity.java | 2 +- .../building/activitys/HouseListActivity.java | 2 +- .../SearchHouseByPersonActivity.java | 2 +- .../fragment/BuildingAreaManageFragment.java | 2 +- .../fragment/BuildingListFragment.java | 2 +- .../fragment/CommunityListFragment.java | 2 +- .../building/fragment/HouseFragment.java | 2 +- .../building/fragment/PersonLibFragment.java | 8 +- .../fragment/SearchHouseByPersonFragment.java | 2 +- .../activitys/cars/CarManageAddActivity.java | 2 +- .../cars/CarManageDetailActivity.java | 2 +- .../activitys/cars/CarManageEditActivity.java | 2 +- .../activitys/cars/CarManageListActivity.java | 2 +- .../activitys/cars/CarPersonEditActivity.java | 2 +- .../components/ComponentAddActivity.java | 2 +- .../components/ComponentEditActivity.java | 2 +- .../components/ComponentsListActivity.java | 2 +- .../components/DepartmentSelActivity.java | 2 +- .../activitys/locus/WorkLocusActivity.java | 2 +- .../orgmanage/NonPublicOrgAddActivity.java | 2 +- .../orgmanage/NonPublicOrgDetailActivity.java | 2 +- .../orgmanage/NonPublicOrgEditActivity.java | 2 +- .../orgmanage/NonPublicOrgListActivity.java | 2 +- .../orgmanage/SocialOrgAddActivity.java | 2 +- .../orgmanage/SocialOrgDetailActivity.java | 2 +- .../orgmanage/SocialOrgEditActivity.java | 2 +- .../orgmanage/SocialOrgListActivity.java | 2 +- .../patrols/EnterprisePatrolAddActivity.java | 2 +- .../EnterprisePatrolDetailActivity.java | 2 +- .../patrols/EnterprisePatrolEditActivity.java | 2 +- .../patrols/EnterprisePatrolListActivity.java | 2 +- .../patrols/ExpressPatrolAddActivity.java | 2 +- .../patrols/ExpressPatrolDetailActivity.java | 2 +- .../patrols/ExpressPatrolEditActivity.java | 2 +- .../patrols/ExpressPatrolListActivity.java | 2 +- .../patrols/KeyAreaPatrolAddActivity.java | 2 +- .../patrols/KeyAreaPatrolDetailActivity.java | 2 +- .../patrols/KeyAreaPatrolEditActivity.java | 2 +- .../patrols/KeyAreaPatrolListActivity.java | 2 +- .../patrols/KeyPlacePatrolAddActivity.java | 2 +- .../patrols/KeyPlacePatrolDetailActivity.java | 2 +- .../patrols/KeyPlacePatrolEditActivity.java | 2 +- .../patrols/KeyPlacePatrolListActivity.java | 2 +- .../patrols/KeyRoadCaseAddActivity.java | 2 +- .../patrols/KeyRoadCaseEditActivity.java | 2 +- .../patrols/KeyRoadCaseListActivity.java | 2 +- .../patrols/PenalPatrolAddActivity.java | 2 +- .../patrols/PenalPatrolDetailActivity.java | 2 +- .../patrols/PenalPatrolEditActivity.java | 2 +- .../patrols/PenalPatrolListActivity.java | 2 +- .../populace/CensusBaseActivity.java | 2 +- .../populace/CensusBaseDetailActivity.java | 2 +- .../populace/CensusBaseEnterActivity.java | 10 +- .../populace/CensusBaseSearchActivity.java | 10 +- .../populace/CensusExitrActivity.java | 2 +- .../populace/CensusResidsActivity.java | 2 +- .../populace/CensusYoungAddActivity.java | 2 +- .../populace/CensusYoungListActivity.java | 2 +- .../activitys/populace/DicSelActivity.java | 2 +- .../populace/YoungCaseAddActivity.java | 2 +- .../populace/YoungCaseDetailActivity.java | 2 +- .../populace/YoungCaseListActivity.java | 2 +- .../fragments/CensusBaseGridListFragment.java | 2 +- .../normal/CensusMigrantAddActivity.java | 1189 +++++++++++++---- .../normal/CensusMigrantDetailActivity.java | 156 ++- .../normal/CensusMigrantListActivity.java | 26 +- .../normal/CensusRearListActivity.java | 2 +- .../normal/CensusRearPersonAddActivity.java | 2 +- .../normal/CensusRegisterAddActivity.java | 2 +- .../normal/CensusRegisterListActivity.java | 2 +- .../outbound/CensusOutBoundAddActivity.java | 2 +- .../outbound/CensusOutboundListActivity.java | 2 +- .../special/CensusAidsAddActivity.java | 2 +- .../special/CensusAidsListActivity.java | 2 +- .../special/CensusCorrctListActivity.java | 2 +- .../special/CensusCorrectAddActivity.java | 2 +- .../special/CensusDrugAddActivity.java | 2 +- .../special/CensusDrugListActivity.java | 2 +- .../CensusSpecialCriminalAddActivity.java | 2 +- .../CensusSpecialCriminalListActivity.java | 2 +- .../special/CensusTroubleAddActivity.java | 2 +- .../special/CensusTroubleListActivity.java | 2 +- .../schools/SchoolCaseAddActivity.java | 2 +- .../schools/SchoolCaseListActivity.java | 2 +- .../schools/SchoolEmphasesAddActivity.java | 2 +- .../schools/SchoolEmphasesListActivity.java | 2 +- .../schools/SchoolManageAddActivity.java | 2 +- .../schools/SchoolManageDetailActivity.java | 2 +- .../schools/SchoolManageListActivity.java | 2 +- .../security/ExpressPoiAddActivity.java | 2 +- .../security/ExpressPoiDetailActivity.java | 2 +- .../security/ExpressPoiEditActivity.java | 2 +- .../security/ExpressPoiListActivity.java | 2 +- .../security/KeyAreaAddActivity.java | 2 +- .../security/KeyAreaDetailActivity.java | 2 +- .../security/KeyAreaEditActivity.java | 2 +- .../security/KeyAreaListActivity.java | 2 +- .../security/KeyPlaceAddActivity.java | 2 +- .../security/KeyPlaceDetailActivity.java | 2 +- .../security/KeyPlaceEditActivity.java | 2 +- .../security/KeyPlaceListActivity.java | 2 +- .../security/KeyRoadAddActivity.java | 2 +- .../security/KeyRoadDetailActivity.java | 2 +- .../security/KeyRoadEditActivity.java | 2 +- .../security/KeyRoadListActivity.java | 2 +- .../activitys/security/PenalAddActivity.java | 2 +- .../security/PenalCaseSelActivity.java | 2 +- .../security/PenalDetailActivity.java | 2 +- .../activitys/security/PenalEditActivity.java | 2 +- .../activitys/security/PenalListActivity.java | 2 +- .../security/PenalSuspicionAddActivity.java | 2 +- .../PenalSuspicionDetailActivity.java | 2 +- .../security/PenalSuspicionEditActivity.java | 2 +- .../security/PenalSuspicionListActivity.java | 2 +- .../security/PenalVictimAddActivity.java | 2 +- .../security/PenalVictimDetailActivity.java | 2 +- .../security/PenalVictimEditActivity.java | 2 +- .../security/PenalVictimListActivity.java | 2 +- .../tasks/TaskBusinessListActivity.java | 2 +- .../activitys/tasks/TaskDetailActivity.java | 2 +- .../tasks/TaskReportRecordAddActivity.java | 2 +- .../tasks/TaskReportRecordEditActivity.java | 2 +- .../tasks/fragments/TaskFragment.java | 2 +- .../layout/activity_census_base_search.xml | 2 + .../main/res/layout/activity_census_enter.xml | 22 +- .../layout/activity_census_nmigrant_add.xml | 309 ++++- .../activity_census_nmigrant_detail.xml | 466 +++++-- .../main/res/layout/fragment_person_lib.xml | 30 +- .../tengshisoft/mainmodule/MainActivity.java | 2 +- .../mainmodule/base/LoginActivity.java | 2 +- .../mainmodule/base/MainTabActivity.java | 64 +- .../mainmodule/base/SplashActivity.java | 2 +- .../fragments/GridMainFragment.java | 58 +- .../main/res/layout/fragment_main_grid.xml | 11 +- .../modulemap/activitys/SelPointActivity.java | 2 +- 292 files changed, 4211 insertions(+), 829 deletions(-) create mode 100644 baselib/src/main/java/com/tenlionsoft/baselib/core/beans/PersonFlowSearchBean.java create mode 100644 baselib/src/main/java/com/tenlionsoft/baselib/utils/ToastUtils.java rename {commonmodule => baselib}/src/main/res/drawable-xhdpi/ic_arrow_sort_gray.png (100%) create mode 100644 commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/notice/NoticeDetailActivity.java create mode 100644 commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/notice/NoticeListActivity.java create mode 100644 commonmodule/src/main/java/com/tengshisoft/commonmodule/adapters/NoticeListAdapter.java create mode 100644 commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/NoticeDetailBean.java create mode 100644 commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/NoticeListBean.java create mode 100644 commonmodule/src/main/java/com/tengshisoft/commonmodule/holders/NoticeListHolder.java create mode 100644 commonmodule/src/main/res/drawable-xhdpi/ic_statistics_radio_bg_no_sel.png create mode 100644 commonmodule/src/main/res/layout/activity_notice_detail.xml create mode 100644 commonmodule/src/main/res/layout/activity_notice_list.xml create mode 100644 commonmodule/src/main/res/layout/item_notice.xml diff --git a/baselib/build.gradle b/baselib/build.gradle index fb92fab..18ce2a0 100755 --- a/baselib/build.gradle +++ b/baselib/build.gradle @@ -94,7 +94,7 @@ dependencies { api 'me.rosuh:AndroidFilePicker:0.8.3' //toast - api 'com.github.getActivity:ToastUtils:9.5' + api 'com.github.getActivity:Toaster:12.3' //图片压缩 api "top.zibin:Luban:$rootProject.ext.lubanVersio" diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/app/BaseAppContext.java b/baselib/src/main/java/com/tenlionsoft/baselib/app/BaseAppContext.java index ab6aa42..96e71a2 100644 --- a/baselib/src/main/java/com/tenlionsoft/baselib/app/BaseAppContext.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/app/BaseAppContext.java @@ -8,7 +8,8 @@ import android.net.NetworkInfo; import android.os.PowerManager; import android.view.Gravity; -import com.hjq.toast.ToastUtils; +import com.hjq.toast.Toaster; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.footer.ClassicsFooter; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tenlionsoft.baselib.constant.BroadcastConstant; @@ -62,8 +63,8 @@ public class BaseAppContext extends MultiDexApplication { public void onCreate() { super.onCreate(); app = this; - ToastUtils.init(this); - ToastUtils.setGravity(Gravity.BOTTOM, 0, 100); + Toaster.init(this); + Toaster.setGravity(Gravity.TOP, 0, 100); PowerManager powerManager = (PowerManager) getSystemService(POWER_SERVICE); isScreenOn = powerManager.isInteractive(); screenTurningOff(); diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java b/baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java index 7dc732f..9becda3 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java @@ -86,6 +86,7 @@ public class PathConfig { public static final String DEFAULT_AREA_CODE = "0";//地区 public static final String PLACE_TYPE_ID = "df8b758c-f6d8-465a-9aa8-c451fde47076";//场馆类型字典 + public static final String NOTICE_CID = "4197a23f-2cae-480f-8eb1-086956a51736";//通知公告ID public static final String CITY_DEFAULT_CODE = "640675"; public static final String CITY_DEFAULT_NAME = "日喀则市"; public static final int CITY_DEFAULT_LEVEL = 3; @@ -321,8 +322,10 @@ public class PathConfig { public static final String PATH_MODULE_COMMON_ACTIVITY_SEL_GRID = "/modulecommon/activity/chooseGrid";//网格选取 public static final String PATH_MODULE_COMMON_ACTIVITY_BIND_GRID = "/modulecommon/activity/bindGrid";//网格绑定 public static final String PATH_MODULE_COMMON_FRAGMENT_KNOW_LEDGE_LIST = "/modulecommon/fragment/knowLedgeList"; - public static final String PATH_MODULE_COMMON_FRAGMENT_GRID_INCIDENT_STATISTICS = "/modulecommon/fragment/gridIncidentStatistics";//网格员事件上报统计 - public static final String PATH_MODULE_COMMON_FRAGMENT_GRID_POPULACE_STATISTICS = "/modulecommon/fragment/gridPopulaceStatistics";//网格员人口统计 + public static final String PATH_MODULE_COMMON_FRAGMENT_GRID_INCIDENT_STATISTICS = "/modulecommon/fragment" + + "/gridIncidentStatistics";//网格员事件上报统计 + public static final String PATH_MODULE_COMMON_FRAGMENT_GRID_POPULACE_STATISTICS = "/modulecommon/fragment" + + "/gridPopulaceStatistics";//网格员人口统计 //知识库列表 public static final String PATH_MODULE_COMMON_FRAGMENT_KNOW_LEDGE_LIST_BY_DEPT = "/modulecommon/fragment" + "/knowLedgeListByDept";//部门黄页 @@ -683,6 +686,10 @@ public class PathConfig { public static final String PATH_MODULE_GRID_ACTIVITY_PATROL_EXPRESS_EDIT = "/modulegrid/activity" + "/patrolExpressEdit";//快递物流巡查编辑 + public static final String PATH_MODULE_COMMON_ACTIVITY_NOTICE_LIST = "/modulecommon/activity/noticeList";//通知列表 + + public static final String PATH_MODULE_COMMON_ACTIVITY_NOTICE_DETAIL = "/modulecommon/activity/noticeDetail"; + //通知详情 //部件 public static final String PATH_MODULE_GRID_ACTIVITY_COMPONENT_LIST = "/modulegrid/activity/componentList";//部件列表 diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/beans/PersonFlowSearchBean.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/beans/PersonFlowSearchBean.java new file mode 100644 index 0000000..9cefa4a --- /dev/null +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/beans/PersonFlowSearchBean.java @@ -0,0 +1,428 @@ +package com.tenlionsoft.baselib.core.beans; + +public class PersonFlowSearchBean { + + private String areaCode; + private String areaId; + private String areaNames; + private String birthDate; + private String cardExpireDate; + private String cardNumber; + private String currentResidence; + private String currentResidenceAddr; + private String currentResidenceDictionaryName; + private String education; + private String educationDictionaryName; + private String floatingPopulationId; + private String fullName; + private String gender; + private String genderDictionaryName; + private String gridId; + private String gridName; + private String healthyStatus; + private String idCardNumber; + private String inflowReason; + private String inflowReasonDict; + private String keyOfFollow; + private String maritalStatus; + private String maritalStatusDictionaryName; + private String nameUsedBefore; + private String nation; + private String nationDictionaryName; + private String nativePlace; + private String nativePlaceAddr; + private String nativePlaceDictionaryName; + private String occupation; + private String occupationCategory; + private String occupationCategoryDictionaryName; + private String politicalStatus; + private String politicalStatusDictionaryName; + private String registerDate; + private String registeredResidence; + private String registeredResidenceAddr; + private String registeredResidenceDictionaryName; + private String registrationType; + private String registrationTypeDict; + private String religion; + private String religionDictionaryName; + private String residenceType; + private String residenceTypeDict; + private String serviceSpace; + private String telephone; + + public String getAreaCode() { + return areaCode; + } + + public void setAreaCode(String areaCode) { + this.areaCode = areaCode; + } + + public String getAreaId() { + return areaId; + } + + public void setAreaId(String areaId) { + this.areaId = areaId; + } + + public String getAreaNames() { + return areaNames; + } + + public void setAreaNames(String areaNames) { + this.areaNames = areaNames; + } + + public String getBirthDate() { + return birthDate; + } + + public void setBirthDate(String birthDate) { + this.birthDate = birthDate; + } + + public String getCardExpireDate() { + return cardExpireDate; + } + + public void setCardExpireDate(String cardExpireDate) { + this.cardExpireDate = cardExpireDate; + } + + public String getCardNumber() { + return cardNumber; + } + + public void setCardNumber(String cardNumber) { + this.cardNumber = cardNumber; + } + + public String getCurrentResidence() { + return currentResidence; + } + + public void setCurrentResidence(String currentResidence) { + this.currentResidence = currentResidence; + } + + public String getCurrentResidenceAddr() { + return currentResidenceAddr; + } + + public void setCurrentResidenceAddr(String currentResidenceAddr) { + this.currentResidenceAddr = currentResidenceAddr; + } + + public String getCurrentResidenceDictionaryName() { + return currentResidenceDictionaryName; + } + + public void setCurrentResidenceDictionaryName(String currentResidenceDictionaryName) { + this.currentResidenceDictionaryName = currentResidenceDictionaryName; + } + + public String getEducation() { + return education; + } + + public void setEducation(String education) { + this.education = education; + } + + public String getEducationDictionaryName() { + return educationDictionaryName; + } + + public void setEducationDictionaryName(String educationDictionaryName) { + this.educationDictionaryName = educationDictionaryName; + } + + public String getFloatingPopulationId() { + return floatingPopulationId; + } + + public void setFloatingPopulationId(String floatingPopulationId) { + this.floatingPopulationId = floatingPopulationId; + } + + public String getFullName() { + return fullName; + } + + public void setFullName(String fullName) { + this.fullName = fullName; + } + + public String getGender() { + return gender; + } + + public void setGender(String gender) { + this.gender = gender; + } + + public String getGenderDictionaryName() { + return genderDictionaryName; + } + + public void setGenderDictionaryName(String genderDictionaryName) { + this.genderDictionaryName = genderDictionaryName; + } + + public String getGridId() { + return gridId; + } + + public void setGridId(String gridId) { + this.gridId = gridId; + } + + public String getGridName() { + return gridName; + } + + public void setGridName(String gridName) { + this.gridName = gridName; + } + + public String getHealthyStatus() { + return healthyStatus; + } + + public void setHealthyStatus(String healthyStatus) { + this.healthyStatus = healthyStatus; + } + + public String getIdCardNumber() { + return idCardNumber; + } + + public void setIdCardNumber(String idCardNumber) { + this.idCardNumber = idCardNumber; + } + + public String getInflowReason() { + return inflowReason; + } + + public void setInflowReason(String inflowReason) { + this.inflowReason = inflowReason; + } + + public String getInflowReasonDict() { + return inflowReasonDict; + } + + public void setInflowReasonDict(String inflowReasonDict) { + this.inflowReasonDict = inflowReasonDict; + } + + public String getKeyOfFollow() { + return keyOfFollow; + } + + public void setKeyOfFollow(String keyOfFollow) { + this.keyOfFollow = keyOfFollow; + } + + public String getMaritalStatus() { + return maritalStatus; + } + + public void setMaritalStatus(String maritalStatus) { + this.maritalStatus = maritalStatus; + } + + public String getMaritalStatusDictionaryName() { + return maritalStatusDictionaryName; + } + + public void setMaritalStatusDictionaryName(String maritalStatusDictionaryName) { + this.maritalStatusDictionaryName = maritalStatusDictionaryName; + } + + public String getNameUsedBefore() { + return nameUsedBefore; + } + + public void setNameUsedBefore(String nameUsedBefore) { + this.nameUsedBefore = nameUsedBefore; + } + + public String getNation() { + return nation; + } + + public void setNation(String nation) { + this.nation = nation; + } + + public String getNationDictionaryName() { + return nationDictionaryName; + } + + public void setNationDictionaryName(String nationDictionaryName) { + this.nationDictionaryName = nationDictionaryName; + } + + public String getNativePlace() { + return nativePlace; + } + + public void setNativePlace(String nativePlace) { + this.nativePlace = nativePlace; + } + + public String getNativePlaceAddr() { + return nativePlaceAddr; + } + + public void setNativePlaceAddr(String nativePlaceAddr) { + this.nativePlaceAddr = nativePlaceAddr; + } + + public String getNativePlaceDictionaryName() { + return nativePlaceDictionaryName; + } + + public void setNativePlaceDictionaryName(String nativePlaceDictionaryName) { + this.nativePlaceDictionaryName = nativePlaceDictionaryName; + } + + public String getOccupation() { + return occupation; + } + + public void setOccupation(String occupation) { + this.occupation = occupation; + } + + public String getOccupationCategory() { + return occupationCategory; + } + + public void setOccupationCategory(String occupationCategory) { + this.occupationCategory = occupationCategory; + } + + public String getOccupationCategoryDictionaryName() { + return occupationCategoryDictionaryName; + } + + public void setOccupationCategoryDictionaryName(String occupationCategoryDictionaryName) { + this.occupationCategoryDictionaryName = occupationCategoryDictionaryName; + } + + public String getPoliticalStatus() { + return politicalStatus; + } + + public void setPoliticalStatus(String politicalStatus) { + this.politicalStatus = politicalStatus; + } + + public String getPoliticalStatusDictionaryName() { + return politicalStatusDictionaryName; + } + + public void setPoliticalStatusDictionaryName(String politicalStatusDictionaryName) { + this.politicalStatusDictionaryName = politicalStatusDictionaryName; + } + + public String getRegisterDate() { + return registerDate; + } + + public void setRegisterDate(String registerDate) { + this.registerDate = registerDate; + } + + public String getRegisteredResidence() { + return registeredResidence; + } + + public void setRegisteredResidence(String registeredResidence) { + this.registeredResidence = registeredResidence; + } + + public String getRegisteredResidenceAddr() { + return registeredResidenceAddr; + } + + public void setRegisteredResidenceAddr(String registeredResidenceAddr) { + this.registeredResidenceAddr = registeredResidenceAddr; + } + + public String getRegisteredResidenceDictionaryName() { + return registeredResidenceDictionaryName; + } + + public void setRegisteredResidenceDictionaryName(String registeredResidenceDictionaryName) { + this.registeredResidenceDictionaryName = registeredResidenceDictionaryName; + } + + public String getRegistrationType() { + return registrationType; + } + + public void setRegistrationType(String registrationType) { + this.registrationType = registrationType; + } + + public String getRegistrationTypeDict() { + return registrationTypeDict; + } + + public void setRegistrationTypeDict(String registrationTypeDict) { + this.registrationTypeDict = registrationTypeDict; + } + + public String getReligion() { + return religion; + } + + public void setReligion(String religion) { + this.religion = religion; + } + + public String getReligionDictionaryName() { + return religionDictionaryName; + } + + public void setReligionDictionaryName(String religionDictionaryName) { + this.religionDictionaryName = religionDictionaryName; + } + + public String getResidenceType() { + return residenceType; + } + + public void setResidenceType(String residenceType) { + this.residenceType = residenceType; + } + + public String getResidenceTypeDict() { + return residenceTypeDict; + } + + public void setResidenceTypeDict(String residenceTypeDict) { + this.residenceTypeDict = residenceTypeDict; + } + + public String getServiceSpace() { + return serviceSpace; + } + + public void setServiceSpace(String serviceSpace) { + this.serviceSpace = serviceSpace; + } + + public String getTelephone() { + return telephone; + } + + public void setTelephone(String telephone) { + this.telephone = telephone; + } +} diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/beans/PersonSearchBean.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/beans/PersonSearchBean.java index cb7f263..4d01f40 100644 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/beans/PersonSearchBean.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/beans/PersonSearchBean.java @@ -50,6 +50,9 @@ public class PersonSearchBean { private String telephone; private String type; + + + public String getAreaCode() { return areaCode; } diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/network/update/service/DownloadService.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/network/update/service/DownloadService.java index 43d1c1a..a60bb6d 100644 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/network/update/service/DownloadService.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/network/update/service/DownloadService.java @@ -4,7 +4,7 @@ import android.app.Service; import android.content.Intent; import android.os.IBinder; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tenlionsoft.baselib.core.network.HttpUtils; import com.tenlionsoft.baselib.core.network.response.DownloadResponseHandler; import com.tenlionsoft.baselib.core.network.update.utils.ApkUtils; diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/BaseUrlApi.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/BaseUrlApi.java index 9744685..51868e3 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/BaseUrlApi.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/BaseUrlApi.java @@ -45,6 +45,7 @@ public class BaseUrlApi { // public static final String BASE_VISITS_IP = "http://192.168.0.111:8084/" + SYS_VISITS; public static final String BASE_IMG_URL = BASE_URL + "route/file/download/true/"; + public static final String BASE_IMG_URL_V2 = BASE_URL + "route/file/v2/download/true/"; public static final String APK_DOWNLOAD_URL = "downloadUrl"; public static final String UPDATE_URL = "version.json"; diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/api/BaseApiService.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/api/BaseApiService.java index 0f96517..d272761 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/api/BaseApiService.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/api/BaseApiService.java @@ -7,6 +7,7 @@ import com.tenlionsoft.baselib.core.beans.BaseDictionaryBean; import com.tenlionsoft.baselib.core.beans.BaseSuccessBean; import com.tenlionsoft.baselib.core.beans.DicBean; import com.tenlionsoft.baselib.core.beans.DictionaryBean; +import com.tenlionsoft.baselib.core.beans.PersonFlowSearchBean; import com.tenlionsoft.baselib.core.beans.PersonSearchBean; import com.tenlionsoft.baselib.core.beans.UploadBean; import com.tenlionsoft.baselib.core.beans.UserExpandInfoBean; @@ -344,6 +345,12 @@ public interface BaseApiService { @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) @GET("app/basepopulationinfo/release/getByIdCardNumber/{idCardNumber}") Observable doSearchPerson(@Path("idCardNumber") String card, @Header("token") String token); + /** + * 根据身份证号码搜索人-流动人口 + */ + @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"}) + @GET("app/floatingpopulation/getByIdCardNumber/{idCardNumber}") + Observable doSearchFLowPerson(@Path("idCardNumber") String card, @Header("token") String token); /** * 获取当前用户拓展信息 diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/PhotoActivity.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/PhotoActivity.java index 20e7902..e7d807f 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/PhotoActivity.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/PhotoActivity.java @@ -11,7 +11,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.bumptech.glide.Glide; import com.bumptech.glide.request.target.Target; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tenlionsoft.baselib.R; import com.tenlionsoft.baselib.R2; import com.tenlionsoft.baselib.constant.PathConfig; diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/TakeVideoActivity.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/TakeVideoActivity.java index 7a9b74d..4a44869 100644 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/TakeVideoActivity.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/TakeVideoActivity.java @@ -8,7 +8,7 @@ import android.util.Log; import android.view.View; import com.alibaba.android.arouter.facade.annotation.Route; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.luck.picture.lib.tools.BitmapUtils; import com.tenlionsoft.baselib.R; import com.tenlionsoft.baselib.R2; diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/BaseActivity.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/BaseActivity.java index 024603b..b6ffc2c 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/BaseActivity.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/BaseActivity.java @@ -21,10 +21,13 @@ import android.text.TextUtils; import android.text.TextWatcher; import android.util.DisplayMetrics; import android.view.Display; +import android.view.KeyCharacterMap; +import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.TouchDelegate; import android.view.View; +import android.view.ViewConfiguration; import android.view.WindowManager; import android.view.animation.LinearInterpolator; import android.view.inputmethod.EditorInfo; @@ -44,7 +47,7 @@ import androidx.appcompat.app.AppCompatActivity; import com.alibaba.android.arouter.launcher.ARouter; import com.gyf.immersionbar.ImmersionBar; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tenlionsoft.baselib.R; import com.tenlionsoft.baselib.constant.PathConfig; import com.tenlionsoft.baselib.core.widget.views.AfxTextView; @@ -149,7 +152,9 @@ public abstract class BaseActivity extends AppCompatActivity { } - + /** + * 判断是否开启虚拟按键 + */ protected boolean isNavBarHasShown(Context ctx) { String brand = Build.BRAND; LogUtils.e(brand); @@ -203,6 +208,18 @@ public abstract class BaseActivity extends AppCompatActivity { } } + /** + * 判断是否有虚拟按键 + */ + protected boolean checkDeviceHasNavigationBar(Context ctx) { + boolean hasMenuKey = ViewConfiguration.get(ctx).hasPermanentMenuKey(); + boolean hasBackKey = KeyCharacterMap.deviceHasKey(KeyEvent.KEYCODE_BACK); + if (!hasMenuKey & !hasBackKey) { + return true; + } + return false; + } + /** * 非全面屏下 虚拟键高度(无论是否隐藏) * @@ -604,6 +621,13 @@ public abstract class BaseActivity extends AppCompatActivity { hideSoftKeyboard(getCurrentFocus()); } + public void hideSoftKeyboard(EditText editText){ + InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + if (editText != null) { + imm.hideSoftInputFromWindow(editText.getWindowToken(), 0); + } + } + @Override public boolean dispatchTouchEvent(MotionEvent ev) { diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/AddCarPersonDialog.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/AddCarPersonDialog.java index 34081a5..4d0ea2c 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/AddCarPersonDialog.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/AddCarPersonDialog.java @@ -19,7 +19,7 @@ import android.widget.TextView; import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.TimePickerView; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tenlionsoft.baselib.R; import com.tenlionsoft.baselib.utils.RegexUtils; import com.tenlionsoft.baselib.utils.TimeUtils; diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/AddPersonDialog.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/AddPersonDialog.java index a0c341f..5ffa2fd 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/AddPersonDialog.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/AddPersonDialog.java @@ -21,7 +21,7 @@ import android.widget.CompoundButton; import android.widget.EditText; import android.widget.ImageView; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tenlionsoft.baselib.R; import com.tenlionsoft.baselib.utils.RegexUtils; diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/AppraiseDialog.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/AppraiseDialog.java index 7b69aca..67aed01 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/AppraiseDialog.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/AppraiseDialog.java @@ -16,7 +16,7 @@ import android.view.inputmethod.InputMethodManager; import android.widget.EditText; import android.widget.RatingBar; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tenlionsoft.baselib.R; import com.tenlionsoft.baselib.utils.RegexUtils; diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/AreaChooseDialog.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/AreaChooseDialog.java index a49b91d..4327a99 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/AreaChooseDialog.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/AreaChooseDialog.java @@ -17,7 +17,7 @@ import android.widget.TextView; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tenlionsoft.baselib.R; import com.tenlionsoft.baselib.constant.PathConfig; import com.tenlionsoft.baselib.core.beans.AreaBean; diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/BaseAreaListDialog.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/BaseAreaListDialog.java index 86556fb..8fb3666 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/BaseAreaListDialog.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/BaseAreaListDialog.java @@ -18,7 +18,7 @@ import android.view.WindowManager; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tenlionsoft.baselib.R; import com.tenlionsoft.baselib.core.beans.UserLoginBean; import com.tenlionsoft.baselib.utils.UserInfoSPUtils; diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/ButtomDialogCommentView.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/ButtomDialogCommentView.java index 940f4d0..71cc921 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/ButtomDialogCommentView.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/ButtomDialogCommentView.java @@ -17,7 +17,7 @@ import android.widget.RelativeLayout; import android.widget.TextView; import com.bumptech.glide.Glide; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tenlionsoft.baselib.R; import com.tenlionsoft.baselib.core.beans.AddPhotoBean; import com.tenlionsoft.baselib.core.retrofit_net.BaseUrlApi; diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterBaseInputView.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterBaseInputView.java index a2f675a..fd9556d 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterBaseInputView.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterBaseInputView.java @@ -16,7 +16,7 @@ import android.view.inputmethod.InputMethodManager; import android.widget.EditText; import com.bigkoo.pickerview.view.TimePickerView; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tenlionsoft.baselib.R; import java.text.SimpleDateFormat; diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterChooseAreaDialogView.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterChooseAreaDialogView.java index c9753b2..18dccaf 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterChooseAreaDialogView.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterChooseAreaDialogView.java @@ -17,7 +17,7 @@ import android.widget.TextView; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tenlionsoft.baselib.R; import com.tenlionsoft.baselib.constant.PathConfig; import com.tenlionsoft.baselib.core.beans.AreaBean; diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterGridPhoneListView.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterGridPhoneListView.java index 5f653d7..5a41ee8 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterGridPhoneListView.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterGridPhoneListView.java @@ -21,7 +21,7 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.bigkoo.pickerview.view.TimePickerView; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tenlionsoft.baselib.R; import com.tenlionsoft.baselib.core.beans.PersonSearchBean; import com.tenlionsoft.baselib.core.widget.base.BaseRecyclerAdapter; diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterInputChooseView.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterInputChooseView.java index 9376426..5ed6e53 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterInputChooseView.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterInputChooseView.java @@ -17,7 +17,7 @@ import android.widget.EditText; import android.widget.RadioGroup; import com.bigkoo.pickerview.view.TimePickerView; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tenlionsoft.baselib.R; import java.text.SimpleDateFormat; diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterInputView.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterInputView.java index 7c96bc9..5e7e22d 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterInputView.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterInputView.java @@ -18,7 +18,7 @@ import android.widget.TextView; import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.TimePickerView; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tenlionsoft.baselib.R; import java.text.SimpleDateFormat; diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterInputViewBase.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterInputViewBase.java index 6fbcadf..feea778 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterInputViewBase.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterInputViewBase.java @@ -15,7 +15,7 @@ import android.view.inputmethod.InputMethodManager; import android.widget.EditText; import com.bigkoo.pickerview.view.TimePickerView; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tenlionsoft.baselib.R; import java.text.SimpleDateFormat; diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterTextAndInputView.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterTextAndInputView.java index 780a61a..cb96898 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterTextAndInputView.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterTextAndInputView.java @@ -15,7 +15,7 @@ import android.view.inputmethod.InputMethodManager; import android.widget.EditText; import android.widget.TextView; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tenlionsoft.baselib.R; diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterTimeAndIntputView.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterTimeAndIntputView.java index 411390d..9515b98 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterTimeAndIntputView.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CenterTimeAndIntputView.java @@ -22,7 +22,7 @@ import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.bigkoo.pickerview.view.TimePickerView; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tenlionsoft.baselib.R; import com.tenlionsoft.baselib.constant.PathConfig; import com.tenlionsoft.baselib.core.beans.AreaBean; diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/ChangePwdDialog.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/ChangePwdDialog.java index 1764993..bf02cb1 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/ChangePwdDialog.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/ChangePwdDialog.java @@ -21,7 +21,7 @@ import android.widget.EditText; import android.widget.ImageView; import android.widget.TextView; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tenlionsoft.baselib.R; import com.tenlionsoft.baselib.constant.PathConfig; diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CorrectionDialog.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CorrectionDialog.java index 9972e5e..facbb2e 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CorrectionDialog.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/CorrectionDialog.java @@ -15,7 +15,7 @@ import android.view.WindowManager; import android.view.inputmethod.InputMethodManager; import android.widget.EditText; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tenlionsoft.baselib.R; import androidx.appcompat.widget.AppCompatRatingBar; diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/LimitEmojiEditText.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/LimitEmojiEditText.java index 2750a90..a97a662 100644 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/LimitEmojiEditText.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/LimitEmojiEditText.java @@ -7,7 +7,7 @@ import android.util.AttributeSet; import android.view.inputmethod.EditorInfo; import android.widget.EditText; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tenlionsoft.baselib.R; import com.tenlionsoft.baselib.utils.LogUtils; diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/SearchPersonDialogView.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/SearchPersonDialogView.java index e02a051..96786f5 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/SearchPersonDialogView.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/SearchPersonDialogView.java @@ -20,7 +20,7 @@ import android.widget.TextView; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tenlionsoft.baselib.R; import com.tenlionsoft.baselib.core.beans.DictionaryBean; import com.tenlionsoft.baselib.core.beans.PersonSearchBean; diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/TypeBoldTextView.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/TypeBoldTextView.java index 684798e..31e8967 100644 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/TypeBoldTextView.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/views/TypeBoldTextView.java @@ -1,12 +1,14 @@ package com.tenlionsoft.baselib.core.widget.views; import android.content.Context; -import android.graphics.Typeface; +import android.content.res.TypedArray; import android.text.TextPaint; import android.util.AttributeSet; import androidx.annotation.Nullable; +import com.tenlionsoft.baselib.R; + /** * 作者: adam * 日期: 2020/6/3 - 4:58 PM @@ -25,7 +27,11 @@ public class TypeBoldTextView extends androidx.appcompat.widget.AppCompatTextVie public TypeBoldTextView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); - setTextBold(); + TypedArray a = context.getTheme().obtainStyledAttributes(attrs, R.styleable.TypeBoldTextView, defStyleAttr, 0); + int type = a.getInteger(R.styleable.TypeBoldTextView_txt_is_bold, 0); + if (type == 0) { + setTextBold(); + } } private void setTextBold() { diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/utils/ExceptionHandler.java b/baselib/src/main/java/com/tenlionsoft/baselib/utils/ExceptionHandler.java index 8512cf3..d25f4af 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/utils/ExceptionHandler.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/utils/ExceptionHandler.java @@ -4,7 +4,6 @@ import android.text.TextUtils; import com.google.gson.Gson; import com.google.gson.JsonParseException; -import com.hjq.toast.ToastUtils; import com.tenlionsoft.baselib.core.beans.ErrorBean; import java.net.SocketTimeoutException; @@ -22,16 +21,23 @@ public class ExceptionHandler { public static void handleException(Throwable throwable) { if (throwable instanceof HttpException) { HttpException ex = (HttpException) throwable; + ex.printStackTrace(); try { String errBody = ex.response().errorBody().string(); + LogUtils.e(ex.getMessage()); + LogUtils.e(errBody); if (!TextUtils.isEmpty(errBody)) { ErrorBean errorBean = new Gson().fromJson(errBody, ErrorBean.class); if (!TextUtils.isEmpty(errorBean.getMsg())) { ToastUtils.show(errorBean.getMsg() + "(" + errorBean.getCode() + ")"); } else if (!TextUtils.isEmpty(errorBean.getMessage())) { ToastUtils.show(errorBean.getMessage() + "(" + errorBean.getCode() + ")"); + } else if (errBody.contains("404")) { + ToastUtils.show("无法连接到服务器,请检查网络连接后再试(404)"); + } else if (errBody.contains("500")) { + ToastUtils.show("服务器发生错误(500)"); } else { - ToastUtils.show("网络错误,请稍后重试" + "(" + errorBean.getCode() + ")"); + ToastUtils.show("服务器发生错误"); } } } catch (Exception e1) { diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/utils/TimeUtils.java b/baselib/src/main/java/com/tenlionsoft/baselib/utils/TimeUtils.java index 79aac83..aa9d3af 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/utils/TimeUtils.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/utils/TimeUtils.java @@ -89,6 +89,7 @@ public final class TimeUtils { } return result; } + public static int getMonthDay(String time) { SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); try { @@ -107,6 +108,7 @@ public final class TimeUtils { SimpleDateFormat format = new SimpleDateFormat("yyyy"); return format.format(date); } + public static int getDayOfString(String time) { SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); try { @@ -120,6 +122,7 @@ public final class TimeUtils { return -1; } } + /** * Milliseconds to the formatted time string. * @@ -130,6 +133,7 @@ public final class TimeUtils { public static String millis2String(final long millis, @NonNull final DateFormat format) { return format.format(new Date(millis)); } + /** * 获取某年某月的最后天 * @@ -144,6 +148,7 @@ public final class TimeUtils { int dayOfMonth = cal.getActualMaximum(Calendar.DATE); return dayOfMonth; } + /** * Formatted time string to the milliseconds. *

The pattern is {@code yyyy-MM-dd HH:mm:ss}.

@@ -160,6 +165,7 @@ public final class TimeUtils { SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); return format.format(date); } + public static String dateToStringMonth(final Date date) { SimpleDateFormat format = new SimpleDateFormat("MM"); return format.format(date); @@ -171,6 +177,12 @@ public final class TimeUtils { return format.format(date); } + public static String getCurrentChineseDate() { + Date date = new Date(); + SimpleDateFormat format = new SimpleDateFormat("yyyy年MM月dd日"); + return format.format(date); + } + public static String getCurrentMonth() { Date date = new Date(); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM"); @@ -1802,7 +1814,7 @@ public final class TimeUtils { } private static final String[] CHINESE_ZODIAC = - {"猴", "鸡", "狗", "猪", "鼠", "牛", "虎", "兔", "龙", "蛇", "马", "羊"}; + {"猴", "鸡", "狗", "猪", "鼠", "牛", "虎", "兔", "龙", "蛇", "马", "羊"}; /** * Return the Chinese zodiac. @@ -1860,8 +1872,8 @@ public final class TimeUtils { private static final int[] ZODIAC_FLAGS = {20, 19, 21, 21, 21, 22, 23, 23, 23, 24, 23, 22}; private static final String[] ZODIAC = { - "水瓶座", "双鱼座", "白羊座", "金牛座", "双子座", "巨蟹座", - "狮子座", "处女座", "天秤座", "天蝎座", "射手座", "魔羯座" + "水瓶座", "双鱼座", "白羊座", "金牛座", "双子座", "巨蟹座", + "狮子座", "处女座", "天秤座", "天蝎座", "射手座", "魔羯座" }; /** @@ -1919,8 +1931,8 @@ public final class TimeUtils { */ public static String getZodiac(final int month, final int day) { return ZODIAC[day >= ZODIAC_FLAGS[month - 1] - ? month - 1 - : (month + 10) % 12]; + ? month - 1 + : (month + 10) % 12]; } private static long timeSpan2Millis(final long timeSpan, diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/utils/ToastUtils.java b/baselib/src/main/java/com/tenlionsoft/baselib/utils/ToastUtils.java new file mode 100644 index 0000000..ab113f3 --- /dev/null +++ b/baselib/src/main/java/com/tenlionsoft/baselib/utils/ToastUtils.java @@ -0,0 +1,17 @@ +package com.tenlionsoft.baselib.utils; + +import com.hjq.toast.Toaster; + +public class ToastUtils { + public static void show(String content) { + Toaster.show(content); + } + + public static void show(int content) { + Toaster.show(content); + } + + public static void showLong(String content) { + Toaster.showLong(content); + } +} diff --git a/commonmodule/src/main/res/drawable-xhdpi/ic_arrow_sort_gray.png b/baselib/src/main/res/drawable-xhdpi/ic_arrow_sort_gray.png similarity index 100% rename from commonmodule/src/main/res/drawable-xhdpi/ic_arrow_sort_gray.png rename to baselib/src/main/res/drawable-xhdpi/ic_arrow_sort_gray.png diff --git a/baselib/src/main/res/layout/base_activity.xml b/baselib/src/main/res/layout/base_activity.xml index dbc3320..e42a1de 100755 --- a/baselib/src/main/res/layout/base_activity.xml +++ b/baselib/src/main/res/layout/base_activity.xml @@ -194,7 +194,7 @@ android:background="@null" android:drawableLeft="@drawable/ic_search_icon_gray" android:drawablePadding="5dp" - android:hint="请输入查询的内容" + android:hint="请输入查询的关键字" android:imeOptions="actionSearch" android:padding="8dp" android:singleLine="true" diff --git a/baselib/src/main/res/layout/item_search.xml b/baselib/src/main/res/layout/item_search.xml index 8f7e396..59ed4f1 100644 --- a/baselib/src/main/res/layout/item_search.xml +++ b/baselib/src/main/res/layout/item_search.xml @@ -29,8 +29,10 @@ android:gravity="left|center" android:hint="请输入人员身份证号码" android:inputType="text" + android:imeOptions="actionSearch" android:paddingLeft="5dp" android:textColor="@color/black" + android:maxLines="1" android:textSize="12sp" tools:text="" /> diff --git a/baselib/src/main/res/values-v26/style.xml b/baselib/src/main/res/values-v26/style.xml index a81080c..baf32be 100644 --- a/baselib/src/main/res/values-v26/style.xml +++ b/baselib/src/main/res/values-v26/style.xml @@ -508,7 +508,7 @@ wrap_content 1 5dp - @drawable/ic_arrow_gray_down + @drawable/ic_arrow_sort_gray right 5dp center_vertical diff --git a/baselib/src/main/res/values-v27/style.xml b/baselib/src/main/res/values-v27/style.xml index e9b484d..9a0a4cb 100644 --- a/baselib/src/main/res/values-v27/style.xml +++ b/baselib/src/main/res/values-v27/style.xml @@ -508,7 +508,7 @@ wrap_content 1 5dp - @drawable/ic_arrow_gray_down + @drawable/ic_arrow_sort_gray right 5dp center_vertical diff --git a/baselib/src/main/res/values/attrs.xml b/baselib/src/main/res/values/attrs.xml index 8519353..93c4f4e 100755 --- a/baselib/src/main/res/values/attrs.xml +++ b/baselib/src/main/res/values/attrs.xml @@ -21,6 +21,7 @@ + @@ -32,6 +33,11 @@ + + + + + @@ -187,7 +193,7 @@ - - + + \ No newline at end of file diff --git a/baselib/src/main/res/values/styles.xml b/baselib/src/main/res/values/styles.xml index ef587b8..05d65e9 100755 --- a/baselib/src/main/res/values/styles.xml +++ b/baselib/src/main/res/values/styles.xml @@ -522,7 +522,7 @@ wrap_content 1 5dp - @drawable/ic_arrow_gray_down + @drawable/ic_arrow_sort_gray right 5dp center_vertical diff --git a/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/AddressListActivity.java b/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/AddressListActivity.java index 8315992..dbef1c9 100644 --- a/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/AddressListActivity.java +++ b/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/AddressListActivity.java @@ -15,7 +15,7 @@ import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.github.promeg.pinyinhelper.Pinyin; import com.gyf.immersionbar.ImmersionBar; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.chatmodule.R; import com.tengshisoft.chatmodule.R2; import com.tengshisoft.chatmodule.fragments.OftenContactFragment; diff --git a/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/AddressListSearchActivity.java b/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/AddressListSearchActivity.java index 9444f12..f7832d6 100644 --- a/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/AddressListSearchActivity.java +++ b/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/AddressListSearchActivity.java @@ -11,7 +11,7 @@ import android.widget.ProgressBar; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.gyf.immersionbar.ImmersionBar; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.chatmodule.R; import com.tengshisoft.chatmodule.R2; diff --git a/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/AddressUserDetailActivity.java b/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/AddressUserDetailActivity.java index 1b54611..504c50b 100644 --- a/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/AddressUserDetailActivity.java +++ b/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/AddressUserDetailActivity.java @@ -18,7 +18,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.huawei.ecterminalsdk.base.TsdkCallInfo; import com.huawei.ecterminalsdk.models.TsdkCommonResult; import com.huawei.ecterminalsdk.models.call.TsdkCall; diff --git a/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/CallSingleActivity.java b/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/CallSingleActivity.java index e3df9cc..7a22400 100644 --- a/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/CallSingleActivity.java +++ b/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/CallSingleActivity.java @@ -8,7 +8,7 @@ import android.view.WindowManager; import com.alibaba.android.arouter.facade.annotation.Route; import com.gyf.immersionbar.ImmersionBar; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.chatmodule.CallSessionCallback; import com.tengshisoft.chatmodule.R; import com.tengshisoft.chatmodule.beans.EnumType; diff --git a/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/ChatActivity.java b/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/ChatActivity.java index 94e5a4e..661ab78 100644 --- a/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/ChatActivity.java +++ b/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/ChatActivity.java @@ -22,7 +22,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.huawei.ecterminalsdk.base.TsdkCallInfo; import com.huawei.ecterminalsdk.models.TsdkCommonResult; import com.huawei.ecterminalsdk.models.call.TsdkCall; diff --git a/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/InvitedPointCallActivity.java b/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/InvitedPointCallActivity.java index 61dd06a..6971fa8 100644 --- a/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/InvitedPointCallActivity.java +++ b/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/InvitedPointCallActivity.java @@ -22,7 +22,7 @@ import android.widget.TextView; import com.allen.library.SuperTextView; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.huawei.ecterminalsdk.base.TsdkConfRole; import com.huawei.ecterminalsdk.base.TsdkLdapContactsInfo; import com.huawei.ecterminalsdk.base.TsdkMobileAuidoRoute; diff --git a/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/ParticipantsActivityV2.java b/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/ParticipantsActivityV2.java index 20b213e..28b46b3 100644 --- a/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/ParticipantsActivityV2.java +++ b/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/ParticipantsActivityV2.java @@ -17,7 +17,7 @@ import android.widget.LinearLayout; import android.widget.TextView; import com.google.android.material.bottomsheet.BottomSheetDialog; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.huawei.ecterminalsdk.base.TsdkConfAttendeeInfo; import com.huawei.ecterminalsdk.base.TsdkConfSpeaker; import com.huawei.ecterminalsdk.base.TsdkConfTerminalType; diff --git a/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/SponsorMeetingActivity.java b/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/SponsorMeetingActivity.java index e9ae3b4..c378de9 100644 --- a/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/SponsorMeetingActivity.java +++ b/chatmodule/src/main/java/com/tengshisoft/chatmodule/activity/SponsorMeetingActivity.java @@ -31,7 +31,7 @@ import android.widget.TextView; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.huawei.ecterminalsdk.base.TsdkConfRole; import com.huawei.ecterminalsdk.base.TsdkMobileAuidoRoute; import com.huawei.ecterminalsdk.base.TsdkNotifyHandUpAttendee; diff --git a/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/manager/LoginMangerV2.java b/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/manager/LoginMangerV2.java index bc188c1..97079fe 100644 --- a/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/manager/LoginMangerV2.java +++ b/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/manager/LoginMangerV2.java @@ -4,7 +4,7 @@ package com.tengshisoft.chatmodule.hwclud.manager; import android.os.Build; import android.text.TextUtils; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.huawei.ecterminalsdk.base.TsdkAuthType; import com.huawei.ecterminalsdk.base.TsdkFailedInfo; import com.huawei.ecterminalsdk.base.TsdkForceLogoutInfo; diff --git a/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/serivce/AuxSendService.java b/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/serivce/AuxSendService.java index 5a6953d..c93f1de 100644 --- a/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/serivce/AuxSendService.java +++ b/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/serivce/AuxSendService.java @@ -20,7 +20,7 @@ import android.view.ViewConfiguration; import android.view.WindowManager; import android.widget.LinearLayout; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.huawei.ecterminalsdk.models.call.TsdkCall; import com.tengshisoft.chatmodule.R; import com.tengshisoft.chatmodule.activity.SponsorMeetingActivity; diff --git a/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/serivce/FloatingViewService.java b/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/serivce/FloatingViewService.java index 2d861b9..233d04b 100644 --- a/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/serivce/FloatingViewService.java +++ b/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/serivce/FloatingViewService.java @@ -17,7 +17,7 @@ import android.widget.Chronometer; import android.widget.FrameLayout; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.chatmodule.R; import com.tengshisoft.chatmodule.activity.SponsorMeetingActivity; import com.tengshisoft.chatmodule.hwclud.listener.FloatingViewListener; diff --git a/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/serivce/MinimizeService.java b/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/serivce/MinimizeService.java index 7886759..27cacb7 100644 --- a/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/serivce/MinimizeService.java +++ b/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/serivce/MinimizeService.java @@ -20,7 +20,7 @@ import android.view.WindowManager; import android.widget.FrameLayout; import android.widget.TextView; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.huawei.ecterminalsdk.base.TsdkWatchSvcAttendees; import com.huawei.ecterminalsdk.models.call.TsdkCall; import com.tengshisoft.chatmodule.R; diff --git a/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/serivce/ServiceNotifyV2.java b/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/serivce/ServiceNotifyV2.java index 766a82e..a3e8b28 100644 --- a/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/serivce/ServiceNotifyV2.java +++ b/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/serivce/ServiceNotifyV2.java @@ -6,7 +6,7 @@ import android.os.Build; import android.text.TextUtils; import android.util.Log; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.huawei.ecterminalsdk.base.TsdkAttendee; import com.huawei.ecterminalsdk.base.TsdkAudioNetQuality; import com.huawei.ecterminalsdk.base.TsdkAuxTokenOwnerInd; diff --git a/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/ui/AuxMeetingFragment.java b/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/ui/AuxMeetingFragment.java index 1ef0c3a..cdbf42d 100644 --- a/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/ui/AuxMeetingFragment.java +++ b/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/ui/AuxMeetingFragment.java @@ -9,7 +9,7 @@ import android.os.Looper; import android.util.Log; import android.widget.FrameLayout; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.huawei.ecterminalsdk.base.TsdkWatchSvcAttendees; import com.tengshisoft.chatmodule.R; import com.tengshisoft.chatmodule.R2; diff --git a/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/ui/BaseMvpActivityV2.java b/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/ui/BaseMvpActivityV2.java index 476a5c7..f5b2753 100644 --- a/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/ui/BaseMvpActivityV2.java +++ b/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/ui/BaseMvpActivityV2.java @@ -14,7 +14,7 @@ import android.view.View; import android.view.inputmethod.InputMethodManager; import android.widget.EditText; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.chatmodule.R; import com.tengshisoft.chatmodule.activity.ChatActivity; import com.tengshisoft.chatmodule.activity.InvitedPointCallActivity; 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 512badb..4de1770 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 @@ -8,7 +8,7 @@ import android.view.View; import android.view.ViewGroup; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.chatmodule.hwclud.listener.OrientationListener; import com.tengshisoft.chatmodule.hwclud.utils.LogUtil; diff --git a/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/ui/SvcVideoFragment.kt b/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/ui/SvcVideoFragment.kt index 82fe854..dbb5fba 100644 --- a/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/ui/SvcVideoFragment.kt +++ b/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/ui/SvcVideoFragment.kt @@ -7,7 +7,7 @@ import android.view.ViewGroup import android.widget.FrameLayout import android.widget.RelativeLayout import androidx.annotation.RequiresApi -import com.hjq.toast.ToastUtils +import com.tenlionsoft.baselib.utils.ToastUtils import com.huawei.ecterminalsdk.base.TsdkConfSpeakerInfo import com.huawei.ecterminalsdk.base.TsdkWatchSvcAttendees import com.tengshisoft.chatmodule.R diff --git a/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/utils/HuaweiUtils.java b/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/utils/HuaweiUtils.java index 0357504..68d8d85 100644 --- a/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/utils/HuaweiUtils.java +++ b/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/utils/HuaweiUtils.java @@ -14,7 +14,7 @@ import android.os.Build; import android.util.Log; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import java.lang.reflect.Method; diff --git a/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/utils/PhoneUtil.java b/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/utils/PhoneUtil.java index aaacf6d..4a03a62 100644 --- a/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/utils/PhoneUtil.java +++ b/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/utils/PhoneUtil.java @@ -9,7 +9,7 @@ import android.provider.Settings; import android.telephony.TelephonyManager; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.chatmodule.R; import com.tenlionsoft.baselib.app.BaseAppContext; diff --git a/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/utils/UIUtil.java b/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/utils/UIUtil.java index 7fdec07..901c91d 100644 --- a/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/utils/UIUtil.java +++ b/chatmodule/src/main/java/com/tengshisoft/chatmodule/hwclud/utils/UIUtil.java @@ -40,7 +40,7 @@ import android.widget.Spinner; import android.widget.SpinnerAdapter; import android.widget.TextView; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.chatmodule.R; import com.tenlionsoft.baselib.app.BaseAppContext; import com.tenlionsoft.baselib.core.beans.Member; diff --git a/chatmodule/src/main/java/com/tengshisoft/chatmodule/keeplive/services/VoipReceiver.java b/chatmodule/src/main/java/com/tengshisoft/chatmodule/keeplive/services/VoipReceiver.java index d5f10d2..6ddfe34 100644 --- a/chatmodule/src/main/java/com/tengshisoft/chatmodule/keeplive/services/VoipReceiver.java +++ b/chatmodule/src/main/java/com/tengshisoft/chatmodule/keeplive/services/VoipReceiver.java @@ -6,7 +6,7 @@ import android.content.Intent; import android.media.AsyncPlayer; import android.util.Log; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import java.util.ArrayList; diff --git a/commonmodule/src/main/AndroidManifest.xml b/commonmodule/src/main/AndroidManifest.xml index 9ed2fb8..7eafcf2 100644 --- a/commonmodule/src/main/AndroidManifest.xml +++ b/commonmodule/src/main/AndroidManifest.xml @@ -3,6 +3,18 @@ package="com.tengshisoft.commonmodule"> + + >() { + RetrofitManager.getInstance() + .create(GridApis.class) + .getCaseTypeListAll(UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer>() { @Override public void onSubscribe(@NonNull Disposable d) { diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentReturnRecordActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentReturnRecordActivity.java index 4fde9c0..c839bca 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentReturnRecordActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentReturnRecordActivity.java @@ -6,7 +6,7 @@ import android.view.View; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentReturnRecordAddActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentReturnRecordAddActivity.java index 0dac0bd..8737789 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentReturnRecordAddActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentReturnRecordAddActivity.java @@ -15,7 +15,7 @@ import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; import com.tengshisoft.commonmodule.beans.SaveFloatingBean; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentSpecialActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentSpecialActivity.java index cb1dfe3..4dace59 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentSpecialActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentSpecialActivity.java @@ -5,7 +5,7 @@ import android.view.View; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; import com.tenlionsoft.baselib.constant.PathConfig; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentSpecialDeptActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentSpecialDeptActivity.java index 0a66ec7..69de246 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentSpecialDeptActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/IncidentSpecialDeptActivity.java @@ -5,7 +5,7 @@ import android.view.View; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; import com.tenlionsoft.baselib.constant.PathConfig; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/TaskConverIncidentReportActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/TaskConverIncidentReportActivity.java index c8e9638..402eddb 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/TaskConverIncidentReportActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/cases/TaskConverIncidentReportActivity.java @@ -33,7 +33,7 @@ import com.bigkoo.pickerview.view.TimePickerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; import com.tengshisoft.commonmodule.beans.AreaGridListBean; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/checkwork/AttendanceActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/checkwork/AttendanceActivity.java index 6186df0..9adee4b 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/checkwork/AttendanceActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/checkwork/AttendanceActivity.java @@ -31,7 +31,7 @@ import com.baidu.mapapi.model.LatLng; import com.bumptech.glide.Glide; import com.bumptech.glide.load.resource.bitmap.CircleCrop; import com.bumptech.glide.request.RequestOptions; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; import com.tengshisoft.commonmodule.beans.UserGridList; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/department/BindGridActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/department/BindGridActivity.java index 5977514..9e3d248 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/department/BindGridActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/department/BindGridActivity.java @@ -9,7 +9,7 @@ import android.widget.ProgressBar; import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/department/ChooseDeptActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/department/ChooseDeptActivity.java index 24d3d8c..a4ef4e2 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/department/ChooseDeptActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/department/ChooseDeptActivity.java @@ -11,7 +11,7 @@ import com.alibaba.android.arouter.facade.annotation.Route; import com.google.android.flexbox.FlexDirection; import com.google.android.flexbox.FlexWrap; import com.google.android.flexbox.FlexboxLayoutManager; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/department/ChooseDeptKnowLedgeActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/department/ChooseDeptKnowLedgeActivity.java index 4118b71..5156560 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/department/ChooseDeptKnowLedgeActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/department/ChooseDeptKnowLedgeActivity.java @@ -11,7 +11,7 @@ import com.alibaba.android.arouter.facade.annotation.Route; import com.google.android.flexbox.FlexDirection; import com.google.android.flexbox.FlexWrap; import com.google.android.flexbox.FlexboxLayoutManager; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/department/ChooseDeptUserActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/department/ChooseDeptUserActivity.java index f5b3618..fe687c2 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/department/ChooseDeptUserActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/department/ChooseDeptUserActivity.java @@ -10,7 +10,7 @@ import com.alibaba.android.arouter.facade.annotation.Route; import com.google.android.flexbox.FlexDirection; import com.google.android.flexbox.FlexWrap; import com.google.android.flexbox.FlexboxLayoutManager; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/department/ChooseGridActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/department/ChooseGridActivity.java index 84cec06..34bf52b 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/department/ChooseGridActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/department/ChooseGridActivity.java @@ -12,7 +12,7 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.alibaba.android.arouter.facade.annotation.Route; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/department/ChooseOrgAreaActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/department/ChooseOrgAreaActivity.java index 8183694..40d98df 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/department/ChooseOrgAreaActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/department/ChooseOrgAreaActivity.java @@ -10,7 +10,7 @@ import com.alibaba.android.arouter.facade.annotation.Route; import com.google.android.flexbox.FlexDirection; import com.google.android.flexbox.FlexWrap; import com.google.android.flexbox.FlexboxLayoutManager; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/department/ChoosePersonActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/department/ChoosePersonActivity.java index d9f54fc..f068a09 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/department/ChoosePersonActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/department/ChoosePersonActivity.java @@ -12,7 +12,7 @@ import android.widget.ProgressBar; import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/journal/JournalDetailActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/journal/JournalDetailActivity.java index 17bf897..43f67cf 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/journal/JournalDetailActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/journal/JournalDetailActivity.java @@ -15,7 +15,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/journal/JournalEditActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/journal/JournalEditActivity.java index e82dda3..9cd70b5 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/journal/JournalEditActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/journal/JournalEditActivity.java @@ -26,7 +26,7 @@ import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; import com.tengshisoft.commonmodule.beans.JournalListBean; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/journal/JournalListActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/journal/JournalListActivity.java index f7e1516..875d505 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/journal/JournalListActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/journal/JournalListActivity.java @@ -21,7 +21,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.gyf.immersionbar.ImmersionBar; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/journal/JournalReportActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/journal/JournalReportActivity.java index 808cd86..0b3147f 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/journal/JournalReportActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/journal/JournalReportActivity.java @@ -25,7 +25,7 @@ import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; import com.tengshisoft.commonmodule.beans.SaveJournalBean; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/logs/StatisticsGridActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/logs/StatisticsGridActivity.java index b213306..c3ab2b9 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/logs/StatisticsGridActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/logs/StatisticsGridActivity.java @@ -17,7 +17,7 @@ import com.github.mikephil.charting.data.BarDataSet; import com.github.mikephil.charting.data.BarEntry; import com.github.mikephil.charting.formatter.LargeValueFormatter; import com.gyf.immersionbar.ImmersionBar; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; import com.tengshisoft.commonmodule.beans.GridStatistCountBean; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/notice/NoticeDetailActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/notice/NoticeDetailActivity.java new file mode 100644 index 0000000..e1e1fc3 --- /dev/null +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/notice/NoticeDetailActivity.java @@ -0,0 +1,196 @@ +package com.tengshisoft.commonmodule.activitys.notice; + +import android.net.http.SslError; +import android.os.Build; +import android.text.TextUtils; +import android.webkit.HttpAuthHandler; +import android.webkit.JsResult; +import android.webkit.SslErrorHandler; +import android.webkit.WebChromeClient; +import android.webkit.WebSettings; +import android.webkit.WebView; +import android.webkit.WebViewClient; +import android.widget.LinearLayout; +import android.widget.TextView; + +import com.alibaba.android.arouter.facade.annotation.Route; +import com.tenlionsoft.baselib.utils.ToastUtils; +import com.tengshisoft.commonmodule.R; +import com.tengshisoft.commonmodule.R2; +import com.tengshisoft.commonmodule.beans.NoticeDetailBean; +import com.tengshisoft.commonmodule.nets.GridApis; +import com.tenlionsoft.baselib.constant.PathConfig; +import com.tenlionsoft.baselib.core.retrofit_net.BaseUrlApi; +import com.tenlionsoft.baselib.core.retrofit_net.RetrofitManager; +import com.tenlionsoft.baselib.core.retrofit_net.conver.RxTransformer; +import com.tenlionsoft.baselib.core.widget.base.BaseActivity; +import com.tenlionsoft.baselib.core.widget.views.NestedScrollWebView; +import com.tenlionsoft.baselib.core.widget.views.TypeBoldTextView; +import com.tenlionsoft.baselib.utils.ExceptionHandler; +import com.tenlionsoft.baselib.utils.LogUtils; +import com.tenlionsoft.baselib.utils.UserLgUtils; + +import butterknife.BindView; +import butterknife.ButterKnife; +import butterknife.Unbinder; +import io.reactivex.rxjava3.annotations.NonNull; +import io.reactivex.rxjava3.core.Observer; +import io.reactivex.rxjava3.disposables.Disposable; + +@Route(path = PathConfig.PATH_MODULE_COMMON_ACTIVITY_NOTICE_DETAIL) +public class NoticeDetailActivity extends BaseActivity { + + + @BindView(R2.id.tv_title) + public TypeBoldTextView mTvTitle; + @BindView(R2.id.tv_source) + public TextView mTvSource; + @BindView(R2.id.tv_time) + public TextView mTvTime; + @BindView(R2.id.nsw_web) + public NestedScrollWebView mNswWeb; + private Unbinder mBind; + private String mId; + + @Override + protected int setLayoutId() { + return R.layout.activity_notice_detail; + } + + @Override + public void initData() { + mBind = ButterKnife.bind(this); + refreshView(STATE_LOAD_LOADING); + mTvBaseTitle.setText("详情"); + mId = getIntent().getStringExtra("id"); + if (TextUtils.isEmpty(mId)) { + ToastUtils.show("数据有误"); + finish(); + } else { + getDetailById(mId); + } + } + + /** + * 获取详情 + * + * @param id + */ + + /** + * 获取详情 + */ + private void getDetailById(String id) { + RetrofitManager.getInstance() + .create(GridApis.class) + .getArticleDetail(id, UserLgUtils.getToken()) + .compose(RxTransformer.getTransformer()) + .subscribe(new Observer() { + @Override + public void onSubscribe(@NonNull Disposable d) { + + } + + @Override + public void onNext(@NonNull NoticeDetailBean rowsBean) { + setDataToView(rowsBean); + } + + @Override + public void onError(@NonNull Throwable e) { + refreshView(STATE_LOAD_ERROR); + ExceptionHandler.handleException(e); + } + + @Override + public void onComplete() { + + } + }); + } + + /** + * 回显数据 + */ + private void setDataToView(NoticeDetailBean bean) { + refreshView(STATE_LOAD_SUCCESS); + mTvTitle.setText(bean.getTitle()); + mTvTime.setText(bean.getPublishDate()); + mTvSource.setText(bean.getSource()); + + WebSettings settings = mNswWeb.getSettings(); + settings.setCacheMode(WebSettings.LOAD_DEFAULT); + settings.setAppCacheEnabled(true); + settings.setJavaScriptEnabled(true);//启用JS + settings.setBlockNetworkImage(true);//阻塞页面图片加载 + settings.setDomStorageEnabled(true); + settings.setTextZoom(90); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + settings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW); + } + String newStr = + bean.getContent().replaceAll("route/file/v2/download/true/", BaseUrlApi.BASE_IMG_URL_V2).replaceAll( + "img", "img style='width:100%;height:auto;'"); + bean.setContent(newStr); + LogUtils.e(newStr); + mNswWeb.loadData(bean.getContent(), "text/html", "utf-8"); + + mNswWeb.setWebViewClient(new WebViewClient() { + @Override + public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError error) { + handler.proceed(); + } + + @Override + public void onPageFinished(WebView view, String url) { + super.onPageFinished(view, url); + view.getSettings().setBlockNetworkImage(false);//开启页面图片加载 +// imgReset(); + runOnUiThread(() -> mNswWeb.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT))); + } + + @Override + public void onReceivedHttpAuthRequest(WebView view, HttpAuthHandler handler, String host, String realm) { + super.onReceivedHttpAuthRequest(view, handler, host, realm); + + } + + @Override + public boolean shouldOverrideUrlLoading(WebView view, String url) { + view.loadUrl(url); + return true; + } + }); + mNswWeb.setWebChromeClient(new WebChromeClient() { + @Override + public boolean onJsAlert(WebView view, String url, String message, JsResult result) { + return super.onJsAlert(view, url, message, result); + } + }); + } + + /** + * 对图片进行重置大小，宽度就是手机屏幕宽度，高度根据宽度比便自动缩放 + **/ + private void imgReset() { + mNswWeb.loadUrl("javascript:(function(){" + + "var objs = document.getElementsByTagName('img'); " + + "for(var i=0;i mDatas; + private int mCurrentPage = 1; + private String mKeywords = ""; + private ProgressDialog mDialog; + private NoticeListAdapter mAdapter; + + @Override + protected int setLayoutId() { + return R.layout.activity_notice_list; + } + + @Override + public void initData() { + mBind = ButterKnife.bind(this); + mTvBaseTitle.setText("通知公告"); + ImmersionBar.with(mActivity) + .statusBarColor("#FFFFFF") + .statusBarDarkFont(true) + .titleBar(mRlTitleBar) + .init(); + mTvBaseTitle.setTextColor(Color.BLACK); + mRlTitleBar.setBackgroundColor(getResources().getColor(R.color.white)); + mIvAppSearchIcon.setVisibility(View.GONE); + mTvAppBack.setBackgroundResource(R.drawable.ic_back_black); + refreshView(STATE_LOAD_SUCCESS); + mIvAppSearchIcon.setVisibility(View.VISIBLE); + mDatas = new ArrayList<>(); + mAdapter = new NoticeListAdapter(mActivity, mDatas); + mRlvComponents.setLayoutManager(new LinearLayoutManager(mActivity)); + mRlvComponents.setAdapter(mAdapter); + mRlvComponents.addItemDecoration(new ItemSplitDivider(mActivity, LinearLayoutManager.VERTICAL, 1, + Color.parseColor("#BFBFBF"))); + mSrlContent.setOnRefreshListener(v -> doRefresh()); + mSrlContent.setOnLoadMoreListener(v -> doLoadMore()); + mCsvState.setState(CustomStateView.STATE_LOAD); + mAdapter.addOnItemClickListener(v -> ARouter.getInstance() + .build(PathConfig.PATH_MODULE_COMMON_ACTIVITY_NOTICE_DETAIL) + .withString("id", v.getContentId()) + .navigation()); + mDialog = UIUtil.initDialog(mActivity, "搜索中..."); + doRefresh(); + } + + //加载更多 + private void doLoadMore() { + getNoticeList(mCurrentPage); + } + + + //刷新 + private void doRefresh() { + mCsvState.setState(CustomStateView.STATE_LOAD); + mDatas.clear(); + mAdapter.setData(mDatas); + getNoticeList(1); + } + + private void getNoticeList(int currentPage) { + mCurrentPage = currentPage; + RetrofitManager.getInstance() + .create(GridApis.class) + .getArticleList(mKeywords, PathConfig.NOTICE_CID, mCurrentPage + "", UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(@NonNull Disposable d) { + + } + + @Override + public void onNext(@NonNull NoticeListBean communityListBean) { + if (mDialog != null && mDialog.isShowing()) { + mDialog.dismiss(); + } + mSrlContent.finishLoadMore(); + mSrlContent.finishRefresh(); + if (communityListBean.getRows() != null && communityListBean.getRows().size() > 0) { + mCsvState.setState(CustomStateView.STATE_SUCCESS); + ++mCurrentPage; + if (currentPage == 1) { + mDatas.clear(); + mDatas.addAll(communityListBean.getRows()); + } else { + mDatas.addAll(communityListBean.getRows()); + } + mAdapter.setData(mDatas); + if (mDatas.size() >= communityListBean.getTotal()) { + mSrlContent.setNoMoreData(true); + } else { + mSrlContent.setNoMoreData(false); + } + } else { + if (currentPage > 1) { + mSrlContent.setNoMoreData(true); + } else { + mCsvState.setState(CustomStateView.STATE_EMPTY); + if (TextUtils.isEmpty(mKeywords)) { + //无数据 + } else { + ToastUtils.show("未查询到相关内容"); + } + } + } + } + + @Override + public void onError(@NonNull Throwable e) { + if (mDialog != null && mDialog.isShowing()) { + mDialog.dismiss(); + } + mSrlContent.finishLoadMore(); + mSrlContent.finishRefresh(); + ExceptionHandler.handleException(e); + mCsvState.setState(CustomStateView.STATE_ERROR); + } + + @Override + public void onComplete() { + + } + }); + } + + @Override + protected void doSearchByTitle() { + + } + + @Override + protected void clearSearch() { + + } +} \ No newline at end of file diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/repository/KnowLedgeAskAddActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/repository/KnowLedgeAskAddActivity.java index da2fb8c..c5f1c6f 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/repository/KnowLedgeAskAddActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/repository/KnowLedgeAskAddActivity.java @@ -10,7 +10,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; import com.tengshisoft.commonmodule.beans.DeptBean; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/repository/KnowLedgeAskDetailActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/repository/KnowLedgeAskDetailActivity.java index 21530d9..6aef8aa 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/repository/KnowLedgeAskDetailActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/repository/KnowLedgeAskDetailActivity.java @@ -14,7 +14,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; import com.tengshisoft.commonmodule.beans.KnowAskDetailBean; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/repository/KnowLedgeDetailActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/repository/KnowLedgeDetailActivity.java index cbdff07..d751970 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/repository/KnowLedgeDetailActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/repository/KnowLedgeDetailActivity.java @@ -18,7 +18,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/repository/KnowLedgeListActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/repository/KnowLedgeListActivity.java index 2b50a98..04e2502 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/repository/KnowLedgeListActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/repository/KnowLedgeListActivity.java @@ -9,7 +9,7 @@ import android.view.View; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.gyf.immersionbar.ImmersionBar; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/repository/KnowLedgeManageAddActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/repository/KnowLedgeManageAddActivity.java index b62003a..c0fe958 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/repository/KnowLedgeManageAddActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/repository/KnowLedgeManageAddActivity.java @@ -13,7 +13,7 @@ import com.alibaba.android.arouter.launcher.ARouter; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; import com.tengshisoft.commonmodule.beans.CaseTypeBean; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/repository/KnowLedgeManageDetailActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/repository/KnowLedgeManageDetailActivity.java index 631f9a6..5d4fa4c 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/repository/KnowLedgeManageDetailActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/repository/KnowLedgeManageDetailActivity.java @@ -12,7 +12,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; import com.tengshisoft.commonmodule.beans.KnowReportDetailBean; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/repository/KnowLedgeManageListActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/repository/KnowLedgeManageListActivity.java index 338038e..ff557b3 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/repository/KnowLedgeManageListActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/repository/KnowLedgeManageListActivity.java @@ -6,7 +6,7 @@ import android.view.View; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/usercenter/ForgetPwdActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/usercenter/ForgetPwdActivity.java index 73aeb88..9fbe580 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/usercenter/ForgetPwdActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/usercenter/ForgetPwdActivity.java @@ -13,7 +13,7 @@ import android.widget.ImageView; import com.alibaba.android.arouter.facade.annotation.Route; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; import com.tenlionsoft.baselib.constant.PathConfig; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/usercenter/UserCenterActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/usercenter/UserCenterActivity.java index 743c4cc..22a9db1 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/usercenter/UserCenterActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/usercenter/UserCenterActivity.java @@ -20,7 +20,7 @@ import com.alibaba.android.arouter.facade.annotation.Route; import com.bumptech.glide.Glide; import com.bumptech.glide.load.resource.bitmap.CircleCrop; import com.bumptech.glide.request.RequestOptions; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; import com.tenlionsoft.baselib.constant.BaseConfig; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/usercenter/UserCenterFragment.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/usercenter/UserCenterFragment.java index ea93a4f..bebcd4c 100755 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/usercenter/UserCenterFragment.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/usercenter/UserCenterFragment.java @@ -26,7 +26,7 @@ import com.bumptech.glide.load.resource.bitmap.CircleCrop; import com.bumptech.glide.request.RequestOptions; import com.github.promeg.pinyinhelper.Pinyin; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; import com.tengshisoft.commonmodule.beans.ChangePwdBean; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/usercenter/UserInfoActivity.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/usercenter/UserInfoActivity.java index a8cfa1f..3428c07 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/usercenter/UserInfoActivity.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/activitys/usercenter/UserInfoActivity.java @@ -14,7 +14,7 @@ import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; import com.tengshisoft.commonmodule.beans.SaveUserExpandleInfo; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/adapters/NoticeListAdapter.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/adapters/NoticeListAdapter.java new file mode 100644 index 0000000..dcd9e02 --- /dev/null +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/adapters/NoticeListAdapter.java @@ -0,0 +1,54 @@ +package com.tengshisoft.commonmodule.adapters; + +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import com.bumptech.glide.Glide; +import com.tengshisoft.commonmodule.R; +import com.tengshisoft.commonmodule.beans.NoticeListBean; +import com.tengshisoft.commonmodule.holders.NoticeListHolder; +import com.tenlionsoft.baselib.core.retrofit_net.BaseUrlApi; +import com.tenlionsoft.baselib.core.widget.base.BaseRecyclerAdapter; + +import java.util.List; + +/** + * 作者: adam + * 日期: 2021/9/26 - 3:01 下午 + * 邮箱: itgaojian@163.com + * 描述: 通知公告 + */ +public class NoticeListAdapter extends BaseRecyclerAdapter { + + public NoticeListAdapter(Context ctx, List list) { + super(ctx, list); + } + + @Override + public NoticeListHolder createHolder(ViewGroup parent, int viewType) { + View itemView = LayoutInflater.from(mContext).inflate(R.layout.item_notice, parent, false); + return new NoticeListHolder(itemView); + } + + @Override + public void bindHolder(NoticeListHolder h, int i) { + NoticeListBean.RowsBean b = mData.get(i); + h.mTvTitle.setText(b.getTitle()); + h.mTvSource.setText(b.getSource()); + h.mTvTime.setText(b.getPublishDate()); + if (!TextUtils.isEmpty(b.getCoverPhotos())) { + h.mIvCover.setVisibility(View.VISIBLE); + String[] split = b.getCoverPhotos().split(","); + String s = BaseUrlApi.BASE_IMG_URL + split[0]; + Glide.with(mContext) + .load(s) + .apply(options) + .into(h.mIvCover); + } else { + h.mIvCover.setVisibility(View.GONE); + } + } +} diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/MigrantDetailBean.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/MigrantDetailBean.java index 78ce0fe..893b39d 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/MigrantDetailBean.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/MigrantDetailBean.java @@ -8,19 +8,85 @@ package com.tengshisoft.commonmodule.beans; */ public class MigrantDetailBean { + private String areaCode; + private String areaId; + private String areaNames; + private String birthDate; private String cardExpireDate; private String cardNumber; + private String currentResidence; + private String currentResidenceAddr; + private String currentResidenceDictionaryName; + private String education; + private String educationDictionaryName; private String floatingPopulationId; private String fullName; + private String gender; + private String genderDictionaryName; + private String gridId; + private String gridName; + private String healthyStatus; private String idCardNumber; private String inflowReason; private String inflowReasonDict; private String keyOfFollow; + private String maritalStatus; + private String maritalStatusDictionaryName; + private String nameUsedBefore; + private String nation; + private String nationDictionaryName; + private String nativePlace; + private String nativePlaceAddr; + private String nativePlaceDictionaryName; + private String occupation; + private String occupationCategory; + private String occupationCategoryDictionaryName; + private String politicalStatus; + private String politicalStatusDictionaryName; private String registerDate; + private String registeredResidence; + private String registeredResidenceAddr; + private String registeredResidenceDictionaryName; private String registrationType; private String registrationTypeDict; + private String religion; + private String religionDictionaryName; private String residenceType; private String residenceTypeDict; + private String serviceSpace; + private String telephone; + + public String getAreaCode() { + return areaCode; + } + + public void setAreaCode(String areaCode) { + this.areaCode = areaCode; + } + + public String getAreaId() { + return areaId; + } + + public void setAreaId(String areaId) { + this.areaId = areaId; + } + + public String getAreaNames() { + return areaNames; + } + + public void setAreaNames(String areaNames) { + this.areaNames = areaNames; + } + + public String getBirthDate() { + return birthDate; + } + + public void setBirthDate(String birthDate) { + this.birthDate = birthDate; + } public String getCardExpireDate() { return cardExpireDate; @@ -38,6 +104,46 @@ public class MigrantDetailBean { this.cardNumber = cardNumber; } + public String getCurrentResidence() { + return currentResidence; + } + + public void setCurrentResidence(String currentResidence) { + this.currentResidence = currentResidence; + } + + public String getCurrentResidenceAddr() { + return currentResidenceAddr; + } + + public void setCurrentResidenceAddr(String currentResidenceAddr) { + this.currentResidenceAddr = currentResidenceAddr; + } + + public String getCurrentResidenceDictionaryName() { + return currentResidenceDictionaryName; + } + + public void setCurrentResidenceDictionaryName(String currentResidenceDictionaryName) { + this.currentResidenceDictionaryName = currentResidenceDictionaryName; + } + + public String getEducation() { + return education; + } + + public void setEducation(String education) { + this.education = education; + } + + public String getEducationDictionaryName() { + return educationDictionaryName; + } + + public void setEducationDictionaryName(String educationDictionaryName) { + this.educationDictionaryName = educationDictionaryName; + } + public String getFloatingPopulationId() { return floatingPopulationId; } @@ -54,6 +160,46 @@ public class MigrantDetailBean { this.fullName = fullName; } + public String getGender() { + return gender; + } + + public void setGender(String gender) { + this.gender = gender; + } + + public String getGenderDictionaryName() { + return genderDictionaryName; + } + + public void setGenderDictionaryName(String genderDictionaryName) { + this.genderDictionaryName = genderDictionaryName; + } + + public String getGridId() { + return gridId; + } + + public void setGridId(String gridId) { + this.gridId = gridId; + } + + public String getGridName() { + return gridName; + } + + public void setGridName(String gridName) { + this.gridName = gridName; + } + + public String getHealthyStatus() { + return healthyStatus; + } + + public void setHealthyStatus(String healthyStatus) { + this.healthyStatus = healthyStatus; + } + public String getIdCardNumber() { return idCardNumber; } @@ -86,6 +232,110 @@ public class MigrantDetailBean { this.keyOfFollow = keyOfFollow; } + public String getMaritalStatus() { + return maritalStatus; + } + + public void setMaritalStatus(String maritalStatus) { + this.maritalStatus = maritalStatus; + } + + public String getMaritalStatusDictionaryName() { + return maritalStatusDictionaryName; + } + + public void setMaritalStatusDictionaryName(String maritalStatusDictionaryName) { + this.maritalStatusDictionaryName = maritalStatusDictionaryName; + } + + public String getNameUsedBefore() { + return nameUsedBefore; + } + + public void setNameUsedBefore(String nameUsedBefore) { + this.nameUsedBefore = nameUsedBefore; + } + + public String getNation() { + return nation; + } + + public void setNation(String nation) { + this.nation = nation; + } + + public String getNationDictionaryName() { + return nationDictionaryName; + } + + public void setNationDictionaryName(String nationDictionaryName) { + this.nationDictionaryName = nationDictionaryName; + } + + public String getNativePlace() { + return nativePlace; + } + + public void setNativePlace(String nativePlace) { + this.nativePlace = nativePlace; + } + + public String getNativePlaceAddr() { + return nativePlaceAddr; + } + + public void setNativePlaceAddr(String nativePlaceAddr) { + this.nativePlaceAddr = nativePlaceAddr; + } + + public String getNativePlaceDictionaryName() { + return nativePlaceDictionaryName; + } + + public void setNativePlaceDictionaryName(String nativePlaceDictionaryName) { + this.nativePlaceDictionaryName = nativePlaceDictionaryName; + } + + public String getOccupation() { + return occupation; + } + + public void setOccupation(String occupation) { + this.occupation = occupation; + } + + public String getOccupationCategory() { + return occupationCategory; + } + + public void setOccupationCategory(String occupationCategory) { + this.occupationCategory = occupationCategory; + } + + public String getOccupationCategoryDictionaryName() { + return occupationCategoryDictionaryName; + } + + public void setOccupationCategoryDictionaryName(String occupationCategoryDictionaryName) { + this.occupationCategoryDictionaryName = occupationCategoryDictionaryName; + } + + public String getPoliticalStatus() { + return politicalStatus; + } + + public void setPoliticalStatus(String politicalStatus) { + this.politicalStatus = politicalStatus; + } + + public String getPoliticalStatusDictionaryName() { + return politicalStatusDictionaryName; + } + + public void setPoliticalStatusDictionaryName(String politicalStatusDictionaryName) { + this.politicalStatusDictionaryName = politicalStatusDictionaryName; + } + public String getRegisterDate() { return registerDate; } @@ -94,6 +344,30 @@ public class MigrantDetailBean { this.registerDate = registerDate; } + public String getRegisteredResidence() { + return registeredResidence; + } + + public void setRegisteredResidence(String registeredResidence) { + this.registeredResidence = registeredResidence; + } + + public String getRegisteredResidenceAddr() { + return registeredResidenceAddr; + } + + public void setRegisteredResidenceAddr(String registeredResidenceAddr) { + this.registeredResidenceAddr = registeredResidenceAddr; + } + + public String getRegisteredResidenceDictionaryName() { + return registeredResidenceDictionaryName; + } + + public void setRegisteredResidenceDictionaryName(String registeredResidenceDictionaryName) { + this.registeredResidenceDictionaryName = registeredResidenceDictionaryName; + } + public String getRegistrationType() { return registrationType; } @@ -110,6 +384,22 @@ public class MigrantDetailBean { this.registrationTypeDict = registrationTypeDict; } + public String getReligion() { + return religion; + } + + public void setReligion(String religion) { + this.religion = religion; + } + + public String getReligionDictionaryName() { + return religionDictionaryName; + } + + public void setReligionDictionaryName(String religionDictionaryName) { + this.religionDictionaryName = religionDictionaryName; + } + public String getResidenceType() { return residenceType; } @@ -125,4 +415,20 @@ public class MigrantDetailBean { public void setResidenceTypeDict(String residenceTypeDict) { this.residenceTypeDict = residenceTypeDict; } + + public String getServiceSpace() { + return serviceSpace; + } + + public void setServiceSpace(String serviceSpace) { + this.serviceSpace = serviceSpace; + } + + public String getTelephone() { + return telephone; + } + + public void setTelephone(String telephone) { + this.telephone = telephone; + } } diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/NoticeDetailBean.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/NoticeDetailBean.java new file mode 100644 index 0000000..685a970 --- /dev/null +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/NoticeDetailBean.java @@ -0,0 +1,149 @@ +package com.tengshisoft.commonmodule.beans; + +public class NoticeDetailBean { + + private String author; + private String categoryId; + private String categorySummary; + private String categoryTitle; + private String content; + private String contentId; + private String coverPhotos; + private String gmtCreate; + private int isPublish; + private String link; + private String publishDate; + private String sort; + private String source; + private String subTitle; + private String summary; + private String title; + + public String getAuthor() { + return author; + } + + public void setAuthor(String author) { + this.author = author; + } + + public String getCategoryId() { + return categoryId; + } + + public void setCategoryId(String categoryId) { + this.categoryId = categoryId; + } + + public String getCategorySummary() { + return categorySummary; + } + + public void setCategorySummary(String categorySummary) { + this.categorySummary = categorySummary; + } + + public String getCategoryTitle() { + return categoryTitle; + } + + public void setCategoryTitle(String categoryTitle) { + this.categoryTitle = categoryTitle; + } + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content; + } + + public String getContentId() { + return contentId; + } + + public void setContentId(String contentId) { + this.contentId = contentId; + } + + public String getCoverPhotos() { + return coverPhotos; + } + + public void setCoverPhotos(String coverPhotos) { + this.coverPhotos = coverPhotos; + } + + public String getGmtCreate() { + return gmtCreate; + } + + public void setGmtCreate(String gmtCreate) { + this.gmtCreate = gmtCreate; + } + + public int getIsPublish() { + return isPublish; + } + + public void setIsPublish(int isPublish) { + this.isPublish = isPublish; + } + + public String getLink() { + return link; + } + + public void setLink(String link) { + this.link = link; + } + + public String getPublishDate() { + return publishDate; + } + + public void setPublishDate(String publishDate) { + this.publishDate = publishDate; + } + + public String getSort() { + return sort; + } + + public void setSort(String sort) { + this.sort = sort; + } + + public String getSource() { + return source; + } + + public void setSource(String source) { + this.source = source; + } + + public String getSubTitle() { + return subTitle; + } + + public void setSubTitle(String subTitle) { + this.subTitle = subTitle; + } + + public String getSummary() { + return summary; + } + + public void setSummary(String summary) { + this.summary = summary; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } +} diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/NoticeListBean.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/NoticeListBean.java new file mode 100644 index 0000000..fbfd460 --- /dev/null +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/NoticeListBean.java @@ -0,0 +1,181 @@ +package com.tengshisoft.commonmodule.beans; + +import java.util.List; + +public class NoticeListBean { + + private int page; + private List rows; + private int total; + + public int getPage() { + return page; + } + + public void setPage(int page) { + this.page = page; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsBean { + private String author; + private String categoryId; + private String categorySummary; + private String categoryTitle; + private String content; + private String contentId; + private String coverPhotos; + private String gmtCreate; + private int isPublish; + private String link; + private String publishDate; + private String sort; + private String source; + private String subTitle; + private String summary; + private String title; + + public String getAuthor() { + return author; + } + + public void setAuthor(String author) { + this.author = author; + } + + public String getCategoryId() { + return categoryId; + } + + public void setCategoryId(String categoryId) { + this.categoryId = categoryId; + } + + public String getCategorySummary() { + return categorySummary; + } + + public void setCategorySummary(String categorySummary) { + this.categorySummary = categorySummary; + } + + public String getCategoryTitle() { + return categoryTitle; + } + + public void setCategoryTitle(String categoryTitle) { + this.categoryTitle = categoryTitle; + } + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content; + } + + public String getContentId() { + return contentId; + } + + public void setContentId(String contentId) { + this.contentId = contentId; + } + + public String getCoverPhotos() { + return coverPhotos; + } + + public void setCoverPhotos(String coverPhotos) { + this.coverPhotos = coverPhotos; + } + + public String getGmtCreate() { + return gmtCreate; + } + + public void setGmtCreate(String gmtCreate) { + this.gmtCreate = gmtCreate; + } + + public int getIsPublish() { + return isPublish; + } + + public void setIsPublish(int isPublish) { + this.isPublish = isPublish; + } + + public String getLink() { + return link; + } + + public void setLink(String link) { + this.link = link; + } + + public String getPublishDate() { + return publishDate; + } + + public void setPublishDate(String publishDate) { + this.publishDate = publishDate; + } + + public String getSort() { + return sort; + } + + public void setSort(String sort) { + this.sort = sort; + } + + public String getSource() { + return source; + } + + public void setSource(String source) { + this.source = source; + } + + public String getSubTitle() { + return subTitle; + } + + public void setSubTitle(String subTitle) { + this.subTitle = subTitle; + } + + public String getSummary() { + return summary; + } + + public void setSummary(String summary) { + this.summary = summary; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + } +} diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SaveFloatingBean.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SaveFloatingBean.java index e256fad..69db9c0 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SaveFloatingBean.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/beans/SaveFloatingBean.java @@ -24,6 +24,184 @@ public class SaveFloatingBean { private String gridId;// 网格ID private String gridName;// 网格名称 + + private String birthDate; + private String currentResidence; + private String currentResidenceAddr; + private String education; + private String gender; + private String maritalStatus; + private String nameUsedBefore; + private String nation; + private String nativePlace; + private String nativePlaceAddr; + private String occupation; + private String occupationCategory; + private String politicalStatus; + private String registeredResidence; + private String registeredResidenceAddr; + private String religion; + private String serviceSpace; + private String telephone; + private String type; + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getNativePlaceAddr() { + return nativePlaceAddr; + } + + public void setNativePlaceAddr(String nativePlaceAddr) { + this.nativePlaceAddr = nativePlaceAddr; + } + + + public String getBirthDate() { + return birthDate; + } + + public void setBirthDate(String birthDate) { + this.birthDate = birthDate; + } + + public String getCurrentResidence() { + return currentResidence; + } + + public void setCurrentResidence(String currentResidence) { + this.currentResidence = currentResidence; + } + + public String getCurrentResidenceAddr() { + return currentResidenceAddr; + } + + public void setCurrentResidenceAddr(String currentResidenceAddr) { + this.currentResidenceAddr = currentResidenceAddr; + } + + public String getEducation() { + return education; + } + + public void setEducation(String education) { + this.education = education; + } + + + + public String getGender() { + return gender; + } + + public void setGender(String gender) { + this.gender = gender; + } + + + + public String getMaritalStatus() { + return maritalStatus; + } + + public void setMaritalStatus(String maritalStatus) { + this.maritalStatus = maritalStatus; + } + + public String getNameUsedBefore() { + return nameUsedBefore; + } + + public void setNameUsedBefore(String nameUsedBefore) { + this.nameUsedBefore = nameUsedBefore; + } + + public String getNation() { + return nation; + } + + public void setNation(String nation) { + this.nation = nation; + } + + public String getNativePlace() { + return nativePlace; + } + + public void setNativePlace(String nativePlace) { + this.nativePlace = nativePlace; + } + + public String getOccupation() { + return occupation; + } + + public void setOccupation(String occupation) { + this.occupation = occupation; + } + + public String getOccupationCategory() { + return occupationCategory; + } + + public void setOccupationCategory(String occupationCategory) { + this.occupationCategory = occupationCategory; + } + + public String getPoliticalStatus() { + return politicalStatus; + } + + public void setPoliticalStatus(String politicalStatus) { + this.politicalStatus = politicalStatus; + } + + public String getRegisteredResidence() { + return registeredResidence; + } + + public void setRegisteredResidence(String registeredResidence) { + this.registeredResidence = registeredResidence; + } + + public String getRegisteredResidenceAddr() { + return registeredResidenceAddr; + } + + public void setRegisteredResidenceAddr(String registeredResidenceAddr) { + this.registeredResidenceAddr = registeredResidenceAddr; + } + + public String getReligion() { + return religion; + } + + public void setReligion(String religion) { + this.religion = religion; + } + + public String getServiceSpace() { + return serviceSpace; + } + + public void setServiceSpace(String serviceSpace) { + this.serviceSpace = serviceSpace; + } + + public String getTelephone() { + return telephone; + } + + public void setTelephone(String telephone) { + this.telephone = telephone; + } + public String getAreaNames() { return areaNames; } diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/fragments/IncidentGridStatisticsFragment.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/fragments/IncidentGridStatisticsFragment.java index 12d1b9a..4313d48 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/fragments/IncidentGridStatisticsFragment.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/fragments/IncidentGridStatisticsFragment.java @@ -174,8 +174,10 @@ public class IncidentGridStatisticsFragment extends BaseFragment { setStateView(STATE_SUCCESS); mSrlView.setEnableLoadMore(false); mTvEndDate.setText("截止时间:" + b.getData().getCountDate()); - mTvMineUp.setText(b.getData().getNowUserVillageRank().getReportNum() + "件"); - mTvMineRanking.setText("第" + StringUtils.int2chineseNum(b.getData().getNowUserVillageRank().getPm()) + "名"); + if (b.getData().getNowUserVillageRank() != null) { + mTvMineUp.setText(b.getData().getNowUserVillageRank().getReportNum() + "件"); + mTvMineRanking.setText("第" + StringUtils.int2chineseNum(b.getData().getNowUserVillageRank().getPm()) + "名"); + } mTvCity.setText(b.getData().getCityRank() + ""); mTvCounty.setText(b.getData().getCountyRank() + ""); mTvVillage.setText(b.getData().getCountyStreetRank() + ""); diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/fragments/KnowLedgeDeptListFragment.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/fragments/KnowLedgeDeptListFragment.java index 77063bb..793f936 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/fragments/KnowLedgeDeptListFragment.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/fragments/KnowLedgeDeptListFragment.java @@ -11,7 +11,7 @@ import android.widget.ProgressBar; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/fragments/KnowLedgeListByDeptFragment.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/fragments/KnowLedgeListByDeptFragment.java index da15a19..c01b781 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/fragments/KnowLedgeListByDeptFragment.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/fragments/KnowLedgeListByDeptFragment.java @@ -9,7 +9,7 @@ import android.widget.ProgressBar; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/fragments/KnowLedgeListFragment.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/fragments/KnowLedgeListFragment.java index ed11606..443942c 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/fragments/KnowLedgeListFragment.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/fragments/KnowLedgeListFragment.java @@ -6,7 +6,7 @@ import android.view.View; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.R; import com.tengshisoft.commonmodule.R2; import com.tengshisoft.commonmodule.adapters.KnowLedgeListAdapter; diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/fragments/PopulaceGridStatisticsFragment.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/fragments/PopulaceGridStatisticsFragment.java index 7b7054e..c99cde1 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/fragments/PopulaceGridStatisticsFragment.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/fragments/PopulaceGridStatisticsFragment.java @@ -139,10 +139,11 @@ public class PopulaceGridStatisticsFragment extends BaseFragment { */ private void setYoungData(String per) { Double aDouble = Double.valueOf(per); - Double surplus = 100 - aDouble; - + Double youngPer = aDouble / 100; + Double surplus = 100 - youngPer; + LogUtils.e("占比:" + youngPer + "\n剩余:" + surplus); ArrayList values = new ArrayList<>(); - values.add(new PieEntry(aDouble.floatValue(), "")); + values.add(new PieEntry(youngPer.floatValue(), "")); values.add(new PieEntry(surplus.floatValue(), "")); PieDataSet dataSet = new PieDataSet(values, ""); @@ -154,7 +155,7 @@ public class PopulaceGridStatisticsFragment extends BaseFragment { data.setDrawValues(false); data.setValueTextSize(11f); data.setValueTextColor(Color.WHITE); - mPcYoung.setCenterText(youngCenterSpannableText(aDouble + "")); + mPcYoung.setCenterText(youngCenterSpannableText(youngPer + "")); mPcYoung.setData(data); mPcYoung.invalidate(); //将图表移动到底部 @@ -399,7 +400,7 @@ public class PopulaceGridStatisticsFragment extends BaseFragment { private void setInfoToView(GridPopulaceStatisticsBean b) { mSrlView.setEnableLoadMore(false); mSrlView.setEnableRefresh(true); - mTvEndTime.setText("截止时间:" + TimeUtils.getCurrentDate()); + mTvEndTime.setText("截止时间:" + TimeUtils.getCurrentChineseDate()); mTvBaseRegister.setText(b.getHuJi() + "");//户籍人口 mTvRegisterOut.setText(b.getWaiChuHuJi() + "");//户籍人口外出 mTvNoRegister.setText(b.getFeiHuJi() + "");//非户籍人口 diff --git a/commonmodule/src/main/java/com/tengshisoft/commonmodule/holders/NoticeListHolder.java b/commonmodule/src/main/java/com/tengshisoft/commonmodule/holders/NoticeListHolder.java new file mode 100644 index 0000000..366daee --- /dev/null +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/holders/NoticeListHolder.java @@ -0,0 +1,34 @@ +package com.tengshisoft.commonmodule.holders; + +import android.view.View; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.tengshisoft.commonmodule.R; + +import org.jetbrains.annotations.NotNull; + +/** + * 作者: adam + * 日期: 2021/9/26 - 3:01 下午 + * 邮箱: itgaojian@163.com + * 描述: 通知公告 + */ +public class NoticeListHolder extends RecyclerView.ViewHolder { + + public ImageView mIvCover; + public TextView mTvTitle; + public TextView mTvSource; + public TextView mTvTime; + + public NoticeListHolder(@NonNull @NotNull View itemView) { + super(itemView); + mIvCover = itemView.findViewById(R.id.iv_cover); + mTvTitle = itemView.findViewById(R.id.tv_title); + mTvSource = itemView.findViewById(R.id.tv_source); + mTvTime = itemView.findViewById(R.id.tv_time); + } +} 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 d7650ff..7a48ab5 100644 --- a/commonmodule/src/main/java/com/tengshisoft/commonmodule/nets/GridApis.java +++ b/commonmodule/src/main/java/com/tengshisoft/commonmodule/nets/GridApis.java @@ -295,6 +295,25 @@ public interface GridApis { @POST("app/residentialintroduction/save") Observable doSaveCommunityDesc(@Body RequestBody body, @Header("token") String token); + + /** + * 通知公告列表 + */ + @Headers({"Content-Type: application/json", "Accept: application/json"}) + @GET("app/contentrelease/listpage") + Observable getArticleList(@Query("keywords") String keywords, + @Query("categoryId") String id, + @Query("page") String page, + @Header("token") String token); + + /** + * 通知公告类型 + */ + @Headers({"Content-Type: application/json", "Accept: application/json"}) + @GET("app/contentrelease/get/{contentId}") + Observable getArticleDetail(@Path("contentId") String id, + @Header("token") String token); + /** * 获取分拨历史信息 */ @@ -1578,6 +1597,7 @@ public interface GridApis { Observable getGridIncidentRanking(@Path("areaCode") String areaCode, @Path("type") String type, @Header("token") String token); + /** * 网格员网格内人口数据统计 * / diff --git a/commonmodule/src/main/res/drawable-xhdpi/ic_incident_statistics_bg.jpg b/commonmodule/src/main/res/drawable-xhdpi/ic_incident_statistics_bg.jpg index 0dd3de58de9868fa941eb16d53467e45f91371a0..bf28a26806e3fc548c868604053bdcb4de1284fb 100644 GIT binary patch literal 51760 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 z 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 HU+(__b(UD4 diff --git a/commonmodule/src/main/res/drawable-xhdpi/ic_statistics_radio_bg.9.png b/commonmodule/src/main/res/drawable-xhdpi/ic_statistics_radio_bg.9.png index c72666b4036d190351e40be49c4e6bf84aae7eae..cf375ff56409046d861542c08b7a7d9faac20cea 100644 GIT binary patch literal 3088 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 JWt~$(696?^9FYJ3 literal 0 HcmV?d00001 diff --git a/commonmodule/src/main/res/drawable/switch_statistics_img.xml b/commonmodule/src/main/res/drawable/switch_statistics_img.xml index deda281..5e41c1b 100755 --- a/commonmodule/src/main/res/drawable/switch_statistics_img.xml +++ b/commonmodule/src/main/res/drawable/switch_statistics_img.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/commonmodule/src/main/res/layout/activity_grid_incident_statistics_viewpage.xml b/commonmodule/src/main/res/layout/activity_grid_incident_statistics_viewpage.xml index 51a024d..79deab9 100644 --- a/commonmodule/src/main/res/layout/activity_grid_incident_statistics_viewpage.xml +++ b/commonmodule/src/main/res/layout/activity_grid_incident_statistics_viewpage.xml @@ -22,7 +22,7 @@ android:layout_centerVertical="true" android:src="@drawable/ic_arrow_left_white_48" /> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/commonmodule/src/main/res/layout/activity_notice_list.xml b/commonmodule/src/main/res/layout/activity_notice_list.xml new file mode 100644 index 0000000..42f0940 --- /dev/null +++ b/commonmodule/src/main/res/layout/activity_notice_list.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/commonmodule/src/main/res/layout/fragment_grid_incident_statistics.xml b/commonmodule/src/main/res/layout/fragment_grid_incident_statistics.xml index 521d87c..84dd185 100644 --- a/commonmodule/src/main/res/layout/fragment_grid_incident_statistics.xml +++ b/commonmodule/src/main/res/layout/fragment_grid_incident_statistics.xml @@ -57,7 +57,7 @@ android:gravity="center_vertical" android:orientation="horizontal"> - - - - @@ -284,7 +286,7 @@ android:layout_height="match_parent" android:background="@color/text_blue_52" /> - - + android:layout_gravity="center" + android:minHeight="200dp" /> - - - - - - - - - - - - + + + + + + + + + + + + + @@ -251,7 +252,8 @@ android:gravity="center" android:minHeight="78dp" android:orientation="vertical" - android:padding="10dp"> + android:padding="10dp" + android:visibility="gone"> - - diff --git a/commonmodule/src/main/res/layout/item_notice.xml b/commonmodule/src/main/res/layout/item_notice.xml new file mode 100644 index 0000000..ec2ee4f --- /dev/null +++ b/commonmodule/src/main/res/layout/item_notice.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BindPersonToHouseActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BindPersonToHouseActivity.java index e34f499..f6ecfaa 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BindPersonToHouseActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BindPersonToHouseActivity.java @@ -17,7 +17,7 @@ import com.alibaba.android.arouter.launcher.ARouter; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.HireRecordAdapter; import com.tengshisoft.commonmodule.beans.BindPersonBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BuildingAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BuildingAddActivity.java index 14de0b2..5e2c9f6 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BuildingAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BuildingAddActivity.java @@ -36,7 +36,7 @@ import com.baidu.mapapi.model.LatLng; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.BuildSubmitBean; import com.tengshisoft.commonmodule.beans.BuildingSaveBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BuildingDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BuildingDetailActivity.java index a7285ab..5d3159a 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BuildingDetailActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BuildingDetailActivity.java @@ -35,7 +35,7 @@ import com.baidu.mapapi.model.LatLng; import com.ctetin.expandabletextviewlibrary.ExpandableTextView; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.BuildingManagerAdapter; import com.tengshisoft.commonmodule.beans.BuildingDetailBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BuildingEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BuildingEditActivity.java index be20cdf..312290a 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BuildingEditActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BuildingEditActivity.java @@ -38,7 +38,7 @@ import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.BuildSubmitBean; import com.tengshisoft.commonmodule.beans.BuildingDetailBean; import com.tengshisoft.commonmodule.beans.BuildingSaveBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BuildingListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BuildingListActivity.java index 1bece69..626f5f2 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BuildingListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BuildingListActivity.java @@ -24,7 +24,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.BuildingListAdapter; import com.tengshisoft.commonmodule.beans.BuildingListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BuildingManagerAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BuildingManagerAddActivity.java index a4074a4..cad4a33 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BuildingManagerAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BuildingManagerAddActivity.java @@ -13,7 +13,7 @@ import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.SaveBuildingManagerBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BuildingManagerDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BuildingManagerDetailActivity.java index e2b3bde..b85e35d 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BuildingManagerDetailActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BuildingManagerDetailActivity.java @@ -9,7 +9,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.BuildingManagerDetailBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BuildingManagerEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BuildingManagerEditActivity.java index 954eaee..0dedccd 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BuildingManagerEditActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/BuildingManagerEditActivity.java @@ -13,7 +13,7 @@ import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.BuildingManagerDetailBean; import com.tengshisoft.commonmodule.beans.SaveBuildingManagerBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityAddActivity.java index 4c0685f..9487dc3 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityAddActivity.java @@ -27,7 +27,7 @@ import com.baidu.mapapi.model.LatLng; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.CommunitySaveBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityAreaAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityAreaAddActivity.java index 52ae51e..f3d42e2 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityAreaAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityAreaAddActivity.java @@ -24,7 +24,7 @@ import com.baidu.mapapi.map.MarkerOptions; import com.baidu.mapapi.map.TextureMapView; import com.baidu.mapapi.model.LatLng; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.SaveCommunityAreaBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityAreaDescAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityAreaDescAddActivity.java index eb01e74..a52c50d 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityAreaDescAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityAreaDescAddActivity.java @@ -17,7 +17,7 @@ import android.widget.LinearLayout; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.SaveCommunityAreaDescBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityAreaDescEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityAreaDescEditActivity.java index 16e3598..6f1907e 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityAreaDescEditActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityAreaDescEditActivity.java @@ -18,7 +18,7 @@ import android.widget.LinearLayout; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.CommunityAreaDescDetailBean; import com.tengshisoft.commonmodule.beans.SaveCommunityAreaDescBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityAreaDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityAreaDetailActivity.java index e386c52..f8e51eb 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityAreaDetailActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityAreaDetailActivity.java @@ -25,7 +25,7 @@ import com.baidu.mapapi.map.MarkerOptions; import com.baidu.mapapi.map.TextureMapView; import com.baidu.mapapi.model.LatLng; import com.ctetin.expandabletextviewlibrary.ExpandableTextView; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.CommunityAreaDescAdapter; import com.tengshisoft.commonmodule.beans.CommunityAreaDescListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityAreaEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityAreaEditActivity.java index 76601eb..40b4b18 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityAreaEditActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityAreaEditActivity.java @@ -25,7 +25,7 @@ import com.baidu.mapapi.map.MarkerOptions; import com.baidu.mapapi.map.TextureMapView; import com.baidu.mapapi.model.LatLng; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.CommunityAreaDetailBean; import com.tengshisoft.commonmodule.beans.SaveCommunityAreaBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityAreaListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityAreaListActivity.java index 076d471..9322d02 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityAreaListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityAreaListActivity.java @@ -14,7 +14,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.CommunityAreaListAdapter; import com.tengshisoft.commonmodule.beans.CommunityAreaListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityDescAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityDescAddActivity.java index c83a461..c083cf3 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityDescAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityDescAddActivity.java @@ -17,7 +17,7 @@ import android.widget.LinearLayout; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.SaveCommunityDescBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityDescEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityDescEditActivity.java index e9f6b50..91c62be 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityDescEditActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityDescEditActivity.java @@ -18,7 +18,7 @@ import android.widget.LinearLayout; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.CommunityDescDetailBean; import com.tengshisoft.commonmodule.beans.SaveCommunityAreaDescBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityDetailActivity.java index 579bb37..2bd2ba4 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityDetailActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityDetailActivity.java @@ -26,7 +26,7 @@ import com.baidu.mapapi.map.MarkerOptions; import com.baidu.mapapi.map.TextureMapView; import com.baidu.mapapi.model.LatLng; import com.ctetin.expandabletextviewlibrary.ExpandableTextView; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.CommunityDescAdapter; import com.tengshisoft.commonmodule.beans.CommunityDescListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityEditActivity.java index bfcc037..a7b9cc3 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityEditActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityEditActivity.java @@ -27,7 +27,7 @@ import com.baidu.mapapi.model.LatLng; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.CommunityDetailBean; import com.tengshisoft.commonmodule.beans.CommunitySaveBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityManageActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityManageActivity.java index ebb235e..8658f23 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityManageActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/CommunityManageActivity.java @@ -10,7 +10,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.CommunityListAdapter; import com.tengshisoft.commonmodule.beans.CommunityListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/FamilyMemberAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/FamilyMemberAddActivity.java index e5ba2c5..3a618c7 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/FamilyMemberAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/FamilyMemberAddActivity.java @@ -18,7 +18,7 @@ import com.alibaba.android.arouter.launcher.ARouter; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.HireRecordMemberAdapter; import com.tengshisoft.commonmodule.beans.FamilyMemberListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/FamilyMemberDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/FamilyMemberDetailActivity.java index f6f79ae..c76783d 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/FamilyMemberDetailActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/FamilyMemberDetailActivity.java @@ -11,7 +11,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.ctetin.expandabletextviewlibrary.ExpandableTextView; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.FamilyMemberDetailBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/FamilyMemberEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/FamilyMemberEditActivity.java index 07307a6..c48488d 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/FamilyMemberEditActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/FamilyMemberEditActivity.java @@ -12,7 +12,7 @@ import com.alibaba.android.arouter.facade.annotation.Route; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.FamilyMemberDetailBean; import com.tengshisoft.commonmodule.beans.SaveFamilyMemberBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/HirerDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/HirerDetailActivity.java index 549ce74..610dbbb 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/HirerDetailActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/HirerDetailActivity.java @@ -14,7 +14,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.ctetin.expandabletextviewlibrary.ExpandableTextView; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.HireRecordMemberAdapter; import com.tengshisoft.commonmodule.beans.FamilyMemberListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/HirerEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/HirerEditActivity.java index 6d0e327..2276573 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/HirerEditActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/HirerEditActivity.java @@ -11,7 +11,7 @@ import com.alibaba.android.arouter.facade.annotation.Route; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.BindPersonBean; import com.tengshisoft.commonmodule.beans.HireRecordDetailBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/HouseDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/HouseDetailActivity.java index cd106d8..724d635 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/HouseDetailActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/HouseDetailActivity.java @@ -15,7 +15,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.ctetin.expandabletextviewlibrary.ExpandableTextView; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.HireRecordAdapter; import com.tengshisoft.commonmodule.beans.HireRecordListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/HouseEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/HouseEditActivity.java index 3ce13ee..8126074 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/HouseEditActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/HouseEditActivity.java @@ -12,7 +12,7 @@ import com.alibaba.android.arouter.facade.annotation.Route; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.HouseDetailBean; import com.tengshisoft.commonmodule.beans.HouseSaveBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/HouseListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/HouseListActivity.java index 108a591..e86c908 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/HouseListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/HouseListActivity.java @@ -12,7 +12,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.HouseListAdapter; import com.tengshisoft.commonmodule.beans.HouseListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/SearchHouseByPersonActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/SearchHouseByPersonActivity.java index 3098c44..779d731 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/SearchHouseByPersonActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/activitys/SearchHouseByPersonActivity.java @@ -12,7 +12,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.HouseListAdapter; import com.tengshisoft.commonmodule.beans.HouseListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/fragment/BuildingAreaManageFragment.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/fragment/BuildingAreaManageFragment.java index 4658b13..a56a2ea 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/fragment/BuildingAreaManageFragment.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/fragment/BuildingAreaManageFragment.java @@ -10,7 +10,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.adapters.CommunityListAdapter; import com.tengshisoft.commonmodule.beans.CommunityListBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/fragment/BuildingListFragment.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/fragment/BuildingListFragment.java index 5bfe205..bbcdb99 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/fragment/BuildingListFragment.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/fragment/BuildingListFragment.java @@ -11,7 +11,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.adapters.BuildingListAdapter; import com.tengshisoft.commonmodule.beans.BuildingListBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/fragment/CommunityListFragment.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/fragment/CommunityListFragment.java index 5fcfd75..34cc079 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/fragment/CommunityListFragment.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/fragment/CommunityListFragment.java @@ -11,7 +11,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.adapters.CommunityAreaListAdapter; import com.tengshisoft.commonmodule.beans.CommunityAreaListBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/fragment/HouseFragment.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/fragment/HouseFragment.java index 467fe15..d3312d7 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/fragment/HouseFragment.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/fragment/HouseFragment.java @@ -11,7 +11,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.adapters.HouseListAdapter; import com.tengshisoft.commonmodule.beans.HouseListBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/fragment/PersonLibFragment.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/fragment/PersonLibFragment.java index cf0f086..1b4592c 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/fragment/PersonLibFragment.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/fragment/PersonLibFragment.java @@ -32,8 +32,8 @@ public class PersonLibFragment extends BaseFragment { TextView mTvBase; @BindView(R2.id.tv_register) TextView mTvRegister; - @BindView(R2.id.tv_float) - TextView mTvFloat; +// @BindView(R2.id.tv_float) +// TextView mTvFloat; @BindView(R2.id.tv_rear) TextView mTvRear; @BindView(R2.id.tv_crime) @@ -60,11 +60,11 @@ public class PersonLibFragment extends BaseFragment { mSrlView.setEnableLoadMore(false); // mTvBase.setOnClickListener(v -> startPage(PathConfig.PATH_MODULE_GRID_ACTIVITY_POPULACE_BASE_LIST));//基础信息 mTvRegisterPeople.setOnClickListener(v -> startPage(PathConfig.PATH_MODULE_GRID_ACTIVITY_POPULACE_BASE_LIST));//户籍人口 - mTvExtra.setOnClickListener(v -> startPage(PathConfig.PATH_MODULE_GRID_ACTIVITY_POPULACE_EXIRT_LIST));//非户籍人口 + mTvExtra.setOnClickListener(v -> startPage(PathConfig.PATH_MODULE_GRID_ACTIVITY_POPULACE_MIGRANT_LIST));//非户籍人口 -> 流动人员 mTvResid.setOnClickListener(v -> startPage(PathConfig.PATH_MODULE_GRID_ACTIVITY_POPULACE_RESID_LIST));//户籍人口(外出) // mTvRegister.setOnClickListener(v -> startPage(PathConfig.PATH_MODULE_GRID_ACTIVITY_POPULACE_REGISTER_LIST)) // ;//户籍信息 - mTvFloat.setOnClickListener(v -> startPage(PathConfig.PATH_MODULE_GRID_ACTIVITY_POPULACE_MIGRANT_LIST));//流动人员 +// mTvFloat.setOnClickListener(v -> startPage(PathConfig.PATH_MODULE_GRID_ACTIVITY_POPULACE_MIGRANT_LIST));//流动人员 mTvRear.setOnClickListener(v -> startPage(PathConfig.PATH_MODULE_GRID_ACTIVITY_POPULACE_REAR_LIST));//留守人员 mTvCrime.setOnClickListener(v -> startPage(PathConfig.PATH_MODULE_GRID_ACTIVITY_POPULACE_CRIMINAL_LIST));//刑满释放 mTvCorrct.setOnClickListener(v -> startPage(PathConfig.PATH_MODULE_GRID_ACTIVITY_POPULACE_CORRECT_LIST));//社区矫正 diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/fragment/SearchHouseByPersonFragment.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/fragment/SearchHouseByPersonFragment.java index d94b278..ac0491f 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/fragment/SearchHouseByPersonFragment.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/building/fragment/SearchHouseByPersonFragment.java @@ -11,7 +11,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.adapters.HouseListAdapter; import com.tengshisoft.commonmodule.beans.HouseListBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/cars/CarManageAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/cars/CarManageAddActivity.java index a1ee966..b95da6d 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/cars/CarManageAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/cars/CarManageAddActivity.java @@ -18,7 +18,7 @@ import com.alibaba.android.arouter.launcher.ARouter; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.SaveCarBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/cars/CarManageDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/cars/CarManageDetailActivity.java index a2893fb..2f8615a 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/cars/CarManageDetailActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/cars/CarManageDetailActivity.java @@ -12,7 +12,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.CarBelongPersonAdapter; import com.tengshisoft.commonmodule.adapters.CarUsePersonAdapter; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/cars/CarManageEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/cars/CarManageEditActivity.java index 1b918c2..8a8631f 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/cars/CarManageEditActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/cars/CarManageEditActivity.java @@ -18,7 +18,7 @@ import com.alibaba.android.arouter.launcher.ARouter; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.CarDetailBean; import com.tengshisoft.commonmodule.beans.SaveCarBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/cars/CarManageListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/cars/CarManageListActivity.java index b19a8f8..c7b9145 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/cars/CarManageListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/cars/CarManageListActivity.java @@ -16,7 +16,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.gyf.immersionbar.ImmersionBar; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.jakewharton.rxbinding3.widget.RxTextView; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.CarListAdapter; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/cars/CarPersonEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/cars/CarPersonEditActivity.java index a6f1f50..07036fb 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/cars/CarPersonEditActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/cars/CarPersonEditActivity.java @@ -11,7 +11,7 @@ import com.alibaba.android.arouter.facade.annotation.Route; import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.CarBelongPersonDetailBean; import com.tengshisoft.commonmodule.beans.CarUsePersonDetailBean; import com.tengshisoft.commonmodule.beans.SaveCarBelongPersonBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/components/ComponentAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/components/ComponentAddActivity.java index 46c0b98..c78456a 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/components/ComponentAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/components/ComponentAddActivity.java @@ -36,7 +36,7 @@ import com.baidu.mapapi.model.LatLng; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.ComponentSaveBean; import com.tengshisoft.commonmodule.beans.ComponentTypeBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/components/ComponentEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/components/ComponentEditActivity.java index 38ef82e..ba79c24 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/components/ComponentEditActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/components/ComponentEditActivity.java @@ -32,7 +32,7 @@ import com.baidu.mapapi.model.LatLng; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.ComponentDetailBean; import com.tengshisoft.commonmodule.beans.ComponentSaveBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/components/ComponentsListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/components/ComponentsListActivity.java index 0a40f71..f93bd49 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/components/ComponentsListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/components/ComponentsListActivity.java @@ -16,7 +16,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.gyf.immersionbar.ImmersionBar; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.ComponentAdapter; import com.tengshisoft.commonmodule.beans.ComponentListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/components/DepartmentSelActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/components/DepartmentSelActivity.java index cc7ad82..2b0d6e6 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/components/DepartmentSelActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/components/DepartmentSelActivity.java @@ -11,7 +11,7 @@ import com.alibaba.android.arouter.facade.annotation.Route; import com.google.android.flexbox.FlexDirection; import com.google.android.flexbox.FlexWrap; import com.google.android.flexbox.FlexboxLayoutManager; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.R2; import com.tengshisoft.commonmodule.adapters.ChooseDeptAdapter; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/locus/WorkLocusActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/locus/WorkLocusActivity.java index 2c7f0d5..6fdbf57 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/locus/WorkLocusActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/locus/WorkLocusActivity.java @@ -33,7 +33,7 @@ import com.bumptech.glide.Glide; import com.bumptech.glide.load.resource.bitmap.CircleCrop; import com.bumptech.glide.request.RequestOptions; import com.gyf.immersionbar.ImmersionBar; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.adapters.LocusStepAdapter; import com.tengshisoft.commonmodule.beans.DrawMapLineBean; import com.tengshisoft.commonmodule.beans.LocationPointBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/NonPublicOrgAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/NonPublicOrgAddActivity.java index 1b5d248..94591e8 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/NonPublicOrgAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/NonPublicOrgAddActivity.java @@ -36,7 +36,7 @@ import com.bigkoo.pickerview.view.TimePickerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.SaveNonPublicOrgBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/NonPublicOrgDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/NonPublicOrgDetailActivity.java index 8442127..d4c6582 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/NonPublicOrgDetailActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/NonPublicOrgDetailActivity.java @@ -25,7 +25,7 @@ import com.baidu.mapapi.map.TextureMapView; import com.baidu.mapapi.model.LatLng; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.NonPublicOrgDetailBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/NonPublicOrgEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/NonPublicOrgEditActivity.java index 769ba0e..0e27dc0 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/NonPublicOrgEditActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/NonPublicOrgEditActivity.java @@ -36,7 +36,7 @@ import com.bigkoo.pickerview.view.TimePickerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.NonPublicOrgDetailBean; import com.tengshisoft.commonmodule.beans.SaveNonPublicOrgBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/NonPublicOrgListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/NonPublicOrgListActivity.java index 7163bfa..ac27108 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/NonPublicOrgListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/NonPublicOrgListActivity.java @@ -15,7 +15,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.gyf.immersionbar.ImmersionBar; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.jakewharton.rxbinding3.widget.RxTextView; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.NonPublicOrgListAdapter; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/SocialOrgAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/SocialOrgAddActivity.java index 5e64268..eab0b33 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/SocialOrgAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/SocialOrgAddActivity.java @@ -38,7 +38,7 @@ import com.bigkoo.pickerview.view.TimePickerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.SaveSocialOrgBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/SocialOrgDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/SocialOrgDetailActivity.java index 99d098d..4b003be 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/SocialOrgDetailActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/SocialOrgDetailActivity.java @@ -25,7 +25,7 @@ import com.baidu.mapapi.map.TextureMapView; import com.baidu.mapapi.model.LatLng; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.SocialOrgDetailBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/SocialOrgEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/SocialOrgEditActivity.java index a237343..3ceb918 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/SocialOrgEditActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/SocialOrgEditActivity.java @@ -38,7 +38,7 @@ import com.bigkoo.pickerview.view.TimePickerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.SaveSocialOrgBean; import com.tengshisoft.commonmodule.beans.SocialOrgDetailBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/SocialOrgListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/SocialOrgListActivity.java index 63df4e6..0e51c05 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/SocialOrgListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/orgmanage/SocialOrgListActivity.java @@ -15,7 +15,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.gyf.immersionbar.ImmersionBar; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.jakewharton.rxbinding3.widget.RxTextView; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.SocialOrgListAdapter; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/EnterprisePatrolAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/EnterprisePatrolAddActivity.java index 66a4a2d..8d4b8f8 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/EnterprisePatrolAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/EnterprisePatrolAddActivity.java @@ -21,7 +21,7 @@ import com.alibaba.android.arouter.launcher.ARouter; import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.SaveEnterprisePatrolBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/EnterprisePatrolDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/EnterprisePatrolDetailActivity.java index c91d11e..90cc671 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/EnterprisePatrolDetailActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/EnterprisePatrolDetailActivity.java @@ -13,7 +13,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.PatrolEnterpriseDetailBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/EnterprisePatrolEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/EnterprisePatrolEditActivity.java index 049b51c..8117aa5 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/EnterprisePatrolEditActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/EnterprisePatrolEditActivity.java @@ -18,7 +18,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.PatrolKeyPlaceDetailBean; import com.tengshisoft.commonmodule.beans.SaveEnterprisePatrolBean; import com.tengshisoft.commonmodule.beans.SavePatrolPenalBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/EnterprisePatrolListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/EnterprisePatrolListActivity.java index ce8aa63..59e37b2 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/EnterprisePatrolListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/EnterprisePatrolListActivity.java @@ -9,7 +9,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.PatrolEnterpriseListAdapter; import com.tengshisoft.commonmodule.beans.KeyPlaceDetailBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/ExpressPatrolAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/ExpressPatrolAddActivity.java index e857cfb..05074cc 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/ExpressPatrolAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/ExpressPatrolAddActivity.java @@ -21,7 +21,7 @@ import com.alibaba.android.arouter.launcher.ARouter; import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.SavePatrolExpressBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/ExpressPatrolDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/ExpressPatrolDetailActivity.java index 6cc2ef1..b9fcd56 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/ExpressPatrolDetailActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/ExpressPatrolDetailActivity.java @@ -16,7 +16,7 @@ import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.PatrolExpressDetailBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/ExpressPatrolEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/ExpressPatrolEditActivity.java index f4c5e6c..a588a6e 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/ExpressPatrolEditActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/ExpressPatrolEditActivity.java @@ -20,7 +20,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.PatrolExpressDetailBean; import com.tengshisoft.commonmodule.beans.SavePatrolExpressBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/ExpressPatrolListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/ExpressPatrolListActivity.java index e691629..f44d6a5 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/ExpressPatrolListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/ExpressPatrolListActivity.java @@ -10,7 +10,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.PatrolExpressListAdapter; import com.tengshisoft.commonmodule.beans.ExpressDetailBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyAreaPatrolAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyAreaPatrolAddActivity.java index 3809b26..e75ad90 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyAreaPatrolAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyAreaPatrolAddActivity.java @@ -21,7 +21,7 @@ import com.alibaba.android.arouter.launcher.ARouter; import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.SavePatrolKeyAreaBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyAreaPatrolDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyAreaPatrolDetailActivity.java index b3e953b..16f934b 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyAreaPatrolDetailActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyAreaPatrolDetailActivity.java @@ -16,7 +16,7 @@ import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.PatrolKeyAreaDetailBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyAreaPatrolEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyAreaPatrolEditActivity.java index 3cb72e5..4697e80 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyAreaPatrolEditActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyAreaPatrolEditActivity.java @@ -18,7 +18,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.PatrolKeyAreaDetailBean; import com.tengshisoft.commonmodule.beans.SavePatrolKeyAreaBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyAreaPatrolListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyAreaPatrolListActivity.java index e4c6932..3961778 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyAreaPatrolListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyAreaPatrolListActivity.java @@ -11,7 +11,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.PatrolKeyAreaListAdapter; import com.tengshisoft.commonmodule.beans.KeyAreaDetailBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyPlacePatrolAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyPlacePatrolAddActivity.java index e11bf8d..96cb591 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyPlacePatrolAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyPlacePatrolAddActivity.java @@ -21,7 +21,7 @@ import com.alibaba.android.arouter.launcher.ARouter; import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.SavePatrolKeyPlaceBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyPlacePatrolDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyPlacePatrolDetailActivity.java index 155f1aa..62e05b4 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyPlacePatrolDetailActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyPlacePatrolDetailActivity.java @@ -16,7 +16,7 @@ import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.PatrolKeyPlaceDetailBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyPlacePatrolEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyPlacePatrolEditActivity.java index a4ddbd2..8fbfdea 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyPlacePatrolEditActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyPlacePatrolEditActivity.java @@ -22,7 +22,7 @@ import com.alibaba.android.arouter.launcher.ARouter; import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.PatrolKeyPlaceDetailBean; import com.tengshisoft.commonmodule.beans.SavePatrolKeyPlaceBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyPlacePatrolListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyPlacePatrolListActivity.java index 534fa4c..c499f78 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyPlacePatrolListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyPlacePatrolListActivity.java @@ -10,7 +10,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.PatrolKeyPlaceListAdapter; import com.tengshisoft.commonmodule.beans.KeyPlaceDetailBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyRoadCaseAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyRoadCaseAddActivity.java index 838250b..1a53cea 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyRoadCaseAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyRoadCaseAddActivity.java @@ -15,7 +15,7 @@ import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.SaveKeyRoadCaseBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyRoadCaseEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyRoadCaseEditActivity.java index 192f1c5..b2bbe79 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyRoadCaseEditActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyRoadCaseEditActivity.java @@ -16,7 +16,7 @@ import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.KeyRoadCaseDetailBean; import com.tengshisoft.commonmodule.beans.SaveKeyRoadCaseBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyRoadCaseListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyRoadCaseListActivity.java index 36bfbe9..2ada359 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyRoadCaseListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/KeyRoadCaseListActivity.java @@ -16,7 +16,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.gyf.immersionbar.ImmersionBar; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.jakewharton.rxbinding3.widget.RxTextView; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.KeyRoadCaseAdapter; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/PenalPatrolAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/PenalPatrolAddActivity.java index c484e50..07d3c3c 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/PenalPatrolAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/PenalPatrolAddActivity.java @@ -21,7 +21,7 @@ import com.alibaba.android.arouter.launcher.ARouter; import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.SavePatrolPenalBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/PenalPatrolDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/PenalPatrolDetailActivity.java index acb64b8..90b5c53 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/PenalPatrolDetailActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/PenalPatrolDetailActivity.java @@ -26,7 +26,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.PatrolPenalDetailBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/PenalPatrolEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/PenalPatrolEditActivity.java index 76255cb..1559c09 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/PenalPatrolEditActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/PenalPatrolEditActivity.java @@ -18,7 +18,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.PatrolPenalDetailBean; import com.tengshisoft.commonmodule.beans.SavePatrolPenalBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/PenalPatrolListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/PenalPatrolListActivity.java index 3975cdf..fc562d7 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/PenalPatrolListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/patrols/PenalPatrolListActivity.java @@ -13,7 +13,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.PatrolPenalListAdapter; import com.tengshisoft.commonmodule.beans.PatrolPenalListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusBaseActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusBaseActivity.java index 8ae91cc..24c11fa 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusBaseActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusBaseActivity.java @@ -20,7 +20,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.CensusPersonAdapter; import com.tengshisoft.commonmodule.beans.AreaGridListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusBaseDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusBaseDetailActivity.java index da62bb2..c7f959f 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusBaseDetailActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusBaseDetailActivity.java @@ -7,7 +7,7 @@ import android.widget.Button; import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; import com.tengshisoft.gridmodule.R; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusBaseEnterActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusBaseEnterActivity.java index 17f9359..9e548d8 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusBaseEnterActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusBaseEnterActivity.java @@ -21,7 +21,7 @@ import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.SavePersonBean; import com.tengshisoft.commonmodule.beans.SuccessBean; @@ -229,12 +229,8 @@ public class CensusBaseEnterActivity extends BaseActivity { DicBean bean2 = new DicBean(); bean2.setDataName("户籍人口(外出)"); bean2.setDataId("2"); - DicBean bean3 = new DicBean(); - bean3.setDataName("非户籍人口"); - bean3.setDataId("3"); mTypeList.add(bean1); mTypeList.add(bean2); - mTypeList.add(bean3); mTvType.setOnClickListener(v -> onShowType()); } @@ -558,9 +554,9 @@ public class CensusBaseEnterActivity extends BaseActivity { mSelTypeBean.setDataId("2"); break; case "3": - mSelTypeBean.setDataName("非户籍人口"); + mSelTypeBean.setDataName("流动人口"); mSelTypeBean.setDataId("3"); - mTvType.setText("非户籍人口"); + mTvType.setText("流动人口"); break; } } diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusBaseSearchActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusBaseSearchActivity.java index d163f0b..b1a8ad4 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusBaseSearchActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusBaseSearchActivity.java @@ -25,7 +25,7 @@ import com.alibaba.android.arouter.launcher.ARouter; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.adapters.CensusPersonAdapter; import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.CensusPersonBean; @@ -139,7 +139,7 @@ public class CensusBaseSearchActivity extends BaseActivity { mEtSearchCentent.setOnEditorActionListener((v, actionId, event) -> { if (actionId == EditorInfo.IME_ACTION_SEARCH) { - hideSoftKeyboard(); + hideSoftKeyboard(mEtSearchCentent); mEtSearchCentent.clearFocus(); mKeywords = v.getText().toString(); setStateView(13); @@ -153,7 +153,7 @@ public class CensusBaseSearchActivity extends BaseActivity { mBtnSearch.setOnClickListener(v -> { String keywords = mEtSearchCentent.getText().toString().trim(); if (!TextUtils.isEmpty(keywords)) { - hideSoftKeyboard(); + hideSoftKeyboard(mEtSearchCentent); mKeywords = keywords; mEtSearchCentent.clearFocus(); setStateView(13); @@ -192,12 +192,8 @@ public class CensusBaseSearchActivity extends BaseActivity { DicBean bean2 = new DicBean(); bean2.setDataName("户籍人口(外出)"); bean2.setDataId("2"); - DicBean bean3 = new DicBean(); - bean3.setDataName("非户籍人口"); - bean3.setDataId("3"); mTypeList.add(bean1); mTypeList.add(bean2); - mTypeList.add(bean3); mTvGrid.setOnClickListener(v -> onShowGrid()); mTvType.setOnClickListener(v -> onShowType()); mBtnSave.setOnClickListener(v -> doSaveEdit()); diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusExitrActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusExitrActivity.java index 3c5a8d6..f0d3d69 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusExitrActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusExitrActivity.java @@ -20,7 +20,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.CensusPersonAdapter; import com.tengshisoft.commonmodule.beans.AreaGridListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusResidsActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusResidsActivity.java index 438ee9e..9b18332 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusResidsActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusResidsActivity.java @@ -20,7 +20,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.CensusPersonAdapter; import com.tengshisoft.commonmodule.beans.AreaGridListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusYoungAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusYoungAddActivity.java index 401763d..a561a03 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusYoungAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusYoungAddActivity.java @@ -15,7 +15,7 @@ import com.alibaba.android.arouter.facade.annotation.Route; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.CensusYoungDetailBean; import com.tengshisoft.commonmodule.beans.SaveYoungBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusYoungListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusYoungListActivity.java index e5185f7..74a9dd3 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusYoungListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/CensusYoungListActivity.java @@ -13,7 +13,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.CensusYoungAdapter; import com.tengshisoft.commonmodule.beans.CensusYoungListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/DicSelActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/DicSelActivity.java index 7da33c7..77ada7e 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/DicSelActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/DicSelActivity.java @@ -10,7 +10,7 @@ import android.widget.EditText; import android.widget.LinearLayout; import com.alibaba.android.arouter.facade.annotation.Route; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.DicSelAdapter; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/YoungCaseAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/YoungCaseAddActivity.java index 0dd4347..d3d8d3c 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/YoungCaseAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/YoungCaseAddActivity.java @@ -12,7 +12,7 @@ import com.alibaba.android.arouter.facade.annotation.Route; import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.adapters.YoungCasePersonAdapter; import com.tengshisoft.commonmodule.beans.SaveYoungCaseBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/YoungCaseDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/YoungCaseDetailActivity.java index e571ebe..e6f5ff3 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/YoungCaseDetailActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/YoungCaseDetailActivity.java @@ -10,7 +10,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.adapters.YoungCasePersonAdapter; import com.tengshisoft.commonmodule.beans.SaveYoungCaseBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/YoungCaseListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/YoungCaseListActivity.java index 3687c5c..259e79e 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/YoungCaseListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/YoungCaseListActivity.java @@ -15,7 +15,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.gyf.immersionbar.ImmersionBar; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.jakewharton.rxbinding3.widget.RxTextView; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.R2; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/fragments/CensusBaseGridListFragment.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/fragments/CensusBaseGridListFragment.java index 6a44d6c..59768eb 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/fragments/CensusBaseGridListFragment.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/fragments/CensusBaseGridListFragment.java @@ -11,7 +11,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.CommunityAreaListAdapter; import com.tengshisoft.commonmodule.beans.CommunityAreaListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusMigrantAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusMigrantAddActivity.java index bf510f9..de3cf5b 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusMigrantAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusMigrantAddActivity.java @@ -1,9 +1,11 @@ package com.tengshisoft.gridmodule.incident.activitys.populace.normal; import android.app.ProgressDialog; +import android.content.Intent; import android.graphics.Color; +import android.text.Editable; import android.text.TextUtils; -import android.view.View; +import android.view.inputmethod.EditorInfo; import android.widget.Button; import android.widget.EditText; import android.widget.ImageView; @@ -11,36 +13,45 @@ import android.widget.LinearLayout; import android.widget.Switch; import android.widget.TextView; +import androidx.annotation.Nullable; + import com.alibaba.android.arouter.facade.annotation.Route; +import com.alibaba.android.arouter.launcher.ARouter; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.hjq.toast.Toaster; +import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.MigrantDetailBean; import com.tengshisoft.commonmodule.beans.SaveFloatingBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; import com.tengshisoft.gridmodule.R; import com.tengshisoft.gridmodule.R2; +import com.tenlionsoft.baselib.app.BaseAppContext; import com.tenlionsoft.baselib.constant.DicIds; import com.tenlionsoft.baselib.constant.PathConfig; +import com.tenlionsoft.baselib.core.beans.AreaBean; import com.tenlionsoft.baselib.core.beans.DicBean; -import com.tenlionsoft.baselib.core.beans.PersonSearchBean; +import com.tenlionsoft.baselib.core.beans.PersonFlowSearchBean; import com.tenlionsoft.baselib.core.retrofit_net.RetrofitManager; import com.tenlionsoft.baselib.core.retrofit_net.api.BaseApiService; import com.tenlionsoft.baselib.core.widget.base.BaseActivity; +import com.tenlionsoft.baselib.core.widget.views.AreaChooseDialog; +import com.tenlionsoft.baselib.interfaces.TextChange; import com.tenlionsoft.baselib.utils.ExceptionHandler; +import com.tenlionsoft.baselib.utils.IDCard; import com.tenlionsoft.baselib.utils.RegexUtils; import com.tenlionsoft.baselib.utils.TimeUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tenlionsoft.baselib.utils.UIUtil; import com.tenlionsoft.baselib.utils.UserLgUtils; import java.text.SimpleDateFormat; import java.util.List; -import androidx.cardview.widget.CardView; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.Unbinder; @@ -57,8 +68,45 @@ import okhttp3.RequestBody; */ @Route(path = PathConfig.PATH_MODULE_GRID_ACTIVITY_POPULACE_MIGRANT_ADD) public class CensusMigrantAddActivity extends BaseActivity { - @BindView(R2.id.ll_into_content) - LinearLayout mLlContent; + //人口基础信息 + @BindView(R2.id.et_identity) + EditText mEtIdentity;//身份证号 + @BindView(R2.id.et_name) + EditText mEtName;//姓名 + @BindView(R2.id.et_once_name) + EditText mEtOnceName;//曾用名--- + @BindView(R2.id.tv_gender) + TextView mTvGender;//性别 + @BindView(R2.id.tv_birth) + TextView mTvBirth;//生日 + @BindView(R2.id.tv_nation) + TextView mTvNation;//民族 + @BindView(R2.id.tv_marry) + TextView mTvMarry;//婚姻 + @BindView(R2.id.tv_political) + TextView mTvPolitical;//政治面貌 + @BindView(R2.id.tv_edu) + TextView mTvEdu;//学历 + @BindView(R2.id.tv_religion) + TextView mTvReligion;//宗教 + @BindView(R2.id.tv_work_type) + TextView mTvWorkType;//职业类别 + @BindView(R2.id.et_work) + EditText mTvWork;//职业 + @BindView(R2.id.et_work_space) + EditText mEtWorkSpace;//服务处所 + @BindView(R2.id.et_phone) + EditText mEtPhone;//联系方式 + @BindView(R2.id.et_census_detail) + EditText mEtCensusDetail;//户籍地详址 + @BindView(R2.id.et_cur_detail) + EditText mEtCurDetail;//现在详细地址 + @BindView(R2.id.tv_area) + TextView mTvArea;//所在地区 + @BindView(R2.id.tv_grid) + TextView mTvGrid;//所在网格 + + @BindView(R2.id.tv_cause) TextView mTvCause;//流入原因-- @BindView(R2.id.tv_card_type) @@ -86,32 +134,47 @@ public class CensusMigrantAddActivity extends BaseActivity { @BindView(R2.id.iv_clear) ImageView mIvClear; - //基础信息 - @BindView(R2.id.cv_base_info) - LinearLayout mCvBaseInfo;//基础信息 - @BindView(R2.id.tv_base_name) - TextView mTvBaseName; - @BindView(R2.id.tv_base_gender) - TextView mTvBaseGender; - @BindView(R2.id.tv_base_native) - TextView mTvBaseNative; - @BindView(R2.id.tv_base_phone) - TextView mTvBasePhone; - @BindView(R2.id.tv_base_cur_loc) - TextView mTvBaseCurLoc; - @BindView(R2.id.tv_base_area) - TextView mTvBaseArea; - @BindView(R2.id.tv_base_grid) - TextView mTvBaseGrid; + private List mGenderList; + private List mNationList; + private List mNativeList; + private List mPoliticalList; + private List mEduList; + private List mReligionList; + private List mTypeList;//人口类型 + private List mMarryList; + private DicBean mSelGender;//性别 + private DicBean mSelNation;//名族 + private DicBean mSelPolitical;//政治面貌 + private DicBean mSelEdu;//学历 + private DicBean mSelReligion;//信仰 + private DicBean mSelWorkType;//职业类别 + private DicBean mSelMarry;//婚姻状况 + private OptionsPickerView mGenderPicker; + private OptionsPickerView mNationPicker; + private OptionsPickerView mNativePicker; + private OptionsPickerView mPoliticalPicker; + private OptionsPickerView mEduPicker; + private OptionsPickerView mReligionPicker; + private OptionsPickerView mMarryPicker; + private OptionsPickerView mTypePicker; + private SimpleDateFormat mDateFormat = new SimpleDateFormat("yyyy-MM-dd"); private Unbinder mBind; + private String mId; + private String mSelCensusIds = ""; + private String mSelCurLoc = ""; + private String mSelAreaCode; + private String mSelAreaId; + private String mSelAreaName; + private AreaGridListBean.RowsBean mSelGridBean; + + private TimePickerView mStartPicker; private TimePickerView mEndPicker; private OptionsPickerView mHouseTypePicker; private OptionsPickerView mCardTypePicker; private OptionsPickerView mFlowTypePicker; - private SimpleDateFormat mDateFormat = new SimpleDateFormat("yyyy-MM-dd"); private boolean mIsAttention = false; private List mCardTypeList;//办证类型 private List mHouseTypeList;//住所类型 @@ -119,8 +182,8 @@ public class CensusMigrantAddActivity extends BaseActivity { private String mSelCardType; private String mSelHouseType; - private String mId; private String mSelCause; + private PersonFlowSearchBean mBaseInfoBean; @Override protected int setLayoutId() { @@ -154,9 +217,21 @@ public class CensusMigrantAddActivity extends BaseActivity { refreshView(STATE_LOAD_LOADING); getDetialById(mId); } else { + mSelAreaName = UserLgUtils.getLocationAddress(); + mSelAreaCode = UserLgUtils.getUserAreaCode(); + mTvArea.setText(mSelAreaName); refreshView(STATE_LOAD_SUCCESS); } - mLlContent.setVisibility(View.GONE); + mEtSearchIdCard.setOnEditorActionListener((v, actionId, event) -> { + if (actionId == EditorInfo.IME_ACTION_SEARCH) { + hideSoftKeyboard(); + mEtSearchIdCard.clearFocus(); + doSearchPerson(); + return true; + } else { + return false; + } + }); mBtnSearch.setOnClickListener(v -> doSearchPerson()); mIvClear.setOnClickListener(v -> mEtSearchIdCard.setText("")); @@ -168,6 +243,44 @@ public class CensusMigrantAddActivity extends BaseActivity { mTvCause.setOnClickListener(v -> onShowCauseType()); mBtnConfirm.setOnClickListener(v -> doSubmit()); setEditTextInhibitInputSpeChat(mEtCardNumber); + + mTvGender.setOnClickListener(v -> onShowGender()); + mTvBirth.setOnClickListener(v -> onShowDate(1)); + mTvNation.setOnClickListener(v -> onShowNation());//名族 + mTvMarry.setOnClickListener(v -> onShowMarry());//婚姻状况 + mTvPolitical.setOnClickListener(v -> onShowPolitical());//政治面貌 + mTvEdu.setOnClickListener(v -> onShowEdu());//学历 + mTvReligion.setOnClickListener(v -> onShowReligion());//宗教信仰 + mTvWorkType.setOnClickListener(v -> onShowWorkType());//职业类别 + mTvGrid.setOnClickListener(v -> { + if (TextUtils.isEmpty(mSelAreaCode)) { + ToastUtils.show("请先选择所在地区"); + } else { + ARouter.getInstance() + .build(PathConfig.PATH_MODULE_COMMON_ACTIVITY_SEL_GRID) + .withString("areaCode", mSelAreaCode) + .navigation(mActivity, 15); + } + }); + + mTvArea.setOnClickListener(v -> onShowArea()); + mEtIdentity.addTextChangedListener(new TextChange() { + @Override + public void afterTextChanged(Editable s) { + String idcard = s.toString(); + if (IDCard.IDCardValidate(idcard)) { + String birthDay = IDCard.getBirthDay(idcard); + mTvBirth.setText(birthDay); + } else { + mTvBirth.setText(""); + } + } + }); + Object curGrid = ((BaseAppContext) getApplicationContext()).getGridBean(); + if (curGrid != null && curGrid instanceof AreaGridListBean.RowsBean) { + mSelGridBean = (AreaGridListBean.RowsBean) curGrid; + mTvGrid.setText(mSelGridBean.getGridName()); + } } @@ -178,31 +291,318 @@ public class CensusMigrantAddActivity extends BaseActivity { */ private void getDetialById(String id) { RetrofitManager.getInstance() - .create(GridApis.class) - .getCensusNmigrantDetail(id, UserLgUtils.getToken()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Observer() { - @Override - public void onSubscribe(@NonNull Disposable d) { + .create(GridApis.class) + .getCensusNmigrantDetail(id, UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(@NonNull Disposable d) { + } + + @Override + public void onNext(@NonNull MigrantDetailBean censusRegisterDetailBean) { + setDataToView(censusRegisterDetailBean, 0); + } + + @Override + public void onError(@NonNull Throwable e) { + refreshView(STATE_LOAD_ERROR); + } + + @Override + public void onComplete() { + + } + }); + } + + /** + * 职业类型 7 + */ + private void onShowWorkType() { + hideSoftKeyboard(); + ARouter.getInstance() + .build(PathConfig.PATH_MODULE_GRID_ACTIVITY_DIC_SEL) + .withBoolean("isSingle", true) + .withString("id", DicIds.DIC_WORK_TYPE) + .navigation(mActivity, 1234); + } + + /** + * 婚姻状况 3 + */ + private void onShowMarry() { + hideSoftKeyboard(); + if (mMarryList != null && mMarryList.size() > 0) { + if (mMarryPicker == null) { + mMarryPicker = new OptionsPickerBuilder(mActivity, (o1, o2, o3, v) -> { + DicBean bean = mMarryList.get(o1); + mSelMarry = bean; + mTvMarry.setText(bean.getDataName()); + }) + .setTitleText("请选择") + .setCancelColor(Color.parseColor("#1189FF")) + .setSubmitColor(Color.parseColor("#1189FF")) + .setTitleColor(Color.parseColor("#1189FF")) + .build(); + mMarryPicker.setPicker(mMarryList); + } + mMarryPicker.show(); + } else { + getDicListByType(DicIds.DIC_MARRIAGE, 3); + } + } + + /** + * 显示地区选择 + */ + private void onShowArea() { + AreaChooseDialog dialog = new AreaChooseDialog + .DialogBuilder(mActivity) + .setDefault(true) + .build(); + dialog.addOnChoseListener((names, id, code) -> { + mSelAreaCode = code; + mSelAreaId = id; + mSelAreaName = names; + mTvArea.setText(names); + mSelGridBean = null; + mTvGrid.setText(""); + dialog.dismiss(); + }); + dialog.show(); + } + + /** + * 选择性别 1 + */ + private void onShowGender() { + hideSoftKeyboard(); + if (mGenderList != null && mGenderList.size() > 0) { + if (mGenderPicker == null) { + mGenderPicker = new OptionsPickerBuilder(mActivity, (options1, options2, options3, v) -> { + DicBean bean = mGenderList.get(options1); + mSelGender = bean; + mTvGender.setText(bean.getDataName()); + }).setTitleText("请选择") + .setCancelColor(Color.parseColor("#1189FF")) + .setSubmitColor(Color.parseColor("#1189FF")) + .setTitleColor(Color.parseColor("#1189FF")) + .build(); + mGenderPicker.setPicker(mGenderList); + } + mGenderPicker.show(); + } else { + getDicListByType(DicIds.DIC_GENDER, 1); + } + } + + /** + * 日期 + * 1 生日 + */ + private void onShowDate(int i) { + hideSoftKeyboard(); + TimePickerView mTimePickerView = new TimePickerBuilder(mActivity, (date, v) -> { + switch (i) { + case 1: + mTvBirth.setText(mDateFormat.format(date)); + break; + } + }) + .setTitleText("请选日期") + .setCancelColor(Color.parseColor("#1189FF")) + .setSubmitColor(Color.parseColor("#1189FF")) + .setType(new boolean[]{true, true, true, false, false, false}) + .setTitleColor(Color.parseColor("#1189FF")) + .build(); + mTimePickerView.show(); + } + + /** + * 选择名族 - 2 + */ + private void onShowNation() { + hideSoftKeyboard(); + if (mNationList != null && mNationList.size() > 0) { + if (mNationPicker == null) { + mNationPicker = new OptionsPickerBuilder(mActivity, (o1, o2, o3, v) -> { + DicBean bean = mNationList.get(o1); + mSelNation = bean; + mTvNation.setText(bean.getDataName()); + }) + .setTitleText("请选择") + .setCancelColor(Color.parseColor("#1189FF")) + .setSubmitColor(Color.parseColor("#1189FF")) + .setTitleColor(Color.parseColor("#1189FF")) + .build(); + mNationPicker.setPicker(mNationList); + } + mNationPicker.show(); + } else { + getDicListByType(DicIds.DIC_NATION, 2); + } + } + + + /** + * 籍贯 - 3 + */ + private void onShowNative() { + hideSoftKeyboard(); + if (mNativeList != null && mNativeList.size() > 0) { + if (mNativePicker == null) { + mNativePicker = new OptionsPickerBuilder(mActivity, (o1, o2, o3, v) -> { + AreaBean bean = mNativeList.get(o1); + }) + .setTitleText("请选择") + .setCancelColor(Color.parseColor("#1189FF")) + .setSubmitColor(Color.parseColor("#1189FF")) + .setTitleColor(Color.parseColor("#1189FF")) + .build(); + mNativePicker.setPicker(mNativeList); + } + mNativePicker.show(); + } else { + getArea1(); + } + } + + /** + * 获取籍贯 + */ + private void getArea1() { + ProgressDialog dialog = UIUtil.initDialog(mActivity, "获取中..."); + dialog.show(); + RetrofitManager.getInstance() + .create(GridApis.class) + .getAreaListByPid("0", UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer>() { + @Override + public void onSubscribe(Disposable d) { + } + + @Override + public void onNext(List areaListBeans) { + dialog.dismiss(); + if (null != areaListBeans && areaListBeans.size() > 0) { + mNativeList = areaListBeans; + onShowNative(); + } else { + ToastUtils.show("暂无数据"); + } + } + + @Override + public void onError(Throwable e) { + dialog.dismiss(); + ExceptionHandler.handleException(e); + } + + @Override + public void onComplete() { + + } + }); + } + + /** + * 政治面貌 - 4 + */ + private void onShowPolitical() { + hideSoftKeyboard(); + if (mPoliticalList != null && mPoliticalList.size() > 0) { + if (mPoliticalPicker == null) { + mPoliticalPicker = new OptionsPickerBuilder(mActivity, (o1, o2, o3, v) -> { + DicBean bean = mPoliticalList.get(o1); + mSelPolitical = bean; + mTvPolitical.setText(bean.getDataName()); + }) + .setTitleText("请选择") + .setCancelColor(Color.parseColor("#1189FF")) + .setSubmitColor(Color.parseColor("#1189FF")) + .setTitleColor(Color.parseColor("#1189FF")) + .build(); + mPoliticalPicker.setPicker(mPoliticalList); + } + mPoliticalPicker.show(); + } else { + getDicListByType(DicIds.DIC_POLITICS, 4); + } + } + + /** + * 学历 5 + */ + private void onShowEdu() { + hideSoftKeyboard(); + if (mEduList != null && mEduList.size() > 0) { + if (mEduPicker == null) { + mEduPicker = new OptionsPickerBuilder(mActivity, (o1, o2, o3, v) -> { + DicBean bean = mEduList.get(o1); + mSelEdu = bean; + mTvEdu.setText(bean.getDataName()); + }) + .setTitleText("请选择") + .setCancelColor(Color.parseColor("#1189FF")) + .setSubmitColor(Color.parseColor("#1189FF")) + .setTitleColor(Color.parseColor("#1189FF")) + .build(); + mEduPicker.setPicker(mEduList); + } + mEduPicker.show(); + } else { + getDicListByType(DicIds.DIC_EDU, 5); + } + } + + /** + * 宗教信仰 6 + */ + private void onShowReligion() { + hideSoftKeyboard(); + if (mReligionList != null && mReligionList.size() > 0) { + if (mReligionPicker == null) { + mReligionPicker = new OptionsPickerBuilder(mActivity, (o1, o2, o3, v) -> { + DicBean bean = mReligionList.get(o1); + mSelReligion = bean; + mTvReligion.setText(bean.getDataName()); + }) + .setTitleText("请选择") + .setCancelColor(Color.parseColor("#1189FF")) + .setSubmitColor(Color.parseColor("#1189FF")) + .setTitleColor(Color.parseColor("#1189FF")) + .build(); + mReligionPicker.setPicker(mReligionList); + } + mReligionPicker.show(); + } else { + getDicListByType(DicIds.DIC_FAITH, 6); + } + } + + @Override + protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { + if (requestCode == 1234) { + if (resultCode == 222) { + DicBean bean = (DicBean) data.getSerializableExtra("bean"); + mSelWorkType = bean; + mTvWorkType.setText(bean.getDataName()); + } + } else if (requestCode == 15) { + if (resultCode == 222) { + //网格选择 + if (data != null) { + mSelGridBean = (AreaGridListBean.RowsBean) data.getSerializableExtra("bean"); + mTvGrid.setText(mSelGridBean.getGridName()); } - - @Override - public void onNext(@NonNull MigrantDetailBean censusRegisterDetailBean) { - setDataToView(censusRegisterDetailBean, 0); - } - - @Override - public void onError(@NonNull Throwable e) { - refreshView(STATE_LOAD_ERROR); - } - - @Override - public void onComplete() { - - } - }); + } + } + super.onActivityResult(requestCode, resultCode, data); } /** @@ -210,6 +610,93 @@ public class CensusMigrantAddActivity extends BaseActivity { */ private void setDataToView(MigrantDetailBean bean, int type) { mId = bean.getFloatingPopulationId(); + //基础信息 + if (!TextUtils.isEmpty(bean.getAreaCode())) { + mSelAreaCode = bean.getAreaCode(); + mSelAreaName = bean.getAreaNames(); + mTvArea.setText(bean.getAreaNames()); + } + if (!TextUtils.isEmpty(bean.getGridId())) { + mSelGridBean = new AreaGridListBean.RowsBean(); + mSelGridBean.setGridName(bean.getGridName()); + mSelGridBean.setGridName(bean.getGridName()); + mTvGrid.setText(bean.getGridName()); + } + mEtIdentity.setText(bean.getIdCardNumber());//身份证号码 + mEtName.setText(bean.getFullName());//姓名 + mEtOnceName.setText(bean.getNameUsedBefore());//曾用名--- + if (!TextUtils.isEmpty(bean.getGender())) { + mSelGender = new DicBean(); + mSelGender.setDataId(bean.getGender()); + mSelGender.setDataName(bean.getGenderDictionaryName()); + mTvGender.setText(bean.getGenderDictionaryName()); + } else { + mSelGender = null; + mTvGender.setText(""); + } + mTvBirth.setText(bean.getBirthDate());//生日 + if (!TextUtils.isEmpty(bean.getNation())) { + mTvNation.setText(bean.getNationDictionaryName());//民族 + mSelNation = new DicBean(); + mSelNation.setDataId(bean.getNation()); + mSelNation.setDataName(bean.getNationDictionaryName()); + } else { + mTvNation.setText(""); + mSelNation = null; + } + + if (!TextUtils.isEmpty(bean.getMaritalStatus())) { + mTvMarry.setText(bean.getMaritalStatusDictionaryName());//婚姻 + mSelMarry = new DicBean(); + mSelMarry.setDataId(bean.getMaritalStatus()); + mSelMarry.setDataName(bean.getMaritalStatusDictionaryName()); + } else { + mTvMarry.setText(""); + mSelMarry = null; + } + if (!TextUtils.isEmpty(bean.getPoliticalStatus())) { + mTvPolitical.setText(bean.getPoliticalStatusDictionaryName());//政治面貌 + mSelPolitical = new DicBean(); + mSelPolitical.setDataId(bean.getPoliticalStatus()); + mSelPolitical.setDataName(bean.getPoliticalStatusDictionaryName()); + } else { + mTvPolitical.setText(""); + mSelPolitical = null; + } + if (!TextUtils.isEmpty(bean.getEducation())) { + mTvEdu.setText(bean.getEducationDictionaryName());//学历 + mSelEdu = new DicBean(); + mSelEdu.setDataId(bean.getEducation()); + mSelEdu.setDataName(bean.getEducationDictionaryName()); + } else { + mSelEdu = null; + mTvEdu.setText(""); + } + if (!TextUtils.isEmpty(bean.getReligion())) { + mTvReligion.setText(bean.getReligionDictionaryName());//宗教 + mSelReligion = new DicBean(); + mSelReligion.setDataName(bean.getReligionDictionaryName()); + mSelReligion.setDataId(bean.getReligion()); + } else { + mTvReligion.setText(""); + mSelReligion = null; + } + + if (!TextUtils.isEmpty(bean.getOccupationCategory())) { + mSelWorkType = new DicBean(); + mTvWorkType.setText(bean.getOccupationCategoryDictionaryName());//职业类别 + mSelWorkType.setDataId(bean.getOccupationCategory()); + mSelWorkType.setDataName(bean.getOccupationCategoryDictionaryName()); + } else { + mSelWorkType = null; + mTvWorkType.setText(""); + } + mTvWork.setText(bean.getOccupation());//职业 + mEtWorkSpace.setText(bean.getServiceSpace());//服务处所----- + mEtPhone.setText(bean.getTelephone());//联系方式 + mEtCensusDetail.setText(bean.getNativePlaceAddr());//户籍地详址 + mEtCurDetail.setText(bean.getCurrentResidenceAddr());//现在详细地址 + //流动信息 mTvCause.setText(bean.getInflowReasonDict());//流入原因-- mSelCause = bean.getInflowReason(); mTvCardType.setText(bean.getRegistrationTypeDict());//证件类型 @@ -221,10 +708,6 @@ public class CensusMigrantAddActivity extends BaseActivity { mSelHouseType = bean.getResidenceType(); mIsAttention = bean.getKeyOfFollow().equals("1"); mSwAttention.setChecked(bean.getKeyOfFollow().equals("1"));//是否重点关注 - if (type == 0) { - mEtSearchIdCard.setText(bean.getIdCardNumber()); - doSearchPerson(); - } refreshView(STATE_LOAD_SUCCESS); } @@ -240,16 +723,16 @@ public class CensusMigrantAddActivity extends BaseActivity { mTvCause.setText(bean.getDataName()); mSelCause = bean.getDataId(); }) - .setTitleText("请选择") - .setCancelColor(Color.parseColor("#1189FF")) - .setSubmitColor(Color.parseColor("#1189FF")) - .setTitleColor(Color.parseColor("#1189FF")) - .build(); + .setTitleText("请选择") + .setCancelColor(Color.parseColor("#1189FF")) + .setSubmitColor(Color.parseColor("#1189FF")) + .setTitleColor(Color.parseColor("#1189FF")) + .build(); mFlowTypePicker.setPicker(mFlowTypeList); } mFlowTypePicker.show(); } else { - getDicListByType(DicIds.DIC_MIGRANT_TYPE, 3); + getDicListByType(DicIds.DIC_MIGRANT_TYPE, 9); } } @@ -265,16 +748,16 @@ public class CensusMigrantAddActivity extends BaseActivity { mTvHouseType.setText(bean.getDataName()); mSelHouseType = bean.getDataId(); }) - .setTitleText("请选择") - .setCancelColor(Color.parseColor("#1189FF")) - .setSubmitColor(Color.parseColor("#1189FF")) - .setTitleColor(Color.parseColor("#1189FF")) - .build(); + .setTitleText("请选择") + .setCancelColor(Color.parseColor("#1189FF")) + .setSubmitColor(Color.parseColor("#1189FF")) + .setTitleColor(Color.parseColor("#1189FF")) + .build(); mHouseTypePicker.setPicker(mHouseTypeList); } mHouseTypePicker.show(); } else { - getDicListByType(DicIds.DIC_HOUSE_TYPE, 1); + getDicListByType(DicIds.DIC_HOUSE_TYPE, 8); } } @@ -290,16 +773,16 @@ public class CensusMigrantAddActivity extends BaseActivity { mTvCardType.setText(bean.getDataName()); mSelCardType = bean.getDataId(); }) - .setTitleText("请选择") - .setCancelColor(Color.parseColor("#1189FF")) - .setSubmitColor(Color.parseColor("#1189FF")) - .setTitleColor(Color.parseColor("#1189FF")) - .build(); + .setTitleText("请选择") + .setCancelColor(Color.parseColor("#1189FF")) + .setSubmitColor(Color.parseColor("#1189FF")) + .setTitleColor(Color.parseColor("#1189FF")) + .build(); mCardTypePicker.setPicker(mCardTypeList); } mCardTypePicker.show(); } else { - getDicListByType(DicIds.DIC_CARD_TYPE, 2); + getDicListByType(DicIds.DIC_CARD_TYPE, 7); } } @@ -314,7 +797,6 @@ public class CensusMigrantAddActivity extends BaseActivity { } else { doAdd(); } - } } @@ -323,34 +805,34 @@ public class CensusMigrantAddActivity extends BaseActivity { dialog.show(); RequestBody body = buildParams(); RetrofitManager.getInstance() - .create(GridApis.class) - .doSaveFloating(body, UserLgUtils.getToken()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Observer() { - @Override - public void onSubscribe(@NonNull Disposable d) { + .create(GridApis.class) + .doSaveFloating(body, UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(@NonNull Disposable d) { - } + } - @Override - public void onNext(@NonNull SuccessBean successBean) { - dialog.dismiss(); - ToastUtils.show("保存成功."); - finish(); - } + @Override + public void onNext(@NonNull SuccessBean successBean) { + dialog.dismiss(); + ToastUtils.show("保存成功."); + finish(); + } - @Override - public void onError(@NonNull Throwable e) { - dialog.dismiss(); - ExceptionHandler.handleException(e); - } + @Override + public void onError(@NonNull Throwable e) { + dialog.dismiss(); + ExceptionHandler.handleException(e); + } - @Override - public void onComplete() { + @Override + public void onComplete() { - } - }); + } + }); } private void doEdit() { @@ -358,34 +840,34 @@ public class CensusMigrantAddActivity extends BaseActivity { dialog.show(); RequestBody body = buildParams(); RetrofitManager.getInstance() - .create(GridApis.class) - .doEditFloating(mId, body, UserLgUtils.getToken()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Observer() { - @Override - public void onSubscribe(@NonNull Disposable d) { + .create(GridApis.class) + .doEditFloating(mId, body, UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(@NonNull Disposable d) { - } + } - @Override - public void onNext(@NonNull SuccessBean successBean) { - dialog.dismiss(); - ToastUtils.show("修改成功"); - finish(); - } + @Override + public void onNext(@NonNull SuccessBean successBean) { + dialog.dismiss(); + ToastUtils.show("修改成功"); + finish(); + } - @Override - public void onError(@NonNull Throwable e) { - dialog.dismiss(); - ExceptionHandler.handleException(e); - } + @Override + public void onError(@NonNull Throwable e) { + dialog.dismiss(); + ExceptionHandler.handleException(e); + } - @Override - public void onComplete() { + @Override + public void onComplete() { - } - }); + } + }); } /** @@ -393,14 +875,51 @@ public class CensusMigrantAddActivity extends BaseActivity { */ private RequestBody buildParams() { SaveFloatingBean bean = new SaveFloatingBean(); - bean.setAreaCode(mBaseInfoBean.getAreaCode()); - bean.setAreaNames(mBaseInfoBean.getAreaNames()); - bean.setGridId(mBaseInfoBean.getGridId()); - bean.setGridName(mBaseInfoBean.getGridName()); - bean.setFullName(mBaseInfoBean.getFullName()); - bean.setIdCardNumber(mBaseInfoBean.getIdCardNumber()); - + bean.setFullName(mEtName.getText().toString().trim()); + bean.setIdCardNumber(mEtIdentity.getText().toString().trim()); bean.setInflowReason(mSelCause); + bean.setAreaNames(mSelAreaName); + bean.setAreaCode(mSelAreaCode); + bean.setGridName(mSelGridBean.getGridName()); + bean.setGridId(mSelGridBean.getGridId()); + String idCard = mEtIdentity.getText().toString().trim(); + bean.setIdCardNumber(idCard); + String name = mEtName.getText().toString().trim(); + bean.setFullName(name); + String onceName = mEtOnceName.getText().toString().trim(); + if (!TextUtils.isEmpty(onceName)) { + bean.setNameUsedBefore(onceName); + } + String gender = mTvGender.getText().toString().trim(); + bean.setGender(mSelGender.getDataId()); + String birth = mTvBirth.getText().toString().trim(); + bean.setBirthDate(birth); + String nation = mTvNation.getText().toString().trim(); + bean.setNation(mSelNation.getDataId()); + String marry = mTvMarry.getText().toString().trim(); + bean.setMaritalStatus(mSelMarry.getDataId()); + String political = mTvPolitical.getText().toString().trim(); + bean.setPoliticalStatus(mSelPolitical.getDataId()); + String edu = mTvEdu.getText().toString().trim(); + bean.setEducation(mSelEdu.getDataId()); + String religion = mTvReligion.getText().toString().trim(); + if (!TextUtils.isEmpty(religion)) { + bean.setReligion(mSelReligion.getDataId()); + } + String workType = mTvWorkType.getText().toString().trim(); + bean.setOccupationCategory(mSelWorkType.getDataId()); + String work = mTvWork.getText().toString().trim(); + bean.setOccupation(work); + String workSpace = mEtWorkSpace.getText().toString().trim(); + if (!TextUtils.isEmpty(workSpace)) { + bean.setServiceSpace(workSpace); + } + String phone = mEtPhone.getText().toString().trim(); + bean.setTelephone(phone); + String censusDetail = mEtCensusDetail.getText().toString().trim(); + bean.setNativePlaceAddr(censusDetail); + String curDetail = mEtCurDetail.getText().toString().trim(); + bean.setCurrentResidenceAddr(curDetail); if (!TextUtils.isEmpty(mSelCardType)) { bean.setRegistrationType(mSelCardType); } @@ -430,6 +949,74 @@ public class CensusMigrantAddActivity extends BaseActivity { * 校验参数 */ private boolean doCheckParams() { + if (TextUtils.isEmpty(mSelAreaCode)) { + ToastUtils.show("请选择所在地区"); + return false; + } + if (mSelGridBean == null) { + ToastUtils.show("请选择所在网格"); + return false; + } + String idCard = mEtIdentity.getText().toString().trim(); + if (TextUtils.isEmpty(idCard) || !RegexUtils.isIDNumber(idCard)) { + ToastUtils.show("请输入正确的身份证号码"); + return false; + } + String name = mEtName.getText().toString().trim(); + if (TextUtils.isEmpty(name)) { + ToastUtils.show("请输入姓名"); + return false; + } + String gender = mTvGender.getText().toString().trim(); + if (TextUtils.isEmpty(gender)) { + ToastUtils.show("请选择性别"); + return false; + } + String birth = mTvBirth.getText().toString().trim(); + if (TextUtils.isEmpty(birth)) { + ToastUtils.show("请选择出生日期"); + return false; + } + String nation = mTvNation.getText().toString().trim(); + if (TextUtils.isEmpty(nation)) { + ToastUtils.show("请选择民族"); + return false; + } + String marry = mTvMarry.getText().toString().trim(); + if (TextUtils.isEmpty(marry)) { + ToastUtils.show("请选择婚姻状况"); + return false; + } + String political = mTvPolitical.getText().toString().trim(); + if (TextUtils.isEmpty(political)) { + ToastUtils.show("请选择政治面貌"); + return false; + } + String edu = mTvEdu.getText().toString().trim(); + if (TextUtils.isEmpty(edu)) { + ToastUtils.show("请选择学历"); + return false; + } + String workType = mTvWorkType.getText().toString().trim(); + if (TextUtils.isEmpty(workType)) { + ToastUtils.show("请选择职业类别"); + return false; + } + String phone = mEtPhone.getText().toString().trim(); + if (TextUtils.isEmpty(phone) || !RegexUtils.isTel(phone)) { + ToastUtils.show("请输入合法的联系方式"); + return false; + } + String censusDetail = mEtCensusDetail.getText().toString().trim(); + if (TextUtils.isEmpty(censusDetail)) { + ToastUtils.show("请输入籍贯地址"); + return false; + } + String curDetail = mEtCurDetail.getText().toString().trim(); + if (TextUtils.isEmpty(curDetail)) { + ToastUtils.show("请输入现住址"); + return false; + } String cause = mTvCause.getText().toString().trim(); if (TextUtils.isEmpty(cause)) { ToastUtils.show("请选择流入原因"); @@ -458,12 +1045,12 @@ public class CensusMigrantAddActivity extends BaseActivity { mStartPicker = new TimePickerBuilder(mActivity, (date, v) -> { mTvStartDate.setText(mDateFormat.format(date)); }) - .setTitleText("请选择日期") - .setCancelColor(Color.parseColor("#1189FF")) - .setSubmitColor(Color.parseColor("#1189FF")) - .setType(new boolean[]{true, true, true, false, false, false}) - .setTitleColor(Color.parseColor("#1189FF")) - .build(); + .setTitleText("请选择日期") + .setCancelColor(Color.parseColor("#1189FF")) + .setSubmitColor(Color.parseColor("#1189FF")) + .setType(new boolean[]{true, true, true, false, false, false}) + .setTitleColor(Color.parseColor("#1189FF")) + .build(); } mStartPicker.show(); } @@ -480,12 +1067,12 @@ public class CensusMigrantAddActivity extends BaseActivity { ToastUtils.show("到期日期必须大于登记日期"); } }) - .setTitleText("请选择日期") - .setCancelColor(Color.parseColor("#1189FF")) - .setSubmitColor(Color.parseColor("#1189FF")) - .setType(new boolean[]{true, true, true, false, false, false}) - .setTitleColor(Color.parseColor("#1189FF")) - .build(); + .setTitleText("请选择日期") + .setCancelColor(Color.parseColor("#1189FF")) + .setSubmitColor(Color.parseColor("#1189FF")) + .setType(new boolean[]{true, true, true, false, false, false}) + .setTitleColor(Color.parseColor("#1189FF")) + .build(); } mEndPicker.show(); } @@ -511,90 +1098,62 @@ public class CensusMigrantAddActivity extends BaseActivity { ProgressDialog dialog = UIUtil.initDialog(mActivity, "获取中..."); dialog.show(); RetrofitManager.getInstance() - .create(GridApis.class) - .getDictListAllByPid(pId, UserLgUtils.getToken()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Observer>() { - @Override - public void onSubscribe(@NonNull Disposable d) { - - } - - @Override - public void onNext(@NonNull List typeListBeans) { - dialog.dismiss(); - if (typeListBeans.size() > 0) { - switch (i) { - case 2://办证类型 - mCardTypeList = typeListBeans; - onShowCardType(); - break; - case 1://住所类型 - mHouseTypeList = typeListBeans; - onShowHouseType(); - break; - case 3://流入原因 - mFlowTypeList = typeListBeans; - onShowCauseType(); - break; - } - } else { - ToastUtils.show("暂无数据"); - } - } - - @Override - public void onError(@NonNull Throwable e) { - dialog.dismiss(); - ExceptionHandler.handleException(e); - } - - @Override - public void onComplete() { - - } - }); - - } - - /** - * 搜索人员基础信息 - */ - private void doSearchPerson() { - String searchIdCard = mEtSearchIdCard.getText().toString().trim(); - if (TextUtils.isEmpty(searchIdCard) || !RegexUtils.isIDNumber(searchIdCard)) { - ToastUtils.show("请输入合法的身份证号码"); - return; - } else { - hideSoftKeyboard(); - ProgressDialog dialog = UIUtil.initDialog(mActivity, "查询中..."); - dialog.show(); - RetrofitManager.getInstance() - .create(BaseApiService.class) - .doSearchPerson(searchIdCard, UserLgUtils.getToken()) + .create(GridApis.class) + .getDictListAllByPid(pId, UserLgUtils.getToken()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Observer() { + .subscribe(new Observer>() { @Override public void onSubscribe(@NonNull Disposable d) { } @Override - public void onNext(@NonNull PersonSearchBean infoBean1) { + public void onNext(@NonNull List typeListBeans) { dialog.dismiss(); - if (!TextUtils.isEmpty(infoBean1.getIdCardNumber())) { - //设置基础信息 - setBaseInfo(infoBean1); + if (typeListBeans.size() > 0) { + + switch (i) { + case 1://性别 + mGenderList = typeListBeans; + onShowGender(); + break; + case 2://名族 + mNationList = typeListBeans; + onShowNation(); + break; + case 3://婚姻状况 + mMarryList = typeListBeans; + onShowMarry(); + break; + case 4://政治面貌 + mPoliticalList = typeListBeans; + onShowPolitical(); + break; + case 5://学历 + mEduList = typeListBeans; + onShowEdu(); + break; + case 6://宗教信仰 + mReligionList = typeListBeans; + onShowReligion(); + break; + case 7://办证类型 + mCardTypeList = typeListBeans; + onShowCardType(); + break; + case 8://住所类型 + mHouseTypeList = typeListBeans; + onShowHouseType(); + break; + case 9://流入原因 + mFlowTypeList = typeListBeans; + onShowCauseType(); + break; + } + } else { - ToastUtils.show("未查询到该人员的基础信息,请完善基础信息"); - mTvBaseName.setText(""); - mTvBaseGender.setText(""); - mTvBasePhone.setText(""); - mTvBaseNative.setText(""); - mTvBaseCurLoc.setText(""); - mLlContent.setVisibility(View.GONE); + ToastUtils.show("暂无数据"); } } @@ -609,26 +1168,208 @@ public class CensusMigrantAddActivity extends BaseActivity { } }); + + } + + /** + * 搜索人员基础信息 + */ + private void doSearchPerson() { + //搜索人员 + + String searchIdCard = mEtSearchIdCard.getText().toString().trim(); + if (TextUtils.isEmpty(searchIdCard) || !RegexUtils.isIDNumber(searchIdCard)) { + ToastUtils.show("请输入合法的身份证号码"); + } else { + hideSoftKeyboard(); + ProgressDialog dialog = UIUtil.initDialog(mActivity, "查询中..."); + dialog.show(); + RetrofitManager.getInstance() + .create(BaseApiService.class) + .doSearchFLowPerson(searchIdCard, UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(@NonNull Disposable d) { + + } + + @Override + public void onNext(@NonNull PersonFlowSearchBean infoBean1) { + dialog.dismiss(); + if (!TextUtils.isEmpty(infoBean1.getIdCardNumber())) { + //设置基础信息 + setPersonInfo(infoBean1); + } else { + Toaster.showLong("未查询到该人员的基础信息,请完善基础信息"); + //重置所有信息 + mEtIdentity.setText(searchIdCard); + mId = ""; + //基础信息 + mEtName.setText("");//姓名 + mEtOnceName.setText("");//曾用名--- + mSelGender = null; + mTvGender.setText(""); +// mTvBirth.setText(bean.getBirthDate());//生日 + mTvNation.setText(""); + mSelNation = null; + mTvMarry.setText(""); + mSelMarry = null; + mTvPolitical.setText(""); + mSelPolitical = null; + mSelEdu = null; + mTvEdu.setText(""); + mTvReligion.setText(""); + mSelReligion = null; + mSelWorkType = null; + mTvWorkType.setText(""); + mTvWork.setText("");//职业 + mEtWorkSpace.setText("");//服务处所----- + mEtPhone.setText("");//联系方式 + mEtCensusDetail.setText("");//户籍地详址 + mEtCurDetail.setText("");//现在详细地址 + //流动信息 + mTvCause.setText("");//流入原因-- + mSelCause = ""; + mTvCardType.setText("");//证件类型 + mEtCardNumber.setText("");//证件号码 + mTvStartDate.setText("");//开始日期 + mTvEndDate.setText("");//到期日期 + mTvHouseType.setText("");//住所类型 + mSelCardType = ""; + mSelHouseType = ""; + mIsAttention = false; + mSwAttention.setChecked(false);//是否重点关注 + } + } + + @Override + public void onError(@NonNull Throwable e) { + dialog.dismiss(); + ExceptionHandler.handleException(e); + } + + @Override + public void onComplete() { + + } + }); } } - private PersonSearchBean mBaseInfoBean; - /** - * 设置基础信息 + * 回显数据 */ - private void setBaseInfo(PersonSearchBean o) { - mBaseInfoBean = o; - mLlContent.setVisibility(View.VISIBLE); - mTvBaseArea.setText(o.getAreaNames()); - mTvBaseGrid.setText(o.getGridName()); - mTvBaseName.setText(o.getFullName()); - mTvBaseGender.setText(o.getGenderDictionaryName()); - mTvBasePhone.setText(o.getTelephone()); - mTvBaseNative.setText(o.getNativePlaceAddr()); - mTvBaseCurLoc.setText(o.getCurrentResidenceAddr()); + private void setPersonInfo(PersonFlowSearchBean bean) { + mId = bean.getFloatingPopulationId(); + //基础信息 + if (!TextUtils.isEmpty(bean.getAreaCode())) { + mSelAreaCode = bean.getAreaCode(); + mSelAreaName = bean.getAreaNames(); + mTvArea.setText(bean.getAreaNames()); + } + if (!TextUtils.isEmpty(bean.getGridId())) { + mSelGridBean = new AreaGridListBean.RowsBean(); + mSelGridBean.setGridName(bean.getGridName()); + mSelGridBean.setGridName(bean.getGridName()); + mTvGrid.setText(bean.getGridName()); + } + mEtIdentity.setText(bean.getIdCardNumber());//身份证号码 + mEtName.setText(bean.getFullName());//姓名 + mEtOnceName.setText(bean.getNameUsedBefore());//曾用名--- + if (!TextUtils.isEmpty(bean.getGridId())) { + mSelGridBean = new AreaGridListBean.RowsBean(); + mSelGridBean.setGridId(bean.getGridId()); + mSelGridBean.setGridName(bean.getGridName()); + mTvGrid.setText(bean.getGridName()); + } + if (!TextUtils.isEmpty(bean.getGender())) { + mSelGender = new DicBean(); + mSelGender.setDataId(bean.getGender()); + mSelGender.setDataName(bean.getGenderDictionaryName()); + mTvGender.setText(bean.getGenderDictionaryName()); + } else { + mSelGender = null; + mTvGender.setText(""); + } + mTvBirth.setText(bean.getBirthDate());//生日 + if (!TextUtils.isEmpty(bean.getNation())) { + mTvNation.setText(bean.getNationDictionaryName());//民族 + mSelNation = new DicBean(); + mSelNation.setDataId(bean.getNation()); + mSelNation.setDataName(bean.getNationDictionaryName()); + } else { + mSelNation = null; + mTvNation.setText(""); + } + + if (!TextUtils.isEmpty(bean.getMaritalStatus())) { + mTvMarry.setText(bean.getMaritalStatusDictionaryName());//婚姻 + mSelMarry = new DicBean(); + mSelMarry.setDataId(bean.getMaritalStatus()); + mSelMarry.setDataName(bean.getMaritalStatusDictionaryName()); + } else { + mSelMarry = null; + mTvMarry.setText(""); + } + if (!TextUtils.isEmpty(bean.getPoliticalStatus())) { + mTvPolitical.setText(bean.getPoliticalStatusDictionaryName());//政治面貌 + mSelPolitical = new DicBean(); + mSelPolitical.setDataId(bean.getPoliticalStatus()); + mSelPolitical.setDataName(bean.getPoliticalStatusDictionaryName()); + } else { + mTvPolitical.setText(""); + mSelPolitical = null; + } + if (!TextUtils.isEmpty(bean.getEducation())) { + mTvEdu.setText(bean.getEducationDictionaryName());//学历 + mSelEdu = new DicBean(); + mSelEdu.setDataId(bean.getEducation()); + mSelEdu.setDataName(bean.getEducationDictionaryName()); + } else { + mTvEdu.setText(""); + mSelEdu = null; + } + if (!TextUtils.isEmpty(bean.getReligion())) { + mTvReligion.setText(bean.getReligionDictionaryName());//宗教 + mSelReligion = new DicBean(); + mSelReligion.setDataName(bean.getReligionDictionaryName()); + mSelReligion.setDataId(bean.getReligion()); + } else { + mTvReligion.setText(""); + mSelReligion = null; + } + + if (!TextUtils.isEmpty(bean.getOccupationCategory())) { + mSelWorkType = new DicBean(); + mTvWorkType.setText(bean.getOccupationCategoryDictionaryName());//职业类别 + mSelWorkType.setDataId(bean.getOccupationCategory()); + mSelWorkType.setDataName(bean.getOccupationCategoryDictionaryName()); + } else { + mSelWorkType = null; + mTvWorkType.setText(""); + } + mTvWork.setText(bean.getOccupation());//职业 + mEtWorkSpace.setText(bean.getServiceSpace());//服务处所----- + mEtPhone.setText(bean.getTelephone());//联系方式 + mEtCensusDetail.setText(bean.getNativePlaceAddr());//户籍地详址 + mEtCurDetail.setText(bean.getCurrentResidenceAddr());//现在详细地址 + //流动信息 + mSelCause = bean.getInflowReason(); + mTvCause.setText(bean.getInflowReasonDict());//流入原因-- + mTvCardType.setText(bean.getRegistrationTypeDict());//证件类型 + mEtCardNumber.setText(bean.getCardNumber());//证件号码 + mTvStartDate.setText(bean.getRegisterDate());//开始日期 + mTvEndDate.setText(bean.getCardExpireDate());//到期日期 + mTvHouseType.setText(bean.getResidenceTypeDict());//住所类型 + mSelCardType = bean.getRegistrationType(); + mSelHouseType = bean.getResidenceType(); + mIsAttention = bean.getKeyOfFollow().equals("1"); + mSwAttention.setChecked(bean.getKeyOfFollow().equals("1"));//是否重点关注 } + @Override protected void onDestroy() { super.onDestroy(); diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusMigrantDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusMigrantDetailActivity.java index a057ef4..986e83d 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusMigrantDetailActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusMigrantDetailActivity.java @@ -1,5 +1,6 @@ package com.tengshisoft.gridmodule.incident.activitys.populace.normal; +import android.text.TextUtils; import android.widget.Switch; import android.widget.TextView; @@ -9,11 +10,11 @@ import com.tengshisoft.commonmodule.nets.GridApis; import com.tengshisoft.gridmodule.R; import com.tengshisoft.gridmodule.R2; import com.tenlionsoft.baselib.constant.PathConfig; -import com.tenlionsoft.baselib.core.beans.PersonSearchBean; import com.tenlionsoft.baselib.core.retrofit_net.RetrofitManager; -import com.tenlionsoft.baselib.core.retrofit_net.api.BaseApiService; import com.tenlionsoft.baselib.core.widget.base.BaseActivity; import com.tenlionsoft.baselib.utils.ExceptionHandler; +import com.tenlionsoft.baselib.utils.IDCard; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tenlionsoft.baselib.utils.UserLgUtils; import butterknife.BindView; @@ -21,7 +22,6 @@ import butterknife.ButterKnife; import butterknife.Unbinder; import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; import io.reactivex.rxjava3.annotations.NonNull; -import io.reactivex.rxjava3.core.Observable; import io.reactivex.rxjava3.core.Observer; import io.reactivex.rxjava3.disposables.Disposable; import io.reactivex.rxjava3.schedulers.Schedulers; @@ -32,22 +32,43 @@ import io.reactivex.rxjava3.schedulers.Schedulers; @Route(path = PathConfig.PATH_MODULE_GRID_ACTIVITY_POPULACE_MIGRANT_DETAIL) public class CensusMigrantDetailActivity extends BaseActivity { //基础信息 - @BindView(R2.id.tv_base_name) - TextView mTvBaseName;//姓名 - @BindView(R2.id.tv_base_former_name) - TextView mTvBaseFormerName;//曾用名 - @BindView(R2.id.tv_base_gender) - TextView mTvBaseGender;//性别 - @BindView(R2.id.tv_base_id_card) - TextView mTvBaseIdCard;//身份证 - @BindView(R2.id.tv_base_phone) - TextView mTvBasePhone;//联系电话 - @BindView(R2.id.tv_base_nation) - TextView mTvBaseNation;//名族 - @BindView(R2.id.tv_base_register_loc) - TextView mTvBaseRegisterLoc;//户籍地 - @BindView(R2.id.tv_base_cur_address) - TextView mTvBaseCurAddress;//现住址详情 + @BindView(R2.id.et_identity) + TextView mEtIdentity;//身份证号 + @BindView(R2.id.et_name) + TextView mEtName;//姓名 + @BindView(R2.id.et_once_name) + TextView mEtOnceName;//曾用名--- + @BindView(R2.id.tv_gender) + TextView mTvGender;//性别 + @BindView(R2.id.tv_birth) + TextView mTvBirth;//生日 + @BindView(R2.id.tv_nation) + TextView mTvNation;//民族 + @BindView(R2.id.tv_marry) + TextView mTvMarry;//婚姻 + @BindView(R2.id.tv_political) + TextView mTvPolitical;//政治面貌 + @BindView(R2.id.tv_edu) + TextView mTvEdu;//学历 + @BindView(R2.id.tv_religion) + TextView mTvReligion;//宗教 + @BindView(R2.id.tv_work_type) + TextView mTvWorkType;//职业类别 + @BindView(R2.id.et_work) + TextView mTvWork;//职业 + @BindView(R2.id.et_work_space) + TextView mEtWorkSpace;//服务处所----- + @BindView(R2.id.et_phone) + TextView mEtPhone;//联系方式 + @BindView(R2.id.et_census_detail) + TextView mEtCensusDetail;//户籍地详址 + @BindView(R2.id.et_cur_detail) + TextView mEtCurDetail;//现在详细地址 + @BindView(R2.id.tv_area) + TextView mTvArea; + @BindView(R2.id.tv_grid) + TextView mTvGrid; + //流动信息 @BindView(R2.id.tv_cause) @@ -64,13 +85,8 @@ public class CensusMigrantDetailActivity extends BaseActivity { TextView mTvHouseType;//住所类型 @BindView(R2.id.sw_attention) Switch mSwAttention;//是否重点关注 - @BindView(R2.id.tv_base_area) - TextView mTvBaseArea; - @BindView(R2.id.tv_base_grid) - TextView mTvBaseGrid; private Unbinder mBind; - private PersonSearchBean mBaseInfo; private MigrantDetailBean mInfoBean; @Override @@ -100,54 +116,71 @@ public class CensusMigrantDetailActivity extends BaseActivity { refreshView(STATE_LOAD_LOADING); String id = getIntent().getStringExtra("id"); String idCard = getIntent().getStringExtra("idCard"); - getDetailData(id, idCard); + if (!TextUtils.isEmpty(id)) { + getDetailData(id); + } else { + ToastUtils.show("数据有误"); + } } /** * 获取详细信息 * * @param id - * @param idCard */ - private void getDetailData(String id, String idCard) { - Observable baseInfo = RetrofitManager.getInstance().create(BaseApiService.class).doSearchPerson(idCard, UserLgUtils.getToken()); - Observable registerInfo = RetrofitManager.getInstance().create(GridApis.class).getCensusNmigrantDetail(id, UserLgUtils.getToken()); - Observable.mergeDelayError(baseInfo, registerInfo) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Observer() { - @Override - public void onSubscribe(@NonNull Disposable d) { + private void getDetailData(String id) { + RetrofitManager.getInstance().create(GridApis.class) + .getCensusNmigrantDetail(id, UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(@NonNull Disposable d) { - } + } - @Override - public void onNext(@NonNull Object o) { - if (o instanceof PersonSearchBean) { - mBaseInfo = (PersonSearchBean) o; - setBaseInfo(); - } else if (o instanceof MigrantDetailBean) { - mInfoBean = (MigrantDetailBean) o; + @Override + public void onNext(@NonNull MigrantDetailBean migrantDetailBean) { + mInfoBean = migrantDetailBean; setInfo(); } - refreshView(STATE_LOAD_SUCCESS); - } - @Override - public void onError(@NonNull Throwable e) { - ExceptionHandler.handleException(e); - refreshView(STATE_LOAD_ERROR); - } + @Override + public void onError(@NonNull Throwable e) { + refreshView(STATE_LOAD_ERROR); + ExceptionHandler.handleException(e); + } - @Override - public void onComplete() { + @Override + public void onComplete() { - } - }); + } + }); } private void setInfo() { + refreshView(STATE_LOAD_SUCCESS); + //基础信息 + mEtIdentity.setText(IDCard.idMask(mInfoBean.getIdCardNumber(), 10, 4));//身份证号码 + mEtName.setText(mInfoBean.getFullName());//姓名 + mEtOnceName.setText(mInfoBean.getNameUsedBefore());//曾用名--- + mTvGender.setText(mInfoBean.getGenderDictionaryName());//性别 + mTvArea.setText(mInfoBean.getAreaNames()); + mTvGrid.setText(mInfoBean.getGridName()); + mTvBirth.setText(mInfoBean.getBirthDate());//生日 + mTvNation.setText(mInfoBean.getNationDictionaryName());//民族 + mTvMarry.setText(mInfoBean.getMaritalStatusDictionaryName());//婚姻 + mTvPolitical.setText(mInfoBean.getPoliticalStatusDictionaryName());//政治面貌 + mTvEdu.setText(mInfoBean.getEducationDictionaryName());//学历 + mTvReligion.setText(mInfoBean.getReligionDictionaryName());//宗教 + mTvWorkType.setText(mInfoBean.getOccupationCategoryDictionaryName());//职业类别 + mTvWork.setText(mInfoBean.getOccupation());//职业 + mEtWorkSpace.setText(mInfoBean.getServiceSpace());//服务处所----- + mEtPhone.setText(mInfoBean.getTelephone());//联系方式 + mEtCensusDetail.setText(mInfoBean.getNativePlaceAddr());//户籍地详址 + mEtCurDetail.setText(mInfoBean.getCurrentResidenceAddr());//现在详细地址 + //流动信息 mTvCause.setText(mInfoBean.getInflowReasonDict());//流入原因-- mTvCardType.setText(mInfoBean.getRegistrationTypeDict());//证件类型 mEtCardNumber.setText(mInfoBean.getCardNumber());//证件号码 @@ -157,20 +190,5 @@ public class CensusMigrantDetailActivity extends BaseActivity { mSwAttention.setChecked(!mInfoBean.getKeyOfFollow().equals("0"));//是否重点关注 } - /** - * 基础信息 - */ - private void setBaseInfo() { - mTvBaseArea.setText(mBaseInfo.getAreaNames()); - mTvBaseGrid.setText(mBaseInfo.getGridName()); - mTvBaseName.setText(mBaseInfo.getFullName()); - mTvBaseFormerName.setText(mBaseInfo.getNameUsedBefore()); - mTvBaseGender.setText(mBaseInfo.getGenderDictionaryName()); - mTvBaseIdCard.setText(mBaseInfo.getIdCardNumber());//身份证 - mTvBasePhone.setText(mBaseInfo.getTelephone());//联系电话 - mTvBaseNation.setText(mBaseInfo.getNationDictionaryName());//名族 - mTvBaseRegisterLoc.setText(mBaseInfo.getNativePlaceAddr());//户籍地 - mTvBaseCurAddress.setText(mBaseInfo.getCurrentResidenceAddr());//现住址详情 - } } \ No newline at end of file diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusMigrantListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusMigrantListActivity.java index 115fb19..a17b9a7 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusMigrantListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusMigrantListActivity.java @@ -5,14 +5,14 @@ import android.app.ProgressDialog; import android.graphics.Color; import android.text.TextUtils; import android.view.View; -import android.widget.Button; -import android.widget.EditText; -import android.widget.ImageView; import android.widget.TextView; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.CensusMigrantAdapter; import com.tengshisoft.commonmodule.beans.MigrantListBean; @@ -31,9 +31,6 @@ import com.tenlionsoft.baselib.utils.UserLgUtils; import java.util.ArrayList; import java.util.List; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import butterknife.BindView; import butterknife.ButterKnife; import butterknife.Unbinder; @@ -82,19 +79,20 @@ public class CensusMigrantListActivity extends BaseActivity { @Override protected void doSearchByTitle() { + doSearch(); } @Override public void initData() { mBind = ButterKnife.bind(this); - mTvBaseTitle.setText("流动人口"); + mTvBaseTitle.setText("非户籍人口"); mTvPublish.setVisibility(View.VISIBLE); mIvAppSearchIcon.setVisibility(View.VISIBLE); mTvPublish.setText("新增"); mTvPublish.setOnClickListener(v -> ARouter.getInstance() .build(PathConfig.PATH_MODULE_GRID_ACTIVITY_POPULACE_MIGRANT_ADD) - .withString("title", "流动人口信息录入") + .withString("title", "非户籍人口信息录入") .navigation()); mAdapter = new CensusMigrantAdapter(mActivity, mDatas); @@ -130,6 +128,9 @@ public class CensusMigrantListActivity extends BaseActivity { hideSoftKeyboard(); mKeywords = searchContent; mCurPage = 1; + refreshView(STATE_LOAD_LOADING); + mDatas.clear(); + mAdapter.setData(mDatas); getUpcomingList(mCurPage); } else { ToastUtils.show("请输入要查询的内容"); @@ -194,7 +195,7 @@ public class CensusMigrantListActivity extends BaseActivity { private void doEditBean(MigrantListBean.RowsBean bean, int pos) { ARouter.getInstance() .build(PathConfig.PATH_MODULE_GRID_ACTIVITY_POPULACE_MIGRANT_ADD) - .withString("title", "流动人口新编辑") + .withString("title", "非户籍人口信息编辑") .withString("id", bean.getFloatingPopulationId()) .navigation(); } @@ -268,10 +269,9 @@ public class CensusMigrantListActivity extends BaseActivity { mSrlContent.setNoMoreData(true); refreshView(STATE_LOAD_SUCCESS); } else { - if (TextUtils.isEmpty(mKeywords)) { + refreshView(STATE_LOAD_EMPTY); + if (!TextUtils.isEmpty(mKeywords)) { //无数据 - refreshView(STATE_LOAD_EMPTY); - } else { ToastUtils.show("未查询到相关内容"); } } diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusRearListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusRearListActivity.java index 52be9e4..1cedb04 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusRearListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusRearListActivity.java @@ -9,7 +9,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.CensusRearAdapter; import com.tengshisoft.commonmodule.beans.RearListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusRearPersonAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusRearPersonAddActivity.java index 7788d5d..4e0ccec 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusRearPersonAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusRearPersonAddActivity.java @@ -15,7 +15,7 @@ import com.alibaba.android.arouter.facade.annotation.Route; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.CensusRearDetailBean; import com.tengshisoft.commonmodule.beans.SaveRearBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusRegisterAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusRegisterAddActivity.java index 045a955..f90d680 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusRegisterAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusRegisterAddActivity.java @@ -14,7 +14,7 @@ import com.alibaba.android.arouter.facade.annotation.Route; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.CensusRegisterDetailBean; import com.tengshisoft.commonmodule.beans.CensusmsgBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusRegisterListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusRegisterListActivity.java index bc1a180..89970eb 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusRegisterListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/normal/CensusRegisterListActivity.java @@ -12,7 +12,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.CensusRegisterAdapter; import com.tengshisoft.commonmodule.beans.CensusRegisterListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/outbound/CensusOutBoundAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/outbound/CensusOutBoundAddActivity.java index 7ca0e55..5f44efa 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/outbound/CensusOutBoundAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/outbound/CensusOutBoundAddActivity.java @@ -16,7 +16,7 @@ import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.OutboundDetailBean; import com.tengshisoft.commonmodule.beans.SaveOutboundBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/outbound/CensusOutboundListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/outbound/CensusOutboundListActivity.java index 6ff7360..6f311b7 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/outbound/CensusOutboundListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/outbound/CensusOutboundListActivity.java @@ -13,7 +13,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.CensusOutboundAdapter; import com.tengshisoft.commonmodule.beans.OutboundListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusAidsAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusAidsAddActivity.java index 47585bf..c173aab 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusAidsAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusAidsAddActivity.java @@ -18,7 +18,7 @@ import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.AidsDetailBean; import com.tengshisoft.commonmodule.beans.SaveAidsBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusAidsListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusAidsListActivity.java index 3132a21..522023d 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusAidsListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusAidsListActivity.java @@ -13,7 +13,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.CensusAidsAdapter; import com.tengshisoft.commonmodule.beans.CensusAidsListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusCorrctListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusCorrctListActivity.java index 1cd6ef4..1d962e8 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusCorrctListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusCorrctListActivity.java @@ -13,7 +13,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.CensusCorrectAdapter; import com.tengshisoft.commonmodule.beans.CensusCorrectListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusCorrectAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusCorrectAddActivity.java index 01a61c0..ac897bc 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusCorrectAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusCorrectAddActivity.java @@ -18,7 +18,7 @@ import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.CorrectDetailBean; import com.tengshisoft.commonmodule.beans.SaveCorrectBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusDrugAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusDrugAddActivity.java index ed8ed0e..705ada9 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusDrugAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusDrugAddActivity.java @@ -17,7 +17,7 @@ import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.DrugDetailBean; import com.tengshisoft.commonmodule.beans.SaveDrugBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusDrugListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusDrugListActivity.java index 9e67e4d..eab8427 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusDrugListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusDrugListActivity.java @@ -13,7 +13,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.CensusDrugAdapter; import com.tengshisoft.commonmodule.beans.CensusDrugListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusSpecialCriminalAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusSpecialCriminalAddActivity.java index 574b870..3c33c88 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusSpecialCriminalAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusSpecialCriminalAddActivity.java @@ -17,7 +17,7 @@ import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.CensusCrimeDetailBean; import com.tengshisoft.commonmodule.beans.SaveCrimeBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusSpecialCriminalListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusSpecialCriminalListActivity.java index ab0ef03..f739f17 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusSpecialCriminalListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusSpecialCriminalListActivity.java @@ -12,7 +12,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.CensusCriminalAdapter; import com.tengshisoft.commonmodule.beans.CensusCriminalListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusTroubleAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusTroubleAddActivity.java index 143fdea..8405410 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusTroubleAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusTroubleAddActivity.java @@ -18,7 +18,7 @@ import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.SaveTroubleBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.beans.TroubleDetailBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusTroubleListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusTroubleListActivity.java index 1aa7af8..3ea512f 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusTroubleListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/populace/special/CensusTroubleListActivity.java @@ -13,7 +13,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.CensusTroubleAdapter; import com.tengshisoft.commonmodule.beans.CensusTroubleListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolCaseAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolCaseAddActivity.java index 4bbbf8b..803012e 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolCaseAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolCaseAddActivity.java @@ -30,7 +30,7 @@ import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.SaveSchoolCaseBean; import com.tengshisoft.commonmodule.beans.SchoolCaseDetailBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolCaseListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolCaseListActivity.java index 43d0ec0..c9c84da 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolCaseListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolCaseListActivity.java @@ -14,7 +14,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.SchoolCaseAdapter; import com.tengshisoft.commonmodule.beans.SchoolCaseListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolEmphasesAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolEmphasesAddActivity.java index 25a7d75..d4910f4 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolEmphasesAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolEmphasesAddActivity.java @@ -16,7 +16,7 @@ import com.alibaba.android.arouter.launcher.ARouter; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.SaveEmphasesBean; import com.tengshisoft.commonmodule.beans.SchoolEmphasesPersonDetailBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolEmphasesListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolEmphasesListActivity.java index e2e9cf3..07f1170 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolEmphasesListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolEmphasesListActivity.java @@ -14,7 +14,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.SchoolEmphasesPersonAdapter; import com.tengshisoft.commonmodule.beans.SchoolEmphasesPersonListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolManageAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolManageAddActivity.java index 973e937..1c89ad5 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolManageAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolManageAddActivity.java @@ -27,7 +27,7 @@ import com.baidu.mapapi.model.LatLng; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.SaveSchoolBean; import com.tengshisoft.commonmodule.beans.SchoolDetailBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolManageDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolManageDetailActivity.java index 07dd1cc..03fb115 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolManageDetailActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolManageDetailActivity.java @@ -22,7 +22,7 @@ import com.baidu.mapapi.map.MapStatusUpdateFactory; import com.baidu.mapapi.map.MarkerOptions; import com.baidu.mapapi.map.TextureMapView; import com.baidu.mapapi.model.LatLng; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.SchoolDetailBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolManageListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolManageListActivity.java index 03c873b..cc3553c 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolManageListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/schools/SchoolManageListActivity.java @@ -16,7 +16,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.gyf.immersionbar.ImmersionBar; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.jakewharton.rxbinding3.widget.RxTextView; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.SchoolListAdapter; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/ExpressPoiAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/ExpressPoiAddActivity.java index 87c2934..ee0696a 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/ExpressPoiAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/ExpressPoiAddActivity.java @@ -27,7 +27,7 @@ import com.baidu.mapapi.model.LatLng; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.SaveExpressBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/ExpressPoiDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/ExpressPoiDetailActivity.java index bb8c772..6e49b05 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/ExpressPoiDetailActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/ExpressPoiDetailActivity.java @@ -22,7 +22,7 @@ import com.baidu.mapapi.map.MapStatusUpdateFactory; import com.baidu.mapapi.map.MarkerOptions; import com.baidu.mapapi.map.TextureMapView; import com.baidu.mapapi.model.LatLng; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.ExpressDetailBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/ExpressPoiEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/ExpressPoiEditActivity.java index 19ff1fc..1629471 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/ExpressPoiEditActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/ExpressPoiEditActivity.java @@ -27,7 +27,7 @@ import com.baidu.mapapi.model.LatLng; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.ExpressDetailBean; import com.tengshisoft.commonmodule.beans.SaveExpressBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/ExpressPoiListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/ExpressPoiListActivity.java index 7197da3..32aebd7 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/ExpressPoiListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/ExpressPoiListActivity.java @@ -15,7 +15,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.gyf.immersionbar.ImmersionBar; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.jakewharton.rxbinding3.widget.RxTextView; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.ExpressListAdapter; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyAreaAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyAreaAddActivity.java index f12172d..afef5c9 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyAreaAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyAreaAddActivity.java @@ -15,7 +15,7 @@ import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.SaveKeyAreaBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyAreaDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyAreaDetailActivity.java index 6bf8821..a35bb5f 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyAreaDetailActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyAreaDetailActivity.java @@ -10,7 +10,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.KeyAreaDetailBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyAreaEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyAreaEditActivity.java index eb463ca..e9275fe 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyAreaEditActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyAreaEditActivity.java @@ -16,7 +16,7 @@ import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.KeyAreaDetailBean; import com.tengshisoft.commonmodule.beans.SaveKeyAreaBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyAreaListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyAreaListActivity.java index ec9fa0d..5b228b7 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyAreaListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyAreaListActivity.java @@ -15,7 +15,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.gyf.immersionbar.ImmersionBar; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.jakewharton.rxbinding3.widget.RxTextView; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.KeyAreaAdapter; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyPlaceAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyPlaceAddActivity.java index a214f9a..ce5ef14 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyPlaceAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyPlaceAddActivity.java @@ -27,7 +27,7 @@ import com.baidu.mapapi.model.LatLng; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.SaveKeyPlaceBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyPlaceDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyPlaceDetailActivity.java index aba2834..1995077 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyPlaceDetailActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyPlaceDetailActivity.java @@ -24,7 +24,7 @@ import com.baidu.mapapi.map.MapStatusUpdateFactory; import com.baidu.mapapi.map.MarkerOptions; import com.baidu.mapapi.map.TextureMapView; import com.baidu.mapapi.model.LatLng; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.KeyPlaceDetailBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyPlaceEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyPlaceEditActivity.java index 435f5ab..94dcd13 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyPlaceEditActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyPlaceEditActivity.java @@ -27,7 +27,7 @@ import com.baidu.mapapi.model.LatLng; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.KeyPlaceDetailBean; import com.tengshisoft.commonmodule.beans.SaveKeyPlaceBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyPlaceListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyPlaceListActivity.java index b6fc68d..83a1e82 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyPlaceListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyPlaceListActivity.java @@ -15,7 +15,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.gyf.immersionbar.ImmersionBar; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.jakewharton.rxbinding3.widget.RxTextView; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.KeyPlaceAdapter; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyRoadAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyRoadAddActivity.java index 77b49e7..65849bf 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyRoadAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyRoadAddActivity.java @@ -13,7 +13,7 @@ import com.alibaba.android.arouter.launcher.ARouter; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.SaveKeyRoadBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyRoadDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyRoadDetailActivity.java index 15128b0..607a008 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyRoadDetailActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyRoadDetailActivity.java @@ -10,7 +10,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.KeyRoadDetailBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyRoadEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyRoadEditActivity.java index 85278a0..5b45cac 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyRoadEditActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyRoadEditActivity.java @@ -27,7 +27,7 @@ import com.alibaba.android.arouter.launcher.ARouter; import com.bigkoo.pickerview.builder.OptionsPickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.KeyRoadDetailBean; import com.tengshisoft.commonmodule.beans.SaveKeyRoadBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyRoadListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyRoadListActivity.java index 6a0e5c0..41f2aa0 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyRoadListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/KeyRoadListActivity.java @@ -15,7 +15,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.gyf.immersionbar.ImmersionBar; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.jakewharton.rxbinding3.widget.RxTextView; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.KeyRoadAdapter; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalAddActivity.java index 2849281..b973b12 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalAddActivity.java @@ -13,7 +13,7 @@ import com.alibaba.android.arouter.launcher.ARouter; import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.SavePenalBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalCaseSelActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalCaseSelActivity.java index df9e8ea..1e9a7fd 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalCaseSelActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalCaseSelActivity.java @@ -10,7 +10,7 @@ import android.widget.ProgressBar; import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.PenalCaseSelAdapter; import com.tengshisoft.commonmodule.beans.PenalListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalDetailActivity.java index 56cbf88..0b9c114 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalDetailActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalDetailActivity.java @@ -10,7 +10,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.PenalDetailBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalEditActivity.java index 3365e22..361c7c4 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalEditActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalEditActivity.java @@ -14,7 +14,7 @@ import com.alibaba.android.arouter.launcher.ARouter; import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.PenalDetailBean; import com.tengshisoft.commonmodule.beans.SavePenalBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalListActivity.java index 5bd0bd0..44e7c2a 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalListActivity.java @@ -15,7 +15,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.gyf.immersionbar.ImmersionBar; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.jakewharton.rxbinding3.widget.RxTextView; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.PenalAdapter; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalSuspicionAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalSuspicionAddActivity.java index 0f27d74..df1bb2c 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalSuspicionAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalSuspicionAddActivity.java @@ -16,7 +16,7 @@ import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.PenalListBean; import com.tengshisoft.commonmodule.beans.SaveSuspicionBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalSuspicionDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalSuspicionDetailActivity.java index 0527610..a50552b 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalSuspicionDetailActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalSuspicionDetailActivity.java @@ -10,7 +10,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.PenalSuspicionDetailBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalSuspicionEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalSuspicionEditActivity.java index 5e493a0..19a9bcf 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalSuspicionEditActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalSuspicionEditActivity.java @@ -16,7 +16,7 @@ import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.PenalListBean; import com.tengshisoft.commonmodule.beans.PenalSuspicionDetailBean; import com.tengshisoft.commonmodule.beans.SaveSuspicionBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalSuspicionListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalSuspicionListActivity.java index 83f7251..23ea3fa 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalSuspicionListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalSuspicionListActivity.java @@ -15,7 +15,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.gyf.immersionbar.ImmersionBar; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.jakewharton.rxbinding3.widget.RxTextView; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.PenalSuspicionListAdapter; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalVictimAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalVictimAddActivity.java index a38120a..3e177a2 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalVictimAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalVictimAddActivity.java @@ -16,7 +16,7 @@ import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.PenalListBean; import com.tengshisoft.commonmodule.beans.SaveVictimBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalVictimDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalVictimDetailActivity.java index 08a5310..6b618b4 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalVictimDetailActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalVictimDetailActivity.java @@ -20,7 +20,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.beans.VictimDetailBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalVictimEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalVictimEditActivity.java index 0ac2411..62bc67d 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalVictimEditActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalVictimEditActivity.java @@ -16,7 +16,7 @@ import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.OptionsPickerView; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.PenalListBean; import com.tengshisoft.commonmodule.beans.SaveVictimBean; import com.tengshisoft.commonmodule.beans.SuccessBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalVictimListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalVictimListActivity.java index 82908d2..5d6e041 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalVictimListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/security/PenalVictimListActivity.java @@ -15,7 +15,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.gyf.immersionbar.ImmersionBar; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.PenalVictimListAdapter; import com.tengshisoft.commonmodule.beans.VictimListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/tasks/TaskBusinessListActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/tasks/TaskBusinessListActivity.java index 594f244..24d72a6 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/tasks/TaskBusinessListActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/tasks/TaskBusinessListActivity.java @@ -10,7 +10,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.TaskBusinessListAdapter; import com.tengshisoft.commonmodule.beans.TaskBusinessListBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/tasks/TaskDetailActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/tasks/TaskDetailActivity.java index 1f3e8ab..d322606 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/tasks/TaskDetailActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/tasks/TaskDetailActivity.java @@ -10,7 +10,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tengshisoft.commonmodule.adapters.TaskReportListAdapter; import com.tengshisoft.commonmodule.beans.TaskReceiveDetailBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/tasks/TaskReportRecordAddActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/tasks/TaskReportRecordAddActivity.java index d79a249..267f6b4 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/tasks/TaskReportRecordAddActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/tasks/TaskReportRecordAddActivity.java @@ -21,7 +21,7 @@ import com.alibaba.android.arouter.launcher.ARouter; import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.view.TimePickerView; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.SaveTaskReportBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.nets.GridApis; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/tasks/TaskReportRecordEditActivity.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/tasks/TaskReportRecordEditActivity.java index c7c10e7..c297c9b 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/tasks/TaskReportRecordEditActivity.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/tasks/TaskReportRecordEditActivity.java @@ -19,7 +19,7 @@ import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.beans.SaveTaskReportBean; import com.tengshisoft.commonmodule.beans.SuccessBean; import com.tengshisoft.commonmodule.beans.TaskReportRecordDetailBean; diff --git a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/tasks/fragments/TaskFragment.java b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/tasks/fragments/TaskFragment.java index 1f4875a..13a88df 100644 --- a/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/tasks/fragments/TaskFragment.java +++ b/gridmodule/src/main/java/com/tengshisoft/gridmodule/incident/activitys/tasks/fragments/TaskFragment.java @@ -8,7 +8,7 @@ import android.view.View; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.google.gson.Gson; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.commonmodule.adapters.TaskListAdapter; import com.tengshisoft.commonmodule.beans.SaveGetTaskBean; import com.tengshisoft.commonmodule.beans.SaveTaskStateBean; diff --git a/gridmodule/src/main/res/layout/activity_census_base_search.xml b/gridmodule/src/main/res/layout/activity_census_base_search.xml index 1d1883d..e7edafe 100644 --- a/gridmodule/src/main/res/layout/activity_census_base_search.xml +++ b/gridmodule/src/main/res/layout/activity_census_base_search.xml @@ -56,6 +56,8 @@ android:paddingLeft="5dp" android:textColor="@color/black" android:textSize="12sp" + android:maxLines="1" + android:singleLine="true" tools:text="" /> @@ -63,7 +63,7 @@ @@ -94,7 +94,7 @@ @@ -143,7 +143,7 @@ @@ -158,7 +158,7 @@ @@ -173,7 +173,7 @@ @@ -189,7 +189,7 @@ @@ -204,7 +204,7 @@ @@ -219,7 +219,7 @@ @@ -236,7 +236,7 @@ @@ -251,7 +251,7 @@ diff --git a/gridmodule/src/main/res/layout/activity_census_nmigrant_add.xml b/gridmodule/src/main/res/layout/activity_census_nmigrant_add.xml index 912327a..486617c 100644 --- a/gridmodule/src/main/res/layout/activity_census_nmigrant_add.xml +++ b/gridmodule/src/main/res/layout/activity_census_nmigrant_add.xml @@ -44,7 +44,6 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/gridmodule/src/main/res/layout/activity_census_nmigrant_detail.xml b/gridmodule/src/main/res/layout/activity_census_nmigrant_detail.xml index 75573b7..5d66323 100644 --- a/gridmodule/src/main/res/layout/activity_census_nmigrant_detail.xml +++ b/gridmodule/src/main/res/layout/activity_census_nmigrant_detail.xml @@ -16,130 +16,370 @@ - + android:layout_marginTop="-20dp"> - - - + android:layout_height="wrap_content" + android:background="@drawable/shape_rectangle_white_top" + android:orientation="vertical" + android:paddingTop="15dp"> - + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/gridmodule/src/main/res/layout/fragment_person_lib.xml b/gridmodule/src/main/res/layout/fragment_person_lib.xml index d8f411c..0271081 100644 --- a/gridmodule/src/main/res/layout/fragment_person_lib.xml +++ b/gridmodule/src/main/res/layout/fragment_person_lib.xml @@ -102,7 +102,7 @@ android:drawableLeft="@drawable/ic_lib_crowd_icon" android:drawablePadding="10dp" android:padding="10dp" - android:text="正常人群" + android:text="普通人群" android:textColor="@color/black" android:textSize="18dp" /> @@ -135,20 +135,20 @@ android:visibility="gone" /> - + + + + + + + + + + + + + + () { - @Override - public void onSubscribe(@NonNull Disposable d) { + @Override + public void onSubscribe(@NonNull Disposable d) { - } + } - @Override - public void onNext(@NonNull JsonObject obj) { - try { - String rhUrl = obj.get("rhUrl").getAsString(); - String rhPort = obj.get("rhPort").getAsString(); - String rhHttpsPort = obj.get("rhHttpsPort").getAsString(); - if (!TextUtils.isEmpty(rhUrl) && !TextUtils.isEmpty(rhPort)) { - UserLgUtils.setRhPort(Integer.parseInt(rhPort)); - UserLgUtils.setRhUrl(rhUrl); - UserLgUtils.setHttpsPort(rhHttpsPort); - if (AppUtils.isSupportCall()) { - //判断是否可以视频通话 - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - initHWClound();//初始化华为融合通信 - getUserExpandInfo(); + @Override + public void onNext(@NonNull JsonObject obj) { + try { + String rhUrl = obj.get("rhUrl").getAsString(); + String rhPort = obj.get("rhPort").getAsString(); + String rhHttpsPort = obj.get("rhHttpsPort").getAsString(); + if (!TextUtils.isEmpty(rhUrl) && !TextUtils.isEmpty(rhPort)) { + UserLgUtils.setRhPort(Integer.parseInt(rhPort)); + UserLgUtils.setRhUrl(rhUrl); + UserLgUtils.setHttpsPort(rhHttpsPort); + if (AppUtils.isSupportCall()) { + //判断是否可以视频通话 + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + initHWClound();//初始化华为融合通信 + getUserExpandInfo(); + } + } } + } catch (Exception e) { + e.printStackTrace(); } } - } catch (Exception e) { - e.printStackTrace(); - } - } - @Override - public void onError(@NonNull Throwable e) { - e.printStackTrace(); - } + @Override + public void onError(@NonNull Throwable e) { + e.printStackTrace(); + } - @Override - public void onComplete() { + @Override + public void onComplete() { - } - }); + } + }); } diff --git a/mainmodule/src/main/java/com/tengshisoft/mainmodule/base/SplashActivity.java b/mainmodule/src/main/java/com/tengshisoft/mainmodule/base/SplashActivity.java index cc108e5..0e4a6c8 100644 --- a/mainmodule/src/main/java/com/tengshisoft/mainmodule/base/SplashActivity.java +++ b/mainmodule/src/main/java/com/tengshisoft/mainmodule/base/SplashActivity.java @@ -5,7 +5,7 @@ import android.view.View; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.gyf.immersionbar.ImmersionBar; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.mainmodule.R; import com.tenlionsoft.baselib.constant.LionActions; import com.tenlionsoft.baselib.constant.PathConfig; diff --git a/mainmodule/src/main/java/com/tengshisoft/mainmodule/fragments/GridMainFragment.java b/mainmodule/src/main/java/com/tengshisoft/mainmodule/fragments/GridMainFragment.java index 4fdbd59..b4b824b 100755 --- a/mainmodule/src/main/java/com/tengshisoft/mainmodule/fragments/GridMainFragment.java +++ b/mainmodule/src/main/java/com/tengshisoft/mainmodule/fragments/GridMainFragment.java @@ -24,6 +24,7 @@ import com.tengshisoft.commonmodule.beans.AreaGridListBean; import com.tengshisoft.commonmodule.beans.IncidentCountBean; import com.tengshisoft.commonmodule.beans.IncidentListBean; import com.tengshisoft.commonmodule.beans.KnowLedgeListBean; +import com.tengshisoft.commonmodule.beans.NoticeListBean; import com.tengshisoft.commonmodule.nets.GridApis; import com.tengshisoft.mainmodule.BaseLineTextAdapter; import com.tengshisoft.mainmodule.R; @@ -40,7 +41,6 @@ import com.tenlionsoft.baselib.core.widget.base.FunctionNumAdapter; import com.tenlionsoft.baselib.core.widget.base.FunctionTitleNumAdapter; import com.tenlionsoft.baselib.core.widget.views.ChooseFuncDialogView; import com.tenlionsoft.baselib.utils.ExceptionHandler; -import com.tenlionsoft.baselib.utils.TimeUtils; import com.tenlionsoft.baselib.utils.UserLgUtils; import org.jetbrains.annotations.NotNull; @@ -53,8 +53,10 @@ import java.util.List; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.Unbinder; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; import io.reactivex.rxjava3.core.Observer; import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.schedulers.Schedulers; /** * 作者: Adam @@ -106,6 +108,12 @@ public class GridMainFragment extends BaseFragment { ImageView mIvKnowEmpty; @BindView(R2.id.ll_know) LinearLayout mLlKnow; + @BindView(R2.id.ll_notice) + LinearLayout mLlNotice; + @BindView(R2.id.tv_notice_1) + TextView mTvNotice1; + @BindView(R2.id.tv_notice_2) + TextView mTvNotice2; private Disposable mDisposable; private Unbinder mBind; private List mFuncs = new ArrayList<>(); @@ -177,6 +185,49 @@ public class GridMainFragment extends BaseFragment { mSrlView.setEnableRefresh(false); initContentView(); getMineGridList(); + getNoticeList(); + } + + /** + * 获取通知公告 + */ + private void getNoticeList() { + RetrofitManager.getInstance() + .create(GridApis.class) + .getArticleList("", PathConfig.NOTICE_CID, "1",UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(@io.reactivex.rxjava3.annotations.NonNull Disposable d) { + + } + + @Override + public void onNext(@io.reactivex.rxjava3.annotations.NonNull NoticeListBean noticeListBean) { + if (noticeListBean.getRows() != null && noticeListBean.getRows().size() > 0) { + mLlNotice.setVisibility(View.VISIBLE); + if (noticeListBean.getRows().size() > 1) { + mTvNotice1.setText(noticeListBean.getRows().get(0).getTitle()); + mTvNotice2.setText(noticeListBean.getRows().get(1).getTitle()); + } else { + mTvNotice1.setText(noticeListBean.getRows().get(0).getTitle()); + } + } else { + mLlNotice.setVisibility(View.GONE); + } + } + + @Override + public void onError(@io.reactivex.rxjava3.annotations.NonNull Throwable e) { + mLlNotice.setVisibility(View.GONE); + } + + @Override + public void onComplete() { + + } + }); } /** @@ -281,6 +332,9 @@ public class GridMainFragment extends BaseFragment { .build(PathConfig.PATH_MODULE_COMMON_ACTIVITY_KNOWLEDGE_LIBRARY_LIST) .withString("type", "grid") .navigation());//知识库 + mLlNotice.setOnClickListener(v -> ARouter.getInstance() + .build(PathConfig.PATH_MODULE_COMMON_ACTIVITY_NOTICE_LIST) + .navigation()); for (int i = 0; i < mBtnStrs.length; i++) { FuncBean bean = new FuncBean(); bean.setText(mBtnStrs[i]); @@ -322,7 +376,7 @@ public class GridMainFragment extends BaseFragment { //我的上报数量 RetrofitManager.getInstance() .create(GridApis.class) - .getIncidentMineList("", 1 + "","","", UserLgUtils.getToken()) + .getIncidentMineList("", 1 + "", "", "", UserLgUtils.getToken()) .compose(RxTransformer.getTransformer()) .subscribe(new Observer() { @Override diff --git a/mainmodule/src/main/res/layout/fragment_main_grid.xml b/mainmodule/src/main/res/layout/fragment_main_grid.xml index 12e1adc..33d7019 100644 --- a/mainmodule/src/main/res/layout/fragment_main_grid.xml +++ b/mainmodule/src/main/res/layout/fragment_main_grid.xml @@ -216,6 +216,8 @@ tools:spanCount="5" /> + android:textSize="@dimen/text_14" /> + android:textSize="@dimen/text_14" /> diff --git a/modulemap/src/main/java/com/tengshisoft/modulemap/activitys/SelPointActivity.java b/modulemap/src/main/java/com/tengshisoft/modulemap/activitys/SelPointActivity.java index 32afed4..7936026 100644 --- a/modulemap/src/main/java/com/tengshisoft/modulemap/activitys/SelPointActivity.java +++ b/modulemap/src/main/java/com/tengshisoft/modulemap/activitys/SelPointActivity.java @@ -27,7 +27,7 @@ import com.baidu.mapapi.search.geocode.GeoCoder; import com.baidu.mapapi.search.geocode.OnGetGeoCoderResultListener; import com.baidu.mapapi.search.geocode.ReverseGeoCodeOption; import com.baidu.mapapi.search.geocode.ReverseGeoCodeResult; -import com.hjq.toast.ToastUtils; +import com.tenlionsoft.baselib.utils.ToastUtils; import com.tengshisoft.modulemap.R; import com.tengshisoft.modulemap.R2; import com.tengshisoft.modulemap.common.Location84;