统计功能、人口房屋页面修改

This commit is contained in:
itgaojian 2023-06-16 09:19:18 +08:00
parent 6e088a2063
commit 055a41bd30
93 changed files with 4947 additions and 1170 deletions

View File

@ -10,8 +10,8 @@
{
"type": "SINGLE",
"filters": [],
"versionCode": 14,
"versionName": "1.1.3",
"versionCode": 15,
"versionName": "1.1.4",
"outputFile": "app-release.apk"
}
]

View File

@ -113,6 +113,7 @@ dependencies {
api 'com.github.MZCretin:ExpandableTextView:v1.6.1-x'
api 'com.jakewharton.rxbinding3:rxbinding-core:3.0.0'
//
api "com.jcodecraeer:xrecyclerview:${rootProject.ext.xRecyclerViewVersion}"
}

View File

@ -12,7 +12,8 @@ import java.io.File;
public class PathConfig {
public static final String PROVIDER_URL = "content://com.tengshisoft.gridclient.content_provider";//内容提供者url
public static final String BASE_LAYER = "http://support.supermap.com.cn:8090/iserver/services/map-china400/rest/maps/China";//地图基础图层
public static final String BASE_LAYER = "http://support.supermap.com.cn:8090/iserver/services/map-china400/rest" +
"/maps/China";//地图基础图层
public static final int CRS = 4326;//坐标系
/*===========================================*/
@ -20,19 +21,24 @@ public class PathConfig {
public static final String ACTION_LOGIN_OUT = "com.tengshisoft.city-governace.restart_app";
public static final String ACTION_REGISTER_BROAD = "com.tengshisoft.city-governace.register_broad";
public static final String ACTION_FROM_SOCKET_PUSH_MSG = "com.tengshisoft.city-governace.push_msg";//系统推送来的消息 根据 推送过来的消息 分为三类 系统消息类 通知类 聊天类 根据type来判断
public static final String ACTION_FROM_SOCKET_PUSH_MSG = "com.tengshisoft.city-governace.push_msg";//系统推送来的消息 根据
// 推送过来的消息 分为三类 系统消息类 通知类 聊天类 根据type来判断
public static final String ACTION_SOCKET_RELINK = "com.tenglionsoft.city-governance.socket_relink";//socket重连
public static final String ACTION_MSG_CHAT = "com.tenglionsoft.city-governance.chat_msg";//聊天消息
public static final String ACTION_MSG_CHAT_SEND = "com.tenglion.city-governance.chat_send";//发送聊天信息
public static final String ACTION_MSG_CHAT_REFRESH = "com.tenglionsoft.city-governance.MSG_REFRESH";//刷新聊天信息状态
public static final String ACTION_MSG_SOCKET_FAIL = "com.tenglionsoft.city-governance.chat_socket_fail";//socket连接失败
public static final String ACTION_PUSH_UPCOMING_BY_SYS = "com.tenglionsoft.city-governance.push_sys_upcoming";//系统待办通知
public static final String ACTION_PUSH_UPCOMING_BY_SYS = "com.tenglionsoft.city-governance.push_sys_upcoming";
//系统待办通知
public static final String ACTION_MSG_UPCOMING_BY_USER = "com.tenglionsoft.city-governance.by_user_upcoming";//待办点击
public static final String ACTION_MSG_UPCOMING_INITIATIVE = "com.tenglionsoft.city-governance.by_user_initiative";//用户主动获取待办信息
public static final String ACTION_MSG_UPCOMING_INITIATIVE =
"com.tenglionsoft.city-governance.by_user_initiative";//用户主动获取待办信息
public static final String ACTION_PUSH_RESTART_SOCKET = "com.tengshisoft.city-governance.push_restart";//重新登录socket
public static final String ACTION_MSG_FORCE_LOGIN_OUT = "com.tengshisoft.city-governance.push_force_grid_login_out";//强制下线
public static final String ACTION_MSG_FORCE_LOGIN_OUT = "com.tengshisoft.city-governance" +
".push_force_grid_login_out";//强制下线
public static final String ACTION_PUSH_STOP_SOCKET = "com.tengshisoft.city-governance.push_stop";//关闭socket
public static final String ACTION_ONE_PIXE_FINISH_ACTIVITY = "com.tengshisoft.city-governance.finish_one_pixe_activity";//关闭activity
public static final String ACTION_ONE_PIXE_FINISH_ACTIVITY = "com.tengshisoft.city-governance" +
".finish_one_pixe_activity";//关闭activity
public static final String ACTION_SCREEN_ON = "com.tengshisoft.city-governance.screen_on";//屏幕关闭
public static final String ACTION_SCREEN_OFF = "com.tengshisoft.city-governance.screen_off";//屏幕开启
public static final String ACTION_SYSTEM_MESSAGE = "com.sucstepsoft.hs.message";
@ -43,15 +49,21 @@ public class PathConfig {
public static final String ACTION_START_LOCATION = "com.sucstepsoft.city-governance.start_listener";
public static final String ACTION_CALL_MSG = "com.tenlionsoft.call_msg";
public static final String ACTION_NOTIFY_CONTACT_LOGIN = "com.tengshisoft.city-governance.notify_login";//通知对方登录
public static final String ACTION_NOTIFY_CONTACT_LOGIN_SUCCESS = "com.tengshisoft.city-governance.notify_login_success";//对方登录成功
public static final String ACTION_NOTIFY_CONTACT_LOGIN_FAIL = "com.tengshisoft.city-governance.notify_login_failed";//对方登录不成功
public static final String ACTION_CALL_OTHER_NO_SUPPORT = "com.tengshisoft.city-governance.call_other_no_support";//对方手机不支持视频语音通话
public static final String ACTION_NOTIFY_CONTACT_LOGIN_SUCCESS = "com.tengshisoft.city-governance" +
".notify_login_success";//对方登录成功
public static final String ACTION_NOTIFY_CONTACT_LOGIN_FAIL = "com.tengshisoft.city-governance" +
".notify_login_failed";//对方登录不成功
public static final String ACTION_CALL_OTHER_NO_SUPPORT =
"com.tengshisoft.city-governance.call_other_no_support";//对方手机不支持视频语音通话
public static final String ACTION_USER_OFFLINE = "com.tengshisoft.city-governance.user_offline";//用户不在线
public static final String ACTION_CALL_LOGIN_FAIL = "com.tengshisoft.city-governance.call_login_local_fail";//本地登录失败
public static final String ACTION_CALL_LOGIN_SUCCESS = "com.tengshisoft.city-governance.call_login_local_success";//本地登录成功
public static final String ACTION_CALL_LOGIN_OUT = "com.tengshisoft.city-governance.call_login_local_loginout";//通知本地退出登录
public static final String ACTION_CALL_LOCAL_PHONE_NO_SUPPORT = "com.tengshisoft.city-governance.call_login_local_no.support";//本地通知手机不支持通话
public static final String ACTION_CALL_LOGIN_SUCCESS =
"com.tengshisoft.city-governance.call_login_local_success";//本地登录成功
public static final String ACTION_CALL_LOGIN_OUT = "com.tengshisoft.city-governance.call_login_local_loginout";
//通知本地退出登录
public static final String ACTION_CALL_LOCAL_PHONE_NO_SUPPORT = "com.tengshisoft.city-governance" +
".call_login_local_no.support";//本地通知手机不支持通话
public static final String ACTION_NET_CHANGE = "android.net.conn.CONNECTIVITY_CHANGE";//网络状态变化
public static final String ACTION_LOCAL_LOGIN = "com.tengshisoft.gridclient.login";//本地融合通信手动登录
public static final String ACTION_LOCAL_LOGINOUT = "com.tengshisoft.gridclient.loginout";//本地融合通信手动退出
@ -101,9 +113,14 @@ public class PathConfig {
// N员bc405346-8714-4ded-89ac-9cc4d755f66a
// 巡检25affe67-134c-4a32-ba41-64b0cfedc782
public static final int PATROL_SECTOR_INDEX = 3;//巡更点NFC使用的扇区
public static final String CATCH_PATH = Environment.getExternalStorageDirectory().getPath() + File.separator + PROJECT_NAME + File.separator + "cache" + File.separator;
public static final String VIDEO_PATH = Environment.getExternalStorageDirectory().getPath() + File.separator + PROJECT_NAME + File.separator + "videoCache" + File.separator;
public static final String PROJECT_CATCH_PATH = Environment.getExternalStorageDirectory().getPath() + File.separator + PROJECT_NAME;//项目缓存目录
public static final String CATCH_PATH =
Environment.getExternalStorageDirectory().getPath() + File.separator + PROJECT_NAME + File.separator +
"cache" + File.separator;
public static final String VIDEO_PATH =
Environment.getExternalStorageDirectory().getPath() + File.separator + PROJECT_NAME + File.separator +
"videoCache" + File.separator;
public static final String PROJECT_CATCH_PATH =
Environment.getExternalStorageDirectory().getPath() + File.separator + PROJECT_NAME;//项目缓存目录
public static final String IDENTITY_FILE = VIDEO_PATH + "identity.txt";
/**
* ====================================主模块===================================
@ -161,14 +178,21 @@ public class PathConfig {
public static final String PATH_MODULE_CHAT_ADDRESSLIST = "/modulechat/activity/addresslist";//通讯录
public static final String PATH_MODULE_CHAT_ADDRESSLIST_SEARCH = "/modulechat/activity/addresslistsearch";//通讯录搜索
public static final String PATH_MODULE_CHAT_FRAGMENT_DEPT_CONTACT = "/modulechat/fragment/contactDeptFragment";//按部门显示联系人
public static final String PATH_MODULE_CHAT_FRAGMENT_OFTEN_CONTACT = "/modulechat/fragment/contactOftenFragment";//常用联系人
public static final String PATH_MODULE_CHAT_FRAGMENT_PINYIN_CONTACT = "/modulechat/fragment/contactPinyinFragment";//按拼音
public static final String PATH_MODULE_CHAT_FRAGMENT_DEPT_CONTACT = "/modulechat/fragment/contactDeptFragment";
//按部门显示联系人
public static final String PATH_MODULE_CHAT_FRAGMENT_OFTEN_CONTACT = "/modulechat/fragment/contactOftenFragment";
//常用联系人
public static final String PATH_MODULE_CHAT_FRAGMENT_PINYIN_CONTACT = "/modulechat/fragment/contactPinyinFragment"
;//按拼音
public static final String PATH_MODULE_CHAT_ADDRESSLIST_USER_DETAIL = "/modulechat/activity/contactUserDetail";//联系人详情
public static final String PATH_MODULE_COMMON_ACTIVITY_INCIDENT_DISPATCH_INFO = "/modulecommon/activity/incidentDispatchInfo";//分拨信息
public static final String PATH_MODULE_COMMON_ACTIVITY_INCIDENT_HANDLE_INFO = "/modulecommon/activity/incidentHandleInfo";//处理信息
public static final String PATH_MODULE_COMMON_ACTIVITY_INCIDENT_CHECK_INFO = "/modulecommon/activity/incidentCheckInfo";//核查信息
public static final String PATH_MODULE_CHAT_ADDRESSLIST_USER_DETAIL = "/modulechat/activity/contactUserDetail";
//联系人详情
public static final String PATH_MODULE_COMMON_ACTIVITY_INCIDENT_DISPATCH_INFO = "/modulecommon/activity" +
"/incidentDispatchInfo";//分拨信息
public static final String PATH_MODULE_COMMON_ACTIVITY_INCIDENT_HANDLE_INFO = "/modulecommon/activity" +
"/incidentHandleInfo";//处理信息
public static final String PATH_MODULE_COMMON_ACTIVITY_INCIDENT_CHECK_INFO = "/modulecommon/activity" +
"/incidentCheckInfo";//核查信息
//==================ModuleMedia====================
public static final String PATH_MODULEMEDIA_CAMERA = "/modulemedia/activity/camera"; //相机
public static final String PATH_MODULEMEDIA_FILEPICKER = "/modulemedia/activity/filepicker";
@ -196,111 +220,177 @@ public class PathConfig {
public static final String PATH_MODULE_COMMON_ACTIVITY_USER_INFO = "/modulecommon/activity/userInfo";//用户信息修改
public static final String PATH_MODULE_COMMON_ACTIVITY_ATTENDANCE = "/modulecommon/activity/attendance";//考勤
public static final String PATH_MODULE_COMMON_DEMO = "/modulecommon/activity/mapdemo";//地图测试
public static final String PATH_MODULE_COMMON_ACTIVITY_USER_CENTER = "/modulecommon/activity/userCenter";//用户中心activity
public static final String PATH_MODULE_COMMON_FRAGMENT_USER_CENTER = "/modulecommon/fragment/userCenter";//用户中心fragment
public static final String PATH_MODULE_COMMON_ACTIVITY_USER_CENTER = "/modulecommon/activity/userCenter";
//用户中心activity
public static final String PATH_MODULE_COMMON_FRAGMENT_USER_CENTER = "/modulecommon/fragment/userCenter";
//用户中心fragment
public static final String PATH_MODULE_BASELIB_SHOW_IMG = "/modulebaselib/activity/showImg";//浏览图片
public static final String PATH_MODULE_BASELIB_TAKE_PHOTO = "/modulebaselib/activity/takePhotoOrVideo";//摄像或拍照
public static final String PATH_MODULE_COMMON_ACTIVITY_SEL_DEPT = "/modulecommon/activity/chooseDept";//部门选择接口
public static final String PATH_MODULE_COMMON_ACTIVITY_SEL_DEPT_KNOW = "/modulecommon/activity/chooseDeptKnowLedge";//部门选择接口
public static final String PATH_MODULE_COMMON_ACTIVITY_SEL_DEPT_KNOW = "/modulecommon/activity" +
"/chooseDeptKnowLedge";//部门选择接口
public static final String PATH_MODULE_COMMON_ACTIVITY_SEL_PERSON = "/modulecommon/activity/choosePerson";//人员选择
public static final String PATH_MODULE_COMMON_ACTIVITY_CHOOSE_ORG_AREA = "/modulecommon/activity/chooseOrgArea";//区域部门选择
public static final String PATH_MODULE_COMMON_ACTIVITY_CHOOSE_GRID_USER = "/modulecommon/activity/chooseGridUser";//网格员选择
public static final String PATH_MODULE_COMMON_ACTIVITY_CHOOSE_ORG_AREA = "/modulecommon/activity/chooseOrgArea";
//区域部门选择
public static final String PATH_MODULE_COMMON_ACTIVITY_CHOOSE_GRID_USER =
"/modulecommon/activity/chooseGridUser";//网格员选择
public static final String PATH_MODULE_COMMON_ACTIVITY_INCIDENT_REPORT = "/modulecommon/activity/incidentReport";//事件上报
public static final String PATH_MODULE_COMMON_ACTIVITY_INCIDENT_REPORT = "/modulecommon/activity/incidentReport";
//事件上报
public static final String PATH_MODULE_COMMON_ACTIVITY_INCIDENT_EDIT = "/modulecommon/activity/incidentEdit";//事件修改
public static final String PATH_MODULE_COMMON_ACTIVITY_INCIDENT_LOG = "/modulecommon/activity/incidentLog";//事件日志
public static final String PATH_MODULE_COMMON_ACTIVITY_INCIDENT_DONE = "/modulecommon/activity/incidentDone";//已办事件
public static final String PATH_MODULE_COMMON_ACTIVITY_INCIDENT_DETAIL = "/modulecommon/activity/incidentDetail";//事件详情
public static final String PATH_MODULE_COMMON_ACTIVITY_INCIDENT_SEL_COMPONENT = "/modulecommon/activity/incidentSelComponent";//部件选择
public static final String PATH_MODULE_COMMON_ACTIVITY_INCIDENT_MINE_LIST = "/modulecommon/activity/incidentMineList";//我上报的事件列表
public static final String PATH_MODULE_COMMON_ACTIVITY_INCIDENT_HANDLE_LIST = "/modulecommon/activity/incidentHandleList";//待处理事件列表
public static final String PATH_MODULE_COMMON_ACTIVITY_INCIDENT_HANDLE = "/modulecommon/activity/incidentHandle";//事件处理
public static final String PATH_MODULE_COMMON_ACTIVITY_INCIDENT_CHECK_LIST = "/modulecommon/activity/incidentCheckList";//事件核查
public static final String PATH_MODULE_COMMON_ACTIVITY_INCIDENT_CHECK_DETAIL = "/modulecommon/activity/incidentCheckDetail";//事件核查详情
public static final String PATH_MODULE_COMMON_ACTIVITY_INCIDENT_DETAIL = "/modulecommon/activity/incidentDetail";
//事件详情
public static final String PATH_MODULE_COMMON_ACTIVITY_INCIDENT_SEL_COMPONENT = "/modulecommon/activity" +
"/incidentSelComponent";//部件选择
public static final String PATH_MODULE_COMMON_ACTIVITY_INCIDENT_MINE_LIST = "/modulecommon/activity" +
"/incidentMineList";//我上报的事件列表
public static final String PATH_MODULE_COMMON_ACTIVITY_INCIDENT_HANDLE_LIST = "/modulecommon/activity" +
"/incidentHandleList";//待处理事件列表
public static final String PATH_MODULE_COMMON_ACTIVITY_INCIDENT_HANDLE = "/modulecommon/activity/incidentHandle";
//事件处理
public static final String PATH_MODULE_COMMON_ACTIVITY_INCIDENT_CHECK_LIST = "/modulecommon/activity" +
"/incidentCheckList";//事件核查
public static final String PATH_MODULE_COMMON_ACTIVITY_INCIDENT_CHECK_DETAIL = "/modulecommon/activity" +
"/incidentCheckDetail";//事件核查详情
public static final String PATH_MODULE_COMMON_ACTIVITY_INCIDENT_DEFER_EXAMINE = "/modulecommon/activity/incidentDeferExamine";//延期审核
public static final String PATH_MODULE_COMMON_ACTIVITY_INCIDENT_DEFER_EXAMINE_DETAIL = "/modulecommon/activity/incidentDeferExamineDetail";//延期审核
public static final String PATH_MODULE_COMMON_ACTIVITY_INCIDENT_DEFER_EXAMINE = "/modulecommon/activity" +
"/incidentDeferExamine";//延期审核
public static final String PATH_MODULE_COMMON_ACTIVITY_INCIDENT_DEFER_EXAMINE_DETAIL = "/modulecommon/activity" +
"/incidentDeferExamineDetail";//延期审核
public static final String PATH_MODULE_COMMON_ACTIVITY_INCIDENT_DEPT_SPECIAL = "/modulecommon/activity/incidentDeptSpecial";//部门端特殊事件 预警和超时
public static final String PATH_MODULE_COMMON_FRAGMENT_INCIDENT_DEPT_TIME_OUT = "/modulecommon/fragment/incidentDeptTimeOut";//部门端超时事件
public static final String PATH_MODULE_COMMON_FRAGMENT_INCIDENT_DEPT_EARLY_WARN = "/modulecommon/fragment/incidentDeptEarlyWarn";//部门端预警事件
public static final String PATH_MODULE_COMMON_ACTIVITY_INCIDENT_DEPT_SPECIAL = "/modulecommon/activity" +
"/incidentDeptSpecial";//部门端特殊事件 预警和超时
public static final String PATH_MODULE_COMMON_FRAGMENT_INCIDENT_DEPT_TIME_OUT = "/modulecommon/fragment" +
"/incidentDeptTimeOut";//部门端超时事件
public static final String PATH_MODULE_COMMON_FRAGMENT_INCIDENT_DEPT_EARLY_WARN = "/modulecommon/fragment" +
"/incidentDeptEarlyWarn";//部门端预警事件
public static final String PATH_MODULE_COMMON_ACTIVITY_INCIDENT_CENTER_SPECIAL = "/modulecommon/activity/incidentCenterSpecial";//中心端特殊事件 预警和超时
public static final String PATH_MODULE_COMMON_FRAGMENT_INCIDENT_CENTER_TIME_OUT = "/modulecommon/fragment/incidentCenterTimeOut";//中心端超时事件
public static final String PATH_MODULE_COMMON_FRAGMENT_INCIDENT_DEFER = "/modulecommon/fragment/incidentDefer";//事件延期列表
public static final String PATH_MODULE_COMMON_FRAGMENT_INCIDENT_CENTER_EARLY_WARN = "/modulecommon/fragment/incidentCenterEarlyWarn";//中心端预警事件
public static final String PATH_MODULE_COMMON_ACTIVITY_INCIDENT_CENTER_CHECK = "/modulecommon/activity/incidentCenterCheck"; //中心端结果核查
public static final String PATH_MODULE_COMMON_ACTIVITY_INCIDENT_CENTER_CHECK_DETAIL = "/modulecommon/activity/incidentCenterCheckDetail";//中心端结果核查详情
public static final String PATH_MODULE_COMMON_ACTIVITY_CHOOSE_DEPT_USER = "/modulecommon/activity/chooseDeptUser";//选择部门人员
public static final String PATH_MODULE_COMMON_ACTIVITY_INCIDENT_CENTER_SPECIAL = "/modulecommon/activity" +
"/incidentCenterSpecial";//中心端特殊事件 预警和超时
public static final String PATH_MODULE_COMMON_FRAGMENT_INCIDENT_CENTER_TIME_OUT = "/modulecommon/fragment" +
"/incidentCenterTimeOut";//中心端超时事件
public static final String PATH_MODULE_COMMON_FRAGMENT_INCIDENT_DEFER = "/modulecommon/fragment/incidentDefer";
//事件延期列表
public static final String PATH_MODULE_COMMON_FRAGMENT_INCIDENT_CENTER_EARLY_WARN = "/modulecommon/fragment" +
"/incidentCenterEarlyWarn";//中心端预警事件
public static final String PATH_MODULE_COMMON_ACTIVITY_INCIDENT_CENTER_CHECK = "/modulecommon/activity" +
"/incidentCenterCheck"; //中心端结果核查
public static final String PATH_MODULE_COMMON_ACTIVITY_INCIDENT_CENTER_CHECK_DETAIL = "/modulecommon/activity" +
"/incidentCenterCheckDetail";//中心端结果核查详情
public static final String PATH_MODULE_COMMON_ACTIVITY_CHOOSE_DEPT_USER =
"/modulecommon/activity/chooseDeptUser";//选择部门人员
public static final String PATH_MODULE_COMMON_ACTIVITY_INCIDENT_OVERSEE = "/modulecommon/activity/incidentOversee";//事件督办
public static final String PATH_MODULE_COMMON_FRAGMENT_INCIDENT_OVERSEE_MINE = "/modulecommon/fragment/incidentOverseeMine";//我发起的督办消息
public static final String PATH_MODULE_COMMON_FRAGMENT_INCIDENT_OVERSEE_BY = "/modulecommon/fragment/incidentByOversee";//我被督办的消息
public static final String PATH_MODULE_COMMON_ACTIVITY_INCIDENT_OVERSEE_DETAIL = "/modulecommon/activity/incidentOverseeDetail";//督办详情
public static final String PATH_MODULE_COMMON_ACTIVITY_INCIDENT_OVERSEE = "/modulecommon/activity/incidentOversee"
;//事件督办
public static final String PATH_MODULE_COMMON_FRAGMENT_INCIDENT_OVERSEE_MINE = "/modulecommon/fragment" +
"/incidentOverseeMine";//我发起的督办消息
public static final String PATH_MODULE_COMMON_FRAGMENT_INCIDENT_OVERSEE_BY = "/modulecommon/fragment" +
"/incidentByOversee";//我被督办的消息
public static final String PATH_MODULE_COMMON_ACTIVITY_INCIDENT_OVERSEE_DETAIL = "/modulecommon/activity" +
"/incidentOverseeDetail";//督办详情
public static final String PATH_MODULE_COMMON_ACTIVITY_GRID_STATISTICS = "/modulecommon/activity/gridStatistics";//统计分析
public static final String PATH_MODULE_COMMON_ACTIVITY_DEPT_STATISTICS = "/modulecommon/activity/deptStatistics";//统计分析
public static final String PATH_MODULE_COMMON_ACTIVITY_COMMAND_STATISTICS = "/modulecommon/activity/commandStatistics";//统计分析
public static final String PATH_MODULE_COMMON_ACTIVITY_GRID_STATISTICS = "/modulecommon/activity/gridStatistics";
//统计分析
public static final String PATH_MODULE_COMMON_ACTIVITY_GRID_STATISTICS_INCIDENT = "/modulecommon/activity" +
"/gridStatisticsIncident";//事件排名统计
public static final String PATH_MODULE_COMMON_ACTIVITY_DEPT_STATISTICS = "/modulecommon/activity/deptStatistics";
//统计分析
public static final String PATH_MODULE_COMMON_ACTIVITY_COMMAND_STATISTICS = "/modulecommon/activity" +
"/commandStatistics";//统计分析
public static final String PATH_MODULE_COMMON_ACTIVITY_KNOWLEDGE_LIBRARY_LIST = "/modulecommon/activity/knowledgeList";//知识库列表
public static final String PATH_MODULE_COMMON_ACTIVITY_KNOWLEDGE_LIBRARY_DETAIL = "/modulecommon/activity/knowledgeDetail";//知识详情
public static final String PATH_MODULE_COMMON_ACTIVITY_KNOWLEDGE_LIBRARY_LIST = "/modulecommon/activity" +
"/knowledgeList";//知识库列表
public static final String PATH_MODULE_COMMON_ACTIVITY_KNOWLEDGE_LIBRARY_DETAIL = "/modulecommon/activity" +
"/knowledgeDetail";//知识详情
public static final String PATH_MODULE_COMMON_ACTIVITY_MINE_COLLECT = "/modulecommon/activity/mineCollect";//我的收藏
public static final String PATH_MODULE_COMMON_FRAGMENT_MINE_COLLECT_INCIDENT = "/modulecommon/fragment/mineCollectIncident";//我的收藏事件列表
public static final String PATH_MODULE_COMMON_ACTIVITY_INCIDENT_ARCHIVE_LIST = "/modulecommon/activity/archiveIncident";//已归档案件
public static final String PATH_MODULE_COMMON_ACTIVITY_INCIDENT_RETURN_RECORD = "/modulecommon/activity/returnRecordIncident";//事件回访记录
public static final String PATH_MODULE_COMMON_ACTIVITY_INCIDENT_RETURN_RECORD_ADD = "/modulecommon/activity/returnRecordIncidentAdd";//添加回访记录
public static final String PATH_MODULE_COMMON_FRAGMENT_MINE_COLLECT_INCIDENT = "/modulecommon/fragment" +
"/mineCollectIncident";//我的收藏事件列表
public static final String PATH_MODULE_COMMON_ACTIVITY_INCIDENT_ARCHIVE_LIST = "/modulecommon/activity" +
"/archiveIncident";//已归档案件
public static final String PATH_MODULE_COMMON_ACTIVITY_INCIDENT_RETURN_RECORD = "/modulecommon/activity" +
"/returnRecordIncident";//事件回访记录
public static final String PATH_MODULE_COMMON_ACTIVITY_INCIDENT_RETURN_RECORD_ADD = "/modulecommon/activity" +
"/returnRecordIncidentAdd";//添加回访记录
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_KNOW_LEDGE_LIST_BY_DEPT = "/modulecommon/fragment/knowLedgeListByDept";//部门黄页
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_KNOW_LEDGE_LIST_BY_DEPT = "/modulecommon/fragment" +
"/knowLedgeListByDept";//部门黄页
public static final String PATH_MODULE_COMMON_FRAGMENT_KNOW_LEDGE_CENTER = "/modulecommon/fragment/knowLedgeCenter";//中心端知识索要
public static final String PATH_MODULE_COMMON_FRAGMENT_KNOW_LEDGE_DEPT = "/modulecommon/fragment/knowLedgeDept";//部门端知识库
public static final String PATH_MODULE_COMMON_FRAGMENT_KNOW_LEDGE_CENTER = "/modulecommon/fragment" +
"/knowLedgeCenter";//中心端知识索要
public static final String PATH_MODULE_COMMON_FRAGMENT_KNOW_LEDGE_DEPT = "/modulecommon/fragment/knowLedgeDept";
//部门端知识库
public static final String PATH_MODULE_COMMON_FRAGMENT_SMART_CONSULT = "/modulecommon/fragment/smartConsult";//智能咨询
public static final String PATH_MODULE_COMMON_ACTIVITY_KNOWLEDGE_LIBRARY_ASK_ADD = "/modulecommon/activity/knowLedgeAskAdd";//知识索要发起
public static final String PATH_MODULE_COMMON_ACTIVITY_KNOWLEDGE_LIBRARY_ASK_EDIT = "/modulecommon/activity/knowLedgeAskEdit";//知识索要编辑
public static final String PATH_MODULE_COMMON_ACTIVITY_KNOWLEDGE_LIBRARY_ASK_DETAIL = "/modulecommon/activity/knowLedgeAskDetail";//知识索要详情
public static final String PATH_MODULE_COMMON_ACTIVITY_KNOWLEDGE_LIBRARY_ASK_LIST = "/modulecommon/activity/knowLedgeAskList";//知识索要列表
public static final String PATH_MODULE_COMMON_ACTIVITY_KNOWLEDGE_LIBRARY_MANAGE_LIST = "/modulecommon/activity/knowLedgeManageList";//知识库上报列表
public static final String PATH_MODULE_COMMON_ACTIVITY_KNOWLEDGE_LIBRARY_MANAGE_ADD = "/modulecommon/activity/knowLedgeManageAdd";//知识库知识上报
public static final String PATH_MODULE_COMMON_ACTIVITY_KNOWLEDGE_LIBRARY_MANAGE_DETAIL = "/modulecommon/activity/knowLedgeManageDetail";//知识库知识详情
public static final String PATH_MODULE_COMMON_ACTIVITY_KNOWLEDGE_LIBRARY_ASK_ADD = "/modulecommon/activity" +
"/knowLedgeAskAdd";//知识索要发起
public static final String PATH_MODULE_COMMON_ACTIVITY_KNOWLEDGE_LIBRARY_ASK_EDIT = "/modulecommon/activity" +
"/knowLedgeAskEdit";//知识索要编辑
public static final String PATH_MODULE_COMMON_ACTIVITY_KNOWLEDGE_LIBRARY_ASK_DETAIL = "/modulecommon/activity" +
"/knowLedgeAskDetail";//知识索要详情
public static final String PATH_MODULE_COMMON_ACTIVITY_KNOWLEDGE_LIBRARY_ASK_LIST = "/modulecommon/activity" +
"/knowLedgeAskList";//知识索要列表
public static final String PATH_MODULE_COMMON_ACTIVITY_KNOWLEDGE_LIBRARY_MANAGE_LIST = "/modulecommon/activity" +
"/knowLedgeManageList";//知识库上报列表
public static final String PATH_MODULE_COMMON_ACTIVITY_KNOWLEDGE_LIBRARY_MANAGE_ADD = "/modulecommon/activity" +
"/knowLedgeManageAdd";//知识库知识上报
public static final String PATH_MODULE_COMMON_ACTIVITY_KNOWLEDGE_LIBRARY_MANAGE_DETAIL = "/modulecommon/activity" +
"/knowLedgeManageDetail";//知识库知识详情
public static final String PATH_MODULE_COMMON_ACTIVITY_TASK_CONVER_CASE = "/modulecommon/activity/taskConverCase";//任务转事件
public static final String PATH_MODULE_COMMON_ACTIVITY_TASK_CONVER_CASE_DETAIL = "/modulecommon/activity/taskConverCaseDetail";//任务转事件详情
public static final String PATH_MODULE_COMMON_ACTIVITY_TASK_CONVER_CASE =
"/modulecommon/activity/taskConverCase";//任务转事件
public static final String PATH_MODULE_COMMON_ACTIVITY_TASK_CONVER_CASE_DETAIL = "/modulecommon/activity" +
"/taskConverCaseDetail";//任务转事件详情
public static final String PATH_MODULE_COMMON_ACTIVITY_FORGET_PWD = "/modulecommon/activity/forgetPassword";//忘记密码
/*======================网格员==================================================*/
//新版人口房屋
public static final String PATH_MODULE_GRID_ACTIVITY_HOUSE_PERSON = "/modulegrid/activity/housePersonList";
public static final String PATH_MODULE_GRID_ACTIVITY_HOUSE_PERSON_NEW = "/modulegrid/activity/housePersonListNew";
//社区
public static final String PATH_MODULE_GRID_ACTIVITY_COMMUNITY_AREA_LIST = "/modulegrid/activity/communityAreaList";//社区管理
public static final String PATH_MODULE_GRID_ACTIVITY_COMMUNITY_AREA_ADD = "/modulegrid/activity/communityAreaAdd";//社区信息天机
public static final String PATH_MODULE_GRID_ACTIVITY_COMMUNITY_AREA_DETAIL = "/modulegrid/activity/communityAreaDetail";//社区信息详情
public static final String PATH_MODULE_GRID_ACTIVITY_COMMUNITY_AREA_EDIT = "/modulegrid/activity/communityAreaEdit";//社区信息编辑
public static final String PATH_MODULE_GRID_ACTIVITY_COMMUNITY_AREA_LIST = "/modulegrid/activity" +
"/communityAreaList";//社区管理
public static final String PATH_MODULE_GRID_ACTIVITY_COMMUNITY_AREA_ADD =
"/modulegrid/activity/communityAreaAdd";//社区信息天机
public static final String PATH_MODULE_GRID_ACTIVITY_COMMUNITY_AREA_DETAIL = "/modulegrid/activity" +
"/communityAreaDetail";//社区信息详情
public static final String PATH_MODULE_GRID_ACTIVITY_COMMUNITY_AREA_EDIT = "/modulegrid/activity" +
"/communityAreaEdit";//社区信息编辑
//社区简介
public static final String PATH_MODULE_GRID_ACTIVITY_COMMUNITY_AREA_DESC_ADD = "/modulegrid/activity/communityAreaDescAdd";//添加社区简介
public static final String PATH_MODULE_GRID_ACTIVITY_COMMUNITY_AREA_DESC_EDIT = "/modulegrid/activity/communityAreaDescEdit";//编辑社区简介
public static final String PATH_MODULE_GRID_ACTIVITY_COMMUNITY_AREA_DESC_ADD = "/modulegrid/activity" +
"/communityAreaDescAdd";//添加社区简介
public static final String PATH_MODULE_GRID_ACTIVITY_COMMUNITY_AREA_DESC_EDIT = "/modulegrid/activity" +
"/communityAreaDescEdit";//编辑社区简介
//小区
public static final String PATH_MODULE_GRID_ACTIVITY_COMMUNITY_MANAGE = "/modulegrid/activity/communityManage";//小区管理
public static final String PATH_MODULE_GRID_ACTIVITY_COMMUNITY_MANAGE = "/modulegrid/activity/communityManage";
//小区管理
public static final String PATH_MODULE_GRID_ACTIVITY_COMMUNITY_ADD = "/modulegrid/activity/communityAdd";//小区添加
public static final String PATH_MODULE_GRID_ACTIVITY_COMMUNITY_DETAIL = "/modulegrid/activity/communityDetail";//小区详情
public static final String PATH_MODULE_GRID_ACTIVITY_COMMUNITY_DETAIL = "/modulegrid/activity/communityDetail";
//小区详情
public static final String PATH_MODULE_GRID_ACTIVITY_COMMUNITY_EDIT = "/modulegrid/activity/communityEdit";//小区编辑
//小区简介
public static final String PATH_MODULE_GRID_ACTIVITY_COMMUNITY_DESC_ADD = "/modulegrid/activity/communityDescAdd";//添加小区简介
public static final String PATH_MODULE_GRID_ACTIVITY_COMMUNITY_DESC_EDIT = "/modulegrid/activity/communityDescEdit";//编辑小区简介
public static final String PATH_MODULE_GRID_ACTIVITY_COMMUNITY_DESC_ADD =
"/modulegrid/activity/communityDescAdd";//添加小区简介
public static final String PATH_MODULE_GRID_ACTIVITY_COMMUNITY_DESC_EDIT = "/modulegrid/activity" +
"/communityDescEdit";//编辑小区简介
//楼宇
public static final String PATH_MODULE_GRID_ACTIVITY_BUILDING_ADD = "/modulegrid/activity/buildingAdd";//楼宇添加
@ -309,79 +399,123 @@ public class PathConfig {
public static final String PATH_MODULE_GRID_ACTIVITY_BUILDING_EDIT = "/modulegrid/activity/buildingEdit";//楼宇编辑
//楼栋长
public static final String PATH_MODULE_GRID_ACTIVITY_BUILDING_MANAGER_ADD = "/modulegrid/activity/buildingManagerAdd";//楼栋长添加
public static final String PATH_MODULE_GRID_ACTIVITY_BUILDING_MANAGER_DETAIL = "/modulegrid/activity/buildingManagerDetail";//楼栋长详情
public static final String PATH_MODULE_GRID_ACTIVITY_BUILDING_MANAGER_EDIT = "/modulegrid/activity/buildingManagerEdit";//楼栋长编辑
public static final String PATH_MODULE_GRID_ACTIVITY_BUILDING_MANAGER_ADD = "/modulegrid/activity" +
"/buildingManagerAdd";//楼栋长添加
public static final String PATH_MODULE_GRID_ACTIVITY_BUILDING_MANAGER_DETAIL = "/modulegrid/activity" +
"/buildingManagerDetail";//楼栋长详情
public static final String PATH_MODULE_GRID_ACTIVITY_BUILDING_MANAGER_EDIT = "/modulegrid/activity" +
"/buildingManagerEdit";//楼栋长编辑
//房屋
public static final String PATH_MODULE_GRID_ACTIVITY_HOUSE_LIST = "/modulegrid/activity/houseList";//房屋列表
public static final String PATH_MODULE_GRID_ACTIVITY_HOUSE_EDIT = "/modulegrid/activity/houseEdit";//房屋编辑
public static final String PATH_MODULE_GRID_ACTIVITY_HOUSE_DETAIL = "/modulegrid/activity/houseDetail";//房屋详情
public static final String PATH_MODULE_GRID_ACTIVITY_HOUSE_BIND_PERSON = "/modulegrid/activity/houseBindPerson";//绑定人员
public static final String PATH_MODULE_GRID_ACTIVITY_HOUSE_BIND_PERSON = "/modulegrid/activity/houseBindPerson";
//绑定人员
public static final String PATH_MODULE_GRID_ACTIVITY_HIRER_EDIT = "/modulegrid/activity/housePersonEdit";//绑定人员编辑
public static final String PATH_MODULE_GRID_ACTIVITY_HIRER_DETAIL = "/modulegrid/activity/hirerDetail";// 绑定人员详情
public static final String PATH_MODULE_GRID_ACTIVITY_MEMBER_ADD = "/modulegrid/activity/familyMemberAdd";//添加家庭成员
public static final String PATH_MODULE_GRID_ACTIVITY_MEMBER_DETAIL = "/modulegrid/activity/familyMemberDetail";//家庭成员详情
public static final String PATH_MODULE_GRID_ACTIVITY_MEMBER_DETAIL = "/modulegrid/activity/familyMemberDetail";
//家庭成员详情
public static final String PATH_MODULE_GRID_ACTIVITY_MEMBER_EDIT = "/modulegrid/activity/familyMemberEdit";//家庭成员编辑
public static final String PATH_MODULE_GRID_ACTIVITY_SEARCH_HOUSE_BY_PERSON = "/modulegrid/activity/searchHouseByPerson";//以人找房
public static final String PATH_MODULE_GRID_ACTIVITY_SEARCH_HOUSE_BY_PERSON = "/modulegrid/activity" +
"/searchHouseByPerson";//以人找房
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_MAIN = "/modulegrid/activity/censusMain";//人口系统主页
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_BASE_LIST = "/modulegrid/activity/censusBaseList";//人口基础信息列表-户籍
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_RESID_LIST = "/modulegrid/activity/censusResidList";//人口基础信息列表-常住
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_EXIRT_LIST = "/modulegrid/activity/censusExirtList";//人口基础信息列表-外来
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_BASE_ADD = "/modulegrid/activity/censusBaseAdd";//人口基础信息录入
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_BASE_DETAIL = "/modulegrid/activity/censusBaseDetail";//人口基础信息详情
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_BASE_EDIT = "/modulegrid/activity/censusBaseEdit";//人口基础信息编辑
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_BASE_LIST = "/modulegrid/activity/censusBaseList";
//人口基础信息列表-户籍
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_RESID_LIST =
"/modulegrid/activity/censusResidList";//人口基础信息列表-常住
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_EXIRT_LIST =
"/modulegrid/activity/censusExirtList";//人口基础信息列表-外来
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_BASE_ADD = "/modulegrid/activity/censusBaseAdd";
//人口基础信息录入
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_BASE_DETAIL = "/modulegrid/activity" +
"/censusBaseDetail";//人口基础信息详情
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_BASE_EDIT = "/modulegrid/activity/censusBaseEdit";
//人口基础信息编辑
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_REAR_LIST = "/modulegrid/activity/censusRearList";//留守人员列表
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_REAR_DETAIL = "/modulegrid/activity/censusRearDetail";//留守人员详情
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_REAR_ADD = "/modulegrid/activity/censusRearAdd";//留守人员添加与编辑
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_REAR_LIST = "/modulegrid/activity/censusRearList";
//留守人员列表
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_REAR_DETAIL = "/modulegrid/activity" +
"/censusRearDetail";//留守人员详情
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_REAR_ADD = "/modulegrid/activity/censusRearAdd";
//留守人员添加与编辑
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_MIGRANT_LIST = "/modulegrid/activity/censusMigrantList";//流动人员列表
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_MIGRANT_DETAIL = "/modulegrid/activity/censusMigrantDetail";//流动人员详情
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_MIGRANT_ADD = "/modulegrid/activity/censusMigrantAdd";//流动人员添加
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_REGISTER_LIST = "/modulegrid/activity/censusRegisterList";//户籍人口列表
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_REGISTER_ADD = "/modulegrid/activity/censusRegisterAdd";//户籍人口添加
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_REGISTER_DETAIL = "/modulegrid/activity/censusRegisterDetail";//户籍人口详情
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_MIGRANT_LIST = "/modulegrid/activity" +
"/censusMigrantList";//流动人员列表
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_MIGRANT_DETAIL = "/modulegrid/activity" +
"/censusMigrantDetail";//流动人员详情
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_MIGRANT_ADD = "/modulegrid/activity" +
"/censusMigrantAdd";//流动人员添加
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_REGISTER_LIST = "/modulegrid/activity" +
"/censusRegisterList";//户籍人口列表
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_REGISTER_ADD = "/modulegrid/activity" +
"/censusRegisterAdd";//户籍人口添加
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_REGISTER_DETAIL = "/modulegrid/activity" +
"/censusRegisterDetail";//户籍人口详情
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_OUT_BOUND_LIST = "/modulegrid/activity/censusOutboundList";//境外人员
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_OUT_BOUND_ADD = "/modulegrid/activity/censusOutboundAdd";//境外人员
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_OUT_BOUND_DETAIL = "/modulegrid/activity/censusOutboundDetail";//境外人员
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_OUT_BOUND_LIST = "/modulegrid/activity" +
"/censusOutboundList";//境外人员
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_OUT_BOUND_ADD = "/modulegrid/activity" +
"/censusOutboundAdd";//境外人员
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_OUT_BOUND_DETAIL = "/modulegrid/activity" +
"/censusOutboundDetail";//境外人员
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_AIDS_LIST = "/modulegrid/activity/censusAidsList";//艾滋病
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_AIDS_LIST = "/modulegrid/activity/censusAidsList";
//艾滋病
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_AIDS_ADD = "/modulegrid/activity/censusAidsAdd";//艾滋病
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_AIDS_DETAIL = "/modulegrid/activity/censusAidsDetail";//艾滋病
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_AIDS_DETAIL = "/modulegrid/activity" +
"/censusAidsDetail";//艾滋病
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_CORRECT_LIST = "/modulegrid/activity/censusCorrectList";//特殊人群-社区矫正人员
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_CORRECT_ADD = "/modulegrid/activity/censusCorrectAdd";//特殊人群-社区矫正人员
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_CORRECT_DETAIL = "/modulegrid/activity/censusCorrectDetail";//特殊人群-社区矫正人员
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_CORRECT_LIST = "/modulegrid/activity" +
"/censusCorrectList";//特殊人群-社区矫正人员
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_CORRECT_ADD = "/modulegrid/activity" +
"/censusCorrectAdd";//特殊人群-社区矫正人员
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_CORRECT_DETAIL = "/modulegrid/activity" +
"/censusCorrectDetail";//特殊人群-社区矫正人员
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_DRUG_LIST = "/modulegrid/activity/censusDrugList";//吸毒人员
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_DRUG_LIST = "/modulegrid/activity/censusDrugList";
//吸毒人员
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_DRUG_ADD = "/modulegrid/activity/censusDrugAdd";//吸毒人员
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_DRUG_DETAIL = "/modulegrid/activity/censusDrugDetail";//吸毒人员
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_DRUG_DETAIL = "/modulegrid/activity" +
"/censusDrugDetail";//吸毒人员
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_CRIMINAL_LIST = "/modulegrid/activity/censusCriminalList";//罪犯人员
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_CRIMINAL_ADD = "/modulegrid/activity/censusCriminalAdd";//罪犯人员
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_CRIMINAL_DETAIl = "/modulegrid/activity/censusCriminalDetail";//罪犯人员
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_CRIMINAL_LIST = "/modulegrid/activity" +
"/censusCriminalList";//罪犯人员
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_CRIMINAL_ADD = "/modulegrid/activity" +
"/censusCriminalAdd";//罪犯人员
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_CRIMINAL_DETAIl = "/modulegrid/activity" +
"/censusCriminalDetail";//罪犯人员
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_TROUBLE_LIST = "/modulegrid/activity/censusTroubleList";//肇事肇祸列表
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_TROUBLE_ADD = "/modulegrid/activity/censusTroubleAdd";//肇事肇祸列表
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_TROUBLE_DETAIL = "/modulegrid/activity/censusTroubleDetail";//肇事肇祸列表
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_TROUBLE_LIST = "/modulegrid/activity" +
"/censusTroubleList";//肇事肇祸列表
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_TROUBLE_ADD = "/modulegrid/activity" +
"/censusTroubleAdd";//肇事肇祸列表
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_TROUBLE_DETAIL = "/modulegrid/activity" +
"/censusTroubleDetail";//肇事肇祸列表
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_YOUNG_LIST = "/modulegrid/activity/censusYoungList";//重点青少年列表
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_YOUNG_ADD = "/modulegrid/activity/censusYoungAdd";//重点青少年列表添加
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_YOUNG_DETAIL = "/modulegrid/activity/censusYoungDetail";//重点青少年列表详情
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_YOUNG_CASE_LIST = "/modulegrid/activity/youngCaseList";//重点青少年事件列表
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_YOUNG_CASE_ADD = "/modulegrid/activity/youngCaseAdd";//重点青少年事件添加
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_YOUNG_CASE_EDIT = "/modulegrid/activity/youngCaseEdit";//重点青少年事件编辑
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_YOUNG_CASE_DETAIL = "/modulegrid/activity/youngCaseDetail";//重点青少年事件详情
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_YOUNG_LIST =
"/modulegrid/activity/censusYoungList";//重点青少年列表
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_YOUNG_ADD = "/modulegrid/activity/censusYoungAdd";
//重点青少年列表添加
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_YOUNG_DETAIL = "/modulegrid/activity" +
"/censusYoungDetail";//重点青少年列表详情
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_YOUNG_CASE_LIST = "/modulegrid/activity" +
"/youngCaseList";//重点青少年事件列表
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_YOUNG_CASE_ADD = "/modulegrid/activity/youngCaseAdd"
;//重点青少年事件添加
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_YOUNG_CASE_EDIT = "/modulegrid/activity" +
"/youngCaseEdit";//重点青少年事件编辑
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_YOUNG_CASE_DETAIL = "/modulegrid/activity" +
"/youngCaseDetail";//重点青少年事件详情
public static final String PATH_MODULE_GRID_ACTIVITY_TASK_MANAGE = "/modulegrid/activity/taskManage";//任务管理
@ -389,30 +523,41 @@ public class PathConfig {
public static final String PATH_MODULE_GRID_ACTIVITY_TASK_DETAIL = "/modulegrid/activity/taskDetail";//任务详情
public static final String PATH_MODULE_GRID_ACTIVITY_TASK_REPORT = "/modulegrid/activity/taskReport";//任务详情
public static final String PATH_MODULE_GRID_ACTIVITY_INSPECTION_PATROL = "/modulegrid/activity/inspectionPatrol";//巡查巡检
public static final String PATH_MODULE_GRID_ACTIVITY_INSPECTION_PATROL = "/modulegrid/activity/inspectionPatrol";
//巡查巡检
public static final String PATH_MODULE_GRID_ACTIVITY_TASK_BUSINESS_LIST = "/modulegrid/activity/taskBusinessList";//任务业务列表
public static final String PATH_MODULE_GRID_ACTIVITY_TASK_BUSINESS_LIST =
"/modulegrid/activity/taskBusinessList";//任务业务列表
public static final String PATH_MODULE_GRID_ACTIVITY_TASK_REPORT_EDIT = "/modulegrid/activity/taskReportEdit";//任务上报记录详情
public static final String PATH_MODULE_GRID_ACTIVITY_TASK_REPORT_DETAIL = "/modulegrid/activity/taskReportDetail";//任务上报记录详情
public static final String PATH_MODULE_GRID_ACTIVITY_TASK_REPORT_EDIT = "/modulegrid/activity/taskReportEdit";
//任务上报记录详情
public static final String PATH_MODULE_GRID_ACTIVITY_TASK_REPORT_DETAIL =
"/modulegrid/activity/taskReportDetail";//任务上报记录详情
public static final String PATH_MODULE_GRID_ACTIVITY_NON_PUBLIC_ORG_LIST = "/modulegrid/activity/nonPublicOrgList";//非公有经济组织
public static final String PATH_MODULE_GRID_ACTIVITY_NON_PUBLIC_ORG_ADD = "/modulegrid/activity/nonPublicOrgAdd";//非公有经济组织信息采集
public static final String PATH_MODULE_GRID_ACTIVITY_NON_PUBLIC_ORG_EDIT = "/modulegrid/activity/nonPublicOrgEdit";//非公有经济组织信息编辑
public static final String PATH_MODULE_GRID_ACTIVITY_NON_PUBLIC_ORG_DETAIL = "/modulegrid/activity/nonPublicOrgDetail";//非公有经济组织详情
public static final String PATH_MODULE_GRID_ACTIVITY_NON_PUBLIC_ORG_LIST = "/modulegrid/activity/nonPublicOrgList"
;//非公有经济组织
public static final String PATH_MODULE_GRID_ACTIVITY_NON_PUBLIC_ORG_ADD = "/modulegrid/activity/nonPublicOrgAdd";
//非公有经济组织信息采集
public static final String PATH_MODULE_GRID_ACTIVITY_NON_PUBLIC_ORG_EDIT = "/modulegrid/activity/nonPublicOrgEdit"
;//非公有经济组织信息编辑
public static final String PATH_MODULE_GRID_ACTIVITY_NON_PUBLIC_ORG_DETAIL = "/modulegrid/activity" +
"/nonPublicOrgDetail";//非公有经济组织详情
public static final String PATH_MODULE_GRID_ACTIVITY_SOCIAL_ORG_LIST = "/modulegrid/activity/socialOrgList";//社会团体信息
public static final String PATH_MODULE_GRID_ACTIVITY_SOCIAL_ORG_ADD = "/modulegrid/activity/socialOrgAdd";//社会团体信息添加
public static final String PATH_MODULE_GRID_ACTIVITY_SOCIAL_ORG_EDIT = "/modulegrid/activity/socialOrgEdit";//社会团体信息编辑
public static final String PATH_MODULE_GRID_ACTIVITY_SOCIAL_ORG_DETAIL = "/modulegrid/activity/socialOrgDetail";//社会团体详情
public static final String PATH_MODULE_GRID_ACTIVITY_SOCIAL_ORG_EDIT = "/modulegrid/activity/socialOrgEdit";
//社会团体信息编辑
public static final String PATH_MODULE_GRID_ACTIVITY_SOCIAL_ORG_DETAIL = "/modulegrid/activity/socialOrgDetail";
//社会团体详情
public static final String PATH_MODULE_GRID_ACTIVITY_KEY_AREA_LIST = "/modulegrid/activity/keyAreasList";//重点区域
public static final String PATH_MODULE_GRID_ACTIVITY_KEY_AREA_ADD = "/modulegrid/activity/keyAreasAdd";//重点区域信息采集
public static final String PATH_MODULE_GRID_ACTIVITY_KEY_AREA_EDIT = "/modulegrid/activity/keyAreasEdit";//重点区域信息编辑
public static final String PATH_MODULE_GRID_ACTIVITY_KEY_AREA_DETAIL = "/modulegrid/activity/keyAreasDetail";//重点区域详情
public static final String PATH_MODULE_GRID_ACTIVITY_KEY_AREA_DETAIL = "/modulegrid/activity/keyAreasDetail";
//重点区域详情
public static final String PATH_MODULE_GRID_ACTIVITY_PENAL_LIST = "/modulegrid/activity/penalList";//命案防控
@ -420,94 +565,142 @@ public class PathConfig {
public static final String PATH_MODULE_GRID_ACTIVITY_PENAL_ADD = "/modulegrid/activity/penalAdd";//命案防控添加
public static final String PATH_MODULE_GRID_ACTIVITY_PENAL_DETAIL = "/modulegrid/activity/penalDetail";//命案防控详情
public static final String PATH_MODULE_GRID_ACTIVITY_PENAL_SUSPICION_LIST = "/modulegrid/activity/penalSuspicionList";//命案嫌疑人
public static final String PATH_MODULE_GRID_ACTIVITY_PENAL_SUSPICION_ADD = "/modulegrid/activity/penalSuspicionAdd";//命案嫌疑人
public static final String PATH_MODULE_GRID_ACTIVITY_PENAL_SUSPICION_EDIT = "/modulegrid/activity/penalSuspicionEdit";//命案嫌疑人
public static final String PATH_MODULE_GRID_ACTIVITY_PENAL_SUSPICION_DETAIL = "/modulegrid/activity/penalSuspicionDetail";//命案嫌疑人
public static final String PATH_MODULE_GRID_ACTIVITY_PENAL_SUSPICION_LIST = "/modulegrid/activity" +
"/penalSuspicionList";//命案嫌疑人
public static final String PATH_MODULE_GRID_ACTIVITY_PENAL_SUSPICION_ADD = "/modulegrid/activity" +
"/penalSuspicionAdd";//命案嫌疑人
public static final String PATH_MODULE_GRID_ACTIVITY_PENAL_SUSPICION_EDIT = "/modulegrid/activity" +
"/penalSuspicionEdit";//命案嫌疑人
public static final String PATH_MODULE_GRID_ACTIVITY_PENAL_SUSPICION_DETAIL = "/modulegrid/activity" +
"/penalSuspicionDetail";//命案嫌疑人
public static final String PATH_MODULE_GRID_ACTIVITY_PENAL_CASE_SEL = "/modulegrid/activity/penalCaseSel";//案件选择
public static final String PATH_MODULE_GRID_ACTIVITY_PENAL_VICTIM_LIST = "/modulegrid/activity/penalVictimList";//命案受害人
public static final String PATH_MODULE_GRID_ACTIVITY_PENAL_VICTIM_ADD = "/modulegrid/activity/penalVictimAdd";//命案受害人
public static final String PATH_MODULE_GRID_ACTIVITY_PENAL_VICTIM_DETAIL = "/modulegrid/activity/penalVictimDetail";//命案受害人
public static final String PATH_MODULE_GRID_ACTIVITY_PENAL_VICTIM_EDIT = "/modulegrid/activity/penalVictimEdit";//命案受害人
public static final String PATH_MODULE_GRID_ACTIVITY_PENAL_VICTIM_LIST = "/modulegrid/activity/penalVictimList";
//命案受害人
public static final String PATH_MODULE_GRID_ACTIVITY_PENAL_VICTIM_ADD = "/modulegrid/activity/penalVictimAdd";
//命案受害人
public static final String PATH_MODULE_GRID_ACTIVITY_PENAL_VICTIM_DETAIL = "/modulegrid/activity" +
"/penalVictimDetail";//命案受害人
public static final String PATH_MODULE_GRID_ACTIVITY_PENAL_VICTIM_EDIT = "/modulegrid/activity/penalVictimEdit";
//命案受害人
public static final String PATH_MODULE_GRID_ACTIVITY_EXPRESS_POI_LIST = "/modulegrid/activity/expressPoiList";//快递点列表
public static final String PATH_MODULE_GRID_ACTIVITY_EXPRESS_POI_LIST = "/modulegrid/activity/expressPoiList";
//快递点列表
public static final String PATH_MODULE_GRID_ACTIVITY_EXPRESS_POI_ADD = "/modulegrid/activity/expressPoiAdd";//快递点添加
public static final String PATH_MODULE_GRID_ACTIVITY_EXPRESS_POI_EDIT = "/modulegrid/activity/expressPoiEdit";//快递点编辑
public static final String PATH_MODULE_GRID_ACTIVITY_EXPRESS_POI_DETAIL = "/modulegrid/activity/expressPoiDetail";//快递点详情
public static final String PATH_MODULE_GRID_ACTIVITY_EXPRESS_POI_EDIT = "/modulegrid/activity/expressPoiEdit";
//快递点编辑
public static final String PATH_MODULE_GRID_ACTIVITY_EXPRESS_POI_DETAIL =
"/modulegrid/activity/expressPoiDetail";//快递点详情
public static final String PATH_MODULE_GRID_ACTIVITY_SCHOOL_MANAGE_LIST = "/modulegrid/activity/schoolManageList";//学校管理
public static final String PATH_MODULE_GRID_ACTIVITY_SCHOOL_MANAGE_ADD = "/modulegrid/activity/schoolManageAdd";//学校管理添加
public static final String PATH_MODULE_GRID_ACTIVITY_SCHOOL_MANAGE_DETAIL = "/modulegrid/activity/schoolManageDetail";//学校管理详情
public static final String PATH_MODULE_GRID_ACTIVITY_SCHOOL_MANAGE_LIST =
"/modulegrid/activity/schoolManageList";//学校管理
public static final String PATH_MODULE_GRID_ACTIVITY_SCHOOL_MANAGE_ADD = "/modulegrid/activity/schoolManageAdd";
//学校管理添加
public static final String PATH_MODULE_GRID_ACTIVITY_SCHOOL_MANAGE_DETAIL = "/modulegrid/activity" +
"/schoolManageDetail";//学校管理详情
public static final String PATH_MODULE_GRID_ACTIVITY_SCHOOL_EMPHASES_PERSON_LIST = "/modulegrid/activity/schoolEmphasesPersonList";//学校周边重点人员列表
public static final String PATH_MODULE_GRID_ACTIVITY_SCHOOL_EMPHASES_PERSON_ADD = "/modulegrid/activity/schoolEmphasesPersonAdd";//学校周边重点人员列表
public static final String PATH_MODULE_GRID_ACTIVITY_SCHOOL_EMPHASES_PERSON_DETAIL = "/modulegrid/activity/schoolEmphasesPersonDetail";//学校周边重点人员列表
public static final String PATH_MODULE_GRID_ACTIVITY_SCHOOL_EMPHASES_PERSON_LIST = "/modulegrid/activity" +
"/schoolEmphasesPersonList";//学校周边重点人员列表
public static final String PATH_MODULE_GRID_ACTIVITY_SCHOOL_EMPHASES_PERSON_ADD = "/modulegrid/activity" +
"/schoolEmphasesPersonAdd";//学校周边重点人员列表
public static final String PATH_MODULE_GRID_ACTIVITY_SCHOOL_EMPHASES_PERSON_DETAIL = "/modulegrid/activity" +
"/schoolEmphasesPersonDetail";//学校周边重点人员列表
public static final String PATH_MODULE_GRID_ACTIVITY_SCHOOL_CASE_LIST = "/modulegrid/activity/schoolCaseList";//学校案件列表
public static final String PATH_MODULE_GRID_ACTIVITY_SCHOOL_CASE_LIST = "/modulegrid/activity/schoolCaseList";
//学校案件列表
public static final String PATH_MODULE_GRID_ACTIVITY_SCHOOL_CASE_ADD = "/modulegrid/activity/schoolCaseAdd";//学校案件添加
public static final String PATH_MODULE_GRID_ACTIVITY_SCHOOL_CASE_DETAIL = "/modulegrid/activity/schoolCaseDetail";//学校案件详情
public static final String PATH_MODULE_GRID_ACTIVITY_SCHOOL_CASE_DETAIL =
"/modulegrid/activity/schoolCaseDetail";//学校案件详情
public static final String PATH_MODULE_GRID_ACTIVITY_DIC_SEL = "/modulegrid/activity/dicSel";//字典多选单选
//巡查巡检
public static final String PATH_MODULE_GRID_ACTIVITY_PATROL_KEY_AREA_LIST = "/modulegrid/activity/patrolKeyAreaList";//重点区域巡查列表
public static final String PATH_MODULE_GRID_ACTIVITY_PATROL_KEY_AREA_ADD = "/modulegrid/activity/patrolKeyAreaAdd";//重点区域巡查上报
public static final String PATH_MODULE_GRID_ACTIVITY_PATROL_KEY_AREA_DETAIL = "/modulegrid/activity/patrolKeyAreaDetail";//重点区域巡查详情
public static final String PATH_MODULE_GRID_ACTIVITY_PATROL_KEY_AREA_EDIT = "/modulegrid/activity/patrolKeyAreaEdit";//重点区域巡查编辑
public static final String PATH_MODULE_GRID_ACTIVITY_PATROL_KEY_AREA_LIST = "/modulegrid/activity" +
"/patrolKeyAreaList";//重点区域巡查列表
public static final String PATH_MODULE_GRID_ACTIVITY_PATROL_KEY_AREA_ADD = "/modulegrid/activity/patrolKeyAreaAdd"
;//重点区域巡查上报
public static final String PATH_MODULE_GRID_ACTIVITY_PATROL_KEY_AREA_DETAIL = "/modulegrid/activity" +
"/patrolKeyAreaDetail";//重点区域巡查详情
public static final String PATH_MODULE_GRID_ACTIVITY_PATROL_KEY_AREA_EDIT = "/modulegrid/activity" +
"/patrolKeyAreaEdit";//重点区域巡查编辑
//重点场所
public static final String PATH_MODULE_GRID_ACTIVITY_KEY_PLACE_LIST = "/modulegrid/activity/keyPlaceList";//重点场所列表
public static final String PATH_MODULE_GRID_ACTIVITY_KEY_PLACE_ADD = "/modulegrid/activity/keyPlaceAdd";//重点场所列表
public static final String PATH_MODULE_GRID_ACTIVITY_KEY_PLACE_EDIT = "/modulegrid/activity/keyPlaceEdit";//重点场所列表
public static final String PATH_MODULE_GRID_ACTIVITY_KEY_PLACE_DETAIL = "/modulegrid/activity/keyPlaceDetail";//重点场所列表
public static final String PATH_MODULE_GRID_ACTIVITY_KEY_PLACE_DETAIL = "/modulegrid/activity/keyPlaceDetail";
//重点场所列表
//重点场所巡查
public static final String PATH_MODULE_GRID_ACTIVITY_PATROL_KEY_PLACE_LIST = "/modulegrid/activity/patrolKeyPlaceList";//重点场所巡查列表
public static final String PATH_MODULE_GRID_ACTIVITY_PATROL_KEY_PLACE_ADD = "/modulegrid/activity/patrolKeyPlaceAdd";//重点区场所查上报
public static final String PATH_MODULE_GRID_ACTIVITY_PATROL_KEY_PLACE_DETAIL = "/modulegrid/activity/patrolKeyPlaceDetail";//重点场所巡查详情
public static final String PATH_MODULE_GRID_ACTIVITY_PATROL_KEY_PLACE_EDIT = "/modulegrid/activity/patrolKeyPlaceEdit";//重点场所巡查编辑
public static final String PATH_MODULE_GRID_ACTIVITY_PATROL_KEY_PLACE_LIST = "/modulegrid/activity" +
"/patrolKeyPlaceList";//重点场所巡查列表
public static final String PATH_MODULE_GRID_ACTIVITY_PATROL_KEY_PLACE_ADD = "/modulegrid/activity" +
"/patrolKeyPlaceAdd";//重点区场所查上报
public static final String PATH_MODULE_GRID_ACTIVITY_PATROL_KEY_PLACE_DETAIL = "/modulegrid/activity" +
"/patrolKeyPlaceDetail";//重点场所巡查详情
public static final String PATH_MODULE_GRID_ACTIVITY_PATROL_KEY_PLACE_EDIT = "/modulegrid/activity" +
"/patrolKeyPlaceEdit";//重点场所巡查编辑
//命案巡查
public static final String PATH_MODULE_GRID_ACTIVITY_PATROL_PENAL_LIST = "/modulegrid/activity/patrolPenalList";//命案发生地列表
public static final String PATH_MODULE_GRID_ACTIVITY_PATROL_PENAL_ADD = "/modulegrid/activity/patrolPenalAdd";//命案发生地列表
public static final String PATH_MODULE_GRID_ACTIVITY_PATROL_PENAL_DETAIL = "/modulegrid/activity/patrolPenalDetail";//命案发生地列表
public static final String PATH_MODULE_GRID_ACTIVITY_PATROL_PENAL_EDIT = "/modulegrid/activity/patrolPenalEdit";//命案发生地列表
public static final String PATH_MODULE_GRID_ACTIVITY_PATROL_PENAL_LIST = "/modulegrid/activity/patrolPenalList";
//命案发生地列表
public static final String PATH_MODULE_GRID_ACTIVITY_PATROL_PENAL_ADD = "/modulegrid/activity/patrolPenalAdd";
//命案发生地列表
public static final String PATH_MODULE_GRID_ACTIVITY_PATROL_PENAL_DETAIL = "/modulegrid/activity" +
"/patrolPenalDetail";//命案发生地列表
public static final String PATH_MODULE_GRID_ACTIVITY_PATROL_PENAL_EDIT = "/modulegrid/activity/patrolPenalEdit";
//命案发生地列表
//企业巡查
public static final String PATH_MODULE_GRID_ACTIVITY_PATROL_ENTERPRISE_LIST = "/modulegrid/activity/patrolEnterpriseList";//企业巡查记录列表
public static final String PATH_MODULE_GRID_ACTIVITY_PATROL_ENTERPRISE_ADD = "/modulegrid/activity/patrolEnterpriseAdd";//企业巡查记录上报
public static final String PATH_MODULE_GRID_ACTIVITY_PATROL_ENTERPRISE_DETAIL = "/modulegrid/activity/patrolEnterpriseDetail";//企业巡查记录详情
public static final String PATH_MODULE_GRID_ACTIVITY_PATROL_ENTERPRISE_EDIT = "/modulegrid/activity/patrolEnterpriseEdit";//企业巡查记录编辑
public static final String PATH_MODULE_GRID_ACTIVITY_PATROL_ENTERPRISE_LIST = "/modulegrid/activity" +
"/patrolEnterpriseList";//企业巡查记录列表
public static final String PATH_MODULE_GRID_ACTIVITY_PATROL_ENTERPRISE_ADD = "/modulegrid/activity" +
"/patrolEnterpriseAdd";//企业巡查记录上报
public static final String PATH_MODULE_GRID_ACTIVITY_PATROL_ENTERPRISE_DETAIL = "/modulegrid/activity" +
"/patrolEnterpriseDetail";//企业巡查记录详情
public static final String PATH_MODULE_GRID_ACTIVITY_PATROL_ENTERPRISE_EDIT = "/modulegrid/activity" +
"/patrolEnterpriseEdit";//企业巡查记录编辑
//合租房巡查
public static final String PATH_MODULE_GRID_ACTIVITY_PATROL_HIRE_LIST = "/modulegrid/activity/patrolHireList";//合租房巡查记录列表
public static final String PATH_MODULE_GRID_ACTIVITY_PATROL_HIRE_ADD = "/modulegrid/activity/patrolHireAdd";//合租房巡查上报
public static final String PATH_MODULE_GRID_ACTIVITY_PATROL_HIRE_DETAIL = "/modulegrid/activity/patrolHireDetail";//合租房巡查记录详情
public static final String PATH_MODULE_GRID_ACTIVITY_PATROL_HIRE_EDIT = "/modulegrid/activity/patrolHireEdit";//合租房巡查记录编辑
public static final String PATH_MODULE_GRID_ACTIVITY_PATROL_HIRE_LIST = "/modulegrid/activity/patrolHireList";
//合租房巡查记录列表
public static final String PATH_MODULE_GRID_ACTIVITY_PATROL_HIRE_ADD = "/modulegrid/activity/patrolHireAdd";
//合租房巡查上报
public static final String PATH_MODULE_GRID_ACTIVITY_PATROL_HIRE_DETAIL =
"/modulegrid/activity/patrolHireDetail";//合租房巡查记录详情
public static final String PATH_MODULE_GRID_ACTIVITY_PATROL_HIRE_EDIT = "/modulegrid/activity/patrolHireEdit";
//合租房巡查记录编辑
//邮递物流
public static final String PATH_MODULE_GRID_ACTIVITY_PATROL_EXPRESS_LIST = "/modulegrid/activity/patrolExpressList";//快递物流巡查列表
public static final String PATH_MODULE_GRID_ACTIVITY_PATROL_EXPRESS_ADD = "/modulegrid/activity/patrolExpressAdd";//快递物流巡查新增
public static final String PATH_MODULE_GRID_ACTIVITY_PATROL_EXPRESS_DETAIL = "/modulegrid/activity/patrolExpressDetail";//快递物流巡查详情
public static final String PATH_MODULE_GRID_ACTIVITY_PATROL_EXPRESS_EDIT = "/modulegrid/activity/patrolExpressEdit";//快递物流巡查编辑
public static final String PATH_MODULE_GRID_ACTIVITY_PATROL_EXPRESS_LIST = "/modulegrid/activity" +
"/patrolExpressList";//快递物流巡查列表
public static final String PATH_MODULE_GRID_ACTIVITY_PATROL_EXPRESS_ADD =
"/modulegrid/activity/patrolExpressAdd";//快递物流巡查新增
public static final String PATH_MODULE_GRID_ACTIVITY_PATROL_EXPRESS_DETAIL = "/modulegrid/activity" +
"/patrolExpressDetail";//快递物流巡查详情
public static final String PATH_MODULE_GRID_ACTIVITY_PATROL_EXPRESS_EDIT = "/modulegrid/activity" +
"/patrolExpressEdit";//快递物流巡查编辑
//部件
public static final String PATH_MODULE_GRID_ACTIVITY_COMPONENT_LIST = "/modulegrid/activity/componentList";//部件列表
public static final String PATH_MODULE_GRID_ACTIVITY_COMPONENT_ADD = "/modulegrid/activity/componentAdd";//部件采集
public static final String PATH_MODULE_GRID_ACTIVITY_COMPONENT_EDIT = "/modulegrid/activity/componentEdit";//部件信息编辑
public static final String PATH_MODULE_GRID_ACTIVITY_COMPONENT_DETAIL = "/modulegrid/activity/componentDetail";//部件信息详情
public static final String PATH_MODULE_GRID_ACTIVITY_COMPONENT_SEL_DEPT = "/modulegrid/activity/componentSelDept";//选择组织机构
public static final String PATH_MODULE_GRID_ACTIVITY_COMPONENT_DETAIL = "/modulegrid/activity/componentDetail";
//部件信息详情
public static final String PATH_MODULE_GRID_ACTIVITY_COMPONENT_SEL_DEPT =
"/modulegrid/activity/componentSelDept";//选择组织机构
//车辆管理
public static final String PATH_MODULE_GRID_ACTIVITY_CAR_MANAGE_LIST = "/modulegrid/activity/carManageList";//车辆管理列表
public static final String PATH_MODULE_GRID_ACTIVITY_CAR_MANAGE_ADD = "/modulegrid/activity/carManageAdd";//车辆信息添加
public static final String PATH_MODULE_GRID_ACTIVITY_CAR_MANAGE_EDIT = "/modulegrid/activity/carManageEdit";//车辆信息编辑
public static final String PATH_MODULE_GRID_ACTIVITY_CAR_MANAGE_DETAIL = "/modulegrid/activity/carManageDetail";//车辆信息详情
public static final String PATH_MODULE_GRID_ACTIVITY_CAR_PERSON_EDIT = "/modulegrid/activity/carPersonEdit";//车辆人员信息编辑
public static final String PATH_MODULE_GRID_ACTIVITY_CAR_MANAGE_DETAIL = "/modulegrid/activity/carManageDetail";
//车辆信息详情
public static final String PATH_MODULE_GRID_ACTIVITY_CAR_PERSON_EDIT = "/modulegrid/activity/carPersonEdit";
//车辆人员信息编辑
public static final String PATH_MODULE_GRID_ACTIVITY_WORK_LOCUS = "/modulegrid/activity/locusWork";//工作轨迹
@ -520,45 +713,70 @@ public class PathConfig {
public static final String PATH_MODULE_GRID_ACTIVITY_KEY_ROAD_DETAIL = "/modulegrid/activity/keyRoadDetail";//护路护线详情
//护路护线涉及案件
public static final String PATH_MODULE_GRID_ACTIVITY_KEY_ROAD_CASE_LIST = "/modulegrid/activity/keyRoadCaseList";//护路护线涉及案件列表
public static final String PATH_MODULE_GRID_ACTIVITY_KEY_ROAD_CASE_EDIT = "/modulegrid/activity/keyRoadCaseEdit";//护路护线涉及案件编辑
public static final String PATH_MODULE_GRID_ACTIVITY_KEY_ROAD_CASE_ADD = "/modulegrid/activity/keyRoadCaseAdd";//护路护线涉及案件添加
public static final String PATH_MODULE_GRID_ACTIVITY_KEY_ROAD_CASE_DETAIL = "/modulegrid/activity/keyRoadCaseDetail";//护路护线涉及案件详情
public static final String PATH_MODULE_GRID_ACTIVITY_KEY_ROAD_CASE_LIST = "/modulegrid/activity/keyRoadCaseList";
//护路护线涉及案件列表
public static final String PATH_MODULE_GRID_ACTIVITY_KEY_ROAD_CASE_EDIT = "/modulegrid/activity/keyRoadCaseEdit";
//护路护线涉及案件编辑
public static final String PATH_MODULE_GRID_ACTIVITY_KEY_ROAD_CASE_ADD = "/modulegrid/activity/keyRoadCaseAdd";
//护路护线涉及案件添加
public static final String PATH_MODULE_GRID_ACTIVITY_KEY_ROAD_CASE_DETAIL = "/modulegrid/activity" +
"/keyRoadCaseDetail";//护路护线涉及案件详情
/*=========================================中心端============================================*/
public static final String PATH_MODULE_COMMAND_ACTIVITY_INCIDENT_ACCEPT_LIST = "/modulecommand/activity/incidentAcceptList";//事件受理列表
public static final String PATH_MODULE_COMMAND_ACTIVITY_INCIDENT_ACCEPT_DETAIL = "/modulecommand/activity/incidentAcceptDetail";//事件受理
public static final String PATH_MODULE_COMMAND_ACTIVITY_INCIDENT_ACCEPT_LIST = "/modulecommand/activity" +
"/incidentAcceptList";//事件受理列表
public static final String PATH_MODULE_COMMAND_ACTIVITY_INCIDENT_ACCEPT_DETAIL = "/modulecommand/activity" +
"/incidentAcceptDetail";//事件受理
public static final String PATH_MODULE_COMMAND_ACTIVITY_INCIDENT_DISPATCH_LIST = "/modulecommand/activity/incidentDispatchList";//事件派遣列表
public static final String PATH_MODULE_COMMAND_ACTIVITY_INCIDENT_DISPATCH_DETAIL = "/modulecommand/activity/incidentDispatchDetail";//事件派遣
public static final String PATH_MODULE_COMMAND_ACTIVITY_INCIDENT_DISPATCH_LIST = "/modulecommand/activity" +
"/incidentDispatchList";//事件派遣列表
public static final String PATH_MODULE_COMMAND_ACTIVITY_INCIDENT_DISPATCH_DETAIL = "/modulecommand/activity" +
"/incidentDispatchDetail";//事件派遣
public static final String PATH_MODULE_COMMAND_ACTIVITY_INCIDENT_SEL_DEPT = "/modulecommand/activity/incidentDeptSel";//选择组织机构
public static final String PATH_MODULE_COMMAND_ACTIVITY_INCIDENT_SEL_DEPT = "/modulecommand/activity" +
"/incidentDeptSel";//选择组织机构
/*=========================================部门端========================================*/
public static final String PATH_MODULE_SUPERVISION_INCIDENT_DISTRIBUTION_LIST_ACTIVITY = "/modulesupervision/activity/incidentDeptDistributionList";//事件分拨列表
public static final String PATH_MODULE_SUPERVISION_INCIDENT_DISTRIBUTION_DETAIL_ACTIVITY = "/modulesupervision/activity/incidentDeptDistributionDetail";//事件分拨详情
public static final String PATH_MODULE_SUPERVISION_INCIDENT_DISTRIBUTION_LIST_ACTIVITY = "/modulesupervision" +
"/activity/incidentDeptDistributionList";//事件分拨列表
public static final String PATH_MODULE_SUPERVISION_INCIDENT_DISTRIBUTION_DETAIL_ACTIVITY = "/modulesupervision" +
"/activity/incidentDeptDistributionDetail";//事件分拨详情
public static final String PATH_MODULE_SUPERVISION_INCIDENT_ACCEPT_LIST_ACTIVITY = "/modulesupervision/activity/incidentDeptAcceptList";//事件受理
public static final String PATH_MODULE_SUPERVISION_INCIDENT_ACCEPT_DETAIL_ACTIVITY = "/modulesupervision/activity/incidentDeptAcceptDetail";//事件受理详情
public static final String PATH_MODULE_SUPERVISION_INCIDENT_ACCEPT_LIST_ACTIVITY = "/modulesupervision/activity" +
"/incidentDeptAcceptList";//事件受理
public static final String PATH_MODULE_SUPERVISION_INCIDENT_ACCEPT_DETAIL_ACTIVITY = "/modulesupervision/activity" +
"/incidentDeptAcceptDetail";//事件受理详情
public static final String PATH_MODULE_SUPERVISION_INCIDENT_CHECK_LIST = "/modulesupervision/activity/incidentDeptList";//事件核查
public static final String PATH_MODULE_SUPERVISION_INCIDENT_CHECK_DETAIL = "/modulesupervision/activity/incidentDeptListDetail";//事件核查详情
public static final String PATH_MODULE_SUPERVISION_INCIDENT_CHECK_LIST = "/modulesupervision/activity" +
"/incidentDeptList";//事件核查
public static final String PATH_MODULE_SUPERVISION_INCIDENT_CHECK_DETAIL = "/modulesupervision/activity" +
"/incidentDeptListDetail";//事件核查详情
public static final String PATH_MODULE_SUPERVISION_ACTIVITY_PETITION_DISPOSE_LIST = "/modulesupervision/activity/petitionDisposeList";//公众信访
public static final String PATH_MODULE_SUPERVISION_FRAGMENT_VISITS_LIST = "/modulesupervision/fragment/visitsList";//公众信访列表
public static final String PATH_MODULE_SUPERVISION_ACTIVITY_VISITS_DISPOSE = "/modulesupervision/activity/visitsDispose";//信访处理
public static final String PATH_MODULE_SUPERVISION_ACTIVITY_VISITS_DISPOSE_LIST = "/modulesupervision/activity/visitsDisposeList";//信访处理列表
public static final String PATH_MODULE_SUPERVISION_ACTIVITY_VISITS_DETAIL = "/modulesupervision/activity/visitsDetail";//信访详情
public static final String PATH_MODULE_SUPERVISION_ACTIVITY_VISITS_DISPOSE_DETAIL = "/modulesupervision/activity/visitsDisposeDetail";//信访处理详情
public static final String PATH_MODULE_SUPERVISION_ACTIVITY_PETITION_DISPOSE_LIST = "/modulesupervision/activity" +
"/petitionDisposeList";//公众信访
public static final String PATH_MODULE_SUPERVISION_FRAGMENT_VISITS_LIST = "/modulesupervision/fragment/visitsList"
;//公众信访列表
public static final String PATH_MODULE_SUPERVISION_ACTIVITY_VISITS_DISPOSE = "/modulesupervision/activity" +
"/visitsDispose";//信访处理
public static final String PATH_MODULE_SUPERVISION_ACTIVITY_VISITS_DISPOSE_LIST = "/modulesupervision/activity" +
"/visitsDisposeList";//信访处理列表
public static final String PATH_MODULE_SUPERVISION_ACTIVITY_VISITS_DETAIL = "/modulesupervision/activity" +
"/visitsDetail";//信访详情
public static final String PATH_MODULE_SUPERVISION_ACTIVITY_VISITS_DISPOSE_DETAIL = "/modulesupervision/activity" +
"/visitsDisposeDetail";//信访处理详情
/*======================================新版房屋人口==================================*/
public static final String PATH_MODULE_GRID_FRAGMENT_BUILDINGAREA_MANAGE = "/modulegrid/fragment/buildingAreaManage";//小区管理
public static final String PATH_MODULE_GRID_FRAGMENT_BUILDINGAREA_MANAGE = "/modulegrid/fragment" +
"/buildingAreaManage";//小区管理
public static final String PATH_MODULE_GRID_FRAGMENT_BUILDING_MANAGE = "/modulegrid/fragment/buildingManage";//楼宇管理
public static final String PATH_MODULE_GRID_FRAGMENT_HOUSE_MANAGE = "/modulegrid/fragment/houseManage";//房屋管理
public static final String PATH_MODULE_GRID_FRAGMENT_COMMUNITY_MANAGE = "/modulegrid/fragment/communityManage";//社区管理
public static final String PATH_MODULE_GRID_FRAGMENT_SEARCH_HOUSE_BY_PERSON = "/modulegrid/fragment/searchHouseByPerson";//以人找房
public static final String PATH_MODULE_GRID_FRAGMENT_COMMUNITY_MANAGE = "/modulegrid/fragment/communityManage";
//社区管理
public static final String PATH_MODULE_GRID_FRAGMENT_SEARCH_HOUSE_BY_PERSON = "/modulegrid/fragment" +
"/searchHouseByPerson";//以人找房
public static final String PATH_MODULE_GRID_FRAGMENT_PERSON_LIB = "/modulegrid/fragment/personLib";//人口库
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_BASE_SEARCH = "/modulegrid/activity/censusBaseSearch";//人口搜索
public static final String PATH_MODULE_GRID_ACTIVITY_POPULACE_BASE_SEARCH = "/modulegrid/activity" +
"/censusBaseSearch";//人口搜索
/*==========================日报===================================*/
public static final String PATH_MODULE_COMMON_ACTIVITY_JOURNAL_LIST = "/modulecommon/activity/journalList";
@ -568,4 +786,5 @@ public class PathConfig {
public static final String PATH_MODULE_COMMON_ACTIVITY_JOURNAL_CALENDAR = "/modulecommon/activity/journalCalendar";
public static final String DEFAULT_PWD_8 = "88888888";
public static final String DEFAULT_PWD_6 = "888888";
}

View File

@ -24,7 +24,7 @@ public class BaseUrlApi {
// public static final String BASE_MAIN_IP = "http://121.36.71.250:58038/usercenter/";
public static final String BASE_MAIN_IP = IP + SYS_USERCENTER;
public static final String BASE_CASE_IP = IP + SYS_CASE;
// public static final String BASE_CASE_IP = "http://192.168.0.120:9000/" + SYS_CASE;
// public static final String BASE_CASE_IP = "http://192.168.0.120:9000/" + SYS_CASE;//TODO 测试
public static final String BASE_LIBRARY_IP = IP + SYS_LIBRARY;
public static final String BASE_TASK_IP = IP + SYS_TASK;
public static final String BASE_PERSON_IP = IP + SYS_POPULATION;

View File

@ -10,8 +10,6 @@ import android.app.Service;
import android.content.Context;
import android.content.Intent;
import android.content.pm.ActivityInfo;
import android.content.res.Configuration;
import android.content.res.Resources;
import android.graphics.Rect;
import android.os.Build;
import android.os.Bundle;
@ -23,7 +21,6 @@ import android.text.TextUtils;
import android.text.TextWatcher;
import android.util.DisplayMetrics;
import android.view.Display;
import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.TouchDelegate;
@ -106,9 +103,15 @@ public abstract class BaseActivity extends AppCompatActivity {
protected AfxTextView mTvSearchBack;
private boolean mIsExpand;//搜索框是否展开
private LocalBroad mLocalBroad;
private LinearLayout mLlBaseSearch;
protected LinearLayout mLlBaseSearch;
private static final String NAVIGATION = "navigationBarBackground";
protected Object mCurGrid;
protected EditText mEtBaseOnlySearch;
protected LinearLayout mLlBaseOnlySearch;
protected LinearLayout mLlOnlySearchBar;
protected ImageView mIvAppOnlyBack;
protected TextView mTvOnlyControl;
private ImageView mIvOnlyClear;
@SuppressLint("ClickableViewAccessibility")
@Override
@ -155,7 +158,8 @@ public abstract class BaseActivity extends AppCompatActivity {
deviceInfo = "navigationbar_is_min";
} else if (brand.equalsIgnoreCase("xiaomi") || brand.equalsIgnoreCase("blackshark")) {
deviceInfo = "force_fsg_nav_bar";
} else if (brand.equalsIgnoreCase("VIVO") || brand.equalsIgnoreCase("OnePlus") || brand.equalsIgnoreCase("OPPO")) {
} else if (brand.equalsIgnoreCase("VIVO") || brand.equalsIgnoreCase("OnePlus") || brand.equalsIgnoreCase(
"OPPO")) {
return !ImmersionBar.isGesture(this);
} else {
deviceInfo = "noah_navi_mode_value";
@ -234,6 +238,22 @@ public abstract class BaseActivity extends AppCompatActivity {
mLlAppBaseContent.setBackgroundColor(getResources().getColor(R.color.white));
mTvBaseTitle = findViewById(R.id.tv_app_title);//页面标题
mLlBaseSearch = findViewById(R.id.ll_base_search);
mLlBaseOnlySearch = findViewById(R.id.ll_base_only_search);
mEtBaseOnlySearch = findViewById(R.id.et_base_only_search);
mIvOnlyClear = findViewById(R.id.iv_app_only_clear_search);
mIvOnlyClear.setVisibility(View.GONE);
mIvOnlyClear.setOnClickListener(v -> {
hideSoftKeyboard();
mEtBaseOnlySearch.setText("");
mEtBaseOnlySearch.clearFocus();
doSearchByTitle();
});
// ll_only_search_bar
// iv_app_only_back
// tv_only_control
mLlOnlySearchBar = findViewById(R.id.ll_only_search_bar);
mIvAppOnlyBack = findViewById(R.id.iv_app_only_back);
mTvOnlyControl = findViewById(R.id.tv_only_control);
//页面返回
mTvAppBack = findViewById(R.id.tv_app_back);
mRlTitleBar = findViewById(R.id.rl_title_bar);
@ -269,6 +289,10 @@ public abstract class BaseActivity extends AppCompatActivity {
hideSoftKeyboard();
finish();
});
mIvAppOnlyBack.setOnClickListener(v -> {
hideSoftKeyboard();
finish();
});
mTvNotify = findViewById(R.id.tv_notify);
mIvEmptyData.setOnClickListener(v -> reLoadData());
@ -295,19 +319,46 @@ public abstract class BaseActivity extends AppCompatActivity {
}
}
});
mEtAppSearchContent.setOnEditorActionListener(new TextView.OnEditorActionListener() {
mEtBaseOnlySearch.addTextChangedListener(new TextWatcher() {
@Override
public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
if (actionId == EditorInfo.IME_ACTION_SEARCH) {
hideSoftKeyboard();
mEtAppSearchContent.clearFocus();
doSearchByTitle();
return true;
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
}
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
}
@Override
public void afterTextChanged(Editable s) {
if (!TextUtils.isEmpty(s.toString())) {
mIvOnlyClear.setVisibility(View.VISIBLE);
} else {
return false;
mIvOnlyClear.setVisibility(View.GONE);
}
}
});
mEtAppSearchContent.setOnEditorActionListener((v, actionId, event) -> {
if (actionId == EditorInfo.IME_ACTION_SEARCH) {
hideSoftKeyboard();
mEtAppSearchContent.clearFocus();
doSearchByTitle();
return true;
} else {
return false;
}
});
mEtBaseOnlySearch.setOnEditorActionListener((v, actionId, event) -> {
if (actionId == EditorInfo.IME_ACTION_SEARCH) {
hideSoftKeyboard();
mEtAppSearchContent.clearFocus();
doSearchByTitle();
return true;
} else {
return false;
}
});
mIvClearSearch.setOnClickListener(v -> clearSearchContent());
//设置默认title
mIvAppSearchIcon.setVisibility(View.GONE);

View File

@ -1,6 +1,5 @@
package com.tenlionsoft.baselib.core.widget.base;
import android.app.Activity;
import android.content.Context;
import android.os.Bundle;
import android.view.LayoutInflater;
@ -12,21 +11,21 @@ import android.widget.LinearLayout;
import android.widget.ProgressBar;
import android.widget.TextView;
import com.scwang.smart.refresh.layout.SmartRefreshLayout;
import com.tenlionsoft.baselib.R;
import com.tenlionsoft.baselib.utils.LogUtils;
import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
import com.scwang.smart.refresh.layout.SmartRefreshLayout;
import com.tenlionsoft.baselib.R;
public abstract class BaseFragment extends Fragment {
public static final int STATE_LOAD = 1234;//加载中
public static final int STATE_ERROR = 1235;//加载失败
public static final int STATE_SUCCESS = 1236;//加载成功
public static final int STATE_EMPTY = 1237;//无数据
public static final int STATE_SEARCH_EMPTY = 1238;//没有搜索到数据
public static final int STATE_SEARCH_INIT = 1239;//搜索初始化
FrameLayout mFlContent;
TextView mTvFragmentErrorHint;
protected TextView mTvFragmentErrorHint;
ProgressBar mPbFragmentLoading;
ImageView mIvFragmentEmptyData;
LinearLayout mLlHintView;
@ -145,6 +144,16 @@ public abstract class BaseFragment extends Fragment {
mSrlView.setEnableLoadMore(true);
mSrlView.setEnableRefresh(true);
break;
case STATE_SEARCH_INIT:
mLlHintView.setVisibility(View.VISIBLE);
mPbFragmentLoading.setVisibility(View.GONE);
mIvFragmentEmptyData.setVisibility(View.VISIBLE);
mIvFragmentEmptyData.setBackgroundResource(R.drawable.ic_empty_data);
mTvFragmentErrorHint.setText("请输入查询的关键字");
mDataView.setVisibility(View.GONE);
mSrlView.setEnableLoadMore(false);
mSrlView.setEnableRefresh(false);
break;
default:
break;
}
@ -155,7 +164,6 @@ public abstract class BaseFragment extends Fragment {
}
/**
* 刷新视图
*/

View File

@ -0,0 +1,87 @@
package com.tenlionsoft.baselib.core.widget.views;
import android.content.Context;
import android.util.AttributeSet;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.jcodecraeer.xrecyclerview.progressindicator.AVLoadingIndicatorView;
import com.tenlionsoft.baselib.R;
import androidx.annotation.Nullable;
/**
* 作者: adam
* 日期: 2022/4/27 - 16:40
* 邮箱: itgaojian@163.com
* 描述: 加载状态view
*/
public class CustomStateView extends LinearLayout {
public static final int STATE_LOAD = 0x123;//加载中
public static final int STATE_EMPTY = 0x124;//空数据
public static final int STATE_ERROR = 0x125;//加载失败
public static final int STATE_SUCCESS = 0x126;//加载成功
public static final int STATE_ERROR_NET = 0x127;//加载失败,网络错误
public static final int STATE_SEARCH = 0x128;//搜索默认状态
private AVLoadingIndicatorView mPbStateLoading;
private ImageView mIvStateDate;
private TextView mTvStateHint;
public CustomStateView(Context context) {
super(context);
}
public CustomStateView(Context context, @Nullable AttributeSet attrs) {
super(context, attrs);
View view = LayoutInflater.from(context).inflate(R.layout.layout_state_view, this, true);
mPbStateLoading = view.findViewById(R.id.pb_state_loading);
mIvStateDate = view.findViewById(R.id.iv_state_data);
mTvStateHint = view.findViewById(R.id.tv_state_hint);
setState(STATE_LOAD);
}
public CustomStateView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
}
public void setState(int state) {
switch (state) {
case STATE_LOAD://加载中
mIvStateDate.setVisibility(View.GONE);
mPbStateLoading.setVisibility(View.VISIBLE);
mTvStateHint.setVisibility(View.VISIBLE);
mTvStateHint.setText("加载中...");
break;
case STATE_EMPTY://没有数据
mIvStateDate.setVisibility(View.VISIBLE);
mIvStateDate.setBackgroundResource(R.drawable.ic_empty_data);
mPbStateLoading.setVisibility(View.GONE);
mTvStateHint.setVisibility(View.VISIBLE);
mTvStateHint.setText("暂无数据");
break;
case STATE_ERROR:
mIvStateDate.setVisibility(View.VISIBLE);
mIvStateDate.setBackgroundResource(R.drawable.ic_load_error);
mPbStateLoading.setVisibility(View.GONE);
mTvStateHint.setVisibility(View.VISIBLE);
mTvStateHint.setText("加载失败");
break;
case STATE_SUCCESS:
mIvStateDate.setVisibility(GONE);
mPbStateLoading.setVisibility(GONE);
mTvStateHint.setVisibility(GONE);
break;
case STATE_SEARCH://搜索默认
mIvStateDate.setVisibility(View.VISIBLE);
mIvStateDate.setBackgroundResource(R.drawable.ic_empty_data);
mPbStateLoading.setVisibility(View.GONE);
mTvStateHint.setVisibility(View.VISIBLE);
mTvStateHint.setText("请输入要搜索的内容");
break;
}
}
}

View File

@ -0,0 +1,50 @@
package com.tenlionsoft.baselib.core.widget.views;
import android.content.Context;
import android.graphics.PointF;
import android.util.AttributeSet;
import android.view.MotionEvent;
import com.github.mikephil.charting.charts.CombinedChart;
import com.github.mikephil.charting.charts.HorizontalBarChart;
/**
* 滑动冲突
*/
public class MPAndroidChartView extends HorizontalBarChart {
private PointF mPointF = new PointF();
public MPAndroidChartView(Context context) {
super(context);
}
public MPAndroidChartView(Context context, AttributeSet attrs) {
super(context, attrs);
}
public MPAndroidChartView(Context context, AttributeSet attrs, int defStyle) {
super(context, attrs, defStyle);
}
@Override
public boolean dispatchTouchEvent(MotionEvent ev) {
getParent().requestDisallowInterceptTouchEvent(true);
return super.dispatchTouchEvent(ev);
}
@Override
public boolean onTouchEvent(MotionEvent event) {
switch (event.getAction()) {
case MotionEvent.ACTION_DOWN:
mPointF.x = event.getX();
mPointF.y = event.getY();
break;
case MotionEvent.ACTION_MOVE:
if (getScaleX() > 1 && Math.abs(event.getX() - mPointF.x) > 5) {
getParent().requestDisallowInterceptTouchEvent(true);
}
break;
}
return super.onTouchEvent(event);
}
}

View File

@ -0,0 +1,41 @@
package com.tenlionsoft.baselib.core.widget.views;
import android.content.Context;
import android.graphics.Typeface;
import android.text.TextPaint;
import android.util.AttributeSet;
import androidx.annotation.Nullable;
/**
* 作者: adam
* 日期: 2020/6/3 - 4:58 PM
* 邮箱: itgaojian@163.com
* 描述: 字体加粗
*/
public class TypeBoldTextView extends androidx.appcompat.widget.AppCompatTextView {
public TypeBoldTextView(Context context) {
this(context, null);
}
public TypeBoldTextView(Context context, @Nullable AttributeSet attrs) {
this(context, attrs, 0);
}
public TypeBoldTextView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
setTextBold();
}
private void setTextBold() {
try {
TextPaint paint = this.getPaint();
if (paint != null) {
paint.setFakeBoldText(true);
}
} catch (Exception e) {
e.printStackTrace();
}
}
}

View File

@ -1,7 +1,6 @@
package com.tenlionsoft.baselib.utils;
import android.text.TextUtils;
import android.view.TextureView;
import com.google.gson.Gson;
import com.google.gson.JsonParseException;
@ -28,15 +27,15 @@ public class ExceptionHandler {
if (!TextUtils.isEmpty(errBody)) {
ErrorBean errorBean = new Gson().fromJson(errBody, ErrorBean.class);
if (!TextUtils.isEmpty(errorBean.getMsg())) {
ToastUtils.show(errorBean.getMsg());
ToastUtils.show(errorBean.getMsg() + "(" + errorBean.getCode() + ")");
} else if (!TextUtils.isEmpty(errorBean.getMessage())) {
ToastUtils.show(errorBean.getMessage());
ToastUtils.show(errorBean.getMessage() + "(" + errorBean.getCode() + ")");
} else {
ToastUtils.show("网络错误,请稍后重试");
ToastUtils.show("网络错误,请稍后重试" + "(" + errorBean.getCode() + ")");
}
}
} catch (Exception e1) {
ToastUtils.show("网络错误,请稍后重试");
ToastUtils.show("网络错误,请稍后重试(500)");
e1.printStackTrace();
}
} else if (throwable instanceof JsonParseException) {
@ -44,7 +43,7 @@ public class ExceptionHandler {
} else if (throwable instanceof SocketTimeoutException) {
ToastUtils.show("网络连接超时");
} else {
ToastUtils.show("网络错误,请稍后重试");
ToastUtils.show("网络错误,请稍后重试(500)");
}
}

View File

@ -1,6 +1,31 @@
package com.tenlionsoft.baselib.utils;
import android.text.SpannableString;
import android.text.style.RelativeSizeSpan;
import java.math.BigDecimal;
import java.text.DecimalFormat;
public final class StringUtils {
/**
* 中文数字
*/
private static final String[] CN_NUM = {"", "", "", "", "", "", "", "", "", ""};
/**
* 中文数字单位
*/
private static final String[] CN_UNIT = {"", "", "", "", "", "", "", "", "亿", "", "", ""};
/**
* 特殊字符
*/
private static final String CN_NEGATIVE = "";
/**
* 特殊字符
*/
private static final String CN_POINT = "";
private StringUtils() {
throw new UnsupportedOperationException("u can't instantiate me...");
@ -182,4 +207,113 @@ public final class StringUtils {
}
return new String(chars);
}
/**
* int 中文数字
* 支持到int最大值
*
* @param intNum 要转换的整型数
* @return 中文数字
*/
public static String int2chineseNum(int intNum) {
StringBuffer sb = new StringBuffer();
boolean isNegative = false;
if (intNum < 0) {
isNegative = true;
intNum *= -1;
}
int count = 0;
while (intNum > 0) {
sb.insert(0, CN_NUM[intNum % 10] + CN_UNIT[count]);
intNum = intNum / 10;
count++;
}
if (isNegative)
sb.insert(0, CN_NEGATIVE);
return sb.toString().replaceAll("零[千百十]", "").replaceAll("零+万", "")
.replaceAll("零+亿", "亿").replaceAll("亿万", "亿零")
.replaceAll("零+", "").replaceAll("零$", "");
}
/**
* bigDecimal 中文数字
* 整数部分只支持到int的最大值
*
* @param bigDecimalNum 要转换的BigDecimal数
* @return 中文数字
*/
public static String bigDecimal2chineseNum(BigDecimal bigDecimalNum) {
if (bigDecimalNum == null)
return CN_NUM[0];
StringBuffer sb = new StringBuffer();
//将小数点后面的零给去除
String numStr = bigDecimalNum.abs().stripTrailingZeros().toPlainString();
String[] split = numStr.split("\\.");
String integerStr = int2chineseNum(Integer.parseInt(split[0]));
sb.append(integerStr);
//如果传入的数有小数则进行切割将整数与小数部分分离
if (split.length == 2) {
//有小数部分
sb.append(CN_POINT);
String decimalStr = split[1];
char[] chars = decimalStr.toCharArray();
for (int i = 0; i < chars.length; i++) {
int index = Integer.parseInt(String.valueOf(chars[i]));
sb.append(CN_NUM[index]);
}
}
//判断传入数字为正数还是负数
int signum = bigDecimalNum.signum();
if (signum == -1) {
sb.insert(0, CN_NEGATIVE);
}
return sb.toString();
}
/**
* 三位逗号分隔
*
* @return
*/
public static String intFenGeNumber(String number) {
StringBuffer sb = new StringBuffer(number);
for (int i = number.length() - 3; i >= 0; i -= 3) {
sb.insert(i, ",");
}
return sb.toString();
}
public static String numAddSepar(int num) {
DecimalFormat mFormat = new DecimalFormat("###,###,###,###");
String format = mFormat.format(num);
return format;
}
public static CharSequence numAddUnit(int num) {
if (num > 9999) {
//
DecimalFormat df2 = new DecimalFormat("0.00");
String format = df2.format((float) num / 10000);
String content = format + "";
SpannableString s = new SpannableString(content);
s.setSpan(new RelativeSizeSpan(0.6f), content.indexOf(""), content.length(),
0);
return s;
} else {
DecimalFormat mFormat = new DecimalFormat("###,###,###,###");
String format = mFormat.format(num);
return format;
}
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 770 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 113 KiB

After

Width:  |  Height:  |  Size: 280 KiB

View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/text_blue1" />
<corners android:radius="5dp" />
</shape>

View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#FFF0F4FD" />
<corners android:radius="5dp" />
</shape>

View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/gray_f6" />
<corners android:radius="3dp" />
</shape>

View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#16FF001E" />
<corners android:radius="3dp" />
</shape>

View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/transparent" />
</shape>

View File

@ -6,184 +6,265 @@
android:layout_height="match_parent"
android:orientation="vertical">
<!-- ===========标题============= -->
<RelativeLayout
android:id="@+id/rl_title_bar"
android:layout_width="match_parent"
android:layout_height="50dp"
android:background="@color/main_theme"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingLeft="5dp"
android:paddingRight="5dp">
<ImageView
android:id="@+id/tv_app_back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="5dp"
android:clickable="true"
android:focusable="true"
android:maxLength="8"
android:paddingLeft="5dp"
android:paddingTop="5dp"
android:paddingBottom="5dp"
android:scaleType="fitXY"
android:textColor="@color/white"
android:textSize="13sp"
android:visibility="visible"
tools:background="@drawable/ic_back_white"
tools:text=""
tools:visibility="visible" />
<RelativeLayout
android:id="@+id/rl_title_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_centerVertical="true">
android:layout_height="50dp"
android:background="@color/main_theme"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingLeft="5dp"
android:paddingRight="5dp"
tools:background="@color/white"
tools:visibility="visible">
<TextView
android:id="@+id/tv_app_title"
<ImageView
android:id="@+id/tv_app_back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_centerVertical="true"
android:layout_marginLeft="5dp"
android:clickable="true"
android:ellipsize="end"
android:maxEms="12"
android:maxLines="1"
android:focusable="true"
android:maxLength="8"
android:paddingLeft="5dp"
android:paddingTop="5dp"
android:paddingBottom="5dp"
android:scaleType="fitXY"
android:textColor="@color/white"
android:textSize="18sp"
tools:text="页面标题" />
android:textSize="13sp"
android:visibility="visible"
tools:background="@drawable/ic_back_white"
tools:text=""
tools:visibility="visible" />
<LinearLayout
android:id="@+id/ll_app_search_content"
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:orientation="horizontal"
tools:visibility="visible">
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_centerVertical="true">
<RelativeLayout
<TextView
android:id="@+id/tv_app_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="@color/transparent">
android:layout_centerInParent="true"
android:clickable="true"
android:ellipsize="end"
android:maxEms="12"
android:maxLines="1"
android:textColor="@color/white"
android:textSize="18sp"
tools:text="页面标题" />
<TextView
android:id="@+id/tv_app_options"
<LinearLayout
android:id="@+id/ll_only_search_bar"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:orientation="horizontal"
android:visibility="gone">
<ImageView
android:id="@+id/iv_app_only_back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_centerVertical="true"
android:layout_marginLeft="5dp"
android:clickable="true"
android:drawableRight="@drawable/ic_arrow_cir_down_white_16"
android:drawablePadding="5dp"
android:focusable="true"
android:maxLength="8"
android:paddingLeft="5dp"
android:paddingTop="5dp"
android:paddingBottom="5dp"
android:text="筛选"
android:scaleType="fitXY"
android:textColor="@color/white"
android:textSize="14sp"
android:visibility="visible" />
<com.tenlionsoft.baselib.core.widget.views.AfxTextView
android:id="@+id/tv_search_back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:clickable="true"
android:focusable="true"
android:visibility="visible"
tools:text="" />
tools:background="@drawable/ic_back_black"
tools:text=""
tools:visibility="visible" />
</RelativeLayout>
<LinearLayout
android:id="@+id/ll_base_search"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_weight="1"
android:background="@drawable/shp_rectangle_white_5">
<EditText
android:id="@+id/et_base_search_content"
<LinearLayout
android:id="@+id/ll_base_only_search"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_weight="1"
android:background="@null"
android:drawableLeft="@drawable/ic_search_icon_gray"
android:drawablePadding="5dp"
android:hint="请输入查询的内容"
android:imeOptions="actionSearch"
android:padding="8dp"
android:singleLine="true"
android:textSize="12sp" />
android:background="@drawable/shp_rectangle_gray_f5_radius">
<EditText
android:id="@+id/et_base_only_search"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@null"
android:drawableLeft="@drawable/ic_search_icon_gray"
android:drawablePadding="5dp"
android:hint="请输入查询的关键字"
android:imeOptions="actionSearch"
android:padding="8dp"
android:singleLine="true"
android:textSize="12sp" />
<ImageView
android:id="@+id/iv_app_only_clear_search"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_gravity="center_vertical"
android:layout_marginRight="5dp"
android:src="@drawable/ic_clear_cir_gray" />
</LinearLayout>
<TextView
android:id="@+id/tv_only_control"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:clickable="true"
android:focusable="true"
android:textColor="@color/black"
android:textSize="15sp"
tools:text="操作" />
<ImageView
android:id="@+id/iv_app_clear_search"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_gravity="center_vertical"
android:layout_marginRight="5dp"
android:src="@drawable/ic_clear_cir_gray" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_app_search_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:orientation="horizontal"
tools:visibility="visible">
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="@color/transparent">
<TextView
android:id="@+id/tv_app_options"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:clickable="true"
android:drawableRight="@drawable/ic_arrow_cir_down_white_16"
android:drawablePadding="5dp"
android:focusable="true"
android:maxLength="8"
android:paddingLeft="5dp"
android:paddingTop="5dp"
android:paddingBottom="5dp"
android:text="筛选"
android:textColor="@color/white"
android:textSize="14sp"
android:visibility="visible" />
<com.tenlionsoft.baselib.core.widget.views.AfxTextView
android:id="@+id/tv_search_back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:clickable="true"
android:focusable="true"
android:visibility="visible"
tools:text="" />
</RelativeLayout>
<LinearLayout
android:id="@+id/ll_base_search"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_weight="1"
android:background="@drawable/shp_rectangle_white_5"
tools:visibility="gone">
<EditText
android:id="@+id/et_base_search_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@null"
android:drawableLeft="@drawable/ic_search_icon_gray"
android:drawablePadding="5dp"
android:hint="请输入查询的内容"
android:imeOptions="actionSearch"
android:padding="8dp"
android:singleLine="true"
android:textSize="12sp" />
<ImageView
android:id="@+id/iv_app_clear_search"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_gravity="center_vertical"
android:layout_marginRight="5dp"
android:src="@drawable/ic_clear_cir_gray" />
</LinearLayout>
<TextView
android:id="@+id/tv_do_search"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:clickable="true"
android:focusable="true"
android:text="搜索"
android:textColor="@color/col_white_gray_press" />
<TextView
android:id="@+id/tv_cancel_search"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:text="取消"
android:textColor="@color/col_white_gray_press" />
</LinearLayout>
</RelativeLayout>
<LinearLayout
android:id="@+id/ll_options"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:id="@+id/iv_app_search_icon"
android:layout_width="18dp"
android:layout_height="18dp"
android:scaleType="fitXY"
android:src="@drawable/ic_search_white" />
<TextView
android:id="@+id/tv_do_search"
android:id="@+id/tv_app_publish"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginLeft="10dp"
android:clickable="true"
android:focusable="true"
android:text="搜索"
android:textColor="@color/col_white_gray_press" />
<TextView
android:id="@+id/tv_cancel_search"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:text="取消"
android:textColor="@color/col_white_gray_press" />
android:textColor="@color/col_white_gray_press"
android:textSize="15sp"
tools:text="操作" />
</LinearLayout>
</RelativeLayout>
<LinearLayout
android:id="@+id/ll_options"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:id="@+id/iv_app_search_icon"
android:layout_width="18dp"
android:layout_height="18dp"
android:scaleType="fitXY"
android:src="@drawable/ic_search_white" />
<TextView
android:id="@+id/tv_app_publish"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:clickable="true"
android:focusable="true"
android:textColor="@color/col_white_gray_press"
android:textSize="15sp"
tools:text="操作" />
</LinearLayout>
</RelativeLayout>
<!-- ===========内容============= -->
<RelativeLayout

View File

@ -19,7 +19,7 @@
android:layout_weight="1"
android:padding="10dp"
android:textColor="@color/black"
android:textSize="15sp"
android:textSize="14dp"
tools:text="测试" />
<CheckBox

View File

@ -0,0 +1,39 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/ll_state_hint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:gravity="center"
android:orientation="vertical"
android:padding="20dp">
<com.jcodecraeer.xrecyclerview.progressindicator.AVLoadingIndicatorView
android:id="@+id/pb_state_loading"
android:layout_width="40dp"
android:layout_height="40dp"
app:indicator="BallSpinFadeLoader"
app:indicator_color="@color/text_blue" />
<ImageView
android:id="@+id/iv_state_data"
android:layout_width="80dp"
android:layout_height="60dp"
android:scaleType="fitXY"
tools:src="@drawable/ic_empty_data" />
<com.tenlionsoft.baselib.core.widget.views.TypeFaceTextView
android:id="@+id/tv_state_hint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:clickable="true"
android:textColor="@color/gray_text"
android:textSize="@dimen/text_14"
tools:text="加载数据失败" />
</LinearLayout>

View File

@ -38,12 +38,14 @@
<!--textColor-->
<color name="text_detail_24">#242424</color>
<color name="text_yellow">#CA5500</color>
<color name="text_yellow_F1">#F1C600</color>
<color name="text_green">#27BA0D</color>
<color name="text_gray">#8E8E8E</color>
<color name="text_gray_tr">#bb8E8E8E</color>
<color name="text_gray01">#535353</color>
<color name="text_gray02">#7C7C7C</color>
<color name="text_blue">#00A6FE</color>
<color name="blue_shallow_30">#BDCBF1</color>
<color name="text_blue_tr">#3300A6FE</color>
<color name="blue_line">#00BEF7</color>
<color name="text_80_gray">#808080</color>
@ -71,6 +73,7 @@
<color name="black">#000000</color>
<!--考勤详情表格颜色-->
<color name="gray_line">#FBFBFB</color>
<color name="gray_6f">#6F6F6F</color>
<color name="gray_line_deep">#EBEBEB</color>
<color name="gray_line_shallow">#F3F1F1</color>
<!-- 透明颜色 -->
@ -121,9 +124,13 @@
<color name="gray_dd">#E7E7E7</color>
<color name="gray_db">#D8D8D8</color>
<color name="red_ff">#FF0000</color>
<color name="red_1E">#82FF001E</color>
<color name="red_37">#F37575</color>
<color name="orange">#FF6300</color>
<color name="home_background">#f5f5f5</color>
<color name="gray_text">#777777</color>
<color name="gray_text_8A">#8A8A8A</color>
<color name="gray_text_89">#898989</color>
<color name="my_blue_bg">#ff7271</color>
<color name="button_bg">#8bc6f7</color>
<color name="sifazhuanti_bg">#f4f4f4</color>
@ -162,6 +169,7 @@
<color name="gray_ef">#efeff4</color>
<color name="line">#efefef</color>
<color name="gray_f5">#F5F5F5</color>
<color name="gray_f6">#F6F6F6</color>
<color name="gray_f7">#F7F7F7</color>
<color name="gray_tr_hint">#aa000000</color>
@ -202,11 +210,16 @@
<!--学习考试-->
<!-- 白色 -->
<color name="blue">#99B1DC</color>
<color name="text_blue_52">#527FFF</color>
<color name="text_blue_79">#79D4FF</color>
<color name="btn_yellow">#AAFD9521</color>
<color name="btn_blue">#AA1BAAE2</color>
<color name="btn_green">#AA37B54A</color>
<color name="btn_purple">#AA6B6FD2</color>
<color name="col_main_theme">#216cd8</color>
<color name="label_green">#03C591</color>
<color name="label_blue">#2579FB</color>
<color name="label_yellow">#FF9A05</color>
<color name="colorDarkOrange">#d84315</color>
</resources>

View File

@ -7,6 +7,7 @@
<dimen name="text_21">21dp</dimen>
<dimen name="text_22">22dp</dimen>
<dimen name="text_14">14dp</dimen>
<dimen name="text_12">12dp</dimen>
<dimen name="text_15">15dp</dimen>
<dimen name="text_16">16dp</dimen>
<dimen name="material_bottom_navigation_active_item_max_width">168dp</dimen>
@ -25,10 +26,10 @@
<dimen name="margin_padding_small">8dp</dimen>
<dimen name="margin_padding_min">4dp</dimen>
<dimen name="text_primary">16sp</dimen>
<dimen name="text_small">14sp</dimen>
<dimen name="text_big">20sp</dimen>
<dimen name="text_min">12sp</dimen>
<dimen name="text_primary">16dp</dimen>
<dimen name="text_small">14dp</dimen>
<dimen name="text_big">20dp</dimen>
<dimen name="text_min">12dp</dimen>
<dimen name="divider_height">0.5dp</dimen>

View File

@ -58,8 +58,8 @@ ext {
gCompileSdkVersion = 30
gMinSdkVersion = 21
gTargetSdkVersion = 30
gVersionCode = 14
gVersionName = '1.1.3'
gVersionCode = 15
gVersionName = '1.1.4'
gBuildToolsVersion = "29.0.2"
// gVersionCode=26
// gVersionName='1.3.0'

View File

@ -3,12 +3,18 @@
package="com.tengshisoft.commonmodule">
<application>
<activity
android:name=".activitys.logs.GridIncidentStatisticsActivity"
android:exported="false"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:windowSoftInputMode="adjustPan|stateHidden" />
<activity
android:name=".activitys.cases.IncidentCheckInfoActivity"
android:exported="false"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:windowSoftInputMode="adjustPan|stateHidden" />
android:windowSoftInputMode="adjustPan|stateHidden" />
<activity
android:name=".activitys.cases.IncidentHandleInfoActivity"
android:exported="false"

View File

@ -0,0 +1,103 @@
package com.tengshisoft.commonmodule.activitys.logs;
import android.view.View;
import android.widget.ImageView;
import android.widget.RelativeLayout;
import android.widget.TextView;
import androidx.viewpager2.widget.ViewPager2;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.alibaba.android.arouter.launcher.ARouter;
import com.gyf.immersionbar.ImmersionBar;
import com.tengshisoft.commonmodule.R;
import com.tengshisoft.commonmodule.R2;
import com.tenlionsoft.baselib.constant.PathConfig;
import com.tenlionsoft.baselib.core.widget.base.BaseActivity;
import com.tenlionsoft.baselib.core.widget.base.BaseFragment;
import com.tenlionsoft.baselib.core.widget.base.BaseViewPage2Adapter;
import java.util.ArrayList;
import java.util.List;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.Unbinder;
/**
* 网格员事件排名
*/
@Route(path = PathConfig.PATH_MODULE_COMMON_ACTIVITY_GRID_STATISTICS_INCIDENT)
public class GridIncidentStatisticsActivity extends BaseActivity {
@BindView(R2.id.iv_page_back)
public ImageView mIvPageBack;
@BindView(R2.id.rl_page_title)
RelativeLayout mRlPageTitle;
@BindView(R2.id.vp_content)
ViewPager2 mVpContent;
@BindView(R2.id.rl_page_content)
RelativeLayout mRlPageContent;
@BindView(R2.id.tv_change_page)
TextView mTvChangePage;
private Unbinder mBind;
private String mCurrentMorY = "month";
private int mCurrentPosition = 0;
@Override
protected int setLayoutId() {
return R.layout.activity_grid_incident_statistics_viewpage;
}
@Override
public void initData() {
mBind = ButterKnife.bind(this);
ImmersionBar.with(mActivity)
.statusBarDarkFont(true)
.init();
mRlTitleBar.setVisibility(View.GONE);
mIvPageBack.setOnClickListener(v -> finish());
initViews();
}
private List<BaseFragment> mFragments;
private void initViews() {
refreshView(STATE_LOAD_SUCCESS);
mFragments = new ArrayList<>();
BaseFragment deptFragment =
(BaseFragment) ARouter.getInstance().build(PathConfig.PATH_MODULE_COMMON_FRAGMENT_GRID_INCIDENT_STATISTICS).navigation();
BaseFragment oftenFragment =
(BaseFragment) ARouter.getInstance().build(PathConfig.PATH_MODULE_COMMON_FRAGMENT_GRID_POPULACE_STATISTICS).navigation();
mFragments.add(deptFragment);
mFragments.add(oftenFragment);
mVpContent.setAdapter(new BaseViewPage2Adapter(this, mFragments));
mVpContent.setOffscreenPageLimit(2);
mVpContent.setUserInputEnabled(false);
mRlPageContent.setBackgroundResource(R.drawable.ic_incident_statistics_bg);
mTvChangePage.setOnClickListener(v -> {
if (mCurrentPosition == 0) {
mCurrentPosition = 1;
mVpContent.setCurrentItem(1, false);
mRlPageContent.setBackgroundResource(R.drawable.ic_populace_statistics_bg);
} else {
mCurrentPosition = 0;
mVpContent.setCurrentItem(0, false);
mRlPageContent.setBackgroundResource(R.drawable.ic_incident_statistics_bg);
}
});
}
@Override
protected void doSearchByTitle() {
}
@Override
protected void clearSearch() {
}
}

View File

@ -83,7 +83,6 @@ public class StatisticsGridActivity extends BaseActivity {
mRlTitleBar.setVisibility(View.GONE);
initViews();
getStatistCount(1);
// getGridUserRank();
}
private void getGridUserRank() {

View File

@ -7,9 +7,7 @@ import android.view.ViewGroup;
import com.tengshisoft.commonmodule.R;
import com.tengshisoft.commonmodule.beans.BuildingListBean;
import com.tengshisoft.commonmodule.beans.CommunityListBean;
import com.tengshisoft.commonmodule.holders.BuildingListHolder;
import com.tengshisoft.commonmodule.holders.CommunityListHolder;
import com.tenlionsoft.baselib.core.widget.base.BaseRecyclerAdapter;
import java.util.List;
@ -42,6 +40,7 @@ public class BuildingListAdapter extends BaseRecyclerAdapter<BuildingListBean.Ro
holder.mTvCommunityName.setText(rowsBean.getResidentialName());
holder.mTvType.setText(rowsBean.getBuildingType());
holder.mTvNumber.setText(rowsBean.getBuildingNum());
holder.mTvLocation.setText(rowsBean.getLocation());
}
public void setCheckId(String id) {

View File

@ -18,7 +18,8 @@ import java.util.List;
* 邮箱: itgaojian@163.com
* 描述:
*/
public class CommunityAreaListAdapter extends BaseRecyclerAdapter<CommunityAreaListBean.RowsBean, CommunityAreaListHolder> {
public class CommunityAreaListAdapter extends BaseRecyclerAdapter<CommunityAreaListBean.RowsBean,
CommunityAreaListHolder> {
private int mType = 1;
private String mCheckId = "";
private String mCheckName = "";
@ -42,9 +43,11 @@ public class CommunityAreaListAdapter extends BaseRecyclerAdapter<CommunityAreaL
holder.mTvPhone.setText(rowsBean.getLinkPhone());
holder.mTvCommunityAddress.setText(rowsBean.getLocation() + rowsBean.getAddress());
if (mType == 1) {
holder.mCbCheck.setVisibility(View.INVISIBLE);
holder.mCbCheck.setVisibility(View.GONE);
holder.mTvShow.setVisibility(View.VISIBLE);
} else {
holder.mCbCheck.setVisibility(View.VISIBLE);
holder.mTvShow.setVisibility(View.GONE);
holder.mCbCheck.setChecked(mCheckId.equals(rowsBean.getCommunityId()));
if (mCheckId.equals(rowsBean.getCommunityId())) {
mCheckName = rowsBean.getCommunityName();

View File

@ -4,7 +4,6 @@ import android.content.Context;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.CompoundButton;
import com.tengshisoft.commonmodule.R;
import com.tengshisoft.commonmodule.beans.CommunityListBean;
@ -39,12 +38,15 @@ public class CommunityListAdapter extends BaseRecyclerAdapter<CommunityListBean.
public void bindHolder(CommunityListHolder holder, int i) {
CommunityListBean.RowsBean rowsBean = mData.get(i);
holder.mTvCommunityName.setText(rowsBean.getResidentialName());
holder.mTvCommunity.setText(rowsBean.getCommunityName());
holder.mTvCommunity.setText(rowsBean.getCommunity());
holder.mTvCommunityAddress.setText(rowsBean.getLocation() + "-" + rowsBean.getResidentialAddress());
if (mType == 1) {
holder.mCbCheck.setVisibility(View.INVISIBLE);
holder.mCbCheck.setVisibility(View.GONE);
holder.mTvShow.setVisibility(View.VISIBLE);
} else {
holder.mCbCheck.setVisibility(View.VISIBLE);
holder.mTvShow.setVisibility(View.GONE);
holder.mCbCheck.setChecked(mCheckId.equals(rowsBean.getResidentialId()));
if (mCheckId.equals(rowsBean.getResidentialId())) {
mCheckName = rowsBean.getResidentialName();

View File

@ -6,9 +6,7 @@ import android.view.View;
import android.view.ViewGroup;
import com.tengshisoft.commonmodule.R;
import com.tengshisoft.commonmodule.beans.BuildingListBean;
import com.tengshisoft.commonmodule.beans.HouseListBean;
import com.tengshisoft.commonmodule.holders.BuildingListHolder;
import com.tengshisoft.commonmodule.holders.HouseListHolder;
import com.tenlionsoft.baselib.core.widget.base.BaseRecyclerAdapter;
@ -41,7 +39,9 @@ public class HouseListAdapter extends BaseRecyclerAdapter<HouseListBean.RowsBean
HouseListBean.RowsBean rowsBean = mData.get(i);
holder.mTvCommunityName.setText(rowsBean.getResidentialName());
holder.mTvType.setText(rowsBean.getHouseStatus());
holder.mTvNumber.setText(rowsBean.getHouseNumber());
holder.mTvNumber.setText(rowsBean.getBuildingName() + "-" + rowsBean.getHouseNumber());
holder.mTvLocation.setText(rowsBean.getLocation());
}
public void setCheckId(String id) {

View File

@ -0,0 +1,89 @@
package com.tengshisoft.commonmodule.adapters;
import android.content.Context;
import android.graphics.Color;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import com.tengshisoft.commonmodule.R;
import com.tengshisoft.commonmodule.beans.GridIncidentStatisticsBean;
import com.tengshisoft.commonmodule.holders.IncidentStatisticsHolder;
import com.tenlionsoft.baselib.core.widget.base.BaseRecyclerAdapter;
import com.tenlionsoft.baselib.utils.UserLgUtils;
import java.util.List;
/**
* 作者: adam
* 日期: 2021/9/26 - 3:01 下午
* 邮箱: itgaojian@163.com
* 描述: 汽车
*/
public class IncidentStatisticsAdapter extends BaseRecyclerAdapter<GridIncidentStatisticsBean.DataBean.VillageListBean, IncidentStatisticsHolder> {
public IncidentStatisticsAdapter(Context ctx, List<GridIncidentStatisticsBean.DataBean.VillageListBean> list) {
super(ctx, list);
}
@Override
public IncidentStatisticsHolder createHolder(ViewGroup parent, int viewType) {
View itemView = LayoutInflater.from(mContext).inflate(R.layout.item_grid_incident_statistics, parent, false);
return new IncidentStatisticsHolder(itemView);
}
@Override
public void bindHolder(IncidentStatisticsHolder h, int i) {
if (i == 0) {
h.mTvNumber.setText("排名");
h.mTvName.setText("网格员姓名");
h.mTvRanking.setText("上报事件");
h.mTvNumber.setTextColor(Color.parseColor("#A5A5A5"));
h.mTvName.setTextColor(Color.parseColor("#A5A5A5"));
h.mTvRanking.setTextColor(Color.parseColor("#A5A5A5"));
} else {
if (mData.get(i).getPm() == 1) {
h.mTvNumber.setTextColor(Color.parseColor("#FFFFFF"));
h.mTvName.setTextColor(Color.parseColor("#46494D"));
h.mTvRanking.setTextColor(Color.parseColor("#46494D"));
h.mTvNumber.setBackgroundResource(R.drawable.ic_statistics_one);
h.mTvRanking.setText(mData.get(i).getReportNum() + "");
h.mTvName.setText(mData.get(i).getUserName());
h.mTvNumber.setText(mData.get(i).getPm() + "");
} else if (mData.get(i).getPm() == 2) {
h.mTvNumber.setBackgroundResource(R.drawable.ic_statistics_two);
h.mTvNumber.setTextColor(Color.parseColor("#FFFFFF"));
h.mTvName.setTextColor(Color.parseColor("#46494D"));
h.mTvRanking.setTextColor(Color.parseColor("#46494D"));
h.mTvRanking.setText(mData.get(i).getReportNum() + "");
h.mTvName.setText(mData.get(i).getUserName());
h.mTvNumber.setText(mData.get(i).getPm() + "");
} else if (mData.get(i).getPm() == 3) {
h.mTvNumber.setBackgroundResource(R.drawable.ic_statistics_third);
h.mTvNumber.setTextColor(Color.parseColor("#FFFFFF"));
h.mTvName.setTextColor(Color.parseColor("#46494D"));
h.mTvRanking.setTextColor(Color.parseColor("#46494D"));
h.mTvRanking.setText(mData.get(i).getReportNum() + "");
h.mTvName.setText(mData.get(i).getUserName());
h.mTvNumber.setText(mData.get(i).getPm() + "");
} else {
h.mTvNumber.setBackgroundResource(0);
h.mTvNumber.setTextColor(Color.parseColor("#46494D"));
h.mTvName.setTextColor(Color.parseColor("#46494D"));
h.mTvRanking.setTextColor(Color.parseColor("#46494D"));
h.mTvRanking.setText(mData.get(i).getReportNum() + "");
h.mTvName.setText(mData.get(i).getUserName());
h.mTvNumber.setText(mData.get(i).getPm() + "");
}
}
if (i != 0) {
if (UserLgUtils.getUserId().equals(mData.get(i).getUserId())) {
h.mLlItemContent.setBackgroundResource(R.drawable.shp_shade_yellow_white);
} else {
h.mLlItemContent.setBackgroundResource(0);
}
}
}
}

View File

@ -10,9 +10,10 @@ import java.util.List;
*/
public class BuildingListBean {
private int page;
private int total;
private List<RowsBean> rows;
private int total;
public int getPage() {
return page;
@ -22,14 +23,6 @@ public class BuildingListBean {
this.page = page;
}
public int getTotal() {
return total;
}
public void setTotal(int total) {
this.total = total;
}
public List<RowsBean> getRows() {
return rows;
}
@ -38,25 +31,39 @@ public class BuildingListBean {
this.rows = rows;
}
public int getTotal() {
return total;
}
public void setTotal(int total) {
this.total = total;
}
public static class RowsBean {
private String buildingId;
private String buildingNum;
private String buildingType;
private int dataFrom;
private int elevator;
private int floorCount;
private String floorCountForUnit;
private List<?> floorCountList;
private String floorCountStr;
private String grid;
private int houseCount;
private String houseCountForFloor;
private List<?> houseCountList;
private String houseCountStr;
private String latitude;
private String location;
private String locationCode;
private String longitude;
private String remake;
private String residentialId;
private String residentialName;
private int unitCount;
private String unitCountStr;
private List<?> floorCountList;
private List<?> houseCountList;
private List<?> unitCountList;
private String unitCountStr;
public String getBuildingId() {
return buildingId;
@ -82,6 +89,14 @@ public class BuildingListBean {
this.buildingType = buildingType;
}
public int getDataFrom() {
return dataFrom;
}
public void setDataFrom(int dataFrom) {
this.dataFrom = dataFrom;
}
public int getElevator() {
return elevator;
}
@ -106,6 +121,14 @@ public class BuildingListBean {
this.floorCountForUnit = floorCountForUnit;
}
public List<?> getFloorCountList() {
return floorCountList;
}
public void setFloorCountList(List<?> floorCountList) {
this.floorCountList = floorCountList;
}
public String getFloorCountStr() {
return floorCountStr;
}
@ -114,6 +137,14 @@ public class BuildingListBean {
this.floorCountStr = floorCountStr;
}
public String getGrid() {
return grid;
}
public void setGrid(String grid) {
this.grid = grid;
}
public int getHouseCount() {
return houseCount;
}
@ -130,6 +161,14 @@ public class BuildingListBean {
this.houseCountForFloor = houseCountForFloor;
}
public List<?> getHouseCountList() {
return houseCountList;
}
public void setHouseCountList(List<?> houseCountList) {
this.houseCountList = houseCountList;
}
public String getHouseCountStr() {
return houseCountStr;
}
@ -138,6 +177,38 @@ public class BuildingListBean {
this.houseCountStr = houseCountStr;
}
public String getLatitude() {
return latitude;
}
public void setLatitude(String latitude) {
this.latitude = latitude;
}
public String getLocation() {
return location;
}
public void setLocation(String location) {
this.location = location;
}
public String getLocationCode() {
return locationCode;
}
public void setLocationCode(String locationCode) {
this.locationCode = locationCode;
}
public String getLongitude() {
return longitude;
}
public void setLongitude(String longitude) {
this.longitude = longitude;
}
public String getRemake() {
return remake;
}
@ -170,30 +241,6 @@ public class BuildingListBean {
this.unitCount = unitCount;
}
public String getUnitCountStr() {
return unitCountStr;
}
public void setUnitCountStr(String unitCountStr) {
this.unitCountStr = unitCountStr;
}
public List<?> getFloorCountList() {
return floorCountList;
}
public void setFloorCountList(List<?> floorCountList) {
this.floorCountList = floorCountList;
}
public List<?> getHouseCountList() {
return houseCountList;
}
public void setHouseCountList(List<?> houseCountList) {
this.houseCountList = houseCountList;
}
public List<?> getUnitCountList() {
return unitCountList;
}
@ -201,5 +248,13 @@ public class BuildingListBean {
public void setUnitCountList(List<?> unitCountList) {
this.unitCountList = unitCountList;
}
public String getUnitCountStr() {
return unitCountStr;
}
public void setUnitCountStr(String unitCountStr) {
this.unitCountStr = unitCountStr;
}
}
}

View File

@ -0,0 +1,259 @@
package com.tengshisoft.commonmodule.beans;
import java.util.List;
public class GridIncidentStatisticsBean {
private DataBean data;
public DataBean getData() {
return data;
}
public void setData(DataBean data) {
this.data = data;
}
public static class DataBean {
private int cityRank;
private String countDate;
private int countyRank;
private int countyStreetRank;
private NowUserVillageRankBean nowUserVillageRank;
private List<VillageListBean> villageList;
public int getCityRank() {
return cityRank;
}
public void setCityRank(int cityRank) {
this.cityRank = cityRank;
}
public String getCountDate() {
return countDate;
}
public void setCountDate(String countDate) {
this.countDate = countDate;
}
public int getCountyRank() {
return countyRank;
}
public void setCountyRank(int countyRank) {
this.countyRank = countyRank;
}
public int getCountyStreetRank() {
return countyStreetRank;
}
public void setCountyStreetRank(int countyStreetRank) {
this.countyStreetRank = countyStreetRank;
}
public NowUserVillageRankBean getNowUserVillageRank() {
return nowUserVillageRank;
}
public void setNowUserVillageRank(NowUserVillageRankBean nowUserVillageRank) {
this.nowUserVillageRank = nowUserVillageRank;
}
public List<VillageListBean> getVillageList() {
return villageList;
}
public void setVillageList(List<VillageListBean> villageList) {
this.villageList = villageList;
}
public static class NowUserVillageRankBean {
private String countDate;
private String countGridUserId;
private int noOverNum;
private int noSelfNum;
private int overNum;
private int pm;
private int reportNum;
private int selfNum;
private String userId;
private String userName;
public String getCountDate() {
return countDate;
}
public void setCountDate(String countDate) {
this.countDate = countDate;
}
public String getCountGridUserId() {
return countGridUserId;
}
public void setCountGridUserId(String countGridUserId) {
this.countGridUserId = countGridUserId;
}
public int getNoOverNum() {
return noOverNum;
}
public void setNoOverNum(int noOverNum) {
this.noOverNum = noOverNum;
}
public int getNoSelfNum() {
return noSelfNum;
}
public void setNoSelfNum(int noSelfNum) {
this.noSelfNum = noSelfNum;
}
public int getOverNum() {
return overNum;
}
public void setOverNum(int overNum) {
this.overNum = overNum;
}
public int getPm() {
return pm;
}
public void setPm(int pm) {
this.pm = pm;
}
public int getReportNum() {
return reportNum;
}
public void setReportNum(int reportNum) {
this.reportNum = reportNum;
}
public int getSelfNum() {
return selfNum;
}
public void setSelfNum(int selfNum) {
this.selfNum = selfNum;
}
public String getUserId() {
return userId;
}
public void setUserId(String userId) {
this.userId = userId;
}
public String getUserName() {
return userName;
}
public void setUserName(String userName) {
this.userName = userName;
}
}
public static class VillageListBean {
private String countDate;
private String countGridUserId;
private int noOverNum;
private int noSelfNum;
private int overNum;
private int pm;
private int reportNum;
private int selfNum;
private String userId;
private String userName;
public String getCountDate() {
return countDate;
}
public void setCountDate(String countDate) {
this.countDate = countDate;
}
public String getCountGridUserId() {
return countGridUserId;
}
public void setCountGridUserId(String countGridUserId) {
this.countGridUserId = countGridUserId;
}
public int getNoOverNum() {
return noOverNum;
}
public void setNoOverNum(int noOverNum) {
this.noOverNum = noOverNum;
}
public int getNoSelfNum() {
return noSelfNum;
}
public void setNoSelfNum(int noSelfNum) {
this.noSelfNum = noSelfNum;
}
public int getOverNum() {
return overNum;
}
public void setOverNum(int overNum) {
this.overNum = overNum;
}
public int getPm() {
return pm;
}
public void setPm(int pm) {
this.pm = pm;
}
public int getReportNum() {
return reportNum;
}
public void setReportNum(int reportNum) {
this.reportNum = reportNum;
}
public int getSelfNum() {
return selfNum;
}
public void setSelfNum(int selfNum) {
this.selfNum = selfNum;
}
public String getUserId() {
return userId;
}
public void setUserId(String userId) {
this.userId = userId;
}
public String getUserName() {
return userName;
}
public void setUserName(String userName) {
this.userName = userName;
}
}
}
}

View File

@ -0,0 +1,122 @@
package com.tengshisoft.commonmodule.beans;
public class GridPopulaceStatisticsBean {
private String zhongDianQingShaoNianZhanBi;
private int zhongDianQingShaoNian;
private int liuDong;
private int waiChuHuJi;
private int jingShen;
private int liuShou;
private int xingMan;
private int feiHuJi;
private int xiDu;
private int aiZi;
private int huJi;
private int jiaoZheng;
private int jingWai;
public int getJingWai() {
return jingWai;
}
public void setJingWai(int jingWai) {
this.jingWai = jingWai;
}
public String getZhongDianQingShaoNianZhanBi() {
return zhongDianQingShaoNianZhanBi;
}
public void setZhongDianQingShaoNianZhanBi(String zhongDianQingShaoNianZhanBi) {
this.zhongDianQingShaoNianZhanBi = zhongDianQingShaoNianZhanBi;
}
public int getZhongDianQingShaoNian() {
return zhongDianQingShaoNian;
}
public void setZhongDianQingShaoNian(int zhongDianQingShaoNian) {
this.zhongDianQingShaoNian = zhongDianQingShaoNian;
}
public int getLiuDong() {
return liuDong;
}
public void setLiuDong(int liuDong) {
this.liuDong = liuDong;
}
public int getWaiChuHuJi() {
return waiChuHuJi;
}
public void setWaiChuHuJi(int waiChuHuJi) {
this.waiChuHuJi = waiChuHuJi;
}
public int getJingShen() {
return jingShen;
}
public void setJingShen(int jingShen) {
this.jingShen = jingShen;
}
public int getLiuShou() {
return liuShou;
}
public void setLiuShou(int liuShou) {
this.liuShou = liuShou;
}
public int getXingMan() {
return xingMan;
}
public void setXingMan(int xingMan) {
this.xingMan = xingMan;
}
public int getFeiHuJi() {
return feiHuJi;
}
public void setFeiHuJi(int feiHuJi) {
this.feiHuJi = feiHuJi;
}
public int getXiDu() {
return xiDu;
}
public void setXiDu(int xiDu) {
this.xiDu = xiDu;
}
public int getAiZi() {
return aiZi;
}
public void setAiZi(int aiZi) {
this.aiZi = aiZi;
}
public int getHuJi() {
return huJi;
}
public void setHuJi(int huJi) {
this.huJi = huJi;
}
public int getJiaoZheng() {
return jiaoZheng;
}
public void setJiaoZheng(int jiaoZheng) {
this.jiaoZheng = jiaoZheng;
}
}

View File

@ -11,8 +11,8 @@ import java.util.List;
public class HouseListBean {
private int page;
private int total;
private List<RowsBean> rows;
private int total;
public int getPage() {
return page;
@ -22,14 +22,6 @@ public class HouseListBean {
this.page = page;
}
public int getTotal() {
return total;
}
public void setTotal(int total) {
this.total = total;
}
public List<RowsBean> getRows() {
return rows;
}
@ -38,16 +30,37 @@ public class HouseListBean {
this.rows = rows;
}
public int getTotal() {
return total;
}
public void setTotal(int total) {
this.total = total;
}
public static class RowsBean {
private String accountNum;
private String buildingHouseId;
private String buildingId;
private String buildingName;
private int dataType;
private String grid;
private String houseName;
private String houseNumber;
private String houseStatus;
private String location;
private String locationCode;
private String remake;
private String residentialName;
public String getAccountNum() {
return accountNum;
}
public void setAccountNum(String accountNum) {
this.accountNum = accountNum;
}
public String getBuildingHouseId() {
return buildingHouseId;
}
@ -80,6 +93,22 @@ public class HouseListBean {
this.dataType = dataType;
}
public String getGrid() {
return grid;
}
public void setGrid(String grid) {
this.grid = grid;
}
public String getHouseName() {
return houseName;
}
public void setHouseName(String houseName) {
this.houseName = houseName;
}
public String getHouseNumber() {
return houseNumber;
}
@ -96,6 +125,22 @@ public class HouseListBean {
this.houseStatus = houseStatus;
}
public String getLocation() {
return location;
}
public void setLocation(String location) {
this.location = location;
}
public String getLocationCode() {
return locationCode;
}
public void setLocationCode(String locationCode) {
this.locationCode = locationCode;
}
public String getRemake() {
return remake;
}

View File

@ -0,0 +1,227 @@
package com.tengshisoft.commonmodule.fragments;
import android.app.ProgressDialog;
import android.view.View;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.RadioButton;
import android.widget.RadioGroup;
import android.widget.TextView;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
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.tengshisoft.commonmodule.R;
import com.tengshisoft.commonmodule.R2;
import com.tengshisoft.commonmodule.adapters.IncidentStatisticsAdapter;
import com.tengshisoft.commonmodule.beans.GridIncidentStatisticsBean;
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.widget.base.BaseFragment;
import com.tenlionsoft.baselib.core.widget.views.CustomStateView;
import com.tenlionsoft.baselib.utils.ExceptionHandler;
import com.tenlionsoft.baselib.utils.LogUtils;
import com.tenlionsoft.baselib.utils.StringUtils;
import com.tenlionsoft.baselib.utils.UIUtil;
import com.tenlionsoft.baselib.utils.UserLgUtils;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.Unbinder;
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
import io.reactivex.rxjava3.annotations.NonNull;
import io.reactivex.rxjava3.core.Observer;
import io.reactivex.rxjava3.disposables.Disposable;
import io.reactivex.rxjava3.schedulers.Schedulers;
/**
* 作者: adam
* 日期: 2021/11/9 - 9:50 上午
* 邮箱: itgaojian@163.com
* 描述: 网格员上报事件统计
*/
@Route(path = PathConfig.PATH_MODULE_COMMON_FRAGMENT_GRID_INCIDENT_STATISTICS)
public class IncidentGridStatisticsFragment extends BaseFragment {
@BindView(R2.id.iv_user_icon)
public ImageView mIvUserIcon;
@BindView(R2.id.tv_user_name)
public TextView mTvUserName;
@BindView(R2.id.tv_mine_ranking)
public TextView mTvMineRanking;
@BindView(R2.id.tv_mine_up)
public TextView mTvMineUp;
@BindView(R2.id.ll_mine_info)
public LinearLayout mLlMineInfo;
@BindView(R2.id.rb_month)
public RadioButton mRbMonth;
@BindView(R2.id.rb_year)
public RadioButton mRbYear;
@BindView(R2.id.rg_type)
public RadioGroup mRgType;
@BindView(R2.id.tv_city)
public TextView mTvCity;
@BindView(R2.id.tv_county)
public TextView mTvCounty;
@BindView(R2.id.tv_village)
public TextView mTvVillage;
@BindView(R2.id.tv_community_count)
public TextView mTvCommunityCount;
@BindView(R2.id.rlv_datas)
public RecyclerView mRlvDatas;
@BindView(R2.id.cv_state)
CustomStateView mCvState;
@BindView(R2.id.tv_end_date)
TextView mTvEndDate;
private Unbinder mBind;
private String mType = "2";//1 2月
private ProgressDialog mDialog;
private IncidentStatisticsAdapter mAdapter;
@Override
protected void setDataToView(View dataView) {
mBind = ButterKnife.bind(this, dataView);
setStateView(STATE_LOAD);
initView();
getIncidentRanking();
}
private void initView() {
mTvUserName.setText(UserLgUtils.getName());
mDialog = UIUtil.initDialog(mActivity, "加载中...");
Glide.with(mActivity)
.load(BaseUrlApi.BASE_IMG_URL + UserLgUtils.getAvatar())
.apply(RequestOptions.bitmapTransform(new CircleCrop())
.error(R.drawable.ic_user_default)
.placeholder(R.drawable.ic_user_default))
.into(mIvUserIcon);
mRgType.setOnCheckedChangeListener((group, checkedId) -> {
if (checkedId == R.id.rb_month) {
mType = "2";
} else {
mType = "1";
}
if (mDialog != null) {
mDialog.show();
}
getIncidentRanking();
});
}
private void getIncidentRanking() {
RetrofitManager.getInstance()
.create(GridApis.class)
.getGridIncidentRanking(UserLgUtils.getUserAreaCode(), mType, UserLgUtils.getToken())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<GridIncidentStatisticsBean>() {
@Override
public void onSubscribe(@NonNull Disposable d) {
}
@Override
public void onNext(@NonNull GridIncidentStatisticsBean b) {
if (mDialog != null && mDialog.isShowing()) {
mDialog.dismiss();
}
setInfoToView(b);
}
@Override
public void onError(@NonNull Throwable e) {
if (mDialog != null && mDialog.isShowing()) {
mDialog.dismiss();
}
ExceptionHandler.handleException(e);
setDefaultData();
mSrlView.setEnableLoadMore(false);
}
@Override
public void onComplete() {
}
});
}
/**
* 重置数据
*/
private void setDefaultData() {
setStateView(STATE_SUCCESS);
mSrlView.setEnableLoadMore(false);
mTvEndDate.setText("");
mTvMineUp.setText("0件");
mTvMineRanking.setText("0");
mTvCity.setText("0");
mTvCounty.setText("0");
mTvVillage.setText("0");
mTvCommunityCount.setText("共计" + 0 + "人本社区");
mCvState.setState(CustomStateView.STATE_ERROR);
mRlvDatas.setVisibility(View.GONE);
}
/**
* @param b
*/
private void setInfoToView(GridIncidentStatisticsBean b) {
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()) + "");
mTvCity.setText(b.getData().getCityRank() + "");
mTvCounty.setText(b.getData().getCountyRank() + "");
mTvVillage.setText(b.getData().getCountyStreetRank() + "");
mTvCommunityCount.setText("共计" + b.getData().getVillageList().size() + "人本社区");
LogUtils.e(b.getData().getVillageList().size() + "");
b.getData().getVillageList().add(0, new GridIncidentStatisticsBean.DataBean.VillageListBean());
if (b.getData().getVillageList() != null && b.getData().getVillageList().size() > 0) {
mCvState.setState(CustomStateView.STATE_SUCCESS);
mRlvDatas.setVisibility(View.VISIBLE);
IncidentStatisticsAdapter adapter = new IncidentStatisticsAdapter(mActivity, b.getData().getVillageList());
mRlvDatas.setLayoutManager(new LinearLayoutManager(mActivity) {
@Override
public boolean canScrollVertically() {
return false;
}
});//禁止RecyclerView滚动
mRlvDatas.setAdapter(adapter);
} else {
mCvState.setState(CustomStateView.STATE_EMPTY);
mRlvDatas.setVisibility(View.GONE);
}
}
/**
* 刷新
*/
@Override
public void refreshContentView(String... data) {
}
@Override
protected void refreshView() {
mSrlView.finishRefresh();
setStateView(STATE_LOAD);
getIncidentRanking();
}
@Override
protected void loadMoreData() {
}
@Override
protected int getContentViewId() {
return R.layout.fragment_grid_incident_statistics;
}
}

View File

@ -0,0 +1,453 @@
package com.tengshisoft.commonmodule.fragments;
import android.graphics.Color;
import android.graphics.Typeface;
import android.text.SpannableString;
import android.text.style.ForegroundColorSpan;
import android.text.style.RelativeSizeSpan;
import android.text.style.StyleSpan;
import android.text.style.UnderlineSpan;
import android.view.View;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.github.mikephil.charting.animation.Easing;
import com.github.mikephil.charting.charts.HorizontalBarChart;
import com.github.mikephil.charting.charts.PieChart;
import com.github.mikephil.charting.components.XAxis;
import com.github.mikephil.charting.components.YAxis;
import com.github.mikephil.charting.data.BarData;
import com.github.mikephil.charting.data.BarDataSet;
import com.github.mikephil.charting.data.BarEntry;
import com.github.mikephil.charting.data.PieData;
import com.github.mikephil.charting.data.PieDataSet;
import com.github.mikephil.charting.data.PieEntry;
import com.github.mikephil.charting.formatter.DefaultValueFormatter;
import com.github.mikephil.charting.formatter.LargeValueFormatter;
import com.github.mikephil.charting.formatter.PercentFormatter;
import com.github.mikephil.charting.utils.MPPointF;
import com.tengshisoft.commonmodule.R;
import com.tengshisoft.commonmodule.R2;
import com.tengshisoft.commonmodule.beans.GridPopulaceStatisticsBean;
import com.tengshisoft.commonmodule.nets.GridApis;
import com.tenlionsoft.baselib.constant.PathConfig;
import com.tenlionsoft.baselib.core.retrofit_net.RetrofitManager;
import com.tenlionsoft.baselib.core.widget.base.BaseFragment;
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.StringUtils;
import com.tenlionsoft.baselib.utils.TimeUtils;
import com.tenlionsoft.baselib.utils.UserLgUtils;
import java.util.ArrayList;
import java.util.List;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.Unbinder;
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
import io.reactivex.rxjava3.annotations.NonNull;
import io.reactivex.rxjava3.core.Observer;
import io.reactivex.rxjava3.disposables.Disposable;
import io.reactivex.rxjava3.schedulers.Schedulers;
/**
* 作者: adam
* 日期: 2021/11/9 - 9:50 上午
* 邮箱: itgaojian@163.com
* 描述: 网格员人口统计
*/
@Route(path = PathConfig.PATH_MODULE_COMMON_FRAGMENT_GRID_POPULACE_STATISTICS)
public class PopulaceGridStatisticsFragment extends BaseFragment {
@BindView(R2.id.pc_young)
PieChart mPcYoung;
@BindView(R2.id.tv_young_count)
TextView mTvYoungCount;
@BindView(R2.id.tv_end_time)
TypeBoldTextView mTvEndTime;//截止时间
@BindView(R2.id.pc_base)
PieChart mPcBase;//人口基础库
@BindView(R2.id.tv_base_register)
TypeBoldTextView mTvBaseRegister;//户籍人口
@BindView(R2.id.tv_no_register)
TypeBoldTextView mTvNoRegister;//非户籍人口
@BindView(R2.id.tv_register_out)
TypeBoldTextView mTvRegisterOut;//户籍人口(外出)
@BindView(R2.id.tv_flow_count)
TypeBoldTextView mTvFlowCount;//流动人口
@BindView(R2.id.tv_stay_count)
TypeBoldTextView mTvStayCount;//留守人员
@BindView(R2.id.hb_special)
HorizontalBarChart mHbSpecial;//特殊人群
@BindView(R2.id.ll_young)
LinearLayout mLlYoung;
private Unbinder mBind;
@Override
protected void setDataToView(View dataView) {
mBind = ButterKnife.bind(this, dataView);
setStateView(STATE_LOAD);
mSrlView.setEnableRefresh(false);
mSrlView.setEnableLoadMore(false);
initPieChart();
initHoChart();
initHalfChart();
getGridPopulaceStatistics();
}
/**
* 初始化重点青少年
*/
private void initHalfChart() {
mPcYoung.setUsePercentValues(true);
mPcYoung.getDescription().setEnabled(false);
mPcYoung.setExtraOffsets(5, 10, 5, 5);
mPcYoung.setDragDecelerationFrictionCoef(0.95f);
mPcYoung.setDrawHoleEnabled(true);
mPcYoung.setHoleColor(Color.WHITE);
mPcYoung.setTransparentCircleColor(Color.WHITE);
mPcYoung.setTransparentCircleAlpha(110);
mPcYoung.setHoleRadius(87f);
mPcYoung.setTransparentCircleRadius(50f);
mPcYoung.setDrawCenterText(true);
mPcYoung.setRotationEnabled(false);
mPcYoung.setHighlightPerTapEnabled(true);
mPcYoung.animateY(1400, Easing.EaseInOutQuad);
mPcYoung.setEntryLabelColor(Color.WHITE);
mPcYoung.setEntryLabelTextSize(12f);
mPcYoung.setDrawEntryLabels(false);
mPcYoung.getLegend().setEnabled(false);
mPcYoung.setNoDataText("您的网格内暂无重点青少年数据");
mPcYoung.setMaxAngle(180f); // HALF CHART
mPcYoung.setRotationAngle(180f);
mPcYoung.setCenterTextOffset(0, -20);
}
/**
* 显示重点青少年数据
*
* @param per
*/
private void setYoungData(String per) {
Double aDouble = Double.valueOf(per);
Double surplus = 100 - aDouble;
ArrayList<PieEntry> values = new ArrayList<>();
values.add(new PieEntry(aDouble.floatValue(), ""));
values.add(new PieEntry(surplus.floatValue(), ""));
PieDataSet dataSet = new PieDataSet(values, "");
dataSet.setSliceSpace(0f);
dataSet.setSelectionShift(0f);
dataSet.setColors(Color.rgb(48, 93, 253), Color.rgb(235, 240, 246));
PieData data = new PieData(dataSet);
data.setValueFormatter(new PercentFormatter());
data.setDrawValues(false);
data.setValueTextSize(11f);
data.setValueTextColor(Color.WHITE);
mPcYoung.setCenterText(youngCenterSpannableText(aDouble + ""));
mPcYoung.setData(data);
mPcYoung.invalidate();
//将图表移动到底部
mLlYoung.getViewTreeObserver()
.addOnGlobalLayoutListener(() -> {
//布局高度
int height = mLlYoung.getHeight();
int offset = (int) (height * 0.65);
LinearLayout.LayoutParams rlParams =
(LinearLayout.LayoutParams) mPcYoung.getLayoutParams();
rlParams.setMargins(0, 0, 0, -offset);
mPcYoung.setLayoutParams(rlParams);
});
}
/**
* 初始化特殊人群图表
*/
private void initHoChart() {
mHbSpecial.getDescription().setEnabled(false);
mHbSpecial.getLegend().setEnabled(false);
mHbSpecial.setExtraOffsets(0, 10, 10, 10);
mHbSpecial.setNoDataText("您的网格内暂无特殊人群数据");
mHbSpecial.setScaleXEnabled(true);
mHbSpecial.setScaleYEnabled(false);
mHbSpecial.setDrawGridBackground(false);//不绘制网格
setAxis();
}
private void setAxis() {
XAxis xAxis = mHbSpecial.getXAxis();
xAxis.setPosition(XAxis.XAxisPosition.BOTTOM);
xAxis.setDrawGridLines(false);
xAxis.setTextSize(12f);
xAxis.setLabelCount(6);
xAxis.setGranularity(1f);//防止放大图后,标签错乱
final String label[] = {"刑满释放人员", "社区矫正人员", "吸毒人员", "艾滋病危险人员", "精神障碍患者", "境外人员"};
xAxis.setValueFormatter(new LargeValueFormatter() {
@Override
public String getFormattedValue(float value) {
try {
return label[(int) value];
} catch (Exception e) {
return "";
}
}
});
YAxis axisRight = mHbSpecial.getAxisRight();
axisRight.setAxisMinimum(0f);
axisRight.setDrawGridLines(true);//绘制网格
axisRight.enableGridDashedLine(5f, 20f, 0f);
axisRight.setAxisMaximum(100f);
axisRight.setTextSize(12f);
axisRight.setValueFormatter(new DefaultValueFormatter(0));//显示整数
//不显示顶部的轴
YAxis axisLeft = mHbSpecial.getAxisLeft();
axisLeft.setAxisMinimum(0f);
axisLeft.setAxisMaximum(100f);
axisLeft.setEnabled(false);
}
private void initPieChart() {
mPcBase.setUsePercentValues(true);
mPcBase.getDescription().setEnabled(false);
mPcBase.setExtraOffsets(5, 10, 5, 5);
mPcBase.setDragDecelerationFrictionCoef(0.95f);
mPcBase.setDrawHoleEnabled(true);
mPcBase.setHoleColor(Color.WHITE);
mPcBase.setTransparentCircleColor(Color.WHITE);
mPcBase.setTransparentCircleAlpha(110);
mPcBase.setHoleRadius(90f);//饼状图中间圆的半径大小
mPcBase.setTransparentCircleRadius(120f);//圆环的半径
mPcBase.setDrawCenterText(true);
mPcBase.setRotationAngle(0);
mPcBase.setRotationEnabled(true);
mPcBase.setHighlightPerTapEnabled(true);
mPcBase.animateY(1400, Easing.EaseInOutQuad);
mPcBase.setEntryLabelColor(Color.WHITE);
mPcBase.setEntryLabelTextSize(12f);
mPcBase.setDrawEntryLabels(false);
mPcBase.getLegend().setEnabled(false);
mPcBase.setNoDataText("您的网格内暂无人口数据");
}
/**
* 显示人口基础库数据
*/
private void setBasePopulace(float reigster, float noRegister, float out) {
ArrayList<PieEntry> entries = new ArrayList<>();
entries.add(new PieEntry(reigster, "", ""));
entries.add(new PieEntry(noRegister, "", ""));
entries.add(new PieEntry(out, "", ""));
PieDataSet dataSet = new PieDataSet(entries, "");
dataSet.setDrawIcons(false);
dataSet.setSliceSpace(0f);
dataSet.setIconsOffset(new MPPointF(0, 40));
dataSet.setSelectionShift(5f);
ArrayList<Integer> colors = new ArrayList<>();
colors.add(Color.rgb(3, 197, 145));
colors.add(Color.rgb(37, 121, 251));
colors.add(Color.rgb(255, 154, 5));
dataSet.setColors(colors);
PieData data = new PieData(dataSet);
data.setValueFormatter(new PercentFormatter());
data.setDrawValues(false);
data.setValueTextSize(11f);
data.setValueTextColor(Color.WHITE);
float total = noRegister + reigster + out;
mPcBase.setCenterText(generateCenterSpannableText(total));
mPcBase.setData(data);
mPcBase.highlightValues(null);
mPcBase.invalidate();
}
/**
* 设置特殊人群数据
*
* @param zf 刑满释放
* @param jz 社区矫正
* @param xd 吸毒人员
* @param az 艾滋病
* @param zs 精神
* @param jw 境外
*/
private void setSpecialData(float zf, float jz, float xd, float az, float zs, float jw) {
//挑选一个最大值
float maxiNum = getMaxNum(zf, jz, xd, az, zs, jw);
LogUtils.e("最大值=" + maxiNum);
YAxis axisRight = mHbSpecial.getAxisRight();
axisRight.setAxisMinimum(0f);
axisRight.setAxisMaximum(maxiNum);
axisRight.setValueFormatter(new DefaultValueFormatter(0));//显示整数
YAxis axisLeft = mHbSpecial.getAxisLeft();
axisLeft.setAxisMinimum(0f);
axisLeft.setAxisMaximum(maxiNum);
List<BarEntry> entryList = new ArrayList<>();
entryList.add(new BarEntry(0, zf));
entryList.add(new BarEntry(1, jz));
entryList.add(new BarEntry(2, xd));
entryList.add(new BarEntry(3, az));
entryList.add(new BarEntry(4, zs));
entryList.add(new BarEntry(5, jw));
BarDataSet barDataSet = new BarDataSet(entryList, "");
barDataSet.setColors(Color.rgb(47, 92, 251),
Color.rgb(47, 92, 251),
Color.rgb(47, 92, 251),
Color.rgb(47, 92, 251),
Color.rgb(47, 92, 251),
Color.rgb(47, 92, 251));
barDataSet.setValueTextColor(Color.BLACK);
barDataSet.setValueFormatter(new DefaultValueFormatter(0));//柱子上面的数
barDataSet.setValueTextSize(14f);
BarData data = new BarData(barDataSet);
data.setBarWidth(0.4f);//设置柱子的宽度
mHbSpecial.setData(data);
}
private float getMaxNum(float zf, float jz, float xd, float az, float zs, float jw) {
float[] array = {zf, jz, xd, az, zs, jw};
float max = array[0];
for (int i = 0; i < array.length; i++) {
if (max < array[i]) {
max = array[i];
}
}
float maxiNum = (int) (max / 100) * 100;
if (maxiNum > 99) {
maxiNum += 100;
} else {
maxiNum += 10;
}
return maxiNum;
}
private SpannableString generateCenterSpannableText(float total) {
String content = StringUtils.numAddUnit((int) total) + "\n人口合计";
SpannableString s = new SpannableString(content);
s.setSpan(new StyleSpan(Typeface.BOLD), 0, content.indexOf(""), 0);
s.setSpan(new RelativeSizeSpan(1.3f), 0, content.indexOf(""), 0);
if (content.contains("")) {
s.setSpan(new RelativeSizeSpan(0.6f), content.indexOf(""), content.indexOf("") + 1,
0);
}
return s;
}
private SpannableString youngCenterSpannableText(String str) {
String content = str + "%\n重点青少年占比";
SpannableString s = new SpannableString(content);
s.setSpan(new StyleSpan(Typeface.BOLD), 0, content.indexOf(""), 0);
s.setSpan(new ForegroundColorSpan(Color.parseColor("#2F5CFB")), 0, content.indexOf(""), 0);
s.setSpan(new RelativeSizeSpan(1.3f), 0, content.indexOf(""), 0);
return s;
}
private void getGridPopulaceStatistics() {
RetrofitManager.getInstance()
.create(GridApis.class)
.getGridPopulaceRanking("", UserLgUtils.getToken())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<GridPopulaceStatisticsBean>() {
@Override
public void onSubscribe(@NonNull Disposable d) {
}
@Override
public void onNext(@NonNull GridPopulaceStatisticsBean b) {
setStateView(STATE_SUCCESS);
setInfoToView(b);
}
@Override
public void onError(@NonNull Throwable e) {
ExceptionHandler.handleException(e);
setStateView(STATE_ERROR);
mSrlView.setEnableLoadMore(false);
mSrlView.setEnableRefresh(true);
}
@Override
public void onComplete() {
}
});
}
/**
* 展示数据
*
* @param b
*/
private void setInfoToView(GridPopulaceStatisticsBean b) {
mSrlView.setEnableLoadMore(false);
mSrlView.setEnableRefresh(true);
mTvEndTime.setText("截止时间:" + TimeUtils.getCurrentDate());
mTvBaseRegister.setText(b.getHuJi() + "");//户籍人口
mTvRegisterOut.setText(b.getWaiChuHuJi() + "");//户籍人口外出
mTvNoRegister.setText(b.getFeiHuJi() + "");//非户籍人口
mTvFlowCount.setText(b.getLiuDong() + "");//流动人口
mTvStayCount.setText(b.getLiuShou() + "");//留守人员
mTvYoungCount.setText(getYoungCount(b.getZhongDianQingShaoNian()));
if (b.getHuJi() > 0 || b.getFeiHuJi() > 0 || b.getWaiChuHuJi() > 0) {
setBasePopulace(b.getHuJi(), b.getFeiHuJi(), b.getWaiChuHuJi());
}
//特殊人群
setSpecialData(b.getXingMan(), b.getJiaoZheng(), b.getXiDu(), b.getAiZi(), b.getJingShen(), b.getJingWai());
//重点青少年
setYoungData(b.getZhongDianQingShaoNianZhanBi());
}
private SpannableString getYoungCount(int zhongDianQingShaoNian) {
String content = "重点青少年" + zhongDianQingShaoNian + "";
SpannableString s = new SpannableString(content);
s.setSpan(new ForegroundColorSpan(Color.parseColor("#2F5CFB")), content.indexOf("") + 1, content.indexOf(""),
0);
s.setSpan(new UnderlineSpan(), content.indexOf("") + 1, content.indexOf(""), 0);
s.setSpan(new StyleSpan(Typeface.BOLD), content.indexOf("") + 1, content.indexOf(""),
0);
return s;
}
/**
* 刷新
*/
@Override
public void refreshContentView(String... data) {
}
@Override
protected void refreshView() {
setStateView(STATE_LOAD);
mSrlView.finishRefresh();
getGridPopulaceStatistics();
}
@Override
protected void loadMoreData() {
}
@Override
protected int getContentViewId() {
return R.layout.fragment_grid_populace_statistics;
}
}

View File

@ -22,11 +22,13 @@ public class BuildingListHolder extends RecyclerView.ViewHolder {
public TextView mTvCommunityName;
public TextView mTvType;
public TextView mTvNumber;
public TextView mTvLocation;
public BuildingListHolder(@NonNull @NotNull View itemView) {
super(itemView);
mTvCommunityName = itemView.findViewById(R.id.tv_community_name);
mTvType = itemView.findViewById(R.id.tv_type);
mTvNumber = itemView.findViewById(R.id.tv_number);
mTvLocation= itemView.findViewById(R.id.tv_community_address);
}
}

View File

@ -24,6 +24,7 @@ public class CommunityAreaListHolder extends RecyclerView.ViewHolder {
public TextView mTvPhone;
public TextView mTvCommunityAddress;
public CheckBox mCbCheck;
public TextView mTvShow;
public CommunityAreaListHolder(@NonNull @NotNull View itemView) {
super(itemView);
@ -32,5 +33,6 @@ public class CommunityAreaListHolder extends RecyclerView.ViewHolder {
mCbCheck = itemView.findViewById(R.id.cb_check);
mTvMaster = itemView.findViewById(R.id.tv_master);
mTvPhone = itemView.findViewById(R.id.tv_phone);
mTvShow= itemView.findViewById(R.id.tv_show);
}
}

View File

@ -23,12 +23,13 @@ public class CommunityListHolder extends RecyclerView.ViewHolder {
public TextView mTvCommunity;
public TextView mTvCommunityAddress;
public CheckBox mCbCheck;
public TextView mTvShow;
public CommunityListHolder(@NonNull @NotNull View itemView) {
super(itemView);
mTvCommunity = itemView.findViewById(R.id.tv_community);
mTvCommunityName = itemView.findViewById(R.id.tv_community_name);
mTvCommunityAddress = itemView.findViewById(R.id.tv_community_address);
mCbCheck = itemView.findViewById(R.id.cb_check);
mTvShow= itemView.findViewById(R.id.tv_show);
}
}

View File

@ -3,13 +3,13 @@ package com.tengshisoft.commonmodule.holders;
import android.view.View;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import com.tengshisoft.commonmodule.R;
import org.jetbrains.annotations.NotNull;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
/**
* 作者: adam
* 日期: 2021/9/26 - 3:01 下午
@ -21,11 +21,13 @@ public class HouseListHolder extends RecyclerView.ViewHolder {
public TextView mTvCommunityName;
public TextView mTvType;
public TextView mTvNumber;
public TextView mTvLocation;
public HouseListHolder(@NonNull @NotNull View itemView) {
super(itemView);
mTvCommunityName = itemView.findViewById(R.id.tv_community_name);
mTvType = itemView.findViewById(R.id.tv_type);
mTvNumber = itemView.findViewById(R.id.tv_number);
mTvLocation = itemView.findViewById(R.id.tv_community_address);
}
}

View File

@ -0,0 +1,25 @@
package com.tengshisoft.commonmodule.holders;
import android.view.View;
import android.widget.LinearLayout;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import com.tengshisoft.commonmodule.R;
public class IncidentStatisticsHolder extends RecyclerView.ViewHolder {
public TextView mTvNumber;
public TextView mTvName;
public TextView mTvRanking;
public LinearLayout mLlItemContent;
public IncidentStatisticsHolder(@NonNull View itemView) {
super(itemView);
mTvNumber = itemView.findViewById(R.id.tv_number);
mTvName = itemView.findViewById(R.id.tv_name);
mTvRanking = itemView.findViewById(R.id.tv_ranking);
mLlItemContent= itemView.findViewById(R.id.ll_item_content);
}
}

View File

@ -1569,6 +1569,23 @@ public interface GridApis {
@GET("app/evaluate/getbyreportid/{reportId}")
Observable<IncidentAppraiseDetailBean> getIncidentAppraiseDetailById(@Path("reportId") String id,
@Header("token") String token);
/**
* 网格员上报量统计
*/
@Headers({"base_url_name:case", "Content-Type: application/json", "Accept: application/json"})
@GET("app/countgriduser/get-user-report-rank/{areaCode}/{type}")
Observable<GridIncidentStatisticsBean> getGridIncidentRanking(@Path("areaCode") String areaCode,
@Path("type") String type,
@Header("token") String token);
/**
* 网格员网格内人口数据统计
* /
*/
@Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"})
@GET("app/basepopulationinfo/population-count-data")
Observable<GridPopulaceStatisticsBean> getGridPopulaceRanking(@Query("areaCode") String areaCode,
@Header("token") String token);
/*=========================================任务=========================================*/
/**

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 683 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 35 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 50 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 64 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 256 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/label_blue" />
</shape>

View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/label_green" />
</shape>

View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/label_yellow" />
</shape>

View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:angle="0"
android:centerColor="#FFFDF8DE"
android:endColor="#00FFFFFF"
android:startColor="#FFFCF4CF"
android:type="linear" />
<corners
android:bottomLeftRadius="20dp"
android:topLeftRadius="20dp" />
</shape>

View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/ic_statistics_radio_bg" android:state_checked="true" />
<item android:drawable="@drawable/shp_trans" android:state_checked="false" />
</selector>

View File

@ -0,0 +1,318 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/ic_incident_statistics_bg"
tools:context=".activitys.logs.GridIncidentStatisticsActivity">
<ImageView
android:id="@+id/iv_page_back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:layout_marginTop="48dp"
android:src="@drawable/ic_arrow_left_white_48" />
<ImageView
android:id="@+id/iv_page_title"
android:layout_width="140dp"
android:layout_height="63dp"
android:layout_below="@id/iv_page_back"
android:layout_marginLeft="20dp"
android:layout_marginTop="22dp"
android:scaleType="fitXY"
android:src="@drawable/ic_statistics_page_title" />
<LinearLayout
android:id="@+id/ll_mine_info"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/iv_page_title"
android:layout_marginStart="20dp"
android:layout_marginTop="20dp"
android:layout_marginEnd="20dp"
android:layout_marginBottom="20dp"
android:background="@drawable/shp_rectangle_white_5"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingLeft="16dp"
android:paddingTop="20dp"
android:paddingBottom="20dp">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="我的\n排名"
android:textColor="@color/black"
android:textSize="@dimen/text_14"
android:textStyle="bold" />
<ImageView
android:id="@+id/iv_user_icon"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginLeft="10dp"
tools:src="@drawable/ic_user_default" />
<TextView
android:id="@+id/tv_user_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:textColor="@color/black"
android:textSize="@dimen/text_14"
android:textStyle="bold"
tools:text="张三" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_mine_ranking"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/text_yellow_F1"
android:textSize="@dimen/text_14"
android:textStyle="bold"
tools:text="第三名" />
<View
android:layout_width="2dp"
android:layout_height="match_parent"
android:layout_margin="5dp"
android:background="@color/gray_bg" />
<TextView
android:id="@+id/tv_mine_up"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="20dp"
android:textColor="@color/text_yellow_F1"
android:textSize="@dimen/text_14"
android:textStyle="bold"
tools:text="24件" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/ll_mine_info"
android:orientation="vertical">
<RadioGroup
android:id="@+id/rg_type"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:gravity="center"
android:orientation="horizontal"
android:padding="2dp">
<RadioButton
android:id="@+id/rb_month"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/switch_statistics_img"
android:button="@null"
android:checked="true"
android:gravity="center"
android:text="月度排行榜"
android:textColor="@color/white"
android:textStyle="bold" />
<RadioButton
android:id="@+id/rb_year"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:background="@drawable/switch_statistics_img"
android:button="@null"
android:gravity="center"
android:text="年度排行榜"
android:textColor="@color/white"
android:textStyle="bold" />
</RadioGroup>
<com.scwang.smart.refresh.layout.SmartRefreshLayout
android:id="@+id/srl_content"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:layout_marginTop="8dp"
android:layout_marginRight="20dp"
android:background="@drawable/shp_rectangle_white_5"
android:orientation="horizontal"
android:padding="20dp">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<TextView
android:id="@+id/tv_city"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="0"
android:textColor="@color/red_ff"
android:textSize="@dimen/text_25"
tools:text="10243" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="13dp"
android:gravity="center"
android:text="全市排名"
android:textColor="@color/gray_text"
android:textSize="@dimen/text_14" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<TextView
android:id="@+id/tv_county"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="0"
android:textColor="@color/text_blue_52"
android:textSize="@dimen/text_25"
tools:text="10243" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="13dp"
android:gravity="center"
android:text="全县排名"
android:textColor="@color/gray_text"
android:textSize="@dimen/text_14" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<TextView
android:id="@+id/tv_village"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="0"
android:textColor="@color/text_blue_79"
android:textSize="@dimen/text_25"
tools:text="10243" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="13dp"
android:gravity="center"
android:text="全镇排名"
android:textColor="@color/gray_text"
android:textSize="@dimen/text_14" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="20dp"
android:layout_marginRight="20dp"
android:background="@drawable/shp_rectangle_white_5"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:gravity="center_vertical">
<View
android:layout_width="5dp"
android:layout_height="match_parent"
android:background="@color/text_blue_52" />
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_weight="1"
android:text="本社区网格员排行榜"
android:textColor="@color/gray_text"
android:textSize="@dimen/text_14" />
<TextView
android:id="@+id/tv_community_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:textColor="@color/gray_text"
android:textSize="@dimen/text_14"
tools:text="共计7人本社区" />
</LinearLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.tenlionsoft.baselib.core.widget.views.CustomStateView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rlv_datas"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginTop="20dp"
android:layout_marginRight="10dp"
tools:listitem="@layout/item_grid_incident_statistics" />
</RelativeLayout>
</LinearLayout>
</LinearLayout>
</com.scwang.smart.refresh.layout.SmartRefreshLayout>
</LinearLayout>
</RelativeLayout>

View File

@ -0,0 +1,47 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/rl_page_content"
tools:background="@drawable/ic_incident_statistics_bg"
tools:context=".activitys.logs.GridIncidentStatisticsActivity">
<RelativeLayout
android:id="@+id/rl_page_title"
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_marginTop="48dp"
android:paddingLeft="20dp"
android:paddingRight="20dp">
<ImageView
android:id="@+id/iv_page_back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:src="@drawable/ic_arrow_left_white_48" />
<TextView
android:id="@+id/tv_change_page"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:clickable="true"
android:focusable="true"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:text="切换"
android:drawablePadding="10dp"
android:textStyle="bold"
android:drawableRight="@drawable/ic_change_page_icon"
android:textColor="@color/col_white_gray_press"
android:textSize="@dimen/text_15" />
</RelativeLayout>
<androidx.viewpager2.widget.ViewPager2
android:id="@+id/vp_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/rl_page_title" />
</RelativeLayout>

View File

@ -0,0 +1,330 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/transparent"
android:orientation="vertical"
tools:background="@drawable/ic_incident_statistics_bg">
<RelativeLayout
android:id="@+id/rl_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="22dp">
<ImageView
android:id="@+id/iv_page_title"
android:layout_width="140dp"
android:layout_height="63dp"
android:layout_centerVertical="true"
android:layout_marginLeft="20dp"
android:scaleType="fitXY"
android:src="@drawable/ic_statistics_page_title" />
<TextView
android:id="@+id/tv_end_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="20dp"
android:textColor="@color/white"
android:textSize="@dimen/text_14" />
</RelativeLayout>
<LinearLayout
android:id="@+id/ll_mine_info"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/rl_title"
android:layout_marginStart="20dp"
android:layout_marginTop="20dp"
android:layout_marginEnd="20dp"
android:layout_marginBottom="20dp"
android:background="@drawable/shp_rectangle_white_5"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingLeft="16dp"
android:paddingTop="20dp"
android:paddingBottom="20dp">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="我的\n排名"
android:textColor="@color/black"
android:textSize="@dimen/text_14"
android:textStyle="bold" />
<ImageView
android:id="@+id/iv_user_icon"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginLeft="10dp"
tools:src="@drawable/ic_user_default" />
<TextView
android:id="@+id/tv_user_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:textColor="@color/black"
android:textSize="@dimen/text_14"
android:textStyle="bold"
tools:text="张三" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_mine_ranking"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/text_yellow_F1"
android:textSize="@dimen/text_14"
android:textStyle="bold"
tools:text="第三名" />
<View
android:layout_width="2dp"
android:layout_height="match_parent"
android:layout_margin="5dp"
android:background="@color/gray_bg" />
<TextView
android:id="@+id/tv_mine_up"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="20dp"
android:textColor="@color/text_yellow_F1"
android:textSize="@dimen/text_14"
android:textStyle="bold"
tools:text="24件" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/ll_mine_info"
android:orientation="vertical">
<RadioGroup
android:id="@+id/rg_type"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:gravity="center"
android:orientation="horizontal"
android:padding="2dp">
<RadioButton
android:id="@+id/rb_month"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/switch_statistics_img"
android:button="@null"
android:checked="true"
android:gravity="center"
android:text="月度排行榜"
android:textColor="@color/white"
android:textStyle="bold" />
<RadioButton
android:id="@+id/rb_year"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:background="@drawable/switch_statistics_img"
android:button="@null"
android:gravity="center"
android:text="年度排行榜"
android:textColor="@color/white"
android:textStyle="bold" />
</RadioGroup>
<androidx.core.widget.NestedScrollView
android:id="@+id/srl_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:srlEnablePureScrollMode="true">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:layout_marginTop="8dp"
android:layout_marginRight="20dp"
android:background="@drawable/shp_rectangle_white_5"
android:orientation="horizontal"
android:padding="20dp">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<TextView
android:id="@+id/tv_city"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="0"
android:textColor="@color/red_ff"
android:textSize="@dimen/text_25"
tools:text="10243" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="13dp"
android:gravity="center"
android:text="全市排名"
android:textColor="@color/gray_text"
android:textSize="@dimen/text_14" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<TextView
android:id="@+id/tv_county"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="0"
android:textColor="@color/text_blue_52"
android:textSize="@dimen/text_25"
tools:text="10243" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="13dp"
android:gravity="center"
android:text="全县排名"
android:textColor="@color/gray_text"
android:textSize="@dimen/text_14" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<TextView
android:id="@+id/tv_village"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="0"
android:textColor="@color/text_blue_79"
android:textSize="@dimen/text_25"
tools:text="10243" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="13dp"
android:gravity="center"
android:text="全镇排名"
android:textColor="@color/gray_text"
android:textSize="@dimen/text_14" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="20dp"
android:layout_marginRight="20dp"
android:background="@drawable/shp_rectangle_white_5"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:gravity="center_vertical">
<View
android:layout_width="5dp"
android:layout_height="match_parent"
android:background="@color/text_blue_52" />
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_weight="1"
android:text="本社区网格员排行榜"
android:textColor="@color/gray_text"
android:textSize="@dimen/text_14" />
<TextView
android:id="@+id/tv_community_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:textColor="@color/gray_text"
android:textSize="@dimen/text_14"
tools:text="共计7人本社区" />
</LinearLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.tenlionsoft.baselib.core.widget.views.CustomStateView
android:id="@+id/cv_state"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rlv_datas"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginTop="20dp"
android:layout_marginRight="10dp"
tools:listitem="@layout/item_grid_incident_statistics" />
</RelativeLayout>
</LinearLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</LinearLayout>
</RelativeLayout>

View File

@ -0,0 +1,406 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:background="@drawable/ic_populace_statistics_bg">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/transparent"
android:orientation="vertical">
<ImageView
android:layout_width="match_parent"
android:layout_height="110dp"
android:layout_margin="20dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_populace_statistics_title" />
<com.tenlionsoft.baselib.core.widget.views.TypeBoldTextView
android:id="@+id/tv_end_time"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginRight="20dp"
android:gravity="right"
android:textColor="@color/white"
android:textSize="@dimen/text_12"
tools:text="截止时间:2033-22-22" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:layout_marginTop="10dp"
android:layout_marginRight="20dp"
android:layout_marginBottom="20dp"
android:background="@drawable/shp_rectangle_white_5"
android:orientation="vertical"
android:padding="10dp"
tools:visibility="visible">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:layout_width="17dp"
android:layout_height="17dp"
android:scaleType="fitXY"
android:src="@drawable/ic_base_populace_icon" />
<com.tenlionsoft.baselib.core.widget.views.TypeBoldTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="7dp"
android:text="人口基础信息库"
android:textColor="@color/black"
android:textSize="@dimen/text_14"
android:textStyle="bold" />
</LinearLayout>
<com.github.mikephil.charting.charts.PieChart
android:id="@+id/pc_base"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="200dp"
android:layout_gravity="center" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="horizontal">
<ImageView
android:layout_width="16dp"
android:layout_height="11dp"
android:src="@drawable/shp_label_green" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:ellipsize="end"
android:gravity="center"
android:maxLines="1"
android:text="户籍人口"
android:textColor="@color/gray_text_8A"
android:textSize="@dimen/text_12" />
</LinearLayout>
<com.tenlionsoft.baselib.core.widget.views.TypeBoldTextView
android:id="@+id/tv_base_register"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:text="0"
android:textColor="@color/black"
android:textSize="@dimen/text_16"
android:textStyle="bold"
tools:text="57.67万" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="horizontal">
<ImageView
android:layout_width="16dp"
android:layout_height="11dp"
android:src="@drawable/shp_label_blue" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:ellipsize="end"
android:gravity="center"
android:maxLines="1"
android:text="非户籍人口"
android:textColor="@color/gray_text_8A"
android:textSize="@dimen/text_12" />
</LinearLayout>
<com.tenlionsoft.baselib.core.widget.views.TypeBoldTextView
android:id="@+id/tv_no_register"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:text="0"
android:textColor="@color/black"
android:textSize="@dimen/text_16"
android:textStyle="bold"
tools:text="57.67万" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="horizontal">
<ImageView
android:layout_width="16dp"
android:layout_height="11dp"
android:src="@drawable/shp_label_yellow" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:ellipsize="end"
android:gravity="center"
android:maxLines="1"
android:text="户籍人口(外出)"
android:textColor="@color/gray_text_8A"
android:textSize="@dimen/text_12" />
</LinearLayout>
<com.tenlionsoft.baselib.core.widget.views.TypeBoldTextView
android:id="@+id/tv_register_out"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:text="0"
android:textColor="@color/black"
android:textSize="@dimen/text_16"
android:textStyle="bold"
tools:text="57.67万" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:background="@drawable/shp_rectangle_white_5"
android:orientation="vertical"
android:padding="10dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:layout_width="17dp"
android:layout_height="17dp"
android:src="@drawable/ic_common_populace_icon" />
<com.tenlionsoft.baselib.core.widget.views.TypeBoldTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:text="普通人群"
android:textColor="@color/black"
android:textSize="@dimen/text_14"
android:textStyle="bold" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:orientation="horizontal">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/shp_rectangle_blue_shallow"
android:gravity="center"
android:minHeight="78dp"
android:orientation="vertical"
android:padding="10dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="流动人口"
android:textColor="@color/gray_text_89"
android:textSize="@dimen/text_12" />
<com.tenlionsoft.baselib.core.widget.views.TypeBoldTextView
android:id="@+id/tv_flow_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="0"
android:textColor="@color/label_blue"
android:textSize="@dimen/text_20"
android:textStyle="bold"
tools:text="1,999,999,999" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_weight="1"
android:background="@drawable/shp_rectangle_blue_shallow"
android:gravity="center"
android:minHeight="78dp"
android:orientation="vertical"
android:padding="10dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="留守人员"
android:textColor="@color/gray_text_89"
android:textSize="@dimen/text_12" />
<com.tenlionsoft.baselib.core.widget.views.TypeBoldTextView
android:id="@+id/tv_stay_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="0"
android:textColor="@color/label_blue"
android:textSize="@dimen/text_20"
android:textStyle="bold"
tools:text="1,999,999,999" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<!--特殊人群-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:layout_marginTop="20dp"
android:layout_marginRight="20dp"
android:background="@drawable/shp_rectangle_white_5"
android:orientation="vertical"
tools:visibility="visible">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="10dp">
<ImageView
android:layout_width="16dp"
android:layout_height="16dp"
android:src="@drawable/ic_special_populace_icon" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:text="特殊人群"
android:textColor="@color/black"
android:textSize="@dimen/text_14"
android:textStyle="bold" />
</LinearLayout>
<com.github.mikephil.charting.charts.HorizontalBarChart
android:id="@+id/hb_special"
android:layout_width="match_parent"
android:layout_height="300dp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:layout_marginTop="20dp"
android:layout_marginRight="20dp"
android:background="@drawable/shp_rectangle_white_5"
android:orientation="vertical"
android:padding="10dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:layout_width="16dp"
android:layout_height="16dp"
android:src="@drawable/ic_yong_populace_icon" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:text="重点青少年"
android:textColor="@color/black"
android:textSize="@dimen/text_14"
android:textStyle="bold" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_young"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<com.github.mikephil.charting.charts.PieChart
android:id="@+id/pc_young"
android:layout_width="match_parent"
android:layout_height="200dp" />
<TextView
android:id="@+id/tv_young_count"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/pc_young"
android:gravity="center"
android:textColor="@color/gray_text_8A"
android:textSize="@dimen/text_14"
android:text="重点青少年0人"
tools:text="重点青少年1091人" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>

View File

@ -4,47 +4,116 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:background="@color/transparent"
android:orientation="horizontal"
android:paddingLeft="12dp"
android:paddingRight="12dp"
android:paddingBottom="12dp">
android:background="@color/white"
android:orientation="vertical"
android:padding="12dp">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1">
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
android:layout_width="51dp"
android:layout_height="51dp"
android:src="@drawable/ic_house_community_icon" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
<TextView
android:id="@+id/tv_community_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_weight="1"
android:ellipsize="end"
android:maxLines="1"
android:textColor="@color/text_20"
android:textSize="15sp"
android:textStyle="bold"
tools:text="小区名称小区名称小区名称小区名称小区名称小区名称小区名称小区名称小区名称小区名称小区名称小区名称小区名称" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginTop="10dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:layout_width="13dp"
android:layout_height="13dp"
android:scaleType="fitXY"
android:src="@drawable/ic_house_icon" />
<TextView
android:id="@+id/tv_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:gravity="center"
android:textColor="@color/text_blue"
android:textSize="12dp"
tools:text="22" />
</LinearLayout>
</LinearLayout>
<TextView
android:id="@+id/tv_community_name"
android:id="@+id/tv_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="2"
android:textColor="@color/text_20"
android:textSize="15sp"
android:textStyle="bold"
tools:text="小区名称" />
<TextView
android:id="@+id/tv_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:background="@drawable/shp_rectangle_red_shallow"
android:gravity="center"
android:textColor="@color/text_20"
android:textSize="12sp"
tools:text="22" />
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:textColor="@color/red_37"
android:textSize="@dimen/text_12"
tools:text="住宅" />
</LinearLayout>
<TextView
android:id="@+id/tv_type"
android:layout_width="wrap_content"
<View
android:layout_width="match_parent"
android:layout_height="2dp"
android:layout_marginTop="10dp"
android:background="@drawable/shp_line_dotted" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/shp_status_blue"
android:gravity="center"
android:textColor="@color/text_20"
tools:text="住宅" />
android:layout_marginTop="10dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_community_address"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:layout_weight="1"
android:drawableLeft="@drawable/ic_location_gray_icon"
android:drawablePadding="5dp"
android:ellipsize="end"
android:maxLines="1"
android:textColor="@color/text_20"
android:textSize="12dp"
tools:text="中国内蒙古自治区包头市九原区X067中国内蒙古自治区包头市九原区X067中国内蒙古自治区包头市九原区X067中国内蒙古自治区包头市九原区X067中国内蒙古自治区包头市九原区X067中国内蒙古自治区包头市九原区X067(包哈公里)" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/shp_rectangle_blue_deep"
android:gravity="center"
android:paddingLeft="5dp"
android:paddingTop="3dp"
android:paddingRight="5dp"
android:paddingBottom="3dp"
android:text="查看详情"
android:textColor="@color/white"
android:textSize="@dimen/text_12" />
</LinearLayout>
</LinearLayout>

View File

@ -4,76 +4,131 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:background="@color/transparent"
android:background="@color/white"
android:padding="12dp"
android:orientation="horizontal">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_weight="1"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_community_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight=".4"
android:ellipsize="end"
android:maxLines="2"
android:textColor="@color/text_20"
android:textSize="15sp"
android:textStyle="bold"
tools:text="万水泉镇万水泉镇万水泉镇万水泉镇万水泉镇万水泉镇万水泉镇万水泉镇" />
<ImageView
android:layout_width="51dp"
android:layout_height="51dp"
android:src="@drawable/ic_house_community_icon" />
<TextView
android:id="@+id/tv_master"
android:layout_width="0dp"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:layout_weight=".2"
android:ellipsize="end"
android:gravity="center"
android:maxLines="2"
android:textColor="@color/text_20"
android:textSize="12sp"
tools:text="负责人" />
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_community_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight=".4"
android:ellipsize="end"
android:maxLines="1"
android:textColor="@color/text_20"
android:textSize="@dimen/text_15"
android:textStyle="bold"
tools:text="万水泉镇万水泉镇万水泉镇万水泉镇万水泉镇万水泉镇万水泉镇万水泉镇" />
<TextView
android:id="@+id/tv_show"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/shp_rectangle_blue_deep"
android:gravity="center"
android:paddingLeft="5dp"
android:paddingTop="3dp"
android:paddingRight="5dp"
android:paddingBottom="3dp"
android:text="查看详情"
android:textColor="@color/white"
android:textSize="@dimen/text_12" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginTop="10dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:layout_width="13dp"
android:layout_height="13dp"
android:scaleType="fitXY"
android:src="@drawable/ic_building_icon" />
<TextView
android:id="@+id/tv_master"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_weight=".2"
android:ellipsize="end"
android:gravity="left"
android:maxLines="1"
android:textColor="@color/text_blue"
android:textSize="12dp"
tools:text="负责人" />
<TextView
android:id="@+id/tv_phone"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_weight=".2"
android:ellipsize="end"
android:gravity="left"
android:maxLines="1"
android:textColor="@color/text_blue"
android:textSize="12dp"
tools:text="负责人" />
</LinearLayout>
</LinearLayout>
<TextView
android:id="@+id/tv_phone"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight=".2"
android:ellipsize="end"
android:gravity="center"
android:layerType="software"
android:maxLines="2"
android:textColor="@color/text_20"
android:textSize="12sp"
tools:text="联系方式" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="2dp"
android:layout_marginTop="10dp"
android:background="@drawable/shp_line_dotted" />
<TextView
android:id="@+id/tv_community_address"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:drawableLeft="@drawable/ic_location_black"
android:drawableLeft="@drawable/ic_location_gray_icon"
android:drawablePadding="5dp"
android:ellipsize="end"
android:maxLines="2"
android:maxLines="1"
android:textColor="@color/text_20"
android:textSize="12sp"
android:textSize="12dp"
tools:text="中国内蒙古自治区包头市九原区X067中国内蒙古自治区包头市九原区X067中国内蒙古自治区包头市九原区X067中国内蒙古自治区包头市九原区X067中国内蒙古自治区包头市九原区X067中国内蒙古自治区包头市九原区X067(包哈公里)" />
</LinearLayout>
<CheckBox
android:id="@+id/cb_check"
android:layout_width="wrap_content"
@ -91,6 +146,7 @@
android:paddingLeft="10dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:textSize="15sp" />
android:textSize="15sp"
tools:visibility="visible" />
</LinearLayout>

View File

@ -3,7 +3,8 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/transparent"
android:layout_marginTop="10dp"
android:background="@color/white"
android:orientation="horizontal"
android:padding="10dp">
@ -19,15 +20,23 @@
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView
android:layout_width="50dp"
android:layout_height="50dp"
android:scaleType="fitXY"
android:src="@drawable/ic_house_community_icon" />
<TextView
android:id="@+id/tv_community_name"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_weight="1"
android:ellipsize="end"
android:maxLines="2"
android:textStyle="bold"
android:textColor="@color/text_20"
android:textSize="15sp"
android:textSize="15dp"
android:textStyle="bold"
tools:text="王府明珠" />
<TextView
@ -35,25 +44,59 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:background="@drawable/shp_rectangle_red_shallow"
android:ellipsize="end"
android:maxLines="2"
android:textColor="@color/text_20"
android:textSize="12sp"
tools:text="社区名称" />
android:gravity="center"
android:maxEms="6"
android:maxLines="1"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:textColor="#F37575"
android:textSize="10dp"
tools:text="社区名称社区名称社区名称社区名称" />
</LinearLayout>
<TextView
android:id="@+id/tv_community_address"
<View
android:layout_width="match_parent"
android:layout_height="2dp"
android:layout_marginTop="10dp"
android:background="@drawable/shp_line_dotted" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:drawableLeft="@drawable/ic_location_black"
android:drawablePadding="5dp"
android:ellipsize="end"
android:maxLines="2"
android:textColor="@color/text_20"
android:textSize="12sp"
tools:text="中国内蒙古自治区包头市九原区X067中国内蒙古自治区包头市九原区X067中国内蒙古自治区包头市九原区X067中国内蒙古自治区包头市九原区X067中国内蒙古自治区包头市九原区X067中国内蒙古自治区包头市九原区X067(包哈公里)" />
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_community_address"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:layout_weight="1"
android:drawableLeft="@drawable/ic_location_gray_icon"
android:drawablePadding="5dp"
android:ellipsize="end"
android:maxLines="1"
android:textColor="@color/text_20"
android:textSize="12dp"
tools:text="中国内蒙古自治区包头市九原区X067中国内蒙古自治区包头市九原区X067中国内蒙古自治区包头市九原区X067中国内蒙古自治区包头市九原区X067中国内蒙古自治区包头市九原区X067中国内蒙古自治区包头市九原区X067(包哈公里)" />
<TextView
android:id="@+id/tv_show"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/shp_rectangle_blue_deep"
android:gravity="center"
android:paddingLeft="5dp"
android:paddingTop="3dp"
android:paddingRight="5dp"
android:paddingBottom="3dp"
android:text="查看详情"
android:textColor="@color/white"
android:textSize="@dimen/text_12" />
</LinearLayout>
</LinearLayout>
<CheckBox
@ -73,6 +116,7 @@
android:paddingLeft="10dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:textSize="15sp" />
android:textSize="15dp"
tools:visibility="gone" />
</LinearLayout>

View File

@ -0,0 +1,53 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="36dp"
android:layout_marginLeft="10dp"
android:layout_marginTop="10dp"
android:layout_marginRight="10dp"
android:orientation="horizontal">
<LinearLayout
android:id="@+id/ll_item_content"
android:layout_width="match_parent"
android:layout_height="36dp"
android:layout_centerVertical="true"
android:layout_marginLeft="-30dp"
android:layout_toRightOf="@id/tv_number"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_name"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginLeft="45dp"
android:layout_weight="1"
android:gravity="center_vertical"
android:textSize="@dimen/text_14"
tools:text="网格员姓名" />
<TextView
android:id="@+id/tv_ranking"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:textSize="@dimen/text_14"
tools:text="上报事件" />
</LinearLayout>
<TextView
android:id="@+id/tv_number"
android:layout_width="51dp"
android:layout_height="32dp"
android:layout_centerVertical="true"
android:gravity="center"
android:textSize="@dimen/text_14"
tools:background="@drawable/ic_statistics_one"
tools:text="1" />
</RelativeLayout>

View File

@ -1,51 +1,119 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:orientation="vertical">
android:background="@color/white"
android:orientation="vertical"
android:padding="12dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
android:layout_width="51dp"
android:layout_height="51dp"
android:src="@drawable/ic_house_community_icon" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
<TextView
android:id="@+id/tv_community_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_weight="1"
android:ellipsize="end"
android:maxLines="1"
android:textColor="@color/text_20"
android:textSize="15sp"
android:textStyle="bold"
tools:text="小区名称小区名称小区名称小区名称小区名称小区名称小区名称小区名称小区名称小区名称小区名称小区名称小区名称" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginTop="10dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:layout_width="13dp"
android:layout_height="13dp"
android:scaleType="fitXY"
android:src="@drawable/ic_building_icon" />
<TextView
android:id="@+id/tv_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:gravity="center"
android:textColor="@color/text_blue"
android:textSize="12dp"
tools:text="22" />
</LinearLayout>
</LinearLayout>
<TextView
android:id="@+id/tv_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/shp_rectangle_red_shallow"
android:gravity="center"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:textColor="@color/red_37"
android:textSize="@dimen/text_12"
tools:text="住宅" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="2dp"
android:layout_marginTop="10dp"
android:background="@drawable/shp_line_dotted" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
android:layout_marginTop="10dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_community_name"
android:layout_width="match_parent"
android:id="@+id/tv_community_address"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:layout_weight="1"
android:drawableLeft="@drawable/ic_location_gray_icon"
android:drawablePadding="5dp"
android:ellipsize="end"
android:maxLines="2"
android:maxLines="1"
android:textColor="@color/text_20"
android:textStyle="bold"
android:textSize="15sp"
tools:text="小区名称" />
android:textSize="12dp"
tools:text="中国内蒙古自治区包头市九原区X067中国内蒙古自治区包头市九原区X067中国内蒙古自治区包头市九原区X067中国内蒙古自治区包头市九原区X067中国内蒙古自治区包头市九原区X067中国内蒙古自治区包头市九原区X067(包哈公里)" />
<TextView
android:id="@+id/tv_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:background="@drawable/shp_rectangle_blue_deep"
android:gravity="center"
android:textColor="@color/text_20"
android:textSize="12sp"
tools:text="22" />
android:paddingLeft="5dp"
android:paddingTop="3dp"
android:paddingRight="5dp"
android:paddingBottom="3dp"
android:text="查看详情"
android:textColor="@color/white"
android:textSize="@dimen/text_12" />
</LinearLayout>
<TextView
android:id="@+id/tv_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:background="@drawable/shp_status_blue"
android:gravity="center"
android:textColor="@color/text_20"
tools:text="住宅" />
</RelativeLayout>
</LinearLayout>

View File

@ -4,6 +4,11 @@
package="com.tengshisoft.gridmodule">
<application>
<activity
android:name=".incident.activitys.building.activitys.HousePersonNewActivity"
android:exported="false"
android:launchMode="singleTop"
android:windowSoftInputMode="adjustPan|stateHidden" />
<activity
android:name=".incident.activitys.populace.CensusBaseSearchActivity"
android:exported="false"

View File

@ -0,0 +1,188 @@
package com.tengshisoft.gridmodule.incident.activitys.building.activitys;
import android.content.Intent;
import android.graphics.Color;
import android.view.View;
import androidx.annotation.Nullable;
import androidx.viewpager2.widget.ViewPager2;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.alibaba.android.arouter.launcher.ARouter;
import com.gyf.immersionbar.ImmersionBar;
import com.tengshisoft.gridmodule.R;
import com.tengshisoft.gridmodule.R2;
import com.tenlionsoft.baselib.constant.PathConfig;
import com.tenlionsoft.baselib.core.widget.base.BaseActivity;
import com.tenlionsoft.baselib.core.widget.base.BaseFragment;
import com.tenlionsoft.baselib.core.widget.base.BaseViewPage2Adapter;
import com.tenlionsoft.baselib.core.widget.base.ViewPageNavigatorAdapter;
import com.tenlionsoft.baselib.utils.UIUtil;
import net.lucode.hackware.magicindicator.MagicIndicator;
import net.lucode.hackware.magicindicator.buildins.commonnavigator.CommonNavigator;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.Unbinder;
/**
* 作者: Adam
* 日期: 2022年03月06日11:35:19
* 邮箱: itgaojian@163.com
* 描述: 人口房屋
*/
@Route(path = PathConfig.PATH_MODULE_GRID_ACTIVITY_HOUSE_PERSON_NEW)
public class HousePersonNewActivity extends BaseActivity {
@BindView(R2.id.mi_tabs)
MagicIndicator mMiTabs;
@BindView(R2.id.vp_content)
ViewPager2 mVpContent;
private String mSelCondition;
private Unbinder mBind;
private List<BaseFragment> mFragments;
private List<String> mTitles = Arrays.asList("人口库", "小区管理", "楼宇管理", "房屋管理", "社区管理", "以人找房");
private int mCurrentItem = 0;
@Override
protected int setLayoutId() {
return R.layout.activity_house_person_new;
}
@Override
public void initData() {
mBind = ButterKnife.bind(this);
mRlTitleBar.setVisibility(View.VISIBLE);
mRlTitleBar.setBackgroundColor(Color.WHITE);
mLlOnlySearchBar.setVisibility(View.VISIBLE);
mLlOnlySearchBar.setBackgroundColor(Color.WHITE);
mTvOnlyControl.setVisibility(View.VISIBLE);
mTvOnlyControl.setText("新增");
mTvOnlyControl.setTextColor(Color.BLACK);
mIvAppOnlyBack.setBackgroundResource(R.drawable.ic_back_black);
mTvOnlyControl.setOnClickListener(v -> {
switch (mCurrentItem) {
case 0://人口库
break;
case 1://小区管理
ARouter.getInstance()
.build(PathConfig.PATH_MODULE_GRID_ACTIVITY_COMMUNITY_ADD)
.navigation(mActivity, 12);
break;
case 2:// 楼宇管理
ARouter.getInstance()
.build(PathConfig.PATH_MODULE_GRID_ACTIVITY_BUILDING_ADD)
.navigation(mActivity, 12);
break;
case 3:// 房屋管理
break;
case 4:// 社区管理
break;
case 5://以人找房
break;
}
});
refreshView(STATE_LOAD_SUCCESS);
ImmersionBar.with(this)
.titleBar(mRlTitleBar)
.statusBarDarkFont(true)
.statusBarColor(R.color.white)
.init();
initContentView();
}
private void initContentView() {
mFragments = new ArrayList<>();
BaseFragment buildingAreaFragment = (BaseFragment) ARouter.getInstance()
.build(PathConfig.PATH_MODULE_GRID_FRAGMENT_BUILDINGAREA_MANAGE)
.navigation();//小区管理
BaseFragment buildingFragment = (BaseFragment) ARouter.getInstance()
.build(PathConfig.PATH_MODULE_GRID_FRAGMENT_BUILDING_MANAGE)
.navigation();//楼宇管理
BaseFragment houseFragment = (BaseFragment) ARouter.getInstance()
.build(PathConfig.PATH_MODULE_GRID_FRAGMENT_HOUSE_MANAGE)
.navigation();//房屋管理
BaseFragment communityFragment = (BaseFragment) ARouter.getInstance()
.build(PathConfig.PATH_MODULE_GRID_FRAGMENT_COMMUNITY_MANAGE)
.navigation();//社区管理
BaseFragment searchFragment = (BaseFragment) ARouter.getInstance()
.build(PathConfig.PATH_MODULE_GRID_FRAGMENT_SEARCH_HOUSE_BY_PERSON)
.navigation();//以人找房
BaseFragment personFragment = (BaseFragment) ARouter.getInstance()
.build(PathConfig.PATH_MODULE_GRID_FRAGMENT_PERSON_LIB)
.navigation();//人口库
mFragments.add(personFragment);
mFragments.add(buildingAreaFragment);
mFragments.add(buildingFragment);
mFragments.add(houseFragment);
mFragments.add(communityFragment);
mFragments.add(searchFragment);
mVpContent.setAdapter(new BaseViewPage2Adapter(this, mFragments));
mVpContent.setUserInputEnabled(false);
CommonNavigator commonNavigator = new CommonNavigator(this);
commonNavigator.setAdapter(new ViewPageNavigatorAdapter(this, mTitles, mVpContent));
commonNavigator.setAdjustMode(false);
mMiTabs.setNavigator(commonNavigator);
UIUtil.bindViewPager2(mMiTabs, mVpContent, pos -> {
mCurrentItem = mVpContent.getCurrentItem();
mEtBaseOnlySearch.setText("");
//人口库
mTvOnlyControl.setVisibility(pos == 1 || pos == 2 ? View.VISIBLE : View.INVISIBLE);
switch (pos) {
case 0:
mTvBaseTitle.setVisibility(View.VISIBLE);
mTvBaseTitle.setText("人口库");
mTvBaseTitle.setTextColor(Color.BLACK);
mLlOnlySearchBar.setVisibility(View.GONE);
mTvAppBack.setVisibility(View.VISIBLE);
mTvAppBack.setBackgroundResource(R.drawable.ic_back_black);
break;
case 5:
mEtBaseOnlySearch.setHint("请输入姓名或身份证号码");
mTvBaseTitle.setVisibility(View.GONE);
mTvAppBack.setVisibility(View.GONE);
mLlOnlySearchBar.setVisibility(View.VISIBLE);
break;
case 1:
case 2:
case 3:
case 4:
default:
mEtBaseOnlySearch.setHint("请输入查询的关键字");
mTvBaseTitle.setVisibility(View.GONE);
mTvAppBack.setVisibility(View.GONE);
mLlOnlySearchBar.setVisibility(View.VISIBLE);
break;
}
});
}
@Override
protected void onActivityResult(int requestCode, int resultCode,
@Nullable @org.jetbrains.annotations.Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == 12) {
if (resultCode == 13) {
//刷新页面
mFragments.get(mCurrentItem).refreshContentView("");
}
}
}
@Override
protected void doSearchByTitle() {
String keywords = mEtBaseOnlySearch.getText().toString().trim();
mFragments.get(mCurrentItem).refreshContentView(keywords);
}
@Override
protected void clearSearch() {
}
}

View File

@ -2,18 +2,15 @@ package com.tengshisoft.gridmodule.incident.activitys.building.fragment;
import android.annotation.SuppressLint;
import android.app.ProgressDialog;
import android.graphics.Color;
import android.text.Editable;
import android.text.TextUtils;
import android.view.View;
import android.view.inputmethod.EditorInfo;
import android.widget.EditText;
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.jakewharton.rxbinding3.widget.RxTextView;
import com.scwang.smart.refresh.layout.SmartRefreshLayout;
import com.tengshisoft.commonmodule.adapters.CommunityListAdapter;
import com.tengshisoft.commonmodule.beans.CommunityListBean;
import com.tengshisoft.commonmodule.nets.GridApis;
@ -22,8 +19,6 @@ import com.tengshisoft.gridmodule.R2;
import com.tenlionsoft.baselib.constant.PathConfig;
import com.tenlionsoft.baselib.core.retrofit_net.RetrofitManager;
import com.tenlionsoft.baselib.core.widget.base.BaseFragment;
import com.tenlionsoft.baselib.core.widget.views.ItemSplitDivider;
import com.tenlionsoft.baselib.interfaces.TextChange;
import com.tenlionsoft.baselib.utils.ExceptionHandler;
import com.tenlionsoft.baselib.utils.LogUtils;
import com.tenlionsoft.baselib.utils.UIUtil;
@ -31,14 +26,10 @@ import com.tenlionsoft.baselib.utils.UserLgUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.Unbinder;
import io.reactivex.functions.Consumer;
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
import io.reactivex.rxjava3.annotations.NonNull;
import io.reactivex.rxjava3.core.Observer;
@ -54,12 +45,8 @@ import io.reactivex.rxjava3.schedulers.Schedulers;
@Route(path = PathConfig.PATH_MODULE_GRID_FRAGMENT_BUILDINGAREA_MANAGE)
public class BuildingAreaManageFragment extends BaseFragment {
@BindView(R2.id.et_search_key)
EditText mEtSearchKey;
@BindView(R2.id.rlv_content)
RecyclerView mRlvContent;
@BindView(R2.id.srl_content)
SmartRefreshLayout mSrlContent;
private Unbinder mBind;
private int mCurrentPage = 1;//当前页数
private int mTotalSize;//总数
@ -73,31 +60,32 @@ public class BuildingAreaManageFragment extends BaseFragment {
@Override
protected void setDataToView(View dataView) {
mBind = ButterKnife.bind(this, dataView);
setStateView(STATE_SUCCESS);
mSrlView.setEnableLoadMore(false);
mSrlView.setEnableRefresh(false);
mDatas = new ArrayList<>();
mAdapter = new CommunityListAdapter(mActivity, mDatas, 1);
mSrlContent.setOnLoadMoreListener(refreshLayout -> loadMore());
mSrlContent.setOnRefreshListener(refreshLayout -> doRefresh());
// mSrlContent.setOnLoadMoreListener(refreshLayout -> loadMore());
// mSrlContent.setOnRefreshListener(refreshLayout -> doRefresh());
mRlvContent.setLayoutManager(new LinearLayoutManager(mActivity));
mRlvContent.addItemDecoration(new ItemSplitDivider(mActivity, LinearLayoutManager.VERTICAL, 1, Color.parseColor("#BFBFBF")));
// mRlvContent.addItemDecoration(new ItemSplitDivider(mActivity, LinearLayoutManager.VERTICAL, 1,
// Color.parseColor("#BFBFBF")));
mRlvContent.setAdapter(mAdapter);
mDialog = UIUtil.initDialog(mActivity, "搜索中...");
setStateView(STATE_LOAD);
doRefresh();
mEtSearchKey.setOnEditorActionListener((v, actionId, event) -> {
if (actionId == EditorInfo.IME_ACTION_SEARCH) {
mActivity.hideSoftKeyboard();
mEtSearchKey.clearFocus();
mKeywords = v.getText().toString();
mDialog.show();
doRefresh();
return true;
} else {
return false;
}
});
// mEtSearchKey.setOnEditorActionListener((v, actionId, event) -> {
// if (actionId == EditorInfo.IME_ACTION_SEARCH) {
// mActivity.hideSoftKeyboard();
// mEtSearchKey.clearFocus();
// mKeywords = v.getText().toString();
// mDialog.show();
// doRefresh();
// return true;
// } else {
// return false;
// }
// });
mAdapter.addOnItemClickListener(this::showDetail);
}
/**
@ -105,9 +93,9 @@ public class BuildingAreaManageFragment extends BaseFragment {
*/
private void showDetail(CommunityListBean.RowsBean b) {
ARouter.getInstance()
.build(PathConfig.PATH_MODULE_GRID_ACTIVITY_COMMUNITY_DETAIL)
.withString("id", b.getResidentialId())
.navigation(mActivity, 12);
.build(PathConfig.PATH_MODULE_GRID_ACTIVITY_COMMUNITY_DETAIL)
.withString("id", b.getResidentialId())
.navigation(mActivity, 12);
}
/**
@ -122,70 +110,72 @@ public class BuildingAreaManageFragment extends BaseFragment {
private void getBuildingAreaList(int currentPage) {
mCurrentPage = currentPage;
RetrofitManager.getInstance()
.create(GridApis.class)
.getCommunityList(mKeywords, mCurrentPage + "", UserLgUtils.getToken())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<CommunityListBean>() {
@Override
public void onSubscribe(@NonNull Disposable d) {
.create(GridApis.class)
.getCommunityList(mKeywords, mCurrentPage + "", UserLgUtils.getToken())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<CommunityListBean>() {
@Override
public void onSubscribe(@NonNull Disposable d) {
}
@Override
public void onNext(@NonNull CommunityListBean communityListBean) {
mSrlContent.finishRefresh();
mSrlContent.finishLoadMore();
if (mDialog != null && mDialog.isShowing()) {
mDialog.dismiss();
}
if (communityListBean.getRows() != null && communityListBean.getRows().size() > 0) {
++mCurrentPage;
if (currentPage == 1) {
mDatas.clear();
mDatas.addAll(communityListBean.getRows());
} else {
mDatas.addAll(communityListBean.getRows());
@Override
public void onNext(@NonNull CommunityListBean communityListBean) {
LogUtils.e("获取到了数据");
setStateView(STATE_SUCCESS);
mSrlView.finishRefresh();
mSrlView.finishLoadMore();
if (mDialog != null && mDialog.isShowing()) {
mDialog.dismiss();
}
mAdapter.notifyDataSetChanged();
mSrlContent.finishRefresh();
if (mDatas.size() >= communityListBean.getTotal()) {
mSrlContent.finishLoadMore();
mSrlContent.setNoMoreData(true);
} else {
mSrlContent.finishLoadMore();
mSrlContent.setNoMoreData(false);
}
} else {
if (currentPage > 1) {
mSrlContent.finishLoadMore();
mSrlContent.setNoMoreData(true);
} else {
if (TextUtils.isEmpty(mKeywords)) {
//无数据
ToastUtils.show("暂无数据");
if (communityListBean.getRows() != null && communityListBean.getRows().size() > 0) {
++mCurrentPage;
if (currentPage == 1) {
mDatas.clear();
mDatas.addAll(communityListBean.getRows());
} else {
ToastUtils.show("未查询到相关内容");
mDatas.addAll(communityListBean.getRows());
}
mAdapter.notifyDataSetChanged();
if (mDatas.size() >= communityListBean.getTotal()) {
mSrlView.finishLoadMore();
mSrlView.setNoMoreData(true);
} else {
mSrlView.finishLoadMore();
mSrlView.setNoMoreData(false);
}
} else {
if (currentPage > 1) {
mSrlView.finishLoadMore();
mSrlView.setNoMoreData(true);
} else {
if (TextUtils.isEmpty(mKeywords)) {
//无数据
ToastUtils.show("暂无数据");
} else {
ToastUtils.show("未查询到相关内容");
}
}
}
}
}
@Override
public void onError(@NonNull Throwable e) {
if (mDialog != null && mDialog.isShowing()) {
mDialog.dismiss();
@Override
public void onError(@NonNull Throwable e) {
if (mDialog != null && mDialog.isShowing()) {
mDialog.dismiss();
}
mSrlView.finishLoadMore();
mSrlView.finishRefresh();
setStateView(STATE_ERROR);
ExceptionHandler.handleException(e);
}
mSrlContent.finishLoadMore();
mSrlContent.finishRefresh();
ExceptionHandler.handleException(e);
}
@Override
public void onComplete() {
@Override
public void onComplete() {
}
});
}
});
}
@ -196,6 +186,7 @@ public class BuildingAreaManageFragment extends BaseFragment {
//刷新
private void doRefresh() {
setStateView(STATE_LOAD);
mDatas.clear();
mAdapter.setData(mDatas);
getBuildingAreaList(1);
@ -203,16 +194,17 @@ public class BuildingAreaManageFragment extends BaseFragment {
@Override
protected void refreshView() {
doRefresh();
}
@Override
protected void loadMoreData() {
loadMore();
}
@Override
public void refreshContentView(String... data) {
mKeywords = data[0];
doRefresh();
}

View File

@ -5,14 +5,13 @@ import android.app.ProgressDialog;
import android.graphics.Color;
import android.text.TextUtils;
import android.view.View;
import android.view.inputmethod.EditorInfo;
import android.widget.EditText;
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.jakewharton.rxbinding3.widget.RxTextView;
import com.scwang.smart.refresh.layout.SmartRefreshLayout;
import com.tengshisoft.commonmodule.adapters.BuildingListAdapter;
import com.tengshisoft.commonmodule.beans.BuildingListBean;
import com.tengshisoft.commonmodule.nets.GridApis;
@ -24,16 +23,12 @@ import com.tenlionsoft.baselib.core.retrofit_net.conver.RxTransformer;
import com.tenlionsoft.baselib.core.widget.base.BaseFragment;
import com.tenlionsoft.baselib.core.widget.views.ItemSplitDivider;
import com.tenlionsoft.baselib.utils.ExceptionHandler;
import com.tenlionsoft.baselib.utils.LogUtils;
import com.tenlionsoft.baselib.utils.UIUtil;
import com.tenlionsoft.baselib.utils.UserLgUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.Unbinder;
@ -49,12 +44,8 @@ import io.reactivex.rxjava3.disposables.Disposable;
*/
@Route(path = PathConfig.PATH_MODULE_GRID_FRAGMENT_BUILDING_MANAGE)
public class BuildingListFragment extends BaseFragment {
@BindView(R2.id.et_search_key)
EditText mEtSearchKey;
@BindView(R2.id.rlv_content)
RecyclerView mRlvContent;
@BindView(R2.id.srl_content)
SmartRefreshLayout mSrlContent;
private Unbinder mBind;
private int mCurrentPage = 1;//当前页数
private List<BuildingListBean.RowsBean> mDatas;
@ -62,111 +53,109 @@ public class BuildingListFragment extends BaseFragment {
private String mKeywords = "";
private ProgressDialog mDialog;
private int mSearchDelay = 600;
@SuppressLint("CheckResult")
@Override
protected void setDataToView(View dataView) {
mBind = ButterKnife.bind(this, dataView);
setStateView(STATE_SUCCESS);
mSrlView.setEnableLoadMore(false);
mSrlView.setEnableRefresh(false);
setStateView(STATE_LOAD);
mDatas = new ArrayList<>();
mAdapter = new BuildingListAdapter(mActivity, mDatas, 1);
mSrlContent.setOnLoadMoreListener(refreshLayout -> loadMore());
mSrlContent.setOnRefreshListener(refreshLayout -> doRefresh());
mRlvContent.setLayoutManager(new LinearLayoutManager(mActivity));
mRlvContent.setLayoutManager(new LinearLayoutManager(mActivity));
mRlvContent.addItemDecoration(new ItemSplitDivider(mActivity, LinearLayoutManager.VERTICAL, 1, Color.parseColor("#BFBFBF")));
mRlvContent.addItemDecoration(new ItemSplitDivider(mActivity, LinearLayoutManager.VERTICAL, 1,
Color.parseColor("#BFBFBF")));
mRlvContent.setAdapter(mAdapter);
mDialog = UIUtil.initDialog(mActivity, "搜索中...");
doRefresh();
mEtSearchKey.setOnEditorActionListener((v, actionId, event) -> {
if (actionId == EditorInfo.IME_ACTION_SEARCH) {
mActivity.hideSoftKeyboard();
mEtSearchKey.clearFocus();
mKeywords = v.getText().toString();
mDialog.show();
doRefresh();
return true;
} else {
return false;
}
});
// mEtSearchKey.setOnEditorActionListener((v, actionId, event) -> {
// if (actionId == EditorInfo.IME_ACTION_SEARCH) {
// mActivity.hideSoftKeyboard();
// mEtSearchKey.clearFocus();
// mKeywords = v.getText().toString();
// mDialog.show();
// doRefresh();
// return true;
// } else {
// return false;
// }
// });
mAdapter.addOnItemClickListener(this::showDetail);
}
private void showDetail(BuildingListBean.RowsBean b) {
ARouter.getInstance()
.build(PathConfig.PATH_MODULE_GRID_ACTIVITY_BUILDING_DETAIL)
.withString("id", b.getBuildingId())
.navigation(mActivity, 12);
.build(PathConfig.PATH_MODULE_GRID_ACTIVITY_BUILDING_DETAIL)
.withString("id", b.getBuildingId())
.navigation(mActivity, 12);
}
private void getBuildingAreaList(int currentPage) {
mCurrentPage = currentPage;
RetrofitManager.getInstance()
.create(GridApis.class)
.getBuildingList(mKeywords, mCurrentPage + "", UserLgUtils.getToken())
.compose(RxTransformer.getTransformer())
.subscribe(new Observer<BuildingListBean>() {
@Override
public void onSubscribe(@NonNull Disposable d) {
.create(GridApis.class)
.getBuildingList(mKeywords, mCurrentPage + "", UserLgUtils.getToken())
.compose(RxTransformer.getTransformer())
.subscribe(new Observer<BuildingListBean>() {
@Override
public void onSubscribe(@NonNull Disposable d) {
}
@Override
public void onNext(@NonNull BuildingListBean communityListBean) {
if (mDialog != null && mDialog.isShowing()) {
mDialog.dismiss();
}
mSrlContent.finishRefresh();
mSrlContent.finishLoadMore();
if (communityListBean.getRows() != null && communityListBean.getRows().size() > 0) {
++mCurrentPage;
if (currentPage == 1) {
mDatas.clear();
mDatas.addAll(communityListBean.getRows());
} else {
mDatas.addAll(communityListBean.getRows());
@Override
public void onNext(@NonNull BuildingListBean communityListBean) {
if (mDialog != null && mDialog.isShowing()) {
mDialog.dismiss();
}
mAdapter.notifyDataSetChanged();
mSrlContent.finishRefresh();
if (mDatas.size() >= communityListBean.getTotal()) {
mSrlContent.finishLoadMore();
mSrlContent.setNoMoreData(true);
} else {
mSrlContent.finishLoadMore();
mSrlContent.setNoMoreData(false);
}
} else {
if (currentPage > 1) {
mSrlContent.finishLoadMore();
mSrlContent.setNoMoreData(true);
} else {
if (TextUtils.isEmpty(mKeywords)) {
//无数据
ToastUtils.show("暂无数据");
mSrlView.finishRefresh();
mSrlView.finishLoadMore();
if (communityListBean.getRows() != null && communityListBean.getRows().size() > 0) {
++mCurrentPage;
setStateView(STATE_SUCCESS);
if (currentPage == 1) {
mDatas.clear();
mDatas.addAll(communityListBean.getRows());
} else {
ToastUtils.show("未查询到相关内容");
mDatas.addAll(communityListBean.getRows());
}
mAdapter.notifyDataSetChanged();
if (mDatas.size() >= communityListBean.getTotal()) {
mSrlView.setNoMoreData(true);
} else {
mSrlView.setNoMoreData(false);
}
} else {
if (currentPage > 1) {
mSrlView.setNoMoreData(true);
} else {
setStateView(STATE_EMPTY);
if (TextUtils.isEmpty(mKeywords)) {
//无数据
ToastUtils.show("暂无数据");
} else {
ToastUtils.show("未查询到相关内容");
}
}
}
}
}
@Override
public void onError(@NonNull Throwable e) {
if (mDialog != null && mDialog.isShowing()) {
mDialog.dismiss();
@Override
public void onError(@NonNull Throwable e) {
if (mDialog != null && mDialog.isShowing()) {
mDialog.dismiss();
}
mSrlView.finishLoadMore();
mSrlView.finishRefresh();
setStateView(STATE_ERROR);
ExceptionHandler.handleException(e);
}
mSrlContent.finishLoadMore();
mSrlContent.finishRefresh();
ExceptionHandler.handleException(e);
}
@Override
public void onComplete() {
@Override
public void onComplete() {
}
});
}
});
}
//加载更多
@ -176,23 +165,26 @@ public class BuildingListFragment extends BaseFragment {
//刷新
private void doRefresh() {
setStateView(STATE_LOAD);
mDatas.clear();
mAdapter.setData(mDatas);
getBuildingAreaList(1);
}
@Override
public void refreshContentView(String... data) {
mKeywords = data[0];
doRefresh();
}
@Override
protected void refreshView() {
doRefresh();
}
@Override
protected void loadMoreData() {
loadMore();
}
@Override

View File

@ -5,14 +5,13 @@ import android.app.ProgressDialog;
import android.graphics.Color;
import android.text.TextUtils;
import android.view.View;
import android.view.inputmethod.EditorInfo;
import android.widget.EditText;
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.jakewharton.rxbinding3.widget.RxTextView;
import com.scwang.smart.refresh.layout.SmartRefreshLayout;
import com.tengshisoft.commonmodule.adapters.CommunityAreaListAdapter;
import com.tengshisoft.commonmodule.beans.CommunityAreaListBean;
import com.tengshisoft.commonmodule.nets.GridApis;
@ -29,10 +28,7 @@ import com.tenlionsoft.baselib.utils.UserLgUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.Unbinder;
@ -48,12 +44,9 @@ import io.reactivex.rxjava3.disposables.Disposable;
*/
@Route(path = PathConfig.PATH_MODULE_GRID_FRAGMENT_COMMUNITY_MANAGE)
public class CommunityListFragment extends BaseFragment {
@BindView(R2.id.et_search_key)
EditText mEtSearchKey;
@BindView(R2.id.rlv_content)
RecyclerView mRlvContent;
@BindView(R2.id.srl_content)
SmartRefreshLayout mSrlContent;
private Unbinder mBind;
private int mCurrentPage = 1;//当前页数
private int mTotalSize;//总数
@ -68,39 +61,36 @@ public class CommunityListFragment extends BaseFragment {
@Override
protected void setDataToView(View dataView) {
mBind = ButterKnife.bind(this, dataView);
setStateView(STATE_SUCCESS);
mSrlView.setEnableLoadMore(false);
mSrlView.setEnableRefresh(false);
setStateView(STATE_LOAD);
mDatas = new ArrayList<>();
mAdapter = new CommunityAreaListAdapter(mActivity, mDatas, mType);
mSrlContent.setOnLoadMoreListener(refreshLayout -> loadMore());
mSrlContent.setOnRefreshListener(refreshLayout -> doRefresh());
mRlvContent.setLayoutManager(new LinearLayoutManager(mActivity));
mRlvContent.setAdapter(mAdapter);
mRlvContent.addItemDecoration(new ItemSplitDivider(mActivity, LinearLayoutManager.VERTICAL, 1, Color.parseColor("#BFBFBF")));
mRlvContent.addItemDecoration(new ItemSplitDivider(mActivity, LinearLayoutManager.VERTICAL, 1,
Color.parseColor("#BFBFBF")));
mDialog = UIUtil.initDialog(mActivity, "搜索中...");
doRefresh();
mEtSearchKey.setOnEditorActionListener((v, actionId, event) -> {
if (actionId == EditorInfo.IME_ACTION_SEARCH) {
mActivity.hideSoftKeyboard();
mEtSearchKey.clearFocus();
mKeywords = v.getText().toString();
mDialog.show();
doRefresh();
return true;
} else {
return false;
}
});
// mEtSearchKey.setOnEditorActionListener((v, actionId, event) -> {
// if (actionId == EditorInfo.IME_ACTION_SEARCH) {
// mActivity.hideSoftKeyboard();
// mEtSearchKey.clearFocus();
// mKeywords = v.getText().toString();
// mDialog.show();
// doRefresh();
// return true;
// } else {
// return false;
// }
// });
mAdapter.addOnItemClickListener(this::showDetail);
}
private void showDetail(CommunityAreaListBean.RowsBean b) {
ARouter.getInstance()
.build(PathConfig.PATH_MODULE_GRID_ACTIVITY_COMMUNITY_AREA_DETAIL)
.withString("id", b.getCommunityId())
.navigation(mActivity, 12);
.build(PathConfig.PATH_MODULE_GRID_ACTIVITY_COMMUNITY_AREA_DETAIL)
.withString("id", b.getCommunityId())
.navigation(mActivity, 12);
}
/**
@ -111,69 +101,68 @@ public class CommunityListFragment extends BaseFragment {
private void getCommunityList(int currentPage) {
mCurrentPage = currentPage;
RetrofitManager.getInstance()
.create(GridApis.class)
.getCommunityAreaList(mKeywords, mCurrentPage + "", UserLgUtils.getToken())
.compose(RxTransformer.getTransformer())
.subscribe(new Observer<CommunityAreaListBean>() {
@Override
public void onSubscribe(@NonNull Disposable d) {
.create(GridApis.class)
.getCommunityAreaList(mKeywords, mCurrentPage + "", UserLgUtils.getToken())
.compose(RxTransformer.getTransformer())
.subscribe(new Observer<CommunityAreaListBean>() {
@Override
public void onSubscribe(@NonNull Disposable d) {
}
@Override
public void onNext(@NonNull CommunityAreaListBean communityListBean) {
if (mDialog != null && mDialog.isShowing()) {
mDialog.dismiss();
}
mSrlContent.finishRefresh();
mSrlContent.finishLoadMore();
if (communityListBean.getRows() != null && communityListBean.getRows().size() > 0) {
++mCurrentPage;
if (currentPage == 1) {
mDatas.clear();
mDatas.addAll(communityListBean.getRows());
} else {
mDatas.addAll(communityListBean.getRows());
@Override
public void onNext(@NonNull CommunityAreaListBean communityListBean) {
if (mDialog != null && mDialog.isShowing()) {
mDialog.dismiss();
}
mAdapter.notifyDataSetChanged();
mSrlContent.finishRefresh();
if (mDatas.size() >= communityListBean.getTotal()) {
mSrlContent.finishLoadMore();
mSrlContent.setNoMoreData(true);
} else {
mSrlContent.finishLoadMore();
mSrlContent.setNoMoreData(false);
}
} else {
if (currentPage > 1) {
mSrlContent.finishLoadMore();
mSrlContent.setNoMoreData(true);
} else {
if (TextUtils.isEmpty(mKeywords)) {
//无数据
ToastUtils.show("暂无数据");
mSrlView.finishRefresh();
mSrlView.finishLoadMore();
if (communityListBean.getRows() != null && communityListBean.getRows().size() > 0) {
setStateView(STATE_SUCCESS);
++mCurrentPage;
if (currentPage == 1) {
mDatas.clear();
mDatas.addAll(communityListBean.getRows());
} else {
ToastUtils.show("未查询到相关内容");
mDatas.addAll(communityListBean.getRows());
}
mAdapter.notifyDataSetChanged();
if (mDatas.size() >= communityListBean.getTotal()) {
mSrlView.setNoMoreData(true);
} else {
mSrlView.setNoMoreData(false);
}
} else {
if (currentPage > 1) {
mSrlView.setNoMoreData(true);
} else {
setStateView(STATE_EMPTY);
if (TextUtils.isEmpty(mKeywords)) {
//无数据
ToastUtils.show("暂无数据");
} else {
ToastUtils.show("未查询到相关内容");
}
}
}
}
}
@Override
public void onError(@NonNull Throwable e) {
if (mDialog != null && mDialog.isShowing()) {
mDialog.dismiss();
@Override
public void onError(@NonNull Throwable e) {
if (mDialog != null && mDialog.isShowing()) {
mDialog.dismiss();
}
mSrlView.finishLoadMore();
mSrlView.finishRefresh();
setStateView(STATE_ERROR);
ExceptionHandler.handleException(e);
}
mSrlContent.finishLoadMore();
mSrlContent.finishRefresh();
ExceptionHandler.handleException(e);
}
@Override
public void onComplete() {
@Override
public void onComplete() {
}
});
}
});
}
//加载更多
@ -190,17 +179,19 @@ public class CommunityListFragment extends BaseFragment {
@Override
public void refreshContentView(String... data) {
mKeywords = data[0];
doRefresh();
}
@Override
protected void refreshView() {
setStateView(STATE_LOAD);
doRefresh();
}
@Override
protected void loadMoreData() {
loadMore();
}
@Override

View File

@ -5,14 +5,13 @@ import android.app.ProgressDialog;
import android.graphics.Color;
import android.text.TextUtils;
import android.view.View;
import android.view.inputmethod.EditorInfo;
import android.widget.EditText;
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.jakewharton.rxbinding3.widget.RxTextView;
import com.scwang.smart.refresh.layout.SmartRefreshLayout;
import com.tengshisoft.commonmodule.adapters.HouseListAdapter;
import com.tengshisoft.commonmodule.beans.HouseListBean;
import com.tengshisoft.commonmodule.nets.GridApis;
@ -23,16 +22,12 @@ import com.tenlionsoft.baselib.core.retrofit_net.RetrofitManager;
import com.tenlionsoft.baselib.core.widget.base.BaseFragment;
import com.tenlionsoft.baselib.core.widget.views.ItemSplitDivider;
import com.tenlionsoft.baselib.utils.ExceptionHandler;
import com.tenlionsoft.baselib.utils.LogUtils;
import com.tenlionsoft.baselib.utils.UIUtil;
import com.tenlionsoft.baselib.utils.UserLgUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.Unbinder;
@ -50,12 +45,8 @@ import io.reactivex.rxjava3.schedulers.Schedulers;
*/
@Route(path = PathConfig.PATH_MODULE_GRID_FRAGMENT_HOUSE_MANAGE)
public class HouseFragment extends BaseFragment {
@BindView(R2.id.et_search_key)
EditText mEtSearchKey;
@BindView(R2.id.rlv_content)
RecyclerView mRlvContent;
@BindView(R2.id.srl_content)
SmartRefreshLayout mSrlContent;
private Unbinder mBind;
private int mCurrentPage = 1;//当前页数
private int mTotalSize;//总数
@ -69,109 +60,105 @@ public class HouseFragment extends BaseFragment {
@Override
protected void setDataToView(View dataView) {
mBind = ButterKnife.bind(this, dataView);
setStateView(STATE_SUCCESS);
mSrlView.setEnableLoadMore(false);
mSrlView.setEnableRefresh(false);
setStateView(STATE_LOAD);
mDatas = new ArrayList<>();
mAdapter = new HouseListAdapter(mActivity, mDatas, 1);
mSrlContent.setOnLoadMoreListener(refreshLayout -> loadMore());
mSrlContent.setOnRefreshListener(refreshLayout -> doRefresh());
mRlvContent.setLayoutManager(new LinearLayoutManager(mActivity));
mRlvContent.setAdapter(mAdapter);
mRlvContent.addItemDecoration(new ItemSplitDivider(mActivity, LinearLayoutManager.VERTICAL, 1, Color.parseColor("#BFBFBF")));
mRlvContent.addItemDecoration(new ItemSplitDivider(mActivity, LinearLayoutManager.VERTICAL, 1,
Color.parseColor("#BFBFBF")));
mDialog = UIUtil.initDialog(mActivity, "搜索中...");
doRefresh();
mEtSearchKey.setOnEditorActionListener((v, actionId, event) -> {
if (actionId == EditorInfo.IME_ACTION_SEARCH) {
mActivity.hideSoftKeyboard();
mEtSearchKey.clearFocus();
mKeywords = v.getText().toString();
mDialog.show();
doRefresh();
return true;
} else {
return false;
}
});
// mEtSearchKey.setOnEditorActionListener((v, actionId, event) -> {
// if (actionId == EditorInfo.IME_ACTION_SEARCH) {
// mActivity.hideSoftKeyboard();
// mEtSearchKey.clearFocus();
// mKeywords = v.getText().toString();
// mDialog.show();
// doRefresh();
// return true;
// } else {
// return false;
// }
// });
mAdapter.addOnItemClickListener(this::showDetail);
}
private void showDetail(HouseListBean.RowsBean b) {
ARouter.getInstance()
.build(PathConfig.PATH_MODULE_GRID_ACTIVITY_HOUSE_DETAIL)
.withString("id", b.getBuildingHouseId())
.navigation(mActivity, 12);
.build(PathConfig.PATH_MODULE_GRID_ACTIVITY_HOUSE_DETAIL)
.withString("id", b.getBuildingHouseId())
.navigation(mActivity, 12);
}
private void getHouseList(int currentPage) {
mCurrentPage = currentPage;
RetrofitManager.getInstance()
.create(GridApis.class)
.getHouseList("", mKeywords, mCurrentPage + "", UserLgUtils.getToken())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<HouseListBean>() {
@Override
public void onSubscribe(@NonNull Disposable d) {
.create(GridApis.class)
.getHouseList("", mKeywords, mCurrentPage + "", UserLgUtils.getToken())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<HouseListBean>() {
@Override
public void onSubscribe(@NonNull Disposable d) {
}
@Override
public void onNext(@NonNull HouseListBean communityListBean) {
if (mDialog != null && mDialog.isShowing()) {
mDialog.dismiss();
}
mSrlContent.finishRefresh();
mSrlContent.finishLoadMore();
if (communityListBean.getRows() != null && communityListBean.getRows().size() > 0) {
++mCurrentPage;
if (currentPage == 1) {
mDatas.clear();
mDatas.addAll(communityListBean.getRows());
} else {
mDatas.addAll(communityListBean.getRows());
@Override
public void onNext(@NonNull HouseListBean communityListBean) {
if (mDialog != null && mDialog.isShowing()) {
mDialog.dismiss();
}
mAdapter.notifyDataSetChanged();
mSrlContent.finishRefresh();
if (mDatas.size() >= communityListBean.getTotal()) {
mSrlContent.finishLoadMore();
mSrlContent.setNoMoreData(true);
} else {
mSrlContent.finishLoadMore();
mSrlContent.setNoMoreData(false);
}
} else {
if (currentPage > 1) {
mSrlContent.finishLoadMore();
mSrlContent.setNoMoreData(true);
} else {
if (TextUtils.isEmpty(mKeywords)) {
//无数据
ToastUtils.show("暂无数据");
mSrlView.finishRefresh();
mSrlView.finishLoadMore();
if (communityListBean.getRows() != null && communityListBean.getRows().size() > 0) {
setStateView(STATE_SUCCESS);
++mCurrentPage;
if (currentPage == 1) {
mDatas.clear();
mDatas.addAll(communityListBean.getRows());
} else {
ToastUtils.show("未查询到相关内容");
mDatas.addAll(communityListBean.getRows());
}
mAdapter.notifyDataSetChanged();
if (mDatas.size() >= communityListBean.getTotal()) {
mSrlView.setNoMoreData(true);
} else {
mSrlView.setNoMoreData(false);
}
} else {
if (currentPage > 1) {
mSrlView.setNoMoreData(true);
} else {
setStateView(STATE_EMPTY);
if (TextUtils.isEmpty(mKeywords)) {
//无数据
ToastUtils.show("暂无数据");
} else {
ToastUtils.show("未查询到相关内容");
}
}
}
}
}
@Override
public void onError(@NonNull Throwable e) {
if (mDialog != null && mDialog.isShowing()) {
mDialog.dismiss();
@Override
public void onError(@NonNull Throwable e) {
if (mDialog != null && mDialog.isShowing()) {
mDialog.dismiss();
}
setStateView(STATE_ERROR);
mSrlView.finishLoadMore();
mSrlView.finishRefresh();
ExceptionHandler.handleException(e);
}
mSrlContent.finishLoadMore();
mSrlContent.finishRefresh();
ExceptionHandler.handleException(e);
}
@Override
public void onComplete() {
@Override
public void onComplete() {
}
});
}
});
}
//加载更多
@ -189,12 +176,19 @@ public class HouseFragment extends BaseFragment {
@Override
protected void refreshView() {
setStateView(STATE_LOAD);
doRefresh();
}
@Override
public void refreshContentView(String... data) {
mKeywords = data[0];
doRefresh();
}
@Override
protected void loadMoreData() {
loadMore();
}
@Override

View File

@ -5,14 +5,13 @@ import android.app.ProgressDialog;
import android.graphics.Color;
import android.text.TextUtils;
import android.view.View;
import android.view.inputmethod.EditorInfo;
import android.widget.EditText;
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.jakewharton.rxbinding3.widget.RxTextView;
import com.scwang.smart.refresh.layout.SmartRefreshLayout;
import com.tengshisoft.commonmodule.adapters.HouseListAdapter;
import com.tengshisoft.commonmodule.beans.HouseListBean;
import com.tengshisoft.commonmodule.nets.GridApis;
@ -29,10 +28,7 @@ import com.tenlionsoft.baselib.utils.UserLgUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.Unbinder;
@ -48,12 +44,8 @@ import io.reactivex.rxjava3.disposables.Disposable;
*/
@Route(path = PathConfig.PATH_MODULE_GRID_FRAGMENT_SEARCH_HOUSE_BY_PERSON)
public class SearchHouseByPersonFragment extends BaseFragment {
@BindView(R2.id.et_search_key)
EditText mEtSearchKey;
@BindView(R2.id.rlv_content)
RecyclerView mRlvContent;
@BindView(R2.id.srl_content)
SmartRefreshLayout mSrlContent;
private Unbinder mBind;
private int mCurrentPage = 1;//当前页数
private int mTotalSize;//总数
@ -67,120 +59,101 @@ public class SearchHouseByPersonFragment extends BaseFragment {
@Override
protected void setDataToView(View dataView) {
mBind = ButterKnife.bind(this, dataView);
setStateView(STATE_SUCCESS);
setStateView(STATE_SEARCH_INIT);
mSrlView.setEnableLoadMore(false);
mSrlView.setEnableRefresh(false);
mDatas = new ArrayList<>();
mAdapter = new HouseListAdapter(mActivity, mDatas, 1);
mSrlContent.setOnLoadMoreListener(refreshLayout -> loadMore());
mSrlContent.setOnRefreshListener(refreshLayout -> doRefresh());
mRlvContent.setLayoutManager(new LinearLayoutManager(mActivity));
mEtSearchKey.setHint("请输入身份证号码或姓名");
mRlvContent.setAdapter(mAdapter);
mRlvContent.addItemDecoration(new ItemSplitDivider(mActivity, LinearLayoutManager.VERTICAL, 1, Color.parseColor("#BFBFBF")));
mRlvContent.addItemDecoration(new ItemSplitDivider(mActivity, LinearLayoutManager.VERTICAL, 1,
Color.parseColor("#BFBFBF")));
mAdapter.addOnItemClickListener(this::showDetail);
mDialog = UIUtil.initDialog(mActivity, "搜索中...");
doRefresh();
mEtSearchKey.setOnEditorActionListener((v, actionId, event) -> {
if (actionId == EditorInfo.IME_ACTION_SEARCH) {
mActivity.hideSoftKeyboard();
mEtSearchKey.clearFocus();
mKeywords = v.getText().toString();
if(TextUtils.isEmpty(mKeywords)){
mDatas.clear();
mAdapter.setData(mDatas);
}else{
mDialog.show();
doRefresh();
}
return true;
} else {
return false;
}
});
mTvFragmentErrorHint.setText("请输入姓名或身份证号码查询");
}
private void showDetail(HouseListBean.RowsBean b) {
ARouter.getInstance()
.build(PathConfig.PATH_MODULE_GRID_ACTIVITY_HOUSE_DETAIL)
.withString("id", b.getBuildingHouseId())
.navigation(mActivity, 12);
.build(PathConfig.PATH_MODULE_GRID_ACTIVITY_HOUSE_DETAIL)
.withString("id", b.getBuildingHouseId())
.navigation(mActivity, 12);
}
private void getHouseList(int currentPage) {
mCurrentPage = currentPage;
RetrofitManager.getInstance()
.create(GridApis.class)
.getHouseList("", mKeywords, mCurrentPage + "", UserLgUtils.getToken())
.compose(RxTransformer.getTransformer())
.subscribe(new Observer<HouseListBean>() {
@Override
public void onSubscribe(@NonNull Disposable d) {
.create(GridApis.class)
.getHouseList("", mKeywords, mCurrentPage + "", UserLgUtils.getToken())
.compose(RxTransformer.getTransformer())
.subscribe(new Observer<HouseListBean>() {
@Override
public void onSubscribe(@NonNull Disposable d) {
}
@Override
public void onNext(@NonNull HouseListBean communityListBean) {
if (mDialog != null && mDialog.isShowing()) {
mDialog.dismiss();
}
mSrlContent.finishLoadMore();
mSrlContent.finishRefresh();
if (communityListBean.getRows() != null && communityListBean.getRows().size() > 0) {
++mCurrentPage;
if (currentPage == 1) {
mDatas.clear();
mDatas.addAll(communityListBean.getRows());
} else {
mDatas.addAll(communityListBean.getRows());
@Override
public void onNext(@NonNull HouseListBean communityListBean) {
if (mDialog != null && mDialog.isShowing()) {
mDialog.dismiss();
}
mAdapter.notifyDataSetChanged();
mSrlContent.finishRefresh();
if (mDatas.size() >= communityListBean.getTotal()) {
mSrlContent.finishLoadMore();
mSrlContent.setNoMoreData(true);
} else {
mSrlContent.finishLoadMore();
mSrlContent.setNoMoreData(false);
}
} else {
if (currentPage > 1) {
mSrlContent.finishLoadMore();
mSrlContent.setNoMoreData(true);
} else {
if (TextUtils.isEmpty(mKeywords)) {
//无数据
ToastUtils.show("暂无数据");
mSrlView.finishLoadMore();
mSrlView.finishRefresh();
if (communityListBean.getRows() != null && communityListBean.getRows().size() > 0) {
setStateView(STATE_SUCCESS);
++mCurrentPage;
if (currentPage == 1) {
mDatas.clear();
mDatas.addAll(communityListBean.getRows());
} else {
ToastUtils.show("未查询到相关内容");
mDatas.addAll(communityListBean.getRows());
}
mAdapter.notifyDataSetChanged();
if (mDatas.size() >= communityListBean.getTotal()) {
mSrlView.setNoMoreData(true);
} else {
mSrlView.setNoMoreData(false);
}
} else {
if (currentPage > 1) {
mSrlView.setNoMoreData(true);
} else {
setStateView(STATE_SEARCH_EMPTY);
if (TextUtils.isEmpty(mKeywords)) {
//无数据
ToastUtils.show("暂无数据");
} else {
ToastUtils.show("未查询到相关内容");
}
}
}
}
}
@Override
public void onError(@NonNull Throwable e) {
if (mDialog != null && mDialog.isShowing()) {
mDialog.dismiss();
@Override
public void onError(@NonNull Throwable e) {
if (mDialog != null && mDialog.isShowing()) {
mDialog.dismiss();
}
setStateView(STATE_ERROR);
mSrlView.finishLoadMore();
mSrlView.finishRefresh();
ExceptionHandler.handleException(e);
}
mSrlContent.finishLoadMore();
mSrlContent.finishRefresh();
ExceptionHandler.handleException(e);
}
@Override
public void onComplete() {
@Override
public void onComplete() {
}
});
}
});
}
//加载更多
private void loadMore() {
if (TextUtils.isEmpty(mKeywords)) {
mSrlContent.finishLoadMore();
mSrlContent.setNoMoreData(true);
mSrlView.finishLoadMore();
mSrlView.setNoMoreData(true);
} else {
getHouseList(mCurrentPage);
}
@ -190,7 +163,7 @@ public class SearchHouseByPersonFragment extends BaseFragment {
private void doRefresh() {
mCurrentPage = 1;
if (TextUtils.isEmpty(mKeywords)) {
mSrlContent.finishRefresh();
mSrlView.finishRefresh();
} else {
mDatas.clear();
mAdapter.setData(mDatas);
@ -201,12 +174,25 @@ public class SearchHouseByPersonFragment extends BaseFragment {
@Override
protected void refreshView() {
doRefresh();
}
@Override
protected void loadMoreData() {
loadMore();
}
@Override
public void refreshContentView(String... data) {
mKeywords = data[0];
if (TextUtils.isEmpty(mKeywords)) {
setStateView(STATE_SEARCH_INIT);
mDatas.clear();
mAdapter.setData(mDatas);
} else {
mDialog.show();
doRefresh();
}
}
@Override

View File

@ -5,8 +5,6 @@ import android.app.ProgressDialog;
import android.graphics.Color;
import android.text.TextUtils;
import android.view.View;
import android.view.inputmethod.EditorInfo;
import android.widget.EditText;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
@ -45,10 +43,8 @@ import io.reactivex.rxjava3.disposables.Disposable;
* 邮箱: itgaojian@163.com
* 描述: 人口库-网格下所有人员
*/
@Route(path = PathConfig.PATH_MODULE_GRID_FRAGMENT_COMMUNITY_MANAGE)
//@Route(path = PathConfig.PATH_MODULE_GRID_FRAGMENT_)
public class CensusBaseGridListFragment extends BaseFragment {
@BindView(R2.id.et_search_key)
EditText mEtSearchKey;
@BindView(R2.id.rlv_content)
RecyclerView mRlvContent;
@BindView(R2.id.srl_content)
@ -77,29 +73,30 @@ public class CensusBaseGridListFragment extends BaseFragment {
mSrlContent.setOnRefreshListener(refreshLayout -> doRefresh());
mRlvContent.setLayoutManager(new LinearLayoutManager(mActivity));
mRlvContent.setAdapter(mAdapter);
mRlvContent.addItemDecoration(new ItemSplitDivider(mActivity, LinearLayoutManager.VERTICAL, 1, Color.parseColor("#BFBFBF")));
mRlvContent.addItemDecoration(new ItemSplitDivider(mActivity, LinearLayoutManager.VERTICAL, 1,
Color.parseColor("#BFBFBF")));
mDialog = UIUtil.initDialog(mActivity, "搜索中...");
doRefresh();
mEtSearchKey.setOnEditorActionListener((v, actionId, event) -> {
if (actionId == EditorInfo.IME_ACTION_SEARCH) {
mActivity.hideSoftKeyboard();
mEtSearchKey.clearFocus();
mKeywords = v.getText().toString();
mDialog.show();
doRefresh();
return true;
} else {
return false;
}
});
// mEtSearchKey.setOnEditorActionListener((v, actionId, event) -> {
// if (actionId == EditorInfo.IME_ACTION_SEARCH) {
// mActivity.hideSoftKeyboard();
// mEtSearchKey.clearFocus();
// mKeywords = v.getText().toString();
// mDialog.show();
// doRefresh();
// return true;
// } else {
// return false;
// }
// });
mAdapter.addOnItemClickListener(this::showDetail);
}
private void showDetail(CommunityAreaListBean.RowsBean b) {
ARouter.getInstance()
.build(PathConfig.PATH_MODULE_GRID_ACTIVITY_COMMUNITY_AREA_DETAIL)
.withString("id", b.getCommunityId())
.navigation(mActivity, 12);
.build(PathConfig.PATH_MODULE_GRID_ACTIVITY_COMMUNITY_AREA_DETAIL)
.withString("id", b.getCommunityId())
.navigation(mActivity, 12);
}
/**
@ -110,69 +107,69 @@ public class CensusBaseGridListFragment extends BaseFragment {
private void getCommunityList(int currentPage) {
mCurrentPage = currentPage;
RetrofitManager.getInstance()
.create(GridApis.class)
.getCommunityAreaList(mKeywords, mCurrentPage + "", UserLgUtils.getToken())
.compose(RxTransformer.getTransformer())
.subscribe(new Observer<CommunityAreaListBean>() {
@Override
public void onSubscribe(@NonNull Disposable d) {
.create(GridApis.class)
.getCommunityAreaList(mKeywords, mCurrentPage + "", UserLgUtils.getToken())
.compose(RxTransformer.getTransformer())
.subscribe(new Observer<CommunityAreaListBean>() {
@Override
public void onSubscribe(@NonNull Disposable d) {
}
@Override
public void onNext(@NonNull CommunityAreaListBean communityListBean) {
if (mDialog != null && mDialog.isShowing()) {
mDialog.dismiss();
}
mSrlContent.finishRefresh();
mSrlContent.finishLoadMore();
if (communityListBean.getRows() != null && communityListBean.getRows().size() > 0) {
++mCurrentPage;
if (currentPage == 1) {
mDatas.clear();
mDatas.addAll(communityListBean.getRows());
} else {
mDatas.addAll(communityListBean.getRows());
@Override
public void onNext(@NonNull CommunityAreaListBean communityListBean) {
if (mDialog != null && mDialog.isShowing()) {
mDialog.dismiss();
}
mAdapter.notifyDataSetChanged();
mSrlContent.finishRefresh();
if (mDatas.size() >= communityListBean.getTotal()) {
mSrlContent.finishLoadMore();
mSrlContent.setNoMoreData(true);
} else {
mSrlContent.finishLoadMore();
mSrlContent.setNoMoreData(false);
}
} else {
if (currentPage > 1) {
mSrlContent.finishLoadMore();
mSrlContent.setNoMoreData(true);
} else {
if (TextUtils.isEmpty(mKeywords)) {
//无数据
ToastUtils.show("暂无数据");
mSrlContent.finishLoadMore();
if (communityListBean.getRows() != null && communityListBean.getRows().size() > 0) {
++mCurrentPage;
if (currentPage == 1) {
mDatas.clear();
mDatas.addAll(communityListBean.getRows());
} else {
ToastUtils.show("未查询到相关内容");
mDatas.addAll(communityListBean.getRows());
}
mAdapter.notifyDataSetChanged();
mSrlContent.finishRefresh();
if (mDatas.size() >= communityListBean.getTotal()) {
mSrlContent.finishLoadMore();
mSrlContent.setNoMoreData(true);
} else {
mSrlContent.finishLoadMore();
mSrlContent.setNoMoreData(false);
}
} else {
if (currentPage > 1) {
mSrlContent.finishLoadMore();
mSrlContent.setNoMoreData(true);
} else {
if (TextUtils.isEmpty(mKeywords)) {
//无数据
ToastUtils.show("暂无数据");
} else {
ToastUtils.show("未查询到相关内容");
}
}
}
}
}
@Override
public void onError(@NonNull Throwable e) {
if (mDialog != null && mDialog.isShowing()) {
mDialog.dismiss();
@Override
public void onError(@NonNull Throwable e) {
if (mDialog != null && mDialog.isShowing()) {
mDialog.dismiss();
}
mSrlContent.finishLoadMore();
mSrlContent.finishRefresh();
ExceptionHandler.handleException(e);
}
mSrlContent.finishLoadMore();
mSrlContent.finishRefresh();
ExceptionHandler.handleException(e);
}
@Override
public void onComplete() {
@Override
public void onComplete() {
}
});
}
});
}
//加载更多
@ -189,6 +186,7 @@ public class CensusBaseGridListFragment extends BaseFragment {
@Override
public void refreshContentView(String... data) {
mKeywords = data[0];
doRefresh();
}

View File

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/gray_f7"
android:orientation="vertical">
<net.lucode.hackware.magicindicator.MagicIndicator
android:id="@+id/mi_tabs"
android:layout_width="match_parent"
android:layout_height="50dp"
android:background="@drawable/shp_bottom_shadow_white_no_radius" />
<androidx.viewpager2.widget.ViewPager2
android:id="@+id/vp_content"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>

View File

@ -3,19 +3,13 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:padding="12dp">
android:paddingLeft="12dp"
android:paddingRight="12dp">
<include layout="@layout/layout_search_item" />
<com.scwang.smart.refresh.layout.SmartRefreshLayout
android:id="@+id/srl_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="10dp">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rlv_content"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</com.scwang.smart.refresh.layout.SmartRefreshLayout>
android:layout_height="match_parent" />
</LinearLayout>

View File

@ -3,19 +3,14 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:padding="12dp">
android:paddingLeft="12dp"
android:paddingRight="12dp"
android:paddingBottom="12dp">
<include layout="@layout/layout_search_item" />
<com.scwang.smart.refresh.layout.SmartRefreshLayout
android:id="@+id/srl_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="10dp">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rlv_content"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</com.scwang.smart.refresh.layout.SmartRefreshLayout>
android:layout_height="match_parent" />
</LinearLayout>

View File

@ -3,19 +3,14 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:padding="12dp">
android:paddingRight="12dp"
android:paddingBottom="12dp"
android:paddingLeft="12dp">
<include layout="@layout/layout_search_item" />
<com.scwang.smart.refresh.layout.SmartRefreshLayout
android:id="@+id/srl_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="10dp">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rlv_content"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</com.scwang.smart.refresh.layout.SmartRefreshLayout>
android:layout_height="match_parent" />
</LinearLayout>

View File

@ -3,19 +3,14 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:padding="12dp">
android:paddingLeft="12dp"
android:paddingRight="12dp"
android:paddingBottom="12dp">
<include layout="@layout/layout_search_item" />
<com.scwang.smart.refresh.layout.SmartRefreshLayout
android:id="@+id/srl_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="10dp">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rlv_content"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</com.scwang.smart.refresh.layout.SmartRefreshLayout>
android:layout_height="match_parent" />
</LinearLayout>

View File

@ -5,7 +5,6 @@
android:orientation="vertical"
android:padding="12dp">
<include layout="@layout/layout_search_item" />
<com.scwang.smart.refresh.layout.SmartRefreshLayout
android:id="@+id/srl_content"

View File

@ -177,7 +177,10 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro
* 获取融合通信配置信息
*/
private void getAppConfig() {
RetrofitManager.getInstance().create(BaseApiService.class).getAppConfig(UserLgUtils.getToken()).compose(RxTransformer.getTransformer()).subscribe(new Observer<JsonObject>() {
RetrofitManager.getInstance().create(BaseApiService.class)
.getAppConfig(UserLgUtils.getToken())
.compose(RxTransformer.getTransformer())
.subscribe(new Observer<JsonObject>() {
@Override
public void onSubscribe(@NonNull Disposable d) {
@ -264,7 +267,6 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro
if (ids.endsWith(",")) {
ids = ids.substring(0, ids.length() - 1);
}
LogUtils.e(ids);
UserLgUtils.setUserDeptId(ids);
}
@ -363,25 +365,6 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro
@Override
public void onNext(@NonNull UserExpandInfoBean userExpandInfoBean) {
UserLgUtils.setUserAreaCode("");
UserLgUtils.setLocationAddress("");
UserLgUtils.setUserAreaLevel(-1);
if (!TextUtils.isEmpty(userExpandInfoBean.getAreaCode())) {
String cityCode = userExpandInfoBean.getAreaCode().substring(0, 4);
String areaCode = userExpandInfoBean.getAreaCode().substring(0, 6);
String streetCode = userExpandInfoBean.getAreaCode().substring(0, 9);
String villageCode = userExpandInfoBean.getAreaCode();
UserLgUtils.setUserAreaCode(userExpandInfoBean.getAreaCode());
UserLgUtils.setLocationAddress(userExpandInfoBean.getAreaName());
UserLgUtils.setUserAreaLevel(userExpandInfoBean.getUserLevel());
GlobalProvider.save(mActivity, "cityCode", cityCode);
GlobalProvider.save(mActivity, "areaCode", areaCode);
GlobalProvider.save(mActivity, "streetCode", streetCode);
GlobalProvider.save(mActivity, "villageCode", villageCode);
GlobalProvider.save(mActivity, "fullAreaCode",
userExpandInfoBean.getAreaCode());
}
if (!TextUtils.isEmpty(userExpandInfoBean.getSmcNumber())) {
LogUtils.e(userExpandInfoBean);
UserLgUtils.setHwAccount(userExpandInfoBean.getSmcNumber());
@ -391,18 +374,7 @@ public class MainTabActivity extends BaseActivity implements LoginView, LocalBro
doLoginHWClound();
}
}
String ids = "";
List<UserExpandInfoBean.DepartmentsBean> departments =
userExpandInfoBean.getDepartments();
for (int i = 0; i < departments.size(); i++) {
ids += departments.get(i).getDepartmentId() + ",";
LogUtils.e(departments.get(i).getDepartmentName());
}
if (ids.endsWith(",")) {
ids = ids.substring(0, ids.length() - 1);
}
LogUtils.e(ids);
UserLgUtils.setUserDeptId(ids);
}
@Override

View File

@ -40,6 +40,7 @@ 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;
@ -105,7 +106,6 @@ public class GridMainFragment extends BaseFragment {
ImageView mIvKnowEmpty;
@BindView(R2.id.ll_know)
LinearLayout mLlKnow;
private Disposable mDisposable;
private Unbinder mBind;
private List<FuncBean> mFuncs = new ArrayList<>();
@ -246,7 +246,7 @@ public class GridMainFragment extends BaseFragment {
.into(mIvUserIcon);
mTvUserName.setText("您好! " + UserLgUtils.getName());
mLlStatistic.setOnClickListener(v -> ARouter.getInstance()
.build(PathConfig.PATH_MODULE_COMMON_ACTIVITY_GRID_STATISTICS)
.build(PathConfig.PATH_MODULE_COMMON_ACTIVITY_GRID_STATISTICS_INCIDENT)
.navigation());//统计分析
mRlSignIn.setOnClickListener(v -> ARouter.getInstance()
.build(PathConfig.PATH_MODULE_COMMON_ACTIVITY_ATTENDANCE)
@ -443,7 +443,7 @@ public class GridMainFragment extends BaseFragment {
break;
case "房屋人口":
ARouter.getInstance()
.build(PathConfig.PATH_MODULE_GRID_ACTIVITY_HOUSE_PERSON)
.build(PathConfig.PATH_MODULE_GRID_ACTIVITY_HOUSE_PERSON_NEW)
.navigation();
break;
case "案件记录":

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.6 KiB

View File

@ -56,7 +56,7 @@
android:layout_height="64dp"
tools:background="@drawable/ic_user_default" />
<TextView
<com.tenlionsoft.baselib.core.widget.views.TypeBoldTextView
android:id="@+id/tv_user_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -214,6 +214,67 @@
tools:layoutManager="GridLayoutManager"
tools:listitem="@layout/item_main_func_title_num"
tools:spanCount="5" />
<!--通知公告-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:background="@drawable/shp_rectangle_white_5"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:layout_width="36dp"
android:layout_height="39dp"
android:layout_marginLeft="14dp"
android:layout_marginTop="15dp"
android:layout_marginBottom="18dp"
android:src="@drawable/ic_notice_title" />
<View
android:layout_width="2dp"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginTop="15dp"
android:layout_marginBottom="15dp"
android:background="#FFD8D8D8" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_notice_new" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
android:textSize="@dimen/text_14"
android:text="最新公众最新公众最新公众最新公众最新公众最新公众最新公众最新公众最新公众最新公众最新公众最新公众" />
</LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:ellipsize="end"
android:maxLines="1"
android:textSize="@dimen/text_14"
android:text="最新公众最新公众最新公众最新公众最新公众最新公众最新公众最新公众最新公众最新公众最新公众最新公众最新公众" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/ll_statistic"
@ -227,21 +288,30 @@
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:text="统计分析"
android:textColor="@color/text_444"
android:textSize="13dp"
android:textStyle="bold" />
android:layout_marginRight="40dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<com.tenlionsoft.baselib.core.widget.views.TypeBoldTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:text="统计分析"
android:textColor="@color/text_444"
android:textSize="@dimen/text_14"
android:textStyle="bold" />
</LinearLayout>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginTop="5dp"
android:background="@drawable/ic_arrow_diamons" />
@ -249,19 +319,20 @@
<ImageView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="76dp"
android:layout_marginTop="5dp"
android:scaleType="fitXY"
android:src="@drawable/ic_statistics_bg" />
</LinearLayout>
<TextView
<com.tenlionsoft.baselib.core.widget.views.TypeBoldTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="其他"
android:textColor="@color/text_444"
android:textSize="13dp"
android:textSize="@dimen/text_14"
android:textStyle="bold" />
<LinearLayout
@ -488,6 +559,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:visibility="gone"
android:src="@drawable/ic_page_title_icon" />
android:src="@drawable/ic_page_title_icon"
android:visibility="gone" />
</RelativeLayout>