diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt new file mode 100644 index 0000000..5fd046f --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -0,0 +1,24 @@ +package com.casic.app.smartwell.adapter + +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager +import androidx.fragment.app.FragmentPagerAdapter + +class TopViewPagerAdapter( + fragmentManager: FragmentManager, + private val pageTitles: Array, + private val pages: List +) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + + override fun getItem(position: Int): Fragment { + return pages[position] + } + + override fun getCount(): Int { + return pages.size + } + + override fun getPageTitle(position: Int): CharSequence { + return pageTitles[position] + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt new file mode 100644 index 0000000..5fd046f --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -0,0 +1,24 @@ +package com.casic.app.smartwell.adapter + +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager +import androidx.fragment.app.FragmentPagerAdapter + +class TopViewPagerAdapter( + fragmentManager: FragmentManager, + private val pageTitles: Array, + private val pages: List +) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + + override fun getItem(position: Int): Fragment { + return pages[position] + } + + override fun getCount(): Int { + return pages.size + } + + override fun getPageTitle(position: Int): CharSequence { + return pageTitles[position] + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt b/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt index b718582..38eb818 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt @@ -36,4 +36,5 @@ R.mipmap.ic_launcher, R.mipmap.ic_launcher, R.mipmap.ic_launcher ) val HOME_ITEMS = arrayOf("闸井管理", "告警工单", "布防撤防") + val SUB_PAGE_TITLES = arrayOf("待处理", "待确认", "处理中", "已完成") } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt new file mode 100644 index 0000000..5fd046f --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -0,0 +1,24 @@ +package com.casic.app.smartwell.adapter + +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager +import androidx.fragment.app.FragmentPagerAdapter + +class TopViewPagerAdapter( + fragmentManager: FragmentManager, + private val pageTitles: Array, + private val pages: List +) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + + override fun getItem(position: Int): Fragment { + return pages[position] + } + + override fun getCount(): Int { + return pages.size + } + + override fun getPageTitle(position: Int): CharSequence { + return pageTitles[position] + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt b/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt index b718582..38eb818 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt @@ -36,4 +36,5 @@ R.mipmap.ic_launcher, R.mipmap.ic_launcher, R.mipmap.ic_launcher ) val HOME_ITEMS = arrayOf("闸井管理", "告警工单", "布防撤防") + val SUB_PAGE_TITLES = arrayOf("待处理", "待确认", "处理中", "已完成") } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 4050d1a..2aaff8c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -13,7 +13,7 @@ import com.casic.app.smartwell.view.fragment.HomePageFragment import com.casic.app.smartwell.view.fragment.MinePageFragment import com.casic.app.smartwell.view.fragment.NoticePageFragment -import com.casic.app.smartwell.view.fragment.OrderListFragment +import com.casic.app.smartwell.view.fragment.WorkOrderListFragment import com.casic.app.smartwell.vm.UserDetailViewModel import com.google.gson.Gson import kotlinx.android.synthetic.main.activity_main.* @@ -28,7 +28,7 @@ init { fragmentList.add(HomePageFragment()) - fragmentList.add(OrderListFragment()) + fragmentList.add(WorkOrderListFragment()) fragmentList.add(NoticePageFragment()) fragmentList.add(MinePageFragment()) } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt new file mode 100644 index 0000000..5fd046f --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -0,0 +1,24 @@ +package com.casic.app.smartwell.adapter + +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager +import androidx.fragment.app.FragmentPagerAdapter + +class TopViewPagerAdapter( + fragmentManager: FragmentManager, + private val pageTitles: Array, + private val pages: List +) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + + override fun getItem(position: Int): Fragment { + return pages[position] + } + + override fun getCount(): Int { + return pages.size + } + + override fun getPageTitle(position: Int): CharSequence { + return pageTitles[position] + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt b/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt index b718582..38eb818 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt @@ -36,4 +36,5 @@ R.mipmap.ic_launcher, R.mipmap.ic_launcher, R.mipmap.ic_launcher ) val HOME_ITEMS = arrayOf("闸井管理", "告警工单", "布防撤防") + val SUB_PAGE_TITLES = arrayOf("待处理", "待确认", "处理中", "已完成") } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 4050d1a..2aaff8c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -13,7 +13,7 @@ import com.casic.app.smartwell.view.fragment.HomePageFragment import com.casic.app.smartwell.view.fragment.MinePageFragment import com.casic.app.smartwell.view.fragment.NoticePageFragment -import com.casic.app.smartwell.view.fragment.OrderListFragment +import com.casic.app.smartwell.view.fragment.WorkOrderListFragment import com.casic.app.smartwell.vm.UserDetailViewModel import com.google.gson.Gson import kotlinx.android.synthetic.main.activity_main.* @@ -28,7 +28,7 @@ init { fragmentList.add(HomePageFragment()) - fragmentList.add(OrderListFragment()) + fragmentList.add(WorkOrderListFragment()) fragmentList.add(NoticePageFragment()) fragmentList.add(MinePageFragment()) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt new file mode 100644 index 0000000..5002066 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt @@ -0,0 +1,17 @@ +package com.casic.app.smartwell.view.fragment + +import com.casic.app.smartwell.R +import com.pengxh.app.multilib.base.BaseFragment + +class CompletedOrderFragment : BaseFragment() { + override fun initLayoutView(): Int = R.layout.fragment_order_completed + + override fun initData() { + + } + + override fun initEvent() { + + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt new file mode 100644 index 0000000..5fd046f --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -0,0 +1,24 @@ +package com.casic.app.smartwell.adapter + +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager +import androidx.fragment.app.FragmentPagerAdapter + +class TopViewPagerAdapter( + fragmentManager: FragmentManager, + private val pageTitles: Array, + private val pages: List +) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + + override fun getItem(position: Int): Fragment { + return pages[position] + } + + override fun getCount(): Int { + return pages.size + } + + override fun getPageTitle(position: Int): CharSequence { + return pageTitles[position] + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt b/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt index b718582..38eb818 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt @@ -36,4 +36,5 @@ R.mipmap.ic_launcher, R.mipmap.ic_launcher, R.mipmap.ic_launcher ) val HOME_ITEMS = arrayOf("闸井管理", "告警工单", "布防撤防") + val SUB_PAGE_TITLES = arrayOf("待处理", "待确认", "处理中", "已完成") } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 4050d1a..2aaff8c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -13,7 +13,7 @@ import com.casic.app.smartwell.view.fragment.HomePageFragment import com.casic.app.smartwell.view.fragment.MinePageFragment import com.casic.app.smartwell.view.fragment.NoticePageFragment -import com.casic.app.smartwell.view.fragment.OrderListFragment +import com.casic.app.smartwell.view.fragment.WorkOrderListFragment import com.casic.app.smartwell.vm.UserDetailViewModel import com.google.gson.Gson import kotlinx.android.synthetic.main.activity_main.* @@ -28,7 +28,7 @@ init { fragmentList.add(HomePageFragment()) - fragmentList.add(OrderListFragment()) + fragmentList.add(WorkOrderListFragment()) fragmentList.add(NoticePageFragment()) fragmentList.add(MinePageFragment()) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt new file mode 100644 index 0000000..5002066 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt @@ -0,0 +1,17 @@ +package com.casic.app.smartwell.view.fragment + +import com.casic.app.smartwell.R +import com.pengxh.app.multilib.base.BaseFragment + +class CompletedOrderFragment : BaseFragment() { + override fun initLayoutView(): Int = R.layout.fragment_order_completed + + override fun initData() { + + } + + override fun initEvent() { + + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt new file mode 100644 index 0000000..363b18e --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt @@ -0,0 +1,17 @@ +package com.casic.app.smartwell.view.fragment + +import com.casic.app.smartwell.R +import com.pengxh.app.multilib.base.BaseFragment + +class InHandleOrderFragment : BaseFragment() { + override fun initLayoutView(): Int = R.layout.fragment_order_inhandle + + override fun initData() { + + } + + override fun initEvent() { + + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt new file mode 100644 index 0000000..5fd046f --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -0,0 +1,24 @@ +package com.casic.app.smartwell.adapter + +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager +import androidx.fragment.app.FragmentPagerAdapter + +class TopViewPagerAdapter( + fragmentManager: FragmentManager, + private val pageTitles: Array, + private val pages: List +) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + + override fun getItem(position: Int): Fragment { + return pages[position] + } + + override fun getCount(): Int { + return pages.size + } + + override fun getPageTitle(position: Int): CharSequence { + return pageTitles[position] + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt b/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt index b718582..38eb818 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt @@ -36,4 +36,5 @@ R.mipmap.ic_launcher, R.mipmap.ic_launcher, R.mipmap.ic_launcher ) val HOME_ITEMS = arrayOf("闸井管理", "告警工单", "布防撤防") + val SUB_PAGE_TITLES = arrayOf("待处理", "待确认", "处理中", "已完成") } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 4050d1a..2aaff8c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -13,7 +13,7 @@ import com.casic.app.smartwell.view.fragment.HomePageFragment import com.casic.app.smartwell.view.fragment.MinePageFragment import com.casic.app.smartwell.view.fragment.NoticePageFragment -import com.casic.app.smartwell.view.fragment.OrderListFragment +import com.casic.app.smartwell.view.fragment.WorkOrderListFragment import com.casic.app.smartwell.vm.UserDetailViewModel import com.google.gson.Gson import kotlinx.android.synthetic.main.activity_main.* @@ -28,7 +28,7 @@ init { fragmentList.add(HomePageFragment()) - fragmentList.add(OrderListFragment()) + fragmentList.add(WorkOrderListFragment()) fragmentList.add(NoticePageFragment()) fragmentList.add(MinePageFragment()) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt new file mode 100644 index 0000000..5002066 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt @@ -0,0 +1,17 @@ +package com.casic.app.smartwell.view.fragment + +import com.casic.app.smartwell.R +import com.pengxh.app.multilib.base.BaseFragment + +class CompletedOrderFragment : BaseFragment() { + override fun initLayoutView(): Int = R.layout.fragment_order_completed + + override fun initData() { + + } + + override fun initEvent() { + + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt new file mode 100644 index 0000000..363b18e --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt @@ -0,0 +1,17 @@ +package com.casic.app.smartwell.view.fragment + +import com.casic.app.smartwell.R +import com.pengxh.app.multilib.base.BaseFragment + +class InHandleOrderFragment : BaseFragment() { + override fun initLayoutView(): Int = R.layout.fragment_order_inhandle + + override fun initData() { + + } + + override fun initEvent() { + + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/OrderListFragment.kt deleted file mode 100644 index 08b3e7a..0000000 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/OrderListFragment.kt +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.app.smartwell.view.fragment - -import com.casic.app.smartwell.R -import com.pengxh.app.multilib.base.BaseFragment - -class OrderListFragment : BaseFragment(){ - override fun initLayoutView(): Int = R.layout.fragment_order - - override fun initData() { - - } - - override fun initEvent() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt new file mode 100644 index 0000000..5fd046f --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -0,0 +1,24 @@ +package com.casic.app.smartwell.adapter + +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager +import androidx.fragment.app.FragmentPagerAdapter + +class TopViewPagerAdapter( + fragmentManager: FragmentManager, + private val pageTitles: Array, + private val pages: List +) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + + override fun getItem(position: Int): Fragment { + return pages[position] + } + + override fun getCount(): Int { + return pages.size + } + + override fun getPageTitle(position: Int): CharSequence { + return pageTitles[position] + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt b/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt index b718582..38eb818 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt @@ -36,4 +36,5 @@ R.mipmap.ic_launcher, R.mipmap.ic_launcher, R.mipmap.ic_launcher ) val HOME_ITEMS = arrayOf("闸井管理", "告警工单", "布防撤防") + val SUB_PAGE_TITLES = arrayOf("待处理", "待确认", "处理中", "已完成") } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 4050d1a..2aaff8c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -13,7 +13,7 @@ import com.casic.app.smartwell.view.fragment.HomePageFragment import com.casic.app.smartwell.view.fragment.MinePageFragment import com.casic.app.smartwell.view.fragment.NoticePageFragment -import com.casic.app.smartwell.view.fragment.OrderListFragment +import com.casic.app.smartwell.view.fragment.WorkOrderListFragment import com.casic.app.smartwell.vm.UserDetailViewModel import com.google.gson.Gson import kotlinx.android.synthetic.main.activity_main.* @@ -28,7 +28,7 @@ init { fragmentList.add(HomePageFragment()) - fragmentList.add(OrderListFragment()) + fragmentList.add(WorkOrderListFragment()) fragmentList.add(NoticePageFragment()) fragmentList.add(MinePageFragment()) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt new file mode 100644 index 0000000..5002066 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt @@ -0,0 +1,17 @@ +package com.casic.app.smartwell.view.fragment + +import com.casic.app.smartwell.R +import com.pengxh.app.multilib.base.BaseFragment + +class CompletedOrderFragment : BaseFragment() { + override fun initLayoutView(): Int = R.layout.fragment_order_completed + + override fun initData() { + + } + + override fun initEvent() { + + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt new file mode 100644 index 0000000..363b18e --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt @@ -0,0 +1,17 @@ +package com.casic.app.smartwell.view.fragment + +import com.casic.app.smartwell.R +import com.pengxh.app.multilib.base.BaseFragment + +class InHandleOrderFragment : BaseFragment() { + override fun initLayoutView(): Int = R.layout.fragment_order_inhandle + + override fun initData() { + + } + + override fun initEvent() { + + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/OrderListFragment.kt deleted file mode 100644 index 08b3e7a..0000000 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/OrderListFragment.kt +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.app.smartwell.view.fragment - -import com.casic.app.smartwell.R -import com.pengxh.app.multilib.base.BaseFragment - -class OrderListFragment : BaseFragment(){ - override fun initLayoutView(): Int = R.layout.fragment_order - - override fun initData() { - - } - - override fun initEvent() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/TodoOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/TodoOrderFragment.kt new file mode 100644 index 0000000..d2171b2 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/TodoOrderFragment.kt @@ -0,0 +1,17 @@ +package com.casic.app.smartwell.view.fragment + +import com.casic.app.smartwell.R +import com.pengxh.app.multilib.base.BaseFragment + +class TodoOrderFragment : BaseFragment() { + override fun initLayoutView(): Int = R.layout.fragment_order_todo + + override fun initData() { + + } + + override fun initEvent() { + + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt new file mode 100644 index 0000000..5fd046f --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -0,0 +1,24 @@ +package com.casic.app.smartwell.adapter + +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager +import androidx.fragment.app.FragmentPagerAdapter + +class TopViewPagerAdapter( + fragmentManager: FragmentManager, + private val pageTitles: Array, + private val pages: List +) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + + override fun getItem(position: Int): Fragment { + return pages[position] + } + + override fun getCount(): Int { + return pages.size + } + + override fun getPageTitle(position: Int): CharSequence { + return pageTitles[position] + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt b/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt index b718582..38eb818 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt @@ -36,4 +36,5 @@ R.mipmap.ic_launcher, R.mipmap.ic_launcher, R.mipmap.ic_launcher ) val HOME_ITEMS = arrayOf("闸井管理", "告警工单", "布防撤防") + val SUB_PAGE_TITLES = arrayOf("待处理", "待确认", "处理中", "已完成") } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 4050d1a..2aaff8c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -13,7 +13,7 @@ import com.casic.app.smartwell.view.fragment.HomePageFragment import com.casic.app.smartwell.view.fragment.MinePageFragment import com.casic.app.smartwell.view.fragment.NoticePageFragment -import com.casic.app.smartwell.view.fragment.OrderListFragment +import com.casic.app.smartwell.view.fragment.WorkOrderListFragment import com.casic.app.smartwell.vm.UserDetailViewModel import com.google.gson.Gson import kotlinx.android.synthetic.main.activity_main.* @@ -28,7 +28,7 @@ init { fragmentList.add(HomePageFragment()) - fragmentList.add(OrderListFragment()) + fragmentList.add(WorkOrderListFragment()) fragmentList.add(NoticePageFragment()) fragmentList.add(MinePageFragment()) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt new file mode 100644 index 0000000..5002066 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt @@ -0,0 +1,17 @@ +package com.casic.app.smartwell.view.fragment + +import com.casic.app.smartwell.R +import com.pengxh.app.multilib.base.BaseFragment + +class CompletedOrderFragment : BaseFragment() { + override fun initLayoutView(): Int = R.layout.fragment_order_completed + + override fun initData() { + + } + + override fun initEvent() { + + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt new file mode 100644 index 0000000..363b18e --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt @@ -0,0 +1,17 @@ +package com.casic.app.smartwell.view.fragment + +import com.casic.app.smartwell.R +import com.pengxh.app.multilib.base.BaseFragment + +class InHandleOrderFragment : BaseFragment() { + override fun initLayoutView(): Int = R.layout.fragment_order_inhandle + + override fun initData() { + + } + + override fun initEvent() { + + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/OrderListFragment.kt deleted file mode 100644 index 08b3e7a..0000000 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/OrderListFragment.kt +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.app.smartwell.view.fragment - -import com.casic.app.smartwell.R -import com.pengxh.app.multilib.base.BaseFragment - -class OrderListFragment : BaseFragment(){ - override fun initLayoutView(): Int = R.layout.fragment_order - - override fun initData() { - - } - - override fun initEvent() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/TodoOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/TodoOrderFragment.kt new file mode 100644 index 0000000..d2171b2 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/TodoOrderFragment.kt @@ -0,0 +1,17 @@ +package com.casic.app.smartwell.view.fragment + +import com.casic.app.smartwell.R +import com.pengxh.app.multilib.base.BaseFragment + +class TodoOrderFragment : BaseFragment() { + override fun initLayoutView(): Int = R.layout.fragment_order_todo + + override fun initData() { + + } + + override fun initEvent() { + + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/UndeterminedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/UndeterminedFragment.kt new file mode 100644 index 0000000..b1284a1 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/UndeterminedFragment.kt @@ -0,0 +1,17 @@ +package com.casic.app.smartwell.view.fragment + +import com.casic.app.smartwell.R +import com.pengxh.app.multilib.base.BaseFragment + +class UndeterminedFragment : BaseFragment() { + override fun initLayoutView(): Int = R.layout.fragment_order_undetermined + + override fun initData() { + + } + + override fun initEvent() { + + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt new file mode 100644 index 0000000..5fd046f --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -0,0 +1,24 @@ +package com.casic.app.smartwell.adapter + +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager +import androidx.fragment.app.FragmentPagerAdapter + +class TopViewPagerAdapter( + fragmentManager: FragmentManager, + private val pageTitles: Array, + private val pages: List +) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + + override fun getItem(position: Int): Fragment { + return pages[position] + } + + override fun getCount(): Int { + return pages.size + } + + override fun getPageTitle(position: Int): CharSequence { + return pageTitles[position] + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt b/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt index b718582..38eb818 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt @@ -36,4 +36,5 @@ R.mipmap.ic_launcher, R.mipmap.ic_launcher, R.mipmap.ic_launcher ) val HOME_ITEMS = arrayOf("闸井管理", "告警工单", "布防撤防") + val SUB_PAGE_TITLES = arrayOf("待处理", "待确认", "处理中", "已完成") } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 4050d1a..2aaff8c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -13,7 +13,7 @@ import com.casic.app.smartwell.view.fragment.HomePageFragment import com.casic.app.smartwell.view.fragment.MinePageFragment import com.casic.app.smartwell.view.fragment.NoticePageFragment -import com.casic.app.smartwell.view.fragment.OrderListFragment +import com.casic.app.smartwell.view.fragment.WorkOrderListFragment import com.casic.app.smartwell.vm.UserDetailViewModel import com.google.gson.Gson import kotlinx.android.synthetic.main.activity_main.* @@ -28,7 +28,7 @@ init { fragmentList.add(HomePageFragment()) - fragmentList.add(OrderListFragment()) + fragmentList.add(WorkOrderListFragment()) fragmentList.add(NoticePageFragment()) fragmentList.add(MinePageFragment()) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt new file mode 100644 index 0000000..5002066 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt @@ -0,0 +1,17 @@ +package com.casic.app.smartwell.view.fragment + +import com.casic.app.smartwell.R +import com.pengxh.app.multilib.base.BaseFragment + +class CompletedOrderFragment : BaseFragment() { + override fun initLayoutView(): Int = R.layout.fragment_order_completed + + override fun initData() { + + } + + override fun initEvent() { + + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt new file mode 100644 index 0000000..363b18e --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt @@ -0,0 +1,17 @@ +package com.casic.app.smartwell.view.fragment + +import com.casic.app.smartwell.R +import com.pengxh.app.multilib.base.BaseFragment + +class InHandleOrderFragment : BaseFragment() { + override fun initLayoutView(): Int = R.layout.fragment_order_inhandle + + override fun initData() { + + } + + override fun initEvent() { + + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/OrderListFragment.kt deleted file mode 100644 index 08b3e7a..0000000 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/OrderListFragment.kt +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.app.smartwell.view.fragment - -import com.casic.app.smartwell.R -import com.pengxh.app.multilib.base.BaseFragment - -class OrderListFragment : BaseFragment(){ - override fun initLayoutView(): Int = R.layout.fragment_order - - override fun initData() { - - } - - override fun initEvent() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/TodoOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/TodoOrderFragment.kt new file mode 100644 index 0000000..d2171b2 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/TodoOrderFragment.kt @@ -0,0 +1,17 @@ +package com.casic.app.smartwell.view.fragment + +import com.casic.app.smartwell.R +import com.pengxh.app.multilib.base.BaseFragment + +class TodoOrderFragment : BaseFragment() { + override fun initLayoutView(): Int = R.layout.fragment_order_todo + + override fun initData() { + + } + + override fun initEvent() { + + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/UndeterminedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/UndeterminedFragment.kt new file mode 100644 index 0000000..b1284a1 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/UndeterminedFragment.kt @@ -0,0 +1,17 @@ +package com.casic.app.smartwell.view.fragment + +import com.casic.app.smartwell.R +import com.pengxh.app.multilib.base.BaseFragment + +class UndeterminedFragment : BaseFragment() { + override fun initLayoutView(): Int = R.layout.fragment_order_undetermined + + override fun initData() { + + } + + override fun initEvent() { + + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/WorkOrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/WorkOrderListFragment.kt new file mode 100644 index 0000000..c0df2ec --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/WorkOrderListFragment.kt @@ -0,0 +1,37 @@ +package com.casic.app.smartwell.view.fragment + +import androidx.fragment.app.Fragment +import com.casic.app.smartwell.R +import com.casic.app.smartwell.adapter.TopViewPagerAdapter +import com.casic.app.smartwell.utils.Constant +import com.pengxh.app.multilib.base.BaseFragment +import kotlinx.android.synthetic.main.fragment_order.* +import java.util.* + +class WorkOrderListFragment : BaseFragment() { + + private var fragmentList: ArrayList = ArrayList() + + init { + fragmentList.add(TodoOrderFragment()) + fragmentList.add(UndeterminedFragment()) + fragmentList.add(InHandleOrderFragment()) + fragmentList.add(CompletedOrderFragment()) + } + + override fun initLayoutView(): Int = R.layout.fragment_order + + override fun initData() { + val topViewPagerAdapter = TopViewPagerAdapter( + childFragmentManager, + Constant.SUB_PAGE_TITLES, + fragmentList + ) + workOrderViewPager.adapter = topViewPagerAdapter + workOrderTabLayout.setupWithViewPager(workOrderViewPager) + } + + override fun initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt new file mode 100644 index 0000000..5fd046f --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -0,0 +1,24 @@ +package com.casic.app.smartwell.adapter + +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager +import androidx.fragment.app.FragmentPagerAdapter + +class TopViewPagerAdapter( + fragmentManager: FragmentManager, + private val pageTitles: Array, + private val pages: List +) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + + override fun getItem(position: Int): Fragment { + return pages[position] + } + + override fun getCount(): Int { + return pages.size + } + + override fun getPageTitle(position: Int): CharSequence { + return pageTitles[position] + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt b/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt index b718582..38eb818 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt @@ -36,4 +36,5 @@ R.mipmap.ic_launcher, R.mipmap.ic_launcher, R.mipmap.ic_launcher ) val HOME_ITEMS = arrayOf("闸井管理", "告警工单", "布防撤防") + val SUB_PAGE_TITLES = arrayOf("待处理", "待确认", "处理中", "已完成") } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 4050d1a..2aaff8c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -13,7 +13,7 @@ import com.casic.app.smartwell.view.fragment.HomePageFragment import com.casic.app.smartwell.view.fragment.MinePageFragment import com.casic.app.smartwell.view.fragment.NoticePageFragment -import com.casic.app.smartwell.view.fragment.OrderListFragment +import com.casic.app.smartwell.view.fragment.WorkOrderListFragment import com.casic.app.smartwell.vm.UserDetailViewModel import com.google.gson.Gson import kotlinx.android.synthetic.main.activity_main.* @@ -28,7 +28,7 @@ init { fragmentList.add(HomePageFragment()) - fragmentList.add(OrderListFragment()) + fragmentList.add(WorkOrderListFragment()) fragmentList.add(NoticePageFragment()) fragmentList.add(MinePageFragment()) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt new file mode 100644 index 0000000..5002066 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt @@ -0,0 +1,17 @@ +package com.casic.app.smartwell.view.fragment + +import com.casic.app.smartwell.R +import com.pengxh.app.multilib.base.BaseFragment + +class CompletedOrderFragment : BaseFragment() { + override fun initLayoutView(): Int = R.layout.fragment_order_completed + + override fun initData() { + + } + + override fun initEvent() { + + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt new file mode 100644 index 0000000..363b18e --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt @@ -0,0 +1,17 @@ +package com.casic.app.smartwell.view.fragment + +import com.casic.app.smartwell.R +import com.pengxh.app.multilib.base.BaseFragment + +class InHandleOrderFragment : BaseFragment() { + override fun initLayoutView(): Int = R.layout.fragment_order_inhandle + + override fun initData() { + + } + + override fun initEvent() { + + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/OrderListFragment.kt deleted file mode 100644 index 08b3e7a..0000000 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/OrderListFragment.kt +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.app.smartwell.view.fragment - -import com.casic.app.smartwell.R -import com.pengxh.app.multilib.base.BaseFragment - -class OrderListFragment : BaseFragment(){ - override fun initLayoutView(): Int = R.layout.fragment_order - - override fun initData() { - - } - - override fun initEvent() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/TodoOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/TodoOrderFragment.kt new file mode 100644 index 0000000..d2171b2 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/TodoOrderFragment.kt @@ -0,0 +1,17 @@ +package com.casic.app.smartwell.view.fragment + +import com.casic.app.smartwell.R +import com.pengxh.app.multilib.base.BaseFragment + +class TodoOrderFragment : BaseFragment() { + override fun initLayoutView(): Int = R.layout.fragment_order_todo + + override fun initData() { + + } + + override fun initEvent() { + + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/UndeterminedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/UndeterminedFragment.kt new file mode 100644 index 0000000..b1284a1 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/UndeterminedFragment.kt @@ -0,0 +1,17 @@ +package com.casic.app.smartwell.view.fragment + +import com.casic.app.smartwell.R +import com.pengxh.app.multilib.base.BaseFragment + +class UndeterminedFragment : BaseFragment() { + override fun initLayoutView(): Int = R.layout.fragment_order_undetermined + + override fun initData() { + + } + + override fun initEvent() { + + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/WorkOrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/WorkOrderListFragment.kt new file mode 100644 index 0000000..c0df2ec --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/WorkOrderListFragment.kt @@ -0,0 +1,37 @@ +package com.casic.app.smartwell.view.fragment + +import androidx.fragment.app.Fragment +import com.casic.app.smartwell.R +import com.casic.app.smartwell.adapter.TopViewPagerAdapter +import com.casic.app.smartwell.utils.Constant +import com.pengxh.app.multilib.base.BaseFragment +import kotlinx.android.synthetic.main.fragment_order.* +import java.util.* + +class WorkOrderListFragment : BaseFragment() { + + private var fragmentList: ArrayList = ArrayList() + + init { + fragmentList.add(TodoOrderFragment()) + fragmentList.add(UndeterminedFragment()) + fragmentList.add(InHandleOrderFragment()) + fragmentList.add(CompletedOrderFragment()) + } + + override fun initLayoutView(): Int = R.layout.fragment_order + + override fun initData() { + val topViewPagerAdapter = TopViewPagerAdapter( + childFragmentManager, + Constant.SUB_PAGE_TITLES, + fragmentList + ) + workOrderViewPager.adapter = topViewPagerAdapter + workOrderTabLayout.setupWithViewPager(workOrderViewPager) + } + + override fun initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 2ff9e1b..98adb01 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -10,7 +10,7 @@ - , + private val pages: List +) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + + override fun getItem(position: Int): Fragment { + return pages[position] + } + + override fun getCount(): Int { + return pages.size + } + + override fun getPageTitle(position: Int): CharSequence { + return pageTitles[position] + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt b/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt index b718582..38eb818 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt @@ -36,4 +36,5 @@ R.mipmap.ic_launcher, R.mipmap.ic_launcher, R.mipmap.ic_launcher ) val HOME_ITEMS = arrayOf("闸井管理", "告警工单", "布防撤防") + val SUB_PAGE_TITLES = arrayOf("待处理", "待确认", "处理中", "已完成") } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 4050d1a..2aaff8c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -13,7 +13,7 @@ import com.casic.app.smartwell.view.fragment.HomePageFragment import com.casic.app.smartwell.view.fragment.MinePageFragment import com.casic.app.smartwell.view.fragment.NoticePageFragment -import com.casic.app.smartwell.view.fragment.OrderListFragment +import com.casic.app.smartwell.view.fragment.WorkOrderListFragment import com.casic.app.smartwell.vm.UserDetailViewModel import com.google.gson.Gson import kotlinx.android.synthetic.main.activity_main.* @@ -28,7 +28,7 @@ init { fragmentList.add(HomePageFragment()) - fragmentList.add(OrderListFragment()) + fragmentList.add(WorkOrderListFragment()) fragmentList.add(NoticePageFragment()) fragmentList.add(MinePageFragment()) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt new file mode 100644 index 0000000..5002066 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt @@ -0,0 +1,17 @@ +package com.casic.app.smartwell.view.fragment + +import com.casic.app.smartwell.R +import com.pengxh.app.multilib.base.BaseFragment + +class CompletedOrderFragment : BaseFragment() { + override fun initLayoutView(): Int = R.layout.fragment_order_completed + + override fun initData() { + + } + + override fun initEvent() { + + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt new file mode 100644 index 0000000..363b18e --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt @@ -0,0 +1,17 @@ +package com.casic.app.smartwell.view.fragment + +import com.casic.app.smartwell.R +import com.pengxh.app.multilib.base.BaseFragment + +class InHandleOrderFragment : BaseFragment() { + override fun initLayoutView(): Int = R.layout.fragment_order_inhandle + + override fun initData() { + + } + + override fun initEvent() { + + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/OrderListFragment.kt deleted file mode 100644 index 08b3e7a..0000000 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/OrderListFragment.kt +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.app.smartwell.view.fragment - -import com.casic.app.smartwell.R -import com.pengxh.app.multilib.base.BaseFragment - -class OrderListFragment : BaseFragment(){ - override fun initLayoutView(): Int = R.layout.fragment_order - - override fun initData() { - - } - - override fun initEvent() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/TodoOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/TodoOrderFragment.kt new file mode 100644 index 0000000..d2171b2 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/TodoOrderFragment.kt @@ -0,0 +1,17 @@ +package com.casic.app.smartwell.view.fragment + +import com.casic.app.smartwell.R +import com.pengxh.app.multilib.base.BaseFragment + +class TodoOrderFragment : BaseFragment() { + override fun initLayoutView(): Int = R.layout.fragment_order_todo + + override fun initData() { + + } + + override fun initEvent() { + + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/UndeterminedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/UndeterminedFragment.kt new file mode 100644 index 0000000..b1284a1 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/UndeterminedFragment.kt @@ -0,0 +1,17 @@ +package com.casic.app.smartwell.view.fragment + +import com.casic.app.smartwell.R +import com.pengxh.app.multilib.base.BaseFragment + +class UndeterminedFragment : BaseFragment() { + override fun initLayoutView(): Int = R.layout.fragment_order_undetermined + + override fun initData() { + + } + + override fun initEvent() { + + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/WorkOrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/WorkOrderListFragment.kt new file mode 100644 index 0000000..c0df2ec --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/WorkOrderListFragment.kt @@ -0,0 +1,37 @@ +package com.casic.app.smartwell.view.fragment + +import androidx.fragment.app.Fragment +import com.casic.app.smartwell.R +import com.casic.app.smartwell.adapter.TopViewPagerAdapter +import com.casic.app.smartwell.utils.Constant +import com.pengxh.app.multilib.base.BaseFragment +import kotlinx.android.synthetic.main.fragment_order.* +import java.util.* + +class WorkOrderListFragment : BaseFragment() { + + private var fragmentList: ArrayList = ArrayList() + + init { + fragmentList.add(TodoOrderFragment()) + fragmentList.add(UndeterminedFragment()) + fragmentList.add(InHandleOrderFragment()) + fragmentList.add(CompletedOrderFragment()) + } + + override fun initLayoutView(): Int = R.layout.fragment_order + + override fun initData() { + val topViewPagerAdapter = TopViewPagerAdapter( + childFragmentManager, + Constant.SUB_PAGE_TITLES, + fragmentList + ) + workOrderViewPager.adapter = topViewPagerAdapter + workOrderTabLayout.setupWithViewPager(workOrderViewPager) + } + + override fun initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 2ff9e1b..98adb01 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -10,7 +10,7 @@ - - + - \ No newline at end of file + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt new file mode 100644 index 0000000..5fd046f --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -0,0 +1,24 @@ +package com.casic.app.smartwell.adapter + +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager +import androidx.fragment.app.FragmentPagerAdapter + +class TopViewPagerAdapter( + fragmentManager: FragmentManager, + private val pageTitles: Array, + private val pages: List +) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + + override fun getItem(position: Int): Fragment { + return pages[position] + } + + override fun getCount(): Int { + return pages.size + } + + override fun getPageTitle(position: Int): CharSequence { + return pageTitles[position] + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt b/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt index b718582..38eb818 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt @@ -36,4 +36,5 @@ R.mipmap.ic_launcher, R.mipmap.ic_launcher, R.mipmap.ic_launcher ) val HOME_ITEMS = arrayOf("闸井管理", "告警工单", "布防撤防") + val SUB_PAGE_TITLES = arrayOf("待处理", "待确认", "处理中", "已完成") } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 4050d1a..2aaff8c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -13,7 +13,7 @@ import com.casic.app.smartwell.view.fragment.HomePageFragment import com.casic.app.smartwell.view.fragment.MinePageFragment import com.casic.app.smartwell.view.fragment.NoticePageFragment -import com.casic.app.smartwell.view.fragment.OrderListFragment +import com.casic.app.smartwell.view.fragment.WorkOrderListFragment import com.casic.app.smartwell.vm.UserDetailViewModel import com.google.gson.Gson import kotlinx.android.synthetic.main.activity_main.* @@ -28,7 +28,7 @@ init { fragmentList.add(HomePageFragment()) - fragmentList.add(OrderListFragment()) + fragmentList.add(WorkOrderListFragment()) fragmentList.add(NoticePageFragment()) fragmentList.add(MinePageFragment()) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt new file mode 100644 index 0000000..5002066 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt @@ -0,0 +1,17 @@ +package com.casic.app.smartwell.view.fragment + +import com.casic.app.smartwell.R +import com.pengxh.app.multilib.base.BaseFragment + +class CompletedOrderFragment : BaseFragment() { + override fun initLayoutView(): Int = R.layout.fragment_order_completed + + override fun initData() { + + } + + override fun initEvent() { + + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt new file mode 100644 index 0000000..363b18e --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt @@ -0,0 +1,17 @@ +package com.casic.app.smartwell.view.fragment + +import com.casic.app.smartwell.R +import com.pengxh.app.multilib.base.BaseFragment + +class InHandleOrderFragment : BaseFragment() { + override fun initLayoutView(): Int = R.layout.fragment_order_inhandle + + override fun initData() { + + } + + override fun initEvent() { + + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/OrderListFragment.kt deleted file mode 100644 index 08b3e7a..0000000 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/OrderListFragment.kt +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.app.smartwell.view.fragment - -import com.casic.app.smartwell.R -import com.pengxh.app.multilib.base.BaseFragment - -class OrderListFragment : BaseFragment(){ - override fun initLayoutView(): Int = R.layout.fragment_order - - override fun initData() { - - } - - override fun initEvent() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/TodoOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/TodoOrderFragment.kt new file mode 100644 index 0000000..d2171b2 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/TodoOrderFragment.kt @@ -0,0 +1,17 @@ +package com.casic.app.smartwell.view.fragment + +import com.casic.app.smartwell.R +import com.pengxh.app.multilib.base.BaseFragment + +class TodoOrderFragment : BaseFragment() { + override fun initLayoutView(): Int = R.layout.fragment_order_todo + + override fun initData() { + + } + + override fun initEvent() { + + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/UndeterminedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/UndeterminedFragment.kt new file mode 100644 index 0000000..b1284a1 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/UndeterminedFragment.kt @@ -0,0 +1,17 @@ +package com.casic.app.smartwell.view.fragment + +import com.casic.app.smartwell.R +import com.pengxh.app.multilib.base.BaseFragment + +class UndeterminedFragment : BaseFragment() { + override fun initLayoutView(): Int = R.layout.fragment_order_undetermined + + override fun initData() { + + } + + override fun initEvent() { + + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/WorkOrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/WorkOrderListFragment.kt new file mode 100644 index 0000000..c0df2ec --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/WorkOrderListFragment.kt @@ -0,0 +1,37 @@ +package com.casic.app.smartwell.view.fragment + +import androidx.fragment.app.Fragment +import com.casic.app.smartwell.R +import com.casic.app.smartwell.adapter.TopViewPagerAdapter +import com.casic.app.smartwell.utils.Constant +import com.pengxh.app.multilib.base.BaseFragment +import kotlinx.android.synthetic.main.fragment_order.* +import java.util.* + +class WorkOrderListFragment : BaseFragment() { + + private var fragmentList: ArrayList = ArrayList() + + init { + fragmentList.add(TodoOrderFragment()) + fragmentList.add(UndeterminedFragment()) + fragmentList.add(InHandleOrderFragment()) + fragmentList.add(CompletedOrderFragment()) + } + + override fun initLayoutView(): Int = R.layout.fragment_order + + override fun initData() { + val topViewPagerAdapter = TopViewPagerAdapter( + childFragmentManager, + Constant.SUB_PAGE_TITLES, + fragmentList + ) + workOrderViewPager.adapter = topViewPagerAdapter + workOrderTabLayout.setupWithViewPager(workOrderViewPager) + } + + override fun initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 2ff9e1b..98adb01 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -10,7 +10,7 @@ - - + - \ No newline at end of file + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_order_completed.xml b/app/src/main/res/layout/fragment_order_completed.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/fragment_order_completed.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt new file mode 100644 index 0000000..5fd046f --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -0,0 +1,24 @@ +package com.casic.app.smartwell.adapter + +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager +import androidx.fragment.app.FragmentPagerAdapter + +class TopViewPagerAdapter( + fragmentManager: FragmentManager, + private val pageTitles: Array, + private val pages: List +) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + + override fun getItem(position: Int): Fragment { + return pages[position] + } + + override fun getCount(): Int { + return pages.size + } + + override fun getPageTitle(position: Int): CharSequence { + return pageTitles[position] + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt b/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt index b718582..38eb818 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt @@ -36,4 +36,5 @@ R.mipmap.ic_launcher, R.mipmap.ic_launcher, R.mipmap.ic_launcher ) val HOME_ITEMS = arrayOf("闸井管理", "告警工单", "布防撤防") + val SUB_PAGE_TITLES = arrayOf("待处理", "待确认", "处理中", "已完成") } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 4050d1a..2aaff8c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -13,7 +13,7 @@ import com.casic.app.smartwell.view.fragment.HomePageFragment import com.casic.app.smartwell.view.fragment.MinePageFragment import com.casic.app.smartwell.view.fragment.NoticePageFragment -import com.casic.app.smartwell.view.fragment.OrderListFragment +import com.casic.app.smartwell.view.fragment.WorkOrderListFragment import com.casic.app.smartwell.vm.UserDetailViewModel import com.google.gson.Gson import kotlinx.android.synthetic.main.activity_main.* @@ -28,7 +28,7 @@ init { fragmentList.add(HomePageFragment()) - fragmentList.add(OrderListFragment()) + fragmentList.add(WorkOrderListFragment()) fragmentList.add(NoticePageFragment()) fragmentList.add(MinePageFragment()) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt new file mode 100644 index 0000000..5002066 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt @@ -0,0 +1,17 @@ +package com.casic.app.smartwell.view.fragment + +import com.casic.app.smartwell.R +import com.pengxh.app.multilib.base.BaseFragment + +class CompletedOrderFragment : BaseFragment() { + override fun initLayoutView(): Int = R.layout.fragment_order_completed + + override fun initData() { + + } + + override fun initEvent() { + + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt new file mode 100644 index 0000000..363b18e --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt @@ -0,0 +1,17 @@ +package com.casic.app.smartwell.view.fragment + +import com.casic.app.smartwell.R +import com.pengxh.app.multilib.base.BaseFragment + +class InHandleOrderFragment : BaseFragment() { + override fun initLayoutView(): Int = R.layout.fragment_order_inhandle + + override fun initData() { + + } + + override fun initEvent() { + + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/OrderListFragment.kt deleted file mode 100644 index 08b3e7a..0000000 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/OrderListFragment.kt +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.app.smartwell.view.fragment - -import com.casic.app.smartwell.R -import com.pengxh.app.multilib.base.BaseFragment - -class OrderListFragment : BaseFragment(){ - override fun initLayoutView(): Int = R.layout.fragment_order - - override fun initData() { - - } - - override fun initEvent() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/TodoOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/TodoOrderFragment.kt new file mode 100644 index 0000000..d2171b2 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/TodoOrderFragment.kt @@ -0,0 +1,17 @@ +package com.casic.app.smartwell.view.fragment + +import com.casic.app.smartwell.R +import com.pengxh.app.multilib.base.BaseFragment + +class TodoOrderFragment : BaseFragment() { + override fun initLayoutView(): Int = R.layout.fragment_order_todo + + override fun initData() { + + } + + override fun initEvent() { + + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/UndeterminedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/UndeterminedFragment.kt new file mode 100644 index 0000000..b1284a1 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/UndeterminedFragment.kt @@ -0,0 +1,17 @@ +package com.casic.app.smartwell.view.fragment + +import com.casic.app.smartwell.R +import com.pengxh.app.multilib.base.BaseFragment + +class UndeterminedFragment : BaseFragment() { + override fun initLayoutView(): Int = R.layout.fragment_order_undetermined + + override fun initData() { + + } + + override fun initEvent() { + + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/WorkOrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/WorkOrderListFragment.kt new file mode 100644 index 0000000..c0df2ec --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/WorkOrderListFragment.kt @@ -0,0 +1,37 @@ +package com.casic.app.smartwell.view.fragment + +import androidx.fragment.app.Fragment +import com.casic.app.smartwell.R +import com.casic.app.smartwell.adapter.TopViewPagerAdapter +import com.casic.app.smartwell.utils.Constant +import com.pengxh.app.multilib.base.BaseFragment +import kotlinx.android.synthetic.main.fragment_order.* +import java.util.* + +class WorkOrderListFragment : BaseFragment() { + + private var fragmentList: ArrayList = ArrayList() + + init { + fragmentList.add(TodoOrderFragment()) + fragmentList.add(UndeterminedFragment()) + fragmentList.add(InHandleOrderFragment()) + fragmentList.add(CompletedOrderFragment()) + } + + override fun initLayoutView(): Int = R.layout.fragment_order + + override fun initData() { + val topViewPagerAdapter = TopViewPagerAdapter( + childFragmentManager, + Constant.SUB_PAGE_TITLES, + fragmentList + ) + workOrderViewPager.adapter = topViewPagerAdapter + workOrderTabLayout.setupWithViewPager(workOrderViewPager) + } + + override fun initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 2ff9e1b..98adb01 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -10,7 +10,7 @@ - - + - \ No newline at end of file + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_order_completed.xml b/app/src/main/res/layout/fragment_order_completed.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/fragment_order_completed.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_order_inhandle.xml b/app/src/main/res/layout/fragment_order_inhandle.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/fragment_order_inhandle.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt new file mode 100644 index 0000000..5fd046f --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -0,0 +1,24 @@ +package com.casic.app.smartwell.adapter + +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager +import androidx.fragment.app.FragmentPagerAdapter + +class TopViewPagerAdapter( + fragmentManager: FragmentManager, + private val pageTitles: Array, + private val pages: List +) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + + override fun getItem(position: Int): Fragment { + return pages[position] + } + + override fun getCount(): Int { + return pages.size + } + + override fun getPageTitle(position: Int): CharSequence { + return pageTitles[position] + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt b/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt index b718582..38eb818 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt @@ -36,4 +36,5 @@ R.mipmap.ic_launcher, R.mipmap.ic_launcher, R.mipmap.ic_launcher ) val HOME_ITEMS = arrayOf("闸井管理", "告警工单", "布防撤防") + val SUB_PAGE_TITLES = arrayOf("待处理", "待确认", "处理中", "已完成") } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 4050d1a..2aaff8c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -13,7 +13,7 @@ import com.casic.app.smartwell.view.fragment.HomePageFragment import com.casic.app.smartwell.view.fragment.MinePageFragment import com.casic.app.smartwell.view.fragment.NoticePageFragment -import com.casic.app.smartwell.view.fragment.OrderListFragment +import com.casic.app.smartwell.view.fragment.WorkOrderListFragment import com.casic.app.smartwell.vm.UserDetailViewModel import com.google.gson.Gson import kotlinx.android.synthetic.main.activity_main.* @@ -28,7 +28,7 @@ init { fragmentList.add(HomePageFragment()) - fragmentList.add(OrderListFragment()) + fragmentList.add(WorkOrderListFragment()) fragmentList.add(NoticePageFragment()) fragmentList.add(MinePageFragment()) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt new file mode 100644 index 0000000..5002066 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt @@ -0,0 +1,17 @@ +package com.casic.app.smartwell.view.fragment + +import com.casic.app.smartwell.R +import com.pengxh.app.multilib.base.BaseFragment + +class CompletedOrderFragment : BaseFragment() { + override fun initLayoutView(): Int = R.layout.fragment_order_completed + + override fun initData() { + + } + + override fun initEvent() { + + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt new file mode 100644 index 0000000..363b18e --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt @@ -0,0 +1,17 @@ +package com.casic.app.smartwell.view.fragment + +import com.casic.app.smartwell.R +import com.pengxh.app.multilib.base.BaseFragment + +class InHandleOrderFragment : BaseFragment() { + override fun initLayoutView(): Int = R.layout.fragment_order_inhandle + + override fun initData() { + + } + + override fun initEvent() { + + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/OrderListFragment.kt deleted file mode 100644 index 08b3e7a..0000000 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/OrderListFragment.kt +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.app.smartwell.view.fragment - -import com.casic.app.smartwell.R -import com.pengxh.app.multilib.base.BaseFragment - -class OrderListFragment : BaseFragment(){ - override fun initLayoutView(): Int = R.layout.fragment_order - - override fun initData() { - - } - - override fun initEvent() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/TodoOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/TodoOrderFragment.kt new file mode 100644 index 0000000..d2171b2 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/TodoOrderFragment.kt @@ -0,0 +1,17 @@ +package com.casic.app.smartwell.view.fragment + +import com.casic.app.smartwell.R +import com.pengxh.app.multilib.base.BaseFragment + +class TodoOrderFragment : BaseFragment() { + override fun initLayoutView(): Int = R.layout.fragment_order_todo + + override fun initData() { + + } + + override fun initEvent() { + + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/UndeterminedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/UndeterminedFragment.kt new file mode 100644 index 0000000..b1284a1 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/UndeterminedFragment.kt @@ -0,0 +1,17 @@ +package com.casic.app.smartwell.view.fragment + +import com.casic.app.smartwell.R +import com.pengxh.app.multilib.base.BaseFragment + +class UndeterminedFragment : BaseFragment() { + override fun initLayoutView(): Int = R.layout.fragment_order_undetermined + + override fun initData() { + + } + + override fun initEvent() { + + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/WorkOrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/WorkOrderListFragment.kt new file mode 100644 index 0000000..c0df2ec --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/WorkOrderListFragment.kt @@ -0,0 +1,37 @@ +package com.casic.app.smartwell.view.fragment + +import androidx.fragment.app.Fragment +import com.casic.app.smartwell.R +import com.casic.app.smartwell.adapter.TopViewPagerAdapter +import com.casic.app.smartwell.utils.Constant +import com.pengxh.app.multilib.base.BaseFragment +import kotlinx.android.synthetic.main.fragment_order.* +import java.util.* + +class WorkOrderListFragment : BaseFragment() { + + private var fragmentList: ArrayList = ArrayList() + + init { + fragmentList.add(TodoOrderFragment()) + fragmentList.add(UndeterminedFragment()) + fragmentList.add(InHandleOrderFragment()) + fragmentList.add(CompletedOrderFragment()) + } + + override fun initLayoutView(): Int = R.layout.fragment_order + + override fun initData() { + val topViewPagerAdapter = TopViewPagerAdapter( + childFragmentManager, + Constant.SUB_PAGE_TITLES, + fragmentList + ) + workOrderViewPager.adapter = topViewPagerAdapter + workOrderTabLayout.setupWithViewPager(workOrderViewPager) + } + + override fun initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 2ff9e1b..98adb01 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -10,7 +10,7 @@ - - + - \ No newline at end of file + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_order_completed.xml b/app/src/main/res/layout/fragment_order_completed.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/fragment_order_completed.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_order_inhandle.xml b/app/src/main/res/layout/fragment_order_inhandle.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/fragment_order_inhandle.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_order_todo.xml b/app/src/main/res/layout/fragment_order_todo.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/fragment_order_todo.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt new file mode 100644 index 0000000..5fd046f --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -0,0 +1,24 @@ +package com.casic.app.smartwell.adapter + +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager +import androidx.fragment.app.FragmentPagerAdapter + +class TopViewPagerAdapter( + fragmentManager: FragmentManager, + private val pageTitles: Array, + private val pages: List +) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + + override fun getItem(position: Int): Fragment { + return pages[position] + } + + override fun getCount(): Int { + return pages.size + } + + override fun getPageTitle(position: Int): CharSequence { + return pageTitles[position] + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt b/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt index b718582..38eb818 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt @@ -36,4 +36,5 @@ R.mipmap.ic_launcher, R.mipmap.ic_launcher, R.mipmap.ic_launcher ) val HOME_ITEMS = arrayOf("闸井管理", "告警工单", "布防撤防") + val SUB_PAGE_TITLES = arrayOf("待处理", "待确认", "处理中", "已完成") } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 4050d1a..2aaff8c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -13,7 +13,7 @@ import com.casic.app.smartwell.view.fragment.HomePageFragment import com.casic.app.smartwell.view.fragment.MinePageFragment import com.casic.app.smartwell.view.fragment.NoticePageFragment -import com.casic.app.smartwell.view.fragment.OrderListFragment +import com.casic.app.smartwell.view.fragment.WorkOrderListFragment import com.casic.app.smartwell.vm.UserDetailViewModel import com.google.gson.Gson import kotlinx.android.synthetic.main.activity_main.* @@ -28,7 +28,7 @@ init { fragmentList.add(HomePageFragment()) - fragmentList.add(OrderListFragment()) + fragmentList.add(WorkOrderListFragment()) fragmentList.add(NoticePageFragment()) fragmentList.add(MinePageFragment()) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt new file mode 100644 index 0000000..5002066 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt @@ -0,0 +1,17 @@ +package com.casic.app.smartwell.view.fragment + +import com.casic.app.smartwell.R +import com.pengxh.app.multilib.base.BaseFragment + +class CompletedOrderFragment : BaseFragment() { + override fun initLayoutView(): Int = R.layout.fragment_order_completed + + override fun initData() { + + } + + override fun initEvent() { + + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt new file mode 100644 index 0000000..363b18e --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt @@ -0,0 +1,17 @@ +package com.casic.app.smartwell.view.fragment + +import com.casic.app.smartwell.R +import com.pengxh.app.multilib.base.BaseFragment + +class InHandleOrderFragment : BaseFragment() { + override fun initLayoutView(): Int = R.layout.fragment_order_inhandle + + override fun initData() { + + } + + override fun initEvent() { + + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/OrderListFragment.kt deleted file mode 100644 index 08b3e7a..0000000 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/OrderListFragment.kt +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.app.smartwell.view.fragment - -import com.casic.app.smartwell.R -import com.pengxh.app.multilib.base.BaseFragment - -class OrderListFragment : BaseFragment(){ - override fun initLayoutView(): Int = R.layout.fragment_order - - override fun initData() { - - } - - override fun initEvent() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/TodoOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/TodoOrderFragment.kt new file mode 100644 index 0000000..d2171b2 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/TodoOrderFragment.kt @@ -0,0 +1,17 @@ +package com.casic.app.smartwell.view.fragment + +import com.casic.app.smartwell.R +import com.pengxh.app.multilib.base.BaseFragment + +class TodoOrderFragment : BaseFragment() { + override fun initLayoutView(): Int = R.layout.fragment_order_todo + + override fun initData() { + + } + + override fun initEvent() { + + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/UndeterminedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/UndeterminedFragment.kt new file mode 100644 index 0000000..b1284a1 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/UndeterminedFragment.kt @@ -0,0 +1,17 @@ +package com.casic.app.smartwell.view.fragment + +import com.casic.app.smartwell.R +import com.pengxh.app.multilib.base.BaseFragment + +class UndeterminedFragment : BaseFragment() { + override fun initLayoutView(): Int = R.layout.fragment_order_undetermined + + override fun initData() { + + } + + override fun initEvent() { + + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/WorkOrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/WorkOrderListFragment.kt new file mode 100644 index 0000000..c0df2ec --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/WorkOrderListFragment.kt @@ -0,0 +1,37 @@ +package com.casic.app.smartwell.view.fragment + +import androidx.fragment.app.Fragment +import com.casic.app.smartwell.R +import com.casic.app.smartwell.adapter.TopViewPagerAdapter +import com.casic.app.smartwell.utils.Constant +import com.pengxh.app.multilib.base.BaseFragment +import kotlinx.android.synthetic.main.fragment_order.* +import java.util.* + +class WorkOrderListFragment : BaseFragment() { + + private var fragmentList: ArrayList = ArrayList() + + init { + fragmentList.add(TodoOrderFragment()) + fragmentList.add(UndeterminedFragment()) + fragmentList.add(InHandleOrderFragment()) + fragmentList.add(CompletedOrderFragment()) + } + + override fun initLayoutView(): Int = R.layout.fragment_order + + override fun initData() { + val topViewPagerAdapter = TopViewPagerAdapter( + childFragmentManager, + Constant.SUB_PAGE_TITLES, + fragmentList + ) + workOrderViewPager.adapter = topViewPagerAdapter + workOrderTabLayout.setupWithViewPager(workOrderViewPager) + } + + override fun initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 2ff9e1b..98adb01 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -10,7 +10,7 @@ - - + - \ No newline at end of file + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_order_completed.xml b/app/src/main/res/layout/fragment_order_completed.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/fragment_order_completed.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_order_inhandle.xml b/app/src/main/res/layout/fragment_order_inhandle.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/fragment_order_inhandle.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_order_todo.xml b/app/src/main/res/layout/fragment_order_todo.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/fragment_order_todo.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_order_undetermined.xml b/app/src/main/res/layout/fragment_order_undetermined.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/fragment_order_undetermined.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt new file mode 100644 index 0000000..5fd046f --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/adapter/TopViewPagerAdapter.kt @@ -0,0 +1,24 @@ +package com.casic.app.smartwell.adapter + +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager +import androidx.fragment.app.FragmentPagerAdapter + +class TopViewPagerAdapter( + fragmentManager: FragmentManager, + private val pageTitles: Array, + private val pages: List +) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + + override fun getItem(position: Int): Fragment { + return pages[position] + } + + override fun getCount(): Int { + return pages.size + } + + override fun getPageTitle(position: Int): CharSequence { + return pageTitles[position] + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt b/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt index b718582..38eb818 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/Constant.kt @@ -36,4 +36,5 @@ R.mipmap.ic_launcher, R.mipmap.ic_launcher, R.mipmap.ic_launcher ) val HOME_ITEMS = arrayOf("闸井管理", "告警工单", "布防撤防") + val SUB_PAGE_TITLES = arrayOf("待处理", "待确认", "处理中", "已完成") } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 4050d1a..2aaff8c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -13,7 +13,7 @@ import com.casic.app.smartwell.view.fragment.HomePageFragment import com.casic.app.smartwell.view.fragment.MinePageFragment import com.casic.app.smartwell.view.fragment.NoticePageFragment -import com.casic.app.smartwell.view.fragment.OrderListFragment +import com.casic.app.smartwell.view.fragment.WorkOrderListFragment import com.casic.app.smartwell.vm.UserDetailViewModel import com.google.gson.Gson import kotlinx.android.synthetic.main.activity_main.* @@ -28,7 +28,7 @@ init { fragmentList.add(HomePageFragment()) - fragmentList.add(OrderListFragment()) + fragmentList.add(WorkOrderListFragment()) fragmentList.add(NoticePageFragment()) fragmentList.add(MinePageFragment()) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt new file mode 100644 index 0000000..5002066 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt @@ -0,0 +1,17 @@ +package com.casic.app.smartwell.view.fragment + +import com.casic.app.smartwell.R +import com.pengxh.app.multilib.base.BaseFragment + +class CompletedOrderFragment : BaseFragment() { + override fun initLayoutView(): Int = R.layout.fragment_order_completed + + override fun initData() { + + } + + override fun initEvent() { + + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt new file mode 100644 index 0000000..363b18e --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt @@ -0,0 +1,17 @@ +package com.casic.app.smartwell.view.fragment + +import com.casic.app.smartwell.R +import com.pengxh.app.multilib.base.BaseFragment + +class InHandleOrderFragment : BaseFragment() { + override fun initLayoutView(): Int = R.layout.fragment_order_inhandle + + override fun initData() { + + } + + override fun initEvent() { + + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/OrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/OrderListFragment.kt deleted file mode 100644 index 08b3e7a..0000000 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/OrderListFragment.kt +++ /dev/null @@ -1,16 +0,0 @@ -package com.casic.app.smartwell.view.fragment - -import com.casic.app.smartwell.R -import com.pengxh.app.multilib.base.BaseFragment - -class OrderListFragment : BaseFragment(){ - override fun initLayoutView(): Int = R.layout.fragment_order - - override fun initData() { - - } - - override fun initEvent() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/TodoOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/TodoOrderFragment.kt new file mode 100644 index 0000000..d2171b2 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/TodoOrderFragment.kt @@ -0,0 +1,17 @@ +package com.casic.app.smartwell.view.fragment + +import com.casic.app.smartwell.R +import com.pengxh.app.multilib.base.BaseFragment + +class TodoOrderFragment : BaseFragment() { + override fun initLayoutView(): Int = R.layout.fragment_order_todo + + override fun initData() { + + } + + override fun initEvent() { + + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/UndeterminedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/UndeterminedFragment.kt new file mode 100644 index 0000000..b1284a1 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/UndeterminedFragment.kt @@ -0,0 +1,17 @@ +package com.casic.app.smartwell.view.fragment + +import com.casic.app.smartwell.R +import com.pengxh.app.multilib.base.BaseFragment + +class UndeterminedFragment : BaseFragment() { + override fun initLayoutView(): Int = R.layout.fragment_order_undetermined + + override fun initData() { + + } + + override fun initEvent() { + + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/WorkOrderListFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/WorkOrderListFragment.kt new file mode 100644 index 0000000..c0df2ec --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/WorkOrderListFragment.kt @@ -0,0 +1,37 @@ +package com.casic.app.smartwell.view.fragment + +import androidx.fragment.app.Fragment +import com.casic.app.smartwell.R +import com.casic.app.smartwell.adapter.TopViewPagerAdapter +import com.casic.app.smartwell.utils.Constant +import com.pengxh.app.multilib.base.BaseFragment +import kotlinx.android.synthetic.main.fragment_order.* +import java.util.* + +class WorkOrderListFragment : BaseFragment() { + + private var fragmentList: ArrayList = ArrayList() + + init { + fragmentList.add(TodoOrderFragment()) + fragmentList.add(UndeterminedFragment()) + fragmentList.add(InHandleOrderFragment()) + fragmentList.add(CompletedOrderFragment()) + } + + override fun initLayoutView(): Int = R.layout.fragment_order + + override fun initData() { + val topViewPagerAdapter = TopViewPagerAdapter( + childFragmentManager, + Constant.SUB_PAGE_TITLES, + fragmentList + ) + workOrderViewPager.adapter = topViewPagerAdapter + workOrderTabLayout.setupWithViewPager(workOrderViewPager) + } + + override fun initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 2ff9e1b..98adb01 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -10,7 +10,7 @@ - - + - \ No newline at end of file + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_order_completed.xml b/app/src/main/res/layout/fragment_order_completed.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/fragment_order_completed.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_order_inhandle.xml b/app/src/main/res/layout/fragment_order_inhandle.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/fragment_order_inhandle.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_order_todo.xml b/app/src/main/res/layout/fragment_order_todo.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/fragment_order_todo.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_order_undetermined.xml b/app/src/main/res/layout/fragment_order_undetermined.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/fragment_order_undetermined.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 09b76ca..00f7dfa 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -3,7 +3,7 @@ 16sp 18sp 20sp - 50sp + 45sp 3dp