Browse code refactor(layout): 优化多个 Activity 和 Fragment 的布局结构 -移除多余的属性和复杂的布局结构 - 使用 TitleBarView 替换自定义标题栏 -统一加载对话框的使用- 调整列表和地图相关布局 - 添加新的导航图标 zhangqiu
1 parent cb923eb commit cce6d992e2d161671b2858b17646358cd0ab5100 pengxianhong authored on 25 Dec

Showing 63 changed files

• app/build.gradle
• app/src/main/AndroidManifest.xml
• app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt
• app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt
• app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt
• app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt
• app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt
• app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt
• app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt
• app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt
• app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt
• app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java
• app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java
• app/src/main/java/com/casic/app/smartwell/greendao/MapWellLocalBeanDao.java
• app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java
• app/src/main/java/com/casic/app/smartwell/greendao/PipeLocalBeanDao.java
• app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt
• app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt
• app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt
• app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt
• app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt
• app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt
• app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt
• app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt
• app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt
• app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt
• app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt
• app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt
• app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt
• app/src/main/res/drawable/ic_down.xml
• app/src/main/res/drawable/ic_navigation.xml
• app/src/main/res/layout/activity_about_us.xml
• app/src/main/res/layout/activity_change_pwd.xml
• app/src/main/res/layout/activity_deployed_well.xml
• app/src/main/res/layout/activity_help_center.xml
• app/src/main/res/layout/activity_order_completed_detail.xml
• app/src/main/res/layout/activity_order_in_handle_detail.xml
• app/src/main/res/layout/activity_order_not_confirmed_detail.xml
• app/src/main/res/layout/activity_order_not_processed_detail.xml
• app/src/main/res/layout/activity_order_overtime.xml
• app/src/main/res/layout/activity_order_search.xml
• app/src/main/res/layout/activity_order_search_result.xml
• app/src/main/res/layout/activity_undeploy_well.xml
• app/src/main/res/layout/activity_user_detail.xml
• app/src/main/res/layout/activity_well_detail.xml
• app/src/main/res/layout/activity_well_management.xml
• app/src/main/res/layout/activity_well_monitor.xml
• app/src/main/res/layout/activity_well_operation.xml
• app/src/main/res/layout/fragment_home.xml
• app/src/main/res/layout/fragment_mine.xml
• app/src/main/res/layout/fragment_notice.xml
• app/src/main/res/layout/fragment_order.xml
• app/src/main/res/layout/fragment_order_not_processed.xml
• app/src/main/res/layout/include_base_title.xml
• app/src/main/res/layout/item_deployed_rv.xml
• app/src/main/res/layout/item_order_completed_rv.xml
• app/src/main/res/layout/item_order_in_handle_rv.xml
• app/src/main/res/layout/item_order_not_confirmed_rv.xml
• app/src/main/res/layout/item_order_not_processed_rv.xml
• app/src/main/res/layout/item_search_result_rv.xml
• app/src/main/res/layout/item_undeploy_rv.xml
• app/src/main/res/layout/item_well_list_rv.xml
• app/src/main/res/layout/item_well_operation_rv.xml

Ignore Space Show notes View app/build.gradle

Ignore Space Show notes View app/src/main/AndroidManifest.xml

Ignore Space Show notes View app/src/main/java/com/casic/app/smartwell/adapter/OrderNotProcessedAdapter.kt

Ignore Space Show notes View app/src/main/java/com/casic/app/smartwell/adapter/SearchResultAdapter.kt

Ignore Space Show notes View app/src/main/java/com/casic/app/smartwell/fragment/HomePageHaveClusterFragment.kt

Ignore Space Show notes View app/src/main/java/com/casic/app/smartwell/fragment/HomePageNoClusterFragment.kt

Ignore Space Show notes View app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt

Ignore Space Show notes View app/src/main/java/com/casic/app/smartwell/fragment/NoticePageFragment.kt

Ignore Space Show notes View app/src/main/java/com/casic/app/smartwell/fragment/OrderListFragment.kt

Ignore Space Show notes View app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt

