diff --git a/.gitignore b/.gitignore index bf9b0ea..91babaf 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,9 @@ /.idea/workspace.xml /.idea/navEditor.xml /.idea/assetWizardSettings.xml +/.idea/deploymentTargetDropDown.xml +/.idea/misc.xml +/.idea/encodings.xml .DS_Store /build /captures diff --git a/.gitignore b/.gitignore index bf9b0ea..91babaf 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,9 @@ /.idea/workspace.xml /.idea/navEditor.xml /.idea/assetWizardSettings.xml +/.idea/deploymentTargetDropDown.xml +/.idea/misc.xml +/.idea/encodings.xml .DS_Store /build /captures diff --git a/app/build.gradle b/app/build.gradle index c0eec8a..db0844d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,7 +22,27 @@ versionCode 117 versionName "1.1.7" - manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] + manifestPlaceholders = [ + GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", + + // 华为 相关应用参数 + HUAWEI_APP_ID : "", + + // 荣耀相关应用参数 + HONOR_APP_ID : "", + + // OPPO 相关应用参数 + OPPO_APP_KEY : "", + OPPO_APP_SECRET: "", + + // VIVO 相关应用参数 + VIVO_APP_ID : "", + VIVO_APP_KEY : "", + + // 小米相关应用参数 + XIAOMI_APP_ID : "", + XIAOMI_APP_KEY : "", + ] // 版本名后面添加一句话，意思就是flavor dimension 它的维度就是该版本号，多渠道打包很重要 flavorDimensions "versionCode" @@ -130,6 +150,14 @@ //推送SDK implementation 'com.getui:gtsdk:3.2.15.0' //个推SDK implementation 'com.getui:gtc:3.2.1.0' //个推核心组件 + //各手机厂商选择集成 +// implementation 'com.getui.opt:hwp:3.1.2' // 华为 +// implementation 'com.getui.opt:xmp:3.3.1' // 小米 +// implementation 'com.assist-v3:oppo:3.4.0' // oppo +// implementation 'com.assist-v3:vivo:3.1.2' // vivo +// implementation 'com.getui.opt:mzp:3.2.3' // 魅族 +// implementation 'com.getui.opt:ups:3.0.3' // ups，ups目前支持坚果，索尼，海信手机 +// implementation 'com.getui.opt:honor:3.6.0' // 荣耀 //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //数据库升级 diff --git a/.gitignore b/.gitignore index bf9b0ea..91babaf 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,9 @@ /.idea/workspace.xml /.idea/navEditor.xml /.idea/assetWizardSettings.xml +/.idea/deploymentTargetDropDown.xml +/.idea/misc.xml +/.idea/encodings.xml .DS_Store /build /captures diff --git a/app/build.gradle b/app/build.gradle index c0eec8a..db0844d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,7 +22,27 @@ versionCode 117 versionName "1.1.7" - manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] + manifestPlaceholders = [ + GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", + + // 华为 相关应用参数 + HUAWEI_APP_ID : "", + + // 荣耀相关应用参数 + HONOR_APP_ID : "", + + // OPPO 相关应用参数 + OPPO_APP_KEY : "", + OPPO_APP_SECRET: "", + + // VIVO 相关应用参数 + VIVO_APP_ID : "", + VIVO_APP_KEY : "", + + // 小米相关应用参数 + XIAOMI_APP_ID : "", + XIAOMI_APP_KEY : "", + ] // 版本名后面添加一句话，意思就是flavor dimension 它的维度就是该版本号，多渠道打包很重要 flavorDimensions "versionCode" @@ -130,6 +150,14 @@ //推送SDK implementation 'com.getui:gtsdk:3.2.15.0' //个推SDK implementation 'com.getui:gtc:3.2.1.0' //个推核心组件 + //各手机厂商选择集成 +// implementation 'com.getui.opt:hwp:3.1.2' // 华为 +// implementation 'com.getui.opt:xmp:3.3.1' // 小米 +// implementation 'com.assist-v3:oppo:3.4.0' // oppo +// implementation 'com.assist-v3:vivo:3.1.2' // vivo +// implementation 'com.getui.opt:mzp:3.2.3' // 魅族 +// implementation 'com.getui.opt:ups:3.0.3' // ups，ups目前支持坚果，索尼，海信手机 +// implementation 'com.getui.opt:honor:3.6.0' // 荣耀 //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //数据库升级 diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index f6f5f89..baa3977 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -26,7 +26,7 @@ private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() - private var pageIndex = 1 + private var offset = 1 private var isRefresh = false private var isLoadMore = false @@ -43,7 +43,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - + getWorkOrderListByState() orderViewModel.orderList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows @@ -89,12 +89,6 @@ ) } - override fun onResume() { - super.onResume() - pageIndex = 1 - getWorkOrderList() - } - override fun observeRequestState() { } @@ -103,26 +97,26 @@ binding.completedOrderLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 - pageIndex = 1 - getWorkOrderList() + offset = 1 + getWorkOrderListByState() } binding.completedOrderLayout.setOnLoadMoreListener { isLoadMore = true - pageIndex++ - getWorkOrderList() + offset++ + getWorkOrderListByState() } } - private fun getWorkOrderList() { - orderViewModel.getWorkOrderListByState("3", pageIndex) + private fun getWorkOrderListByState() { + orderViewModel.getWorkOrderListByState("3", offset) } override fun handleMessage(msg: Message): Boolean { if (msg.what == 2022033101) { if (dataBeans.size == 0) { binding.emptyInclude.emptyView.showEmptyPage("您还没有处理完成过任何工单") { - pageIndex = 1 - getWorkOrderList() + offset = 1 + getWorkOrderListByState() } } else { binding.emptyInclude.emptyView.hide() diff --git a/.gitignore b/.gitignore index bf9b0ea..91babaf 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,9 @@ /.idea/workspace.xml /.idea/navEditor.xml /.idea/assetWizardSettings.xml +/.idea/deploymentTargetDropDown.xml +/.idea/misc.xml +/.idea/encodings.xml .DS_Store /build /captures diff --git a/app/build.gradle b/app/build.gradle index c0eec8a..db0844d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,7 +22,27 @@ versionCode 117 versionName "1.1.7" - manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] + manifestPlaceholders = [ + GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", + + // 华为 相关应用参数 + HUAWEI_APP_ID : "", + + // 荣耀相关应用参数 + HONOR_APP_ID : "", + + // OPPO 相关应用参数 + OPPO_APP_KEY : "", + OPPO_APP_SECRET: "", + + // VIVO 相关应用参数 + VIVO_APP_ID : "", + VIVO_APP_KEY : "", + + // 小米相关应用参数 + XIAOMI_APP_ID : "", + XIAOMI_APP_KEY : "", + ] // 版本名后面添加一句话，意思就是flavor dimension 它的维度就是该版本号，多渠道打包很重要 flavorDimensions "versionCode" @@ -130,6 +150,14 @@ //推送SDK implementation 'com.getui:gtsdk:3.2.15.0' //个推SDK implementation 'com.getui:gtc:3.2.1.0' //个推核心组件 + //各手机厂商选择集成 +// implementation 'com.getui.opt:hwp:3.1.2' // 华为 +// implementation 'com.getui.opt:xmp:3.3.1' // 小米 +// implementation 'com.assist-v3:oppo:3.4.0' // oppo +// implementation 'com.assist-v3:vivo:3.1.2' // vivo +// implementation 'com.getui.opt:mzp:3.2.3' // 魅族 +// implementation 'com.getui.opt:ups:3.0.3' // ups，ups目前支持坚果，索尼，海信手机 +// implementation 'com.getui.opt:honor:3.6.0' // 荣耀 //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //数据库升级 diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index f6f5f89..baa3977 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -26,7 +26,7 @@ private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() - private var pageIndex = 1 + private var offset = 1 private var isRefresh = false private var isLoadMore = false @@ -43,7 +43,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - + getWorkOrderListByState() orderViewModel.orderList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows @@ -89,12 +89,6 @@ ) } - override fun onResume() { - super.onResume() - pageIndex = 1 - getWorkOrderList() - } - override fun observeRequestState() { } @@ -103,26 +97,26 @@ binding.completedOrderLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 - pageIndex = 1 - getWorkOrderList() + offset = 1 + getWorkOrderListByState() } binding.completedOrderLayout.setOnLoadMoreListener { isLoadMore = true - pageIndex++ - getWorkOrderList() + offset++ + getWorkOrderListByState() } } - private fun getWorkOrderList() { - orderViewModel.getWorkOrderListByState("3", pageIndex) + private fun getWorkOrderListByState() { + orderViewModel.getWorkOrderListByState("3", offset) } override fun handleMessage(msg: Message): Boolean { if (msg.what == 2022033101) { if (dataBeans.size == 0) { binding.emptyInclude.emptyView.showEmptyPage("您还没有处理完成过任何工单") { - pageIndex = 1 - getWorkOrderList() + offset = 1 + getWorkOrderListByState() } } else { binding.emptyInclude.emptyView.hide() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index db77028..8e1dc28 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -25,7 +25,7 @@ private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() - private var pageIndex = 1 + private var offset = 1 private var isRefresh = false private var isLoadMore = false @@ -42,7 +42,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - + getWorkOrderListByState() orderViewModel.orderList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows @@ -88,12 +88,6 @@ ) } - override fun onResume() { - super.onResume() - pageIndex = 1 - getWorkOrderList() - } - override fun observeRequestState() { } @@ -102,26 +96,26 @@ binding.inHandleLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 - pageIndex = 1 - getWorkOrderList() + offset = 1 + getWorkOrderListByState() } binding.inHandleLayout.setOnLoadMoreListener { isLoadMore = true - pageIndex++ - getWorkOrderList() + offset++ + getWorkOrderListByState() } } - private fun getWorkOrderList() { - orderViewModel.getWorkOrderListByState("2", pageIndex) + private fun getWorkOrderListByState() { + orderViewModel.getWorkOrderListByState("2", offset) } override fun handleMessage(msg: Message): Boolean { if (msg.what == 2022033002) { if (dataBeans.size == 0) { binding.emptyInclude.emptyView.showEmptyPage("真不错，您已经处理完所有工单") { - pageIndex = 1 - getWorkOrderList() + offset = 1 + getWorkOrderListByState() } } else { binding.emptyInclude.emptyView.hide() diff --git a/.gitignore b/.gitignore index bf9b0ea..91babaf 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,9 @@ /.idea/workspace.xml /.idea/navEditor.xml /.idea/assetWizardSettings.xml +/.idea/deploymentTargetDropDown.xml +/.idea/misc.xml +/.idea/encodings.xml .DS_Store /build /captures diff --git a/app/build.gradle b/app/build.gradle index c0eec8a..db0844d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,7 +22,27 @@ versionCode 117 versionName "1.1.7" - manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] + manifestPlaceholders = [ + GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", + + // 华为 相关应用参数 + HUAWEI_APP_ID : "", + + // 荣耀相关应用参数 + HONOR_APP_ID : "", + + // OPPO 相关应用参数 + OPPO_APP_KEY : "", + OPPO_APP_SECRET: "", + + // VIVO 相关应用参数 + VIVO_APP_ID : "", + VIVO_APP_KEY : "", + + // 小米相关应用参数 + XIAOMI_APP_ID : "", + XIAOMI_APP_KEY : "", + ] // 版本名后面添加一句话，意思就是flavor dimension 它的维度就是该版本号，多渠道打包很重要 flavorDimensions "versionCode" @@ -130,6 +150,14 @@ //推送SDK implementation 'com.getui:gtsdk:3.2.15.0' //个推SDK implementation 'com.getui:gtc:3.2.1.0' //个推核心组件 + //各手机厂商选择集成 +// implementation 'com.getui.opt:hwp:3.1.2' // 华为 +// implementation 'com.getui.opt:xmp:3.3.1' // 小米 +// implementation 'com.assist-v3:oppo:3.4.0' // oppo +// implementation 'com.assist-v3:vivo:3.1.2' // vivo +// implementation 'com.getui.opt:mzp:3.2.3' // 魅族 +// implementation 'com.getui.opt:ups:3.0.3' // ups，ups目前支持坚果，索尼，海信手机 +// implementation 'com.getui.opt:honor:3.6.0' // 荣耀 //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //数据库升级 diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index f6f5f89..baa3977 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -26,7 +26,7 @@ private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() - private var pageIndex = 1 + private var offset = 1 private var isRefresh = false private var isLoadMore = false @@ -43,7 +43,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - + getWorkOrderListByState() orderViewModel.orderList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows @@ -89,12 +89,6 @@ ) } - override fun onResume() { - super.onResume() - pageIndex = 1 - getWorkOrderList() - } - override fun observeRequestState() { } @@ -103,26 +97,26 @@ binding.completedOrderLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 - pageIndex = 1 - getWorkOrderList() + offset = 1 + getWorkOrderListByState() } binding.completedOrderLayout.setOnLoadMoreListener { isLoadMore = true - pageIndex++ - getWorkOrderList() + offset++ + getWorkOrderListByState() } } - private fun getWorkOrderList() { - orderViewModel.getWorkOrderListByState("3", pageIndex) + private fun getWorkOrderListByState() { + orderViewModel.getWorkOrderListByState("3", offset) } override fun handleMessage(msg: Message): Boolean { if (msg.what == 2022033101) { if (dataBeans.size == 0) { binding.emptyInclude.emptyView.showEmptyPage("您还没有处理完成过任何工单") { - pageIndex = 1 - getWorkOrderList() + offset = 1 + getWorkOrderListByState() } } else { binding.emptyInclude.emptyView.hide() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index db77028..8e1dc28 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -25,7 +25,7 @@ private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() - private var pageIndex = 1 + private var offset = 1 private var isRefresh = false private var isLoadMore = false @@ -42,7 +42,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - + getWorkOrderListByState() orderViewModel.orderList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows @@ -88,12 +88,6 @@ ) } - override fun onResume() { - super.onResume() - pageIndex = 1 - getWorkOrderList() - } - override fun observeRequestState() { } @@ -102,26 +96,26 @@ binding.inHandleLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 - pageIndex = 1 - getWorkOrderList() + offset = 1 + getWorkOrderListByState() } binding.inHandleLayout.setOnLoadMoreListener { isLoadMore = true - pageIndex++ - getWorkOrderList() + offset++ + getWorkOrderListByState() } } - private fun getWorkOrderList() { - orderViewModel.getWorkOrderListByState("2", pageIndex) + private fun getWorkOrderListByState() { + orderViewModel.getWorkOrderListByState("2", offset) } override fun handleMessage(msg: Message): Boolean { if (msg.what == 2022033002) { if (dataBeans.size == 0) { binding.emptyInclude.emptyView.showEmptyPage("真不错，您已经处理完所有工单") { - pageIndex = 1 - getWorkOrderList() + offset = 1 + getWorkOrderListByState() } } else { binding.emptyInclude.emptyView.hide() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index c392fba..cae5d67 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -25,7 +25,7 @@ private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() - private var pageIndex = 1 + private var offset = 1 private var isRefresh = false private var isLoadMore = false @@ -42,6 +42,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + getWorkOrderListByState() orderViewModel.orderList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows @@ -74,12 +75,6 @@ ) } - override fun onResume() { - super.onResume() - pageIndex = 1 - getWorkOrderList() - } - override fun observeRequestState() { } @@ -88,26 +83,26 @@ binding.notConfirmedLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 - pageIndex = 1 - getWorkOrderList() + offset = 1 + getWorkOrderListByState() } binding.notConfirmedLayout.setOnLoadMoreListener { isLoadMore = true - pageIndex++ - getWorkOrderList() + offset++ + getWorkOrderListByState() } } - private fun getWorkOrderList() { - orderViewModel.getWorkOrderListByState("1", pageIndex) + private fun getWorkOrderListByState() { + orderViewModel.getWorkOrderListByState("1", offset) } override fun handleMessage(msg: Message): Boolean { if (msg.what == 2022033001) { if (dataBeans.size == 0) { binding.emptyInclude.emptyView.showEmptyPage("没有需要您确认的工单") { - pageIndex = 1 - getWorkOrderList() + offset = 1 + getWorkOrderListByState() } } else { binding.emptyInclude.emptyView.hide() diff --git a/.gitignore b/.gitignore index bf9b0ea..91babaf 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,9 @@ /.idea/workspace.xml /.idea/navEditor.xml /.idea/assetWizardSettings.xml +/.idea/deploymentTargetDropDown.xml +/.idea/misc.xml +/.idea/encodings.xml .DS_Store /build /captures diff --git a/app/build.gradle b/app/build.gradle index c0eec8a..db0844d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,7 +22,27 @@ versionCode 117 versionName "1.1.7" - manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] + manifestPlaceholders = [ + GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", + + // 华为 相关应用参数 + HUAWEI_APP_ID : "", + + // 荣耀相关应用参数 + HONOR_APP_ID : "", + + // OPPO 相关应用参数 + OPPO_APP_KEY : "", + OPPO_APP_SECRET: "", + + // VIVO 相关应用参数 + VIVO_APP_ID : "", + VIVO_APP_KEY : "", + + // 小米相关应用参数 + XIAOMI_APP_ID : "", + XIAOMI_APP_KEY : "", + ] // 版本名后面添加一句话，意思就是flavor dimension 它的维度就是该版本号，多渠道打包很重要 flavorDimensions "versionCode" @@ -130,6 +150,14 @@ //推送SDK implementation 'com.getui:gtsdk:3.2.15.0' //个推SDK implementation 'com.getui:gtc:3.2.1.0' //个推核心组件 + //各手机厂商选择集成 +// implementation 'com.getui.opt:hwp:3.1.2' // 华为 +// implementation 'com.getui.opt:xmp:3.3.1' // 小米 +// implementation 'com.assist-v3:oppo:3.4.0' // oppo +// implementation 'com.assist-v3:vivo:3.1.2' // vivo +// implementation 'com.getui.opt:mzp:3.2.3' // 魅族 +// implementation 'com.getui.opt:ups:3.0.3' // ups，ups目前支持坚果，索尼，海信手机 +// implementation 'com.getui.opt:honor:3.6.0' // 荣耀 //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //数据库升级 diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index f6f5f89..baa3977 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -26,7 +26,7 @@ private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() - private var pageIndex = 1 + private var offset = 1 private var isRefresh = false private var isLoadMore = false @@ -43,7 +43,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - + getWorkOrderListByState() orderViewModel.orderList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows @@ -89,12 +89,6 @@ ) } - override fun onResume() { - super.onResume() - pageIndex = 1 - getWorkOrderList() - } - override fun observeRequestState() { } @@ -103,26 +97,26 @@ binding.completedOrderLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 - pageIndex = 1 - getWorkOrderList() + offset = 1 + getWorkOrderListByState() } binding.completedOrderLayout.setOnLoadMoreListener { isLoadMore = true - pageIndex++ - getWorkOrderList() + offset++ + getWorkOrderListByState() } } - private fun getWorkOrderList() { - orderViewModel.getWorkOrderListByState("3", pageIndex) + private fun getWorkOrderListByState() { + orderViewModel.getWorkOrderListByState("3", offset) } override fun handleMessage(msg: Message): Boolean { if (msg.what == 2022033101) { if (dataBeans.size == 0) { binding.emptyInclude.emptyView.showEmptyPage("您还没有处理完成过任何工单") { - pageIndex = 1 - getWorkOrderList() + offset = 1 + getWorkOrderListByState() } } else { binding.emptyInclude.emptyView.hide() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index db77028..8e1dc28 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -25,7 +25,7 @@ private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() - private var pageIndex = 1 + private var offset = 1 private var isRefresh = false private var isLoadMore = false @@ -42,7 +42,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - + getWorkOrderListByState() orderViewModel.orderList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows @@ -88,12 +88,6 @@ ) } - override fun onResume() { - super.onResume() - pageIndex = 1 - getWorkOrderList() - } - override fun observeRequestState() { } @@ -102,26 +96,26 @@ binding.inHandleLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 - pageIndex = 1 - getWorkOrderList() + offset = 1 + getWorkOrderListByState() } binding.inHandleLayout.setOnLoadMoreListener { isLoadMore = true - pageIndex++ - getWorkOrderList() + offset++ + getWorkOrderListByState() } } - private fun getWorkOrderList() { - orderViewModel.getWorkOrderListByState("2", pageIndex) + private fun getWorkOrderListByState() { + orderViewModel.getWorkOrderListByState("2", offset) } override fun handleMessage(msg: Message): Boolean { if (msg.what == 2022033002) { if (dataBeans.size == 0) { binding.emptyInclude.emptyView.showEmptyPage("真不错，您已经处理完所有工单") { - pageIndex = 1 - getWorkOrderList() + offset = 1 + getWorkOrderListByState() } } else { binding.emptyInclude.emptyView.hide() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index c392fba..cae5d67 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -25,7 +25,7 @@ private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() - private var pageIndex = 1 + private var offset = 1 private var isRefresh = false private var isLoadMore = false @@ -42,6 +42,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + getWorkOrderListByState() orderViewModel.orderList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows @@ -74,12 +75,6 @@ ) } - override fun onResume() { - super.onResume() - pageIndex = 1 - getWorkOrderList() - } - override fun observeRequestState() { } @@ -88,26 +83,26 @@ binding.notConfirmedLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 - pageIndex = 1 - getWorkOrderList() + offset = 1 + getWorkOrderListByState() } binding.notConfirmedLayout.setOnLoadMoreListener { isLoadMore = true - pageIndex++ - getWorkOrderList() + offset++ + getWorkOrderListByState() } } - private fun getWorkOrderList() { - orderViewModel.getWorkOrderListByState("1", pageIndex) + private fun getWorkOrderListByState() { + orderViewModel.getWorkOrderListByState("1", offset) } override fun handleMessage(msg: Message): Boolean { if (msg.what == 2022033001) { if (dataBeans.size == 0) { binding.emptyInclude.emptyView.showEmptyPage("没有需要您确认的工单") { - pageIndex = 1 - getWorkOrderList() + offset = 1 + getWorkOrderListByState() } } else { binding.emptyInclude.emptyView.hide() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 4711be9..0b3d09d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -30,7 +30,7 @@ private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter private var dataBeans: MutableList = ArrayList() - private var pageIndex = 1 + private var offset = 1 private var isRefresh = false private var isLoadMore = false private var clickedPosition = 0 @@ -48,8 +48,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - + getWorkOrderListByState() orderViewModel.orderList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows @@ -77,17 +76,13 @@ } } + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + binding.notProcessedView.addItemDecoration( RecyclerViewItemOffsets(0, 5, 0, 5) ) } - override fun onResume() { - super.onResume() - pageIndex = 1 - getWorkOrderList() - } - override fun observeRequestState() { //接单状态处理 operationViewModel.loadState.observe(this) { @@ -112,26 +107,26 @@ binding.notProcessedLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 - pageIndex = 1 - getWorkOrderList() + offset = 1 + getWorkOrderListByState() } binding.notProcessedLayout.setOnLoadMoreListener { isLoadMore = true - pageIndex++ - getWorkOrderList() + offset++ + getWorkOrderListByState() } } - private fun getWorkOrderList() { - orderViewModel.getWorkOrderListByState("0", pageIndex) + private fun getWorkOrderListByState() { + orderViewModel.getWorkOrderListByState("0", offset) } override fun handleMessage(msg: Message): Boolean { if (msg.what == 2022032901) { if (dataBeans.size == 0) { binding.emptyInclude.emptyView.showEmptyPage("没有需要您处理的工单") { - pageIndex = 1 - getWorkOrderList() + offset = 1 + getWorkOrderListByState() } } else { binding.emptyInclude.emptyView.hide() diff --git a/.gitignore b/.gitignore index bf9b0ea..91babaf 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,9 @@ /.idea/workspace.xml /.idea/navEditor.xml /.idea/assetWizardSettings.xml +/.idea/deploymentTargetDropDown.xml +/.idea/misc.xml +/.idea/encodings.xml .DS_Store /build /captures diff --git a/app/build.gradle b/app/build.gradle index c0eec8a..db0844d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,7 +22,27 @@ versionCode 117 versionName "1.1.7" - manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] + manifestPlaceholders = [ + GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", + + // 华为 相关应用参数 + HUAWEI_APP_ID : "", + + // 荣耀相关应用参数 + HONOR_APP_ID : "", + + // OPPO 相关应用参数 + OPPO_APP_KEY : "", + OPPO_APP_SECRET: "", + + // VIVO 相关应用参数 + VIVO_APP_ID : "", + VIVO_APP_KEY : "", + + // 小米相关应用参数 + XIAOMI_APP_ID : "", + XIAOMI_APP_KEY : "", + ] // 版本名后面添加一句话，意思就是flavor dimension 它的维度就是该版本号，多渠道打包很重要 flavorDimensions "versionCode" @@ -130,6 +150,14 @@ //推送SDK implementation 'com.getui:gtsdk:3.2.15.0' //个推SDK implementation 'com.getui:gtc:3.2.1.0' //个推核心组件 + //各手机厂商选择集成 +// implementation 'com.getui.opt:hwp:3.1.2' // 华为 +// implementation 'com.getui.opt:xmp:3.3.1' // 小米 +// implementation 'com.assist-v3:oppo:3.4.0' // oppo +// implementation 'com.assist-v3:vivo:3.1.2' // vivo +// implementation 'com.getui.opt:mzp:3.2.3' // 魅族 +// implementation 'com.getui.opt:ups:3.0.3' // ups，ups目前支持坚果，索尼，海信手机 +// implementation 'com.getui.opt:honor:3.6.0' // 荣耀 //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //数据库升级 diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index f6f5f89..baa3977 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -26,7 +26,7 @@ private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() - private var pageIndex = 1 + private var offset = 1 private var isRefresh = false private var isLoadMore = false @@ -43,7 +43,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - + getWorkOrderListByState() orderViewModel.orderList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows @@ -89,12 +89,6 @@ ) } - override fun onResume() { - super.onResume() - pageIndex = 1 - getWorkOrderList() - } - override fun observeRequestState() { } @@ -103,26 +97,26 @@ binding.completedOrderLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 - pageIndex = 1 - getWorkOrderList() + offset = 1 + getWorkOrderListByState() } binding.completedOrderLayout.setOnLoadMoreListener { isLoadMore = true - pageIndex++ - getWorkOrderList() + offset++ + getWorkOrderListByState() } } - private fun getWorkOrderList() { - orderViewModel.getWorkOrderListByState("3", pageIndex) + private fun getWorkOrderListByState() { + orderViewModel.getWorkOrderListByState("3", offset) } override fun handleMessage(msg: Message): Boolean { if (msg.what == 2022033101) { if (dataBeans.size == 0) { binding.emptyInclude.emptyView.showEmptyPage("您还没有处理完成过任何工单") { - pageIndex = 1 - getWorkOrderList() + offset = 1 + getWorkOrderListByState() } } else { binding.emptyInclude.emptyView.hide() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index db77028..8e1dc28 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -25,7 +25,7 @@ private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() - private var pageIndex = 1 + private var offset = 1 private var isRefresh = false private var isLoadMore = false @@ -42,7 +42,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - + getWorkOrderListByState() orderViewModel.orderList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows @@ -88,12 +88,6 @@ ) } - override fun onResume() { - super.onResume() - pageIndex = 1 - getWorkOrderList() - } - override fun observeRequestState() { } @@ -102,26 +96,26 @@ binding.inHandleLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 - pageIndex = 1 - getWorkOrderList() + offset = 1 + getWorkOrderListByState() } binding.inHandleLayout.setOnLoadMoreListener { isLoadMore = true - pageIndex++ - getWorkOrderList() + offset++ + getWorkOrderListByState() } } - private fun getWorkOrderList() { - orderViewModel.getWorkOrderListByState("2", pageIndex) + private fun getWorkOrderListByState() { + orderViewModel.getWorkOrderListByState("2", offset) } override fun handleMessage(msg: Message): Boolean { if (msg.what == 2022033002) { if (dataBeans.size == 0) { binding.emptyInclude.emptyView.showEmptyPage("真不错，您已经处理完所有工单") { - pageIndex = 1 - getWorkOrderList() + offset = 1 + getWorkOrderListByState() } } else { binding.emptyInclude.emptyView.hide() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index c392fba..cae5d67 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -25,7 +25,7 @@ private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() - private var pageIndex = 1 + private var offset = 1 private var isRefresh = false private var isLoadMore = false @@ -42,6 +42,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + getWorkOrderListByState() orderViewModel.orderList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows @@ -74,12 +75,6 @@ ) } - override fun onResume() { - super.onResume() - pageIndex = 1 - getWorkOrderList() - } - override fun observeRequestState() { } @@ -88,26 +83,26 @@ binding.notConfirmedLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 - pageIndex = 1 - getWorkOrderList() + offset = 1 + getWorkOrderListByState() } binding.notConfirmedLayout.setOnLoadMoreListener { isLoadMore = true - pageIndex++ - getWorkOrderList() + offset++ + getWorkOrderListByState() } } - private fun getWorkOrderList() { - orderViewModel.getWorkOrderListByState("1", pageIndex) + private fun getWorkOrderListByState() { + orderViewModel.getWorkOrderListByState("1", offset) } override fun handleMessage(msg: Message): Boolean { if (msg.what == 2022033001) { if (dataBeans.size == 0) { binding.emptyInclude.emptyView.showEmptyPage("没有需要您确认的工单") { - pageIndex = 1 - getWorkOrderList() + offset = 1 + getWorkOrderListByState() } } else { binding.emptyInclude.emptyView.hide() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 4711be9..0b3d09d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -30,7 +30,7 @@ private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter private var dataBeans: MutableList = ArrayList() - private var pageIndex = 1 + private var offset = 1 private var isRefresh = false private var isLoadMore = false private var clickedPosition = 0 @@ -48,8 +48,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - + getWorkOrderListByState() orderViewModel.orderList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows @@ -77,17 +76,13 @@ } } + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + binding.notProcessedView.addItemDecoration( RecyclerViewItemOffsets(0, 5, 0, 5) ) } - override fun onResume() { - super.onResume() - pageIndex = 1 - getWorkOrderList() - } - override fun observeRequestState() { //接单状态处理 operationViewModel.loadState.observe(this) { @@ -112,26 +107,26 @@ binding.notProcessedLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 - pageIndex = 1 - getWorkOrderList() + offset = 1 + getWorkOrderListByState() } binding.notProcessedLayout.setOnLoadMoreListener { isLoadMore = true - pageIndex++ - getWorkOrderList() + offset++ + getWorkOrderListByState() } } - private fun getWorkOrderList() { - orderViewModel.getWorkOrderListByState("0", pageIndex) + private fun getWorkOrderListByState() { + orderViewModel.getWorkOrderListByState("0", offset) } override fun handleMessage(msg: Message): Boolean { if (msg.what == 2022032901) { if (dataBeans.size == 0) { binding.emptyInclude.emptyView.showEmptyPage("没有需要您处理的工单") { - pageIndex = 1 - getWorkOrderList() + offset = 1 + getWorkOrderListByState() } } else { binding.emptyInclude.emptyView.hide() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 1cc5c72..a198545 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -33,7 +33,7 @@ private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter private var dataBeans: MutableList = ArrayList() - private var pageIndex = 1 + private var offset = 1 private var isRefresh = false private var isLoadMore = false private var clickedPosition = 0 @@ -51,8 +51,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - + getWorkOrderListByState() orderViewModel.orderList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows @@ -80,17 +79,13 @@ } } + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + binding.notProcessedView.addItemDecoration( RecyclerViewItemOffsets(0, 5, 0, 5) ) } - override fun onResume() { - super.onResume() - pageIndex = 1 - getWorkOrderList() - } - override fun observeRequestState() { //接单状态处理 operationViewModel.loadState.observe(this) { @@ -115,26 +110,26 @@ binding.notProcessedLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 - pageIndex = 1 - getWorkOrderList() + offset = 1 + getWorkOrderListByState() } binding.notProcessedLayout.setOnLoadMoreListener { isLoadMore = true - pageIndex++ - getWorkOrderList() + offset++ + getWorkOrderListByState() } } - private fun getWorkOrderList() { - orderViewModel.getNotAcceptOderList(page = pageIndex) + private fun getWorkOrderListByState() { + orderViewModel.getNotAcceptOderList(page = offset) } override fun handleMessage(msg: Message): Boolean { if (msg.what == 2022040601) { if (dataBeans.size == 0) { binding.emptyInclude.emptyView.showEmptyPage("您没有超时未处理的工单") { - pageIndex = 1 - getWorkOrderList() + offset = 1 + getWorkOrderListByState() } } else { binding.emptyInclude.emptyView.hide() diff --git a/.gitignore b/.gitignore index bf9b0ea..91babaf 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,9 @@ /.idea/workspace.xml /.idea/navEditor.xml /.idea/assetWizardSettings.xml +/.idea/deploymentTargetDropDown.xml +/.idea/misc.xml +/.idea/encodings.xml .DS_Store /build /captures diff --git a/app/build.gradle b/app/build.gradle index c0eec8a..db0844d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,7 +22,27 @@ versionCode 117 versionName "1.1.7" - manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] + manifestPlaceholders = [ + GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", + + // 华为 相关应用参数 + HUAWEI_APP_ID : "", + + // 荣耀相关应用参数 + HONOR_APP_ID : "", + + // OPPO 相关应用参数 + OPPO_APP_KEY : "", + OPPO_APP_SECRET: "", + + // VIVO 相关应用参数 + VIVO_APP_ID : "", + VIVO_APP_KEY : "", + + // 小米相关应用参数 + XIAOMI_APP_ID : "", + XIAOMI_APP_KEY : "", + ] // 版本名后面添加一句话，意思就是flavor dimension 它的维度就是该版本号，多渠道打包很重要 flavorDimensions "versionCode" @@ -130,6 +150,14 @@ //推送SDK implementation 'com.getui:gtsdk:3.2.15.0' //个推SDK implementation 'com.getui:gtc:3.2.1.0' //个推核心组件 + //各手机厂商选择集成 +// implementation 'com.getui.opt:hwp:3.1.2' // 华为 +// implementation 'com.getui.opt:xmp:3.3.1' // 小米 +// implementation 'com.assist-v3:oppo:3.4.0' // oppo +// implementation 'com.assist-v3:vivo:3.1.2' // vivo +// implementation 'com.getui.opt:mzp:3.2.3' // 魅族 +// implementation 'com.getui.opt:ups:3.0.3' // ups，ups目前支持坚果，索尼，海信手机 +// implementation 'com.getui.opt:honor:3.6.0' // 荣耀 //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //数据库升级 diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index f6f5f89..baa3977 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -26,7 +26,7 @@ private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() - private var pageIndex = 1 + private var offset = 1 private var isRefresh = false private var isLoadMore = false @@ -43,7 +43,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - + getWorkOrderListByState() orderViewModel.orderList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows @@ -89,12 +89,6 @@ ) } - override fun onResume() { - super.onResume() - pageIndex = 1 - getWorkOrderList() - } - override fun observeRequestState() { } @@ -103,26 +97,26 @@ binding.completedOrderLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 - pageIndex = 1 - getWorkOrderList() + offset = 1 + getWorkOrderListByState() } binding.completedOrderLayout.setOnLoadMoreListener { isLoadMore = true - pageIndex++ - getWorkOrderList() + offset++ + getWorkOrderListByState() } } - private fun getWorkOrderList() { - orderViewModel.getWorkOrderListByState("3", pageIndex) + private fun getWorkOrderListByState() { + orderViewModel.getWorkOrderListByState("3", offset) } override fun handleMessage(msg: Message): Boolean { if (msg.what == 2022033101) { if (dataBeans.size == 0) { binding.emptyInclude.emptyView.showEmptyPage("您还没有处理完成过任何工单") { - pageIndex = 1 - getWorkOrderList() + offset = 1 + getWorkOrderListByState() } } else { binding.emptyInclude.emptyView.hide() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index db77028..8e1dc28 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -25,7 +25,7 @@ private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() - private var pageIndex = 1 + private var offset = 1 private var isRefresh = false private var isLoadMore = false @@ -42,7 +42,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - + getWorkOrderListByState() orderViewModel.orderList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows @@ -88,12 +88,6 @@ ) } - override fun onResume() { - super.onResume() - pageIndex = 1 - getWorkOrderList() - } - override fun observeRequestState() { } @@ -102,26 +96,26 @@ binding.inHandleLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 - pageIndex = 1 - getWorkOrderList() + offset = 1 + getWorkOrderListByState() } binding.inHandleLayout.setOnLoadMoreListener { isLoadMore = true - pageIndex++ - getWorkOrderList() + offset++ + getWorkOrderListByState() } } - private fun getWorkOrderList() { - orderViewModel.getWorkOrderListByState("2", pageIndex) + private fun getWorkOrderListByState() { + orderViewModel.getWorkOrderListByState("2", offset) } override fun handleMessage(msg: Message): Boolean { if (msg.what == 2022033002) { if (dataBeans.size == 0) { binding.emptyInclude.emptyView.showEmptyPage("真不错，您已经处理完所有工单") { - pageIndex = 1 - getWorkOrderList() + offset = 1 + getWorkOrderListByState() } } else { binding.emptyInclude.emptyView.hide() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index c392fba..cae5d67 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -25,7 +25,7 @@ private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() - private var pageIndex = 1 + private var offset = 1 private var isRefresh = false private var isLoadMore = false @@ -42,6 +42,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + getWorkOrderListByState() orderViewModel.orderList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows @@ -74,12 +75,6 @@ ) } - override fun onResume() { - super.onResume() - pageIndex = 1 - getWorkOrderList() - } - override fun observeRequestState() { } @@ -88,26 +83,26 @@ binding.notConfirmedLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 - pageIndex = 1 - getWorkOrderList() + offset = 1 + getWorkOrderListByState() } binding.notConfirmedLayout.setOnLoadMoreListener { isLoadMore = true - pageIndex++ - getWorkOrderList() + offset++ + getWorkOrderListByState() } } - private fun getWorkOrderList() { - orderViewModel.getWorkOrderListByState("1", pageIndex) + private fun getWorkOrderListByState() { + orderViewModel.getWorkOrderListByState("1", offset) } override fun handleMessage(msg: Message): Boolean { if (msg.what == 2022033001) { if (dataBeans.size == 0) { binding.emptyInclude.emptyView.showEmptyPage("没有需要您确认的工单") { - pageIndex = 1 - getWorkOrderList() + offset = 1 + getWorkOrderListByState() } } else { binding.emptyInclude.emptyView.hide() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 4711be9..0b3d09d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -30,7 +30,7 @@ private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter private var dataBeans: MutableList = ArrayList() - private var pageIndex = 1 + private var offset = 1 private var isRefresh = false private var isLoadMore = false private var clickedPosition = 0 @@ -48,8 +48,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - + getWorkOrderListByState() orderViewModel.orderList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows @@ -77,17 +76,13 @@ } } + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + binding.notProcessedView.addItemDecoration( RecyclerViewItemOffsets(0, 5, 0, 5) ) } - override fun onResume() { - super.onResume() - pageIndex = 1 - getWorkOrderList() - } - override fun observeRequestState() { //接单状态处理 operationViewModel.loadState.observe(this) { @@ -112,26 +107,26 @@ binding.notProcessedLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 - pageIndex = 1 - getWorkOrderList() + offset = 1 + getWorkOrderListByState() } binding.notProcessedLayout.setOnLoadMoreListener { isLoadMore = true - pageIndex++ - getWorkOrderList() + offset++ + getWorkOrderListByState() } } - private fun getWorkOrderList() { - orderViewModel.getWorkOrderListByState("0", pageIndex) + private fun getWorkOrderListByState() { + orderViewModel.getWorkOrderListByState("0", offset) } override fun handleMessage(msg: Message): Boolean { if (msg.what == 2022032901) { if (dataBeans.size == 0) { binding.emptyInclude.emptyView.showEmptyPage("没有需要您处理的工单") { - pageIndex = 1 - getWorkOrderList() + offset = 1 + getWorkOrderListByState() } } else { binding.emptyInclude.emptyView.hide() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 1cc5c72..a198545 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -33,7 +33,7 @@ private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter private var dataBeans: MutableList = ArrayList() - private var pageIndex = 1 + private var offset = 1 private var isRefresh = false private var isLoadMore = false private var clickedPosition = 0 @@ -51,8 +51,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - + getWorkOrderListByState() orderViewModel.orderList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows @@ -80,17 +79,13 @@ } } + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + binding.notProcessedView.addItemDecoration( RecyclerViewItemOffsets(0, 5, 0, 5) ) } - override fun onResume() { - super.onResume() - pageIndex = 1 - getWorkOrderList() - } - override fun observeRequestState() { //接单状态处理 operationViewModel.loadState.observe(this) { @@ -115,26 +110,26 @@ binding.notProcessedLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 - pageIndex = 1 - getWorkOrderList() + offset = 1 + getWorkOrderListByState() } binding.notProcessedLayout.setOnLoadMoreListener { isLoadMore = true - pageIndex++ - getWorkOrderList() + offset++ + getWorkOrderListByState() } } - private fun getWorkOrderList() { - orderViewModel.getNotAcceptOderList(page = pageIndex) + private fun getWorkOrderListByState() { + orderViewModel.getNotAcceptOderList(page = offset) } override fun handleMessage(msg: Message): Boolean { if (msg.what == 2022040601) { if (dataBeans.size == 0) { binding.emptyInclude.emptyView.showEmptyPage("您没有超时未处理的工单") { - pageIndex = 1 - getWorkOrderList() + offset = 1 + getWorkOrderListByState() } } else { binding.emptyInclude.emptyView.hide() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 2fcb189..1b4df98 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -28,7 +28,7 @@ private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() - private var pageIndex = 1 + private var offset = 1 private var isRefresh = false private var isLoadMore = false @@ -45,7 +45,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - + getWorkOrderListByState() orderViewModel.orderList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows @@ -78,12 +78,6 @@ ) } - override fun onResume() { - super.onResume() - pageIndex = 1 - getWorkOrderList() - } - override fun observeRequestState() { } @@ -92,26 +86,26 @@ binding.notConfirmedLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 - pageIndex = 1 - getWorkOrderList() + offset = 1 + getWorkOrderListByState() } binding.notConfirmedLayout.setOnLoadMoreListener { isLoadMore = true - pageIndex++ - getWorkOrderList() + offset++ + getWorkOrderListByState() } } - private fun getWorkOrderList() { - orderViewModel.getNotHandleOderList(page = pageIndex) + private fun getWorkOrderListByState() { + orderViewModel.getNotHandleOderList(page = offset) } override fun handleMessage(msg: Message): Boolean { if (msg.what == 2022040801) { if (dataBeans.size == 0) { binding.emptyInclude.emptyView.showEmptyPage("真不错，您已经处理完所有工单") { - pageIndex = 1 - getWorkOrderList() + offset = 1 + getWorkOrderListByState() } } else { binding.emptyInclude.emptyView.hide() diff --git a/.gitignore b/.gitignore index bf9b0ea..91babaf 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,9 @@ /.idea/workspace.xml /.idea/navEditor.xml /.idea/assetWizardSettings.xml +/.idea/deploymentTargetDropDown.xml +/.idea/misc.xml +/.idea/encodings.xml .DS_Store /build /captures diff --git a/app/build.gradle b/app/build.gradle index c0eec8a..db0844d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,7 +22,27 @@ versionCode 117 versionName "1.1.7" - manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] + manifestPlaceholders = [ + GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", + + // 华为 相关应用参数 + HUAWEI_APP_ID : "", + + // 荣耀相关应用参数 + HONOR_APP_ID : "", + + // OPPO 相关应用参数 + OPPO_APP_KEY : "", + OPPO_APP_SECRET: "", + + // VIVO 相关应用参数 + VIVO_APP_ID : "", + VIVO_APP_KEY : "", + + // 小米相关应用参数 + XIAOMI_APP_ID : "", + XIAOMI_APP_KEY : "", + ] // 版本名后面添加一句话，意思就是flavor dimension 它的维度就是该版本号，多渠道打包很重要 flavorDimensions "versionCode" @@ -130,6 +150,14 @@ //推送SDK implementation 'com.getui:gtsdk:3.2.15.0' //个推SDK implementation 'com.getui:gtc:3.2.1.0' //个推核心组件 + //各手机厂商选择集成 +// implementation 'com.getui.opt:hwp:3.1.2' // 华为 +// implementation 'com.getui.opt:xmp:3.3.1' // 小米 +// implementation 'com.assist-v3:oppo:3.4.0' // oppo +// implementation 'com.assist-v3:vivo:3.1.2' // vivo +// implementation 'com.getui.opt:mzp:3.2.3' // 魅族 +// implementation 'com.getui.opt:ups:3.0.3' // ups，ups目前支持坚果，索尼，海信手机 +// implementation 'com.getui.opt:honor:3.6.0' // 荣耀 //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //数据库升级 diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index f6f5f89..baa3977 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -26,7 +26,7 @@ private lateinit var orderViewModel: OrderViewModel private lateinit var completedAdapter: OrderCompletedAdapter private var dataBeans: MutableList = ArrayList() - private var pageIndex = 1 + private var offset = 1 private var isRefresh = false private var isLoadMore = false @@ -43,7 +43,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - + getWorkOrderListByState() orderViewModel.orderList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows @@ -89,12 +89,6 @@ ) } - override fun onResume() { - super.onResume() - pageIndex = 1 - getWorkOrderList() - } - override fun observeRequestState() { } @@ -103,26 +97,26 @@ binding.completedOrderLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 - pageIndex = 1 - getWorkOrderList() + offset = 1 + getWorkOrderListByState() } binding.completedOrderLayout.setOnLoadMoreListener { isLoadMore = true - pageIndex++ - getWorkOrderList() + offset++ + getWorkOrderListByState() } } - private fun getWorkOrderList() { - orderViewModel.getWorkOrderListByState("3", pageIndex) + private fun getWorkOrderListByState() { + orderViewModel.getWorkOrderListByState("3", offset) } override fun handleMessage(msg: Message): Boolean { if (msg.what == 2022033101) { if (dataBeans.size == 0) { binding.emptyInclude.emptyView.showEmptyPage("您还没有处理完成过任何工单") { - pageIndex = 1 - getWorkOrderList() + offset = 1 + getWorkOrderListByState() } } else { binding.emptyInclude.emptyView.hide() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index db77028..8e1dc28 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -25,7 +25,7 @@ private lateinit var orderViewModel: OrderViewModel private lateinit var inHandleAdapter: OrderInHandleAdapter private var dataBeans: MutableList = ArrayList() - private var pageIndex = 1 + private var offset = 1 private var isRefresh = false private var isLoadMore = false @@ -42,7 +42,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - + getWorkOrderListByState() orderViewModel.orderList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows @@ -88,12 +88,6 @@ ) } - override fun onResume() { - super.onResume() - pageIndex = 1 - getWorkOrderList() - } - override fun observeRequestState() { } @@ -102,26 +96,26 @@ binding.inHandleLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 - pageIndex = 1 - getWorkOrderList() + offset = 1 + getWorkOrderListByState() } binding.inHandleLayout.setOnLoadMoreListener { isLoadMore = true - pageIndex++ - getWorkOrderList() + offset++ + getWorkOrderListByState() } } - private fun getWorkOrderList() { - orderViewModel.getWorkOrderListByState("2", pageIndex) + private fun getWorkOrderListByState() { + orderViewModel.getWorkOrderListByState("2", offset) } override fun handleMessage(msg: Message): Boolean { if (msg.what == 2022033002) { if (dataBeans.size == 0) { binding.emptyInclude.emptyView.showEmptyPage("真不错，您已经处理完所有工单") { - pageIndex = 1 - getWorkOrderList() + offset = 1 + getWorkOrderListByState() } } else { binding.emptyInclude.emptyView.hide() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index c392fba..cae5d67 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -25,7 +25,7 @@ private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() - private var pageIndex = 1 + private var offset = 1 private var isRefresh = false private var isLoadMore = false @@ -42,6 +42,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] + getWorkOrderListByState() orderViewModel.orderList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows @@ -74,12 +75,6 @@ ) } - override fun onResume() { - super.onResume() - pageIndex = 1 - getWorkOrderList() - } - override fun observeRequestState() { } @@ -88,26 +83,26 @@ binding.notConfirmedLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 - pageIndex = 1 - getWorkOrderList() + offset = 1 + getWorkOrderListByState() } binding.notConfirmedLayout.setOnLoadMoreListener { isLoadMore = true - pageIndex++ - getWorkOrderList() + offset++ + getWorkOrderListByState() } } - private fun getWorkOrderList() { - orderViewModel.getWorkOrderListByState("1", pageIndex) + private fun getWorkOrderListByState() { + orderViewModel.getWorkOrderListByState("1", offset) } override fun handleMessage(msg: Message): Boolean { if (msg.what == 2022033001) { if (dataBeans.size == 0) { binding.emptyInclude.emptyView.showEmptyPage("没有需要您确认的工单") { - pageIndex = 1 - getWorkOrderList() + offset = 1 + getWorkOrderListByState() } } else { binding.emptyInclude.emptyView.hide() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index 4711be9..0b3d09d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -30,7 +30,7 @@ private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter private var dataBeans: MutableList = ArrayList() - private var pageIndex = 1 + private var offset = 1 private var isRefresh = false private var isLoadMore = false private var clickedPosition = 0 @@ -48,8 +48,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - + getWorkOrderListByState() orderViewModel.orderList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows @@ -77,17 +76,13 @@ } } + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + binding.notProcessedView.addItemDecoration( RecyclerViewItemOffsets(0, 5, 0, 5) ) } - override fun onResume() { - super.onResume() - pageIndex = 1 - getWorkOrderList() - } - override fun observeRequestState() { //接单状态处理 operationViewModel.loadState.observe(this) { @@ -112,26 +107,26 @@ binding.notProcessedLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 - pageIndex = 1 - getWorkOrderList() + offset = 1 + getWorkOrderListByState() } binding.notProcessedLayout.setOnLoadMoreListener { isLoadMore = true - pageIndex++ - getWorkOrderList() + offset++ + getWorkOrderListByState() } } - private fun getWorkOrderList() { - orderViewModel.getWorkOrderListByState("0", pageIndex) + private fun getWorkOrderListByState() { + orderViewModel.getWorkOrderListByState("0", offset) } override fun handleMessage(msg: Message): Boolean { if (msg.what == 2022032901) { if (dataBeans.size == 0) { binding.emptyInclude.emptyView.showEmptyPage("没有需要您处理的工单") { - pageIndex = 1 - getWorkOrderList() + offset = 1 + getWorkOrderListByState() } } else { binding.emptyInclude.emptyView.hide() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index 1cc5c72..a198545 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -33,7 +33,7 @@ private lateinit var operationViewModel: OperationViewModel private lateinit var notProcessedAdapter: OrderNotProcessedAdapter private var dataBeans: MutableList = ArrayList() - private var pageIndex = 1 + private var offset = 1 private var isRefresh = false private var isLoadMore = false private var clickedPosition = 0 @@ -51,8 +51,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - + getWorkOrderListByState() orderViewModel.orderList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows @@ -80,17 +79,13 @@ } } + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + binding.notProcessedView.addItemDecoration( RecyclerViewItemOffsets(0, 5, 0, 5) ) } - override fun onResume() { - super.onResume() - pageIndex = 1 - getWorkOrderList() - } - override fun observeRequestState() { //接单状态处理 operationViewModel.loadState.observe(this) { @@ -115,26 +110,26 @@ binding.notProcessedLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 - pageIndex = 1 - getWorkOrderList() + offset = 1 + getWorkOrderListByState() } binding.notProcessedLayout.setOnLoadMoreListener { isLoadMore = true - pageIndex++ - getWorkOrderList() + offset++ + getWorkOrderListByState() } } - private fun getWorkOrderList() { - orderViewModel.getNotAcceptOderList(page = pageIndex) + private fun getWorkOrderListByState() { + orderViewModel.getNotAcceptOderList(page = offset) } override fun handleMessage(msg: Message): Boolean { if (msg.what == 2022040601) { if (dataBeans.size == 0) { binding.emptyInclude.emptyView.showEmptyPage("您没有超时未处理的工单") { - pageIndex = 1 - getWorkOrderList() + offset = 1 + getWorkOrderListByState() } } else { binding.emptyInclude.emptyView.hide() diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index 2fcb189..1b4df98 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -28,7 +28,7 @@ private lateinit var orderViewModel: OrderViewModel private lateinit var notConfirmedAdapter: OrderNotConfirmedAdapter private var dataBeans: MutableList = ArrayList() - private var pageIndex = 1 + private var offset = 1 private var isRefresh = false private var isLoadMore = false @@ -45,7 +45,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { orderViewModel = ViewModelProvider(this)[OrderViewModel::class.java] - + getWorkOrderListByState() orderViewModel.orderList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows @@ -78,12 +78,6 @@ ) } - override fun onResume() { - super.onResume() - pageIndex = 1 - getWorkOrderList() - } - override fun observeRequestState() { } @@ -92,26 +86,26 @@ binding.notConfirmedLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 - pageIndex = 1 - getWorkOrderList() + offset = 1 + getWorkOrderListByState() } binding.notConfirmedLayout.setOnLoadMoreListener { isLoadMore = true - pageIndex++ - getWorkOrderList() + offset++ + getWorkOrderListByState() } } - private fun getWorkOrderList() { - orderViewModel.getNotHandleOderList(page = pageIndex) + private fun getWorkOrderListByState() { + orderViewModel.getNotHandleOderList(page = offset) } override fun handleMessage(msg: Message): Boolean { if (msg.what == 2022040801) { if (dataBeans.size == 0) { binding.emptyInclude.emptyView.showEmptyPage("真不错，您已经处理完所有工单") { - pageIndex = 1 - getWorkOrderList() + offset = 1 + getWorkOrderListByState() } } else { binding.emptyInclude.emptyView.hide() diff --git a/push_service.yml b/push_service.yml new file mode 100644 index 0000000..eef26f1 --- /dev/null +++ b/push_service.yml @@ -0,0 +1,20 @@ +PUSH_CONFIG: + HUAWEI: + Account: 18105416891 + Password: sgs112233 + + HONOR: + Account: 18105416891 + Password: sgs112233 + + OPPO: + Account: 18105416891 + Password: sgs112233 + + XIAOMI: + Account: 18105416891 + Password: sgs112233 + + VIVO: + Account: 18105416891 + Password: Sgs112233! \ No newline at end of file