Ignore Space Show notes View app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt

Ignore Space Show notes View app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java

Ignore Space Show notes View app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java

Ignore Space Show notes View app/src/main/java/com/casic/app/smartwell/greendao/MapWellLocalBeanDao.java

Ignore Space Show notes View app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java

Ignore Space Show notes View app/src/main/java/com/casic/app/smartwell/greendao/PipeLocalBeanDao.java

Ignore Space Show notes View app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt

Ignore Space Show notes View app/src/main/java/com/casic/app/smartwell/view/DeployedWellActivity.kt

Ignore Space Show notes View app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt

Ignore Space Show notes View app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt

Ignore Space Show notes View app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt

Ignore Space Show notes View app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt

Ignore Space Show notes View app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt

Ignore Space Show notes View app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt

Ignore Space Show notes View app/src/main/java/com/casic/app/smartwell/view/UnDeployWellActivity.kt

Ignore Space Show notes View app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt

Ignore Space Show notes View app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt

Ignore Space Show notes View app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt

Ignore Space Show notes View app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt

Ignore Space Show notes View app/src/main/res/drawable/ic_down.xml

Ignore Space Show notes View app/src/main/res/drawable/ic_navigation.xml 0 → 100644

Ignore Space Show notes View app/src/main/res/layout/activity_about_us.xml

Ignore Space Show notes View app/src/main/res/layout/activity_change_pwd.xml

Ignore Space Show notes View app/src/main/res/layout/activity_deployed_well.xml

Ignore Space Show notes View app/src/main/res/layout/activity_help_center.xml

Ignore Space Show notes View app/src/main/res/layout/activity_order_completed_detail.xml

Ignore Space Show notes View app/src/main/res/layout/activity_order_in_handle_detail.xml

Ignore Space Show notes View app/src/main/res/layout/activity_order_not_confirmed_detail.xml

Ignore Space Show notes View app/src/main/res/layout/activity_order_not_processed_detail.xml

Ignore Space Show notes View app/src/main/res/layout/activity_order_overtime.xml

Ignore Space Show notes View app/src/main/res/layout/activity_order_search.xml

Ignore Space Show notes View app/src/main/res/layout/activity_order_search_result.xml

Ignore Space Show notes View app/src/main/res/layout/activity_undeploy_well.xml

Ignore Space Show notes View app/src/main/res/layout/activity_user_detail.xml

Ignore Space Show notes View app/src/main/res/layout/activity_well_detail.xml

Ignore Space Show notes View app/src/main/res/layout/activity_well_management.xml

Ignore Space Show notes View app/src/main/res/layout/activity_well_monitor.xml

Ignore Space Show notes View app/src/main/res/layout/activity_well_operation.xml

Ignore Space Show notes View app/src/main/res/layout/fragment_home.xml

Ignore Space Show notes View app/src/main/res/layout/fragment_mine.xml

Ignore Space Show notes View app/src/main/res/layout/fragment_notice.xml

Ignore Space Show notes View app/src/main/res/layout/fragment_order.xml

Ignore Space Show notes View app/src/main/res/layout/fragment_order_not_processed.xml

Show notes View app/src/main/res/layout/include_base_title.xml 100644 → 0

Ignore Space Show notes View app/src/main/res/layout/item_deployed_rv.xml

Ignore Space Show notes View app/src/main/res/layout/item_order_completed_rv.xml

Ignore Space Show notes View app/src/main/res/layout/item_order_in_handle_rv.xml

Ignore Space Show notes View app/src/main/res/layout/item_order_not_confirmed_rv.xml

Ignore Space Show notes View app/src/main/res/layout/item_order_not_processed_rv.xml

Ignore Space Show notes View app/src/main/res/layout/item_search_result_rv.xml

Ignore Space Show notes View app/src/main/res/layout/item_undeploy_rv.xml

Ignore Space Show notes View app/src/main/res/layout/item_well_list_rv.xml

Ignore Space Show notes View app/src/main/res/layout/item_well_operation_rv.xml

Show line notes below