diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt new file mode 100644 index 0000000..621d5d4 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt @@ -0,0 +1,18 @@ +package com.casic.xz.meterage.adapter + +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager +import androidx.fragment.app.FragmentPagerAdapter + +class SubViewPagerAdapter( + manager: FragmentManager, + private val pages: ArrayList, + private val titles: Array +) : FragmentPagerAdapter(manager) { + + override fun getItem(position: Int): Fragment = pages[position] + + override fun getCount(): Int = pages.size + + override fun getPageTitle(position: Int): CharSequence = titles[position] +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt new file mode 100644 index 0000000..621d5d4 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt @@ -0,0 +1,18 @@ +package com.casic.xz.meterage.adapter + +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager +import androidx.fragment.app.FragmentPagerAdapter + +class SubViewPagerAdapter( + manager: FragmentManager, + private val pages: ArrayList, + private val titles: Array +) : FragmentPagerAdapter(manager) { + + override fun getItem(position: Int): Fragment = pages[position] + + override fun getCount(): Int = pages.size + + override fun getPageTitle(position: Int): CharSequence = titles[position] +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index f54f94a..afa0759 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,11 +1,32 @@ package com.casic.xz.meterage.fragment +import androidx.fragment.app.Fragment import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.SubViewPagerAdapter +import com.casic.xz.meterage.fragment.sample.FutureTaskFragment +import com.casic.xz.meterage.fragment.sample.TotalTaskFragment +import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_sample.* -class SamplePageFragment : KotlinBaseFragment(){ +class SamplePageFragment : KotlinBaseFragment() { + + private var fragmentPages: ArrayList = ArrayList() + + init { + fragmentPages.add(UnderTaskFragment()) + fragmentPages.add(FutureTaskFragment()) + fragmentPages.add(TotalTaskFragment()) + } + override fun initData() { + val samplePageTitles = arrayOf("检定中 0", "预期任务 0", "全部 0") + sampleViewPager.adapter = SubViewPagerAdapter( + childFragmentManager, fragmentPages, samplePageTitles + ) + //绑定 + topTabLayout.setupWithViewPager(sampleViewPager) } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt new file mode 100644 index 0000000..621d5d4 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt @@ -0,0 +1,18 @@ +package com.casic.xz.meterage.adapter + +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager +import androidx.fragment.app.FragmentPagerAdapter + +class SubViewPagerAdapter( + manager: FragmentManager, + private val pages: ArrayList, + private val titles: Array +) : FragmentPagerAdapter(manager) { + + override fun getItem(position: Int): Fragment = pages[position] + + override fun getCount(): Int = pages.size + + override fun getPageTitle(position: Int): CharSequence = titles[position] +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index f54f94a..afa0759 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,11 +1,32 @@ package com.casic.xz.meterage.fragment +import androidx.fragment.app.Fragment import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.SubViewPagerAdapter +import com.casic.xz.meterage.fragment.sample.FutureTaskFragment +import com.casic.xz.meterage.fragment.sample.TotalTaskFragment +import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_sample.* -class SamplePageFragment : KotlinBaseFragment(){ +class SamplePageFragment : KotlinBaseFragment() { + + private var fragmentPages: ArrayList = ArrayList() + + init { + fragmentPages.add(UnderTaskFragment()) + fragmentPages.add(FutureTaskFragment()) + fragmentPages.add(TotalTaskFragment()) + } + override fun initData() { + val samplePageTitles = arrayOf("检定中 0", "预期任务 0", "全部 0") + sampleViewPager.adapter = SubViewPagerAdapter( + childFragmentManager, fragmentPages, samplePageTitles + ) + //绑定 + topTabLayout.setupWithViewPager(sampleViewPager) } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt new file mode 100644 index 0000000..ebad65f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.sample + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class FutureTaskFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_future_task + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt new file mode 100644 index 0000000..621d5d4 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt @@ -0,0 +1,18 @@ +package com.casic.xz.meterage.adapter + +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager +import androidx.fragment.app.FragmentPagerAdapter + +class SubViewPagerAdapter( + manager: FragmentManager, + private val pages: ArrayList, + private val titles: Array +) : FragmentPagerAdapter(manager) { + + override fun getItem(position: Int): Fragment = pages[position] + + override fun getCount(): Int = pages.size + + override fun getPageTitle(position: Int): CharSequence = titles[position] +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index f54f94a..afa0759 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,11 +1,32 @@ package com.casic.xz.meterage.fragment +import androidx.fragment.app.Fragment import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.SubViewPagerAdapter +import com.casic.xz.meterage.fragment.sample.FutureTaskFragment +import com.casic.xz.meterage.fragment.sample.TotalTaskFragment +import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_sample.* -class SamplePageFragment : KotlinBaseFragment(){ +class SamplePageFragment : KotlinBaseFragment() { + + private var fragmentPages: ArrayList = ArrayList() + + init { + fragmentPages.add(UnderTaskFragment()) + fragmentPages.add(FutureTaskFragment()) + fragmentPages.add(TotalTaskFragment()) + } + override fun initData() { + val samplePageTitles = arrayOf("检定中 0", "预期任务 0", "全部 0") + sampleViewPager.adapter = SubViewPagerAdapter( + childFragmentManager, fragmentPages, samplePageTitles + ) + //绑定 + topTabLayout.setupWithViewPager(sampleViewPager) } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt new file mode 100644 index 0000000..ebad65f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.sample + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class FutureTaskFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_future_task + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/sample/TotalTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/sample/TotalTaskFragment.kt new file mode 100644 index 0000000..1968ed2 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/sample/TotalTaskFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.sample + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TotalTaskFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_total_task + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt new file mode 100644 index 0000000..621d5d4 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt @@ -0,0 +1,18 @@ +package com.casic.xz.meterage.adapter + +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager +import androidx.fragment.app.FragmentPagerAdapter + +class SubViewPagerAdapter( + manager: FragmentManager, + private val pages: ArrayList, + private val titles: Array +) : FragmentPagerAdapter(manager) { + + override fun getItem(position: Int): Fragment = pages[position] + + override fun getCount(): Int = pages.size + + override fun getPageTitle(position: Int): CharSequence = titles[position] +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index f54f94a..afa0759 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,11 +1,32 @@ package com.casic.xz.meterage.fragment +import androidx.fragment.app.Fragment import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.SubViewPagerAdapter +import com.casic.xz.meterage.fragment.sample.FutureTaskFragment +import com.casic.xz.meterage.fragment.sample.TotalTaskFragment +import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_sample.* -class SamplePageFragment : KotlinBaseFragment(){ +class SamplePageFragment : KotlinBaseFragment() { + + private var fragmentPages: ArrayList = ArrayList() + + init { + fragmentPages.add(UnderTaskFragment()) + fragmentPages.add(FutureTaskFragment()) + fragmentPages.add(TotalTaskFragment()) + } + override fun initData() { + val samplePageTitles = arrayOf("检定中 0", "预期任务 0", "全部 0") + sampleViewPager.adapter = SubViewPagerAdapter( + childFragmentManager, fragmentPages, samplePageTitles + ) + //绑定 + topTabLayout.setupWithViewPager(sampleViewPager) } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt new file mode 100644 index 0000000..ebad65f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.sample + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class FutureTaskFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_future_task + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/sample/TotalTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/sample/TotalTaskFragment.kt new file mode 100644 index 0000000..1968ed2 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/sample/TotalTaskFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.sample + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TotalTaskFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_total_task + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/sample/UnderTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/sample/UnderTaskFragment.kt new file mode 100644 index 0000000..da5c3f3 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/sample/UnderTaskFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.sample + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class UnderTaskFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_under_task + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt new file mode 100644 index 0000000..621d5d4 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt @@ -0,0 +1,18 @@ +package com.casic.xz.meterage.adapter + +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager +import androidx.fragment.app.FragmentPagerAdapter + +class SubViewPagerAdapter( + manager: FragmentManager, + private val pages: ArrayList, + private val titles: Array +) : FragmentPagerAdapter(manager) { + + override fun getItem(position: Int): Fragment = pages[position] + + override fun getCount(): Int = pages.size + + override fun getPageTitle(position: Int): CharSequence = titles[position] +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index f54f94a..afa0759 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,11 +1,32 @@ package com.casic.xz.meterage.fragment +import androidx.fragment.app.Fragment import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.SubViewPagerAdapter +import com.casic.xz.meterage.fragment.sample.FutureTaskFragment +import com.casic.xz.meterage.fragment.sample.TotalTaskFragment +import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_sample.* -class SamplePageFragment : KotlinBaseFragment(){ +class SamplePageFragment : KotlinBaseFragment() { + + private var fragmentPages: ArrayList = ArrayList() + + init { + fragmentPages.add(UnderTaskFragment()) + fragmentPages.add(FutureTaskFragment()) + fragmentPages.add(TotalTaskFragment()) + } + override fun initData() { + val samplePageTitles = arrayOf("检定中 0", "预期任务 0", "全部 0") + sampleViewPager.adapter = SubViewPagerAdapter( + childFragmentManager, fragmentPages, samplePageTitles + ) + //绑定 + topTabLayout.setupWithViewPager(sampleViewPager) } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt new file mode 100644 index 0000000..ebad65f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.sample + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class FutureTaskFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_future_task + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/sample/TotalTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/sample/TotalTaskFragment.kt new file mode 100644 index 0000000..1968ed2 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/sample/TotalTaskFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.sample + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TotalTaskFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_total_task + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/sample/UnderTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/sample/UnderTaskFragment.kt new file mode 100644 index 0000000..da5c3f3 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/sample/UnderTaskFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.sample + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class UnderTaskFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_under_task + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml index b41f4ac..c7546e4 100644 --- a/app/src/main/res/drawable/ic_about.xml +++ b/app/src/main/res/drawable/ic_about.xml @@ -5,8 +5,5 @@ android:viewportHeight="1024"> - + android:pathData="M300.93,453.16c11.5,-2.59 18.74,-14.02 16.15,-25.53 -5.44,-24.16 -6.26,-48.98 -2.43,-73.71C331.33,245.86 432.8,171.54 540.95,188.29c25.5,3.94 49.54,12.59 71.42,25.7 10.16,6.07 23.24,2.77 29.3,-7.34 6.05,-10.13 2.75,-23.24 -7.36,-29.3 -26.66,-15.95 -55.88,-26.48 -86.84,-31.26 -131.27,-20.32 -254.74,69.98 -275.07,201.33 -4.62,30.06 -3.62,60.2 2.99,89.59 2.23,9.95 11.05,16.69 20.82,16.69 1.57,-0.01 3.14,-0.2 4.72,-0.53zM895.38,612.43c0,-30.54 -11.99,-57.46 -32.14,-76.09 20.22,-46.71 31.58,-98.08 31.58,-152.1C894.82,172.37 722.46,0 510.61,0 298.75,0 126.38,172.37 126.38,384.24c0,126.89 61.98,239.39 157.13,309.4a106.69,106.69 0,0 0,2.64 11.4c3.62,12.37 8.62,23.45 14.94,33.05 34.45,52.54 73.5,112.04 112.24,170.06 39.24,58.74 96.04,95.27 168.8,108.56 9.16,1.61 17.54,2.71 25.63,3.74 3.89,0.52 7.78,1.03 11.64,1.58 3.05,0.45 6.14,0.65 9.22,0.65h43.39c3.41,0 6.83,-0.23 10.21,-0.82 3.82,-0.62 7.63,-1.21 11.49,-1.8a2627.42,2627.42 0,0 0,19.7 -3.15c91.92,-15.87 161.29,-85 176.84,-176.22 3.18,-18.23 4.83,-36.71 4.9,-54.77 0.22,-68.46 0.22,-77.04 0.2,-104.73 0,-14.2 0,-33.52 0.02,-68.75zM190.45,384.23c0,-176.85 143.35,-320.17 320.16,-320.17s320.16,143.32 320.16,320.17c0,44.88 -9.4,87.5 -26.09,126.26 -3,-0.29 -5.99,-0.49 -9,-0.49a99.29,99.29 0,0 0,-26.95 3.71c-9.98,-9.44 -21.92,-16.83 -35.32,-21.43 -2.23,-0.73 -4.45,-1.37 -6.65,-1.96 10.54,-21.32 18.18,-44.51 21.98,-69.26 8.26,-53.24 -1.15,-106.25 -27.18,-153.33 -5.7,-10.31 -18.69,-14.07 -29.02,-8.36 -10.31,5.71 -14.05,18.7 -8.35,29.02 21.41,38.71 29.14,82.34 22.35,126.13 -4.3,27.64 -14.22,52.92 -28.34,75.1 -1.27,0.3 -2.6,0.43 -3.85,0.78 -8.78,-8.07 -19.31,-14.72 -31.37,-19.78 -9.2,-4.9 -19.5,-7.45 -29.99,-7.45h-2.16c0,-27.51 0,-53.6 -0.03,-74.53 0,-52.01 -34.53,-92.43 -85.95,-100.51a92.3,92.3 0,0 0,-14.37 -1.15c-50.27,0 -94.47,40.42 -98.51,90.09 -0.48,6.38 -0.48,11.74 -0.48,16.05v162.58c-19.94,-11.45 -37.93,-26.28 -52.95,-44.22 -7.55,-9.04 -21,-10.25 -30.08,-2.68 -9.03,7.57 -10.23,21.04 -2.68,30.1 10.42,12.44 22.1,23.59 34.63,33.57 -25.95,6.62 -48.7,23.19 -62.88,46.41 -0.55,0.9 -0.97,1.84 -1.49,2.75 -64.79,-58.6 -105.57,-143.19 -105.57,-237.41zM831.09,785.7c-0.07,14.72 -1.46,29.65 -3.99,44.21 -10.98,64.43 -59.79,112.68 -124.43,123.82 -10.16,1.72 -20.44,3.24 -30.65,4.9h-43.4c-11.63,-1.72 -23.37,-2.94 -34.97,-5 -53.34,-9.73 -96.64,-35.58 -127.02,-81.08 -37.67,-56.37 -74.81,-112.96 -111.96,-169.6 -3.14,-4.78 -5.38,-10.33 -7.01,-15.82 -6.95,-23.93 7.16,-48.66 30.71,-53.22 3.42,-0.64 6.74,-0.99 9.89,-0.99 14.31,0 26.51,6.47 35.85,18.57 15.57,20.13 30.29,40.92 45.36,61.42a369.92,369.92 0,0 0,4.84 6.52c0.39,-0.17 0.82,-0.3 1.22,-0.49v-5.75,-320.07c0,-3.64 0,-7.24 0.28,-10.87 1.38,-16.89 17.86,-31.19 34.66,-31.19 1.45,0 2.96,0.12 4.43,0.36 19.88,3.13 31.84,16.94 31.84,37.27 0.05,56.97 0,152.32 0.08,209.34 0,2.96 0.19,6.06 1.06,8.86 1.46,4.61 4.94,7.08 9.88,7.46h1.05c4.72,0 8.2,-2.36 10.06,-6.59 1.19,-2.62 1.26,-5.83 1.26,-8.82 0,-19.61 -0.05,-25.79 -0.05,-25.79l-0.07,18.23c0,-0.06 0,-6.3 0.05,-25.8 0,-12.88 4.32,-24.08 15.27,-31.69 4.03,-2.75 8.83,-4.47 13.26,-6.64h14.39c0.51,0.37 0.92,0.84 1.47,1.04 18.72,6.44 27.42,18.58 27.42,38.26 -0.06,19.31 -0.06,25.46 -0.06,25.46l-0.02,-18.79v25.49c0,1.84 -0.06,3.62 0.13,5.4 0.78,6.15 5.51,10.23 11.48,10.23 0.39,0 0.74,0 1.12,-0.02 6.31,-0.57 9.92,-4.88 10.36,-12.68v-0.19c0.03,-0.47 0.03,-0.96 0.03,-1.43v-12.12c0.28,-8.39 2.34,-16.3 7.74,-23.13 7.09,-8.99 17.41,-13.88 28.18,-13.88 3.91,0 7.88,0.65 11.73,1.95 14.79,5.1 24.25,19.45 24.25,36.59 -0.02,19.31 -0.05,25.48 -0.05,25.48 -0.01,0 -0.05,-18.81 -0.07,-18.81 0,0 -0.01,6.15 -0.01,25.5 0,2.2 0,4.43 0.23,6.61 0.71,5.8 4.47,8.8 9.86,9.86a7.59,7.59 0,0 0,1.68 0.16c4.26,0 8.79,-2.97 10.23,-7.24 0.92,-2.77 1.18,-5.86 1.18,-8.86 0,-2.62 0,-4.88 0.01,-6.77v12.98c0.07,0 0.11,-3.89 0.15,-15.16 0.07,-6.25 1.2,-12.92 3.67,-18.63 5.64,-12.79 18.6,-20.52 31.96,-20.52 2.47,0 4.9,0.29 7.36,0.82 17.32,3.79 28.26,18.49 28.26,37.52 -0.06,103.54 0.1,69.78 -0.22,173.33z" /> diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt new file mode 100644 index 0000000..621d5d4 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt @@ -0,0 +1,18 @@ +package com.casic.xz.meterage.adapter + +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager +import androidx.fragment.app.FragmentPagerAdapter + +class SubViewPagerAdapter( + manager: FragmentManager, + private val pages: ArrayList, + private val titles: Array +) : FragmentPagerAdapter(manager) { + + override fun getItem(position: Int): Fragment = pages[position] + + override fun getCount(): Int = pages.size + + override fun getPageTitle(position: Int): CharSequence = titles[position] +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index f54f94a..afa0759 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,11 +1,32 @@ package com.casic.xz.meterage.fragment +import androidx.fragment.app.Fragment import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.SubViewPagerAdapter +import com.casic.xz.meterage.fragment.sample.FutureTaskFragment +import com.casic.xz.meterage.fragment.sample.TotalTaskFragment +import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_sample.* -class SamplePageFragment : KotlinBaseFragment(){ +class SamplePageFragment : KotlinBaseFragment() { + + private var fragmentPages: ArrayList = ArrayList() + + init { + fragmentPages.add(UnderTaskFragment()) + fragmentPages.add(FutureTaskFragment()) + fragmentPages.add(TotalTaskFragment()) + } + override fun initData() { + val samplePageTitles = arrayOf("检定中 0", "预期任务 0", "全部 0") + sampleViewPager.adapter = SubViewPagerAdapter( + childFragmentManager, fragmentPages, samplePageTitles + ) + //绑定 + topTabLayout.setupWithViewPager(sampleViewPager) } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt new file mode 100644 index 0000000..ebad65f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.sample + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class FutureTaskFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_future_task + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/sample/TotalTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/sample/TotalTaskFragment.kt new file mode 100644 index 0000000..1968ed2 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/sample/TotalTaskFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.sample + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TotalTaskFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_total_task + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/sample/UnderTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/sample/UnderTaskFragment.kt new file mode 100644 index 0000000..da5c3f3 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/sample/UnderTaskFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.sample + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class UnderTaskFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_under_task + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml index b41f4ac..c7546e4 100644 --- a/app/src/main/res/drawable/ic_about.xml +++ b/app/src/main/res/drawable/ic_about.xml @@ -5,8 +5,5 @@ android:viewportHeight="1024"> - + android:pathData="M300.93,453.16c11.5,-2.59 18.74,-14.02 16.15,-25.53 -5.44,-24.16 -6.26,-48.98 -2.43,-73.71C331.33,245.86 432.8,171.54 540.95,188.29c25.5,3.94 49.54,12.59 71.42,25.7 10.16,6.07 23.24,2.77 29.3,-7.34 6.05,-10.13 2.75,-23.24 -7.36,-29.3 -26.66,-15.95 -55.88,-26.48 -86.84,-31.26 -131.27,-20.32 -254.74,69.98 -275.07,201.33 -4.62,30.06 -3.62,60.2 2.99,89.59 2.23,9.95 11.05,16.69 20.82,16.69 1.57,-0.01 3.14,-0.2 4.72,-0.53zM895.38,612.43c0,-30.54 -11.99,-57.46 -32.14,-76.09 20.22,-46.71 31.58,-98.08 31.58,-152.1C894.82,172.37 722.46,0 510.61,0 298.75,0 126.38,172.37 126.38,384.24c0,126.89 61.98,239.39 157.13,309.4a106.69,106.69 0,0 0,2.64 11.4c3.62,12.37 8.62,23.45 14.94,33.05 34.45,52.54 73.5,112.04 112.24,170.06 39.24,58.74 96.04,95.27 168.8,108.56 9.16,1.61 17.54,2.71 25.63,3.74 3.89,0.52 7.78,1.03 11.64,1.58 3.05,0.45 6.14,0.65 9.22,0.65h43.39c3.41,0 6.83,-0.23 10.21,-0.82 3.82,-0.62 7.63,-1.21 11.49,-1.8a2627.42,2627.42 0,0 0,19.7 -3.15c91.92,-15.87 161.29,-85 176.84,-176.22 3.18,-18.23 4.83,-36.71 4.9,-54.77 0.22,-68.46 0.22,-77.04 0.2,-104.73 0,-14.2 0,-33.52 0.02,-68.75zM190.45,384.23c0,-176.85 143.35,-320.17 320.16,-320.17s320.16,143.32 320.16,320.17c0,44.88 -9.4,87.5 -26.09,126.26 -3,-0.29 -5.99,-0.49 -9,-0.49a99.29,99.29 0,0 0,-26.95 3.71c-9.98,-9.44 -21.92,-16.83 -35.32,-21.43 -2.23,-0.73 -4.45,-1.37 -6.65,-1.96 10.54,-21.32 18.18,-44.51 21.98,-69.26 8.26,-53.24 -1.15,-106.25 -27.18,-153.33 -5.7,-10.31 -18.69,-14.07 -29.02,-8.36 -10.31,5.71 -14.05,18.7 -8.35,29.02 21.41,38.71 29.14,82.34 22.35,126.13 -4.3,27.64 -14.22,52.92 -28.34,75.1 -1.27,0.3 -2.6,0.43 -3.85,0.78 -8.78,-8.07 -19.31,-14.72 -31.37,-19.78 -9.2,-4.9 -19.5,-7.45 -29.99,-7.45h-2.16c0,-27.51 0,-53.6 -0.03,-74.53 0,-52.01 -34.53,-92.43 -85.95,-100.51a92.3,92.3 0,0 0,-14.37 -1.15c-50.27,0 -94.47,40.42 -98.51,90.09 -0.48,6.38 -0.48,11.74 -0.48,16.05v162.58c-19.94,-11.45 -37.93,-26.28 -52.95,-44.22 -7.55,-9.04 -21,-10.25 -30.08,-2.68 -9.03,7.57 -10.23,21.04 -2.68,30.1 10.42,12.44 22.1,23.59 34.63,33.57 -25.95,6.62 -48.7,23.19 -62.88,46.41 -0.55,0.9 -0.97,1.84 -1.49,2.75 -64.79,-58.6 -105.57,-143.19 -105.57,-237.41zM831.09,785.7c-0.07,14.72 -1.46,29.65 -3.99,44.21 -10.98,64.43 -59.79,112.68 -124.43,123.82 -10.16,1.72 -20.44,3.24 -30.65,4.9h-43.4c-11.63,-1.72 -23.37,-2.94 -34.97,-5 -53.34,-9.73 -96.64,-35.58 -127.02,-81.08 -37.67,-56.37 -74.81,-112.96 -111.96,-169.6 -3.14,-4.78 -5.38,-10.33 -7.01,-15.82 -6.95,-23.93 7.16,-48.66 30.71,-53.22 3.42,-0.64 6.74,-0.99 9.89,-0.99 14.31,0 26.51,6.47 35.85,18.57 15.57,20.13 30.29,40.92 45.36,61.42a369.92,369.92 0,0 0,4.84 6.52c0.39,-0.17 0.82,-0.3 1.22,-0.49v-5.75,-320.07c0,-3.64 0,-7.24 0.28,-10.87 1.38,-16.89 17.86,-31.19 34.66,-31.19 1.45,0 2.96,0.12 4.43,0.36 19.88,3.13 31.84,16.94 31.84,37.27 0.05,56.97 0,152.32 0.08,209.34 0,2.96 0.19,6.06 1.06,8.86 1.46,4.61 4.94,7.08 9.88,7.46h1.05c4.72,0 8.2,-2.36 10.06,-6.59 1.19,-2.62 1.26,-5.83 1.26,-8.82 0,-19.61 -0.05,-25.79 -0.05,-25.79l-0.07,18.23c0,-0.06 0,-6.3 0.05,-25.8 0,-12.88 4.32,-24.08 15.27,-31.69 4.03,-2.75 8.83,-4.47 13.26,-6.64h14.39c0.51,0.37 0.92,0.84 1.47,1.04 18.72,6.44 27.42,18.58 27.42,38.26 -0.06,19.31 -0.06,25.46 -0.06,25.46l-0.02,-18.79v25.49c0,1.84 -0.06,3.62 0.13,5.4 0.78,6.15 5.51,10.23 11.48,10.23 0.39,0 0.74,0 1.12,-0.02 6.31,-0.57 9.92,-4.88 10.36,-12.68v-0.19c0.03,-0.47 0.03,-0.96 0.03,-1.43v-12.12c0.28,-8.39 2.34,-16.3 7.74,-23.13 7.09,-8.99 17.41,-13.88 28.18,-13.88 3.91,0 7.88,0.65 11.73,1.95 14.79,5.1 24.25,19.45 24.25,36.59 -0.02,19.31 -0.05,25.48 -0.05,25.48 -0.01,0 -0.05,-18.81 -0.07,-18.81 0,0 -0.01,6.15 -0.01,25.5 0,2.2 0,4.43 0.23,6.61 0.71,5.8 4.47,8.8 9.86,9.86a7.59,7.59 0,0 0,1.68 0.16c4.26,0 8.79,-2.97 10.23,-7.24 0.92,-2.77 1.18,-5.86 1.18,-8.86 0,-2.62 0,-4.88 0.01,-6.77v12.98c0.07,0 0.11,-3.89 0.15,-15.16 0.07,-6.25 1.2,-12.92 3.67,-18.63 5.64,-12.79 18.6,-20.52 31.96,-20.52 2.47,0 4.9,0.29 7.36,0.82 17.32,3.79 28.26,18.49 28.26,37.52 -0.06,103.54 0.1,69.78 -0.22,173.33z" /> diff --git a/app/src/main/res/drawable/ic_collection.xml b/app/src/main/res/drawable/ic_collection.xml index ce1a8a2..4d2016b 100644 --- a/app/src/main/res/drawable/ic_collection.xml +++ b/app/src/main/res/drawable/ic_collection.xml @@ -5,8 +5,5 @@ android:viewportHeight="1024"> - + android:pathData="M139.64,930.91 L512,774.48 884.36,930.91 884.36,93.09 139.64,93.09 139.64,930.91ZM79.79,93.09C79.79,60.04 106.59,33.25 139.64,33.25L884.36,33.25C917.41,33.25 944.21,60.04 944.21,93.09L944.21,930.91C944.21,973.69 900.62,1002.65 861.18,986.08L488.82,829.65 535.18,829.65 162.81,986.08C123.38,1002.65 79.79,973.69 79.79,930.91L79.79,93.09ZM512,606.67 L628.8,659.86C652.63,670.7 668.89,658.58 665.59,632.98L649.71,509.73 738.03,418.34C755.56,400.2 749.98,381.09 724.83,376.4L597.09,352.58 534.8,243.1C522.43,221.36 501.6,221.3 488.77,243.84L426.98,352.4 299.23,376.26C274.26,380.93 268.17,399.75 286.02,418.22L374.29,509.61 358.41,632.86C355.12,658.41 371.59,670.5 395.2,659.77L512,606.67ZM536.77,661.15 L419.97,714.25C353.79,744.33 289.76,697.43 299.06,625.22L314.93,501.96 331.24,551.18 242.98,459.8C192.09,407.12 216.3,330.88 288.24,317.44L415.99,293.57 374.97,322.79 436.76,214.24C472.3,151.8 551.26,151 586.82,213.51L649.1,322.98 608.06,293.75 735.8,317.57C808.03,331.04 831.6,407.64 781.06,459.93L692.74,551.31 709.07,502.08 724.94,625.34C734.25,697.6 670.4,744.55 604,714.32L487.2,661.14 536.77,661.15Z" /> diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt new file mode 100644 index 0000000..621d5d4 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt @@ -0,0 +1,18 @@ +package com.casic.xz.meterage.adapter + +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager +import androidx.fragment.app.FragmentPagerAdapter + +class SubViewPagerAdapter( + manager: FragmentManager, + private val pages: ArrayList, + private val titles: Array +) : FragmentPagerAdapter(manager) { + + override fun getItem(position: Int): Fragment = pages[position] + + override fun getCount(): Int = pages.size + + override fun getPageTitle(position: Int): CharSequence = titles[position] +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index f54f94a..afa0759 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,11 +1,32 @@ package com.casic.xz.meterage.fragment +import androidx.fragment.app.Fragment import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.SubViewPagerAdapter +import com.casic.xz.meterage.fragment.sample.FutureTaskFragment +import com.casic.xz.meterage.fragment.sample.TotalTaskFragment +import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_sample.* -class SamplePageFragment : KotlinBaseFragment(){ +class SamplePageFragment : KotlinBaseFragment() { + + private var fragmentPages: ArrayList = ArrayList() + + init { + fragmentPages.add(UnderTaskFragment()) + fragmentPages.add(FutureTaskFragment()) + fragmentPages.add(TotalTaskFragment()) + } + override fun initData() { + val samplePageTitles = arrayOf("检定中 0", "预期任务 0", "全部 0") + sampleViewPager.adapter = SubViewPagerAdapter( + childFragmentManager, fragmentPages, samplePageTitles + ) + //绑定 + topTabLayout.setupWithViewPager(sampleViewPager) } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt new file mode 100644 index 0000000..ebad65f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.sample + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class FutureTaskFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_future_task + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/sample/TotalTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/sample/TotalTaskFragment.kt new file mode 100644 index 0000000..1968ed2 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/sample/TotalTaskFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.sample + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TotalTaskFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_total_task + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/sample/UnderTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/sample/UnderTaskFragment.kt new file mode 100644 index 0000000..da5c3f3 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/sample/UnderTaskFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.sample + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class UnderTaskFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_under_task + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml index b41f4ac..c7546e4 100644 --- a/app/src/main/res/drawable/ic_about.xml +++ b/app/src/main/res/drawable/ic_about.xml @@ -5,8 +5,5 @@ android:viewportHeight="1024"> - + android:pathData="M300.93,453.16c11.5,-2.59 18.74,-14.02 16.15,-25.53 -5.44,-24.16 -6.26,-48.98 -2.43,-73.71C331.33,245.86 432.8,171.54 540.95,188.29c25.5,3.94 49.54,12.59 71.42,25.7 10.16,6.07 23.24,2.77 29.3,-7.34 6.05,-10.13 2.75,-23.24 -7.36,-29.3 -26.66,-15.95 -55.88,-26.48 -86.84,-31.26 -131.27,-20.32 -254.74,69.98 -275.07,201.33 -4.62,30.06 -3.62,60.2 2.99,89.59 2.23,9.95 11.05,16.69 20.82,16.69 1.57,-0.01 3.14,-0.2 4.72,-0.53zM895.38,612.43c0,-30.54 -11.99,-57.46 -32.14,-76.09 20.22,-46.71 31.58,-98.08 31.58,-152.1C894.82,172.37 722.46,0 510.61,0 298.75,0 126.38,172.37 126.38,384.24c0,126.89 61.98,239.39 157.13,309.4a106.69,106.69 0,0 0,2.64 11.4c3.62,12.37 8.62,23.45 14.94,33.05 34.45,52.54 73.5,112.04 112.24,170.06 39.24,58.74 96.04,95.27 168.8,108.56 9.16,1.61 17.54,2.71 25.63,3.74 3.89,0.52 7.78,1.03 11.64,1.58 3.05,0.45 6.14,0.65 9.22,0.65h43.39c3.41,0 6.83,-0.23 10.21,-0.82 3.82,-0.62 7.63,-1.21 11.49,-1.8a2627.42,2627.42 0,0 0,19.7 -3.15c91.92,-15.87 161.29,-85 176.84,-176.22 3.18,-18.23 4.83,-36.71 4.9,-54.77 0.22,-68.46 0.22,-77.04 0.2,-104.73 0,-14.2 0,-33.52 0.02,-68.75zM190.45,384.23c0,-176.85 143.35,-320.17 320.16,-320.17s320.16,143.32 320.16,320.17c0,44.88 -9.4,87.5 -26.09,126.26 -3,-0.29 -5.99,-0.49 -9,-0.49a99.29,99.29 0,0 0,-26.95 3.71c-9.98,-9.44 -21.92,-16.83 -35.32,-21.43 -2.23,-0.73 -4.45,-1.37 -6.65,-1.96 10.54,-21.32 18.18,-44.51 21.98,-69.26 8.26,-53.24 -1.15,-106.25 -27.18,-153.33 -5.7,-10.31 -18.69,-14.07 -29.02,-8.36 -10.31,5.71 -14.05,18.7 -8.35,29.02 21.41,38.71 29.14,82.34 22.35,126.13 -4.3,27.64 -14.22,52.92 -28.34,75.1 -1.27,0.3 -2.6,0.43 -3.85,0.78 -8.78,-8.07 -19.31,-14.72 -31.37,-19.78 -9.2,-4.9 -19.5,-7.45 -29.99,-7.45h-2.16c0,-27.51 0,-53.6 -0.03,-74.53 0,-52.01 -34.53,-92.43 -85.95,-100.51a92.3,92.3 0,0 0,-14.37 -1.15c-50.27,0 -94.47,40.42 -98.51,90.09 -0.48,6.38 -0.48,11.74 -0.48,16.05v162.58c-19.94,-11.45 -37.93,-26.28 -52.95,-44.22 -7.55,-9.04 -21,-10.25 -30.08,-2.68 -9.03,7.57 -10.23,21.04 -2.68,30.1 10.42,12.44 22.1,23.59 34.63,33.57 -25.95,6.62 -48.7,23.19 -62.88,46.41 -0.55,0.9 -0.97,1.84 -1.49,2.75 -64.79,-58.6 -105.57,-143.19 -105.57,-237.41zM831.09,785.7c-0.07,14.72 -1.46,29.65 -3.99,44.21 -10.98,64.43 -59.79,112.68 -124.43,123.82 -10.16,1.72 -20.44,3.24 -30.65,4.9h-43.4c-11.63,-1.72 -23.37,-2.94 -34.97,-5 -53.34,-9.73 -96.64,-35.58 -127.02,-81.08 -37.67,-56.37 -74.81,-112.96 -111.96,-169.6 -3.14,-4.78 -5.38,-10.33 -7.01,-15.82 -6.95,-23.93 7.16,-48.66 30.71,-53.22 3.42,-0.64 6.74,-0.99 9.89,-0.99 14.31,0 26.51,6.47 35.85,18.57 15.57,20.13 30.29,40.92 45.36,61.42a369.92,369.92 0,0 0,4.84 6.52c0.39,-0.17 0.82,-0.3 1.22,-0.49v-5.75,-320.07c0,-3.64 0,-7.24 0.28,-10.87 1.38,-16.89 17.86,-31.19 34.66,-31.19 1.45,0 2.96,0.12 4.43,0.36 19.88,3.13 31.84,16.94 31.84,37.27 0.05,56.97 0,152.32 0.08,209.34 0,2.96 0.19,6.06 1.06,8.86 1.46,4.61 4.94,7.08 9.88,7.46h1.05c4.72,0 8.2,-2.36 10.06,-6.59 1.19,-2.62 1.26,-5.83 1.26,-8.82 0,-19.61 -0.05,-25.79 -0.05,-25.79l-0.07,18.23c0,-0.06 0,-6.3 0.05,-25.8 0,-12.88 4.32,-24.08 15.27,-31.69 4.03,-2.75 8.83,-4.47 13.26,-6.64h14.39c0.51,0.37 0.92,0.84 1.47,1.04 18.72,6.44 27.42,18.58 27.42,38.26 -0.06,19.31 -0.06,25.46 -0.06,25.46l-0.02,-18.79v25.49c0,1.84 -0.06,3.62 0.13,5.4 0.78,6.15 5.51,10.23 11.48,10.23 0.39,0 0.74,0 1.12,-0.02 6.31,-0.57 9.92,-4.88 10.36,-12.68v-0.19c0.03,-0.47 0.03,-0.96 0.03,-1.43v-12.12c0.28,-8.39 2.34,-16.3 7.74,-23.13 7.09,-8.99 17.41,-13.88 28.18,-13.88 3.91,0 7.88,0.65 11.73,1.95 14.79,5.1 24.25,19.45 24.25,36.59 -0.02,19.31 -0.05,25.48 -0.05,25.48 -0.01,0 -0.05,-18.81 -0.07,-18.81 0,0 -0.01,6.15 -0.01,25.5 0,2.2 0,4.43 0.23,6.61 0.71,5.8 4.47,8.8 9.86,9.86a7.59,7.59 0,0 0,1.68 0.16c4.26,0 8.79,-2.97 10.23,-7.24 0.92,-2.77 1.18,-5.86 1.18,-8.86 0,-2.62 0,-4.88 0.01,-6.77v12.98c0.07,0 0.11,-3.89 0.15,-15.16 0.07,-6.25 1.2,-12.92 3.67,-18.63 5.64,-12.79 18.6,-20.52 31.96,-20.52 2.47,0 4.9,0.29 7.36,0.82 17.32,3.79 28.26,18.49 28.26,37.52 -0.06,103.54 0.1,69.78 -0.22,173.33z" /> diff --git a/app/src/main/res/drawable/ic_collection.xml b/app/src/main/res/drawable/ic_collection.xml index ce1a8a2..4d2016b 100644 --- a/app/src/main/res/drawable/ic_collection.xml +++ b/app/src/main/res/drawable/ic_collection.xml @@ -5,8 +5,5 @@ android:viewportHeight="1024"> - + android:pathData="M139.64,930.91 L512,774.48 884.36,930.91 884.36,93.09 139.64,93.09 139.64,930.91ZM79.79,93.09C79.79,60.04 106.59,33.25 139.64,33.25L884.36,33.25C917.41,33.25 944.21,60.04 944.21,93.09L944.21,930.91C944.21,973.69 900.62,1002.65 861.18,986.08L488.82,829.65 535.18,829.65 162.81,986.08C123.38,1002.65 79.79,973.69 79.79,930.91L79.79,93.09ZM512,606.67 L628.8,659.86C652.63,670.7 668.89,658.58 665.59,632.98L649.71,509.73 738.03,418.34C755.56,400.2 749.98,381.09 724.83,376.4L597.09,352.58 534.8,243.1C522.43,221.36 501.6,221.3 488.77,243.84L426.98,352.4 299.23,376.26C274.26,380.93 268.17,399.75 286.02,418.22L374.29,509.61 358.41,632.86C355.12,658.41 371.59,670.5 395.2,659.77L512,606.67ZM536.77,661.15 L419.97,714.25C353.79,744.33 289.76,697.43 299.06,625.22L314.93,501.96 331.24,551.18 242.98,459.8C192.09,407.12 216.3,330.88 288.24,317.44L415.99,293.57 374.97,322.79 436.76,214.24C472.3,151.8 551.26,151 586.82,213.51L649.1,322.98 608.06,293.75 735.8,317.57C808.03,331.04 831.6,407.64 781.06,459.93L692.74,551.31 709.07,502.08 724.94,625.34C734.25,697.6 670.4,744.55 604,714.32L487.2,661.14 536.77,661.15Z" /> diff --git a/app/src/main/res/drawable/ic_help.xml b/app/src/main/res/drawable/ic_help.xml index 3835c32..cf1f741 100644 --- a/app/src/main/res/drawable/ic_help.xml +++ b/app/src/main/res/drawable/ic_help.xml @@ -5,11 +5,5 @@ android:viewportHeight="1024"> - - + android:pathData="M860.2,64.2L264,64.2c-110.5,0 -200,89.5 -200,200v538.9c-0.3,3.7 -0.4,7.4 -0.4,11.1h0.5C66.6,895 132.8,959.6 214,959.6h646.2c55.2,0 100,-44.8 100,-100L960.2,164.2c0,-55.2 -44.8,-100 -100,-100zM499.4,473.4l-58.7,-52.1c-0.1,-0.1 -0.2,-0.1 -0.2,-0.2 -0.3,-0.3 -0.7,-0.6 -1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.4,-0.3 -0.7,-0.5 -1.1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.3,-0.2 -0.7,-0.5 -1.1,-0.7 -0.2,-0.1 -0.3,-0.2 -0.5,-0.3 -0.3,-0.2 -0.7,-0.4 -1,-0.6l-0.6,-0.3c-0.3,-0.2 -0.6,-0.3 -0.9,-0.5 -0.2,-0.1 -0.5,-0.3 -0.7,-0.4 -0.3,-0.1 -0.5,-0.3 -0.8,-0.4 -0.3,-0.1 -0.6,-0.3 -0.9,-0.4 -0.2,-0.1 -0.4,-0.2 -0.7,-0.3 -0.3,-0.1 -0.7,-0.3 -1,-0.4 -0.2,-0.1 -0.4,-0.1 -0.6,-0.2 -0.4,-0.1 -0.7,-0.3 -1.1,-0.4 -0.2,-0.1 -0.3,-0.1 -0.5,-0.2l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.2 -1.2,-0.2 -0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.1 -1.2,-0.2 -0.2,0 -0.4,0 -0.6,-0.1 -0.4,0 -0.7,-0.1 -1.1,-0.1h-5.1c-0.3,0 -0.7,0.1 -1,0.1 -0.2,0 -0.4,0 -0.7,0.1 -0.4,0 -0.7,0.1 -1.1,0.1 -0.2,0 -0.4,0.1 -0.6,0.1 -0.4,0.1 -0.8,0.1 -1.2,0.2 -0.2,0 -0.4,0.1 -0.5,0.1l-1.2,0.3c-0.2,0 -0.4,0.1 -0.5,0.1 -0.4,0.1 -0.7,0.2 -1.1,0.3 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.4,0.1 -0.7,0.2 -1,0.4 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.3,0.1 -0.6,0.2 -0.9,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.1 -0.5,0.2 -0.8,0.4 -0.3,0.1 -0.6,0.3 -0.8,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.2 -0.6,0.3 -1,0.5 -0.2,0.1 -0.4,0.2 -0.5,0.3 -0.4,0.2 -0.7,0.4 -1,0.6 -0.1,0.1 -0.3,0.2 -0.4,0.3 -0.4,0.2 -0.7,0.5 -1.1,0.7 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.4,0.3 -0.7,0.5 -1.1,0.8 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.3,0.3 -0.7,0.6 -1,0.9 -0.1,0.1 -0.2,0.1 -0.2,0.2L332.7,474L332.7,136.2h166.7v337.2zM173.5,173.7c23.4,-23.4 54.2,-36.6 87.2,-37.4L260.7,555.7c0,0.3 0,0.7 0.1,1 0,0.3 0.1,0.5 0.1,0.8 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8l0.3,0.9c0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.4,0.8 0.1,0.3 0.2,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.2,0.3 0.3,0.5 0.5,0.8 0.1,0.2 0.3,0.5 0.5,0.7 0.2,0.3 0.4,0.5 0.5,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.4,0.5 0.6,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.5,0.6 0.7,0.8l0.3,0.3 0.2,0.2c0.3,0.3 0.6,0.6 0.8,0.9l0.5,0.5 0.8,0.8c0.9,0.9 1.9,1.7 2.9,2.5 0.1,0.1 0.3,0.2 0.4,0.3 0.3,0.2 0.7,0.5 1,0.7 0.2,0.1 0.3,0.2 0.5,0.4 0.3,0.2 0.6,0.4 1,0.6 0.2,0.1 0.4,0.3 0.6,0.4 0.3,0.2 0.6,0.4 0.9,0.5 0.2,0.1 0.5,0.3 0.7,0.4 0.3,0.1 0.5,0.3 0.8,0.4 0.3,0.1 0.6,0.3 0.9,0.4 0.2,0.1 0.5,0.2 0.7,0.3 0.4,0.2 0.7,0.3 1.1,0.5 0.2,0.1 0.4,0.1 0.5,0.2 0.5,0.2 0.9,0.3 1.4,0.5 0.1,0 0.2,0.1 0.3,0.1 0.6,0.2 1.1,0.3 1.7,0.5h0.1c3,0.8 6.1,1.2 9.3,1.2h2.3c0.4,0 0.8,-0.1 1.1,-0.1 0.2,0 0.5,-0.1 0.7,-0.1 0.3,0 0.7,-0.1 1,-0.1 0.3,0 0.5,-0.1 0.8,-0.1 0.3,0 0.6,-0.1 0.9,-0.2 0.3,0 0.5,-0.1 0.8,-0.2 0.3,-0.1 0.6,-0.1 0.9,-0.2 0.3,-0.1 0.5,-0.1 0.8,-0.2l0.9,-0.3c0.2,-0.1 0.5,-0.1 0.7,-0.2 0.4,-0.1 0.7,-0.2 1.1,-0.4 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.5,-0.2 1,-0.4 1.6,-0.6 0.1,0 0.2,-0.1 0.3,-0.1 0.4,-0.2 0.9,-0.4 1.3,-0.6 0.2,-0.1 0.3,-0.2 0.5,-0.2 0.4,-0.2 0.7,-0.4 1,-0.5 0.2,-0.1 0.4,-0.2 0.5,-0.3 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.3 0.8,-0.5 0.2,-0.1 0.4,-0.3 0.6,-0.4 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.4,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.4 0.7,-0.6 0.1,-0.1 0.3,-0.2 0.4,-0.3l96.2,-84.3 94.9,84.1c0.2,0.1 0.3,0.3 0.5,0.4 0.2,0.2 0.4,0.4 0.7,0.6 0.2,0.2 0.5,0.4 0.7,0.5 0.2,0.2 0.4,0.3 0.7,0.5 0.3,0.2 0.5,0.4 0.8,0.6 0.2,0.1 0.4,0.3 0.6,0.4l0.9,0.6c0.2,0.1 0.3,0.2 0.5,0.3 0.4,0.2 0.7,0.4 1.1,0.6 0.1,0.1 0.2,0.1 0.3,0.2 0.5,0.3 1,0.5 1.5,0.8 0.5,0.3 1,0.5 1.6,0.7 0.1,0 0.2,0.1 0.2,0.1 0.4,0.2 0.9,0.4 1.3,0.5 0.2,0.1 0.4,0.1 0.6,0.2 0.3,0.1 0.7,0.2 1,0.3 0.2,0.1 0.5,0.1 0.7,0.2l0.9,0.3c0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0 0.5,0.1 0.8,0.1 0.3,0 0.7,0.1 1,0.1 0.2,0 0.5,0.1 0.7,0.1 0.4,0 0.8,0.1 1.1,0.1h2.3c3.8,0 7.5,-0.6 11,-1.7 0.1,0 0.2,-0.1 0.2,-0.1 0.5,-0.2 1,-0.3 1.5,-0.5 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.4,-0.2 0.8,-0.3 1.1,-0.5 0.2,-0.1 0.5,-0.2 0.7,-0.3 0.3,-0.1 0.6,-0.3 0.9,-0.4 0.3,-0.1 0.6,-0.3 0.8,-0.4 0.2,-0.1 0.5,-0.3 0.7,-0.4 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.4 1,-0.6 0.2,-0.1 0.4,-0.2 0.5,-0.4 0.3,-0.2 0.6,-0.4 1,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.3,-0.2 0.6,-0.5 0.9,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.4,-0.3 0.7,-0.6 1.1,-1 0.4,-0.3 0.7,-0.7 1,-1 0.1,-0.1 0.3,-0.3 0.4,-0.5l0.9,-0.9 0.1,-0.1c0.1,-0.1 0.2,-0.3 0.4,-0.4 0.2,-0.3 0.5,-0.5 0.7,-0.8 0.2,-0.2 0.3,-0.4 0.5,-0.6 0.2,-0.3 0.4,-0.5 0.6,-0.8 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.2 0.2,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8l0.3,-0.9c0.1,-0.3 0.2,-0.5 0.2,-0.8 0.1,-0.3 0.2,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.5 0.2,-0.8 0.1,-0.3 0.1,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.6 0.2,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.5 0.1,-0.8 0,-0.3 0.1,-0.7 0.1,-1v-0.8,-1.1 -417.9h288.8c15.4,0 28,12.6 28,28v504L209.7,668.2c-26.9,0 -52,7.3 -73.7,20v-424c0,-34.2 13.3,-66.3 37.5,-90.5zM860.2,887.6L214,887.6c-43,0 -78,-35 -78,-78v-3.1c3.9,-37.2 35.5,-66.2 73.7,-66.2h678.5v119.3c0,15.4 -12.6,28 -28,28z" /> diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt new file mode 100644 index 0000000..621d5d4 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt @@ -0,0 +1,18 @@ +package com.casic.xz.meterage.adapter + +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager +import androidx.fragment.app.FragmentPagerAdapter + +class SubViewPagerAdapter( + manager: FragmentManager, + private val pages: ArrayList, + private val titles: Array +) : FragmentPagerAdapter(manager) { + + override fun getItem(position: Int): Fragment = pages[position] + + override fun getCount(): Int = pages.size + + override fun getPageTitle(position: Int): CharSequence = titles[position] +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index f54f94a..afa0759 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,11 +1,32 @@ package com.casic.xz.meterage.fragment +import androidx.fragment.app.Fragment import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.SubViewPagerAdapter +import com.casic.xz.meterage.fragment.sample.FutureTaskFragment +import com.casic.xz.meterage.fragment.sample.TotalTaskFragment +import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_sample.* -class SamplePageFragment : KotlinBaseFragment(){ +class SamplePageFragment : KotlinBaseFragment() { + + private var fragmentPages: ArrayList = ArrayList() + + init { + fragmentPages.add(UnderTaskFragment()) + fragmentPages.add(FutureTaskFragment()) + fragmentPages.add(TotalTaskFragment()) + } + override fun initData() { + val samplePageTitles = arrayOf("检定中 0", "预期任务 0", "全部 0") + sampleViewPager.adapter = SubViewPagerAdapter( + childFragmentManager, fragmentPages, samplePageTitles + ) + //绑定 + topTabLayout.setupWithViewPager(sampleViewPager) } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt new file mode 100644 index 0000000..ebad65f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.sample + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class FutureTaskFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_future_task + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/sample/TotalTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/sample/TotalTaskFragment.kt new file mode 100644 index 0000000..1968ed2 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/sample/TotalTaskFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.sample + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TotalTaskFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_total_task + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/sample/UnderTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/sample/UnderTaskFragment.kt new file mode 100644 index 0000000..da5c3f3 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/sample/UnderTaskFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.sample + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class UnderTaskFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_under_task + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml index b41f4ac..c7546e4 100644 --- a/app/src/main/res/drawable/ic_about.xml +++ b/app/src/main/res/drawable/ic_about.xml @@ -5,8 +5,5 @@ android:viewportHeight="1024"> - + android:pathData="M300.93,453.16c11.5,-2.59 18.74,-14.02 16.15,-25.53 -5.44,-24.16 -6.26,-48.98 -2.43,-73.71C331.33,245.86 432.8,171.54 540.95,188.29c25.5,3.94 49.54,12.59 71.42,25.7 10.16,6.07 23.24,2.77 29.3,-7.34 6.05,-10.13 2.75,-23.24 -7.36,-29.3 -26.66,-15.95 -55.88,-26.48 -86.84,-31.26 -131.27,-20.32 -254.74,69.98 -275.07,201.33 -4.62,30.06 -3.62,60.2 2.99,89.59 2.23,9.95 11.05,16.69 20.82,16.69 1.57,-0.01 3.14,-0.2 4.72,-0.53zM895.38,612.43c0,-30.54 -11.99,-57.46 -32.14,-76.09 20.22,-46.71 31.58,-98.08 31.58,-152.1C894.82,172.37 722.46,0 510.61,0 298.75,0 126.38,172.37 126.38,384.24c0,126.89 61.98,239.39 157.13,309.4a106.69,106.69 0,0 0,2.64 11.4c3.62,12.37 8.62,23.45 14.94,33.05 34.45,52.54 73.5,112.04 112.24,170.06 39.24,58.74 96.04,95.27 168.8,108.56 9.16,1.61 17.54,2.71 25.63,3.74 3.89,0.52 7.78,1.03 11.64,1.58 3.05,0.45 6.14,0.65 9.22,0.65h43.39c3.41,0 6.83,-0.23 10.21,-0.82 3.82,-0.62 7.63,-1.21 11.49,-1.8a2627.42,2627.42 0,0 0,19.7 -3.15c91.92,-15.87 161.29,-85 176.84,-176.22 3.18,-18.23 4.83,-36.71 4.9,-54.77 0.22,-68.46 0.22,-77.04 0.2,-104.73 0,-14.2 0,-33.52 0.02,-68.75zM190.45,384.23c0,-176.85 143.35,-320.17 320.16,-320.17s320.16,143.32 320.16,320.17c0,44.88 -9.4,87.5 -26.09,126.26 -3,-0.29 -5.99,-0.49 -9,-0.49a99.29,99.29 0,0 0,-26.95 3.71c-9.98,-9.44 -21.92,-16.83 -35.32,-21.43 -2.23,-0.73 -4.45,-1.37 -6.65,-1.96 10.54,-21.32 18.18,-44.51 21.98,-69.26 8.26,-53.24 -1.15,-106.25 -27.18,-153.33 -5.7,-10.31 -18.69,-14.07 -29.02,-8.36 -10.31,5.71 -14.05,18.7 -8.35,29.02 21.41,38.71 29.14,82.34 22.35,126.13 -4.3,27.64 -14.22,52.92 -28.34,75.1 -1.27,0.3 -2.6,0.43 -3.85,0.78 -8.78,-8.07 -19.31,-14.72 -31.37,-19.78 -9.2,-4.9 -19.5,-7.45 -29.99,-7.45h-2.16c0,-27.51 0,-53.6 -0.03,-74.53 0,-52.01 -34.53,-92.43 -85.95,-100.51a92.3,92.3 0,0 0,-14.37 -1.15c-50.27,0 -94.47,40.42 -98.51,90.09 -0.48,6.38 -0.48,11.74 -0.48,16.05v162.58c-19.94,-11.45 -37.93,-26.28 -52.95,-44.22 -7.55,-9.04 -21,-10.25 -30.08,-2.68 -9.03,7.57 -10.23,21.04 -2.68,30.1 10.42,12.44 22.1,23.59 34.63,33.57 -25.95,6.62 -48.7,23.19 -62.88,46.41 -0.55,0.9 -0.97,1.84 -1.49,2.75 -64.79,-58.6 -105.57,-143.19 -105.57,-237.41zM831.09,785.7c-0.07,14.72 -1.46,29.65 -3.99,44.21 -10.98,64.43 -59.79,112.68 -124.43,123.82 -10.16,1.72 -20.44,3.24 -30.65,4.9h-43.4c-11.63,-1.72 -23.37,-2.94 -34.97,-5 -53.34,-9.73 -96.64,-35.58 -127.02,-81.08 -37.67,-56.37 -74.81,-112.96 -111.96,-169.6 -3.14,-4.78 -5.38,-10.33 -7.01,-15.82 -6.95,-23.93 7.16,-48.66 30.71,-53.22 3.42,-0.64 6.74,-0.99 9.89,-0.99 14.31,0 26.51,6.47 35.85,18.57 15.57,20.13 30.29,40.92 45.36,61.42a369.92,369.92 0,0 0,4.84 6.52c0.39,-0.17 0.82,-0.3 1.22,-0.49v-5.75,-320.07c0,-3.64 0,-7.24 0.28,-10.87 1.38,-16.89 17.86,-31.19 34.66,-31.19 1.45,0 2.96,0.12 4.43,0.36 19.88,3.13 31.84,16.94 31.84,37.27 0.05,56.97 0,152.32 0.08,209.34 0,2.96 0.19,6.06 1.06,8.86 1.46,4.61 4.94,7.08 9.88,7.46h1.05c4.72,0 8.2,-2.36 10.06,-6.59 1.19,-2.62 1.26,-5.83 1.26,-8.82 0,-19.61 -0.05,-25.79 -0.05,-25.79l-0.07,18.23c0,-0.06 0,-6.3 0.05,-25.8 0,-12.88 4.32,-24.08 15.27,-31.69 4.03,-2.75 8.83,-4.47 13.26,-6.64h14.39c0.51,0.37 0.92,0.84 1.47,1.04 18.72,6.44 27.42,18.58 27.42,38.26 -0.06,19.31 -0.06,25.46 -0.06,25.46l-0.02,-18.79v25.49c0,1.84 -0.06,3.62 0.13,5.4 0.78,6.15 5.51,10.23 11.48,10.23 0.39,0 0.74,0 1.12,-0.02 6.31,-0.57 9.92,-4.88 10.36,-12.68v-0.19c0.03,-0.47 0.03,-0.96 0.03,-1.43v-12.12c0.28,-8.39 2.34,-16.3 7.74,-23.13 7.09,-8.99 17.41,-13.88 28.18,-13.88 3.91,0 7.88,0.65 11.73,1.95 14.79,5.1 24.25,19.45 24.25,36.59 -0.02,19.31 -0.05,25.48 -0.05,25.48 -0.01,0 -0.05,-18.81 -0.07,-18.81 0,0 -0.01,6.15 -0.01,25.5 0,2.2 0,4.43 0.23,6.61 0.71,5.8 4.47,8.8 9.86,9.86a7.59,7.59 0,0 0,1.68 0.16c4.26,0 8.79,-2.97 10.23,-7.24 0.92,-2.77 1.18,-5.86 1.18,-8.86 0,-2.62 0,-4.88 0.01,-6.77v12.98c0.07,0 0.11,-3.89 0.15,-15.16 0.07,-6.25 1.2,-12.92 3.67,-18.63 5.64,-12.79 18.6,-20.52 31.96,-20.52 2.47,0 4.9,0.29 7.36,0.82 17.32,3.79 28.26,18.49 28.26,37.52 -0.06,103.54 0.1,69.78 -0.22,173.33z" /> diff --git a/app/src/main/res/drawable/ic_collection.xml b/app/src/main/res/drawable/ic_collection.xml index ce1a8a2..4d2016b 100644 --- a/app/src/main/res/drawable/ic_collection.xml +++ b/app/src/main/res/drawable/ic_collection.xml @@ -5,8 +5,5 @@ android:viewportHeight="1024"> - + android:pathData="M139.64,930.91 L512,774.48 884.36,930.91 884.36,93.09 139.64,93.09 139.64,930.91ZM79.79,93.09C79.79,60.04 106.59,33.25 139.64,33.25L884.36,33.25C917.41,33.25 944.21,60.04 944.21,93.09L944.21,930.91C944.21,973.69 900.62,1002.65 861.18,986.08L488.82,829.65 535.18,829.65 162.81,986.08C123.38,1002.65 79.79,973.69 79.79,930.91L79.79,93.09ZM512,606.67 L628.8,659.86C652.63,670.7 668.89,658.58 665.59,632.98L649.71,509.73 738.03,418.34C755.56,400.2 749.98,381.09 724.83,376.4L597.09,352.58 534.8,243.1C522.43,221.36 501.6,221.3 488.77,243.84L426.98,352.4 299.23,376.26C274.26,380.93 268.17,399.75 286.02,418.22L374.29,509.61 358.41,632.86C355.12,658.41 371.59,670.5 395.2,659.77L512,606.67ZM536.77,661.15 L419.97,714.25C353.79,744.33 289.76,697.43 299.06,625.22L314.93,501.96 331.24,551.18 242.98,459.8C192.09,407.12 216.3,330.88 288.24,317.44L415.99,293.57 374.97,322.79 436.76,214.24C472.3,151.8 551.26,151 586.82,213.51L649.1,322.98 608.06,293.75 735.8,317.57C808.03,331.04 831.6,407.64 781.06,459.93L692.74,551.31 709.07,502.08 724.94,625.34C734.25,697.6 670.4,744.55 604,714.32L487.2,661.14 536.77,661.15Z" /> diff --git a/app/src/main/res/drawable/ic_help.xml b/app/src/main/res/drawable/ic_help.xml index 3835c32..cf1f741 100644 --- a/app/src/main/res/drawable/ic_help.xml +++ b/app/src/main/res/drawable/ic_help.xml @@ -5,11 +5,5 @@ android:viewportHeight="1024"> - - + android:pathData="M860.2,64.2L264,64.2c-110.5,0 -200,89.5 -200,200v538.9c-0.3,3.7 -0.4,7.4 -0.4,11.1h0.5C66.6,895 132.8,959.6 214,959.6h646.2c55.2,0 100,-44.8 100,-100L960.2,164.2c0,-55.2 -44.8,-100 -100,-100zM499.4,473.4l-58.7,-52.1c-0.1,-0.1 -0.2,-0.1 -0.2,-0.2 -0.3,-0.3 -0.7,-0.6 -1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.4,-0.3 -0.7,-0.5 -1.1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.3,-0.2 -0.7,-0.5 -1.1,-0.7 -0.2,-0.1 -0.3,-0.2 -0.5,-0.3 -0.3,-0.2 -0.7,-0.4 -1,-0.6l-0.6,-0.3c-0.3,-0.2 -0.6,-0.3 -0.9,-0.5 -0.2,-0.1 -0.5,-0.3 -0.7,-0.4 -0.3,-0.1 -0.5,-0.3 -0.8,-0.4 -0.3,-0.1 -0.6,-0.3 -0.9,-0.4 -0.2,-0.1 -0.4,-0.2 -0.7,-0.3 -0.3,-0.1 -0.7,-0.3 -1,-0.4 -0.2,-0.1 -0.4,-0.1 -0.6,-0.2 -0.4,-0.1 -0.7,-0.3 -1.1,-0.4 -0.2,-0.1 -0.3,-0.1 -0.5,-0.2l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.2 -1.2,-0.2 -0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.1 -1.2,-0.2 -0.2,0 -0.4,0 -0.6,-0.1 -0.4,0 -0.7,-0.1 -1.1,-0.1h-5.1c-0.3,0 -0.7,0.1 -1,0.1 -0.2,0 -0.4,0 -0.7,0.1 -0.4,0 -0.7,0.1 -1.1,0.1 -0.2,0 -0.4,0.1 -0.6,0.1 -0.4,0.1 -0.8,0.1 -1.2,0.2 -0.2,0 -0.4,0.1 -0.5,0.1l-1.2,0.3c-0.2,0 -0.4,0.1 -0.5,0.1 -0.4,0.1 -0.7,0.2 -1.1,0.3 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.4,0.1 -0.7,0.2 -1,0.4 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.3,0.1 -0.6,0.2 -0.9,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.1 -0.5,0.2 -0.8,0.4 -0.3,0.1 -0.6,0.3 -0.8,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.2 -0.6,0.3 -1,0.5 -0.2,0.1 -0.4,0.2 -0.5,0.3 -0.4,0.2 -0.7,0.4 -1,0.6 -0.1,0.1 -0.3,0.2 -0.4,0.3 -0.4,0.2 -0.7,0.5 -1.1,0.7 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.4,0.3 -0.7,0.5 -1.1,0.8 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.3,0.3 -0.7,0.6 -1,0.9 -0.1,0.1 -0.2,0.1 -0.2,0.2L332.7,474L332.7,136.2h166.7v337.2zM173.5,173.7c23.4,-23.4 54.2,-36.6 87.2,-37.4L260.7,555.7c0,0.3 0,0.7 0.1,1 0,0.3 0.1,0.5 0.1,0.8 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8l0.3,0.9c0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.4,0.8 0.1,0.3 0.2,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.2,0.3 0.3,0.5 0.5,0.8 0.1,0.2 0.3,0.5 0.5,0.7 0.2,0.3 0.4,0.5 0.5,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.4,0.5 0.6,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.5,0.6 0.7,0.8l0.3,0.3 0.2,0.2c0.3,0.3 0.6,0.6 0.8,0.9l0.5,0.5 0.8,0.8c0.9,0.9 1.9,1.7 2.9,2.5 0.1,0.1 0.3,0.2 0.4,0.3 0.3,0.2 0.7,0.5 1,0.7 0.2,0.1 0.3,0.2 0.5,0.4 0.3,0.2 0.6,0.4 1,0.6 0.2,0.1 0.4,0.3 0.6,0.4 0.3,0.2 0.6,0.4 0.9,0.5 0.2,0.1 0.5,0.3 0.7,0.4 0.3,0.1 0.5,0.3 0.8,0.4 0.3,0.1 0.6,0.3 0.9,0.4 0.2,0.1 0.5,0.2 0.7,0.3 0.4,0.2 0.7,0.3 1.1,0.5 0.2,0.1 0.4,0.1 0.5,0.2 0.5,0.2 0.9,0.3 1.4,0.5 0.1,0 0.2,0.1 0.3,0.1 0.6,0.2 1.1,0.3 1.7,0.5h0.1c3,0.8 6.1,1.2 9.3,1.2h2.3c0.4,0 0.8,-0.1 1.1,-0.1 0.2,0 0.5,-0.1 0.7,-0.1 0.3,0 0.7,-0.1 1,-0.1 0.3,0 0.5,-0.1 0.8,-0.1 0.3,0 0.6,-0.1 0.9,-0.2 0.3,0 0.5,-0.1 0.8,-0.2 0.3,-0.1 0.6,-0.1 0.9,-0.2 0.3,-0.1 0.5,-0.1 0.8,-0.2l0.9,-0.3c0.2,-0.1 0.5,-0.1 0.7,-0.2 0.4,-0.1 0.7,-0.2 1.1,-0.4 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.5,-0.2 1,-0.4 1.6,-0.6 0.1,0 0.2,-0.1 0.3,-0.1 0.4,-0.2 0.9,-0.4 1.3,-0.6 0.2,-0.1 0.3,-0.2 0.5,-0.2 0.4,-0.2 0.7,-0.4 1,-0.5 0.2,-0.1 0.4,-0.2 0.5,-0.3 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.3 0.8,-0.5 0.2,-0.1 0.4,-0.3 0.6,-0.4 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.4,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.4 0.7,-0.6 0.1,-0.1 0.3,-0.2 0.4,-0.3l96.2,-84.3 94.9,84.1c0.2,0.1 0.3,0.3 0.5,0.4 0.2,0.2 0.4,0.4 0.7,0.6 0.2,0.2 0.5,0.4 0.7,0.5 0.2,0.2 0.4,0.3 0.7,0.5 0.3,0.2 0.5,0.4 0.8,0.6 0.2,0.1 0.4,0.3 0.6,0.4l0.9,0.6c0.2,0.1 0.3,0.2 0.5,0.3 0.4,0.2 0.7,0.4 1.1,0.6 0.1,0.1 0.2,0.1 0.3,0.2 0.5,0.3 1,0.5 1.5,0.8 0.5,0.3 1,0.5 1.6,0.7 0.1,0 0.2,0.1 0.2,0.1 0.4,0.2 0.9,0.4 1.3,0.5 0.2,0.1 0.4,0.1 0.6,0.2 0.3,0.1 0.7,0.2 1,0.3 0.2,0.1 0.5,0.1 0.7,0.2l0.9,0.3c0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0 0.5,0.1 0.8,0.1 0.3,0 0.7,0.1 1,0.1 0.2,0 0.5,0.1 0.7,0.1 0.4,0 0.8,0.1 1.1,0.1h2.3c3.8,0 7.5,-0.6 11,-1.7 0.1,0 0.2,-0.1 0.2,-0.1 0.5,-0.2 1,-0.3 1.5,-0.5 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.4,-0.2 0.8,-0.3 1.1,-0.5 0.2,-0.1 0.5,-0.2 0.7,-0.3 0.3,-0.1 0.6,-0.3 0.9,-0.4 0.3,-0.1 0.6,-0.3 0.8,-0.4 0.2,-0.1 0.5,-0.3 0.7,-0.4 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.4 1,-0.6 0.2,-0.1 0.4,-0.2 0.5,-0.4 0.3,-0.2 0.6,-0.4 1,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.3,-0.2 0.6,-0.5 0.9,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.4,-0.3 0.7,-0.6 1.1,-1 0.4,-0.3 0.7,-0.7 1,-1 0.1,-0.1 0.3,-0.3 0.4,-0.5l0.9,-0.9 0.1,-0.1c0.1,-0.1 0.2,-0.3 0.4,-0.4 0.2,-0.3 0.5,-0.5 0.7,-0.8 0.2,-0.2 0.3,-0.4 0.5,-0.6 0.2,-0.3 0.4,-0.5 0.6,-0.8 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.2 0.2,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8l0.3,-0.9c0.1,-0.3 0.2,-0.5 0.2,-0.8 0.1,-0.3 0.2,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.5 0.2,-0.8 0.1,-0.3 0.1,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.6 0.2,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.5 0.1,-0.8 0,-0.3 0.1,-0.7 0.1,-1v-0.8,-1.1 -417.9h288.8c15.4,0 28,12.6 28,28v504L209.7,668.2c-26.9,0 -52,7.3 -73.7,20v-424c0,-34.2 13.3,-66.3 37.5,-90.5zM860.2,887.6L214,887.6c-43,0 -78,-35 -78,-78v-3.1c3.9,-37.2 35.5,-66.2 73.7,-66.2h678.5v119.3c0,15.4 -12.6,28 -28,28z" /> diff --git a/app/src/main/res/drawable/ic_overtime.xml b/app/src/main/res/drawable/ic_overtime.xml new file mode 100644 index 0000000..6916eca --- /dev/null +++ b/app/src/main/res/drawable/ic_overtime.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt new file mode 100644 index 0000000..621d5d4 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt @@ -0,0 +1,18 @@ +package com.casic.xz.meterage.adapter + +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager +import androidx.fragment.app.FragmentPagerAdapter + +class SubViewPagerAdapter( + manager: FragmentManager, + private val pages: ArrayList, + private val titles: Array +) : FragmentPagerAdapter(manager) { + + override fun getItem(position: Int): Fragment = pages[position] + + override fun getCount(): Int = pages.size + + override fun getPageTitle(position: Int): CharSequence = titles[position] +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index f54f94a..afa0759 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,11 +1,32 @@ package com.casic.xz.meterage.fragment +import androidx.fragment.app.Fragment import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.SubViewPagerAdapter +import com.casic.xz.meterage.fragment.sample.FutureTaskFragment +import com.casic.xz.meterage.fragment.sample.TotalTaskFragment +import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_sample.* -class SamplePageFragment : KotlinBaseFragment(){ +class SamplePageFragment : KotlinBaseFragment() { + + private var fragmentPages: ArrayList = ArrayList() + + init { + fragmentPages.add(UnderTaskFragment()) + fragmentPages.add(FutureTaskFragment()) + fragmentPages.add(TotalTaskFragment()) + } + override fun initData() { + val samplePageTitles = arrayOf("检定中 0", "预期任务 0", "全部 0") + sampleViewPager.adapter = SubViewPagerAdapter( + childFragmentManager, fragmentPages, samplePageTitles + ) + //绑定 + topTabLayout.setupWithViewPager(sampleViewPager) } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt new file mode 100644 index 0000000..ebad65f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.sample + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class FutureTaskFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_future_task + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/sample/TotalTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/sample/TotalTaskFragment.kt new file mode 100644 index 0000000..1968ed2 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/sample/TotalTaskFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.sample + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TotalTaskFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_total_task + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/sample/UnderTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/sample/UnderTaskFragment.kt new file mode 100644 index 0000000..da5c3f3 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/sample/UnderTaskFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.sample + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class UnderTaskFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_under_task + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml index b41f4ac..c7546e4 100644 --- a/app/src/main/res/drawable/ic_about.xml +++ b/app/src/main/res/drawable/ic_about.xml @@ -5,8 +5,5 @@ android:viewportHeight="1024"> - + android:pathData="M300.93,453.16c11.5,-2.59 18.74,-14.02 16.15,-25.53 -5.44,-24.16 -6.26,-48.98 -2.43,-73.71C331.33,245.86 432.8,171.54 540.95,188.29c25.5,3.94 49.54,12.59 71.42,25.7 10.16,6.07 23.24,2.77 29.3,-7.34 6.05,-10.13 2.75,-23.24 -7.36,-29.3 -26.66,-15.95 -55.88,-26.48 -86.84,-31.26 -131.27,-20.32 -254.74,69.98 -275.07,201.33 -4.62,30.06 -3.62,60.2 2.99,89.59 2.23,9.95 11.05,16.69 20.82,16.69 1.57,-0.01 3.14,-0.2 4.72,-0.53zM895.38,612.43c0,-30.54 -11.99,-57.46 -32.14,-76.09 20.22,-46.71 31.58,-98.08 31.58,-152.1C894.82,172.37 722.46,0 510.61,0 298.75,0 126.38,172.37 126.38,384.24c0,126.89 61.98,239.39 157.13,309.4a106.69,106.69 0,0 0,2.64 11.4c3.62,12.37 8.62,23.45 14.94,33.05 34.45,52.54 73.5,112.04 112.24,170.06 39.24,58.74 96.04,95.27 168.8,108.56 9.16,1.61 17.54,2.71 25.63,3.74 3.89,0.52 7.78,1.03 11.64,1.58 3.05,0.45 6.14,0.65 9.22,0.65h43.39c3.41,0 6.83,-0.23 10.21,-0.82 3.82,-0.62 7.63,-1.21 11.49,-1.8a2627.42,2627.42 0,0 0,19.7 -3.15c91.92,-15.87 161.29,-85 176.84,-176.22 3.18,-18.23 4.83,-36.71 4.9,-54.77 0.22,-68.46 0.22,-77.04 0.2,-104.73 0,-14.2 0,-33.52 0.02,-68.75zM190.45,384.23c0,-176.85 143.35,-320.17 320.16,-320.17s320.16,143.32 320.16,320.17c0,44.88 -9.4,87.5 -26.09,126.26 -3,-0.29 -5.99,-0.49 -9,-0.49a99.29,99.29 0,0 0,-26.95 3.71c-9.98,-9.44 -21.92,-16.83 -35.32,-21.43 -2.23,-0.73 -4.45,-1.37 -6.65,-1.96 10.54,-21.32 18.18,-44.51 21.98,-69.26 8.26,-53.24 -1.15,-106.25 -27.18,-153.33 -5.7,-10.31 -18.69,-14.07 -29.02,-8.36 -10.31,5.71 -14.05,18.7 -8.35,29.02 21.41,38.71 29.14,82.34 22.35,126.13 -4.3,27.64 -14.22,52.92 -28.34,75.1 -1.27,0.3 -2.6,0.43 -3.85,0.78 -8.78,-8.07 -19.31,-14.72 -31.37,-19.78 -9.2,-4.9 -19.5,-7.45 -29.99,-7.45h-2.16c0,-27.51 0,-53.6 -0.03,-74.53 0,-52.01 -34.53,-92.43 -85.95,-100.51a92.3,92.3 0,0 0,-14.37 -1.15c-50.27,0 -94.47,40.42 -98.51,90.09 -0.48,6.38 -0.48,11.74 -0.48,16.05v162.58c-19.94,-11.45 -37.93,-26.28 -52.95,-44.22 -7.55,-9.04 -21,-10.25 -30.08,-2.68 -9.03,7.57 -10.23,21.04 -2.68,30.1 10.42,12.44 22.1,23.59 34.63,33.57 -25.95,6.62 -48.7,23.19 -62.88,46.41 -0.55,0.9 -0.97,1.84 -1.49,2.75 -64.79,-58.6 -105.57,-143.19 -105.57,-237.41zM831.09,785.7c-0.07,14.72 -1.46,29.65 -3.99,44.21 -10.98,64.43 -59.79,112.68 -124.43,123.82 -10.16,1.72 -20.44,3.24 -30.65,4.9h-43.4c-11.63,-1.72 -23.37,-2.94 -34.97,-5 -53.34,-9.73 -96.64,-35.58 -127.02,-81.08 -37.67,-56.37 -74.81,-112.96 -111.96,-169.6 -3.14,-4.78 -5.38,-10.33 -7.01,-15.82 -6.95,-23.93 7.16,-48.66 30.71,-53.22 3.42,-0.64 6.74,-0.99 9.89,-0.99 14.31,0 26.51,6.47 35.85,18.57 15.57,20.13 30.29,40.92 45.36,61.42a369.92,369.92 0,0 0,4.84 6.52c0.39,-0.17 0.82,-0.3 1.22,-0.49v-5.75,-320.07c0,-3.64 0,-7.24 0.28,-10.87 1.38,-16.89 17.86,-31.19 34.66,-31.19 1.45,0 2.96,0.12 4.43,0.36 19.88,3.13 31.84,16.94 31.84,37.27 0.05,56.97 0,152.32 0.08,209.34 0,2.96 0.19,6.06 1.06,8.86 1.46,4.61 4.94,7.08 9.88,7.46h1.05c4.72,0 8.2,-2.36 10.06,-6.59 1.19,-2.62 1.26,-5.83 1.26,-8.82 0,-19.61 -0.05,-25.79 -0.05,-25.79l-0.07,18.23c0,-0.06 0,-6.3 0.05,-25.8 0,-12.88 4.32,-24.08 15.27,-31.69 4.03,-2.75 8.83,-4.47 13.26,-6.64h14.39c0.51,0.37 0.92,0.84 1.47,1.04 18.72,6.44 27.42,18.58 27.42,38.26 -0.06,19.31 -0.06,25.46 -0.06,25.46l-0.02,-18.79v25.49c0,1.84 -0.06,3.62 0.13,5.4 0.78,6.15 5.51,10.23 11.48,10.23 0.39,0 0.74,0 1.12,-0.02 6.31,-0.57 9.92,-4.88 10.36,-12.68v-0.19c0.03,-0.47 0.03,-0.96 0.03,-1.43v-12.12c0.28,-8.39 2.34,-16.3 7.74,-23.13 7.09,-8.99 17.41,-13.88 28.18,-13.88 3.91,0 7.88,0.65 11.73,1.95 14.79,5.1 24.25,19.45 24.25,36.59 -0.02,19.31 -0.05,25.48 -0.05,25.48 -0.01,0 -0.05,-18.81 -0.07,-18.81 0,0 -0.01,6.15 -0.01,25.5 0,2.2 0,4.43 0.23,6.61 0.71,5.8 4.47,8.8 9.86,9.86a7.59,7.59 0,0 0,1.68 0.16c4.26,0 8.79,-2.97 10.23,-7.24 0.92,-2.77 1.18,-5.86 1.18,-8.86 0,-2.62 0,-4.88 0.01,-6.77v12.98c0.07,0 0.11,-3.89 0.15,-15.16 0.07,-6.25 1.2,-12.92 3.67,-18.63 5.64,-12.79 18.6,-20.52 31.96,-20.52 2.47,0 4.9,0.29 7.36,0.82 17.32,3.79 28.26,18.49 28.26,37.52 -0.06,103.54 0.1,69.78 -0.22,173.33z" /> diff --git a/app/src/main/res/drawable/ic_collection.xml b/app/src/main/res/drawable/ic_collection.xml index ce1a8a2..4d2016b 100644 --- a/app/src/main/res/drawable/ic_collection.xml +++ b/app/src/main/res/drawable/ic_collection.xml @@ -5,8 +5,5 @@ android:viewportHeight="1024"> - + android:pathData="M139.64,930.91 L512,774.48 884.36,930.91 884.36,93.09 139.64,93.09 139.64,930.91ZM79.79,93.09C79.79,60.04 106.59,33.25 139.64,33.25L884.36,33.25C917.41,33.25 944.21,60.04 944.21,93.09L944.21,930.91C944.21,973.69 900.62,1002.65 861.18,986.08L488.82,829.65 535.18,829.65 162.81,986.08C123.38,1002.65 79.79,973.69 79.79,930.91L79.79,93.09ZM512,606.67 L628.8,659.86C652.63,670.7 668.89,658.58 665.59,632.98L649.71,509.73 738.03,418.34C755.56,400.2 749.98,381.09 724.83,376.4L597.09,352.58 534.8,243.1C522.43,221.36 501.6,221.3 488.77,243.84L426.98,352.4 299.23,376.26C274.26,380.93 268.17,399.75 286.02,418.22L374.29,509.61 358.41,632.86C355.12,658.41 371.59,670.5 395.2,659.77L512,606.67ZM536.77,661.15 L419.97,714.25C353.79,744.33 289.76,697.43 299.06,625.22L314.93,501.96 331.24,551.18 242.98,459.8C192.09,407.12 216.3,330.88 288.24,317.44L415.99,293.57 374.97,322.79 436.76,214.24C472.3,151.8 551.26,151 586.82,213.51L649.1,322.98 608.06,293.75 735.8,317.57C808.03,331.04 831.6,407.64 781.06,459.93L692.74,551.31 709.07,502.08 724.94,625.34C734.25,697.6 670.4,744.55 604,714.32L487.2,661.14 536.77,661.15Z" /> diff --git a/app/src/main/res/drawable/ic_help.xml b/app/src/main/res/drawable/ic_help.xml index 3835c32..cf1f741 100644 --- a/app/src/main/res/drawable/ic_help.xml +++ b/app/src/main/res/drawable/ic_help.xml @@ -5,11 +5,5 @@ android:viewportHeight="1024"> - - + android:pathData="M860.2,64.2L264,64.2c-110.5,0 -200,89.5 -200,200v538.9c-0.3,3.7 -0.4,7.4 -0.4,11.1h0.5C66.6,895 132.8,959.6 214,959.6h646.2c55.2,0 100,-44.8 100,-100L960.2,164.2c0,-55.2 -44.8,-100 -100,-100zM499.4,473.4l-58.7,-52.1c-0.1,-0.1 -0.2,-0.1 -0.2,-0.2 -0.3,-0.3 -0.7,-0.6 -1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.4,-0.3 -0.7,-0.5 -1.1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.3,-0.2 -0.7,-0.5 -1.1,-0.7 -0.2,-0.1 -0.3,-0.2 -0.5,-0.3 -0.3,-0.2 -0.7,-0.4 -1,-0.6l-0.6,-0.3c-0.3,-0.2 -0.6,-0.3 -0.9,-0.5 -0.2,-0.1 -0.5,-0.3 -0.7,-0.4 -0.3,-0.1 -0.5,-0.3 -0.8,-0.4 -0.3,-0.1 -0.6,-0.3 -0.9,-0.4 -0.2,-0.1 -0.4,-0.2 -0.7,-0.3 -0.3,-0.1 -0.7,-0.3 -1,-0.4 -0.2,-0.1 -0.4,-0.1 -0.6,-0.2 -0.4,-0.1 -0.7,-0.3 -1.1,-0.4 -0.2,-0.1 -0.3,-0.1 -0.5,-0.2l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.2 -1.2,-0.2 -0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.1 -1.2,-0.2 -0.2,0 -0.4,0 -0.6,-0.1 -0.4,0 -0.7,-0.1 -1.1,-0.1h-5.1c-0.3,0 -0.7,0.1 -1,0.1 -0.2,0 -0.4,0 -0.7,0.1 -0.4,0 -0.7,0.1 -1.1,0.1 -0.2,0 -0.4,0.1 -0.6,0.1 -0.4,0.1 -0.8,0.1 -1.2,0.2 -0.2,0 -0.4,0.1 -0.5,0.1l-1.2,0.3c-0.2,0 -0.4,0.1 -0.5,0.1 -0.4,0.1 -0.7,0.2 -1.1,0.3 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.4,0.1 -0.7,0.2 -1,0.4 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.3,0.1 -0.6,0.2 -0.9,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.1 -0.5,0.2 -0.8,0.4 -0.3,0.1 -0.6,0.3 -0.8,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.2 -0.6,0.3 -1,0.5 -0.2,0.1 -0.4,0.2 -0.5,0.3 -0.4,0.2 -0.7,0.4 -1,0.6 -0.1,0.1 -0.3,0.2 -0.4,0.3 -0.4,0.2 -0.7,0.5 -1.1,0.7 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.4,0.3 -0.7,0.5 -1.1,0.8 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.3,0.3 -0.7,0.6 -1,0.9 -0.1,0.1 -0.2,0.1 -0.2,0.2L332.7,474L332.7,136.2h166.7v337.2zM173.5,173.7c23.4,-23.4 54.2,-36.6 87.2,-37.4L260.7,555.7c0,0.3 0,0.7 0.1,1 0,0.3 0.1,0.5 0.1,0.8 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8l0.3,0.9c0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.4,0.8 0.1,0.3 0.2,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.2,0.3 0.3,0.5 0.5,0.8 0.1,0.2 0.3,0.5 0.5,0.7 0.2,0.3 0.4,0.5 0.5,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.4,0.5 0.6,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.5,0.6 0.7,0.8l0.3,0.3 0.2,0.2c0.3,0.3 0.6,0.6 0.8,0.9l0.5,0.5 0.8,0.8c0.9,0.9 1.9,1.7 2.9,2.5 0.1,0.1 0.3,0.2 0.4,0.3 0.3,0.2 0.7,0.5 1,0.7 0.2,0.1 0.3,0.2 0.5,0.4 0.3,0.2 0.6,0.4 1,0.6 0.2,0.1 0.4,0.3 0.6,0.4 0.3,0.2 0.6,0.4 0.9,0.5 0.2,0.1 0.5,0.3 0.7,0.4 0.3,0.1 0.5,0.3 0.8,0.4 0.3,0.1 0.6,0.3 0.9,0.4 0.2,0.1 0.5,0.2 0.7,0.3 0.4,0.2 0.7,0.3 1.1,0.5 0.2,0.1 0.4,0.1 0.5,0.2 0.5,0.2 0.9,0.3 1.4,0.5 0.1,0 0.2,0.1 0.3,0.1 0.6,0.2 1.1,0.3 1.7,0.5h0.1c3,0.8 6.1,1.2 9.3,1.2h2.3c0.4,0 0.8,-0.1 1.1,-0.1 0.2,0 0.5,-0.1 0.7,-0.1 0.3,0 0.7,-0.1 1,-0.1 0.3,0 0.5,-0.1 0.8,-0.1 0.3,0 0.6,-0.1 0.9,-0.2 0.3,0 0.5,-0.1 0.8,-0.2 0.3,-0.1 0.6,-0.1 0.9,-0.2 0.3,-0.1 0.5,-0.1 0.8,-0.2l0.9,-0.3c0.2,-0.1 0.5,-0.1 0.7,-0.2 0.4,-0.1 0.7,-0.2 1.1,-0.4 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.5,-0.2 1,-0.4 1.6,-0.6 0.1,0 0.2,-0.1 0.3,-0.1 0.4,-0.2 0.9,-0.4 1.3,-0.6 0.2,-0.1 0.3,-0.2 0.5,-0.2 0.4,-0.2 0.7,-0.4 1,-0.5 0.2,-0.1 0.4,-0.2 0.5,-0.3 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.3 0.8,-0.5 0.2,-0.1 0.4,-0.3 0.6,-0.4 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.4,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.4 0.7,-0.6 0.1,-0.1 0.3,-0.2 0.4,-0.3l96.2,-84.3 94.9,84.1c0.2,0.1 0.3,0.3 0.5,0.4 0.2,0.2 0.4,0.4 0.7,0.6 0.2,0.2 0.5,0.4 0.7,0.5 0.2,0.2 0.4,0.3 0.7,0.5 0.3,0.2 0.5,0.4 0.8,0.6 0.2,0.1 0.4,0.3 0.6,0.4l0.9,0.6c0.2,0.1 0.3,0.2 0.5,0.3 0.4,0.2 0.7,0.4 1.1,0.6 0.1,0.1 0.2,0.1 0.3,0.2 0.5,0.3 1,0.5 1.5,0.8 0.5,0.3 1,0.5 1.6,0.7 0.1,0 0.2,0.1 0.2,0.1 0.4,0.2 0.9,0.4 1.3,0.5 0.2,0.1 0.4,0.1 0.6,0.2 0.3,0.1 0.7,0.2 1,0.3 0.2,0.1 0.5,0.1 0.7,0.2l0.9,0.3c0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0 0.5,0.1 0.8,0.1 0.3,0 0.7,0.1 1,0.1 0.2,0 0.5,0.1 0.7,0.1 0.4,0 0.8,0.1 1.1,0.1h2.3c3.8,0 7.5,-0.6 11,-1.7 0.1,0 0.2,-0.1 0.2,-0.1 0.5,-0.2 1,-0.3 1.5,-0.5 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.4,-0.2 0.8,-0.3 1.1,-0.5 0.2,-0.1 0.5,-0.2 0.7,-0.3 0.3,-0.1 0.6,-0.3 0.9,-0.4 0.3,-0.1 0.6,-0.3 0.8,-0.4 0.2,-0.1 0.5,-0.3 0.7,-0.4 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.4 1,-0.6 0.2,-0.1 0.4,-0.2 0.5,-0.4 0.3,-0.2 0.6,-0.4 1,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.3,-0.2 0.6,-0.5 0.9,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.4,-0.3 0.7,-0.6 1.1,-1 0.4,-0.3 0.7,-0.7 1,-1 0.1,-0.1 0.3,-0.3 0.4,-0.5l0.9,-0.9 0.1,-0.1c0.1,-0.1 0.2,-0.3 0.4,-0.4 0.2,-0.3 0.5,-0.5 0.7,-0.8 0.2,-0.2 0.3,-0.4 0.5,-0.6 0.2,-0.3 0.4,-0.5 0.6,-0.8 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.2 0.2,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8l0.3,-0.9c0.1,-0.3 0.2,-0.5 0.2,-0.8 0.1,-0.3 0.2,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.5 0.2,-0.8 0.1,-0.3 0.1,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.6 0.2,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.5 0.1,-0.8 0,-0.3 0.1,-0.7 0.1,-1v-0.8,-1.1 -417.9h288.8c15.4,0 28,12.6 28,28v504L209.7,668.2c-26.9,0 -52,7.3 -73.7,20v-424c0,-34.2 13.3,-66.3 37.5,-90.5zM860.2,887.6L214,887.6c-43,0 -78,-35 -78,-78v-3.1c3.9,-37.2 35.5,-66.2 73.7,-66.2h678.5v119.3c0,15.4 -12.6,28 -28,28z" /> diff --git a/app/src/main/res/drawable/ic_overtime.xml b/app/src/main/res/drawable/ic_overtime.xml new file mode 100644 index 0000000..6916eca --- /dev/null +++ b/app/src/main/res/drawable/ic_overtime.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_privacy.xml b/app/src/main/res/drawable/ic_privacy.xml index 22ef981..92d2699 100644 --- a/app/src/main/res/drawable/ic_privacy.xml +++ b/app/src/main/res/drawable/ic_privacy.xml @@ -5,5 +5,8 @@ android:viewportHeight="1024"> + android:pathData="M615.51,402.9a34.13,34.13 0,0 1,51.16 45.08l-2.18,2.45 -149.61,154.15a34.13,34.13 0,0 1,-44.07 4.18l-2.65,-2.05 -106.41,-91.39a34.13,34.13 0,0 1,41.9 -53.8l2.6,2.01 82.01,70.46 127.25,-131.09z" /> + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt new file mode 100644 index 0000000..621d5d4 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt @@ -0,0 +1,18 @@ +package com.casic.xz.meterage.adapter + +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager +import androidx.fragment.app.FragmentPagerAdapter + +class SubViewPagerAdapter( + manager: FragmentManager, + private val pages: ArrayList, + private val titles: Array +) : FragmentPagerAdapter(manager) { + + override fun getItem(position: Int): Fragment = pages[position] + + override fun getCount(): Int = pages.size + + override fun getPageTitle(position: Int): CharSequence = titles[position] +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index f54f94a..afa0759 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,11 +1,32 @@ package com.casic.xz.meterage.fragment +import androidx.fragment.app.Fragment import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.SubViewPagerAdapter +import com.casic.xz.meterage.fragment.sample.FutureTaskFragment +import com.casic.xz.meterage.fragment.sample.TotalTaskFragment +import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_sample.* -class SamplePageFragment : KotlinBaseFragment(){ +class SamplePageFragment : KotlinBaseFragment() { + + private var fragmentPages: ArrayList = ArrayList() + + init { + fragmentPages.add(UnderTaskFragment()) + fragmentPages.add(FutureTaskFragment()) + fragmentPages.add(TotalTaskFragment()) + } + override fun initData() { + val samplePageTitles = arrayOf("检定中 0", "预期任务 0", "全部 0") + sampleViewPager.adapter = SubViewPagerAdapter( + childFragmentManager, fragmentPages, samplePageTitles + ) + //绑定 + topTabLayout.setupWithViewPager(sampleViewPager) } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt new file mode 100644 index 0000000..ebad65f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.sample + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class FutureTaskFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_future_task + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/sample/TotalTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/sample/TotalTaskFragment.kt new file mode 100644 index 0000000..1968ed2 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/sample/TotalTaskFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.sample + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TotalTaskFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_total_task + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/sample/UnderTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/sample/UnderTaskFragment.kt new file mode 100644 index 0000000..da5c3f3 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/sample/UnderTaskFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.sample + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class UnderTaskFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_under_task + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml index b41f4ac..c7546e4 100644 --- a/app/src/main/res/drawable/ic_about.xml +++ b/app/src/main/res/drawable/ic_about.xml @@ -5,8 +5,5 @@ android:viewportHeight="1024"> - + android:pathData="M300.93,453.16c11.5,-2.59 18.74,-14.02 16.15,-25.53 -5.44,-24.16 -6.26,-48.98 -2.43,-73.71C331.33,245.86 432.8,171.54 540.95,188.29c25.5,3.94 49.54,12.59 71.42,25.7 10.16,6.07 23.24,2.77 29.3,-7.34 6.05,-10.13 2.75,-23.24 -7.36,-29.3 -26.66,-15.95 -55.88,-26.48 -86.84,-31.26 -131.27,-20.32 -254.74,69.98 -275.07,201.33 -4.62,30.06 -3.62,60.2 2.99,89.59 2.23,9.95 11.05,16.69 20.82,16.69 1.57,-0.01 3.14,-0.2 4.72,-0.53zM895.38,612.43c0,-30.54 -11.99,-57.46 -32.14,-76.09 20.22,-46.71 31.58,-98.08 31.58,-152.1C894.82,172.37 722.46,0 510.61,0 298.75,0 126.38,172.37 126.38,384.24c0,126.89 61.98,239.39 157.13,309.4a106.69,106.69 0,0 0,2.64 11.4c3.62,12.37 8.62,23.45 14.94,33.05 34.45,52.54 73.5,112.04 112.24,170.06 39.24,58.74 96.04,95.27 168.8,108.56 9.16,1.61 17.54,2.71 25.63,3.74 3.89,0.52 7.78,1.03 11.64,1.58 3.05,0.45 6.14,0.65 9.22,0.65h43.39c3.41,0 6.83,-0.23 10.21,-0.82 3.82,-0.62 7.63,-1.21 11.49,-1.8a2627.42,2627.42 0,0 0,19.7 -3.15c91.92,-15.87 161.29,-85 176.84,-176.22 3.18,-18.23 4.83,-36.71 4.9,-54.77 0.22,-68.46 0.22,-77.04 0.2,-104.73 0,-14.2 0,-33.52 0.02,-68.75zM190.45,384.23c0,-176.85 143.35,-320.17 320.16,-320.17s320.16,143.32 320.16,320.17c0,44.88 -9.4,87.5 -26.09,126.26 -3,-0.29 -5.99,-0.49 -9,-0.49a99.29,99.29 0,0 0,-26.95 3.71c-9.98,-9.44 -21.92,-16.83 -35.32,-21.43 -2.23,-0.73 -4.45,-1.37 -6.65,-1.96 10.54,-21.32 18.18,-44.51 21.98,-69.26 8.26,-53.24 -1.15,-106.25 -27.18,-153.33 -5.7,-10.31 -18.69,-14.07 -29.02,-8.36 -10.31,5.71 -14.05,18.7 -8.35,29.02 21.41,38.71 29.14,82.34 22.35,126.13 -4.3,27.64 -14.22,52.92 -28.34,75.1 -1.27,0.3 -2.6,0.43 -3.85,0.78 -8.78,-8.07 -19.31,-14.72 -31.37,-19.78 -9.2,-4.9 -19.5,-7.45 -29.99,-7.45h-2.16c0,-27.51 0,-53.6 -0.03,-74.53 0,-52.01 -34.53,-92.43 -85.95,-100.51a92.3,92.3 0,0 0,-14.37 -1.15c-50.27,0 -94.47,40.42 -98.51,90.09 -0.48,6.38 -0.48,11.74 -0.48,16.05v162.58c-19.94,-11.45 -37.93,-26.28 -52.95,-44.22 -7.55,-9.04 -21,-10.25 -30.08,-2.68 -9.03,7.57 -10.23,21.04 -2.68,30.1 10.42,12.44 22.1,23.59 34.63,33.57 -25.95,6.62 -48.7,23.19 -62.88,46.41 -0.55,0.9 -0.97,1.84 -1.49,2.75 -64.79,-58.6 -105.57,-143.19 -105.57,-237.41zM831.09,785.7c-0.07,14.72 -1.46,29.65 -3.99,44.21 -10.98,64.43 -59.79,112.68 -124.43,123.82 -10.16,1.72 -20.44,3.24 -30.65,4.9h-43.4c-11.63,-1.72 -23.37,-2.94 -34.97,-5 -53.34,-9.73 -96.64,-35.58 -127.02,-81.08 -37.67,-56.37 -74.81,-112.96 -111.96,-169.6 -3.14,-4.78 -5.38,-10.33 -7.01,-15.82 -6.95,-23.93 7.16,-48.66 30.71,-53.22 3.42,-0.64 6.74,-0.99 9.89,-0.99 14.31,0 26.51,6.47 35.85,18.57 15.57,20.13 30.29,40.92 45.36,61.42a369.92,369.92 0,0 0,4.84 6.52c0.39,-0.17 0.82,-0.3 1.22,-0.49v-5.75,-320.07c0,-3.64 0,-7.24 0.28,-10.87 1.38,-16.89 17.86,-31.19 34.66,-31.19 1.45,0 2.96,0.12 4.43,0.36 19.88,3.13 31.84,16.94 31.84,37.27 0.05,56.97 0,152.32 0.08,209.34 0,2.96 0.19,6.06 1.06,8.86 1.46,4.61 4.94,7.08 9.88,7.46h1.05c4.72,0 8.2,-2.36 10.06,-6.59 1.19,-2.62 1.26,-5.83 1.26,-8.82 0,-19.61 -0.05,-25.79 -0.05,-25.79l-0.07,18.23c0,-0.06 0,-6.3 0.05,-25.8 0,-12.88 4.32,-24.08 15.27,-31.69 4.03,-2.75 8.83,-4.47 13.26,-6.64h14.39c0.51,0.37 0.92,0.84 1.47,1.04 18.72,6.44 27.42,18.58 27.42,38.26 -0.06,19.31 -0.06,25.46 -0.06,25.46l-0.02,-18.79v25.49c0,1.84 -0.06,3.62 0.13,5.4 0.78,6.15 5.51,10.23 11.48,10.23 0.39,0 0.74,0 1.12,-0.02 6.31,-0.57 9.92,-4.88 10.36,-12.68v-0.19c0.03,-0.47 0.03,-0.96 0.03,-1.43v-12.12c0.28,-8.39 2.34,-16.3 7.74,-23.13 7.09,-8.99 17.41,-13.88 28.18,-13.88 3.91,0 7.88,0.65 11.73,1.95 14.79,5.1 24.25,19.45 24.25,36.59 -0.02,19.31 -0.05,25.48 -0.05,25.48 -0.01,0 -0.05,-18.81 -0.07,-18.81 0,0 -0.01,6.15 -0.01,25.5 0,2.2 0,4.43 0.23,6.61 0.71,5.8 4.47,8.8 9.86,9.86a7.59,7.59 0,0 0,1.68 0.16c4.26,0 8.79,-2.97 10.23,-7.24 0.92,-2.77 1.18,-5.86 1.18,-8.86 0,-2.62 0,-4.88 0.01,-6.77v12.98c0.07,0 0.11,-3.89 0.15,-15.16 0.07,-6.25 1.2,-12.92 3.67,-18.63 5.64,-12.79 18.6,-20.52 31.96,-20.52 2.47,0 4.9,0.29 7.36,0.82 17.32,3.79 28.26,18.49 28.26,37.52 -0.06,103.54 0.1,69.78 -0.22,173.33z" /> diff --git a/app/src/main/res/drawable/ic_collection.xml b/app/src/main/res/drawable/ic_collection.xml index ce1a8a2..4d2016b 100644 --- a/app/src/main/res/drawable/ic_collection.xml +++ b/app/src/main/res/drawable/ic_collection.xml @@ -5,8 +5,5 @@ android:viewportHeight="1024"> - + android:pathData="M139.64,930.91 L512,774.48 884.36,930.91 884.36,93.09 139.64,93.09 139.64,930.91ZM79.79,93.09C79.79,60.04 106.59,33.25 139.64,33.25L884.36,33.25C917.41,33.25 944.21,60.04 944.21,93.09L944.21,930.91C944.21,973.69 900.62,1002.65 861.18,986.08L488.82,829.65 535.18,829.65 162.81,986.08C123.38,1002.65 79.79,973.69 79.79,930.91L79.79,93.09ZM512,606.67 L628.8,659.86C652.63,670.7 668.89,658.58 665.59,632.98L649.71,509.73 738.03,418.34C755.56,400.2 749.98,381.09 724.83,376.4L597.09,352.58 534.8,243.1C522.43,221.36 501.6,221.3 488.77,243.84L426.98,352.4 299.23,376.26C274.26,380.93 268.17,399.75 286.02,418.22L374.29,509.61 358.41,632.86C355.12,658.41 371.59,670.5 395.2,659.77L512,606.67ZM536.77,661.15 L419.97,714.25C353.79,744.33 289.76,697.43 299.06,625.22L314.93,501.96 331.24,551.18 242.98,459.8C192.09,407.12 216.3,330.88 288.24,317.44L415.99,293.57 374.97,322.79 436.76,214.24C472.3,151.8 551.26,151 586.82,213.51L649.1,322.98 608.06,293.75 735.8,317.57C808.03,331.04 831.6,407.64 781.06,459.93L692.74,551.31 709.07,502.08 724.94,625.34C734.25,697.6 670.4,744.55 604,714.32L487.2,661.14 536.77,661.15Z" /> diff --git a/app/src/main/res/drawable/ic_help.xml b/app/src/main/res/drawable/ic_help.xml index 3835c32..cf1f741 100644 --- a/app/src/main/res/drawable/ic_help.xml +++ b/app/src/main/res/drawable/ic_help.xml @@ -5,11 +5,5 @@ android:viewportHeight="1024"> - - + android:pathData="M860.2,64.2L264,64.2c-110.5,0 -200,89.5 -200,200v538.9c-0.3,3.7 -0.4,7.4 -0.4,11.1h0.5C66.6,895 132.8,959.6 214,959.6h646.2c55.2,0 100,-44.8 100,-100L960.2,164.2c0,-55.2 -44.8,-100 -100,-100zM499.4,473.4l-58.7,-52.1c-0.1,-0.1 -0.2,-0.1 -0.2,-0.2 -0.3,-0.3 -0.7,-0.6 -1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.4,-0.3 -0.7,-0.5 -1.1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.3,-0.2 -0.7,-0.5 -1.1,-0.7 -0.2,-0.1 -0.3,-0.2 -0.5,-0.3 -0.3,-0.2 -0.7,-0.4 -1,-0.6l-0.6,-0.3c-0.3,-0.2 -0.6,-0.3 -0.9,-0.5 -0.2,-0.1 -0.5,-0.3 -0.7,-0.4 -0.3,-0.1 -0.5,-0.3 -0.8,-0.4 -0.3,-0.1 -0.6,-0.3 -0.9,-0.4 -0.2,-0.1 -0.4,-0.2 -0.7,-0.3 -0.3,-0.1 -0.7,-0.3 -1,-0.4 -0.2,-0.1 -0.4,-0.1 -0.6,-0.2 -0.4,-0.1 -0.7,-0.3 -1.1,-0.4 -0.2,-0.1 -0.3,-0.1 -0.5,-0.2l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.2 -1.2,-0.2 -0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.1 -1.2,-0.2 -0.2,0 -0.4,0 -0.6,-0.1 -0.4,0 -0.7,-0.1 -1.1,-0.1h-5.1c-0.3,0 -0.7,0.1 -1,0.1 -0.2,0 -0.4,0 -0.7,0.1 -0.4,0 -0.7,0.1 -1.1,0.1 -0.2,0 -0.4,0.1 -0.6,0.1 -0.4,0.1 -0.8,0.1 -1.2,0.2 -0.2,0 -0.4,0.1 -0.5,0.1l-1.2,0.3c-0.2,0 -0.4,0.1 -0.5,0.1 -0.4,0.1 -0.7,0.2 -1.1,0.3 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.4,0.1 -0.7,0.2 -1,0.4 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.3,0.1 -0.6,0.2 -0.9,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.1 -0.5,0.2 -0.8,0.4 -0.3,0.1 -0.6,0.3 -0.8,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.2 -0.6,0.3 -1,0.5 -0.2,0.1 -0.4,0.2 -0.5,0.3 -0.4,0.2 -0.7,0.4 -1,0.6 -0.1,0.1 -0.3,0.2 -0.4,0.3 -0.4,0.2 -0.7,0.5 -1.1,0.7 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.4,0.3 -0.7,0.5 -1.1,0.8 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.3,0.3 -0.7,0.6 -1,0.9 -0.1,0.1 -0.2,0.1 -0.2,0.2L332.7,474L332.7,136.2h166.7v337.2zM173.5,173.7c23.4,-23.4 54.2,-36.6 87.2,-37.4L260.7,555.7c0,0.3 0,0.7 0.1,1 0,0.3 0.1,0.5 0.1,0.8 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8l0.3,0.9c0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.4,0.8 0.1,0.3 0.2,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.2,0.3 0.3,0.5 0.5,0.8 0.1,0.2 0.3,0.5 0.5,0.7 0.2,0.3 0.4,0.5 0.5,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.4,0.5 0.6,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.5,0.6 0.7,0.8l0.3,0.3 0.2,0.2c0.3,0.3 0.6,0.6 0.8,0.9l0.5,0.5 0.8,0.8c0.9,0.9 1.9,1.7 2.9,2.5 0.1,0.1 0.3,0.2 0.4,0.3 0.3,0.2 0.7,0.5 1,0.7 0.2,0.1 0.3,0.2 0.5,0.4 0.3,0.2 0.6,0.4 1,0.6 0.2,0.1 0.4,0.3 0.6,0.4 0.3,0.2 0.6,0.4 0.9,0.5 0.2,0.1 0.5,0.3 0.7,0.4 0.3,0.1 0.5,0.3 0.8,0.4 0.3,0.1 0.6,0.3 0.9,0.4 0.2,0.1 0.5,0.2 0.7,0.3 0.4,0.2 0.7,0.3 1.1,0.5 0.2,0.1 0.4,0.1 0.5,0.2 0.5,0.2 0.9,0.3 1.4,0.5 0.1,0 0.2,0.1 0.3,0.1 0.6,0.2 1.1,0.3 1.7,0.5h0.1c3,0.8 6.1,1.2 9.3,1.2h2.3c0.4,0 0.8,-0.1 1.1,-0.1 0.2,0 0.5,-0.1 0.7,-0.1 0.3,0 0.7,-0.1 1,-0.1 0.3,0 0.5,-0.1 0.8,-0.1 0.3,0 0.6,-0.1 0.9,-0.2 0.3,0 0.5,-0.1 0.8,-0.2 0.3,-0.1 0.6,-0.1 0.9,-0.2 0.3,-0.1 0.5,-0.1 0.8,-0.2l0.9,-0.3c0.2,-0.1 0.5,-0.1 0.7,-0.2 0.4,-0.1 0.7,-0.2 1.1,-0.4 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.5,-0.2 1,-0.4 1.6,-0.6 0.1,0 0.2,-0.1 0.3,-0.1 0.4,-0.2 0.9,-0.4 1.3,-0.6 0.2,-0.1 0.3,-0.2 0.5,-0.2 0.4,-0.2 0.7,-0.4 1,-0.5 0.2,-0.1 0.4,-0.2 0.5,-0.3 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.3 0.8,-0.5 0.2,-0.1 0.4,-0.3 0.6,-0.4 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.4,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.4 0.7,-0.6 0.1,-0.1 0.3,-0.2 0.4,-0.3l96.2,-84.3 94.9,84.1c0.2,0.1 0.3,0.3 0.5,0.4 0.2,0.2 0.4,0.4 0.7,0.6 0.2,0.2 0.5,0.4 0.7,0.5 0.2,0.2 0.4,0.3 0.7,0.5 0.3,0.2 0.5,0.4 0.8,0.6 0.2,0.1 0.4,0.3 0.6,0.4l0.9,0.6c0.2,0.1 0.3,0.2 0.5,0.3 0.4,0.2 0.7,0.4 1.1,0.6 0.1,0.1 0.2,0.1 0.3,0.2 0.5,0.3 1,0.5 1.5,0.8 0.5,0.3 1,0.5 1.6,0.7 0.1,0 0.2,0.1 0.2,0.1 0.4,0.2 0.9,0.4 1.3,0.5 0.2,0.1 0.4,0.1 0.6,0.2 0.3,0.1 0.7,0.2 1,0.3 0.2,0.1 0.5,0.1 0.7,0.2l0.9,0.3c0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0 0.5,0.1 0.8,0.1 0.3,0 0.7,0.1 1,0.1 0.2,0 0.5,0.1 0.7,0.1 0.4,0 0.8,0.1 1.1,0.1h2.3c3.8,0 7.5,-0.6 11,-1.7 0.1,0 0.2,-0.1 0.2,-0.1 0.5,-0.2 1,-0.3 1.5,-0.5 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.4,-0.2 0.8,-0.3 1.1,-0.5 0.2,-0.1 0.5,-0.2 0.7,-0.3 0.3,-0.1 0.6,-0.3 0.9,-0.4 0.3,-0.1 0.6,-0.3 0.8,-0.4 0.2,-0.1 0.5,-0.3 0.7,-0.4 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.4 1,-0.6 0.2,-0.1 0.4,-0.2 0.5,-0.4 0.3,-0.2 0.6,-0.4 1,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.3,-0.2 0.6,-0.5 0.9,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.4,-0.3 0.7,-0.6 1.1,-1 0.4,-0.3 0.7,-0.7 1,-1 0.1,-0.1 0.3,-0.3 0.4,-0.5l0.9,-0.9 0.1,-0.1c0.1,-0.1 0.2,-0.3 0.4,-0.4 0.2,-0.3 0.5,-0.5 0.7,-0.8 0.2,-0.2 0.3,-0.4 0.5,-0.6 0.2,-0.3 0.4,-0.5 0.6,-0.8 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.2 0.2,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8l0.3,-0.9c0.1,-0.3 0.2,-0.5 0.2,-0.8 0.1,-0.3 0.2,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.5 0.2,-0.8 0.1,-0.3 0.1,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.6 0.2,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.5 0.1,-0.8 0,-0.3 0.1,-0.7 0.1,-1v-0.8,-1.1 -417.9h288.8c15.4,0 28,12.6 28,28v504L209.7,668.2c-26.9,0 -52,7.3 -73.7,20v-424c0,-34.2 13.3,-66.3 37.5,-90.5zM860.2,887.6L214,887.6c-43,0 -78,-35 -78,-78v-3.1c3.9,-37.2 35.5,-66.2 73.7,-66.2h678.5v119.3c0,15.4 -12.6,28 -28,28z" /> diff --git a/app/src/main/res/drawable/ic_overtime.xml b/app/src/main/res/drawable/ic_overtime.xml new file mode 100644 index 0000000..6916eca --- /dev/null +++ b/app/src/main/res/drawable/ic_overtime.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_privacy.xml b/app/src/main/res/drawable/ic_privacy.xml index 22ef981..92d2699 100644 --- a/app/src/main/res/drawable/ic_privacy.xml +++ b/app/src/main/res/drawable/ic_privacy.xml @@ -5,5 +5,8 @@ android:viewportHeight="1024"> + android:pathData="M615.51,402.9a34.13,34.13 0,0 1,51.16 45.08l-2.18,2.45 -149.61,154.15a34.13,34.13 0,0 1,-44.07 4.18l-2.65,-2.05 -106.41,-91.39a34.13,34.13 0,0 1,41.9 -53.8l2.6,2.01 82.01,70.46 127.25,-131.09z" /> + diff --git a/app/src/main/res/drawable/ic_push_setting.xml b/app/src/main/res/drawable/ic_push_setting.xml index 69e0c3f..c03f19f 100644 --- a/app/src/main/res/drawable/ic_push_setting.xml +++ b/app/src/main/res/drawable/ic_push_setting.xml @@ -5,30 +5,5 @@ android:viewportHeight="1024"> - + android:pathData="M932.6,832L432.8,832c-9.4,0 -18.4,-4.4 -24,-12 -5.6,-7.6 -7.4,-17.4 -4.8,-26.4l24.4,-84.4c0.4,-1.2 0.8,-2.4 1.4,-3.6 1.6,-3.6 2.4,-7.4 2.4,-11.4L432.2,480.8c0,-137.8 112.2,-250 250,-250 138.4,0 251,112.2 251,250v213.4c0,4 0.8,7.8 2.4,11.4 0.6,1.2 1,2.4 1.4,3.6l24.4,84.4c2.6,9 0.8,18.8 -4.8,26.4 -5.8,7.6 -14.6,12 -24,12zM472.6,772h420l-12.8,-44.4c-4.4,-10.6 -6.6,-21.8 -6.6,-33.4L873.2,480.8c0,-104.8 -85.6,-190 -191,-190 -104.8,0 -190.2,85.2 -190.2,190v213.4c0,11.6 -2.2,22.8 -6.6,33.4l-12.8,44.4zM833.4,507.6c0,-104 -58.2,-176.8 -141.4,-176.8 -16.6,0 -30,13.4 -30,30s13.4,30 30,30c64.2,0 81.4,73.4 81.4,116.8 0,16.6 13.4,30 30,30s30,-13.4 30,-30zM785.8,895c0,-16.6 -13.4,-30 -30,-30h-146.2c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h146.2c16.6,0 30,-13.4 30,-30zM364.6,923.6c0,-16.6 -13.4,-30 -30,-30L180.4,893.6c-32.4,0 -58.8,-26.4 -58.8,-58.8L121.6,189.2c0,-32.4 26.4,-58.8 58.8,-58.8h514.8c32.4,0 58.8,26.4 58.8,58.8 0,16.6 13.4,30 30,30s30,-13.4 30,-30c0,-65.6 -53.4,-118.8 -118.8,-118.8L180.4,70.4c-65.6,0 -118.8,53.4 -118.8,118.8v645.4c0,65.6 53.4,118.8 118.8,118.8h154.2c16.6,0.2 30,-13.2 30,-29.8zM354.4,327.2c0,-16.6 -13.4,-30 -30,-30h-104.2c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h104.2c16.6,0 30,-13.4 30,-30zM317.6,492.6c0,-16.6 -13.4,-30 -30,-30h-67.4c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h67.4c16.6,0 30,-13.4 30,-30zM334,658c0,-16.6 -13.4,-30 -30,-30h-83.8c-16.6,0 -30,13.4 -30,30s13.4,30 30,30L304,688c16.4,0 30,-13.4 30,-30z" /> diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt new file mode 100644 index 0000000..621d5d4 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt @@ -0,0 +1,18 @@ +package com.casic.xz.meterage.adapter + +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager +import androidx.fragment.app.FragmentPagerAdapter + +class SubViewPagerAdapter( + manager: FragmentManager, + private val pages: ArrayList, + private val titles: Array +) : FragmentPagerAdapter(manager) { + + override fun getItem(position: Int): Fragment = pages[position] + + override fun getCount(): Int = pages.size + + override fun getPageTitle(position: Int): CharSequence = titles[position] +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index f54f94a..afa0759 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,11 +1,32 @@ package com.casic.xz.meterage.fragment +import androidx.fragment.app.Fragment import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.SubViewPagerAdapter +import com.casic.xz.meterage.fragment.sample.FutureTaskFragment +import com.casic.xz.meterage.fragment.sample.TotalTaskFragment +import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_sample.* -class SamplePageFragment : KotlinBaseFragment(){ +class SamplePageFragment : KotlinBaseFragment() { + + private var fragmentPages: ArrayList = ArrayList() + + init { + fragmentPages.add(UnderTaskFragment()) + fragmentPages.add(FutureTaskFragment()) + fragmentPages.add(TotalTaskFragment()) + } + override fun initData() { + val samplePageTitles = arrayOf("检定中 0", "预期任务 0", "全部 0") + sampleViewPager.adapter = SubViewPagerAdapter( + childFragmentManager, fragmentPages, samplePageTitles + ) + //绑定 + topTabLayout.setupWithViewPager(sampleViewPager) } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt new file mode 100644 index 0000000..ebad65f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.sample + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class FutureTaskFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_future_task + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/sample/TotalTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/sample/TotalTaskFragment.kt new file mode 100644 index 0000000..1968ed2 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/sample/TotalTaskFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.sample + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TotalTaskFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_total_task + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/sample/UnderTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/sample/UnderTaskFragment.kt new file mode 100644 index 0000000..da5c3f3 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/sample/UnderTaskFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.sample + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class UnderTaskFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_under_task + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml index b41f4ac..c7546e4 100644 --- a/app/src/main/res/drawable/ic_about.xml +++ b/app/src/main/res/drawable/ic_about.xml @@ -5,8 +5,5 @@ android:viewportHeight="1024"> - + android:pathData="M300.93,453.16c11.5,-2.59 18.74,-14.02 16.15,-25.53 -5.44,-24.16 -6.26,-48.98 -2.43,-73.71C331.33,245.86 432.8,171.54 540.95,188.29c25.5,3.94 49.54,12.59 71.42,25.7 10.16,6.07 23.24,2.77 29.3,-7.34 6.05,-10.13 2.75,-23.24 -7.36,-29.3 -26.66,-15.95 -55.88,-26.48 -86.84,-31.26 -131.27,-20.32 -254.74,69.98 -275.07,201.33 -4.62,30.06 -3.62,60.2 2.99,89.59 2.23,9.95 11.05,16.69 20.82,16.69 1.57,-0.01 3.14,-0.2 4.72,-0.53zM895.38,612.43c0,-30.54 -11.99,-57.46 -32.14,-76.09 20.22,-46.71 31.58,-98.08 31.58,-152.1C894.82,172.37 722.46,0 510.61,0 298.75,0 126.38,172.37 126.38,384.24c0,126.89 61.98,239.39 157.13,309.4a106.69,106.69 0,0 0,2.64 11.4c3.62,12.37 8.62,23.45 14.94,33.05 34.45,52.54 73.5,112.04 112.24,170.06 39.24,58.74 96.04,95.27 168.8,108.56 9.16,1.61 17.54,2.71 25.63,3.74 3.89,0.52 7.78,1.03 11.64,1.58 3.05,0.45 6.14,0.65 9.22,0.65h43.39c3.41,0 6.83,-0.23 10.21,-0.82 3.82,-0.62 7.63,-1.21 11.49,-1.8a2627.42,2627.42 0,0 0,19.7 -3.15c91.92,-15.87 161.29,-85 176.84,-176.22 3.18,-18.23 4.83,-36.71 4.9,-54.77 0.22,-68.46 0.22,-77.04 0.2,-104.73 0,-14.2 0,-33.52 0.02,-68.75zM190.45,384.23c0,-176.85 143.35,-320.17 320.16,-320.17s320.16,143.32 320.16,320.17c0,44.88 -9.4,87.5 -26.09,126.26 -3,-0.29 -5.99,-0.49 -9,-0.49a99.29,99.29 0,0 0,-26.95 3.71c-9.98,-9.44 -21.92,-16.83 -35.32,-21.43 -2.23,-0.73 -4.45,-1.37 -6.65,-1.96 10.54,-21.32 18.18,-44.51 21.98,-69.26 8.26,-53.24 -1.15,-106.25 -27.18,-153.33 -5.7,-10.31 -18.69,-14.07 -29.02,-8.36 -10.31,5.71 -14.05,18.7 -8.35,29.02 21.41,38.71 29.14,82.34 22.35,126.13 -4.3,27.64 -14.22,52.92 -28.34,75.1 -1.27,0.3 -2.6,0.43 -3.85,0.78 -8.78,-8.07 -19.31,-14.72 -31.37,-19.78 -9.2,-4.9 -19.5,-7.45 -29.99,-7.45h-2.16c0,-27.51 0,-53.6 -0.03,-74.53 0,-52.01 -34.53,-92.43 -85.95,-100.51a92.3,92.3 0,0 0,-14.37 -1.15c-50.27,0 -94.47,40.42 -98.51,90.09 -0.48,6.38 -0.48,11.74 -0.48,16.05v162.58c-19.94,-11.45 -37.93,-26.28 -52.95,-44.22 -7.55,-9.04 -21,-10.25 -30.08,-2.68 -9.03,7.57 -10.23,21.04 -2.68,30.1 10.42,12.44 22.1,23.59 34.63,33.57 -25.95,6.62 -48.7,23.19 -62.88,46.41 -0.55,0.9 -0.97,1.84 -1.49,2.75 -64.79,-58.6 -105.57,-143.19 -105.57,-237.41zM831.09,785.7c-0.07,14.72 -1.46,29.65 -3.99,44.21 -10.98,64.43 -59.79,112.68 -124.43,123.82 -10.16,1.72 -20.44,3.24 -30.65,4.9h-43.4c-11.63,-1.72 -23.37,-2.94 -34.97,-5 -53.34,-9.73 -96.64,-35.58 -127.02,-81.08 -37.67,-56.37 -74.81,-112.96 -111.96,-169.6 -3.14,-4.78 -5.38,-10.33 -7.01,-15.82 -6.95,-23.93 7.16,-48.66 30.71,-53.22 3.42,-0.64 6.74,-0.99 9.89,-0.99 14.31,0 26.51,6.47 35.85,18.57 15.57,20.13 30.29,40.92 45.36,61.42a369.92,369.92 0,0 0,4.84 6.52c0.39,-0.17 0.82,-0.3 1.22,-0.49v-5.75,-320.07c0,-3.64 0,-7.24 0.28,-10.87 1.38,-16.89 17.86,-31.19 34.66,-31.19 1.45,0 2.96,0.12 4.43,0.36 19.88,3.13 31.84,16.94 31.84,37.27 0.05,56.97 0,152.32 0.08,209.34 0,2.96 0.19,6.06 1.06,8.86 1.46,4.61 4.94,7.08 9.88,7.46h1.05c4.72,0 8.2,-2.36 10.06,-6.59 1.19,-2.62 1.26,-5.83 1.26,-8.82 0,-19.61 -0.05,-25.79 -0.05,-25.79l-0.07,18.23c0,-0.06 0,-6.3 0.05,-25.8 0,-12.88 4.32,-24.08 15.27,-31.69 4.03,-2.75 8.83,-4.47 13.26,-6.64h14.39c0.51,0.37 0.92,0.84 1.47,1.04 18.72,6.44 27.42,18.58 27.42,38.26 -0.06,19.31 -0.06,25.46 -0.06,25.46l-0.02,-18.79v25.49c0,1.84 -0.06,3.62 0.13,5.4 0.78,6.15 5.51,10.23 11.48,10.23 0.39,0 0.74,0 1.12,-0.02 6.31,-0.57 9.92,-4.88 10.36,-12.68v-0.19c0.03,-0.47 0.03,-0.96 0.03,-1.43v-12.12c0.28,-8.39 2.34,-16.3 7.74,-23.13 7.09,-8.99 17.41,-13.88 28.18,-13.88 3.91,0 7.88,0.65 11.73,1.95 14.79,5.1 24.25,19.45 24.25,36.59 -0.02,19.31 -0.05,25.48 -0.05,25.48 -0.01,0 -0.05,-18.81 -0.07,-18.81 0,0 -0.01,6.15 -0.01,25.5 0,2.2 0,4.43 0.23,6.61 0.71,5.8 4.47,8.8 9.86,9.86a7.59,7.59 0,0 0,1.68 0.16c4.26,0 8.79,-2.97 10.23,-7.24 0.92,-2.77 1.18,-5.86 1.18,-8.86 0,-2.62 0,-4.88 0.01,-6.77v12.98c0.07,0 0.11,-3.89 0.15,-15.16 0.07,-6.25 1.2,-12.92 3.67,-18.63 5.64,-12.79 18.6,-20.52 31.96,-20.52 2.47,0 4.9,0.29 7.36,0.82 17.32,3.79 28.26,18.49 28.26,37.52 -0.06,103.54 0.1,69.78 -0.22,173.33z" /> diff --git a/app/src/main/res/drawable/ic_collection.xml b/app/src/main/res/drawable/ic_collection.xml index ce1a8a2..4d2016b 100644 --- a/app/src/main/res/drawable/ic_collection.xml +++ b/app/src/main/res/drawable/ic_collection.xml @@ -5,8 +5,5 @@ android:viewportHeight="1024"> - + android:pathData="M139.64,930.91 L512,774.48 884.36,930.91 884.36,93.09 139.64,93.09 139.64,930.91ZM79.79,93.09C79.79,60.04 106.59,33.25 139.64,33.25L884.36,33.25C917.41,33.25 944.21,60.04 944.21,93.09L944.21,930.91C944.21,973.69 900.62,1002.65 861.18,986.08L488.82,829.65 535.18,829.65 162.81,986.08C123.38,1002.65 79.79,973.69 79.79,930.91L79.79,93.09ZM512,606.67 L628.8,659.86C652.63,670.7 668.89,658.58 665.59,632.98L649.71,509.73 738.03,418.34C755.56,400.2 749.98,381.09 724.83,376.4L597.09,352.58 534.8,243.1C522.43,221.36 501.6,221.3 488.77,243.84L426.98,352.4 299.23,376.26C274.26,380.93 268.17,399.75 286.02,418.22L374.29,509.61 358.41,632.86C355.12,658.41 371.59,670.5 395.2,659.77L512,606.67ZM536.77,661.15 L419.97,714.25C353.79,744.33 289.76,697.43 299.06,625.22L314.93,501.96 331.24,551.18 242.98,459.8C192.09,407.12 216.3,330.88 288.24,317.44L415.99,293.57 374.97,322.79 436.76,214.24C472.3,151.8 551.26,151 586.82,213.51L649.1,322.98 608.06,293.75 735.8,317.57C808.03,331.04 831.6,407.64 781.06,459.93L692.74,551.31 709.07,502.08 724.94,625.34C734.25,697.6 670.4,744.55 604,714.32L487.2,661.14 536.77,661.15Z" /> diff --git a/app/src/main/res/drawable/ic_help.xml b/app/src/main/res/drawable/ic_help.xml index 3835c32..cf1f741 100644 --- a/app/src/main/res/drawable/ic_help.xml +++ b/app/src/main/res/drawable/ic_help.xml @@ -5,11 +5,5 @@ android:viewportHeight="1024"> - - + android:pathData="M860.2,64.2L264,64.2c-110.5,0 -200,89.5 -200,200v538.9c-0.3,3.7 -0.4,7.4 -0.4,11.1h0.5C66.6,895 132.8,959.6 214,959.6h646.2c55.2,0 100,-44.8 100,-100L960.2,164.2c0,-55.2 -44.8,-100 -100,-100zM499.4,473.4l-58.7,-52.1c-0.1,-0.1 -0.2,-0.1 -0.2,-0.2 -0.3,-0.3 -0.7,-0.6 -1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.4,-0.3 -0.7,-0.5 -1.1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.3,-0.2 -0.7,-0.5 -1.1,-0.7 -0.2,-0.1 -0.3,-0.2 -0.5,-0.3 -0.3,-0.2 -0.7,-0.4 -1,-0.6l-0.6,-0.3c-0.3,-0.2 -0.6,-0.3 -0.9,-0.5 -0.2,-0.1 -0.5,-0.3 -0.7,-0.4 -0.3,-0.1 -0.5,-0.3 -0.8,-0.4 -0.3,-0.1 -0.6,-0.3 -0.9,-0.4 -0.2,-0.1 -0.4,-0.2 -0.7,-0.3 -0.3,-0.1 -0.7,-0.3 -1,-0.4 -0.2,-0.1 -0.4,-0.1 -0.6,-0.2 -0.4,-0.1 -0.7,-0.3 -1.1,-0.4 -0.2,-0.1 -0.3,-0.1 -0.5,-0.2l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.2 -1.2,-0.2 -0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.1 -1.2,-0.2 -0.2,0 -0.4,0 -0.6,-0.1 -0.4,0 -0.7,-0.1 -1.1,-0.1h-5.1c-0.3,0 -0.7,0.1 -1,0.1 -0.2,0 -0.4,0 -0.7,0.1 -0.4,0 -0.7,0.1 -1.1,0.1 -0.2,0 -0.4,0.1 -0.6,0.1 -0.4,0.1 -0.8,0.1 -1.2,0.2 -0.2,0 -0.4,0.1 -0.5,0.1l-1.2,0.3c-0.2,0 -0.4,0.1 -0.5,0.1 -0.4,0.1 -0.7,0.2 -1.1,0.3 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.4,0.1 -0.7,0.2 -1,0.4 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.3,0.1 -0.6,0.2 -0.9,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.1 -0.5,0.2 -0.8,0.4 -0.3,0.1 -0.6,0.3 -0.8,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.2 -0.6,0.3 -1,0.5 -0.2,0.1 -0.4,0.2 -0.5,0.3 -0.4,0.2 -0.7,0.4 -1,0.6 -0.1,0.1 -0.3,0.2 -0.4,0.3 -0.4,0.2 -0.7,0.5 -1.1,0.7 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.4,0.3 -0.7,0.5 -1.1,0.8 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.3,0.3 -0.7,0.6 -1,0.9 -0.1,0.1 -0.2,0.1 -0.2,0.2L332.7,474L332.7,136.2h166.7v337.2zM173.5,173.7c23.4,-23.4 54.2,-36.6 87.2,-37.4L260.7,555.7c0,0.3 0,0.7 0.1,1 0,0.3 0.1,0.5 0.1,0.8 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8l0.3,0.9c0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.4,0.8 0.1,0.3 0.2,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.2,0.3 0.3,0.5 0.5,0.8 0.1,0.2 0.3,0.5 0.5,0.7 0.2,0.3 0.4,0.5 0.5,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.4,0.5 0.6,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.5,0.6 0.7,0.8l0.3,0.3 0.2,0.2c0.3,0.3 0.6,0.6 0.8,0.9l0.5,0.5 0.8,0.8c0.9,0.9 1.9,1.7 2.9,2.5 0.1,0.1 0.3,0.2 0.4,0.3 0.3,0.2 0.7,0.5 1,0.7 0.2,0.1 0.3,0.2 0.5,0.4 0.3,0.2 0.6,0.4 1,0.6 0.2,0.1 0.4,0.3 0.6,0.4 0.3,0.2 0.6,0.4 0.9,0.5 0.2,0.1 0.5,0.3 0.7,0.4 0.3,0.1 0.5,0.3 0.8,0.4 0.3,0.1 0.6,0.3 0.9,0.4 0.2,0.1 0.5,0.2 0.7,0.3 0.4,0.2 0.7,0.3 1.1,0.5 0.2,0.1 0.4,0.1 0.5,0.2 0.5,0.2 0.9,0.3 1.4,0.5 0.1,0 0.2,0.1 0.3,0.1 0.6,0.2 1.1,0.3 1.7,0.5h0.1c3,0.8 6.1,1.2 9.3,1.2h2.3c0.4,0 0.8,-0.1 1.1,-0.1 0.2,0 0.5,-0.1 0.7,-0.1 0.3,0 0.7,-0.1 1,-0.1 0.3,0 0.5,-0.1 0.8,-0.1 0.3,0 0.6,-0.1 0.9,-0.2 0.3,0 0.5,-0.1 0.8,-0.2 0.3,-0.1 0.6,-0.1 0.9,-0.2 0.3,-0.1 0.5,-0.1 0.8,-0.2l0.9,-0.3c0.2,-0.1 0.5,-0.1 0.7,-0.2 0.4,-0.1 0.7,-0.2 1.1,-0.4 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.5,-0.2 1,-0.4 1.6,-0.6 0.1,0 0.2,-0.1 0.3,-0.1 0.4,-0.2 0.9,-0.4 1.3,-0.6 0.2,-0.1 0.3,-0.2 0.5,-0.2 0.4,-0.2 0.7,-0.4 1,-0.5 0.2,-0.1 0.4,-0.2 0.5,-0.3 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.3 0.8,-0.5 0.2,-0.1 0.4,-0.3 0.6,-0.4 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.4,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.4 0.7,-0.6 0.1,-0.1 0.3,-0.2 0.4,-0.3l96.2,-84.3 94.9,84.1c0.2,0.1 0.3,0.3 0.5,0.4 0.2,0.2 0.4,0.4 0.7,0.6 0.2,0.2 0.5,0.4 0.7,0.5 0.2,0.2 0.4,0.3 0.7,0.5 0.3,0.2 0.5,0.4 0.8,0.6 0.2,0.1 0.4,0.3 0.6,0.4l0.9,0.6c0.2,0.1 0.3,0.2 0.5,0.3 0.4,0.2 0.7,0.4 1.1,0.6 0.1,0.1 0.2,0.1 0.3,0.2 0.5,0.3 1,0.5 1.5,0.8 0.5,0.3 1,0.5 1.6,0.7 0.1,0 0.2,0.1 0.2,0.1 0.4,0.2 0.9,0.4 1.3,0.5 0.2,0.1 0.4,0.1 0.6,0.2 0.3,0.1 0.7,0.2 1,0.3 0.2,0.1 0.5,0.1 0.7,0.2l0.9,0.3c0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0 0.5,0.1 0.8,0.1 0.3,0 0.7,0.1 1,0.1 0.2,0 0.5,0.1 0.7,0.1 0.4,0 0.8,0.1 1.1,0.1h2.3c3.8,0 7.5,-0.6 11,-1.7 0.1,0 0.2,-0.1 0.2,-0.1 0.5,-0.2 1,-0.3 1.5,-0.5 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.4,-0.2 0.8,-0.3 1.1,-0.5 0.2,-0.1 0.5,-0.2 0.7,-0.3 0.3,-0.1 0.6,-0.3 0.9,-0.4 0.3,-0.1 0.6,-0.3 0.8,-0.4 0.2,-0.1 0.5,-0.3 0.7,-0.4 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.4 1,-0.6 0.2,-0.1 0.4,-0.2 0.5,-0.4 0.3,-0.2 0.6,-0.4 1,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.3,-0.2 0.6,-0.5 0.9,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.4,-0.3 0.7,-0.6 1.1,-1 0.4,-0.3 0.7,-0.7 1,-1 0.1,-0.1 0.3,-0.3 0.4,-0.5l0.9,-0.9 0.1,-0.1c0.1,-0.1 0.2,-0.3 0.4,-0.4 0.2,-0.3 0.5,-0.5 0.7,-0.8 0.2,-0.2 0.3,-0.4 0.5,-0.6 0.2,-0.3 0.4,-0.5 0.6,-0.8 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.2 0.2,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8l0.3,-0.9c0.1,-0.3 0.2,-0.5 0.2,-0.8 0.1,-0.3 0.2,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.5 0.2,-0.8 0.1,-0.3 0.1,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.6 0.2,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.5 0.1,-0.8 0,-0.3 0.1,-0.7 0.1,-1v-0.8,-1.1 -417.9h288.8c15.4,0 28,12.6 28,28v504L209.7,668.2c-26.9,0 -52,7.3 -73.7,20v-424c0,-34.2 13.3,-66.3 37.5,-90.5zM860.2,887.6L214,887.6c-43,0 -78,-35 -78,-78v-3.1c3.9,-37.2 35.5,-66.2 73.7,-66.2h678.5v119.3c0,15.4 -12.6,28 -28,28z" /> diff --git a/app/src/main/res/drawable/ic_overtime.xml b/app/src/main/res/drawable/ic_overtime.xml new file mode 100644 index 0000000..6916eca --- /dev/null +++ b/app/src/main/res/drawable/ic_overtime.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_privacy.xml b/app/src/main/res/drawable/ic_privacy.xml index 22ef981..92d2699 100644 --- a/app/src/main/res/drawable/ic_privacy.xml +++ b/app/src/main/res/drawable/ic_privacy.xml @@ -5,5 +5,8 @@ android:viewportHeight="1024"> + android:pathData="M615.51,402.9a34.13,34.13 0,0 1,51.16 45.08l-2.18,2.45 -149.61,154.15a34.13,34.13 0,0 1,-44.07 4.18l-2.65,-2.05 -106.41,-91.39a34.13,34.13 0,0 1,41.9 -53.8l2.6,2.01 82.01,70.46 127.25,-131.09z" /> + diff --git a/app/src/main/res/drawable/ic_push_setting.xml b/app/src/main/res/drawable/ic_push_setting.xml index 69e0c3f..c03f19f 100644 --- a/app/src/main/res/drawable/ic_push_setting.xml +++ b/app/src/main/res/drawable/ic_push_setting.xml @@ -5,30 +5,5 @@ android:viewportHeight="1024"> - + android:pathData="M932.6,832L432.8,832c-9.4,0 -18.4,-4.4 -24,-12 -5.6,-7.6 -7.4,-17.4 -4.8,-26.4l24.4,-84.4c0.4,-1.2 0.8,-2.4 1.4,-3.6 1.6,-3.6 2.4,-7.4 2.4,-11.4L432.2,480.8c0,-137.8 112.2,-250 250,-250 138.4,0 251,112.2 251,250v213.4c0,4 0.8,7.8 2.4,11.4 0.6,1.2 1,2.4 1.4,3.6l24.4,84.4c2.6,9 0.8,18.8 -4.8,26.4 -5.8,7.6 -14.6,12 -24,12zM472.6,772h420l-12.8,-44.4c-4.4,-10.6 -6.6,-21.8 -6.6,-33.4L873.2,480.8c0,-104.8 -85.6,-190 -191,-190 -104.8,0 -190.2,85.2 -190.2,190v213.4c0,11.6 -2.2,22.8 -6.6,33.4l-12.8,44.4zM833.4,507.6c0,-104 -58.2,-176.8 -141.4,-176.8 -16.6,0 -30,13.4 -30,30s13.4,30 30,30c64.2,0 81.4,73.4 81.4,116.8 0,16.6 13.4,30 30,30s30,-13.4 30,-30zM785.8,895c0,-16.6 -13.4,-30 -30,-30h-146.2c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h146.2c16.6,0 30,-13.4 30,-30zM364.6,923.6c0,-16.6 -13.4,-30 -30,-30L180.4,893.6c-32.4,0 -58.8,-26.4 -58.8,-58.8L121.6,189.2c0,-32.4 26.4,-58.8 58.8,-58.8h514.8c32.4,0 58.8,26.4 58.8,58.8 0,16.6 13.4,30 30,30s30,-13.4 30,-30c0,-65.6 -53.4,-118.8 -118.8,-118.8L180.4,70.4c-65.6,0 -118.8,53.4 -118.8,118.8v645.4c0,65.6 53.4,118.8 118.8,118.8h154.2c16.6,0.2 30,-13.2 30,-29.8zM354.4,327.2c0,-16.6 -13.4,-30 -30,-30h-104.2c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h104.2c16.6,0 30,-13.4 30,-30zM317.6,492.6c0,-16.6 -13.4,-30 -30,-30h-67.4c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h67.4c16.6,0 30,-13.4 30,-30zM334,658c0,-16.6 -13.4,-30 -30,-30h-83.8c-16.6,0 -30,13.4 -30,30s13.4,30 30,30L304,688c16.4,0 30,-13.4 30,-30z" /> diff --git a/app/src/main/res/drawable/ic_total_sample.xml b/app/src/main/res/drawable/ic_total_sample.xml new file mode 100644 index 0000000..6bad12a --- /dev/null +++ b/app/src/main/res/drawable/ic_total_sample.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt new file mode 100644 index 0000000..621d5d4 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt @@ -0,0 +1,18 @@ +package com.casic.xz.meterage.adapter + +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager +import androidx.fragment.app.FragmentPagerAdapter + +class SubViewPagerAdapter( + manager: FragmentManager, + private val pages: ArrayList, + private val titles: Array +) : FragmentPagerAdapter(manager) { + + override fun getItem(position: Int): Fragment = pages[position] + + override fun getCount(): Int = pages.size + + override fun getPageTitle(position: Int): CharSequence = titles[position] +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index f54f94a..afa0759 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,11 +1,32 @@ package com.casic.xz.meterage.fragment +import androidx.fragment.app.Fragment import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.SubViewPagerAdapter +import com.casic.xz.meterage.fragment.sample.FutureTaskFragment +import com.casic.xz.meterage.fragment.sample.TotalTaskFragment +import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_sample.* -class SamplePageFragment : KotlinBaseFragment(){ +class SamplePageFragment : KotlinBaseFragment() { + + private var fragmentPages: ArrayList = ArrayList() + + init { + fragmentPages.add(UnderTaskFragment()) + fragmentPages.add(FutureTaskFragment()) + fragmentPages.add(TotalTaskFragment()) + } + override fun initData() { + val samplePageTitles = arrayOf("检定中 0", "预期任务 0", "全部 0") + sampleViewPager.adapter = SubViewPagerAdapter( + childFragmentManager, fragmentPages, samplePageTitles + ) + //绑定 + topTabLayout.setupWithViewPager(sampleViewPager) } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt new file mode 100644 index 0000000..ebad65f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.sample + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class FutureTaskFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_future_task + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/sample/TotalTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/sample/TotalTaskFragment.kt new file mode 100644 index 0000000..1968ed2 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/sample/TotalTaskFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.sample + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TotalTaskFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_total_task + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/sample/UnderTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/sample/UnderTaskFragment.kt new file mode 100644 index 0000000..da5c3f3 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/sample/UnderTaskFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.sample + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class UnderTaskFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_under_task + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml index b41f4ac..c7546e4 100644 --- a/app/src/main/res/drawable/ic_about.xml +++ b/app/src/main/res/drawable/ic_about.xml @@ -5,8 +5,5 @@ android:viewportHeight="1024"> - + android:pathData="M300.93,453.16c11.5,-2.59 18.74,-14.02 16.15,-25.53 -5.44,-24.16 -6.26,-48.98 -2.43,-73.71C331.33,245.86 432.8,171.54 540.95,188.29c25.5,3.94 49.54,12.59 71.42,25.7 10.16,6.07 23.24,2.77 29.3,-7.34 6.05,-10.13 2.75,-23.24 -7.36,-29.3 -26.66,-15.95 -55.88,-26.48 -86.84,-31.26 -131.27,-20.32 -254.74,69.98 -275.07,201.33 -4.62,30.06 -3.62,60.2 2.99,89.59 2.23,9.95 11.05,16.69 20.82,16.69 1.57,-0.01 3.14,-0.2 4.72,-0.53zM895.38,612.43c0,-30.54 -11.99,-57.46 -32.14,-76.09 20.22,-46.71 31.58,-98.08 31.58,-152.1C894.82,172.37 722.46,0 510.61,0 298.75,0 126.38,172.37 126.38,384.24c0,126.89 61.98,239.39 157.13,309.4a106.69,106.69 0,0 0,2.64 11.4c3.62,12.37 8.62,23.45 14.94,33.05 34.45,52.54 73.5,112.04 112.24,170.06 39.24,58.74 96.04,95.27 168.8,108.56 9.16,1.61 17.54,2.71 25.63,3.74 3.89,0.52 7.78,1.03 11.64,1.58 3.05,0.45 6.14,0.65 9.22,0.65h43.39c3.41,0 6.83,-0.23 10.21,-0.82 3.82,-0.62 7.63,-1.21 11.49,-1.8a2627.42,2627.42 0,0 0,19.7 -3.15c91.92,-15.87 161.29,-85 176.84,-176.22 3.18,-18.23 4.83,-36.71 4.9,-54.77 0.22,-68.46 0.22,-77.04 0.2,-104.73 0,-14.2 0,-33.52 0.02,-68.75zM190.45,384.23c0,-176.85 143.35,-320.17 320.16,-320.17s320.16,143.32 320.16,320.17c0,44.88 -9.4,87.5 -26.09,126.26 -3,-0.29 -5.99,-0.49 -9,-0.49a99.29,99.29 0,0 0,-26.95 3.71c-9.98,-9.44 -21.92,-16.83 -35.32,-21.43 -2.23,-0.73 -4.45,-1.37 -6.65,-1.96 10.54,-21.32 18.18,-44.51 21.98,-69.26 8.26,-53.24 -1.15,-106.25 -27.18,-153.33 -5.7,-10.31 -18.69,-14.07 -29.02,-8.36 -10.31,5.71 -14.05,18.7 -8.35,29.02 21.41,38.71 29.14,82.34 22.35,126.13 -4.3,27.64 -14.22,52.92 -28.34,75.1 -1.27,0.3 -2.6,0.43 -3.85,0.78 -8.78,-8.07 -19.31,-14.72 -31.37,-19.78 -9.2,-4.9 -19.5,-7.45 -29.99,-7.45h-2.16c0,-27.51 0,-53.6 -0.03,-74.53 0,-52.01 -34.53,-92.43 -85.95,-100.51a92.3,92.3 0,0 0,-14.37 -1.15c-50.27,0 -94.47,40.42 -98.51,90.09 -0.48,6.38 -0.48,11.74 -0.48,16.05v162.58c-19.94,-11.45 -37.93,-26.28 -52.95,-44.22 -7.55,-9.04 -21,-10.25 -30.08,-2.68 -9.03,7.57 -10.23,21.04 -2.68,30.1 10.42,12.44 22.1,23.59 34.63,33.57 -25.95,6.62 -48.7,23.19 -62.88,46.41 -0.55,0.9 -0.97,1.84 -1.49,2.75 -64.79,-58.6 -105.57,-143.19 -105.57,-237.41zM831.09,785.7c-0.07,14.72 -1.46,29.65 -3.99,44.21 -10.98,64.43 -59.79,112.68 -124.43,123.82 -10.16,1.72 -20.44,3.24 -30.65,4.9h-43.4c-11.63,-1.72 -23.37,-2.94 -34.97,-5 -53.34,-9.73 -96.64,-35.58 -127.02,-81.08 -37.67,-56.37 -74.81,-112.96 -111.96,-169.6 -3.14,-4.78 -5.38,-10.33 -7.01,-15.82 -6.95,-23.93 7.16,-48.66 30.71,-53.22 3.42,-0.64 6.74,-0.99 9.89,-0.99 14.31,0 26.51,6.47 35.85,18.57 15.57,20.13 30.29,40.92 45.36,61.42a369.92,369.92 0,0 0,4.84 6.52c0.39,-0.17 0.82,-0.3 1.22,-0.49v-5.75,-320.07c0,-3.64 0,-7.24 0.28,-10.87 1.38,-16.89 17.86,-31.19 34.66,-31.19 1.45,0 2.96,0.12 4.43,0.36 19.88,3.13 31.84,16.94 31.84,37.27 0.05,56.97 0,152.32 0.08,209.34 0,2.96 0.19,6.06 1.06,8.86 1.46,4.61 4.94,7.08 9.88,7.46h1.05c4.72,0 8.2,-2.36 10.06,-6.59 1.19,-2.62 1.26,-5.83 1.26,-8.82 0,-19.61 -0.05,-25.79 -0.05,-25.79l-0.07,18.23c0,-0.06 0,-6.3 0.05,-25.8 0,-12.88 4.32,-24.08 15.27,-31.69 4.03,-2.75 8.83,-4.47 13.26,-6.64h14.39c0.51,0.37 0.92,0.84 1.47,1.04 18.72,6.44 27.42,18.58 27.42,38.26 -0.06,19.31 -0.06,25.46 -0.06,25.46l-0.02,-18.79v25.49c0,1.84 -0.06,3.62 0.13,5.4 0.78,6.15 5.51,10.23 11.48,10.23 0.39,0 0.74,0 1.12,-0.02 6.31,-0.57 9.92,-4.88 10.36,-12.68v-0.19c0.03,-0.47 0.03,-0.96 0.03,-1.43v-12.12c0.28,-8.39 2.34,-16.3 7.74,-23.13 7.09,-8.99 17.41,-13.88 28.18,-13.88 3.91,0 7.88,0.65 11.73,1.95 14.79,5.1 24.25,19.45 24.25,36.59 -0.02,19.31 -0.05,25.48 -0.05,25.48 -0.01,0 -0.05,-18.81 -0.07,-18.81 0,0 -0.01,6.15 -0.01,25.5 0,2.2 0,4.43 0.23,6.61 0.71,5.8 4.47,8.8 9.86,9.86a7.59,7.59 0,0 0,1.68 0.16c4.26,0 8.79,-2.97 10.23,-7.24 0.92,-2.77 1.18,-5.86 1.18,-8.86 0,-2.62 0,-4.88 0.01,-6.77v12.98c0.07,0 0.11,-3.89 0.15,-15.16 0.07,-6.25 1.2,-12.92 3.67,-18.63 5.64,-12.79 18.6,-20.52 31.96,-20.52 2.47,0 4.9,0.29 7.36,0.82 17.32,3.79 28.26,18.49 28.26,37.52 -0.06,103.54 0.1,69.78 -0.22,173.33z" /> diff --git a/app/src/main/res/drawable/ic_collection.xml b/app/src/main/res/drawable/ic_collection.xml index ce1a8a2..4d2016b 100644 --- a/app/src/main/res/drawable/ic_collection.xml +++ b/app/src/main/res/drawable/ic_collection.xml @@ -5,8 +5,5 @@ android:viewportHeight="1024"> - + android:pathData="M139.64,930.91 L512,774.48 884.36,930.91 884.36,93.09 139.64,93.09 139.64,930.91ZM79.79,93.09C79.79,60.04 106.59,33.25 139.64,33.25L884.36,33.25C917.41,33.25 944.21,60.04 944.21,93.09L944.21,930.91C944.21,973.69 900.62,1002.65 861.18,986.08L488.82,829.65 535.18,829.65 162.81,986.08C123.38,1002.65 79.79,973.69 79.79,930.91L79.79,93.09ZM512,606.67 L628.8,659.86C652.63,670.7 668.89,658.58 665.59,632.98L649.71,509.73 738.03,418.34C755.56,400.2 749.98,381.09 724.83,376.4L597.09,352.58 534.8,243.1C522.43,221.36 501.6,221.3 488.77,243.84L426.98,352.4 299.23,376.26C274.26,380.93 268.17,399.75 286.02,418.22L374.29,509.61 358.41,632.86C355.12,658.41 371.59,670.5 395.2,659.77L512,606.67ZM536.77,661.15 L419.97,714.25C353.79,744.33 289.76,697.43 299.06,625.22L314.93,501.96 331.24,551.18 242.98,459.8C192.09,407.12 216.3,330.88 288.24,317.44L415.99,293.57 374.97,322.79 436.76,214.24C472.3,151.8 551.26,151 586.82,213.51L649.1,322.98 608.06,293.75 735.8,317.57C808.03,331.04 831.6,407.64 781.06,459.93L692.74,551.31 709.07,502.08 724.94,625.34C734.25,697.6 670.4,744.55 604,714.32L487.2,661.14 536.77,661.15Z" /> diff --git a/app/src/main/res/drawable/ic_help.xml b/app/src/main/res/drawable/ic_help.xml index 3835c32..cf1f741 100644 --- a/app/src/main/res/drawable/ic_help.xml +++ b/app/src/main/res/drawable/ic_help.xml @@ -5,11 +5,5 @@ android:viewportHeight="1024"> - - + android:pathData="M860.2,64.2L264,64.2c-110.5,0 -200,89.5 -200,200v538.9c-0.3,3.7 -0.4,7.4 -0.4,11.1h0.5C66.6,895 132.8,959.6 214,959.6h646.2c55.2,0 100,-44.8 100,-100L960.2,164.2c0,-55.2 -44.8,-100 -100,-100zM499.4,473.4l-58.7,-52.1c-0.1,-0.1 -0.2,-0.1 -0.2,-0.2 -0.3,-0.3 -0.7,-0.6 -1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.4,-0.3 -0.7,-0.5 -1.1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.3,-0.2 -0.7,-0.5 -1.1,-0.7 -0.2,-0.1 -0.3,-0.2 -0.5,-0.3 -0.3,-0.2 -0.7,-0.4 -1,-0.6l-0.6,-0.3c-0.3,-0.2 -0.6,-0.3 -0.9,-0.5 -0.2,-0.1 -0.5,-0.3 -0.7,-0.4 -0.3,-0.1 -0.5,-0.3 -0.8,-0.4 -0.3,-0.1 -0.6,-0.3 -0.9,-0.4 -0.2,-0.1 -0.4,-0.2 -0.7,-0.3 -0.3,-0.1 -0.7,-0.3 -1,-0.4 -0.2,-0.1 -0.4,-0.1 -0.6,-0.2 -0.4,-0.1 -0.7,-0.3 -1.1,-0.4 -0.2,-0.1 -0.3,-0.1 -0.5,-0.2l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.2 -1.2,-0.2 -0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.1 -1.2,-0.2 -0.2,0 -0.4,0 -0.6,-0.1 -0.4,0 -0.7,-0.1 -1.1,-0.1h-5.1c-0.3,0 -0.7,0.1 -1,0.1 -0.2,0 -0.4,0 -0.7,0.1 -0.4,0 -0.7,0.1 -1.1,0.1 -0.2,0 -0.4,0.1 -0.6,0.1 -0.4,0.1 -0.8,0.1 -1.2,0.2 -0.2,0 -0.4,0.1 -0.5,0.1l-1.2,0.3c-0.2,0 -0.4,0.1 -0.5,0.1 -0.4,0.1 -0.7,0.2 -1.1,0.3 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.4,0.1 -0.7,0.2 -1,0.4 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.3,0.1 -0.6,0.2 -0.9,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.1 -0.5,0.2 -0.8,0.4 -0.3,0.1 -0.6,0.3 -0.8,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.2 -0.6,0.3 -1,0.5 -0.2,0.1 -0.4,0.2 -0.5,0.3 -0.4,0.2 -0.7,0.4 -1,0.6 -0.1,0.1 -0.3,0.2 -0.4,0.3 -0.4,0.2 -0.7,0.5 -1.1,0.7 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.4,0.3 -0.7,0.5 -1.1,0.8 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.3,0.3 -0.7,0.6 -1,0.9 -0.1,0.1 -0.2,0.1 -0.2,0.2L332.7,474L332.7,136.2h166.7v337.2zM173.5,173.7c23.4,-23.4 54.2,-36.6 87.2,-37.4L260.7,555.7c0,0.3 0,0.7 0.1,1 0,0.3 0.1,0.5 0.1,0.8 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8l0.3,0.9c0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.4,0.8 0.1,0.3 0.2,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.2,0.3 0.3,0.5 0.5,0.8 0.1,0.2 0.3,0.5 0.5,0.7 0.2,0.3 0.4,0.5 0.5,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.4,0.5 0.6,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.5,0.6 0.7,0.8l0.3,0.3 0.2,0.2c0.3,0.3 0.6,0.6 0.8,0.9l0.5,0.5 0.8,0.8c0.9,0.9 1.9,1.7 2.9,2.5 0.1,0.1 0.3,0.2 0.4,0.3 0.3,0.2 0.7,0.5 1,0.7 0.2,0.1 0.3,0.2 0.5,0.4 0.3,0.2 0.6,0.4 1,0.6 0.2,0.1 0.4,0.3 0.6,0.4 0.3,0.2 0.6,0.4 0.9,0.5 0.2,0.1 0.5,0.3 0.7,0.4 0.3,0.1 0.5,0.3 0.8,0.4 0.3,0.1 0.6,0.3 0.9,0.4 0.2,0.1 0.5,0.2 0.7,0.3 0.4,0.2 0.7,0.3 1.1,0.5 0.2,0.1 0.4,0.1 0.5,0.2 0.5,0.2 0.9,0.3 1.4,0.5 0.1,0 0.2,0.1 0.3,0.1 0.6,0.2 1.1,0.3 1.7,0.5h0.1c3,0.8 6.1,1.2 9.3,1.2h2.3c0.4,0 0.8,-0.1 1.1,-0.1 0.2,0 0.5,-0.1 0.7,-0.1 0.3,0 0.7,-0.1 1,-0.1 0.3,0 0.5,-0.1 0.8,-0.1 0.3,0 0.6,-0.1 0.9,-0.2 0.3,0 0.5,-0.1 0.8,-0.2 0.3,-0.1 0.6,-0.1 0.9,-0.2 0.3,-0.1 0.5,-0.1 0.8,-0.2l0.9,-0.3c0.2,-0.1 0.5,-0.1 0.7,-0.2 0.4,-0.1 0.7,-0.2 1.1,-0.4 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.5,-0.2 1,-0.4 1.6,-0.6 0.1,0 0.2,-0.1 0.3,-0.1 0.4,-0.2 0.9,-0.4 1.3,-0.6 0.2,-0.1 0.3,-0.2 0.5,-0.2 0.4,-0.2 0.7,-0.4 1,-0.5 0.2,-0.1 0.4,-0.2 0.5,-0.3 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.3 0.8,-0.5 0.2,-0.1 0.4,-0.3 0.6,-0.4 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.4,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.4 0.7,-0.6 0.1,-0.1 0.3,-0.2 0.4,-0.3l96.2,-84.3 94.9,84.1c0.2,0.1 0.3,0.3 0.5,0.4 0.2,0.2 0.4,0.4 0.7,0.6 0.2,0.2 0.5,0.4 0.7,0.5 0.2,0.2 0.4,0.3 0.7,0.5 0.3,0.2 0.5,0.4 0.8,0.6 0.2,0.1 0.4,0.3 0.6,0.4l0.9,0.6c0.2,0.1 0.3,0.2 0.5,0.3 0.4,0.2 0.7,0.4 1.1,0.6 0.1,0.1 0.2,0.1 0.3,0.2 0.5,0.3 1,0.5 1.5,0.8 0.5,0.3 1,0.5 1.6,0.7 0.1,0 0.2,0.1 0.2,0.1 0.4,0.2 0.9,0.4 1.3,0.5 0.2,0.1 0.4,0.1 0.6,0.2 0.3,0.1 0.7,0.2 1,0.3 0.2,0.1 0.5,0.1 0.7,0.2l0.9,0.3c0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0 0.5,0.1 0.8,0.1 0.3,0 0.7,0.1 1,0.1 0.2,0 0.5,0.1 0.7,0.1 0.4,0 0.8,0.1 1.1,0.1h2.3c3.8,0 7.5,-0.6 11,-1.7 0.1,0 0.2,-0.1 0.2,-0.1 0.5,-0.2 1,-0.3 1.5,-0.5 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.4,-0.2 0.8,-0.3 1.1,-0.5 0.2,-0.1 0.5,-0.2 0.7,-0.3 0.3,-0.1 0.6,-0.3 0.9,-0.4 0.3,-0.1 0.6,-0.3 0.8,-0.4 0.2,-0.1 0.5,-0.3 0.7,-0.4 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.4 1,-0.6 0.2,-0.1 0.4,-0.2 0.5,-0.4 0.3,-0.2 0.6,-0.4 1,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.3,-0.2 0.6,-0.5 0.9,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.4,-0.3 0.7,-0.6 1.1,-1 0.4,-0.3 0.7,-0.7 1,-1 0.1,-0.1 0.3,-0.3 0.4,-0.5l0.9,-0.9 0.1,-0.1c0.1,-0.1 0.2,-0.3 0.4,-0.4 0.2,-0.3 0.5,-0.5 0.7,-0.8 0.2,-0.2 0.3,-0.4 0.5,-0.6 0.2,-0.3 0.4,-0.5 0.6,-0.8 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.2 0.2,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8l0.3,-0.9c0.1,-0.3 0.2,-0.5 0.2,-0.8 0.1,-0.3 0.2,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.5 0.2,-0.8 0.1,-0.3 0.1,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.6 0.2,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.5 0.1,-0.8 0,-0.3 0.1,-0.7 0.1,-1v-0.8,-1.1 -417.9h288.8c15.4,0 28,12.6 28,28v504L209.7,668.2c-26.9,0 -52,7.3 -73.7,20v-424c0,-34.2 13.3,-66.3 37.5,-90.5zM860.2,887.6L214,887.6c-43,0 -78,-35 -78,-78v-3.1c3.9,-37.2 35.5,-66.2 73.7,-66.2h678.5v119.3c0,15.4 -12.6,28 -28,28z" /> diff --git a/app/src/main/res/drawable/ic_overtime.xml b/app/src/main/res/drawable/ic_overtime.xml new file mode 100644 index 0000000..6916eca --- /dev/null +++ b/app/src/main/res/drawable/ic_overtime.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_privacy.xml b/app/src/main/res/drawable/ic_privacy.xml index 22ef981..92d2699 100644 --- a/app/src/main/res/drawable/ic_privacy.xml +++ b/app/src/main/res/drawable/ic_privacy.xml @@ -5,5 +5,8 @@ android:viewportHeight="1024"> + android:pathData="M615.51,402.9a34.13,34.13 0,0 1,51.16 45.08l-2.18,2.45 -149.61,154.15a34.13,34.13 0,0 1,-44.07 4.18l-2.65,-2.05 -106.41,-91.39a34.13,34.13 0,0 1,41.9 -53.8l2.6,2.01 82.01,70.46 127.25,-131.09z" /> + diff --git a/app/src/main/res/drawable/ic_push_setting.xml b/app/src/main/res/drawable/ic_push_setting.xml index 69e0c3f..c03f19f 100644 --- a/app/src/main/res/drawable/ic_push_setting.xml +++ b/app/src/main/res/drawable/ic_push_setting.xml @@ -5,30 +5,5 @@ android:viewportHeight="1024"> - + android:pathData="M932.6,832L432.8,832c-9.4,0 -18.4,-4.4 -24,-12 -5.6,-7.6 -7.4,-17.4 -4.8,-26.4l24.4,-84.4c0.4,-1.2 0.8,-2.4 1.4,-3.6 1.6,-3.6 2.4,-7.4 2.4,-11.4L432.2,480.8c0,-137.8 112.2,-250 250,-250 138.4,0 251,112.2 251,250v213.4c0,4 0.8,7.8 2.4,11.4 0.6,1.2 1,2.4 1.4,3.6l24.4,84.4c2.6,9 0.8,18.8 -4.8,26.4 -5.8,7.6 -14.6,12 -24,12zM472.6,772h420l-12.8,-44.4c-4.4,-10.6 -6.6,-21.8 -6.6,-33.4L873.2,480.8c0,-104.8 -85.6,-190 -191,-190 -104.8,0 -190.2,85.2 -190.2,190v213.4c0,11.6 -2.2,22.8 -6.6,33.4l-12.8,44.4zM833.4,507.6c0,-104 -58.2,-176.8 -141.4,-176.8 -16.6,0 -30,13.4 -30,30s13.4,30 30,30c64.2,0 81.4,73.4 81.4,116.8 0,16.6 13.4,30 30,30s30,-13.4 30,-30zM785.8,895c0,-16.6 -13.4,-30 -30,-30h-146.2c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h146.2c16.6,0 30,-13.4 30,-30zM364.6,923.6c0,-16.6 -13.4,-30 -30,-30L180.4,893.6c-32.4,0 -58.8,-26.4 -58.8,-58.8L121.6,189.2c0,-32.4 26.4,-58.8 58.8,-58.8h514.8c32.4,0 58.8,26.4 58.8,58.8 0,16.6 13.4,30 30,30s30,-13.4 30,-30c0,-65.6 -53.4,-118.8 -118.8,-118.8L180.4,70.4c-65.6,0 -118.8,53.4 -118.8,118.8v645.4c0,65.6 53.4,118.8 118.8,118.8h154.2c16.6,0.2 30,-13.2 30,-29.8zM354.4,327.2c0,-16.6 -13.4,-30 -30,-30h-104.2c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h104.2c16.6,0 30,-13.4 30,-30zM317.6,492.6c0,-16.6 -13.4,-30 -30,-30h-67.4c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h67.4c16.6,0 30,-13.4 30,-30zM334,658c0,-16.6 -13.4,-30 -30,-30h-83.8c-16.6,0 -30,13.4 -30,30s13.4,30 30,30L304,688c16.4,0 30,-13.4 30,-30z" /> diff --git a/app/src/main/res/drawable/ic_total_sample.xml b/app/src/main/res/drawable/ic_total_sample.xml new file mode 100644 index 0000000..6bad12a --- /dev/null +++ b/app/src/main/res/drawable/ic_total_sample.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_total_verify.xml b/app/src/main/res/drawable/ic_total_verify.xml new file mode 100644 index 0000000..4ff7f08 --- /dev/null +++ b/app/src/main/res/drawable/ic_total_verify.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt new file mode 100644 index 0000000..621d5d4 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt @@ -0,0 +1,18 @@ +package com.casic.xz.meterage.adapter + +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager +import androidx.fragment.app.FragmentPagerAdapter + +class SubViewPagerAdapter( + manager: FragmentManager, + private val pages: ArrayList, + private val titles: Array +) : FragmentPagerAdapter(manager) { + + override fun getItem(position: Int): Fragment = pages[position] + + override fun getCount(): Int = pages.size + + override fun getPageTitle(position: Int): CharSequence = titles[position] +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index f54f94a..afa0759 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,11 +1,32 @@ package com.casic.xz.meterage.fragment +import androidx.fragment.app.Fragment import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.SubViewPagerAdapter +import com.casic.xz.meterage.fragment.sample.FutureTaskFragment +import com.casic.xz.meterage.fragment.sample.TotalTaskFragment +import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_sample.* -class SamplePageFragment : KotlinBaseFragment(){ +class SamplePageFragment : KotlinBaseFragment() { + + private var fragmentPages: ArrayList = ArrayList() + + init { + fragmentPages.add(UnderTaskFragment()) + fragmentPages.add(FutureTaskFragment()) + fragmentPages.add(TotalTaskFragment()) + } + override fun initData() { + val samplePageTitles = arrayOf("检定中 0", "预期任务 0", "全部 0") + sampleViewPager.adapter = SubViewPagerAdapter( + childFragmentManager, fragmentPages, samplePageTitles + ) + //绑定 + topTabLayout.setupWithViewPager(sampleViewPager) } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt new file mode 100644 index 0000000..ebad65f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.sample + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class FutureTaskFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_future_task + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/sample/TotalTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/sample/TotalTaskFragment.kt new file mode 100644 index 0000000..1968ed2 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/sample/TotalTaskFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.sample + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TotalTaskFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_total_task + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/sample/UnderTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/sample/UnderTaskFragment.kt new file mode 100644 index 0000000..da5c3f3 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/sample/UnderTaskFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.sample + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class UnderTaskFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_under_task + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml index b41f4ac..c7546e4 100644 --- a/app/src/main/res/drawable/ic_about.xml +++ b/app/src/main/res/drawable/ic_about.xml @@ -5,8 +5,5 @@ android:viewportHeight="1024"> - + android:pathData="M300.93,453.16c11.5,-2.59 18.74,-14.02 16.15,-25.53 -5.44,-24.16 -6.26,-48.98 -2.43,-73.71C331.33,245.86 432.8,171.54 540.95,188.29c25.5,3.94 49.54,12.59 71.42,25.7 10.16,6.07 23.24,2.77 29.3,-7.34 6.05,-10.13 2.75,-23.24 -7.36,-29.3 -26.66,-15.95 -55.88,-26.48 -86.84,-31.26 -131.27,-20.32 -254.74,69.98 -275.07,201.33 -4.62,30.06 -3.62,60.2 2.99,89.59 2.23,9.95 11.05,16.69 20.82,16.69 1.57,-0.01 3.14,-0.2 4.72,-0.53zM895.38,612.43c0,-30.54 -11.99,-57.46 -32.14,-76.09 20.22,-46.71 31.58,-98.08 31.58,-152.1C894.82,172.37 722.46,0 510.61,0 298.75,0 126.38,172.37 126.38,384.24c0,126.89 61.98,239.39 157.13,309.4a106.69,106.69 0,0 0,2.64 11.4c3.62,12.37 8.62,23.45 14.94,33.05 34.45,52.54 73.5,112.04 112.24,170.06 39.24,58.74 96.04,95.27 168.8,108.56 9.16,1.61 17.54,2.71 25.63,3.74 3.89,0.52 7.78,1.03 11.64,1.58 3.05,0.45 6.14,0.65 9.22,0.65h43.39c3.41,0 6.83,-0.23 10.21,-0.82 3.82,-0.62 7.63,-1.21 11.49,-1.8a2627.42,2627.42 0,0 0,19.7 -3.15c91.92,-15.87 161.29,-85 176.84,-176.22 3.18,-18.23 4.83,-36.71 4.9,-54.77 0.22,-68.46 0.22,-77.04 0.2,-104.73 0,-14.2 0,-33.52 0.02,-68.75zM190.45,384.23c0,-176.85 143.35,-320.17 320.16,-320.17s320.16,143.32 320.16,320.17c0,44.88 -9.4,87.5 -26.09,126.26 -3,-0.29 -5.99,-0.49 -9,-0.49a99.29,99.29 0,0 0,-26.95 3.71c-9.98,-9.44 -21.92,-16.83 -35.32,-21.43 -2.23,-0.73 -4.45,-1.37 -6.65,-1.96 10.54,-21.32 18.18,-44.51 21.98,-69.26 8.26,-53.24 -1.15,-106.25 -27.18,-153.33 -5.7,-10.31 -18.69,-14.07 -29.02,-8.36 -10.31,5.71 -14.05,18.7 -8.35,29.02 21.41,38.71 29.14,82.34 22.35,126.13 -4.3,27.64 -14.22,52.92 -28.34,75.1 -1.27,0.3 -2.6,0.43 -3.85,0.78 -8.78,-8.07 -19.31,-14.72 -31.37,-19.78 -9.2,-4.9 -19.5,-7.45 -29.99,-7.45h-2.16c0,-27.51 0,-53.6 -0.03,-74.53 0,-52.01 -34.53,-92.43 -85.95,-100.51a92.3,92.3 0,0 0,-14.37 -1.15c-50.27,0 -94.47,40.42 -98.51,90.09 -0.48,6.38 -0.48,11.74 -0.48,16.05v162.58c-19.94,-11.45 -37.93,-26.28 -52.95,-44.22 -7.55,-9.04 -21,-10.25 -30.08,-2.68 -9.03,7.57 -10.23,21.04 -2.68,30.1 10.42,12.44 22.1,23.59 34.63,33.57 -25.95,6.62 -48.7,23.19 -62.88,46.41 -0.55,0.9 -0.97,1.84 -1.49,2.75 -64.79,-58.6 -105.57,-143.19 -105.57,-237.41zM831.09,785.7c-0.07,14.72 -1.46,29.65 -3.99,44.21 -10.98,64.43 -59.79,112.68 -124.43,123.82 -10.16,1.72 -20.44,3.24 -30.65,4.9h-43.4c-11.63,-1.72 -23.37,-2.94 -34.97,-5 -53.34,-9.73 -96.64,-35.58 -127.02,-81.08 -37.67,-56.37 -74.81,-112.96 -111.96,-169.6 -3.14,-4.78 -5.38,-10.33 -7.01,-15.82 -6.95,-23.93 7.16,-48.66 30.71,-53.22 3.42,-0.64 6.74,-0.99 9.89,-0.99 14.31,0 26.51,6.47 35.85,18.57 15.57,20.13 30.29,40.92 45.36,61.42a369.92,369.92 0,0 0,4.84 6.52c0.39,-0.17 0.82,-0.3 1.22,-0.49v-5.75,-320.07c0,-3.64 0,-7.24 0.28,-10.87 1.38,-16.89 17.86,-31.19 34.66,-31.19 1.45,0 2.96,0.12 4.43,0.36 19.88,3.13 31.84,16.94 31.84,37.27 0.05,56.97 0,152.32 0.08,209.34 0,2.96 0.19,6.06 1.06,8.86 1.46,4.61 4.94,7.08 9.88,7.46h1.05c4.72,0 8.2,-2.36 10.06,-6.59 1.19,-2.62 1.26,-5.83 1.26,-8.82 0,-19.61 -0.05,-25.79 -0.05,-25.79l-0.07,18.23c0,-0.06 0,-6.3 0.05,-25.8 0,-12.88 4.32,-24.08 15.27,-31.69 4.03,-2.75 8.83,-4.47 13.26,-6.64h14.39c0.51,0.37 0.92,0.84 1.47,1.04 18.72,6.44 27.42,18.58 27.42,38.26 -0.06,19.31 -0.06,25.46 -0.06,25.46l-0.02,-18.79v25.49c0,1.84 -0.06,3.62 0.13,5.4 0.78,6.15 5.51,10.23 11.48,10.23 0.39,0 0.74,0 1.12,-0.02 6.31,-0.57 9.92,-4.88 10.36,-12.68v-0.19c0.03,-0.47 0.03,-0.96 0.03,-1.43v-12.12c0.28,-8.39 2.34,-16.3 7.74,-23.13 7.09,-8.99 17.41,-13.88 28.18,-13.88 3.91,0 7.88,0.65 11.73,1.95 14.79,5.1 24.25,19.45 24.25,36.59 -0.02,19.31 -0.05,25.48 -0.05,25.48 -0.01,0 -0.05,-18.81 -0.07,-18.81 0,0 -0.01,6.15 -0.01,25.5 0,2.2 0,4.43 0.23,6.61 0.71,5.8 4.47,8.8 9.86,9.86a7.59,7.59 0,0 0,1.68 0.16c4.26,0 8.79,-2.97 10.23,-7.24 0.92,-2.77 1.18,-5.86 1.18,-8.86 0,-2.62 0,-4.88 0.01,-6.77v12.98c0.07,0 0.11,-3.89 0.15,-15.16 0.07,-6.25 1.2,-12.92 3.67,-18.63 5.64,-12.79 18.6,-20.52 31.96,-20.52 2.47,0 4.9,0.29 7.36,0.82 17.32,3.79 28.26,18.49 28.26,37.52 -0.06,103.54 0.1,69.78 -0.22,173.33z" /> diff --git a/app/src/main/res/drawable/ic_collection.xml b/app/src/main/res/drawable/ic_collection.xml index ce1a8a2..4d2016b 100644 --- a/app/src/main/res/drawable/ic_collection.xml +++ b/app/src/main/res/drawable/ic_collection.xml @@ -5,8 +5,5 @@ android:viewportHeight="1024"> - + android:pathData="M139.64,930.91 L512,774.48 884.36,930.91 884.36,93.09 139.64,93.09 139.64,930.91ZM79.79,93.09C79.79,60.04 106.59,33.25 139.64,33.25L884.36,33.25C917.41,33.25 944.21,60.04 944.21,93.09L944.21,930.91C944.21,973.69 900.62,1002.65 861.18,986.08L488.82,829.65 535.18,829.65 162.81,986.08C123.38,1002.65 79.79,973.69 79.79,930.91L79.79,93.09ZM512,606.67 L628.8,659.86C652.63,670.7 668.89,658.58 665.59,632.98L649.71,509.73 738.03,418.34C755.56,400.2 749.98,381.09 724.83,376.4L597.09,352.58 534.8,243.1C522.43,221.36 501.6,221.3 488.77,243.84L426.98,352.4 299.23,376.26C274.26,380.93 268.17,399.75 286.02,418.22L374.29,509.61 358.41,632.86C355.12,658.41 371.59,670.5 395.2,659.77L512,606.67ZM536.77,661.15 L419.97,714.25C353.79,744.33 289.76,697.43 299.06,625.22L314.93,501.96 331.24,551.18 242.98,459.8C192.09,407.12 216.3,330.88 288.24,317.44L415.99,293.57 374.97,322.79 436.76,214.24C472.3,151.8 551.26,151 586.82,213.51L649.1,322.98 608.06,293.75 735.8,317.57C808.03,331.04 831.6,407.64 781.06,459.93L692.74,551.31 709.07,502.08 724.94,625.34C734.25,697.6 670.4,744.55 604,714.32L487.2,661.14 536.77,661.15Z" /> diff --git a/app/src/main/res/drawable/ic_help.xml b/app/src/main/res/drawable/ic_help.xml index 3835c32..cf1f741 100644 --- a/app/src/main/res/drawable/ic_help.xml +++ b/app/src/main/res/drawable/ic_help.xml @@ -5,11 +5,5 @@ android:viewportHeight="1024"> - - + android:pathData="M860.2,64.2L264,64.2c-110.5,0 -200,89.5 -200,200v538.9c-0.3,3.7 -0.4,7.4 -0.4,11.1h0.5C66.6,895 132.8,959.6 214,959.6h646.2c55.2,0 100,-44.8 100,-100L960.2,164.2c0,-55.2 -44.8,-100 -100,-100zM499.4,473.4l-58.7,-52.1c-0.1,-0.1 -0.2,-0.1 -0.2,-0.2 -0.3,-0.3 -0.7,-0.6 -1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.4,-0.3 -0.7,-0.5 -1.1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.3,-0.2 -0.7,-0.5 -1.1,-0.7 -0.2,-0.1 -0.3,-0.2 -0.5,-0.3 -0.3,-0.2 -0.7,-0.4 -1,-0.6l-0.6,-0.3c-0.3,-0.2 -0.6,-0.3 -0.9,-0.5 -0.2,-0.1 -0.5,-0.3 -0.7,-0.4 -0.3,-0.1 -0.5,-0.3 -0.8,-0.4 -0.3,-0.1 -0.6,-0.3 -0.9,-0.4 -0.2,-0.1 -0.4,-0.2 -0.7,-0.3 -0.3,-0.1 -0.7,-0.3 -1,-0.4 -0.2,-0.1 -0.4,-0.1 -0.6,-0.2 -0.4,-0.1 -0.7,-0.3 -1.1,-0.4 -0.2,-0.1 -0.3,-0.1 -0.5,-0.2l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.2 -1.2,-0.2 -0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.1 -1.2,-0.2 -0.2,0 -0.4,0 -0.6,-0.1 -0.4,0 -0.7,-0.1 -1.1,-0.1h-5.1c-0.3,0 -0.7,0.1 -1,0.1 -0.2,0 -0.4,0 -0.7,0.1 -0.4,0 -0.7,0.1 -1.1,0.1 -0.2,0 -0.4,0.1 -0.6,0.1 -0.4,0.1 -0.8,0.1 -1.2,0.2 -0.2,0 -0.4,0.1 -0.5,0.1l-1.2,0.3c-0.2,0 -0.4,0.1 -0.5,0.1 -0.4,0.1 -0.7,0.2 -1.1,0.3 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.4,0.1 -0.7,0.2 -1,0.4 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.3,0.1 -0.6,0.2 -0.9,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.1 -0.5,0.2 -0.8,0.4 -0.3,0.1 -0.6,0.3 -0.8,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.2 -0.6,0.3 -1,0.5 -0.2,0.1 -0.4,0.2 -0.5,0.3 -0.4,0.2 -0.7,0.4 -1,0.6 -0.1,0.1 -0.3,0.2 -0.4,0.3 -0.4,0.2 -0.7,0.5 -1.1,0.7 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.4,0.3 -0.7,0.5 -1.1,0.8 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.3,0.3 -0.7,0.6 -1,0.9 -0.1,0.1 -0.2,0.1 -0.2,0.2L332.7,474L332.7,136.2h166.7v337.2zM173.5,173.7c23.4,-23.4 54.2,-36.6 87.2,-37.4L260.7,555.7c0,0.3 0,0.7 0.1,1 0,0.3 0.1,0.5 0.1,0.8 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8l0.3,0.9c0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.4,0.8 0.1,0.3 0.2,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.2,0.3 0.3,0.5 0.5,0.8 0.1,0.2 0.3,0.5 0.5,0.7 0.2,0.3 0.4,0.5 0.5,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.4,0.5 0.6,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.5,0.6 0.7,0.8l0.3,0.3 0.2,0.2c0.3,0.3 0.6,0.6 0.8,0.9l0.5,0.5 0.8,0.8c0.9,0.9 1.9,1.7 2.9,2.5 0.1,0.1 0.3,0.2 0.4,0.3 0.3,0.2 0.7,0.5 1,0.7 0.2,0.1 0.3,0.2 0.5,0.4 0.3,0.2 0.6,0.4 1,0.6 0.2,0.1 0.4,0.3 0.6,0.4 0.3,0.2 0.6,0.4 0.9,0.5 0.2,0.1 0.5,0.3 0.7,0.4 0.3,0.1 0.5,0.3 0.8,0.4 0.3,0.1 0.6,0.3 0.9,0.4 0.2,0.1 0.5,0.2 0.7,0.3 0.4,0.2 0.7,0.3 1.1,0.5 0.2,0.1 0.4,0.1 0.5,0.2 0.5,0.2 0.9,0.3 1.4,0.5 0.1,0 0.2,0.1 0.3,0.1 0.6,0.2 1.1,0.3 1.7,0.5h0.1c3,0.8 6.1,1.2 9.3,1.2h2.3c0.4,0 0.8,-0.1 1.1,-0.1 0.2,0 0.5,-0.1 0.7,-0.1 0.3,0 0.7,-0.1 1,-0.1 0.3,0 0.5,-0.1 0.8,-0.1 0.3,0 0.6,-0.1 0.9,-0.2 0.3,0 0.5,-0.1 0.8,-0.2 0.3,-0.1 0.6,-0.1 0.9,-0.2 0.3,-0.1 0.5,-0.1 0.8,-0.2l0.9,-0.3c0.2,-0.1 0.5,-0.1 0.7,-0.2 0.4,-0.1 0.7,-0.2 1.1,-0.4 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.5,-0.2 1,-0.4 1.6,-0.6 0.1,0 0.2,-0.1 0.3,-0.1 0.4,-0.2 0.9,-0.4 1.3,-0.6 0.2,-0.1 0.3,-0.2 0.5,-0.2 0.4,-0.2 0.7,-0.4 1,-0.5 0.2,-0.1 0.4,-0.2 0.5,-0.3 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.3 0.8,-0.5 0.2,-0.1 0.4,-0.3 0.6,-0.4 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.4,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.4 0.7,-0.6 0.1,-0.1 0.3,-0.2 0.4,-0.3l96.2,-84.3 94.9,84.1c0.2,0.1 0.3,0.3 0.5,0.4 0.2,0.2 0.4,0.4 0.7,0.6 0.2,0.2 0.5,0.4 0.7,0.5 0.2,0.2 0.4,0.3 0.7,0.5 0.3,0.2 0.5,0.4 0.8,0.6 0.2,0.1 0.4,0.3 0.6,0.4l0.9,0.6c0.2,0.1 0.3,0.2 0.5,0.3 0.4,0.2 0.7,0.4 1.1,0.6 0.1,0.1 0.2,0.1 0.3,0.2 0.5,0.3 1,0.5 1.5,0.8 0.5,0.3 1,0.5 1.6,0.7 0.1,0 0.2,0.1 0.2,0.1 0.4,0.2 0.9,0.4 1.3,0.5 0.2,0.1 0.4,0.1 0.6,0.2 0.3,0.1 0.7,0.2 1,0.3 0.2,0.1 0.5,0.1 0.7,0.2l0.9,0.3c0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0 0.5,0.1 0.8,0.1 0.3,0 0.7,0.1 1,0.1 0.2,0 0.5,0.1 0.7,0.1 0.4,0 0.8,0.1 1.1,0.1h2.3c3.8,0 7.5,-0.6 11,-1.7 0.1,0 0.2,-0.1 0.2,-0.1 0.5,-0.2 1,-0.3 1.5,-0.5 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.4,-0.2 0.8,-0.3 1.1,-0.5 0.2,-0.1 0.5,-0.2 0.7,-0.3 0.3,-0.1 0.6,-0.3 0.9,-0.4 0.3,-0.1 0.6,-0.3 0.8,-0.4 0.2,-0.1 0.5,-0.3 0.7,-0.4 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.4 1,-0.6 0.2,-0.1 0.4,-0.2 0.5,-0.4 0.3,-0.2 0.6,-0.4 1,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.3,-0.2 0.6,-0.5 0.9,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.4,-0.3 0.7,-0.6 1.1,-1 0.4,-0.3 0.7,-0.7 1,-1 0.1,-0.1 0.3,-0.3 0.4,-0.5l0.9,-0.9 0.1,-0.1c0.1,-0.1 0.2,-0.3 0.4,-0.4 0.2,-0.3 0.5,-0.5 0.7,-0.8 0.2,-0.2 0.3,-0.4 0.5,-0.6 0.2,-0.3 0.4,-0.5 0.6,-0.8 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.2 0.2,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8l0.3,-0.9c0.1,-0.3 0.2,-0.5 0.2,-0.8 0.1,-0.3 0.2,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.5 0.2,-0.8 0.1,-0.3 0.1,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.6 0.2,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.5 0.1,-0.8 0,-0.3 0.1,-0.7 0.1,-1v-0.8,-1.1 -417.9h288.8c15.4,0 28,12.6 28,28v504L209.7,668.2c-26.9,0 -52,7.3 -73.7,20v-424c0,-34.2 13.3,-66.3 37.5,-90.5zM860.2,887.6L214,887.6c-43,0 -78,-35 -78,-78v-3.1c3.9,-37.2 35.5,-66.2 73.7,-66.2h678.5v119.3c0,15.4 -12.6,28 -28,28z" /> diff --git a/app/src/main/res/drawable/ic_overtime.xml b/app/src/main/res/drawable/ic_overtime.xml new file mode 100644 index 0000000..6916eca --- /dev/null +++ b/app/src/main/res/drawable/ic_overtime.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_privacy.xml b/app/src/main/res/drawable/ic_privacy.xml index 22ef981..92d2699 100644 --- a/app/src/main/res/drawable/ic_privacy.xml +++ b/app/src/main/res/drawable/ic_privacy.xml @@ -5,5 +5,8 @@ android:viewportHeight="1024"> + android:pathData="M615.51,402.9a34.13,34.13 0,0 1,51.16 45.08l-2.18,2.45 -149.61,154.15a34.13,34.13 0,0 1,-44.07 4.18l-2.65,-2.05 -106.41,-91.39a34.13,34.13 0,0 1,41.9 -53.8l2.6,2.01 82.01,70.46 127.25,-131.09z" /> + diff --git a/app/src/main/res/drawable/ic_push_setting.xml b/app/src/main/res/drawable/ic_push_setting.xml index 69e0c3f..c03f19f 100644 --- a/app/src/main/res/drawable/ic_push_setting.xml +++ b/app/src/main/res/drawable/ic_push_setting.xml @@ -5,30 +5,5 @@ android:viewportHeight="1024"> - + android:pathData="M932.6,832L432.8,832c-9.4,0 -18.4,-4.4 -24,-12 -5.6,-7.6 -7.4,-17.4 -4.8,-26.4l24.4,-84.4c0.4,-1.2 0.8,-2.4 1.4,-3.6 1.6,-3.6 2.4,-7.4 2.4,-11.4L432.2,480.8c0,-137.8 112.2,-250 250,-250 138.4,0 251,112.2 251,250v213.4c0,4 0.8,7.8 2.4,11.4 0.6,1.2 1,2.4 1.4,3.6l24.4,84.4c2.6,9 0.8,18.8 -4.8,26.4 -5.8,7.6 -14.6,12 -24,12zM472.6,772h420l-12.8,-44.4c-4.4,-10.6 -6.6,-21.8 -6.6,-33.4L873.2,480.8c0,-104.8 -85.6,-190 -191,-190 -104.8,0 -190.2,85.2 -190.2,190v213.4c0,11.6 -2.2,22.8 -6.6,33.4l-12.8,44.4zM833.4,507.6c0,-104 -58.2,-176.8 -141.4,-176.8 -16.6,0 -30,13.4 -30,30s13.4,30 30,30c64.2,0 81.4,73.4 81.4,116.8 0,16.6 13.4,30 30,30s30,-13.4 30,-30zM785.8,895c0,-16.6 -13.4,-30 -30,-30h-146.2c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h146.2c16.6,0 30,-13.4 30,-30zM364.6,923.6c0,-16.6 -13.4,-30 -30,-30L180.4,893.6c-32.4,0 -58.8,-26.4 -58.8,-58.8L121.6,189.2c0,-32.4 26.4,-58.8 58.8,-58.8h514.8c32.4,0 58.8,26.4 58.8,58.8 0,16.6 13.4,30 30,30s30,-13.4 30,-30c0,-65.6 -53.4,-118.8 -118.8,-118.8L180.4,70.4c-65.6,0 -118.8,53.4 -118.8,118.8v645.4c0,65.6 53.4,118.8 118.8,118.8h154.2c16.6,0.2 30,-13.2 30,-29.8zM354.4,327.2c0,-16.6 -13.4,-30 -30,-30h-104.2c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h104.2c16.6,0 30,-13.4 30,-30zM317.6,492.6c0,-16.6 -13.4,-30 -30,-30h-67.4c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h67.4c16.6,0 30,-13.4 30,-30zM334,658c0,-16.6 -13.4,-30 -30,-30h-83.8c-16.6,0 -30,13.4 -30,30s13.4,30 30,30L304,688c16.4,0 30,-13.4 30,-30z" /> diff --git a/app/src/main/res/drawable/ic_total_sample.xml b/app/src/main/res/drawable/ic_total_sample.xml new file mode 100644 index 0000000..6bad12a --- /dev/null +++ b/app/src/main/res/drawable/ic_total_sample.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_total_verify.xml b/app/src/main/res/drawable/ic_total_verify.xml new file mode 100644 index 0000000..4ff7f08 --- /dev/null +++ b/app/src/main/res/drawable/ic_total_verify.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_update.xml b/app/src/main/res/drawable/ic_update.xml index b361057..bcc9397 100644 --- a/app/src/main/res/drawable/ic_update.xml +++ b/app/src/main/res/drawable/ic_update.xml @@ -5,5 +5,11 @@ android:viewportHeight="1024"> + android:pathData="M774.56,775.16H558.41a27,27 0,1 1,0 -54.1h216.15a27,27 0,1 1,0 54.1zM327.65,841.85H192.54a27,27 0,1 1,0 -54.09h135.11a27,27 0,1 1,0 54.09zM287.13,950.79h-54a27,27 0,0 1,0 -54.1h54a27,27 0,1 1,0 54.1zM774.56,423.89h-162.1a27,27 0,1 1,0 -54.09h162.1a27,27 0,1 1,0 54.09zM774.56,599.52H558.41a27,27 0,1 1,0 -54.09h216.15a27,27 0,1 1,0 54.09zM937.38,328.67H832.57a81.24,81.24 0,0 1,-81.15 -81.15V112.28a27.05,27.05 0,1 1,54.1 0v135.24a27.06,27.06 0,0 0,27.05 27h104.81a27.05,27.05 0,0 1,0 54.1z" /> + + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt new file mode 100644 index 0000000..621d5d4 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt @@ -0,0 +1,18 @@ +package com.casic.xz.meterage.adapter + +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager +import androidx.fragment.app.FragmentPagerAdapter + +class SubViewPagerAdapter( + manager: FragmentManager, + private val pages: ArrayList, + private val titles: Array +) : FragmentPagerAdapter(manager) { + + override fun getItem(position: Int): Fragment = pages[position] + + override fun getCount(): Int = pages.size + + override fun getPageTitle(position: Int): CharSequence = titles[position] +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index f54f94a..afa0759 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,11 +1,32 @@ package com.casic.xz.meterage.fragment +import androidx.fragment.app.Fragment import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.SubViewPagerAdapter +import com.casic.xz.meterage.fragment.sample.FutureTaskFragment +import com.casic.xz.meterage.fragment.sample.TotalTaskFragment +import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_sample.* -class SamplePageFragment : KotlinBaseFragment(){ +class SamplePageFragment : KotlinBaseFragment() { + + private var fragmentPages: ArrayList = ArrayList() + + init { + fragmentPages.add(UnderTaskFragment()) + fragmentPages.add(FutureTaskFragment()) + fragmentPages.add(TotalTaskFragment()) + } + override fun initData() { + val samplePageTitles = arrayOf("检定中 0", "预期任务 0", "全部 0") + sampleViewPager.adapter = SubViewPagerAdapter( + childFragmentManager, fragmentPages, samplePageTitles + ) + //绑定 + topTabLayout.setupWithViewPager(sampleViewPager) } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt new file mode 100644 index 0000000..ebad65f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.sample + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class FutureTaskFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_future_task + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/sample/TotalTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/sample/TotalTaskFragment.kt new file mode 100644 index 0000000..1968ed2 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/sample/TotalTaskFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.sample + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TotalTaskFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_total_task + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/sample/UnderTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/sample/UnderTaskFragment.kt new file mode 100644 index 0000000..da5c3f3 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/sample/UnderTaskFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.sample + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class UnderTaskFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_under_task + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml index b41f4ac..c7546e4 100644 --- a/app/src/main/res/drawable/ic_about.xml +++ b/app/src/main/res/drawable/ic_about.xml @@ -5,8 +5,5 @@ android:viewportHeight="1024"> - + android:pathData="M300.93,453.16c11.5,-2.59 18.74,-14.02 16.15,-25.53 -5.44,-24.16 -6.26,-48.98 -2.43,-73.71C331.33,245.86 432.8,171.54 540.95,188.29c25.5,3.94 49.54,12.59 71.42,25.7 10.16,6.07 23.24,2.77 29.3,-7.34 6.05,-10.13 2.75,-23.24 -7.36,-29.3 -26.66,-15.95 -55.88,-26.48 -86.84,-31.26 -131.27,-20.32 -254.74,69.98 -275.07,201.33 -4.62,30.06 -3.62,60.2 2.99,89.59 2.23,9.95 11.05,16.69 20.82,16.69 1.57,-0.01 3.14,-0.2 4.72,-0.53zM895.38,612.43c0,-30.54 -11.99,-57.46 -32.14,-76.09 20.22,-46.71 31.58,-98.08 31.58,-152.1C894.82,172.37 722.46,0 510.61,0 298.75,0 126.38,172.37 126.38,384.24c0,126.89 61.98,239.39 157.13,309.4a106.69,106.69 0,0 0,2.64 11.4c3.62,12.37 8.62,23.45 14.94,33.05 34.45,52.54 73.5,112.04 112.24,170.06 39.24,58.74 96.04,95.27 168.8,108.56 9.16,1.61 17.54,2.71 25.63,3.74 3.89,0.52 7.78,1.03 11.64,1.58 3.05,0.45 6.14,0.65 9.22,0.65h43.39c3.41,0 6.83,-0.23 10.21,-0.82 3.82,-0.62 7.63,-1.21 11.49,-1.8a2627.42,2627.42 0,0 0,19.7 -3.15c91.92,-15.87 161.29,-85 176.84,-176.22 3.18,-18.23 4.83,-36.71 4.9,-54.77 0.22,-68.46 0.22,-77.04 0.2,-104.73 0,-14.2 0,-33.52 0.02,-68.75zM190.45,384.23c0,-176.85 143.35,-320.17 320.16,-320.17s320.16,143.32 320.16,320.17c0,44.88 -9.4,87.5 -26.09,126.26 -3,-0.29 -5.99,-0.49 -9,-0.49a99.29,99.29 0,0 0,-26.95 3.71c-9.98,-9.44 -21.92,-16.83 -35.32,-21.43 -2.23,-0.73 -4.45,-1.37 -6.65,-1.96 10.54,-21.32 18.18,-44.51 21.98,-69.26 8.26,-53.24 -1.15,-106.25 -27.18,-153.33 -5.7,-10.31 -18.69,-14.07 -29.02,-8.36 -10.31,5.71 -14.05,18.7 -8.35,29.02 21.41,38.71 29.14,82.34 22.35,126.13 -4.3,27.64 -14.22,52.92 -28.34,75.1 -1.27,0.3 -2.6,0.43 -3.85,0.78 -8.78,-8.07 -19.31,-14.72 -31.37,-19.78 -9.2,-4.9 -19.5,-7.45 -29.99,-7.45h-2.16c0,-27.51 0,-53.6 -0.03,-74.53 0,-52.01 -34.53,-92.43 -85.95,-100.51a92.3,92.3 0,0 0,-14.37 -1.15c-50.27,0 -94.47,40.42 -98.51,90.09 -0.48,6.38 -0.48,11.74 -0.48,16.05v162.58c-19.94,-11.45 -37.93,-26.28 -52.95,-44.22 -7.55,-9.04 -21,-10.25 -30.08,-2.68 -9.03,7.57 -10.23,21.04 -2.68,30.1 10.42,12.44 22.1,23.59 34.63,33.57 -25.95,6.62 -48.7,23.19 -62.88,46.41 -0.55,0.9 -0.97,1.84 -1.49,2.75 -64.79,-58.6 -105.57,-143.19 -105.57,-237.41zM831.09,785.7c-0.07,14.72 -1.46,29.65 -3.99,44.21 -10.98,64.43 -59.79,112.68 -124.43,123.82 -10.16,1.72 -20.44,3.24 -30.65,4.9h-43.4c-11.63,-1.72 -23.37,-2.94 -34.97,-5 -53.34,-9.73 -96.64,-35.58 -127.02,-81.08 -37.67,-56.37 -74.81,-112.96 -111.96,-169.6 -3.14,-4.78 -5.38,-10.33 -7.01,-15.82 -6.95,-23.93 7.16,-48.66 30.71,-53.22 3.42,-0.64 6.74,-0.99 9.89,-0.99 14.31,0 26.51,6.47 35.85,18.57 15.57,20.13 30.29,40.92 45.36,61.42a369.92,369.92 0,0 0,4.84 6.52c0.39,-0.17 0.82,-0.3 1.22,-0.49v-5.75,-320.07c0,-3.64 0,-7.24 0.28,-10.87 1.38,-16.89 17.86,-31.19 34.66,-31.19 1.45,0 2.96,0.12 4.43,0.36 19.88,3.13 31.84,16.94 31.84,37.27 0.05,56.97 0,152.32 0.08,209.34 0,2.96 0.19,6.06 1.06,8.86 1.46,4.61 4.94,7.08 9.88,7.46h1.05c4.72,0 8.2,-2.36 10.06,-6.59 1.19,-2.62 1.26,-5.83 1.26,-8.82 0,-19.61 -0.05,-25.79 -0.05,-25.79l-0.07,18.23c0,-0.06 0,-6.3 0.05,-25.8 0,-12.88 4.32,-24.08 15.27,-31.69 4.03,-2.75 8.83,-4.47 13.26,-6.64h14.39c0.51,0.37 0.92,0.84 1.47,1.04 18.72,6.44 27.42,18.58 27.42,38.26 -0.06,19.31 -0.06,25.46 -0.06,25.46l-0.02,-18.79v25.49c0,1.84 -0.06,3.62 0.13,5.4 0.78,6.15 5.51,10.23 11.48,10.23 0.39,0 0.74,0 1.12,-0.02 6.31,-0.57 9.92,-4.88 10.36,-12.68v-0.19c0.03,-0.47 0.03,-0.96 0.03,-1.43v-12.12c0.28,-8.39 2.34,-16.3 7.74,-23.13 7.09,-8.99 17.41,-13.88 28.18,-13.88 3.91,0 7.88,0.65 11.73,1.95 14.79,5.1 24.25,19.45 24.25,36.59 -0.02,19.31 -0.05,25.48 -0.05,25.48 -0.01,0 -0.05,-18.81 -0.07,-18.81 0,0 -0.01,6.15 -0.01,25.5 0,2.2 0,4.43 0.23,6.61 0.71,5.8 4.47,8.8 9.86,9.86a7.59,7.59 0,0 0,1.68 0.16c4.26,0 8.79,-2.97 10.23,-7.24 0.92,-2.77 1.18,-5.86 1.18,-8.86 0,-2.62 0,-4.88 0.01,-6.77v12.98c0.07,0 0.11,-3.89 0.15,-15.16 0.07,-6.25 1.2,-12.92 3.67,-18.63 5.64,-12.79 18.6,-20.52 31.96,-20.52 2.47,0 4.9,0.29 7.36,0.82 17.32,3.79 28.26,18.49 28.26,37.52 -0.06,103.54 0.1,69.78 -0.22,173.33z" /> diff --git a/app/src/main/res/drawable/ic_collection.xml b/app/src/main/res/drawable/ic_collection.xml index ce1a8a2..4d2016b 100644 --- a/app/src/main/res/drawable/ic_collection.xml +++ b/app/src/main/res/drawable/ic_collection.xml @@ -5,8 +5,5 @@ android:viewportHeight="1024"> - + android:pathData="M139.64,930.91 L512,774.48 884.36,930.91 884.36,93.09 139.64,93.09 139.64,930.91ZM79.79,93.09C79.79,60.04 106.59,33.25 139.64,33.25L884.36,33.25C917.41,33.25 944.21,60.04 944.21,93.09L944.21,930.91C944.21,973.69 900.62,1002.65 861.18,986.08L488.82,829.65 535.18,829.65 162.81,986.08C123.38,1002.65 79.79,973.69 79.79,930.91L79.79,93.09ZM512,606.67 L628.8,659.86C652.63,670.7 668.89,658.58 665.59,632.98L649.71,509.73 738.03,418.34C755.56,400.2 749.98,381.09 724.83,376.4L597.09,352.58 534.8,243.1C522.43,221.36 501.6,221.3 488.77,243.84L426.98,352.4 299.23,376.26C274.26,380.93 268.17,399.75 286.02,418.22L374.29,509.61 358.41,632.86C355.12,658.41 371.59,670.5 395.2,659.77L512,606.67ZM536.77,661.15 L419.97,714.25C353.79,744.33 289.76,697.43 299.06,625.22L314.93,501.96 331.24,551.18 242.98,459.8C192.09,407.12 216.3,330.88 288.24,317.44L415.99,293.57 374.97,322.79 436.76,214.24C472.3,151.8 551.26,151 586.82,213.51L649.1,322.98 608.06,293.75 735.8,317.57C808.03,331.04 831.6,407.64 781.06,459.93L692.74,551.31 709.07,502.08 724.94,625.34C734.25,697.6 670.4,744.55 604,714.32L487.2,661.14 536.77,661.15Z" /> diff --git a/app/src/main/res/drawable/ic_help.xml b/app/src/main/res/drawable/ic_help.xml index 3835c32..cf1f741 100644 --- a/app/src/main/res/drawable/ic_help.xml +++ b/app/src/main/res/drawable/ic_help.xml @@ -5,11 +5,5 @@ android:viewportHeight="1024"> - - + android:pathData="M860.2,64.2L264,64.2c-110.5,0 -200,89.5 -200,200v538.9c-0.3,3.7 -0.4,7.4 -0.4,11.1h0.5C66.6,895 132.8,959.6 214,959.6h646.2c55.2,0 100,-44.8 100,-100L960.2,164.2c0,-55.2 -44.8,-100 -100,-100zM499.4,473.4l-58.7,-52.1c-0.1,-0.1 -0.2,-0.1 -0.2,-0.2 -0.3,-0.3 -0.7,-0.6 -1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.4,-0.3 -0.7,-0.5 -1.1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.3,-0.2 -0.7,-0.5 -1.1,-0.7 -0.2,-0.1 -0.3,-0.2 -0.5,-0.3 -0.3,-0.2 -0.7,-0.4 -1,-0.6l-0.6,-0.3c-0.3,-0.2 -0.6,-0.3 -0.9,-0.5 -0.2,-0.1 -0.5,-0.3 -0.7,-0.4 -0.3,-0.1 -0.5,-0.3 -0.8,-0.4 -0.3,-0.1 -0.6,-0.3 -0.9,-0.4 -0.2,-0.1 -0.4,-0.2 -0.7,-0.3 -0.3,-0.1 -0.7,-0.3 -1,-0.4 -0.2,-0.1 -0.4,-0.1 -0.6,-0.2 -0.4,-0.1 -0.7,-0.3 -1.1,-0.4 -0.2,-0.1 -0.3,-0.1 -0.5,-0.2l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.2 -1.2,-0.2 -0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.1 -1.2,-0.2 -0.2,0 -0.4,0 -0.6,-0.1 -0.4,0 -0.7,-0.1 -1.1,-0.1h-5.1c-0.3,0 -0.7,0.1 -1,0.1 -0.2,0 -0.4,0 -0.7,0.1 -0.4,0 -0.7,0.1 -1.1,0.1 -0.2,0 -0.4,0.1 -0.6,0.1 -0.4,0.1 -0.8,0.1 -1.2,0.2 -0.2,0 -0.4,0.1 -0.5,0.1l-1.2,0.3c-0.2,0 -0.4,0.1 -0.5,0.1 -0.4,0.1 -0.7,0.2 -1.1,0.3 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.4,0.1 -0.7,0.2 -1,0.4 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.3,0.1 -0.6,0.2 -0.9,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.1 -0.5,0.2 -0.8,0.4 -0.3,0.1 -0.6,0.3 -0.8,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.2 -0.6,0.3 -1,0.5 -0.2,0.1 -0.4,0.2 -0.5,0.3 -0.4,0.2 -0.7,0.4 -1,0.6 -0.1,0.1 -0.3,0.2 -0.4,0.3 -0.4,0.2 -0.7,0.5 -1.1,0.7 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.4,0.3 -0.7,0.5 -1.1,0.8 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.3,0.3 -0.7,0.6 -1,0.9 -0.1,0.1 -0.2,0.1 -0.2,0.2L332.7,474L332.7,136.2h166.7v337.2zM173.5,173.7c23.4,-23.4 54.2,-36.6 87.2,-37.4L260.7,555.7c0,0.3 0,0.7 0.1,1 0,0.3 0.1,0.5 0.1,0.8 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8l0.3,0.9c0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.4,0.8 0.1,0.3 0.2,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.2,0.3 0.3,0.5 0.5,0.8 0.1,0.2 0.3,0.5 0.5,0.7 0.2,0.3 0.4,0.5 0.5,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.4,0.5 0.6,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.5,0.6 0.7,0.8l0.3,0.3 0.2,0.2c0.3,0.3 0.6,0.6 0.8,0.9l0.5,0.5 0.8,0.8c0.9,0.9 1.9,1.7 2.9,2.5 0.1,0.1 0.3,0.2 0.4,0.3 0.3,0.2 0.7,0.5 1,0.7 0.2,0.1 0.3,0.2 0.5,0.4 0.3,0.2 0.6,0.4 1,0.6 0.2,0.1 0.4,0.3 0.6,0.4 0.3,0.2 0.6,0.4 0.9,0.5 0.2,0.1 0.5,0.3 0.7,0.4 0.3,0.1 0.5,0.3 0.8,0.4 0.3,0.1 0.6,0.3 0.9,0.4 0.2,0.1 0.5,0.2 0.7,0.3 0.4,0.2 0.7,0.3 1.1,0.5 0.2,0.1 0.4,0.1 0.5,0.2 0.5,0.2 0.9,0.3 1.4,0.5 0.1,0 0.2,0.1 0.3,0.1 0.6,0.2 1.1,0.3 1.7,0.5h0.1c3,0.8 6.1,1.2 9.3,1.2h2.3c0.4,0 0.8,-0.1 1.1,-0.1 0.2,0 0.5,-0.1 0.7,-0.1 0.3,0 0.7,-0.1 1,-0.1 0.3,0 0.5,-0.1 0.8,-0.1 0.3,0 0.6,-0.1 0.9,-0.2 0.3,0 0.5,-0.1 0.8,-0.2 0.3,-0.1 0.6,-0.1 0.9,-0.2 0.3,-0.1 0.5,-0.1 0.8,-0.2l0.9,-0.3c0.2,-0.1 0.5,-0.1 0.7,-0.2 0.4,-0.1 0.7,-0.2 1.1,-0.4 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.5,-0.2 1,-0.4 1.6,-0.6 0.1,0 0.2,-0.1 0.3,-0.1 0.4,-0.2 0.9,-0.4 1.3,-0.6 0.2,-0.1 0.3,-0.2 0.5,-0.2 0.4,-0.2 0.7,-0.4 1,-0.5 0.2,-0.1 0.4,-0.2 0.5,-0.3 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.3 0.8,-0.5 0.2,-0.1 0.4,-0.3 0.6,-0.4 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.4,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.4 0.7,-0.6 0.1,-0.1 0.3,-0.2 0.4,-0.3l96.2,-84.3 94.9,84.1c0.2,0.1 0.3,0.3 0.5,0.4 0.2,0.2 0.4,0.4 0.7,0.6 0.2,0.2 0.5,0.4 0.7,0.5 0.2,0.2 0.4,0.3 0.7,0.5 0.3,0.2 0.5,0.4 0.8,0.6 0.2,0.1 0.4,0.3 0.6,0.4l0.9,0.6c0.2,0.1 0.3,0.2 0.5,0.3 0.4,0.2 0.7,0.4 1.1,0.6 0.1,0.1 0.2,0.1 0.3,0.2 0.5,0.3 1,0.5 1.5,0.8 0.5,0.3 1,0.5 1.6,0.7 0.1,0 0.2,0.1 0.2,0.1 0.4,0.2 0.9,0.4 1.3,0.5 0.2,0.1 0.4,0.1 0.6,0.2 0.3,0.1 0.7,0.2 1,0.3 0.2,0.1 0.5,0.1 0.7,0.2l0.9,0.3c0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0 0.5,0.1 0.8,0.1 0.3,0 0.7,0.1 1,0.1 0.2,0 0.5,0.1 0.7,0.1 0.4,0 0.8,0.1 1.1,0.1h2.3c3.8,0 7.5,-0.6 11,-1.7 0.1,0 0.2,-0.1 0.2,-0.1 0.5,-0.2 1,-0.3 1.5,-0.5 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.4,-0.2 0.8,-0.3 1.1,-0.5 0.2,-0.1 0.5,-0.2 0.7,-0.3 0.3,-0.1 0.6,-0.3 0.9,-0.4 0.3,-0.1 0.6,-0.3 0.8,-0.4 0.2,-0.1 0.5,-0.3 0.7,-0.4 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.4 1,-0.6 0.2,-0.1 0.4,-0.2 0.5,-0.4 0.3,-0.2 0.6,-0.4 1,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.3,-0.2 0.6,-0.5 0.9,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.4,-0.3 0.7,-0.6 1.1,-1 0.4,-0.3 0.7,-0.7 1,-1 0.1,-0.1 0.3,-0.3 0.4,-0.5l0.9,-0.9 0.1,-0.1c0.1,-0.1 0.2,-0.3 0.4,-0.4 0.2,-0.3 0.5,-0.5 0.7,-0.8 0.2,-0.2 0.3,-0.4 0.5,-0.6 0.2,-0.3 0.4,-0.5 0.6,-0.8 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.2 0.2,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8l0.3,-0.9c0.1,-0.3 0.2,-0.5 0.2,-0.8 0.1,-0.3 0.2,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.5 0.2,-0.8 0.1,-0.3 0.1,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.6 0.2,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.5 0.1,-0.8 0,-0.3 0.1,-0.7 0.1,-1v-0.8,-1.1 -417.9h288.8c15.4,0 28,12.6 28,28v504L209.7,668.2c-26.9,0 -52,7.3 -73.7,20v-424c0,-34.2 13.3,-66.3 37.5,-90.5zM860.2,887.6L214,887.6c-43,0 -78,-35 -78,-78v-3.1c3.9,-37.2 35.5,-66.2 73.7,-66.2h678.5v119.3c0,15.4 -12.6,28 -28,28z" /> diff --git a/app/src/main/res/drawable/ic_overtime.xml b/app/src/main/res/drawable/ic_overtime.xml new file mode 100644 index 0000000..6916eca --- /dev/null +++ b/app/src/main/res/drawable/ic_overtime.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_privacy.xml b/app/src/main/res/drawable/ic_privacy.xml index 22ef981..92d2699 100644 --- a/app/src/main/res/drawable/ic_privacy.xml +++ b/app/src/main/res/drawable/ic_privacy.xml @@ -5,5 +5,8 @@ android:viewportHeight="1024"> + android:pathData="M615.51,402.9a34.13,34.13 0,0 1,51.16 45.08l-2.18,2.45 -149.61,154.15a34.13,34.13 0,0 1,-44.07 4.18l-2.65,-2.05 -106.41,-91.39a34.13,34.13 0,0 1,41.9 -53.8l2.6,2.01 82.01,70.46 127.25,-131.09z" /> + diff --git a/app/src/main/res/drawable/ic_push_setting.xml b/app/src/main/res/drawable/ic_push_setting.xml index 69e0c3f..c03f19f 100644 --- a/app/src/main/res/drawable/ic_push_setting.xml +++ b/app/src/main/res/drawable/ic_push_setting.xml @@ -5,30 +5,5 @@ android:viewportHeight="1024"> - + android:pathData="M932.6,832L432.8,832c-9.4,0 -18.4,-4.4 -24,-12 -5.6,-7.6 -7.4,-17.4 -4.8,-26.4l24.4,-84.4c0.4,-1.2 0.8,-2.4 1.4,-3.6 1.6,-3.6 2.4,-7.4 2.4,-11.4L432.2,480.8c0,-137.8 112.2,-250 250,-250 138.4,0 251,112.2 251,250v213.4c0,4 0.8,7.8 2.4,11.4 0.6,1.2 1,2.4 1.4,3.6l24.4,84.4c2.6,9 0.8,18.8 -4.8,26.4 -5.8,7.6 -14.6,12 -24,12zM472.6,772h420l-12.8,-44.4c-4.4,-10.6 -6.6,-21.8 -6.6,-33.4L873.2,480.8c0,-104.8 -85.6,-190 -191,-190 -104.8,0 -190.2,85.2 -190.2,190v213.4c0,11.6 -2.2,22.8 -6.6,33.4l-12.8,44.4zM833.4,507.6c0,-104 -58.2,-176.8 -141.4,-176.8 -16.6,0 -30,13.4 -30,30s13.4,30 30,30c64.2,0 81.4,73.4 81.4,116.8 0,16.6 13.4,30 30,30s30,-13.4 30,-30zM785.8,895c0,-16.6 -13.4,-30 -30,-30h-146.2c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h146.2c16.6,0 30,-13.4 30,-30zM364.6,923.6c0,-16.6 -13.4,-30 -30,-30L180.4,893.6c-32.4,0 -58.8,-26.4 -58.8,-58.8L121.6,189.2c0,-32.4 26.4,-58.8 58.8,-58.8h514.8c32.4,0 58.8,26.4 58.8,58.8 0,16.6 13.4,30 30,30s30,-13.4 30,-30c0,-65.6 -53.4,-118.8 -118.8,-118.8L180.4,70.4c-65.6,0 -118.8,53.4 -118.8,118.8v645.4c0,65.6 53.4,118.8 118.8,118.8h154.2c16.6,0.2 30,-13.2 30,-29.8zM354.4,327.2c0,-16.6 -13.4,-30 -30,-30h-104.2c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h104.2c16.6,0 30,-13.4 30,-30zM317.6,492.6c0,-16.6 -13.4,-30 -30,-30h-67.4c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h67.4c16.6,0 30,-13.4 30,-30zM334,658c0,-16.6 -13.4,-30 -30,-30h-83.8c-16.6,0 -30,13.4 -30,30s13.4,30 30,30L304,688c16.4,0 30,-13.4 30,-30z" /> diff --git a/app/src/main/res/drawable/ic_total_sample.xml b/app/src/main/res/drawable/ic_total_sample.xml new file mode 100644 index 0000000..6bad12a --- /dev/null +++ b/app/src/main/res/drawable/ic_total_sample.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_total_verify.xml b/app/src/main/res/drawable/ic_total_verify.xml new file mode 100644 index 0000000..4ff7f08 --- /dev/null +++ b/app/src/main/res/drawable/ic_total_verify.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_update.xml b/app/src/main/res/drawable/ic_update.xml index b361057..bcc9397 100644 --- a/app/src/main/res/drawable/ic_update.xml +++ b/app/src/main/res/drawable/ic_update.xml @@ -5,5 +5,11 @@ android:viewportHeight="1024"> + android:pathData="M774.56,775.16H558.41a27,27 0,1 1,0 -54.1h216.15a27,27 0,1 1,0 54.1zM327.65,841.85H192.54a27,27 0,1 1,0 -54.09h135.11a27,27 0,1 1,0 54.09zM287.13,950.79h-54a27,27 0,0 1,0 -54.1h54a27,27 0,1 1,0 54.1zM774.56,423.89h-162.1a27,27 0,1 1,0 -54.09h162.1a27,27 0,1 1,0 54.09zM774.56,599.52H558.41a27,27 0,1 1,0 -54.09h216.15a27,27 0,1 1,0 54.09zM937.38,328.67H832.57a81.24,81.24 0,0 1,-81.15 -81.15V112.28a27.05,27.05 0,1 1,54.1 0v135.24a27.06,27.06 0,0 0,27.05 27h104.81a27.05,27.05 0,0 1,0 54.1z" /> + + diff --git a/app/src/main/res/drawable/ic_verified.xml b/app/src/main/res/drawable/ic_verified.xml new file mode 100644 index 0000000..aeb63f6 --- /dev/null +++ b/app/src/main/res/drawable/ic_verified.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt new file mode 100644 index 0000000..621d5d4 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt @@ -0,0 +1,18 @@ +package com.casic.xz.meterage.adapter + +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager +import androidx.fragment.app.FragmentPagerAdapter + +class SubViewPagerAdapter( + manager: FragmentManager, + private val pages: ArrayList, + private val titles: Array +) : FragmentPagerAdapter(manager) { + + override fun getItem(position: Int): Fragment = pages[position] + + override fun getCount(): Int = pages.size + + override fun getPageTitle(position: Int): CharSequence = titles[position] +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index f54f94a..afa0759 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,11 +1,32 @@ package com.casic.xz.meterage.fragment +import androidx.fragment.app.Fragment import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.SubViewPagerAdapter +import com.casic.xz.meterage.fragment.sample.FutureTaskFragment +import com.casic.xz.meterage.fragment.sample.TotalTaskFragment +import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_sample.* -class SamplePageFragment : KotlinBaseFragment(){ +class SamplePageFragment : KotlinBaseFragment() { + + private var fragmentPages: ArrayList = ArrayList() + + init { + fragmentPages.add(UnderTaskFragment()) + fragmentPages.add(FutureTaskFragment()) + fragmentPages.add(TotalTaskFragment()) + } + override fun initData() { + val samplePageTitles = arrayOf("检定中 0", "预期任务 0", "全部 0") + sampleViewPager.adapter = SubViewPagerAdapter( + childFragmentManager, fragmentPages, samplePageTitles + ) + //绑定 + topTabLayout.setupWithViewPager(sampleViewPager) } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt new file mode 100644 index 0000000..ebad65f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.sample + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class FutureTaskFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_future_task + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/sample/TotalTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/sample/TotalTaskFragment.kt new file mode 100644 index 0000000..1968ed2 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/sample/TotalTaskFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.sample + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TotalTaskFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_total_task + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/sample/UnderTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/sample/UnderTaskFragment.kt new file mode 100644 index 0000000..da5c3f3 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/sample/UnderTaskFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.sample + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class UnderTaskFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_under_task + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml index b41f4ac..c7546e4 100644 --- a/app/src/main/res/drawable/ic_about.xml +++ b/app/src/main/res/drawable/ic_about.xml @@ -5,8 +5,5 @@ android:viewportHeight="1024"> - + android:pathData="M300.93,453.16c11.5,-2.59 18.74,-14.02 16.15,-25.53 -5.44,-24.16 -6.26,-48.98 -2.43,-73.71C331.33,245.86 432.8,171.54 540.95,188.29c25.5,3.94 49.54,12.59 71.42,25.7 10.16,6.07 23.24,2.77 29.3,-7.34 6.05,-10.13 2.75,-23.24 -7.36,-29.3 -26.66,-15.95 -55.88,-26.48 -86.84,-31.26 -131.27,-20.32 -254.74,69.98 -275.07,201.33 -4.62,30.06 -3.62,60.2 2.99,89.59 2.23,9.95 11.05,16.69 20.82,16.69 1.57,-0.01 3.14,-0.2 4.72,-0.53zM895.38,612.43c0,-30.54 -11.99,-57.46 -32.14,-76.09 20.22,-46.71 31.58,-98.08 31.58,-152.1C894.82,172.37 722.46,0 510.61,0 298.75,0 126.38,172.37 126.38,384.24c0,126.89 61.98,239.39 157.13,309.4a106.69,106.69 0,0 0,2.64 11.4c3.62,12.37 8.62,23.45 14.94,33.05 34.45,52.54 73.5,112.04 112.24,170.06 39.24,58.74 96.04,95.27 168.8,108.56 9.16,1.61 17.54,2.71 25.63,3.74 3.89,0.52 7.78,1.03 11.64,1.58 3.05,0.45 6.14,0.65 9.22,0.65h43.39c3.41,0 6.83,-0.23 10.21,-0.82 3.82,-0.62 7.63,-1.21 11.49,-1.8a2627.42,2627.42 0,0 0,19.7 -3.15c91.92,-15.87 161.29,-85 176.84,-176.22 3.18,-18.23 4.83,-36.71 4.9,-54.77 0.22,-68.46 0.22,-77.04 0.2,-104.73 0,-14.2 0,-33.52 0.02,-68.75zM190.45,384.23c0,-176.85 143.35,-320.17 320.16,-320.17s320.16,143.32 320.16,320.17c0,44.88 -9.4,87.5 -26.09,126.26 -3,-0.29 -5.99,-0.49 -9,-0.49a99.29,99.29 0,0 0,-26.95 3.71c-9.98,-9.44 -21.92,-16.83 -35.32,-21.43 -2.23,-0.73 -4.45,-1.37 -6.65,-1.96 10.54,-21.32 18.18,-44.51 21.98,-69.26 8.26,-53.24 -1.15,-106.25 -27.18,-153.33 -5.7,-10.31 -18.69,-14.07 -29.02,-8.36 -10.31,5.71 -14.05,18.7 -8.35,29.02 21.41,38.71 29.14,82.34 22.35,126.13 -4.3,27.64 -14.22,52.92 -28.34,75.1 -1.27,0.3 -2.6,0.43 -3.85,0.78 -8.78,-8.07 -19.31,-14.72 -31.37,-19.78 -9.2,-4.9 -19.5,-7.45 -29.99,-7.45h-2.16c0,-27.51 0,-53.6 -0.03,-74.53 0,-52.01 -34.53,-92.43 -85.95,-100.51a92.3,92.3 0,0 0,-14.37 -1.15c-50.27,0 -94.47,40.42 -98.51,90.09 -0.48,6.38 -0.48,11.74 -0.48,16.05v162.58c-19.94,-11.45 -37.93,-26.28 -52.95,-44.22 -7.55,-9.04 -21,-10.25 -30.08,-2.68 -9.03,7.57 -10.23,21.04 -2.68,30.1 10.42,12.44 22.1,23.59 34.63,33.57 -25.95,6.62 -48.7,23.19 -62.88,46.41 -0.55,0.9 -0.97,1.84 -1.49,2.75 -64.79,-58.6 -105.57,-143.19 -105.57,-237.41zM831.09,785.7c-0.07,14.72 -1.46,29.65 -3.99,44.21 -10.98,64.43 -59.79,112.68 -124.43,123.82 -10.16,1.72 -20.44,3.24 -30.65,4.9h-43.4c-11.63,-1.72 -23.37,-2.94 -34.97,-5 -53.34,-9.73 -96.64,-35.58 -127.02,-81.08 -37.67,-56.37 -74.81,-112.96 -111.96,-169.6 -3.14,-4.78 -5.38,-10.33 -7.01,-15.82 -6.95,-23.93 7.16,-48.66 30.71,-53.22 3.42,-0.64 6.74,-0.99 9.89,-0.99 14.31,0 26.51,6.47 35.85,18.57 15.57,20.13 30.29,40.92 45.36,61.42a369.92,369.92 0,0 0,4.84 6.52c0.39,-0.17 0.82,-0.3 1.22,-0.49v-5.75,-320.07c0,-3.64 0,-7.24 0.28,-10.87 1.38,-16.89 17.86,-31.19 34.66,-31.19 1.45,0 2.96,0.12 4.43,0.36 19.88,3.13 31.84,16.94 31.84,37.27 0.05,56.97 0,152.32 0.08,209.34 0,2.96 0.19,6.06 1.06,8.86 1.46,4.61 4.94,7.08 9.88,7.46h1.05c4.72,0 8.2,-2.36 10.06,-6.59 1.19,-2.62 1.26,-5.83 1.26,-8.82 0,-19.61 -0.05,-25.79 -0.05,-25.79l-0.07,18.23c0,-0.06 0,-6.3 0.05,-25.8 0,-12.88 4.32,-24.08 15.27,-31.69 4.03,-2.75 8.83,-4.47 13.26,-6.64h14.39c0.51,0.37 0.92,0.84 1.47,1.04 18.72,6.44 27.42,18.58 27.42,38.26 -0.06,19.31 -0.06,25.46 -0.06,25.46l-0.02,-18.79v25.49c0,1.84 -0.06,3.62 0.13,5.4 0.78,6.15 5.51,10.23 11.48,10.23 0.39,0 0.74,0 1.12,-0.02 6.31,-0.57 9.92,-4.88 10.36,-12.68v-0.19c0.03,-0.47 0.03,-0.96 0.03,-1.43v-12.12c0.28,-8.39 2.34,-16.3 7.74,-23.13 7.09,-8.99 17.41,-13.88 28.18,-13.88 3.91,0 7.88,0.65 11.73,1.95 14.79,5.1 24.25,19.45 24.25,36.59 -0.02,19.31 -0.05,25.48 -0.05,25.48 -0.01,0 -0.05,-18.81 -0.07,-18.81 0,0 -0.01,6.15 -0.01,25.5 0,2.2 0,4.43 0.23,6.61 0.71,5.8 4.47,8.8 9.86,9.86a7.59,7.59 0,0 0,1.68 0.16c4.26,0 8.79,-2.97 10.23,-7.24 0.92,-2.77 1.18,-5.86 1.18,-8.86 0,-2.62 0,-4.88 0.01,-6.77v12.98c0.07,0 0.11,-3.89 0.15,-15.16 0.07,-6.25 1.2,-12.92 3.67,-18.63 5.64,-12.79 18.6,-20.52 31.96,-20.52 2.47,0 4.9,0.29 7.36,0.82 17.32,3.79 28.26,18.49 28.26,37.52 -0.06,103.54 0.1,69.78 -0.22,173.33z" /> diff --git a/app/src/main/res/drawable/ic_collection.xml b/app/src/main/res/drawable/ic_collection.xml index ce1a8a2..4d2016b 100644 --- a/app/src/main/res/drawable/ic_collection.xml +++ b/app/src/main/res/drawable/ic_collection.xml @@ -5,8 +5,5 @@ android:viewportHeight="1024"> - + android:pathData="M139.64,930.91 L512,774.48 884.36,930.91 884.36,93.09 139.64,93.09 139.64,930.91ZM79.79,93.09C79.79,60.04 106.59,33.25 139.64,33.25L884.36,33.25C917.41,33.25 944.21,60.04 944.21,93.09L944.21,930.91C944.21,973.69 900.62,1002.65 861.18,986.08L488.82,829.65 535.18,829.65 162.81,986.08C123.38,1002.65 79.79,973.69 79.79,930.91L79.79,93.09ZM512,606.67 L628.8,659.86C652.63,670.7 668.89,658.58 665.59,632.98L649.71,509.73 738.03,418.34C755.56,400.2 749.98,381.09 724.83,376.4L597.09,352.58 534.8,243.1C522.43,221.36 501.6,221.3 488.77,243.84L426.98,352.4 299.23,376.26C274.26,380.93 268.17,399.75 286.02,418.22L374.29,509.61 358.41,632.86C355.12,658.41 371.59,670.5 395.2,659.77L512,606.67ZM536.77,661.15 L419.97,714.25C353.79,744.33 289.76,697.43 299.06,625.22L314.93,501.96 331.24,551.18 242.98,459.8C192.09,407.12 216.3,330.88 288.24,317.44L415.99,293.57 374.97,322.79 436.76,214.24C472.3,151.8 551.26,151 586.82,213.51L649.1,322.98 608.06,293.75 735.8,317.57C808.03,331.04 831.6,407.64 781.06,459.93L692.74,551.31 709.07,502.08 724.94,625.34C734.25,697.6 670.4,744.55 604,714.32L487.2,661.14 536.77,661.15Z" /> diff --git a/app/src/main/res/drawable/ic_help.xml b/app/src/main/res/drawable/ic_help.xml index 3835c32..cf1f741 100644 --- a/app/src/main/res/drawable/ic_help.xml +++ b/app/src/main/res/drawable/ic_help.xml @@ -5,11 +5,5 @@ android:viewportHeight="1024"> - - + android:pathData="M860.2,64.2L264,64.2c-110.5,0 -200,89.5 -200,200v538.9c-0.3,3.7 -0.4,7.4 -0.4,11.1h0.5C66.6,895 132.8,959.6 214,959.6h646.2c55.2,0 100,-44.8 100,-100L960.2,164.2c0,-55.2 -44.8,-100 -100,-100zM499.4,473.4l-58.7,-52.1c-0.1,-0.1 -0.2,-0.1 -0.2,-0.2 -0.3,-0.3 -0.7,-0.6 -1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.4,-0.3 -0.7,-0.5 -1.1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.3,-0.2 -0.7,-0.5 -1.1,-0.7 -0.2,-0.1 -0.3,-0.2 -0.5,-0.3 -0.3,-0.2 -0.7,-0.4 -1,-0.6l-0.6,-0.3c-0.3,-0.2 -0.6,-0.3 -0.9,-0.5 -0.2,-0.1 -0.5,-0.3 -0.7,-0.4 -0.3,-0.1 -0.5,-0.3 -0.8,-0.4 -0.3,-0.1 -0.6,-0.3 -0.9,-0.4 -0.2,-0.1 -0.4,-0.2 -0.7,-0.3 -0.3,-0.1 -0.7,-0.3 -1,-0.4 -0.2,-0.1 -0.4,-0.1 -0.6,-0.2 -0.4,-0.1 -0.7,-0.3 -1.1,-0.4 -0.2,-0.1 -0.3,-0.1 -0.5,-0.2l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.2 -1.2,-0.2 -0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.1 -1.2,-0.2 -0.2,0 -0.4,0 -0.6,-0.1 -0.4,0 -0.7,-0.1 -1.1,-0.1h-5.1c-0.3,0 -0.7,0.1 -1,0.1 -0.2,0 -0.4,0 -0.7,0.1 -0.4,0 -0.7,0.1 -1.1,0.1 -0.2,0 -0.4,0.1 -0.6,0.1 -0.4,0.1 -0.8,0.1 -1.2,0.2 -0.2,0 -0.4,0.1 -0.5,0.1l-1.2,0.3c-0.2,0 -0.4,0.1 -0.5,0.1 -0.4,0.1 -0.7,0.2 -1.1,0.3 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.4,0.1 -0.7,0.2 -1,0.4 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.3,0.1 -0.6,0.2 -0.9,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.1 -0.5,0.2 -0.8,0.4 -0.3,0.1 -0.6,0.3 -0.8,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.2 -0.6,0.3 -1,0.5 -0.2,0.1 -0.4,0.2 -0.5,0.3 -0.4,0.2 -0.7,0.4 -1,0.6 -0.1,0.1 -0.3,0.2 -0.4,0.3 -0.4,0.2 -0.7,0.5 -1.1,0.7 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.4,0.3 -0.7,0.5 -1.1,0.8 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.3,0.3 -0.7,0.6 -1,0.9 -0.1,0.1 -0.2,0.1 -0.2,0.2L332.7,474L332.7,136.2h166.7v337.2zM173.5,173.7c23.4,-23.4 54.2,-36.6 87.2,-37.4L260.7,555.7c0,0.3 0,0.7 0.1,1 0,0.3 0.1,0.5 0.1,0.8 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8l0.3,0.9c0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.4,0.8 0.1,0.3 0.2,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.2,0.3 0.3,0.5 0.5,0.8 0.1,0.2 0.3,0.5 0.5,0.7 0.2,0.3 0.4,0.5 0.5,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.4,0.5 0.6,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.5,0.6 0.7,0.8l0.3,0.3 0.2,0.2c0.3,0.3 0.6,0.6 0.8,0.9l0.5,0.5 0.8,0.8c0.9,0.9 1.9,1.7 2.9,2.5 0.1,0.1 0.3,0.2 0.4,0.3 0.3,0.2 0.7,0.5 1,0.7 0.2,0.1 0.3,0.2 0.5,0.4 0.3,0.2 0.6,0.4 1,0.6 0.2,0.1 0.4,0.3 0.6,0.4 0.3,0.2 0.6,0.4 0.9,0.5 0.2,0.1 0.5,0.3 0.7,0.4 0.3,0.1 0.5,0.3 0.8,0.4 0.3,0.1 0.6,0.3 0.9,0.4 0.2,0.1 0.5,0.2 0.7,0.3 0.4,0.2 0.7,0.3 1.1,0.5 0.2,0.1 0.4,0.1 0.5,0.2 0.5,0.2 0.9,0.3 1.4,0.5 0.1,0 0.2,0.1 0.3,0.1 0.6,0.2 1.1,0.3 1.7,0.5h0.1c3,0.8 6.1,1.2 9.3,1.2h2.3c0.4,0 0.8,-0.1 1.1,-0.1 0.2,0 0.5,-0.1 0.7,-0.1 0.3,0 0.7,-0.1 1,-0.1 0.3,0 0.5,-0.1 0.8,-0.1 0.3,0 0.6,-0.1 0.9,-0.2 0.3,0 0.5,-0.1 0.8,-0.2 0.3,-0.1 0.6,-0.1 0.9,-0.2 0.3,-0.1 0.5,-0.1 0.8,-0.2l0.9,-0.3c0.2,-0.1 0.5,-0.1 0.7,-0.2 0.4,-0.1 0.7,-0.2 1.1,-0.4 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.5,-0.2 1,-0.4 1.6,-0.6 0.1,0 0.2,-0.1 0.3,-0.1 0.4,-0.2 0.9,-0.4 1.3,-0.6 0.2,-0.1 0.3,-0.2 0.5,-0.2 0.4,-0.2 0.7,-0.4 1,-0.5 0.2,-0.1 0.4,-0.2 0.5,-0.3 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.3 0.8,-0.5 0.2,-0.1 0.4,-0.3 0.6,-0.4 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.4,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.4 0.7,-0.6 0.1,-0.1 0.3,-0.2 0.4,-0.3l96.2,-84.3 94.9,84.1c0.2,0.1 0.3,0.3 0.5,0.4 0.2,0.2 0.4,0.4 0.7,0.6 0.2,0.2 0.5,0.4 0.7,0.5 0.2,0.2 0.4,0.3 0.7,0.5 0.3,0.2 0.5,0.4 0.8,0.6 0.2,0.1 0.4,0.3 0.6,0.4l0.9,0.6c0.2,0.1 0.3,0.2 0.5,0.3 0.4,0.2 0.7,0.4 1.1,0.6 0.1,0.1 0.2,0.1 0.3,0.2 0.5,0.3 1,0.5 1.5,0.8 0.5,0.3 1,0.5 1.6,0.7 0.1,0 0.2,0.1 0.2,0.1 0.4,0.2 0.9,0.4 1.3,0.5 0.2,0.1 0.4,0.1 0.6,0.2 0.3,0.1 0.7,0.2 1,0.3 0.2,0.1 0.5,0.1 0.7,0.2l0.9,0.3c0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0 0.5,0.1 0.8,0.1 0.3,0 0.7,0.1 1,0.1 0.2,0 0.5,0.1 0.7,0.1 0.4,0 0.8,0.1 1.1,0.1h2.3c3.8,0 7.5,-0.6 11,-1.7 0.1,0 0.2,-0.1 0.2,-0.1 0.5,-0.2 1,-0.3 1.5,-0.5 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.4,-0.2 0.8,-0.3 1.1,-0.5 0.2,-0.1 0.5,-0.2 0.7,-0.3 0.3,-0.1 0.6,-0.3 0.9,-0.4 0.3,-0.1 0.6,-0.3 0.8,-0.4 0.2,-0.1 0.5,-0.3 0.7,-0.4 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.4 1,-0.6 0.2,-0.1 0.4,-0.2 0.5,-0.4 0.3,-0.2 0.6,-0.4 1,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.3,-0.2 0.6,-0.5 0.9,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.4,-0.3 0.7,-0.6 1.1,-1 0.4,-0.3 0.7,-0.7 1,-1 0.1,-0.1 0.3,-0.3 0.4,-0.5l0.9,-0.9 0.1,-0.1c0.1,-0.1 0.2,-0.3 0.4,-0.4 0.2,-0.3 0.5,-0.5 0.7,-0.8 0.2,-0.2 0.3,-0.4 0.5,-0.6 0.2,-0.3 0.4,-0.5 0.6,-0.8 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.2 0.2,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8l0.3,-0.9c0.1,-0.3 0.2,-0.5 0.2,-0.8 0.1,-0.3 0.2,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.5 0.2,-0.8 0.1,-0.3 0.1,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.6 0.2,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.5 0.1,-0.8 0,-0.3 0.1,-0.7 0.1,-1v-0.8,-1.1 -417.9h288.8c15.4,0 28,12.6 28,28v504L209.7,668.2c-26.9,0 -52,7.3 -73.7,20v-424c0,-34.2 13.3,-66.3 37.5,-90.5zM860.2,887.6L214,887.6c-43,0 -78,-35 -78,-78v-3.1c3.9,-37.2 35.5,-66.2 73.7,-66.2h678.5v119.3c0,15.4 -12.6,28 -28,28z" /> diff --git a/app/src/main/res/drawable/ic_overtime.xml b/app/src/main/res/drawable/ic_overtime.xml new file mode 100644 index 0000000..6916eca --- /dev/null +++ b/app/src/main/res/drawable/ic_overtime.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_privacy.xml b/app/src/main/res/drawable/ic_privacy.xml index 22ef981..92d2699 100644 --- a/app/src/main/res/drawable/ic_privacy.xml +++ b/app/src/main/res/drawable/ic_privacy.xml @@ -5,5 +5,8 @@ android:viewportHeight="1024"> + android:pathData="M615.51,402.9a34.13,34.13 0,0 1,51.16 45.08l-2.18,2.45 -149.61,154.15a34.13,34.13 0,0 1,-44.07 4.18l-2.65,-2.05 -106.41,-91.39a34.13,34.13 0,0 1,41.9 -53.8l2.6,2.01 82.01,70.46 127.25,-131.09z" /> + diff --git a/app/src/main/res/drawable/ic_push_setting.xml b/app/src/main/res/drawable/ic_push_setting.xml index 69e0c3f..c03f19f 100644 --- a/app/src/main/res/drawable/ic_push_setting.xml +++ b/app/src/main/res/drawable/ic_push_setting.xml @@ -5,30 +5,5 @@ android:viewportHeight="1024"> - + android:pathData="M932.6,832L432.8,832c-9.4,0 -18.4,-4.4 -24,-12 -5.6,-7.6 -7.4,-17.4 -4.8,-26.4l24.4,-84.4c0.4,-1.2 0.8,-2.4 1.4,-3.6 1.6,-3.6 2.4,-7.4 2.4,-11.4L432.2,480.8c0,-137.8 112.2,-250 250,-250 138.4,0 251,112.2 251,250v213.4c0,4 0.8,7.8 2.4,11.4 0.6,1.2 1,2.4 1.4,3.6l24.4,84.4c2.6,9 0.8,18.8 -4.8,26.4 -5.8,7.6 -14.6,12 -24,12zM472.6,772h420l-12.8,-44.4c-4.4,-10.6 -6.6,-21.8 -6.6,-33.4L873.2,480.8c0,-104.8 -85.6,-190 -191,-190 -104.8,0 -190.2,85.2 -190.2,190v213.4c0,11.6 -2.2,22.8 -6.6,33.4l-12.8,44.4zM833.4,507.6c0,-104 -58.2,-176.8 -141.4,-176.8 -16.6,0 -30,13.4 -30,30s13.4,30 30,30c64.2,0 81.4,73.4 81.4,116.8 0,16.6 13.4,30 30,30s30,-13.4 30,-30zM785.8,895c0,-16.6 -13.4,-30 -30,-30h-146.2c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h146.2c16.6,0 30,-13.4 30,-30zM364.6,923.6c0,-16.6 -13.4,-30 -30,-30L180.4,893.6c-32.4,0 -58.8,-26.4 -58.8,-58.8L121.6,189.2c0,-32.4 26.4,-58.8 58.8,-58.8h514.8c32.4,0 58.8,26.4 58.8,58.8 0,16.6 13.4,30 30,30s30,-13.4 30,-30c0,-65.6 -53.4,-118.8 -118.8,-118.8L180.4,70.4c-65.6,0 -118.8,53.4 -118.8,118.8v645.4c0,65.6 53.4,118.8 118.8,118.8h154.2c16.6,0.2 30,-13.2 30,-29.8zM354.4,327.2c0,-16.6 -13.4,-30 -30,-30h-104.2c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h104.2c16.6,0 30,-13.4 30,-30zM317.6,492.6c0,-16.6 -13.4,-30 -30,-30h-67.4c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h67.4c16.6,0 30,-13.4 30,-30zM334,658c0,-16.6 -13.4,-30 -30,-30h-83.8c-16.6,0 -30,13.4 -30,30s13.4,30 30,30L304,688c16.4,0 30,-13.4 30,-30z" /> diff --git a/app/src/main/res/drawable/ic_total_sample.xml b/app/src/main/res/drawable/ic_total_sample.xml new file mode 100644 index 0000000..6bad12a --- /dev/null +++ b/app/src/main/res/drawable/ic_total_sample.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_total_verify.xml b/app/src/main/res/drawable/ic_total_verify.xml new file mode 100644 index 0000000..4ff7f08 --- /dev/null +++ b/app/src/main/res/drawable/ic_total_verify.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_update.xml b/app/src/main/res/drawable/ic_update.xml index b361057..bcc9397 100644 --- a/app/src/main/res/drawable/ic_update.xml +++ b/app/src/main/res/drawable/ic_update.xml @@ -5,5 +5,11 @@ android:viewportHeight="1024"> + android:pathData="M774.56,775.16H558.41a27,27 0,1 1,0 -54.1h216.15a27,27 0,1 1,0 54.1zM327.65,841.85H192.54a27,27 0,1 1,0 -54.09h135.11a27,27 0,1 1,0 54.09zM287.13,950.79h-54a27,27 0,0 1,0 -54.1h54a27,27 0,1 1,0 54.1zM774.56,423.89h-162.1a27,27 0,1 1,0 -54.09h162.1a27,27 0,1 1,0 54.09zM774.56,599.52H558.41a27,27 0,1 1,0 -54.09h216.15a27,27 0,1 1,0 54.09zM937.38,328.67H832.57a81.24,81.24 0,0 1,-81.15 -81.15V112.28a27.05,27.05 0,1 1,54.1 0v135.24a27.06,27.06 0,0 0,27.05 27h104.81a27.05,27.05 0,0 1,0 54.1z" /> + + diff --git a/app/src/main/res/drawable/ic_verified.xml b/app/src/main/res/drawable/ic_verified.xml new file mode 100644 index 0000000..aeb63f6 --- /dev/null +++ b/app/src/main/res/drawable/ic_verified.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/layout/fragment_future_task.xml b/app/src/main/res/layout/fragment_future_task.xml new file mode 100644 index 0000000..dd959d2 --- /dev/null +++ b/app/src/main/res/layout/fragment_future_task.xml @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt new file mode 100644 index 0000000..621d5d4 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt @@ -0,0 +1,18 @@ +package com.casic.xz.meterage.adapter + +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager +import androidx.fragment.app.FragmentPagerAdapter + +class SubViewPagerAdapter( + manager: FragmentManager, + private val pages: ArrayList, + private val titles: Array +) : FragmentPagerAdapter(manager) { + + override fun getItem(position: Int): Fragment = pages[position] + + override fun getCount(): Int = pages.size + + override fun getPageTitle(position: Int): CharSequence = titles[position] +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index f54f94a..afa0759 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,11 +1,32 @@ package com.casic.xz.meterage.fragment +import androidx.fragment.app.Fragment import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.SubViewPagerAdapter +import com.casic.xz.meterage.fragment.sample.FutureTaskFragment +import com.casic.xz.meterage.fragment.sample.TotalTaskFragment +import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_sample.* -class SamplePageFragment : KotlinBaseFragment(){ +class SamplePageFragment : KotlinBaseFragment() { + + private var fragmentPages: ArrayList = ArrayList() + + init { + fragmentPages.add(UnderTaskFragment()) + fragmentPages.add(FutureTaskFragment()) + fragmentPages.add(TotalTaskFragment()) + } + override fun initData() { + val samplePageTitles = arrayOf("检定中 0", "预期任务 0", "全部 0") + sampleViewPager.adapter = SubViewPagerAdapter( + childFragmentManager, fragmentPages, samplePageTitles + ) + //绑定 + topTabLayout.setupWithViewPager(sampleViewPager) } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt new file mode 100644 index 0000000..ebad65f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.sample + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class FutureTaskFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_future_task + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/sample/TotalTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/sample/TotalTaskFragment.kt new file mode 100644 index 0000000..1968ed2 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/sample/TotalTaskFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.sample + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TotalTaskFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_total_task + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/sample/UnderTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/sample/UnderTaskFragment.kt new file mode 100644 index 0000000..da5c3f3 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/sample/UnderTaskFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.sample + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class UnderTaskFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_under_task + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml index b41f4ac..c7546e4 100644 --- a/app/src/main/res/drawable/ic_about.xml +++ b/app/src/main/res/drawable/ic_about.xml @@ -5,8 +5,5 @@ android:viewportHeight="1024"> - + android:pathData="M300.93,453.16c11.5,-2.59 18.74,-14.02 16.15,-25.53 -5.44,-24.16 -6.26,-48.98 -2.43,-73.71C331.33,245.86 432.8,171.54 540.95,188.29c25.5,3.94 49.54,12.59 71.42,25.7 10.16,6.07 23.24,2.77 29.3,-7.34 6.05,-10.13 2.75,-23.24 -7.36,-29.3 -26.66,-15.95 -55.88,-26.48 -86.84,-31.26 -131.27,-20.32 -254.74,69.98 -275.07,201.33 -4.62,30.06 -3.62,60.2 2.99,89.59 2.23,9.95 11.05,16.69 20.82,16.69 1.57,-0.01 3.14,-0.2 4.72,-0.53zM895.38,612.43c0,-30.54 -11.99,-57.46 -32.14,-76.09 20.22,-46.71 31.58,-98.08 31.58,-152.1C894.82,172.37 722.46,0 510.61,0 298.75,0 126.38,172.37 126.38,384.24c0,126.89 61.98,239.39 157.13,309.4a106.69,106.69 0,0 0,2.64 11.4c3.62,12.37 8.62,23.45 14.94,33.05 34.45,52.54 73.5,112.04 112.24,170.06 39.24,58.74 96.04,95.27 168.8,108.56 9.16,1.61 17.54,2.71 25.63,3.74 3.89,0.52 7.78,1.03 11.64,1.58 3.05,0.45 6.14,0.65 9.22,0.65h43.39c3.41,0 6.83,-0.23 10.21,-0.82 3.82,-0.62 7.63,-1.21 11.49,-1.8a2627.42,2627.42 0,0 0,19.7 -3.15c91.92,-15.87 161.29,-85 176.84,-176.22 3.18,-18.23 4.83,-36.71 4.9,-54.77 0.22,-68.46 0.22,-77.04 0.2,-104.73 0,-14.2 0,-33.52 0.02,-68.75zM190.45,384.23c0,-176.85 143.35,-320.17 320.16,-320.17s320.16,143.32 320.16,320.17c0,44.88 -9.4,87.5 -26.09,126.26 -3,-0.29 -5.99,-0.49 -9,-0.49a99.29,99.29 0,0 0,-26.95 3.71c-9.98,-9.44 -21.92,-16.83 -35.32,-21.43 -2.23,-0.73 -4.45,-1.37 -6.65,-1.96 10.54,-21.32 18.18,-44.51 21.98,-69.26 8.26,-53.24 -1.15,-106.25 -27.18,-153.33 -5.7,-10.31 -18.69,-14.07 -29.02,-8.36 -10.31,5.71 -14.05,18.7 -8.35,29.02 21.41,38.71 29.14,82.34 22.35,126.13 -4.3,27.64 -14.22,52.92 -28.34,75.1 -1.27,0.3 -2.6,0.43 -3.85,0.78 -8.78,-8.07 -19.31,-14.72 -31.37,-19.78 -9.2,-4.9 -19.5,-7.45 -29.99,-7.45h-2.16c0,-27.51 0,-53.6 -0.03,-74.53 0,-52.01 -34.53,-92.43 -85.95,-100.51a92.3,92.3 0,0 0,-14.37 -1.15c-50.27,0 -94.47,40.42 -98.51,90.09 -0.48,6.38 -0.48,11.74 -0.48,16.05v162.58c-19.94,-11.45 -37.93,-26.28 -52.95,-44.22 -7.55,-9.04 -21,-10.25 -30.08,-2.68 -9.03,7.57 -10.23,21.04 -2.68,30.1 10.42,12.44 22.1,23.59 34.63,33.57 -25.95,6.62 -48.7,23.19 -62.88,46.41 -0.55,0.9 -0.97,1.84 -1.49,2.75 -64.79,-58.6 -105.57,-143.19 -105.57,-237.41zM831.09,785.7c-0.07,14.72 -1.46,29.65 -3.99,44.21 -10.98,64.43 -59.79,112.68 -124.43,123.82 -10.16,1.72 -20.44,3.24 -30.65,4.9h-43.4c-11.63,-1.72 -23.37,-2.94 -34.97,-5 -53.34,-9.73 -96.64,-35.58 -127.02,-81.08 -37.67,-56.37 -74.81,-112.96 -111.96,-169.6 -3.14,-4.78 -5.38,-10.33 -7.01,-15.82 -6.95,-23.93 7.16,-48.66 30.71,-53.22 3.42,-0.64 6.74,-0.99 9.89,-0.99 14.31,0 26.51,6.47 35.85,18.57 15.57,20.13 30.29,40.92 45.36,61.42a369.92,369.92 0,0 0,4.84 6.52c0.39,-0.17 0.82,-0.3 1.22,-0.49v-5.75,-320.07c0,-3.64 0,-7.24 0.28,-10.87 1.38,-16.89 17.86,-31.19 34.66,-31.19 1.45,0 2.96,0.12 4.43,0.36 19.88,3.13 31.84,16.94 31.84,37.27 0.05,56.97 0,152.32 0.08,209.34 0,2.96 0.19,6.06 1.06,8.86 1.46,4.61 4.94,7.08 9.88,7.46h1.05c4.72,0 8.2,-2.36 10.06,-6.59 1.19,-2.62 1.26,-5.83 1.26,-8.82 0,-19.61 -0.05,-25.79 -0.05,-25.79l-0.07,18.23c0,-0.06 0,-6.3 0.05,-25.8 0,-12.88 4.32,-24.08 15.27,-31.69 4.03,-2.75 8.83,-4.47 13.26,-6.64h14.39c0.51,0.37 0.92,0.84 1.47,1.04 18.72,6.44 27.42,18.58 27.42,38.26 -0.06,19.31 -0.06,25.46 -0.06,25.46l-0.02,-18.79v25.49c0,1.84 -0.06,3.62 0.13,5.4 0.78,6.15 5.51,10.23 11.48,10.23 0.39,0 0.74,0 1.12,-0.02 6.31,-0.57 9.92,-4.88 10.36,-12.68v-0.19c0.03,-0.47 0.03,-0.96 0.03,-1.43v-12.12c0.28,-8.39 2.34,-16.3 7.74,-23.13 7.09,-8.99 17.41,-13.88 28.18,-13.88 3.91,0 7.88,0.65 11.73,1.95 14.79,5.1 24.25,19.45 24.25,36.59 -0.02,19.31 -0.05,25.48 -0.05,25.48 -0.01,0 -0.05,-18.81 -0.07,-18.81 0,0 -0.01,6.15 -0.01,25.5 0,2.2 0,4.43 0.23,6.61 0.71,5.8 4.47,8.8 9.86,9.86a7.59,7.59 0,0 0,1.68 0.16c4.26,0 8.79,-2.97 10.23,-7.24 0.92,-2.77 1.18,-5.86 1.18,-8.86 0,-2.62 0,-4.88 0.01,-6.77v12.98c0.07,0 0.11,-3.89 0.15,-15.16 0.07,-6.25 1.2,-12.92 3.67,-18.63 5.64,-12.79 18.6,-20.52 31.96,-20.52 2.47,0 4.9,0.29 7.36,0.82 17.32,3.79 28.26,18.49 28.26,37.52 -0.06,103.54 0.1,69.78 -0.22,173.33z" /> diff --git a/app/src/main/res/drawable/ic_collection.xml b/app/src/main/res/drawable/ic_collection.xml index ce1a8a2..4d2016b 100644 --- a/app/src/main/res/drawable/ic_collection.xml +++ b/app/src/main/res/drawable/ic_collection.xml @@ -5,8 +5,5 @@ android:viewportHeight="1024"> - + android:pathData="M139.64,930.91 L512,774.48 884.36,930.91 884.36,93.09 139.64,93.09 139.64,930.91ZM79.79,93.09C79.79,60.04 106.59,33.25 139.64,33.25L884.36,33.25C917.41,33.25 944.21,60.04 944.21,93.09L944.21,930.91C944.21,973.69 900.62,1002.65 861.18,986.08L488.82,829.65 535.18,829.65 162.81,986.08C123.38,1002.65 79.79,973.69 79.79,930.91L79.79,93.09ZM512,606.67 L628.8,659.86C652.63,670.7 668.89,658.58 665.59,632.98L649.71,509.73 738.03,418.34C755.56,400.2 749.98,381.09 724.83,376.4L597.09,352.58 534.8,243.1C522.43,221.36 501.6,221.3 488.77,243.84L426.98,352.4 299.23,376.26C274.26,380.93 268.17,399.75 286.02,418.22L374.29,509.61 358.41,632.86C355.12,658.41 371.59,670.5 395.2,659.77L512,606.67ZM536.77,661.15 L419.97,714.25C353.79,744.33 289.76,697.43 299.06,625.22L314.93,501.96 331.24,551.18 242.98,459.8C192.09,407.12 216.3,330.88 288.24,317.44L415.99,293.57 374.97,322.79 436.76,214.24C472.3,151.8 551.26,151 586.82,213.51L649.1,322.98 608.06,293.75 735.8,317.57C808.03,331.04 831.6,407.64 781.06,459.93L692.74,551.31 709.07,502.08 724.94,625.34C734.25,697.6 670.4,744.55 604,714.32L487.2,661.14 536.77,661.15Z" /> diff --git a/app/src/main/res/drawable/ic_help.xml b/app/src/main/res/drawable/ic_help.xml index 3835c32..cf1f741 100644 --- a/app/src/main/res/drawable/ic_help.xml +++ b/app/src/main/res/drawable/ic_help.xml @@ -5,11 +5,5 @@ android:viewportHeight="1024"> - - + android:pathData="M860.2,64.2L264,64.2c-110.5,0 -200,89.5 -200,200v538.9c-0.3,3.7 -0.4,7.4 -0.4,11.1h0.5C66.6,895 132.8,959.6 214,959.6h646.2c55.2,0 100,-44.8 100,-100L960.2,164.2c0,-55.2 -44.8,-100 -100,-100zM499.4,473.4l-58.7,-52.1c-0.1,-0.1 -0.2,-0.1 -0.2,-0.2 -0.3,-0.3 -0.7,-0.6 -1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.4,-0.3 -0.7,-0.5 -1.1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.3,-0.2 -0.7,-0.5 -1.1,-0.7 -0.2,-0.1 -0.3,-0.2 -0.5,-0.3 -0.3,-0.2 -0.7,-0.4 -1,-0.6l-0.6,-0.3c-0.3,-0.2 -0.6,-0.3 -0.9,-0.5 -0.2,-0.1 -0.5,-0.3 -0.7,-0.4 -0.3,-0.1 -0.5,-0.3 -0.8,-0.4 -0.3,-0.1 -0.6,-0.3 -0.9,-0.4 -0.2,-0.1 -0.4,-0.2 -0.7,-0.3 -0.3,-0.1 -0.7,-0.3 -1,-0.4 -0.2,-0.1 -0.4,-0.1 -0.6,-0.2 -0.4,-0.1 -0.7,-0.3 -1.1,-0.4 -0.2,-0.1 -0.3,-0.1 -0.5,-0.2l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.2 -1.2,-0.2 -0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.1 -1.2,-0.2 -0.2,0 -0.4,0 -0.6,-0.1 -0.4,0 -0.7,-0.1 -1.1,-0.1h-5.1c-0.3,0 -0.7,0.1 -1,0.1 -0.2,0 -0.4,0 -0.7,0.1 -0.4,0 -0.7,0.1 -1.1,0.1 -0.2,0 -0.4,0.1 -0.6,0.1 -0.4,0.1 -0.8,0.1 -1.2,0.2 -0.2,0 -0.4,0.1 -0.5,0.1l-1.2,0.3c-0.2,0 -0.4,0.1 -0.5,0.1 -0.4,0.1 -0.7,0.2 -1.1,0.3 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.4,0.1 -0.7,0.2 -1,0.4 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.3,0.1 -0.6,0.2 -0.9,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.1 -0.5,0.2 -0.8,0.4 -0.3,0.1 -0.6,0.3 -0.8,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.2 -0.6,0.3 -1,0.5 -0.2,0.1 -0.4,0.2 -0.5,0.3 -0.4,0.2 -0.7,0.4 -1,0.6 -0.1,0.1 -0.3,0.2 -0.4,0.3 -0.4,0.2 -0.7,0.5 -1.1,0.7 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.4,0.3 -0.7,0.5 -1.1,0.8 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.3,0.3 -0.7,0.6 -1,0.9 -0.1,0.1 -0.2,0.1 -0.2,0.2L332.7,474L332.7,136.2h166.7v337.2zM173.5,173.7c23.4,-23.4 54.2,-36.6 87.2,-37.4L260.7,555.7c0,0.3 0,0.7 0.1,1 0,0.3 0.1,0.5 0.1,0.8 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8l0.3,0.9c0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.4,0.8 0.1,0.3 0.2,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.2,0.3 0.3,0.5 0.5,0.8 0.1,0.2 0.3,0.5 0.5,0.7 0.2,0.3 0.4,0.5 0.5,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.4,0.5 0.6,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.5,0.6 0.7,0.8l0.3,0.3 0.2,0.2c0.3,0.3 0.6,0.6 0.8,0.9l0.5,0.5 0.8,0.8c0.9,0.9 1.9,1.7 2.9,2.5 0.1,0.1 0.3,0.2 0.4,0.3 0.3,0.2 0.7,0.5 1,0.7 0.2,0.1 0.3,0.2 0.5,0.4 0.3,0.2 0.6,0.4 1,0.6 0.2,0.1 0.4,0.3 0.6,0.4 0.3,0.2 0.6,0.4 0.9,0.5 0.2,0.1 0.5,0.3 0.7,0.4 0.3,0.1 0.5,0.3 0.8,0.4 0.3,0.1 0.6,0.3 0.9,0.4 0.2,0.1 0.5,0.2 0.7,0.3 0.4,0.2 0.7,0.3 1.1,0.5 0.2,0.1 0.4,0.1 0.5,0.2 0.5,0.2 0.9,0.3 1.4,0.5 0.1,0 0.2,0.1 0.3,0.1 0.6,0.2 1.1,0.3 1.7,0.5h0.1c3,0.8 6.1,1.2 9.3,1.2h2.3c0.4,0 0.8,-0.1 1.1,-0.1 0.2,0 0.5,-0.1 0.7,-0.1 0.3,0 0.7,-0.1 1,-0.1 0.3,0 0.5,-0.1 0.8,-0.1 0.3,0 0.6,-0.1 0.9,-0.2 0.3,0 0.5,-0.1 0.8,-0.2 0.3,-0.1 0.6,-0.1 0.9,-0.2 0.3,-0.1 0.5,-0.1 0.8,-0.2l0.9,-0.3c0.2,-0.1 0.5,-0.1 0.7,-0.2 0.4,-0.1 0.7,-0.2 1.1,-0.4 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.5,-0.2 1,-0.4 1.6,-0.6 0.1,0 0.2,-0.1 0.3,-0.1 0.4,-0.2 0.9,-0.4 1.3,-0.6 0.2,-0.1 0.3,-0.2 0.5,-0.2 0.4,-0.2 0.7,-0.4 1,-0.5 0.2,-0.1 0.4,-0.2 0.5,-0.3 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.3 0.8,-0.5 0.2,-0.1 0.4,-0.3 0.6,-0.4 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.4,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.4 0.7,-0.6 0.1,-0.1 0.3,-0.2 0.4,-0.3l96.2,-84.3 94.9,84.1c0.2,0.1 0.3,0.3 0.5,0.4 0.2,0.2 0.4,0.4 0.7,0.6 0.2,0.2 0.5,0.4 0.7,0.5 0.2,0.2 0.4,0.3 0.7,0.5 0.3,0.2 0.5,0.4 0.8,0.6 0.2,0.1 0.4,0.3 0.6,0.4l0.9,0.6c0.2,0.1 0.3,0.2 0.5,0.3 0.4,0.2 0.7,0.4 1.1,0.6 0.1,0.1 0.2,0.1 0.3,0.2 0.5,0.3 1,0.5 1.5,0.8 0.5,0.3 1,0.5 1.6,0.7 0.1,0 0.2,0.1 0.2,0.1 0.4,0.2 0.9,0.4 1.3,0.5 0.2,0.1 0.4,0.1 0.6,0.2 0.3,0.1 0.7,0.2 1,0.3 0.2,0.1 0.5,0.1 0.7,0.2l0.9,0.3c0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0 0.5,0.1 0.8,0.1 0.3,0 0.7,0.1 1,0.1 0.2,0 0.5,0.1 0.7,0.1 0.4,0 0.8,0.1 1.1,0.1h2.3c3.8,0 7.5,-0.6 11,-1.7 0.1,0 0.2,-0.1 0.2,-0.1 0.5,-0.2 1,-0.3 1.5,-0.5 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.4,-0.2 0.8,-0.3 1.1,-0.5 0.2,-0.1 0.5,-0.2 0.7,-0.3 0.3,-0.1 0.6,-0.3 0.9,-0.4 0.3,-0.1 0.6,-0.3 0.8,-0.4 0.2,-0.1 0.5,-0.3 0.7,-0.4 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.4 1,-0.6 0.2,-0.1 0.4,-0.2 0.5,-0.4 0.3,-0.2 0.6,-0.4 1,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.3,-0.2 0.6,-0.5 0.9,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.4,-0.3 0.7,-0.6 1.1,-1 0.4,-0.3 0.7,-0.7 1,-1 0.1,-0.1 0.3,-0.3 0.4,-0.5l0.9,-0.9 0.1,-0.1c0.1,-0.1 0.2,-0.3 0.4,-0.4 0.2,-0.3 0.5,-0.5 0.7,-0.8 0.2,-0.2 0.3,-0.4 0.5,-0.6 0.2,-0.3 0.4,-0.5 0.6,-0.8 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.2 0.2,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8l0.3,-0.9c0.1,-0.3 0.2,-0.5 0.2,-0.8 0.1,-0.3 0.2,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.5 0.2,-0.8 0.1,-0.3 0.1,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.6 0.2,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.5 0.1,-0.8 0,-0.3 0.1,-0.7 0.1,-1v-0.8,-1.1 -417.9h288.8c15.4,0 28,12.6 28,28v504L209.7,668.2c-26.9,0 -52,7.3 -73.7,20v-424c0,-34.2 13.3,-66.3 37.5,-90.5zM860.2,887.6L214,887.6c-43,0 -78,-35 -78,-78v-3.1c3.9,-37.2 35.5,-66.2 73.7,-66.2h678.5v119.3c0,15.4 -12.6,28 -28,28z" /> diff --git a/app/src/main/res/drawable/ic_overtime.xml b/app/src/main/res/drawable/ic_overtime.xml new file mode 100644 index 0000000..6916eca --- /dev/null +++ b/app/src/main/res/drawable/ic_overtime.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_privacy.xml b/app/src/main/res/drawable/ic_privacy.xml index 22ef981..92d2699 100644 --- a/app/src/main/res/drawable/ic_privacy.xml +++ b/app/src/main/res/drawable/ic_privacy.xml @@ -5,5 +5,8 @@ android:viewportHeight="1024"> + android:pathData="M615.51,402.9a34.13,34.13 0,0 1,51.16 45.08l-2.18,2.45 -149.61,154.15a34.13,34.13 0,0 1,-44.07 4.18l-2.65,-2.05 -106.41,-91.39a34.13,34.13 0,0 1,41.9 -53.8l2.6,2.01 82.01,70.46 127.25,-131.09z" /> + diff --git a/app/src/main/res/drawable/ic_push_setting.xml b/app/src/main/res/drawable/ic_push_setting.xml index 69e0c3f..c03f19f 100644 --- a/app/src/main/res/drawable/ic_push_setting.xml +++ b/app/src/main/res/drawable/ic_push_setting.xml @@ -5,30 +5,5 @@ android:viewportHeight="1024"> - + android:pathData="M932.6,832L432.8,832c-9.4,0 -18.4,-4.4 -24,-12 -5.6,-7.6 -7.4,-17.4 -4.8,-26.4l24.4,-84.4c0.4,-1.2 0.8,-2.4 1.4,-3.6 1.6,-3.6 2.4,-7.4 2.4,-11.4L432.2,480.8c0,-137.8 112.2,-250 250,-250 138.4,0 251,112.2 251,250v213.4c0,4 0.8,7.8 2.4,11.4 0.6,1.2 1,2.4 1.4,3.6l24.4,84.4c2.6,9 0.8,18.8 -4.8,26.4 -5.8,7.6 -14.6,12 -24,12zM472.6,772h420l-12.8,-44.4c-4.4,-10.6 -6.6,-21.8 -6.6,-33.4L873.2,480.8c0,-104.8 -85.6,-190 -191,-190 -104.8,0 -190.2,85.2 -190.2,190v213.4c0,11.6 -2.2,22.8 -6.6,33.4l-12.8,44.4zM833.4,507.6c0,-104 -58.2,-176.8 -141.4,-176.8 -16.6,0 -30,13.4 -30,30s13.4,30 30,30c64.2,0 81.4,73.4 81.4,116.8 0,16.6 13.4,30 30,30s30,-13.4 30,-30zM785.8,895c0,-16.6 -13.4,-30 -30,-30h-146.2c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h146.2c16.6,0 30,-13.4 30,-30zM364.6,923.6c0,-16.6 -13.4,-30 -30,-30L180.4,893.6c-32.4,0 -58.8,-26.4 -58.8,-58.8L121.6,189.2c0,-32.4 26.4,-58.8 58.8,-58.8h514.8c32.4,0 58.8,26.4 58.8,58.8 0,16.6 13.4,30 30,30s30,-13.4 30,-30c0,-65.6 -53.4,-118.8 -118.8,-118.8L180.4,70.4c-65.6,0 -118.8,53.4 -118.8,118.8v645.4c0,65.6 53.4,118.8 118.8,118.8h154.2c16.6,0.2 30,-13.2 30,-29.8zM354.4,327.2c0,-16.6 -13.4,-30 -30,-30h-104.2c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h104.2c16.6,0 30,-13.4 30,-30zM317.6,492.6c0,-16.6 -13.4,-30 -30,-30h-67.4c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h67.4c16.6,0 30,-13.4 30,-30zM334,658c0,-16.6 -13.4,-30 -30,-30h-83.8c-16.6,0 -30,13.4 -30,30s13.4,30 30,30L304,688c16.4,0 30,-13.4 30,-30z" /> diff --git a/app/src/main/res/drawable/ic_total_sample.xml b/app/src/main/res/drawable/ic_total_sample.xml new file mode 100644 index 0000000..6bad12a --- /dev/null +++ b/app/src/main/res/drawable/ic_total_sample.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_total_verify.xml b/app/src/main/res/drawable/ic_total_verify.xml new file mode 100644 index 0000000..4ff7f08 --- /dev/null +++ b/app/src/main/res/drawable/ic_total_verify.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_update.xml b/app/src/main/res/drawable/ic_update.xml index b361057..bcc9397 100644 --- a/app/src/main/res/drawable/ic_update.xml +++ b/app/src/main/res/drawable/ic_update.xml @@ -5,5 +5,11 @@ android:viewportHeight="1024"> + android:pathData="M774.56,775.16H558.41a27,27 0,1 1,0 -54.1h216.15a27,27 0,1 1,0 54.1zM327.65,841.85H192.54a27,27 0,1 1,0 -54.09h135.11a27,27 0,1 1,0 54.09zM287.13,950.79h-54a27,27 0,0 1,0 -54.1h54a27,27 0,1 1,0 54.1zM774.56,423.89h-162.1a27,27 0,1 1,0 -54.09h162.1a27,27 0,1 1,0 54.09zM774.56,599.52H558.41a27,27 0,1 1,0 -54.09h216.15a27,27 0,1 1,0 54.09zM937.38,328.67H832.57a81.24,81.24 0,0 1,-81.15 -81.15V112.28a27.05,27.05 0,1 1,54.1 0v135.24a27.06,27.06 0,0 0,27.05 27h104.81a27.05,27.05 0,0 1,0 54.1z" /> + + diff --git a/app/src/main/res/drawable/ic_verified.xml b/app/src/main/res/drawable/ic_verified.xml new file mode 100644 index 0000000..aeb63f6 --- /dev/null +++ b/app/src/main/res/drawable/ic_verified.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/layout/fragment_future_task.xml b/app/src/main/res/layout/fragment_future_task.xml new file mode 100644 index 0000000..dd959d2 --- /dev/null +++ b/app/src/main/res/layout/fragment_future_task.xml @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml index c8d6d99..b319fa0 100644 --- a/app/src/main/res/layout/fragment_mine.xml +++ b/app/src/main/res/layout/fragment_mine.xml @@ -61,6 +61,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_7" android:fontFamily="sans-serif-black" + android:singleLine="true" android:text="北京达佳科技有限公司" android:textColor="@color/mainTextColor" android:textSize="@dimen/sp_18" /> diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt new file mode 100644 index 0000000..621d5d4 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt @@ -0,0 +1,18 @@ +package com.casic.xz.meterage.adapter + +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager +import androidx.fragment.app.FragmentPagerAdapter + +class SubViewPagerAdapter( + manager: FragmentManager, + private val pages: ArrayList, + private val titles: Array +) : FragmentPagerAdapter(manager) { + + override fun getItem(position: Int): Fragment = pages[position] + + override fun getCount(): Int = pages.size + + override fun getPageTitle(position: Int): CharSequence = titles[position] +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index f54f94a..afa0759 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,11 +1,32 @@ package com.casic.xz.meterage.fragment +import androidx.fragment.app.Fragment import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.SubViewPagerAdapter +import com.casic.xz.meterage.fragment.sample.FutureTaskFragment +import com.casic.xz.meterage.fragment.sample.TotalTaskFragment +import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_sample.* -class SamplePageFragment : KotlinBaseFragment(){ +class SamplePageFragment : KotlinBaseFragment() { + + private var fragmentPages: ArrayList = ArrayList() + + init { + fragmentPages.add(UnderTaskFragment()) + fragmentPages.add(FutureTaskFragment()) + fragmentPages.add(TotalTaskFragment()) + } + override fun initData() { + val samplePageTitles = arrayOf("检定中 0", "预期任务 0", "全部 0") + sampleViewPager.adapter = SubViewPagerAdapter( + childFragmentManager, fragmentPages, samplePageTitles + ) + //绑定 + topTabLayout.setupWithViewPager(sampleViewPager) } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt new file mode 100644 index 0000000..ebad65f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.sample + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class FutureTaskFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_future_task + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/sample/TotalTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/sample/TotalTaskFragment.kt new file mode 100644 index 0000000..1968ed2 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/sample/TotalTaskFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.sample + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TotalTaskFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_total_task + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/sample/UnderTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/sample/UnderTaskFragment.kt new file mode 100644 index 0000000..da5c3f3 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/sample/UnderTaskFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.sample + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class UnderTaskFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_under_task + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml index b41f4ac..c7546e4 100644 --- a/app/src/main/res/drawable/ic_about.xml +++ b/app/src/main/res/drawable/ic_about.xml @@ -5,8 +5,5 @@ android:viewportHeight="1024"> - + android:pathData="M300.93,453.16c11.5,-2.59 18.74,-14.02 16.15,-25.53 -5.44,-24.16 -6.26,-48.98 -2.43,-73.71C331.33,245.86 432.8,171.54 540.95,188.29c25.5,3.94 49.54,12.59 71.42,25.7 10.16,6.07 23.24,2.77 29.3,-7.34 6.05,-10.13 2.75,-23.24 -7.36,-29.3 -26.66,-15.95 -55.88,-26.48 -86.84,-31.26 -131.27,-20.32 -254.74,69.98 -275.07,201.33 -4.62,30.06 -3.62,60.2 2.99,89.59 2.23,9.95 11.05,16.69 20.82,16.69 1.57,-0.01 3.14,-0.2 4.72,-0.53zM895.38,612.43c0,-30.54 -11.99,-57.46 -32.14,-76.09 20.22,-46.71 31.58,-98.08 31.58,-152.1C894.82,172.37 722.46,0 510.61,0 298.75,0 126.38,172.37 126.38,384.24c0,126.89 61.98,239.39 157.13,309.4a106.69,106.69 0,0 0,2.64 11.4c3.62,12.37 8.62,23.45 14.94,33.05 34.45,52.54 73.5,112.04 112.24,170.06 39.24,58.74 96.04,95.27 168.8,108.56 9.16,1.61 17.54,2.71 25.63,3.74 3.89,0.52 7.78,1.03 11.64,1.58 3.05,0.45 6.14,0.65 9.22,0.65h43.39c3.41,0 6.83,-0.23 10.21,-0.82 3.82,-0.62 7.63,-1.21 11.49,-1.8a2627.42,2627.42 0,0 0,19.7 -3.15c91.92,-15.87 161.29,-85 176.84,-176.22 3.18,-18.23 4.83,-36.71 4.9,-54.77 0.22,-68.46 0.22,-77.04 0.2,-104.73 0,-14.2 0,-33.52 0.02,-68.75zM190.45,384.23c0,-176.85 143.35,-320.17 320.16,-320.17s320.16,143.32 320.16,320.17c0,44.88 -9.4,87.5 -26.09,126.26 -3,-0.29 -5.99,-0.49 -9,-0.49a99.29,99.29 0,0 0,-26.95 3.71c-9.98,-9.44 -21.92,-16.83 -35.32,-21.43 -2.23,-0.73 -4.45,-1.37 -6.65,-1.96 10.54,-21.32 18.18,-44.51 21.98,-69.26 8.26,-53.24 -1.15,-106.25 -27.18,-153.33 -5.7,-10.31 -18.69,-14.07 -29.02,-8.36 -10.31,5.71 -14.05,18.7 -8.35,29.02 21.41,38.71 29.14,82.34 22.35,126.13 -4.3,27.64 -14.22,52.92 -28.34,75.1 -1.27,0.3 -2.6,0.43 -3.85,0.78 -8.78,-8.07 -19.31,-14.72 -31.37,-19.78 -9.2,-4.9 -19.5,-7.45 -29.99,-7.45h-2.16c0,-27.51 0,-53.6 -0.03,-74.53 0,-52.01 -34.53,-92.43 -85.95,-100.51a92.3,92.3 0,0 0,-14.37 -1.15c-50.27,0 -94.47,40.42 -98.51,90.09 -0.48,6.38 -0.48,11.74 -0.48,16.05v162.58c-19.94,-11.45 -37.93,-26.28 -52.95,-44.22 -7.55,-9.04 -21,-10.25 -30.08,-2.68 -9.03,7.57 -10.23,21.04 -2.68,30.1 10.42,12.44 22.1,23.59 34.63,33.57 -25.95,6.62 -48.7,23.19 -62.88,46.41 -0.55,0.9 -0.97,1.84 -1.49,2.75 -64.79,-58.6 -105.57,-143.19 -105.57,-237.41zM831.09,785.7c-0.07,14.72 -1.46,29.65 -3.99,44.21 -10.98,64.43 -59.79,112.68 -124.43,123.82 -10.16,1.72 -20.44,3.24 -30.65,4.9h-43.4c-11.63,-1.72 -23.37,-2.94 -34.97,-5 -53.34,-9.73 -96.64,-35.58 -127.02,-81.08 -37.67,-56.37 -74.81,-112.96 -111.96,-169.6 -3.14,-4.78 -5.38,-10.33 -7.01,-15.82 -6.95,-23.93 7.16,-48.66 30.71,-53.22 3.42,-0.64 6.74,-0.99 9.89,-0.99 14.31,0 26.51,6.47 35.85,18.57 15.57,20.13 30.29,40.92 45.36,61.42a369.92,369.92 0,0 0,4.84 6.52c0.39,-0.17 0.82,-0.3 1.22,-0.49v-5.75,-320.07c0,-3.64 0,-7.24 0.28,-10.87 1.38,-16.89 17.86,-31.19 34.66,-31.19 1.45,0 2.96,0.12 4.43,0.36 19.88,3.13 31.84,16.94 31.84,37.27 0.05,56.97 0,152.32 0.08,209.34 0,2.96 0.19,6.06 1.06,8.86 1.46,4.61 4.94,7.08 9.88,7.46h1.05c4.72,0 8.2,-2.36 10.06,-6.59 1.19,-2.62 1.26,-5.83 1.26,-8.82 0,-19.61 -0.05,-25.79 -0.05,-25.79l-0.07,18.23c0,-0.06 0,-6.3 0.05,-25.8 0,-12.88 4.32,-24.08 15.27,-31.69 4.03,-2.75 8.83,-4.47 13.26,-6.64h14.39c0.51,0.37 0.92,0.84 1.47,1.04 18.72,6.44 27.42,18.58 27.42,38.26 -0.06,19.31 -0.06,25.46 -0.06,25.46l-0.02,-18.79v25.49c0,1.84 -0.06,3.62 0.13,5.4 0.78,6.15 5.51,10.23 11.48,10.23 0.39,0 0.74,0 1.12,-0.02 6.31,-0.57 9.92,-4.88 10.36,-12.68v-0.19c0.03,-0.47 0.03,-0.96 0.03,-1.43v-12.12c0.28,-8.39 2.34,-16.3 7.74,-23.13 7.09,-8.99 17.41,-13.88 28.18,-13.88 3.91,0 7.88,0.65 11.73,1.95 14.79,5.1 24.25,19.45 24.25,36.59 -0.02,19.31 -0.05,25.48 -0.05,25.48 -0.01,0 -0.05,-18.81 -0.07,-18.81 0,0 -0.01,6.15 -0.01,25.5 0,2.2 0,4.43 0.23,6.61 0.71,5.8 4.47,8.8 9.86,9.86a7.59,7.59 0,0 0,1.68 0.16c4.26,0 8.79,-2.97 10.23,-7.24 0.92,-2.77 1.18,-5.86 1.18,-8.86 0,-2.62 0,-4.88 0.01,-6.77v12.98c0.07,0 0.11,-3.89 0.15,-15.16 0.07,-6.25 1.2,-12.92 3.67,-18.63 5.64,-12.79 18.6,-20.52 31.96,-20.52 2.47,0 4.9,0.29 7.36,0.82 17.32,3.79 28.26,18.49 28.26,37.52 -0.06,103.54 0.1,69.78 -0.22,173.33z" /> diff --git a/app/src/main/res/drawable/ic_collection.xml b/app/src/main/res/drawable/ic_collection.xml index ce1a8a2..4d2016b 100644 --- a/app/src/main/res/drawable/ic_collection.xml +++ b/app/src/main/res/drawable/ic_collection.xml @@ -5,8 +5,5 @@ android:viewportHeight="1024"> - + android:pathData="M139.64,930.91 L512,774.48 884.36,930.91 884.36,93.09 139.64,93.09 139.64,930.91ZM79.79,93.09C79.79,60.04 106.59,33.25 139.64,33.25L884.36,33.25C917.41,33.25 944.21,60.04 944.21,93.09L944.21,930.91C944.21,973.69 900.62,1002.65 861.18,986.08L488.82,829.65 535.18,829.65 162.81,986.08C123.38,1002.65 79.79,973.69 79.79,930.91L79.79,93.09ZM512,606.67 L628.8,659.86C652.63,670.7 668.89,658.58 665.59,632.98L649.71,509.73 738.03,418.34C755.56,400.2 749.98,381.09 724.83,376.4L597.09,352.58 534.8,243.1C522.43,221.36 501.6,221.3 488.77,243.84L426.98,352.4 299.23,376.26C274.26,380.93 268.17,399.75 286.02,418.22L374.29,509.61 358.41,632.86C355.12,658.41 371.59,670.5 395.2,659.77L512,606.67ZM536.77,661.15 L419.97,714.25C353.79,744.33 289.76,697.43 299.06,625.22L314.93,501.96 331.24,551.18 242.98,459.8C192.09,407.12 216.3,330.88 288.24,317.44L415.99,293.57 374.97,322.79 436.76,214.24C472.3,151.8 551.26,151 586.82,213.51L649.1,322.98 608.06,293.75 735.8,317.57C808.03,331.04 831.6,407.64 781.06,459.93L692.74,551.31 709.07,502.08 724.94,625.34C734.25,697.6 670.4,744.55 604,714.32L487.2,661.14 536.77,661.15Z" /> diff --git a/app/src/main/res/drawable/ic_help.xml b/app/src/main/res/drawable/ic_help.xml index 3835c32..cf1f741 100644 --- a/app/src/main/res/drawable/ic_help.xml +++ b/app/src/main/res/drawable/ic_help.xml @@ -5,11 +5,5 @@ android:viewportHeight="1024"> - - + android:pathData="M860.2,64.2L264,64.2c-110.5,0 -200,89.5 -200,200v538.9c-0.3,3.7 -0.4,7.4 -0.4,11.1h0.5C66.6,895 132.8,959.6 214,959.6h646.2c55.2,0 100,-44.8 100,-100L960.2,164.2c0,-55.2 -44.8,-100 -100,-100zM499.4,473.4l-58.7,-52.1c-0.1,-0.1 -0.2,-0.1 -0.2,-0.2 -0.3,-0.3 -0.7,-0.6 -1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.4,-0.3 -0.7,-0.5 -1.1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.3,-0.2 -0.7,-0.5 -1.1,-0.7 -0.2,-0.1 -0.3,-0.2 -0.5,-0.3 -0.3,-0.2 -0.7,-0.4 -1,-0.6l-0.6,-0.3c-0.3,-0.2 -0.6,-0.3 -0.9,-0.5 -0.2,-0.1 -0.5,-0.3 -0.7,-0.4 -0.3,-0.1 -0.5,-0.3 -0.8,-0.4 -0.3,-0.1 -0.6,-0.3 -0.9,-0.4 -0.2,-0.1 -0.4,-0.2 -0.7,-0.3 -0.3,-0.1 -0.7,-0.3 -1,-0.4 -0.2,-0.1 -0.4,-0.1 -0.6,-0.2 -0.4,-0.1 -0.7,-0.3 -1.1,-0.4 -0.2,-0.1 -0.3,-0.1 -0.5,-0.2l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.2 -1.2,-0.2 -0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.1 -1.2,-0.2 -0.2,0 -0.4,0 -0.6,-0.1 -0.4,0 -0.7,-0.1 -1.1,-0.1h-5.1c-0.3,0 -0.7,0.1 -1,0.1 -0.2,0 -0.4,0 -0.7,0.1 -0.4,0 -0.7,0.1 -1.1,0.1 -0.2,0 -0.4,0.1 -0.6,0.1 -0.4,0.1 -0.8,0.1 -1.2,0.2 -0.2,0 -0.4,0.1 -0.5,0.1l-1.2,0.3c-0.2,0 -0.4,0.1 -0.5,0.1 -0.4,0.1 -0.7,0.2 -1.1,0.3 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.4,0.1 -0.7,0.2 -1,0.4 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.3,0.1 -0.6,0.2 -0.9,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.1 -0.5,0.2 -0.8,0.4 -0.3,0.1 -0.6,0.3 -0.8,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.2 -0.6,0.3 -1,0.5 -0.2,0.1 -0.4,0.2 -0.5,0.3 -0.4,0.2 -0.7,0.4 -1,0.6 -0.1,0.1 -0.3,0.2 -0.4,0.3 -0.4,0.2 -0.7,0.5 -1.1,0.7 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.4,0.3 -0.7,0.5 -1.1,0.8 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.3,0.3 -0.7,0.6 -1,0.9 -0.1,0.1 -0.2,0.1 -0.2,0.2L332.7,474L332.7,136.2h166.7v337.2zM173.5,173.7c23.4,-23.4 54.2,-36.6 87.2,-37.4L260.7,555.7c0,0.3 0,0.7 0.1,1 0,0.3 0.1,0.5 0.1,0.8 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8l0.3,0.9c0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.4,0.8 0.1,0.3 0.2,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.2,0.3 0.3,0.5 0.5,0.8 0.1,0.2 0.3,0.5 0.5,0.7 0.2,0.3 0.4,0.5 0.5,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.4,0.5 0.6,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.5,0.6 0.7,0.8l0.3,0.3 0.2,0.2c0.3,0.3 0.6,0.6 0.8,0.9l0.5,0.5 0.8,0.8c0.9,0.9 1.9,1.7 2.9,2.5 0.1,0.1 0.3,0.2 0.4,0.3 0.3,0.2 0.7,0.5 1,0.7 0.2,0.1 0.3,0.2 0.5,0.4 0.3,0.2 0.6,0.4 1,0.6 0.2,0.1 0.4,0.3 0.6,0.4 0.3,0.2 0.6,0.4 0.9,0.5 0.2,0.1 0.5,0.3 0.7,0.4 0.3,0.1 0.5,0.3 0.8,0.4 0.3,0.1 0.6,0.3 0.9,0.4 0.2,0.1 0.5,0.2 0.7,0.3 0.4,0.2 0.7,0.3 1.1,0.5 0.2,0.1 0.4,0.1 0.5,0.2 0.5,0.2 0.9,0.3 1.4,0.5 0.1,0 0.2,0.1 0.3,0.1 0.6,0.2 1.1,0.3 1.7,0.5h0.1c3,0.8 6.1,1.2 9.3,1.2h2.3c0.4,0 0.8,-0.1 1.1,-0.1 0.2,0 0.5,-0.1 0.7,-0.1 0.3,0 0.7,-0.1 1,-0.1 0.3,0 0.5,-0.1 0.8,-0.1 0.3,0 0.6,-0.1 0.9,-0.2 0.3,0 0.5,-0.1 0.8,-0.2 0.3,-0.1 0.6,-0.1 0.9,-0.2 0.3,-0.1 0.5,-0.1 0.8,-0.2l0.9,-0.3c0.2,-0.1 0.5,-0.1 0.7,-0.2 0.4,-0.1 0.7,-0.2 1.1,-0.4 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.5,-0.2 1,-0.4 1.6,-0.6 0.1,0 0.2,-0.1 0.3,-0.1 0.4,-0.2 0.9,-0.4 1.3,-0.6 0.2,-0.1 0.3,-0.2 0.5,-0.2 0.4,-0.2 0.7,-0.4 1,-0.5 0.2,-0.1 0.4,-0.2 0.5,-0.3 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.3 0.8,-0.5 0.2,-0.1 0.4,-0.3 0.6,-0.4 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.4,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.4 0.7,-0.6 0.1,-0.1 0.3,-0.2 0.4,-0.3l96.2,-84.3 94.9,84.1c0.2,0.1 0.3,0.3 0.5,0.4 0.2,0.2 0.4,0.4 0.7,0.6 0.2,0.2 0.5,0.4 0.7,0.5 0.2,0.2 0.4,0.3 0.7,0.5 0.3,0.2 0.5,0.4 0.8,0.6 0.2,0.1 0.4,0.3 0.6,0.4l0.9,0.6c0.2,0.1 0.3,0.2 0.5,0.3 0.4,0.2 0.7,0.4 1.1,0.6 0.1,0.1 0.2,0.1 0.3,0.2 0.5,0.3 1,0.5 1.5,0.8 0.5,0.3 1,0.5 1.6,0.7 0.1,0 0.2,0.1 0.2,0.1 0.4,0.2 0.9,0.4 1.3,0.5 0.2,0.1 0.4,0.1 0.6,0.2 0.3,0.1 0.7,0.2 1,0.3 0.2,0.1 0.5,0.1 0.7,0.2l0.9,0.3c0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0 0.5,0.1 0.8,0.1 0.3,0 0.7,0.1 1,0.1 0.2,0 0.5,0.1 0.7,0.1 0.4,0 0.8,0.1 1.1,0.1h2.3c3.8,0 7.5,-0.6 11,-1.7 0.1,0 0.2,-0.1 0.2,-0.1 0.5,-0.2 1,-0.3 1.5,-0.5 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.4,-0.2 0.8,-0.3 1.1,-0.5 0.2,-0.1 0.5,-0.2 0.7,-0.3 0.3,-0.1 0.6,-0.3 0.9,-0.4 0.3,-0.1 0.6,-0.3 0.8,-0.4 0.2,-0.1 0.5,-0.3 0.7,-0.4 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.4 1,-0.6 0.2,-0.1 0.4,-0.2 0.5,-0.4 0.3,-0.2 0.6,-0.4 1,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.3,-0.2 0.6,-0.5 0.9,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.4,-0.3 0.7,-0.6 1.1,-1 0.4,-0.3 0.7,-0.7 1,-1 0.1,-0.1 0.3,-0.3 0.4,-0.5l0.9,-0.9 0.1,-0.1c0.1,-0.1 0.2,-0.3 0.4,-0.4 0.2,-0.3 0.5,-0.5 0.7,-0.8 0.2,-0.2 0.3,-0.4 0.5,-0.6 0.2,-0.3 0.4,-0.5 0.6,-0.8 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.2 0.2,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8l0.3,-0.9c0.1,-0.3 0.2,-0.5 0.2,-0.8 0.1,-0.3 0.2,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.5 0.2,-0.8 0.1,-0.3 0.1,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.6 0.2,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.5 0.1,-0.8 0,-0.3 0.1,-0.7 0.1,-1v-0.8,-1.1 -417.9h288.8c15.4,0 28,12.6 28,28v504L209.7,668.2c-26.9,0 -52,7.3 -73.7,20v-424c0,-34.2 13.3,-66.3 37.5,-90.5zM860.2,887.6L214,887.6c-43,0 -78,-35 -78,-78v-3.1c3.9,-37.2 35.5,-66.2 73.7,-66.2h678.5v119.3c0,15.4 -12.6,28 -28,28z" /> diff --git a/app/src/main/res/drawable/ic_overtime.xml b/app/src/main/res/drawable/ic_overtime.xml new file mode 100644 index 0000000..6916eca --- /dev/null +++ b/app/src/main/res/drawable/ic_overtime.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_privacy.xml b/app/src/main/res/drawable/ic_privacy.xml index 22ef981..92d2699 100644 --- a/app/src/main/res/drawable/ic_privacy.xml +++ b/app/src/main/res/drawable/ic_privacy.xml @@ -5,5 +5,8 @@ android:viewportHeight="1024"> + android:pathData="M615.51,402.9a34.13,34.13 0,0 1,51.16 45.08l-2.18,2.45 -149.61,154.15a34.13,34.13 0,0 1,-44.07 4.18l-2.65,-2.05 -106.41,-91.39a34.13,34.13 0,0 1,41.9 -53.8l2.6,2.01 82.01,70.46 127.25,-131.09z" /> + diff --git a/app/src/main/res/drawable/ic_push_setting.xml b/app/src/main/res/drawable/ic_push_setting.xml index 69e0c3f..c03f19f 100644 --- a/app/src/main/res/drawable/ic_push_setting.xml +++ b/app/src/main/res/drawable/ic_push_setting.xml @@ -5,30 +5,5 @@ android:viewportHeight="1024"> - + android:pathData="M932.6,832L432.8,832c-9.4,0 -18.4,-4.4 -24,-12 -5.6,-7.6 -7.4,-17.4 -4.8,-26.4l24.4,-84.4c0.4,-1.2 0.8,-2.4 1.4,-3.6 1.6,-3.6 2.4,-7.4 2.4,-11.4L432.2,480.8c0,-137.8 112.2,-250 250,-250 138.4,0 251,112.2 251,250v213.4c0,4 0.8,7.8 2.4,11.4 0.6,1.2 1,2.4 1.4,3.6l24.4,84.4c2.6,9 0.8,18.8 -4.8,26.4 -5.8,7.6 -14.6,12 -24,12zM472.6,772h420l-12.8,-44.4c-4.4,-10.6 -6.6,-21.8 -6.6,-33.4L873.2,480.8c0,-104.8 -85.6,-190 -191,-190 -104.8,0 -190.2,85.2 -190.2,190v213.4c0,11.6 -2.2,22.8 -6.6,33.4l-12.8,44.4zM833.4,507.6c0,-104 -58.2,-176.8 -141.4,-176.8 -16.6,0 -30,13.4 -30,30s13.4,30 30,30c64.2,0 81.4,73.4 81.4,116.8 0,16.6 13.4,30 30,30s30,-13.4 30,-30zM785.8,895c0,-16.6 -13.4,-30 -30,-30h-146.2c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h146.2c16.6,0 30,-13.4 30,-30zM364.6,923.6c0,-16.6 -13.4,-30 -30,-30L180.4,893.6c-32.4,0 -58.8,-26.4 -58.8,-58.8L121.6,189.2c0,-32.4 26.4,-58.8 58.8,-58.8h514.8c32.4,0 58.8,26.4 58.8,58.8 0,16.6 13.4,30 30,30s30,-13.4 30,-30c0,-65.6 -53.4,-118.8 -118.8,-118.8L180.4,70.4c-65.6,0 -118.8,53.4 -118.8,118.8v645.4c0,65.6 53.4,118.8 118.8,118.8h154.2c16.6,0.2 30,-13.2 30,-29.8zM354.4,327.2c0,-16.6 -13.4,-30 -30,-30h-104.2c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h104.2c16.6,0 30,-13.4 30,-30zM317.6,492.6c0,-16.6 -13.4,-30 -30,-30h-67.4c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h67.4c16.6,0 30,-13.4 30,-30zM334,658c0,-16.6 -13.4,-30 -30,-30h-83.8c-16.6,0 -30,13.4 -30,30s13.4,30 30,30L304,688c16.4,0 30,-13.4 30,-30z" /> diff --git a/app/src/main/res/drawable/ic_total_sample.xml b/app/src/main/res/drawable/ic_total_sample.xml new file mode 100644 index 0000000..6bad12a --- /dev/null +++ b/app/src/main/res/drawable/ic_total_sample.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_total_verify.xml b/app/src/main/res/drawable/ic_total_verify.xml new file mode 100644 index 0000000..4ff7f08 --- /dev/null +++ b/app/src/main/res/drawable/ic_total_verify.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_update.xml b/app/src/main/res/drawable/ic_update.xml index b361057..bcc9397 100644 --- a/app/src/main/res/drawable/ic_update.xml +++ b/app/src/main/res/drawable/ic_update.xml @@ -5,5 +5,11 @@ android:viewportHeight="1024"> + android:pathData="M774.56,775.16H558.41a27,27 0,1 1,0 -54.1h216.15a27,27 0,1 1,0 54.1zM327.65,841.85H192.54a27,27 0,1 1,0 -54.09h135.11a27,27 0,1 1,0 54.09zM287.13,950.79h-54a27,27 0,0 1,0 -54.1h54a27,27 0,1 1,0 54.1zM774.56,423.89h-162.1a27,27 0,1 1,0 -54.09h162.1a27,27 0,1 1,0 54.09zM774.56,599.52H558.41a27,27 0,1 1,0 -54.09h216.15a27,27 0,1 1,0 54.09zM937.38,328.67H832.57a81.24,81.24 0,0 1,-81.15 -81.15V112.28a27.05,27.05 0,1 1,54.1 0v135.24a27.06,27.06 0,0 0,27.05 27h104.81a27.05,27.05 0,0 1,0 54.1z" /> + + diff --git a/app/src/main/res/drawable/ic_verified.xml b/app/src/main/res/drawable/ic_verified.xml new file mode 100644 index 0000000..aeb63f6 --- /dev/null +++ b/app/src/main/res/drawable/ic_verified.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/layout/fragment_future_task.xml b/app/src/main/res/layout/fragment_future_task.xml new file mode 100644 index 0000000..dd959d2 --- /dev/null +++ b/app/src/main/res/layout/fragment_future_task.xml @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml index c8d6d99..b319fa0 100644 --- a/app/src/main/res/layout/fragment_mine.xml +++ b/app/src/main/res/layout/fragment_mine.xml @@ -61,6 +61,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_7" android:fontFamily="sans-serif-black" + android:singleLine="true" android:text="北京达佳科技有限公司" android:textColor="@color/mainTextColor" android:textSize="@dimen/sp_18" /> diff --git a/app/src/main/res/layout/fragment_sample.xml b/app/src/main/res/layout/fragment_sample.xml index 41d2ef1..2df9f57 100644 --- a/app/src/main/res/layout/fragment_sample.xml +++ b/app/src/main/res/layout/fragment_sample.xml @@ -1,6 +1,39 @@ + android:layout_height="match_parent" + android:background="@color/mainBackground" + android:orientation="vertical"> + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt new file mode 100644 index 0000000..621d5d4 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt @@ -0,0 +1,18 @@ +package com.casic.xz.meterage.adapter + +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager +import androidx.fragment.app.FragmentPagerAdapter + +class SubViewPagerAdapter( + manager: FragmentManager, + private val pages: ArrayList, + private val titles: Array +) : FragmentPagerAdapter(manager) { + + override fun getItem(position: Int): Fragment = pages[position] + + override fun getCount(): Int = pages.size + + override fun getPageTitle(position: Int): CharSequence = titles[position] +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index f54f94a..afa0759 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,11 +1,32 @@ package com.casic.xz.meterage.fragment +import androidx.fragment.app.Fragment import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.SubViewPagerAdapter +import com.casic.xz.meterage.fragment.sample.FutureTaskFragment +import com.casic.xz.meterage.fragment.sample.TotalTaskFragment +import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_sample.* -class SamplePageFragment : KotlinBaseFragment(){ +class SamplePageFragment : KotlinBaseFragment() { + + private var fragmentPages: ArrayList = ArrayList() + + init { + fragmentPages.add(UnderTaskFragment()) + fragmentPages.add(FutureTaskFragment()) + fragmentPages.add(TotalTaskFragment()) + } + override fun initData() { + val samplePageTitles = arrayOf("检定中 0", "预期任务 0", "全部 0") + sampleViewPager.adapter = SubViewPagerAdapter( + childFragmentManager, fragmentPages, samplePageTitles + ) + //绑定 + topTabLayout.setupWithViewPager(sampleViewPager) } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt new file mode 100644 index 0000000..ebad65f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.sample + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class FutureTaskFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_future_task + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/sample/TotalTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/sample/TotalTaskFragment.kt new file mode 100644 index 0000000..1968ed2 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/sample/TotalTaskFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.sample + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TotalTaskFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_total_task + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/sample/UnderTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/sample/UnderTaskFragment.kt new file mode 100644 index 0000000..da5c3f3 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/sample/UnderTaskFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.sample + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class UnderTaskFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_under_task + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml index b41f4ac..c7546e4 100644 --- a/app/src/main/res/drawable/ic_about.xml +++ b/app/src/main/res/drawable/ic_about.xml @@ -5,8 +5,5 @@ android:viewportHeight="1024"> - + android:pathData="M300.93,453.16c11.5,-2.59 18.74,-14.02 16.15,-25.53 -5.44,-24.16 -6.26,-48.98 -2.43,-73.71C331.33,245.86 432.8,171.54 540.95,188.29c25.5,3.94 49.54,12.59 71.42,25.7 10.16,6.07 23.24,2.77 29.3,-7.34 6.05,-10.13 2.75,-23.24 -7.36,-29.3 -26.66,-15.95 -55.88,-26.48 -86.84,-31.26 -131.27,-20.32 -254.74,69.98 -275.07,201.33 -4.62,30.06 -3.62,60.2 2.99,89.59 2.23,9.95 11.05,16.69 20.82,16.69 1.57,-0.01 3.14,-0.2 4.72,-0.53zM895.38,612.43c0,-30.54 -11.99,-57.46 -32.14,-76.09 20.22,-46.71 31.58,-98.08 31.58,-152.1C894.82,172.37 722.46,0 510.61,0 298.75,0 126.38,172.37 126.38,384.24c0,126.89 61.98,239.39 157.13,309.4a106.69,106.69 0,0 0,2.64 11.4c3.62,12.37 8.62,23.45 14.94,33.05 34.45,52.54 73.5,112.04 112.24,170.06 39.24,58.74 96.04,95.27 168.8,108.56 9.16,1.61 17.54,2.71 25.63,3.74 3.89,0.52 7.78,1.03 11.64,1.58 3.05,0.45 6.14,0.65 9.22,0.65h43.39c3.41,0 6.83,-0.23 10.21,-0.82 3.82,-0.62 7.63,-1.21 11.49,-1.8a2627.42,2627.42 0,0 0,19.7 -3.15c91.92,-15.87 161.29,-85 176.84,-176.22 3.18,-18.23 4.83,-36.71 4.9,-54.77 0.22,-68.46 0.22,-77.04 0.2,-104.73 0,-14.2 0,-33.52 0.02,-68.75zM190.45,384.23c0,-176.85 143.35,-320.17 320.16,-320.17s320.16,143.32 320.16,320.17c0,44.88 -9.4,87.5 -26.09,126.26 -3,-0.29 -5.99,-0.49 -9,-0.49a99.29,99.29 0,0 0,-26.95 3.71c-9.98,-9.44 -21.92,-16.83 -35.32,-21.43 -2.23,-0.73 -4.45,-1.37 -6.65,-1.96 10.54,-21.32 18.18,-44.51 21.98,-69.26 8.26,-53.24 -1.15,-106.25 -27.18,-153.33 -5.7,-10.31 -18.69,-14.07 -29.02,-8.36 -10.31,5.71 -14.05,18.7 -8.35,29.02 21.41,38.71 29.14,82.34 22.35,126.13 -4.3,27.64 -14.22,52.92 -28.34,75.1 -1.27,0.3 -2.6,0.43 -3.85,0.78 -8.78,-8.07 -19.31,-14.72 -31.37,-19.78 -9.2,-4.9 -19.5,-7.45 -29.99,-7.45h-2.16c0,-27.51 0,-53.6 -0.03,-74.53 0,-52.01 -34.53,-92.43 -85.95,-100.51a92.3,92.3 0,0 0,-14.37 -1.15c-50.27,0 -94.47,40.42 -98.51,90.09 -0.48,6.38 -0.48,11.74 -0.48,16.05v162.58c-19.94,-11.45 -37.93,-26.28 -52.95,-44.22 -7.55,-9.04 -21,-10.25 -30.08,-2.68 -9.03,7.57 -10.23,21.04 -2.68,30.1 10.42,12.44 22.1,23.59 34.63,33.57 -25.95,6.62 -48.7,23.19 -62.88,46.41 -0.55,0.9 -0.97,1.84 -1.49,2.75 -64.79,-58.6 -105.57,-143.19 -105.57,-237.41zM831.09,785.7c-0.07,14.72 -1.46,29.65 -3.99,44.21 -10.98,64.43 -59.79,112.68 -124.43,123.82 -10.16,1.72 -20.44,3.24 -30.65,4.9h-43.4c-11.63,-1.72 -23.37,-2.94 -34.97,-5 -53.34,-9.73 -96.64,-35.58 -127.02,-81.08 -37.67,-56.37 -74.81,-112.96 -111.96,-169.6 -3.14,-4.78 -5.38,-10.33 -7.01,-15.82 -6.95,-23.93 7.16,-48.66 30.71,-53.22 3.42,-0.64 6.74,-0.99 9.89,-0.99 14.31,0 26.51,6.47 35.85,18.57 15.57,20.13 30.29,40.92 45.36,61.42a369.92,369.92 0,0 0,4.84 6.52c0.39,-0.17 0.82,-0.3 1.22,-0.49v-5.75,-320.07c0,-3.64 0,-7.24 0.28,-10.87 1.38,-16.89 17.86,-31.19 34.66,-31.19 1.45,0 2.96,0.12 4.43,0.36 19.88,3.13 31.84,16.94 31.84,37.27 0.05,56.97 0,152.32 0.08,209.34 0,2.96 0.19,6.06 1.06,8.86 1.46,4.61 4.94,7.08 9.88,7.46h1.05c4.72,0 8.2,-2.36 10.06,-6.59 1.19,-2.62 1.26,-5.83 1.26,-8.82 0,-19.61 -0.05,-25.79 -0.05,-25.79l-0.07,18.23c0,-0.06 0,-6.3 0.05,-25.8 0,-12.88 4.32,-24.08 15.27,-31.69 4.03,-2.75 8.83,-4.47 13.26,-6.64h14.39c0.51,0.37 0.92,0.84 1.47,1.04 18.72,6.44 27.42,18.58 27.42,38.26 -0.06,19.31 -0.06,25.46 -0.06,25.46l-0.02,-18.79v25.49c0,1.84 -0.06,3.62 0.13,5.4 0.78,6.15 5.51,10.23 11.48,10.23 0.39,0 0.74,0 1.12,-0.02 6.31,-0.57 9.92,-4.88 10.36,-12.68v-0.19c0.03,-0.47 0.03,-0.96 0.03,-1.43v-12.12c0.28,-8.39 2.34,-16.3 7.74,-23.13 7.09,-8.99 17.41,-13.88 28.18,-13.88 3.91,0 7.88,0.65 11.73,1.95 14.79,5.1 24.25,19.45 24.25,36.59 -0.02,19.31 -0.05,25.48 -0.05,25.48 -0.01,0 -0.05,-18.81 -0.07,-18.81 0,0 -0.01,6.15 -0.01,25.5 0,2.2 0,4.43 0.23,6.61 0.71,5.8 4.47,8.8 9.86,9.86a7.59,7.59 0,0 0,1.68 0.16c4.26,0 8.79,-2.97 10.23,-7.24 0.92,-2.77 1.18,-5.86 1.18,-8.86 0,-2.62 0,-4.88 0.01,-6.77v12.98c0.07,0 0.11,-3.89 0.15,-15.16 0.07,-6.25 1.2,-12.92 3.67,-18.63 5.64,-12.79 18.6,-20.52 31.96,-20.52 2.47,0 4.9,0.29 7.36,0.82 17.32,3.79 28.26,18.49 28.26,37.52 -0.06,103.54 0.1,69.78 -0.22,173.33z" /> diff --git a/app/src/main/res/drawable/ic_collection.xml b/app/src/main/res/drawable/ic_collection.xml index ce1a8a2..4d2016b 100644 --- a/app/src/main/res/drawable/ic_collection.xml +++ b/app/src/main/res/drawable/ic_collection.xml @@ -5,8 +5,5 @@ android:viewportHeight="1024"> - + android:pathData="M139.64,930.91 L512,774.48 884.36,930.91 884.36,93.09 139.64,93.09 139.64,930.91ZM79.79,93.09C79.79,60.04 106.59,33.25 139.64,33.25L884.36,33.25C917.41,33.25 944.21,60.04 944.21,93.09L944.21,930.91C944.21,973.69 900.62,1002.65 861.18,986.08L488.82,829.65 535.18,829.65 162.81,986.08C123.38,1002.65 79.79,973.69 79.79,930.91L79.79,93.09ZM512,606.67 L628.8,659.86C652.63,670.7 668.89,658.58 665.59,632.98L649.71,509.73 738.03,418.34C755.56,400.2 749.98,381.09 724.83,376.4L597.09,352.58 534.8,243.1C522.43,221.36 501.6,221.3 488.77,243.84L426.98,352.4 299.23,376.26C274.26,380.93 268.17,399.75 286.02,418.22L374.29,509.61 358.41,632.86C355.12,658.41 371.59,670.5 395.2,659.77L512,606.67ZM536.77,661.15 L419.97,714.25C353.79,744.33 289.76,697.43 299.06,625.22L314.93,501.96 331.24,551.18 242.98,459.8C192.09,407.12 216.3,330.88 288.24,317.44L415.99,293.57 374.97,322.79 436.76,214.24C472.3,151.8 551.26,151 586.82,213.51L649.1,322.98 608.06,293.75 735.8,317.57C808.03,331.04 831.6,407.64 781.06,459.93L692.74,551.31 709.07,502.08 724.94,625.34C734.25,697.6 670.4,744.55 604,714.32L487.2,661.14 536.77,661.15Z" /> diff --git a/app/src/main/res/drawable/ic_help.xml b/app/src/main/res/drawable/ic_help.xml index 3835c32..cf1f741 100644 --- a/app/src/main/res/drawable/ic_help.xml +++ b/app/src/main/res/drawable/ic_help.xml @@ -5,11 +5,5 @@ android:viewportHeight="1024"> - - + android:pathData="M860.2,64.2L264,64.2c-110.5,0 -200,89.5 -200,200v538.9c-0.3,3.7 -0.4,7.4 -0.4,11.1h0.5C66.6,895 132.8,959.6 214,959.6h646.2c55.2,0 100,-44.8 100,-100L960.2,164.2c0,-55.2 -44.8,-100 -100,-100zM499.4,473.4l-58.7,-52.1c-0.1,-0.1 -0.2,-0.1 -0.2,-0.2 -0.3,-0.3 -0.7,-0.6 -1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.4,-0.3 -0.7,-0.5 -1.1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.3,-0.2 -0.7,-0.5 -1.1,-0.7 -0.2,-0.1 -0.3,-0.2 -0.5,-0.3 -0.3,-0.2 -0.7,-0.4 -1,-0.6l-0.6,-0.3c-0.3,-0.2 -0.6,-0.3 -0.9,-0.5 -0.2,-0.1 -0.5,-0.3 -0.7,-0.4 -0.3,-0.1 -0.5,-0.3 -0.8,-0.4 -0.3,-0.1 -0.6,-0.3 -0.9,-0.4 -0.2,-0.1 -0.4,-0.2 -0.7,-0.3 -0.3,-0.1 -0.7,-0.3 -1,-0.4 -0.2,-0.1 -0.4,-0.1 -0.6,-0.2 -0.4,-0.1 -0.7,-0.3 -1.1,-0.4 -0.2,-0.1 -0.3,-0.1 -0.5,-0.2l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.2 -1.2,-0.2 -0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.1 -1.2,-0.2 -0.2,0 -0.4,0 -0.6,-0.1 -0.4,0 -0.7,-0.1 -1.1,-0.1h-5.1c-0.3,0 -0.7,0.1 -1,0.1 -0.2,0 -0.4,0 -0.7,0.1 -0.4,0 -0.7,0.1 -1.1,0.1 -0.2,0 -0.4,0.1 -0.6,0.1 -0.4,0.1 -0.8,0.1 -1.2,0.2 -0.2,0 -0.4,0.1 -0.5,0.1l-1.2,0.3c-0.2,0 -0.4,0.1 -0.5,0.1 -0.4,0.1 -0.7,0.2 -1.1,0.3 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.4,0.1 -0.7,0.2 -1,0.4 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.3,0.1 -0.6,0.2 -0.9,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.1 -0.5,0.2 -0.8,0.4 -0.3,0.1 -0.6,0.3 -0.8,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.2 -0.6,0.3 -1,0.5 -0.2,0.1 -0.4,0.2 -0.5,0.3 -0.4,0.2 -0.7,0.4 -1,0.6 -0.1,0.1 -0.3,0.2 -0.4,0.3 -0.4,0.2 -0.7,0.5 -1.1,0.7 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.4,0.3 -0.7,0.5 -1.1,0.8 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.3,0.3 -0.7,0.6 -1,0.9 -0.1,0.1 -0.2,0.1 -0.2,0.2L332.7,474L332.7,136.2h166.7v337.2zM173.5,173.7c23.4,-23.4 54.2,-36.6 87.2,-37.4L260.7,555.7c0,0.3 0,0.7 0.1,1 0,0.3 0.1,0.5 0.1,0.8 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8l0.3,0.9c0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.4,0.8 0.1,0.3 0.2,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.2,0.3 0.3,0.5 0.5,0.8 0.1,0.2 0.3,0.5 0.5,0.7 0.2,0.3 0.4,0.5 0.5,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.4,0.5 0.6,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.5,0.6 0.7,0.8l0.3,0.3 0.2,0.2c0.3,0.3 0.6,0.6 0.8,0.9l0.5,0.5 0.8,0.8c0.9,0.9 1.9,1.7 2.9,2.5 0.1,0.1 0.3,0.2 0.4,0.3 0.3,0.2 0.7,0.5 1,0.7 0.2,0.1 0.3,0.2 0.5,0.4 0.3,0.2 0.6,0.4 1,0.6 0.2,0.1 0.4,0.3 0.6,0.4 0.3,0.2 0.6,0.4 0.9,0.5 0.2,0.1 0.5,0.3 0.7,0.4 0.3,0.1 0.5,0.3 0.8,0.4 0.3,0.1 0.6,0.3 0.9,0.4 0.2,0.1 0.5,0.2 0.7,0.3 0.4,0.2 0.7,0.3 1.1,0.5 0.2,0.1 0.4,0.1 0.5,0.2 0.5,0.2 0.9,0.3 1.4,0.5 0.1,0 0.2,0.1 0.3,0.1 0.6,0.2 1.1,0.3 1.7,0.5h0.1c3,0.8 6.1,1.2 9.3,1.2h2.3c0.4,0 0.8,-0.1 1.1,-0.1 0.2,0 0.5,-0.1 0.7,-0.1 0.3,0 0.7,-0.1 1,-0.1 0.3,0 0.5,-0.1 0.8,-0.1 0.3,0 0.6,-0.1 0.9,-0.2 0.3,0 0.5,-0.1 0.8,-0.2 0.3,-0.1 0.6,-0.1 0.9,-0.2 0.3,-0.1 0.5,-0.1 0.8,-0.2l0.9,-0.3c0.2,-0.1 0.5,-0.1 0.7,-0.2 0.4,-0.1 0.7,-0.2 1.1,-0.4 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.5,-0.2 1,-0.4 1.6,-0.6 0.1,0 0.2,-0.1 0.3,-0.1 0.4,-0.2 0.9,-0.4 1.3,-0.6 0.2,-0.1 0.3,-0.2 0.5,-0.2 0.4,-0.2 0.7,-0.4 1,-0.5 0.2,-0.1 0.4,-0.2 0.5,-0.3 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.3 0.8,-0.5 0.2,-0.1 0.4,-0.3 0.6,-0.4 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.4,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.4 0.7,-0.6 0.1,-0.1 0.3,-0.2 0.4,-0.3l96.2,-84.3 94.9,84.1c0.2,0.1 0.3,0.3 0.5,0.4 0.2,0.2 0.4,0.4 0.7,0.6 0.2,0.2 0.5,0.4 0.7,0.5 0.2,0.2 0.4,0.3 0.7,0.5 0.3,0.2 0.5,0.4 0.8,0.6 0.2,0.1 0.4,0.3 0.6,0.4l0.9,0.6c0.2,0.1 0.3,0.2 0.5,0.3 0.4,0.2 0.7,0.4 1.1,0.6 0.1,0.1 0.2,0.1 0.3,0.2 0.5,0.3 1,0.5 1.5,0.8 0.5,0.3 1,0.5 1.6,0.7 0.1,0 0.2,0.1 0.2,0.1 0.4,0.2 0.9,0.4 1.3,0.5 0.2,0.1 0.4,0.1 0.6,0.2 0.3,0.1 0.7,0.2 1,0.3 0.2,0.1 0.5,0.1 0.7,0.2l0.9,0.3c0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0 0.5,0.1 0.8,0.1 0.3,0 0.7,0.1 1,0.1 0.2,0 0.5,0.1 0.7,0.1 0.4,0 0.8,0.1 1.1,0.1h2.3c3.8,0 7.5,-0.6 11,-1.7 0.1,0 0.2,-0.1 0.2,-0.1 0.5,-0.2 1,-0.3 1.5,-0.5 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.4,-0.2 0.8,-0.3 1.1,-0.5 0.2,-0.1 0.5,-0.2 0.7,-0.3 0.3,-0.1 0.6,-0.3 0.9,-0.4 0.3,-0.1 0.6,-0.3 0.8,-0.4 0.2,-0.1 0.5,-0.3 0.7,-0.4 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.4 1,-0.6 0.2,-0.1 0.4,-0.2 0.5,-0.4 0.3,-0.2 0.6,-0.4 1,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.3,-0.2 0.6,-0.5 0.9,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.4,-0.3 0.7,-0.6 1.1,-1 0.4,-0.3 0.7,-0.7 1,-1 0.1,-0.1 0.3,-0.3 0.4,-0.5l0.9,-0.9 0.1,-0.1c0.1,-0.1 0.2,-0.3 0.4,-0.4 0.2,-0.3 0.5,-0.5 0.7,-0.8 0.2,-0.2 0.3,-0.4 0.5,-0.6 0.2,-0.3 0.4,-0.5 0.6,-0.8 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.2 0.2,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8l0.3,-0.9c0.1,-0.3 0.2,-0.5 0.2,-0.8 0.1,-0.3 0.2,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.5 0.2,-0.8 0.1,-0.3 0.1,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.6 0.2,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.5 0.1,-0.8 0,-0.3 0.1,-0.7 0.1,-1v-0.8,-1.1 -417.9h288.8c15.4,0 28,12.6 28,28v504L209.7,668.2c-26.9,0 -52,7.3 -73.7,20v-424c0,-34.2 13.3,-66.3 37.5,-90.5zM860.2,887.6L214,887.6c-43,0 -78,-35 -78,-78v-3.1c3.9,-37.2 35.5,-66.2 73.7,-66.2h678.5v119.3c0,15.4 -12.6,28 -28,28z" /> diff --git a/app/src/main/res/drawable/ic_overtime.xml b/app/src/main/res/drawable/ic_overtime.xml new file mode 100644 index 0000000..6916eca --- /dev/null +++ b/app/src/main/res/drawable/ic_overtime.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_privacy.xml b/app/src/main/res/drawable/ic_privacy.xml index 22ef981..92d2699 100644 --- a/app/src/main/res/drawable/ic_privacy.xml +++ b/app/src/main/res/drawable/ic_privacy.xml @@ -5,5 +5,8 @@ android:viewportHeight="1024"> + android:pathData="M615.51,402.9a34.13,34.13 0,0 1,51.16 45.08l-2.18,2.45 -149.61,154.15a34.13,34.13 0,0 1,-44.07 4.18l-2.65,-2.05 -106.41,-91.39a34.13,34.13 0,0 1,41.9 -53.8l2.6,2.01 82.01,70.46 127.25,-131.09z" /> + diff --git a/app/src/main/res/drawable/ic_push_setting.xml b/app/src/main/res/drawable/ic_push_setting.xml index 69e0c3f..c03f19f 100644 --- a/app/src/main/res/drawable/ic_push_setting.xml +++ b/app/src/main/res/drawable/ic_push_setting.xml @@ -5,30 +5,5 @@ android:viewportHeight="1024"> - + android:pathData="M932.6,832L432.8,832c-9.4,0 -18.4,-4.4 -24,-12 -5.6,-7.6 -7.4,-17.4 -4.8,-26.4l24.4,-84.4c0.4,-1.2 0.8,-2.4 1.4,-3.6 1.6,-3.6 2.4,-7.4 2.4,-11.4L432.2,480.8c0,-137.8 112.2,-250 250,-250 138.4,0 251,112.2 251,250v213.4c0,4 0.8,7.8 2.4,11.4 0.6,1.2 1,2.4 1.4,3.6l24.4,84.4c2.6,9 0.8,18.8 -4.8,26.4 -5.8,7.6 -14.6,12 -24,12zM472.6,772h420l-12.8,-44.4c-4.4,-10.6 -6.6,-21.8 -6.6,-33.4L873.2,480.8c0,-104.8 -85.6,-190 -191,-190 -104.8,0 -190.2,85.2 -190.2,190v213.4c0,11.6 -2.2,22.8 -6.6,33.4l-12.8,44.4zM833.4,507.6c0,-104 -58.2,-176.8 -141.4,-176.8 -16.6,0 -30,13.4 -30,30s13.4,30 30,30c64.2,0 81.4,73.4 81.4,116.8 0,16.6 13.4,30 30,30s30,-13.4 30,-30zM785.8,895c0,-16.6 -13.4,-30 -30,-30h-146.2c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h146.2c16.6,0 30,-13.4 30,-30zM364.6,923.6c0,-16.6 -13.4,-30 -30,-30L180.4,893.6c-32.4,0 -58.8,-26.4 -58.8,-58.8L121.6,189.2c0,-32.4 26.4,-58.8 58.8,-58.8h514.8c32.4,0 58.8,26.4 58.8,58.8 0,16.6 13.4,30 30,30s30,-13.4 30,-30c0,-65.6 -53.4,-118.8 -118.8,-118.8L180.4,70.4c-65.6,0 -118.8,53.4 -118.8,118.8v645.4c0,65.6 53.4,118.8 118.8,118.8h154.2c16.6,0.2 30,-13.2 30,-29.8zM354.4,327.2c0,-16.6 -13.4,-30 -30,-30h-104.2c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h104.2c16.6,0 30,-13.4 30,-30zM317.6,492.6c0,-16.6 -13.4,-30 -30,-30h-67.4c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h67.4c16.6,0 30,-13.4 30,-30zM334,658c0,-16.6 -13.4,-30 -30,-30h-83.8c-16.6,0 -30,13.4 -30,30s13.4,30 30,30L304,688c16.4,0 30,-13.4 30,-30z" /> diff --git a/app/src/main/res/drawable/ic_total_sample.xml b/app/src/main/res/drawable/ic_total_sample.xml new file mode 100644 index 0000000..6bad12a --- /dev/null +++ b/app/src/main/res/drawable/ic_total_sample.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_total_verify.xml b/app/src/main/res/drawable/ic_total_verify.xml new file mode 100644 index 0000000..4ff7f08 --- /dev/null +++ b/app/src/main/res/drawable/ic_total_verify.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_update.xml b/app/src/main/res/drawable/ic_update.xml index b361057..bcc9397 100644 --- a/app/src/main/res/drawable/ic_update.xml +++ b/app/src/main/res/drawable/ic_update.xml @@ -5,5 +5,11 @@ android:viewportHeight="1024"> + android:pathData="M774.56,775.16H558.41a27,27 0,1 1,0 -54.1h216.15a27,27 0,1 1,0 54.1zM327.65,841.85H192.54a27,27 0,1 1,0 -54.09h135.11a27,27 0,1 1,0 54.09zM287.13,950.79h-54a27,27 0,0 1,0 -54.1h54a27,27 0,1 1,0 54.1zM774.56,423.89h-162.1a27,27 0,1 1,0 -54.09h162.1a27,27 0,1 1,0 54.09zM774.56,599.52H558.41a27,27 0,1 1,0 -54.09h216.15a27,27 0,1 1,0 54.09zM937.38,328.67H832.57a81.24,81.24 0,0 1,-81.15 -81.15V112.28a27.05,27.05 0,1 1,54.1 0v135.24a27.06,27.06 0,0 0,27.05 27h104.81a27.05,27.05 0,0 1,0 54.1z" /> + + diff --git a/app/src/main/res/drawable/ic_verified.xml b/app/src/main/res/drawable/ic_verified.xml new file mode 100644 index 0000000..aeb63f6 --- /dev/null +++ b/app/src/main/res/drawable/ic_verified.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/layout/fragment_future_task.xml b/app/src/main/res/layout/fragment_future_task.xml new file mode 100644 index 0000000..dd959d2 --- /dev/null +++ b/app/src/main/res/layout/fragment_future_task.xml @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml index c8d6d99..b319fa0 100644 --- a/app/src/main/res/layout/fragment_mine.xml +++ b/app/src/main/res/layout/fragment_mine.xml @@ -61,6 +61,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_7" android:fontFamily="sans-serif-black" + android:singleLine="true" android:text="北京达佳科技有限公司" android:textColor="@color/mainTextColor" android:textSize="@dimen/sp_18" /> diff --git a/app/src/main/res/layout/fragment_sample.xml b/app/src/main/res/layout/fragment_sample.xml index 41d2ef1..2df9f57 100644 --- a/app/src/main/res/layout/fragment_sample.xml +++ b/app/src/main/res/layout/fragment_sample.xml @@ -1,6 +1,39 @@ + android:layout_height="match_parent" + android:background="@color/mainBackground" + android:orientation="vertical"> + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_total_task.xml b/app/src/main/res/layout/fragment_total_task.xml new file mode 100644 index 0000000..cab9456 --- /dev/null +++ b/app/src/main/res/layout/fragment_total_task.xml @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt new file mode 100644 index 0000000..621d5d4 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt @@ -0,0 +1,18 @@ +package com.casic.xz.meterage.adapter + +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager +import androidx.fragment.app.FragmentPagerAdapter + +class SubViewPagerAdapter( + manager: FragmentManager, + private val pages: ArrayList, + private val titles: Array +) : FragmentPagerAdapter(manager) { + + override fun getItem(position: Int): Fragment = pages[position] + + override fun getCount(): Int = pages.size + + override fun getPageTitle(position: Int): CharSequence = titles[position] +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index f54f94a..afa0759 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,11 +1,32 @@ package com.casic.xz.meterage.fragment +import androidx.fragment.app.Fragment import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.SubViewPagerAdapter +import com.casic.xz.meterage.fragment.sample.FutureTaskFragment +import com.casic.xz.meterage.fragment.sample.TotalTaskFragment +import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_sample.* -class SamplePageFragment : KotlinBaseFragment(){ +class SamplePageFragment : KotlinBaseFragment() { + + private var fragmentPages: ArrayList = ArrayList() + + init { + fragmentPages.add(UnderTaskFragment()) + fragmentPages.add(FutureTaskFragment()) + fragmentPages.add(TotalTaskFragment()) + } + override fun initData() { + val samplePageTitles = arrayOf("检定中 0", "预期任务 0", "全部 0") + sampleViewPager.adapter = SubViewPagerAdapter( + childFragmentManager, fragmentPages, samplePageTitles + ) + //绑定 + topTabLayout.setupWithViewPager(sampleViewPager) } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt new file mode 100644 index 0000000..ebad65f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.sample + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class FutureTaskFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_future_task + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/sample/TotalTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/sample/TotalTaskFragment.kt new file mode 100644 index 0000000..1968ed2 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/sample/TotalTaskFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.sample + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TotalTaskFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_total_task + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/sample/UnderTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/sample/UnderTaskFragment.kt new file mode 100644 index 0000000..da5c3f3 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/sample/UnderTaskFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.sample + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class UnderTaskFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_under_task + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml index b41f4ac..c7546e4 100644 --- a/app/src/main/res/drawable/ic_about.xml +++ b/app/src/main/res/drawable/ic_about.xml @@ -5,8 +5,5 @@ android:viewportHeight="1024"> - + android:pathData="M300.93,453.16c11.5,-2.59 18.74,-14.02 16.15,-25.53 -5.44,-24.16 -6.26,-48.98 -2.43,-73.71C331.33,245.86 432.8,171.54 540.95,188.29c25.5,3.94 49.54,12.59 71.42,25.7 10.16,6.07 23.24,2.77 29.3,-7.34 6.05,-10.13 2.75,-23.24 -7.36,-29.3 -26.66,-15.95 -55.88,-26.48 -86.84,-31.26 -131.27,-20.32 -254.74,69.98 -275.07,201.33 -4.62,30.06 -3.62,60.2 2.99,89.59 2.23,9.95 11.05,16.69 20.82,16.69 1.57,-0.01 3.14,-0.2 4.72,-0.53zM895.38,612.43c0,-30.54 -11.99,-57.46 -32.14,-76.09 20.22,-46.71 31.58,-98.08 31.58,-152.1C894.82,172.37 722.46,0 510.61,0 298.75,0 126.38,172.37 126.38,384.24c0,126.89 61.98,239.39 157.13,309.4a106.69,106.69 0,0 0,2.64 11.4c3.62,12.37 8.62,23.45 14.94,33.05 34.45,52.54 73.5,112.04 112.24,170.06 39.24,58.74 96.04,95.27 168.8,108.56 9.16,1.61 17.54,2.71 25.63,3.74 3.89,0.52 7.78,1.03 11.64,1.58 3.05,0.45 6.14,0.65 9.22,0.65h43.39c3.41,0 6.83,-0.23 10.21,-0.82 3.82,-0.62 7.63,-1.21 11.49,-1.8a2627.42,2627.42 0,0 0,19.7 -3.15c91.92,-15.87 161.29,-85 176.84,-176.22 3.18,-18.23 4.83,-36.71 4.9,-54.77 0.22,-68.46 0.22,-77.04 0.2,-104.73 0,-14.2 0,-33.52 0.02,-68.75zM190.45,384.23c0,-176.85 143.35,-320.17 320.16,-320.17s320.16,143.32 320.16,320.17c0,44.88 -9.4,87.5 -26.09,126.26 -3,-0.29 -5.99,-0.49 -9,-0.49a99.29,99.29 0,0 0,-26.95 3.71c-9.98,-9.44 -21.92,-16.83 -35.32,-21.43 -2.23,-0.73 -4.45,-1.37 -6.65,-1.96 10.54,-21.32 18.18,-44.51 21.98,-69.26 8.26,-53.24 -1.15,-106.25 -27.18,-153.33 -5.7,-10.31 -18.69,-14.07 -29.02,-8.36 -10.31,5.71 -14.05,18.7 -8.35,29.02 21.41,38.71 29.14,82.34 22.35,126.13 -4.3,27.64 -14.22,52.92 -28.34,75.1 -1.27,0.3 -2.6,0.43 -3.85,0.78 -8.78,-8.07 -19.31,-14.72 -31.37,-19.78 -9.2,-4.9 -19.5,-7.45 -29.99,-7.45h-2.16c0,-27.51 0,-53.6 -0.03,-74.53 0,-52.01 -34.53,-92.43 -85.95,-100.51a92.3,92.3 0,0 0,-14.37 -1.15c-50.27,0 -94.47,40.42 -98.51,90.09 -0.48,6.38 -0.48,11.74 -0.48,16.05v162.58c-19.94,-11.45 -37.93,-26.28 -52.95,-44.22 -7.55,-9.04 -21,-10.25 -30.08,-2.68 -9.03,7.57 -10.23,21.04 -2.68,30.1 10.42,12.44 22.1,23.59 34.63,33.57 -25.95,6.62 -48.7,23.19 -62.88,46.41 -0.55,0.9 -0.97,1.84 -1.49,2.75 -64.79,-58.6 -105.57,-143.19 -105.57,-237.41zM831.09,785.7c-0.07,14.72 -1.46,29.65 -3.99,44.21 -10.98,64.43 -59.79,112.68 -124.43,123.82 -10.16,1.72 -20.44,3.24 -30.65,4.9h-43.4c-11.63,-1.72 -23.37,-2.94 -34.97,-5 -53.34,-9.73 -96.64,-35.58 -127.02,-81.08 -37.67,-56.37 -74.81,-112.96 -111.96,-169.6 -3.14,-4.78 -5.38,-10.33 -7.01,-15.82 -6.95,-23.93 7.16,-48.66 30.71,-53.22 3.42,-0.64 6.74,-0.99 9.89,-0.99 14.31,0 26.51,6.47 35.85,18.57 15.57,20.13 30.29,40.92 45.36,61.42a369.92,369.92 0,0 0,4.84 6.52c0.39,-0.17 0.82,-0.3 1.22,-0.49v-5.75,-320.07c0,-3.64 0,-7.24 0.28,-10.87 1.38,-16.89 17.86,-31.19 34.66,-31.19 1.45,0 2.96,0.12 4.43,0.36 19.88,3.13 31.84,16.94 31.84,37.27 0.05,56.97 0,152.32 0.08,209.34 0,2.96 0.19,6.06 1.06,8.86 1.46,4.61 4.94,7.08 9.88,7.46h1.05c4.72,0 8.2,-2.36 10.06,-6.59 1.19,-2.62 1.26,-5.83 1.26,-8.82 0,-19.61 -0.05,-25.79 -0.05,-25.79l-0.07,18.23c0,-0.06 0,-6.3 0.05,-25.8 0,-12.88 4.32,-24.08 15.27,-31.69 4.03,-2.75 8.83,-4.47 13.26,-6.64h14.39c0.51,0.37 0.92,0.84 1.47,1.04 18.72,6.44 27.42,18.58 27.42,38.26 -0.06,19.31 -0.06,25.46 -0.06,25.46l-0.02,-18.79v25.49c0,1.84 -0.06,3.62 0.13,5.4 0.78,6.15 5.51,10.23 11.48,10.23 0.39,0 0.74,0 1.12,-0.02 6.31,-0.57 9.92,-4.88 10.36,-12.68v-0.19c0.03,-0.47 0.03,-0.96 0.03,-1.43v-12.12c0.28,-8.39 2.34,-16.3 7.74,-23.13 7.09,-8.99 17.41,-13.88 28.18,-13.88 3.91,0 7.88,0.65 11.73,1.95 14.79,5.1 24.25,19.45 24.25,36.59 -0.02,19.31 -0.05,25.48 -0.05,25.48 -0.01,0 -0.05,-18.81 -0.07,-18.81 0,0 -0.01,6.15 -0.01,25.5 0,2.2 0,4.43 0.23,6.61 0.71,5.8 4.47,8.8 9.86,9.86a7.59,7.59 0,0 0,1.68 0.16c4.26,0 8.79,-2.97 10.23,-7.24 0.92,-2.77 1.18,-5.86 1.18,-8.86 0,-2.62 0,-4.88 0.01,-6.77v12.98c0.07,0 0.11,-3.89 0.15,-15.16 0.07,-6.25 1.2,-12.92 3.67,-18.63 5.64,-12.79 18.6,-20.52 31.96,-20.52 2.47,0 4.9,0.29 7.36,0.82 17.32,3.79 28.26,18.49 28.26,37.52 -0.06,103.54 0.1,69.78 -0.22,173.33z" /> diff --git a/app/src/main/res/drawable/ic_collection.xml b/app/src/main/res/drawable/ic_collection.xml index ce1a8a2..4d2016b 100644 --- a/app/src/main/res/drawable/ic_collection.xml +++ b/app/src/main/res/drawable/ic_collection.xml @@ -5,8 +5,5 @@ android:viewportHeight="1024"> - + android:pathData="M139.64,930.91 L512,774.48 884.36,930.91 884.36,93.09 139.64,93.09 139.64,930.91ZM79.79,93.09C79.79,60.04 106.59,33.25 139.64,33.25L884.36,33.25C917.41,33.25 944.21,60.04 944.21,93.09L944.21,930.91C944.21,973.69 900.62,1002.65 861.18,986.08L488.82,829.65 535.18,829.65 162.81,986.08C123.38,1002.65 79.79,973.69 79.79,930.91L79.79,93.09ZM512,606.67 L628.8,659.86C652.63,670.7 668.89,658.58 665.59,632.98L649.71,509.73 738.03,418.34C755.56,400.2 749.98,381.09 724.83,376.4L597.09,352.58 534.8,243.1C522.43,221.36 501.6,221.3 488.77,243.84L426.98,352.4 299.23,376.26C274.26,380.93 268.17,399.75 286.02,418.22L374.29,509.61 358.41,632.86C355.12,658.41 371.59,670.5 395.2,659.77L512,606.67ZM536.77,661.15 L419.97,714.25C353.79,744.33 289.76,697.43 299.06,625.22L314.93,501.96 331.24,551.18 242.98,459.8C192.09,407.12 216.3,330.88 288.24,317.44L415.99,293.57 374.97,322.79 436.76,214.24C472.3,151.8 551.26,151 586.82,213.51L649.1,322.98 608.06,293.75 735.8,317.57C808.03,331.04 831.6,407.64 781.06,459.93L692.74,551.31 709.07,502.08 724.94,625.34C734.25,697.6 670.4,744.55 604,714.32L487.2,661.14 536.77,661.15Z" /> diff --git a/app/src/main/res/drawable/ic_help.xml b/app/src/main/res/drawable/ic_help.xml index 3835c32..cf1f741 100644 --- a/app/src/main/res/drawable/ic_help.xml +++ b/app/src/main/res/drawable/ic_help.xml @@ -5,11 +5,5 @@ android:viewportHeight="1024"> - - + android:pathData="M860.2,64.2L264,64.2c-110.5,0 -200,89.5 -200,200v538.9c-0.3,3.7 -0.4,7.4 -0.4,11.1h0.5C66.6,895 132.8,959.6 214,959.6h646.2c55.2,0 100,-44.8 100,-100L960.2,164.2c0,-55.2 -44.8,-100 -100,-100zM499.4,473.4l-58.7,-52.1c-0.1,-0.1 -0.2,-0.1 -0.2,-0.2 -0.3,-0.3 -0.7,-0.6 -1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.4,-0.3 -0.7,-0.5 -1.1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.3,-0.2 -0.7,-0.5 -1.1,-0.7 -0.2,-0.1 -0.3,-0.2 -0.5,-0.3 -0.3,-0.2 -0.7,-0.4 -1,-0.6l-0.6,-0.3c-0.3,-0.2 -0.6,-0.3 -0.9,-0.5 -0.2,-0.1 -0.5,-0.3 -0.7,-0.4 -0.3,-0.1 -0.5,-0.3 -0.8,-0.4 -0.3,-0.1 -0.6,-0.3 -0.9,-0.4 -0.2,-0.1 -0.4,-0.2 -0.7,-0.3 -0.3,-0.1 -0.7,-0.3 -1,-0.4 -0.2,-0.1 -0.4,-0.1 -0.6,-0.2 -0.4,-0.1 -0.7,-0.3 -1.1,-0.4 -0.2,-0.1 -0.3,-0.1 -0.5,-0.2l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.2 -1.2,-0.2 -0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.1 -1.2,-0.2 -0.2,0 -0.4,0 -0.6,-0.1 -0.4,0 -0.7,-0.1 -1.1,-0.1h-5.1c-0.3,0 -0.7,0.1 -1,0.1 -0.2,0 -0.4,0 -0.7,0.1 -0.4,0 -0.7,0.1 -1.1,0.1 -0.2,0 -0.4,0.1 -0.6,0.1 -0.4,0.1 -0.8,0.1 -1.2,0.2 -0.2,0 -0.4,0.1 -0.5,0.1l-1.2,0.3c-0.2,0 -0.4,0.1 -0.5,0.1 -0.4,0.1 -0.7,0.2 -1.1,0.3 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.4,0.1 -0.7,0.2 -1,0.4 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.3,0.1 -0.6,0.2 -0.9,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.1 -0.5,0.2 -0.8,0.4 -0.3,0.1 -0.6,0.3 -0.8,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.2 -0.6,0.3 -1,0.5 -0.2,0.1 -0.4,0.2 -0.5,0.3 -0.4,0.2 -0.7,0.4 -1,0.6 -0.1,0.1 -0.3,0.2 -0.4,0.3 -0.4,0.2 -0.7,0.5 -1.1,0.7 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.4,0.3 -0.7,0.5 -1.1,0.8 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.3,0.3 -0.7,0.6 -1,0.9 -0.1,0.1 -0.2,0.1 -0.2,0.2L332.7,474L332.7,136.2h166.7v337.2zM173.5,173.7c23.4,-23.4 54.2,-36.6 87.2,-37.4L260.7,555.7c0,0.3 0,0.7 0.1,1 0,0.3 0.1,0.5 0.1,0.8 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8l0.3,0.9c0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.4,0.8 0.1,0.3 0.2,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.2,0.3 0.3,0.5 0.5,0.8 0.1,0.2 0.3,0.5 0.5,0.7 0.2,0.3 0.4,0.5 0.5,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.4,0.5 0.6,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.5,0.6 0.7,0.8l0.3,0.3 0.2,0.2c0.3,0.3 0.6,0.6 0.8,0.9l0.5,0.5 0.8,0.8c0.9,0.9 1.9,1.7 2.9,2.5 0.1,0.1 0.3,0.2 0.4,0.3 0.3,0.2 0.7,0.5 1,0.7 0.2,0.1 0.3,0.2 0.5,0.4 0.3,0.2 0.6,0.4 1,0.6 0.2,0.1 0.4,0.3 0.6,0.4 0.3,0.2 0.6,0.4 0.9,0.5 0.2,0.1 0.5,0.3 0.7,0.4 0.3,0.1 0.5,0.3 0.8,0.4 0.3,0.1 0.6,0.3 0.9,0.4 0.2,0.1 0.5,0.2 0.7,0.3 0.4,0.2 0.7,0.3 1.1,0.5 0.2,0.1 0.4,0.1 0.5,0.2 0.5,0.2 0.9,0.3 1.4,0.5 0.1,0 0.2,0.1 0.3,0.1 0.6,0.2 1.1,0.3 1.7,0.5h0.1c3,0.8 6.1,1.2 9.3,1.2h2.3c0.4,0 0.8,-0.1 1.1,-0.1 0.2,0 0.5,-0.1 0.7,-0.1 0.3,0 0.7,-0.1 1,-0.1 0.3,0 0.5,-0.1 0.8,-0.1 0.3,0 0.6,-0.1 0.9,-0.2 0.3,0 0.5,-0.1 0.8,-0.2 0.3,-0.1 0.6,-0.1 0.9,-0.2 0.3,-0.1 0.5,-0.1 0.8,-0.2l0.9,-0.3c0.2,-0.1 0.5,-0.1 0.7,-0.2 0.4,-0.1 0.7,-0.2 1.1,-0.4 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.5,-0.2 1,-0.4 1.6,-0.6 0.1,0 0.2,-0.1 0.3,-0.1 0.4,-0.2 0.9,-0.4 1.3,-0.6 0.2,-0.1 0.3,-0.2 0.5,-0.2 0.4,-0.2 0.7,-0.4 1,-0.5 0.2,-0.1 0.4,-0.2 0.5,-0.3 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.3 0.8,-0.5 0.2,-0.1 0.4,-0.3 0.6,-0.4 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.4,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.4 0.7,-0.6 0.1,-0.1 0.3,-0.2 0.4,-0.3l96.2,-84.3 94.9,84.1c0.2,0.1 0.3,0.3 0.5,0.4 0.2,0.2 0.4,0.4 0.7,0.6 0.2,0.2 0.5,0.4 0.7,0.5 0.2,0.2 0.4,0.3 0.7,0.5 0.3,0.2 0.5,0.4 0.8,0.6 0.2,0.1 0.4,0.3 0.6,0.4l0.9,0.6c0.2,0.1 0.3,0.2 0.5,0.3 0.4,0.2 0.7,0.4 1.1,0.6 0.1,0.1 0.2,0.1 0.3,0.2 0.5,0.3 1,0.5 1.5,0.8 0.5,0.3 1,0.5 1.6,0.7 0.1,0 0.2,0.1 0.2,0.1 0.4,0.2 0.9,0.4 1.3,0.5 0.2,0.1 0.4,0.1 0.6,0.2 0.3,0.1 0.7,0.2 1,0.3 0.2,0.1 0.5,0.1 0.7,0.2l0.9,0.3c0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0 0.5,0.1 0.8,0.1 0.3,0 0.7,0.1 1,0.1 0.2,0 0.5,0.1 0.7,0.1 0.4,0 0.8,0.1 1.1,0.1h2.3c3.8,0 7.5,-0.6 11,-1.7 0.1,0 0.2,-0.1 0.2,-0.1 0.5,-0.2 1,-0.3 1.5,-0.5 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.4,-0.2 0.8,-0.3 1.1,-0.5 0.2,-0.1 0.5,-0.2 0.7,-0.3 0.3,-0.1 0.6,-0.3 0.9,-0.4 0.3,-0.1 0.6,-0.3 0.8,-0.4 0.2,-0.1 0.5,-0.3 0.7,-0.4 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.4 1,-0.6 0.2,-0.1 0.4,-0.2 0.5,-0.4 0.3,-0.2 0.6,-0.4 1,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.3,-0.2 0.6,-0.5 0.9,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.4,-0.3 0.7,-0.6 1.1,-1 0.4,-0.3 0.7,-0.7 1,-1 0.1,-0.1 0.3,-0.3 0.4,-0.5l0.9,-0.9 0.1,-0.1c0.1,-0.1 0.2,-0.3 0.4,-0.4 0.2,-0.3 0.5,-0.5 0.7,-0.8 0.2,-0.2 0.3,-0.4 0.5,-0.6 0.2,-0.3 0.4,-0.5 0.6,-0.8 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.2 0.2,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8l0.3,-0.9c0.1,-0.3 0.2,-0.5 0.2,-0.8 0.1,-0.3 0.2,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.5 0.2,-0.8 0.1,-0.3 0.1,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.6 0.2,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.5 0.1,-0.8 0,-0.3 0.1,-0.7 0.1,-1v-0.8,-1.1 -417.9h288.8c15.4,0 28,12.6 28,28v504L209.7,668.2c-26.9,0 -52,7.3 -73.7,20v-424c0,-34.2 13.3,-66.3 37.5,-90.5zM860.2,887.6L214,887.6c-43,0 -78,-35 -78,-78v-3.1c3.9,-37.2 35.5,-66.2 73.7,-66.2h678.5v119.3c0,15.4 -12.6,28 -28,28z" /> diff --git a/app/src/main/res/drawable/ic_overtime.xml b/app/src/main/res/drawable/ic_overtime.xml new file mode 100644 index 0000000..6916eca --- /dev/null +++ b/app/src/main/res/drawable/ic_overtime.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_privacy.xml b/app/src/main/res/drawable/ic_privacy.xml index 22ef981..92d2699 100644 --- a/app/src/main/res/drawable/ic_privacy.xml +++ b/app/src/main/res/drawable/ic_privacy.xml @@ -5,5 +5,8 @@ android:viewportHeight="1024"> + android:pathData="M615.51,402.9a34.13,34.13 0,0 1,51.16 45.08l-2.18,2.45 -149.61,154.15a34.13,34.13 0,0 1,-44.07 4.18l-2.65,-2.05 -106.41,-91.39a34.13,34.13 0,0 1,41.9 -53.8l2.6,2.01 82.01,70.46 127.25,-131.09z" /> + diff --git a/app/src/main/res/drawable/ic_push_setting.xml b/app/src/main/res/drawable/ic_push_setting.xml index 69e0c3f..c03f19f 100644 --- a/app/src/main/res/drawable/ic_push_setting.xml +++ b/app/src/main/res/drawable/ic_push_setting.xml @@ -5,30 +5,5 @@ android:viewportHeight="1024"> - + android:pathData="M932.6,832L432.8,832c-9.4,0 -18.4,-4.4 -24,-12 -5.6,-7.6 -7.4,-17.4 -4.8,-26.4l24.4,-84.4c0.4,-1.2 0.8,-2.4 1.4,-3.6 1.6,-3.6 2.4,-7.4 2.4,-11.4L432.2,480.8c0,-137.8 112.2,-250 250,-250 138.4,0 251,112.2 251,250v213.4c0,4 0.8,7.8 2.4,11.4 0.6,1.2 1,2.4 1.4,3.6l24.4,84.4c2.6,9 0.8,18.8 -4.8,26.4 -5.8,7.6 -14.6,12 -24,12zM472.6,772h420l-12.8,-44.4c-4.4,-10.6 -6.6,-21.8 -6.6,-33.4L873.2,480.8c0,-104.8 -85.6,-190 -191,-190 -104.8,0 -190.2,85.2 -190.2,190v213.4c0,11.6 -2.2,22.8 -6.6,33.4l-12.8,44.4zM833.4,507.6c0,-104 -58.2,-176.8 -141.4,-176.8 -16.6,0 -30,13.4 -30,30s13.4,30 30,30c64.2,0 81.4,73.4 81.4,116.8 0,16.6 13.4,30 30,30s30,-13.4 30,-30zM785.8,895c0,-16.6 -13.4,-30 -30,-30h-146.2c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h146.2c16.6,0 30,-13.4 30,-30zM364.6,923.6c0,-16.6 -13.4,-30 -30,-30L180.4,893.6c-32.4,0 -58.8,-26.4 -58.8,-58.8L121.6,189.2c0,-32.4 26.4,-58.8 58.8,-58.8h514.8c32.4,0 58.8,26.4 58.8,58.8 0,16.6 13.4,30 30,30s30,-13.4 30,-30c0,-65.6 -53.4,-118.8 -118.8,-118.8L180.4,70.4c-65.6,0 -118.8,53.4 -118.8,118.8v645.4c0,65.6 53.4,118.8 118.8,118.8h154.2c16.6,0.2 30,-13.2 30,-29.8zM354.4,327.2c0,-16.6 -13.4,-30 -30,-30h-104.2c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h104.2c16.6,0 30,-13.4 30,-30zM317.6,492.6c0,-16.6 -13.4,-30 -30,-30h-67.4c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h67.4c16.6,0 30,-13.4 30,-30zM334,658c0,-16.6 -13.4,-30 -30,-30h-83.8c-16.6,0 -30,13.4 -30,30s13.4,30 30,30L304,688c16.4,0 30,-13.4 30,-30z" /> diff --git a/app/src/main/res/drawable/ic_total_sample.xml b/app/src/main/res/drawable/ic_total_sample.xml new file mode 100644 index 0000000..6bad12a --- /dev/null +++ b/app/src/main/res/drawable/ic_total_sample.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_total_verify.xml b/app/src/main/res/drawable/ic_total_verify.xml new file mode 100644 index 0000000..4ff7f08 --- /dev/null +++ b/app/src/main/res/drawable/ic_total_verify.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_update.xml b/app/src/main/res/drawable/ic_update.xml index b361057..bcc9397 100644 --- a/app/src/main/res/drawable/ic_update.xml +++ b/app/src/main/res/drawable/ic_update.xml @@ -5,5 +5,11 @@ android:viewportHeight="1024"> + android:pathData="M774.56,775.16H558.41a27,27 0,1 1,0 -54.1h216.15a27,27 0,1 1,0 54.1zM327.65,841.85H192.54a27,27 0,1 1,0 -54.09h135.11a27,27 0,1 1,0 54.09zM287.13,950.79h-54a27,27 0,0 1,0 -54.1h54a27,27 0,1 1,0 54.1zM774.56,423.89h-162.1a27,27 0,1 1,0 -54.09h162.1a27,27 0,1 1,0 54.09zM774.56,599.52H558.41a27,27 0,1 1,0 -54.09h216.15a27,27 0,1 1,0 54.09zM937.38,328.67H832.57a81.24,81.24 0,0 1,-81.15 -81.15V112.28a27.05,27.05 0,1 1,54.1 0v135.24a27.06,27.06 0,0 0,27.05 27h104.81a27.05,27.05 0,0 1,0 54.1z" /> + + diff --git a/app/src/main/res/drawable/ic_verified.xml b/app/src/main/res/drawable/ic_verified.xml new file mode 100644 index 0000000..aeb63f6 --- /dev/null +++ b/app/src/main/res/drawable/ic_verified.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/layout/fragment_future_task.xml b/app/src/main/res/layout/fragment_future_task.xml new file mode 100644 index 0000000..dd959d2 --- /dev/null +++ b/app/src/main/res/layout/fragment_future_task.xml @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml index c8d6d99..b319fa0 100644 --- a/app/src/main/res/layout/fragment_mine.xml +++ b/app/src/main/res/layout/fragment_mine.xml @@ -61,6 +61,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_7" android:fontFamily="sans-serif-black" + android:singleLine="true" android:text="北京达佳科技有限公司" android:textColor="@color/mainTextColor" android:textSize="@dimen/sp_18" /> diff --git a/app/src/main/res/layout/fragment_sample.xml b/app/src/main/res/layout/fragment_sample.xml index 41d2ef1..2df9f57 100644 --- a/app/src/main/res/layout/fragment_sample.xml +++ b/app/src/main/res/layout/fragment_sample.xml @@ -1,6 +1,39 @@ + android:layout_height="match_parent" + android:background="@color/mainBackground" + android:orientation="vertical"> + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_total_task.xml b/app/src/main/res/layout/fragment_total_task.xml new file mode 100644 index 0000000..cab9456 --- /dev/null +++ b/app/src/main/res/layout/fragment_total_task.xml @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_under_task.xml b/app/src/main/res/layout/fragment_under_task.xml new file mode 100644 index 0000000..d66f351 --- /dev/null +++ b/app/src/main/res/layout/fragment_under_task.xml @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt new file mode 100644 index 0000000..621d5d4 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt @@ -0,0 +1,18 @@ +package com.casic.xz.meterage.adapter + +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager +import androidx.fragment.app.FragmentPagerAdapter + +class SubViewPagerAdapter( + manager: FragmentManager, + private val pages: ArrayList, + private val titles: Array +) : FragmentPagerAdapter(manager) { + + override fun getItem(position: Int): Fragment = pages[position] + + override fun getCount(): Int = pages.size + + override fun getPageTitle(position: Int): CharSequence = titles[position] +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index f54f94a..afa0759 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,11 +1,32 @@ package com.casic.xz.meterage.fragment +import androidx.fragment.app.Fragment import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.SubViewPagerAdapter +import com.casic.xz.meterage.fragment.sample.FutureTaskFragment +import com.casic.xz.meterage.fragment.sample.TotalTaskFragment +import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_sample.* -class SamplePageFragment : KotlinBaseFragment(){ +class SamplePageFragment : KotlinBaseFragment() { + + private var fragmentPages: ArrayList = ArrayList() + + init { + fragmentPages.add(UnderTaskFragment()) + fragmentPages.add(FutureTaskFragment()) + fragmentPages.add(TotalTaskFragment()) + } + override fun initData() { + val samplePageTitles = arrayOf("检定中 0", "预期任务 0", "全部 0") + sampleViewPager.adapter = SubViewPagerAdapter( + childFragmentManager, fragmentPages, samplePageTitles + ) + //绑定 + topTabLayout.setupWithViewPager(sampleViewPager) } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt new file mode 100644 index 0000000..ebad65f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.sample + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class FutureTaskFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_future_task + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/sample/TotalTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/sample/TotalTaskFragment.kt new file mode 100644 index 0000000..1968ed2 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/sample/TotalTaskFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.sample + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TotalTaskFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_total_task + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/sample/UnderTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/sample/UnderTaskFragment.kt new file mode 100644 index 0000000..da5c3f3 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/sample/UnderTaskFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.sample + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class UnderTaskFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_under_task + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml index b41f4ac..c7546e4 100644 --- a/app/src/main/res/drawable/ic_about.xml +++ b/app/src/main/res/drawable/ic_about.xml @@ -5,8 +5,5 @@ android:viewportHeight="1024"> - + android:pathData="M300.93,453.16c11.5,-2.59 18.74,-14.02 16.15,-25.53 -5.44,-24.16 -6.26,-48.98 -2.43,-73.71C331.33,245.86 432.8,171.54 540.95,188.29c25.5,3.94 49.54,12.59 71.42,25.7 10.16,6.07 23.24,2.77 29.3,-7.34 6.05,-10.13 2.75,-23.24 -7.36,-29.3 -26.66,-15.95 -55.88,-26.48 -86.84,-31.26 -131.27,-20.32 -254.74,69.98 -275.07,201.33 -4.62,30.06 -3.62,60.2 2.99,89.59 2.23,9.95 11.05,16.69 20.82,16.69 1.57,-0.01 3.14,-0.2 4.72,-0.53zM895.38,612.43c0,-30.54 -11.99,-57.46 -32.14,-76.09 20.22,-46.71 31.58,-98.08 31.58,-152.1C894.82,172.37 722.46,0 510.61,0 298.75,0 126.38,172.37 126.38,384.24c0,126.89 61.98,239.39 157.13,309.4a106.69,106.69 0,0 0,2.64 11.4c3.62,12.37 8.62,23.45 14.94,33.05 34.45,52.54 73.5,112.04 112.24,170.06 39.24,58.74 96.04,95.27 168.8,108.56 9.16,1.61 17.54,2.71 25.63,3.74 3.89,0.52 7.78,1.03 11.64,1.58 3.05,0.45 6.14,0.65 9.22,0.65h43.39c3.41,0 6.83,-0.23 10.21,-0.82 3.82,-0.62 7.63,-1.21 11.49,-1.8a2627.42,2627.42 0,0 0,19.7 -3.15c91.92,-15.87 161.29,-85 176.84,-176.22 3.18,-18.23 4.83,-36.71 4.9,-54.77 0.22,-68.46 0.22,-77.04 0.2,-104.73 0,-14.2 0,-33.52 0.02,-68.75zM190.45,384.23c0,-176.85 143.35,-320.17 320.16,-320.17s320.16,143.32 320.16,320.17c0,44.88 -9.4,87.5 -26.09,126.26 -3,-0.29 -5.99,-0.49 -9,-0.49a99.29,99.29 0,0 0,-26.95 3.71c-9.98,-9.44 -21.92,-16.83 -35.32,-21.43 -2.23,-0.73 -4.45,-1.37 -6.65,-1.96 10.54,-21.32 18.18,-44.51 21.98,-69.26 8.26,-53.24 -1.15,-106.25 -27.18,-153.33 -5.7,-10.31 -18.69,-14.07 -29.02,-8.36 -10.31,5.71 -14.05,18.7 -8.35,29.02 21.41,38.71 29.14,82.34 22.35,126.13 -4.3,27.64 -14.22,52.92 -28.34,75.1 -1.27,0.3 -2.6,0.43 -3.85,0.78 -8.78,-8.07 -19.31,-14.72 -31.37,-19.78 -9.2,-4.9 -19.5,-7.45 -29.99,-7.45h-2.16c0,-27.51 0,-53.6 -0.03,-74.53 0,-52.01 -34.53,-92.43 -85.95,-100.51a92.3,92.3 0,0 0,-14.37 -1.15c-50.27,0 -94.47,40.42 -98.51,90.09 -0.48,6.38 -0.48,11.74 -0.48,16.05v162.58c-19.94,-11.45 -37.93,-26.28 -52.95,-44.22 -7.55,-9.04 -21,-10.25 -30.08,-2.68 -9.03,7.57 -10.23,21.04 -2.68,30.1 10.42,12.44 22.1,23.59 34.63,33.57 -25.95,6.62 -48.7,23.19 -62.88,46.41 -0.55,0.9 -0.97,1.84 -1.49,2.75 -64.79,-58.6 -105.57,-143.19 -105.57,-237.41zM831.09,785.7c-0.07,14.72 -1.46,29.65 -3.99,44.21 -10.98,64.43 -59.79,112.68 -124.43,123.82 -10.16,1.72 -20.44,3.24 -30.65,4.9h-43.4c-11.63,-1.72 -23.37,-2.94 -34.97,-5 -53.34,-9.73 -96.64,-35.58 -127.02,-81.08 -37.67,-56.37 -74.81,-112.96 -111.96,-169.6 -3.14,-4.78 -5.38,-10.33 -7.01,-15.82 -6.95,-23.93 7.16,-48.66 30.71,-53.22 3.42,-0.64 6.74,-0.99 9.89,-0.99 14.31,0 26.51,6.47 35.85,18.57 15.57,20.13 30.29,40.92 45.36,61.42a369.92,369.92 0,0 0,4.84 6.52c0.39,-0.17 0.82,-0.3 1.22,-0.49v-5.75,-320.07c0,-3.64 0,-7.24 0.28,-10.87 1.38,-16.89 17.86,-31.19 34.66,-31.19 1.45,0 2.96,0.12 4.43,0.36 19.88,3.13 31.84,16.94 31.84,37.27 0.05,56.97 0,152.32 0.08,209.34 0,2.96 0.19,6.06 1.06,8.86 1.46,4.61 4.94,7.08 9.88,7.46h1.05c4.72,0 8.2,-2.36 10.06,-6.59 1.19,-2.62 1.26,-5.83 1.26,-8.82 0,-19.61 -0.05,-25.79 -0.05,-25.79l-0.07,18.23c0,-0.06 0,-6.3 0.05,-25.8 0,-12.88 4.32,-24.08 15.27,-31.69 4.03,-2.75 8.83,-4.47 13.26,-6.64h14.39c0.51,0.37 0.92,0.84 1.47,1.04 18.72,6.44 27.42,18.58 27.42,38.26 -0.06,19.31 -0.06,25.46 -0.06,25.46l-0.02,-18.79v25.49c0,1.84 -0.06,3.62 0.13,5.4 0.78,6.15 5.51,10.23 11.48,10.23 0.39,0 0.74,0 1.12,-0.02 6.31,-0.57 9.92,-4.88 10.36,-12.68v-0.19c0.03,-0.47 0.03,-0.96 0.03,-1.43v-12.12c0.28,-8.39 2.34,-16.3 7.74,-23.13 7.09,-8.99 17.41,-13.88 28.18,-13.88 3.91,0 7.88,0.65 11.73,1.95 14.79,5.1 24.25,19.45 24.25,36.59 -0.02,19.31 -0.05,25.48 -0.05,25.48 -0.01,0 -0.05,-18.81 -0.07,-18.81 0,0 -0.01,6.15 -0.01,25.5 0,2.2 0,4.43 0.23,6.61 0.71,5.8 4.47,8.8 9.86,9.86a7.59,7.59 0,0 0,1.68 0.16c4.26,0 8.79,-2.97 10.23,-7.24 0.92,-2.77 1.18,-5.86 1.18,-8.86 0,-2.62 0,-4.88 0.01,-6.77v12.98c0.07,0 0.11,-3.89 0.15,-15.16 0.07,-6.25 1.2,-12.92 3.67,-18.63 5.64,-12.79 18.6,-20.52 31.96,-20.52 2.47,0 4.9,0.29 7.36,0.82 17.32,3.79 28.26,18.49 28.26,37.52 -0.06,103.54 0.1,69.78 -0.22,173.33z" /> diff --git a/app/src/main/res/drawable/ic_collection.xml b/app/src/main/res/drawable/ic_collection.xml index ce1a8a2..4d2016b 100644 --- a/app/src/main/res/drawable/ic_collection.xml +++ b/app/src/main/res/drawable/ic_collection.xml @@ -5,8 +5,5 @@ android:viewportHeight="1024"> - + android:pathData="M139.64,930.91 L512,774.48 884.36,930.91 884.36,93.09 139.64,93.09 139.64,930.91ZM79.79,93.09C79.79,60.04 106.59,33.25 139.64,33.25L884.36,33.25C917.41,33.25 944.21,60.04 944.21,93.09L944.21,930.91C944.21,973.69 900.62,1002.65 861.18,986.08L488.82,829.65 535.18,829.65 162.81,986.08C123.38,1002.65 79.79,973.69 79.79,930.91L79.79,93.09ZM512,606.67 L628.8,659.86C652.63,670.7 668.89,658.58 665.59,632.98L649.71,509.73 738.03,418.34C755.56,400.2 749.98,381.09 724.83,376.4L597.09,352.58 534.8,243.1C522.43,221.36 501.6,221.3 488.77,243.84L426.98,352.4 299.23,376.26C274.26,380.93 268.17,399.75 286.02,418.22L374.29,509.61 358.41,632.86C355.12,658.41 371.59,670.5 395.2,659.77L512,606.67ZM536.77,661.15 L419.97,714.25C353.79,744.33 289.76,697.43 299.06,625.22L314.93,501.96 331.24,551.18 242.98,459.8C192.09,407.12 216.3,330.88 288.24,317.44L415.99,293.57 374.97,322.79 436.76,214.24C472.3,151.8 551.26,151 586.82,213.51L649.1,322.98 608.06,293.75 735.8,317.57C808.03,331.04 831.6,407.64 781.06,459.93L692.74,551.31 709.07,502.08 724.94,625.34C734.25,697.6 670.4,744.55 604,714.32L487.2,661.14 536.77,661.15Z" /> diff --git a/app/src/main/res/drawable/ic_help.xml b/app/src/main/res/drawable/ic_help.xml index 3835c32..cf1f741 100644 --- a/app/src/main/res/drawable/ic_help.xml +++ b/app/src/main/res/drawable/ic_help.xml @@ -5,11 +5,5 @@ android:viewportHeight="1024"> - - + android:pathData="M860.2,64.2L264,64.2c-110.5,0 -200,89.5 -200,200v538.9c-0.3,3.7 -0.4,7.4 -0.4,11.1h0.5C66.6,895 132.8,959.6 214,959.6h646.2c55.2,0 100,-44.8 100,-100L960.2,164.2c0,-55.2 -44.8,-100 -100,-100zM499.4,473.4l-58.7,-52.1c-0.1,-0.1 -0.2,-0.1 -0.2,-0.2 -0.3,-0.3 -0.7,-0.6 -1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.4,-0.3 -0.7,-0.5 -1.1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.3,-0.2 -0.7,-0.5 -1.1,-0.7 -0.2,-0.1 -0.3,-0.2 -0.5,-0.3 -0.3,-0.2 -0.7,-0.4 -1,-0.6l-0.6,-0.3c-0.3,-0.2 -0.6,-0.3 -0.9,-0.5 -0.2,-0.1 -0.5,-0.3 -0.7,-0.4 -0.3,-0.1 -0.5,-0.3 -0.8,-0.4 -0.3,-0.1 -0.6,-0.3 -0.9,-0.4 -0.2,-0.1 -0.4,-0.2 -0.7,-0.3 -0.3,-0.1 -0.7,-0.3 -1,-0.4 -0.2,-0.1 -0.4,-0.1 -0.6,-0.2 -0.4,-0.1 -0.7,-0.3 -1.1,-0.4 -0.2,-0.1 -0.3,-0.1 -0.5,-0.2l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.2 -1.2,-0.2 -0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.1 -1.2,-0.2 -0.2,0 -0.4,0 -0.6,-0.1 -0.4,0 -0.7,-0.1 -1.1,-0.1h-5.1c-0.3,0 -0.7,0.1 -1,0.1 -0.2,0 -0.4,0 -0.7,0.1 -0.4,0 -0.7,0.1 -1.1,0.1 -0.2,0 -0.4,0.1 -0.6,0.1 -0.4,0.1 -0.8,0.1 -1.2,0.2 -0.2,0 -0.4,0.1 -0.5,0.1l-1.2,0.3c-0.2,0 -0.4,0.1 -0.5,0.1 -0.4,0.1 -0.7,0.2 -1.1,0.3 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.4,0.1 -0.7,0.2 -1,0.4 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.3,0.1 -0.6,0.2 -0.9,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.1 -0.5,0.2 -0.8,0.4 -0.3,0.1 -0.6,0.3 -0.8,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.2 -0.6,0.3 -1,0.5 -0.2,0.1 -0.4,0.2 -0.5,0.3 -0.4,0.2 -0.7,0.4 -1,0.6 -0.1,0.1 -0.3,0.2 -0.4,0.3 -0.4,0.2 -0.7,0.5 -1.1,0.7 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.4,0.3 -0.7,0.5 -1.1,0.8 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.3,0.3 -0.7,0.6 -1,0.9 -0.1,0.1 -0.2,0.1 -0.2,0.2L332.7,474L332.7,136.2h166.7v337.2zM173.5,173.7c23.4,-23.4 54.2,-36.6 87.2,-37.4L260.7,555.7c0,0.3 0,0.7 0.1,1 0,0.3 0.1,0.5 0.1,0.8 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8l0.3,0.9c0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.4,0.8 0.1,0.3 0.2,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.2,0.3 0.3,0.5 0.5,0.8 0.1,0.2 0.3,0.5 0.5,0.7 0.2,0.3 0.4,0.5 0.5,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.4,0.5 0.6,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.5,0.6 0.7,0.8l0.3,0.3 0.2,0.2c0.3,0.3 0.6,0.6 0.8,0.9l0.5,0.5 0.8,0.8c0.9,0.9 1.9,1.7 2.9,2.5 0.1,0.1 0.3,0.2 0.4,0.3 0.3,0.2 0.7,0.5 1,0.7 0.2,0.1 0.3,0.2 0.5,0.4 0.3,0.2 0.6,0.4 1,0.6 0.2,0.1 0.4,0.3 0.6,0.4 0.3,0.2 0.6,0.4 0.9,0.5 0.2,0.1 0.5,0.3 0.7,0.4 0.3,0.1 0.5,0.3 0.8,0.4 0.3,0.1 0.6,0.3 0.9,0.4 0.2,0.1 0.5,0.2 0.7,0.3 0.4,0.2 0.7,0.3 1.1,0.5 0.2,0.1 0.4,0.1 0.5,0.2 0.5,0.2 0.9,0.3 1.4,0.5 0.1,0 0.2,0.1 0.3,0.1 0.6,0.2 1.1,0.3 1.7,0.5h0.1c3,0.8 6.1,1.2 9.3,1.2h2.3c0.4,0 0.8,-0.1 1.1,-0.1 0.2,0 0.5,-0.1 0.7,-0.1 0.3,0 0.7,-0.1 1,-0.1 0.3,0 0.5,-0.1 0.8,-0.1 0.3,0 0.6,-0.1 0.9,-0.2 0.3,0 0.5,-0.1 0.8,-0.2 0.3,-0.1 0.6,-0.1 0.9,-0.2 0.3,-0.1 0.5,-0.1 0.8,-0.2l0.9,-0.3c0.2,-0.1 0.5,-0.1 0.7,-0.2 0.4,-0.1 0.7,-0.2 1.1,-0.4 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.5,-0.2 1,-0.4 1.6,-0.6 0.1,0 0.2,-0.1 0.3,-0.1 0.4,-0.2 0.9,-0.4 1.3,-0.6 0.2,-0.1 0.3,-0.2 0.5,-0.2 0.4,-0.2 0.7,-0.4 1,-0.5 0.2,-0.1 0.4,-0.2 0.5,-0.3 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.3 0.8,-0.5 0.2,-0.1 0.4,-0.3 0.6,-0.4 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.4,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.4 0.7,-0.6 0.1,-0.1 0.3,-0.2 0.4,-0.3l96.2,-84.3 94.9,84.1c0.2,0.1 0.3,0.3 0.5,0.4 0.2,0.2 0.4,0.4 0.7,0.6 0.2,0.2 0.5,0.4 0.7,0.5 0.2,0.2 0.4,0.3 0.7,0.5 0.3,0.2 0.5,0.4 0.8,0.6 0.2,0.1 0.4,0.3 0.6,0.4l0.9,0.6c0.2,0.1 0.3,0.2 0.5,0.3 0.4,0.2 0.7,0.4 1.1,0.6 0.1,0.1 0.2,0.1 0.3,0.2 0.5,0.3 1,0.5 1.5,0.8 0.5,0.3 1,0.5 1.6,0.7 0.1,0 0.2,0.1 0.2,0.1 0.4,0.2 0.9,0.4 1.3,0.5 0.2,0.1 0.4,0.1 0.6,0.2 0.3,0.1 0.7,0.2 1,0.3 0.2,0.1 0.5,0.1 0.7,0.2l0.9,0.3c0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0 0.5,0.1 0.8,0.1 0.3,0 0.7,0.1 1,0.1 0.2,0 0.5,0.1 0.7,0.1 0.4,0 0.8,0.1 1.1,0.1h2.3c3.8,0 7.5,-0.6 11,-1.7 0.1,0 0.2,-0.1 0.2,-0.1 0.5,-0.2 1,-0.3 1.5,-0.5 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.4,-0.2 0.8,-0.3 1.1,-0.5 0.2,-0.1 0.5,-0.2 0.7,-0.3 0.3,-0.1 0.6,-0.3 0.9,-0.4 0.3,-0.1 0.6,-0.3 0.8,-0.4 0.2,-0.1 0.5,-0.3 0.7,-0.4 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.4 1,-0.6 0.2,-0.1 0.4,-0.2 0.5,-0.4 0.3,-0.2 0.6,-0.4 1,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.3,-0.2 0.6,-0.5 0.9,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.4,-0.3 0.7,-0.6 1.1,-1 0.4,-0.3 0.7,-0.7 1,-1 0.1,-0.1 0.3,-0.3 0.4,-0.5l0.9,-0.9 0.1,-0.1c0.1,-0.1 0.2,-0.3 0.4,-0.4 0.2,-0.3 0.5,-0.5 0.7,-0.8 0.2,-0.2 0.3,-0.4 0.5,-0.6 0.2,-0.3 0.4,-0.5 0.6,-0.8 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.2 0.2,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8l0.3,-0.9c0.1,-0.3 0.2,-0.5 0.2,-0.8 0.1,-0.3 0.2,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.5 0.2,-0.8 0.1,-0.3 0.1,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.6 0.2,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.5 0.1,-0.8 0,-0.3 0.1,-0.7 0.1,-1v-0.8,-1.1 -417.9h288.8c15.4,0 28,12.6 28,28v504L209.7,668.2c-26.9,0 -52,7.3 -73.7,20v-424c0,-34.2 13.3,-66.3 37.5,-90.5zM860.2,887.6L214,887.6c-43,0 -78,-35 -78,-78v-3.1c3.9,-37.2 35.5,-66.2 73.7,-66.2h678.5v119.3c0,15.4 -12.6,28 -28,28z" /> diff --git a/app/src/main/res/drawable/ic_overtime.xml b/app/src/main/res/drawable/ic_overtime.xml new file mode 100644 index 0000000..6916eca --- /dev/null +++ b/app/src/main/res/drawable/ic_overtime.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_privacy.xml b/app/src/main/res/drawable/ic_privacy.xml index 22ef981..92d2699 100644 --- a/app/src/main/res/drawable/ic_privacy.xml +++ b/app/src/main/res/drawable/ic_privacy.xml @@ -5,5 +5,8 @@ android:viewportHeight="1024"> + android:pathData="M615.51,402.9a34.13,34.13 0,0 1,51.16 45.08l-2.18,2.45 -149.61,154.15a34.13,34.13 0,0 1,-44.07 4.18l-2.65,-2.05 -106.41,-91.39a34.13,34.13 0,0 1,41.9 -53.8l2.6,2.01 82.01,70.46 127.25,-131.09z" /> + diff --git a/app/src/main/res/drawable/ic_push_setting.xml b/app/src/main/res/drawable/ic_push_setting.xml index 69e0c3f..c03f19f 100644 --- a/app/src/main/res/drawable/ic_push_setting.xml +++ b/app/src/main/res/drawable/ic_push_setting.xml @@ -5,30 +5,5 @@ android:viewportHeight="1024"> - + android:pathData="M932.6,832L432.8,832c-9.4,0 -18.4,-4.4 -24,-12 -5.6,-7.6 -7.4,-17.4 -4.8,-26.4l24.4,-84.4c0.4,-1.2 0.8,-2.4 1.4,-3.6 1.6,-3.6 2.4,-7.4 2.4,-11.4L432.2,480.8c0,-137.8 112.2,-250 250,-250 138.4,0 251,112.2 251,250v213.4c0,4 0.8,7.8 2.4,11.4 0.6,1.2 1,2.4 1.4,3.6l24.4,84.4c2.6,9 0.8,18.8 -4.8,26.4 -5.8,7.6 -14.6,12 -24,12zM472.6,772h420l-12.8,-44.4c-4.4,-10.6 -6.6,-21.8 -6.6,-33.4L873.2,480.8c0,-104.8 -85.6,-190 -191,-190 -104.8,0 -190.2,85.2 -190.2,190v213.4c0,11.6 -2.2,22.8 -6.6,33.4l-12.8,44.4zM833.4,507.6c0,-104 -58.2,-176.8 -141.4,-176.8 -16.6,0 -30,13.4 -30,30s13.4,30 30,30c64.2,0 81.4,73.4 81.4,116.8 0,16.6 13.4,30 30,30s30,-13.4 30,-30zM785.8,895c0,-16.6 -13.4,-30 -30,-30h-146.2c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h146.2c16.6,0 30,-13.4 30,-30zM364.6,923.6c0,-16.6 -13.4,-30 -30,-30L180.4,893.6c-32.4,0 -58.8,-26.4 -58.8,-58.8L121.6,189.2c0,-32.4 26.4,-58.8 58.8,-58.8h514.8c32.4,0 58.8,26.4 58.8,58.8 0,16.6 13.4,30 30,30s30,-13.4 30,-30c0,-65.6 -53.4,-118.8 -118.8,-118.8L180.4,70.4c-65.6,0 -118.8,53.4 -118.8,118.8v645.4c0,65.6 53.4,118.8 118.8,118.8h154.2c16.6,0.2 30,-13.2 30,-29.8zM354.4,327.2c0,-16.6 -13.4,-30 -30,-30h-104.2c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h104.2c16.6,0 30,-13.4 30,-30zM317.6,492.6c0,-16.6 -13.4,-30 -30,-30h-67.4c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h67.4c16.6,0 30,-13.4 30,-30zM334,658c0,-16.6 -13.4,-30 -30,-30h-83.8c-16.6,0 -30,13.4 -30,30s13.4,30 30,30L304,688c16.4,0 30,-13.4 30,-30z" /> diff --git a/app/src/main/res/drawable/ic_total_sample.xml b/app/src/main/res/drawable/ic_total_sample.xml new file mode 100644 index 0000000..6bad12a --- /dev/null +++ b/app/src/main/res/drawable/ic_total_sample.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_total_verify.xml b/app/src/main/res/drawable/ic_total_verify.xml new file mode 100644 index 0000000..4ff7f08 --- /dev/null +++ b/app/src/main/res/drawable/ic_total_verify.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_update.xml b/app/src/main/res/drawable/ic_update.xml index b361057..bcc9397 100644 --- a/app/src/main/res/drawable/ic_update.xml +++ b/app/src/main/res/drawable/ic_update.xml @@ -5,5 +5,11 @@ android:viewportHeight="1024"> + android:pathData="M774.56,775.16H558.41a27,27 0,1 1,0 -54.1h216.15a27,27 0,1 1,0 54.1zM327.65,841.85H192.54a27,27 0,1 1,0 -54.09h135.11a27,27 0,1 1,0 54.09zM287.13,950.79h-54a27,27 0,0 1,0 -54.1h54a27,27 0,1 1,0 54.1zM774.56,423.89h-162.1a27,27 0,1 1,0 -54.09h162.1a27,27 0,1 1,0 54.09zM774.56,599.52H558.41a27,27 0,1 1,0 -54.09h216.15a27,27 0,1 1,0 54.09zM937.38,328.67H832.57a81.24,81.24 0,0 1,-81.15 -81.15V112.28a27.05,27.05 0,1 1,54.1 0v135.24a27.06,27.06 0,0 0,27.05 27h104.81a27.05,27.05 0,0 1,0 54.1z" /> + + diff --git a/app/src/main/res/drawable/ic_verified.xml b/app/src/main/res/drawable/ic_verified.xml new file mode 100644 index 0000000..aeb63f6 --- /dev/null +++ b/app/src/main/res/drawable/ic_verified.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/layout/fragment_future_task.xml b/app/src/main/res/layout/fragment_future_task.xml new file mode 100644 index 0000000..dd959d2 --- /dev/null +++ b/app/src/main/res/layout/fragment_future_task.xml @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml index c8d6d99..b319fa0 100644 --- a/app/src/main/res/layout/fragment_mine.xml +++ b/app/src/main/res/layout/fragment_mine.xml @@ -61,6 +61,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_7" android:fontFamily="sans-serif-black" + android:singleLine="true" android:text="北京达佳科技有限公司" android:textColor="@color/mainTextColor" android:textSize="@dimen/sp_18" /> diff --git a/app/src/main/res/layout/fragment_sample.xml b/app/src/main/res/layout/fragment_sample.xml index 41d2ef1..2df9f57 100644 --- a/app/src/main/res/layout/fragment_sample.xml +++ b/app/src/main/res/layout/fragment_sample.xml @@ -1,6 +1,39 @@ + android:layout_height="match_parent" + android:background="@color/mainBackground" + android:orientation="vertical"> + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_total_task.xml b/app/src/main/res/layout/fragment_total_task.xml new file mode 100644 index 0000000..cab9456 --- /dev/null +++ b/app/src/main/res/layout/fragment_total_task.xml @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_under_task.xml b/app/src/main/res/layout/fragment_under_task.xml new file mode 100644 index 0000000..d66f351 --- /dev/null +++ b/app/src/main/res/layout/fragment_under_task.xml @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/include_sample_top_layout.xml b/app/src/main/res/layout/include_sample_top_layout.xml new file mode 100644 index 0000000..ac4f5c5 --- /dev/null +++ b/app/src/main/res/layout/include_sample_top_layout.xml @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt new file mode 100644 index 0000000..621d5d4 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SubViewPagerAdapter.kt @@ -0,0 +1,18 @@ +package com.casic.xz.meterage.adapter + +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager +import androidx.fragment.app.FragmentPagerAdapter + +class SubViewPagerAdapter( + manager: FragmentManager, + private val pages: ArrayList, + private val titles: Array +) : FragmentPagerAdapter(manager) { + + override fun getItem(position: Int): Fragment = pages[position] + + override fun getCount(): Int = pages.size + + override fun getPageTitle(position: Int): CharSequence = titles[position] +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt index f54f94a..afa0759 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/SamplePageFragment.kt @@ -1,11 +1,32 @@ package com.casic.xz.meterage.fragment +import androidx.fragment.app.Fragment import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.SubViewPagerAdapter +import com.casic.xz.meterage.fragment.sample.FutureTaskFragment +import com.casic.xz.meterage.fragment.sample.TotalTaskFragment +import com.casic.xz.meterage.fragment.sample.UnderTaskFragment import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_sample.* -class SamplePageFragment : KotlinBaseFragment(){ +class SamplePageFragment : KotlinBaseFragment() { + + private var fragmentPages: ArrayList = ArrayList() + + init { + fragmentPages.add(UnderTaskFragment()) + fragmentPages.add(FutureTaskFragment()) + fragmentPages.add(TotalTaskFragment()) + } + override fun initData() { + val samplePageTitles = arrayOf("检定中 0", "预期任务 0", "全部 0") + sampleViewPager.adapter = SubViewPagerAdapter( + childFragmentManager, fragmentPages, samplePageTitles + ) + //绑定 + topTabLayout.setupWithViewPager(sampleViewPager) } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt new file mode 100644 index 0000000..ebad65f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/sample/FutureTaskFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.sample + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class FutureTaskFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_future_task + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/sample/TotalTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/sample/TotalTaskFragment.kt new file mode 100644 index 0000000..1968ed2 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/sample/TotalTaskFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.sample + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class TotalTaskFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_total_task + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/sample/UnderTaskFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/sample/UnderTaskFragment.kt new file mode 100644 index 0000000..da5c3f3 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/sample/UnderTaskFragment.kt @@ -0,0 +1,24 @@ +package com.casic.xz.meterage.fragment.sample + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseFragment + +class UnderTaskFragment : KotlinBaseFragment() { + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_under_task + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml index b41f4ac..c7546e4 100644 --- a/app/src/main/res/drawable/ic_about.xml +++ b/app/src/main/res/drawable/ic_about.xml @@ -5,8 +5,5 @@ android:viewportHeight="1024"> - + android:pathData="M300.93,453.16c11.5,-2.59 18.74,-14.02 16.15,-25.53 -5.44,-24.16 -6.26,-48.98 -2.43,-73.71C331.33,245.86 432.8,171.54 540.95,188.29c25.5,3.94 49.54,12.59 71.42,25.7 10.16,6.07 23.24,2.77 29.3,-7.34 6.05,-10.13 2.75,-23.24 -7.36,-29.3 -26.66,-15.95 -55.88,-26.48 -86.84,-31.26 -131.27,-20.32 -254.74,69.98 -275.07,201.33 -4.62,30.06 -3.62,60.2 2.99,89.59 2.23,9.95 11.05,16.69 20.82,16.69 1.57,-0.01 3.14,-0.2 4.72,-0.53zM895.38,612.43c0,-30.54 -11.99,-57.46 -32.14,-76.09 20.22,-46.71 31.58,-98.08 31.58,-152.1C894.82,172.37 722.46,0 510.61,0 298.75,0 126.38,172.37 126.38,384.24c0,126.89 61.98,239.39 157.13,309.4a106.69,106.69 0,0 0,2.64 11.4c3.62,12.37 8.62,23.45 14.94,33.05 34.45,52.54 73.5,112.04 112.24,170.06 39.24,58.74 96.04,95.27 168.8,108.56 9.16,1.61 17.54,2.71 25.63,3.74 3.89,0.52 7.78,1.03 11.64,1.58 3.05,0.45 6.14,0.65 9.22,0.65h43.39c3.41,0 6.83,-0.23 10.21,-0.82 3.82,-0.62 7.63,-1.21 11.49,-1.8a2627.42,2627.42 0,0 0,19.7 -3.15c91.92,-15.87 161.29,-85 176.84,-176.22 3.18,-18.23 4.83,-36.71 4.9,-54.77 0.22,-68.46 0.22,-77.04 0.2,-104.73 0,-14.2 0,-33.52 0.02,-68.75zM190.45,384.23c0,-176.85 143.35,-320.17 320.16,-320.17s320.16,143.32 320.16,320.17c0,44.88 -9.4,87.5 -26.09,126.26 -3,-0.29 -5.99,-0.49 -9,-0.49a99.29,99.29 0,0 0,-26.95 3.71c-9.98,-9.44 -21.92,-16.83 -35.32,-21.43 -2.23,-0.73 -4.45,-1.37 -6.65,-1.96 10.54,-21.32 18.18,-44.51 21.98,-69.26 8.26,-53.24 -1.15,-106.25 -27.18,-153.33 -5.7,-10.31 -18.69,-14.07 -29.02,-8.36 -10.31,5.71 -14.05,18.7 -8.35,29.02 21.41,38.71 29.14,82.34 22.35,126.13 -4.3,27.64 -14.22,52.92 -28.34,75.1 -1.27,0.3 -2.6,0.43 -3.85,0.78 -8.78,-8.07 -19.31,-14.72 -31.37,-19.78 -9.2,-4.9 -19.5,-7.45 -29.99,-7.45h-2.16c0,-27.51 0,-53.6 -0.03,-74.53 0,-52.01 -34.53,-92.43 -85.95,-100.51a92.3,92.3 0,0 0,-14.37 -1.15c-50.27,0 -94.47,40.42 -98.51,90.09 -0.48,6.38 -0.48,11.74 -0.48,16.05v162.58c-19.94,-11.45 -37.93,-26.28 -52.95,-44.22 -7.55,-9.04 -21,-10.25 -30.08,-2.68 -9.03,7.57 -10.23,21.04 -2.68,30.1 10.42,12.44 22.1,23.59 34.63,33.57 -25.95,6.62 -48.7,23.19 -62.88,46.41 -0.55,0.9 -0.97,1.84 -1.49,2.75 -64.79,-58.6 -105.57,-143.19 -105.57,-237.41zM831.09,785.7c-0.07,14.72 -1.46,29.65 -3.99,44.21 -10.98,64.43 -59.79,112.68 -124.43,123.82 -10.16,1.72 -20.44,3.24 -30.65,4.9h-43.4c-11.63,-1.72 -23.37,-2.94 -34.97,-5 -53.34,-9.73 -96.64,-35.58 -127.02,-81.08 -37.67,-56.37 -74.81,-112.96 -111.96,-169.6 -3.14,-4.78 -5.38,-10.33 -7.01,-15.82 -6.95,-23.93 7.16,-48.66 30.71,-53.22 3.42,-0.64 6.74,-0.99 9.89,-0.99 14.31,0 26.51,6.47 35.85,18.57 15.57,20.13 30.29,40.92 45.36,61.42a369.92,369.92 0,0 0,4.84 6.52c0.39,-0.17 0.82,-0.3 1.22,-0.49v-5.75,-320.07c0,-3.64 0,-7.24 0.28,-10.87 1.38,-16.89 17.86,-31.19 34.66,-31.19 1.45,0 2.96,0.12 4.43,0.36 19.88,3.13 31.84,16.94 31.84,37.27 0.05,56.97 0,152.32 0.08,209.34 0,2.96 0.19,6.06 1.06,8.86 1.46,4.61 4.94,7.08 9.88,7.46h1.05c4.72,0 8.2,-2.36 10.06,-6.59 1.19,-2.62 1.26,-5.83 1.26,-8.82 0,-19.61 -0.05,-25.79 -0.05,-25.79l-0.07,18.23c0,-0.06 0,-6.3 0.05,-25.8 0,-12.88 4.32,-24.08 15.27,-31.69 4.03,-2.75 8.83,-4.47 13.26,-6.64h14.39c0.51,0.37 0.92,0.84 1.47,1.04 18.72,6.44 27.42,18.58 27.42,38.26 -0.06,19.31 -0.06,25.46 -0.06,25.46l-0.02,-18.79v25.49c0,1.84 -0.06,3.62 0.13,5.4 0.78,6.15 5.51,10.23 11.48,10.23 0.39,0 0.74,0 1.12,-0.02 6.31,-0.57 9.92,-4.88 10.36,-12.68v-0.19c0.03,-0.47 0.03,-0.96 0.03,-1.43v-12.12c0.28,-8.39 2.34,-16.3 7.74,-23.13 7.09,-8.99 17.41,-13.88 28.18,-13.88 3.91,0 7.88,0.65 11.73,1.95 14.79,5.1 24.25,19.45 24.25,36.59 -0.02,19.31 -0.05,25.48 -0.05,25.48 -0.01,0 -0.05,-18.81 -0.07,-18.81 0,0 -0.01,6.15 -0.01,25.5 0,2.2 0,4.43 0.23,6.61 0.71,5.8 4.47,8.8 9.86,9.86a7.59,7.59 0,0 0,1.68 0.16c4.26,0 8.79,-2.97 10.23,-7.24 0.92,-2.77 1.18,-5.86 1.18,-8.86 0,-2.62 0,-4.88 0.01,-6.77v12.98c0.07,0 0.11,-3.89 0.15,-15.16 0.07,-6.25 1.2,-12.92 3.67,-18.63 5.64,-12.79 18.6,-20.52 31.96,-20.52 2.47,0 4.9,0.29 7.36,0.82 17.32,3.79 28.26,18.49 28.26,37.52 -0.06,103.54 0.1,69.78 -0.22,173.33z" /> diff --git a/app/src/main/res/drawable/ic_collection.xml b/app/src/main/res/drawable/ic_collection.xml index ce1a8a2..4d2016b 100644 --- a/app/src/main/res/drawable/ic_collection.xml +++ b/app/src/main/res/drawable/ic_collection.xml @@ -5,8 +5,5 @@ android:viewportHeight="1024"> - + android:pathData="M139.64,930.91 L512,774.48 884.36,930.91 884.36,93.09 139.64,93.09 139.64,930.91ZM79.79,93.09C79.79,60.04 106.59,33.25 139.64,33.25L884.36,33.25C917.41,33.25 944.21,60.04 944.21,93.09L944.21,930.91C944.21,973.69 900.62,1002.65 861.18,986.08L488.82,829.65 535.18,829.65 162.81,986.08C123.38,1002.65 79.79,973.69 79.79,930.91L79.79,93.09ZM512,606.67 L628.8,659.86C652.63,670.7 668.89,658.58 665.59,632.98L649.71,509.73 738.03,418.34C755.56,400.2 749.98,381.09 724.83,376.4L597.09,352.58 534.8,243.1C522.43,221.36 501.6,221.3 488.77,243.84L426.98,352.4 299.23,376.26C274.26,380.93 268.17,399.75 286.02,418.22L374.29,509.61 358.41,632.86C355.12,658.41 371.59,670.5 395.2,659.77L512,606.67ZM536.77,661.15 L419.97,714.25C353.79,744.33 289.76,697.43 299.06,625.22L314.93,501.96 331.24,551.18 242.98,459.8C192.09,407.12 216.3,330.88 288.24,317.44L415.99,293.57 374.97,322.79 436.76,214.24C472.3,151.8 551.26,151 586.82,213.51L649.1,322.98 608.06,293.75 735.8,317.57C808.03,331.04 831.6,407.64 781.06,459.93L692.74,551.31 709.07,502.08 724.94,625.34C734.25,697.6 670.4,744.55 604,714.32L487.2,661.14 536.77,661.15Z" /> diff --git a/app/src/main/res/drawable/ic_help.xml b/app/src/main/res/drawable/ic_help.xml index 3835c32..cf1f741 100644 --- a/app/src/main/res/drawable/ic_help.xml +++ b/app/src/main/res/drawable/ic_help.xml @@ -5,11 +5,5 @@ android:viewportHeight="1024"> - - + android:pathData="M860.2,64.2L264,64.2c-110.5,0 -200,89.5 -200,200v538.9c-0.3,3.7 -0.4,7.4 -0.4,11.1h0.5C66.6,895 132.8,959.6 214,959.6h646.2c55.2,0 100,-44.8 100,-100L960.2,164.2c0,-55.2 -44.8,-100 -100,-100zM499.4,473.4l-58.7,-52.1c-0.1,-0.1 -0.2,-0.1 -0.2,-0.2 -0.3,-0.3 -0.7,-0.6 -1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.4,-0.3 -0.7,-0.5 -1.1,-0.8 -0.1,-0.1 -0.3,-0.2 -0.4,-0.3 -0.3,-0.2 -0.7,-0.5 -1.1,-0.7 -0.2,-0.1 -0.3,-0.2 -0.5,-0.3 -0.3,-0.2 -0.7,-0.4 -1,-0.6l-0.6,-0.3c-0.3,-0.2 -0.6,-0.3 -0.9,-0.5 -0.2,-0.1 -0.5,-0.3 -0.7,-0.4 -0.3,-0.1 -0.5,-0.3 -0.8,-0.4 -0.3,-0.1 -0.6,-0.3 -0.9,-0.4 -0.2,-0.1 -0.4,-0.2 -0.7,-0.3 -0.3,-0.1 -0.7,-0.3 -1,-0.4 -0.2,-0.1 -0.4,-0.1 -0.6,-0.2 -0.4,-0.1 -0.7,-0.3 -1.1,-0.4 -0.2,-0.1 -0.3,-0.1 -0.5,-0.2l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1l-1.2,-0.3c-0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.2 -1.2,-0.2 -0.2,0 -0.3,-0.1 -0.5,-0.1 -0.4,-0.1 -0.8,-0.1 -1.2,-0.2 -0.2,0 -0.4,0 -0.6,-0.1 -0.4,0 -0.7,-0.1 -1.1,-0.1h-5.1c-0.3,0 -0.7,0.1 -1,0.1 -0.2,0 -0.4,0 -0.7,0.1 -0.4,0 -0.7,0.1 -1.1,0.1 -0.2,0 -0.4,0.1 -0.6,0.1 -0.4,0.1 -0.8,0.1 -1.2,0.2 -0.2,0 -0.4,0.1 -0.5,0.1l-1.2,0.3c-0.2,0 -0.4,0.1 -0.5,0.1 -0.4,0.1 -0.7,0.2 -1.1,0.3 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.4,0.1 -0.7,0.2 -1,0.4 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.3,0.1 -0.6,0.2 -0.9,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.1 -0.5,0.2 -0.8,0.4 -0.3,0.1 -0.6,0.3 -0.8,0.4 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.3,0.2 -0.6,0.3 -1,0.5 -0.2,0.1 -0.4,0.2 -0.5,0.3 -0.4,0.2 -0.7,0.4 -1,0.6 -0.1,0.1 -0.3,0.2 -0.4,0.3 -0.4,0.2 -0.7,0.5 -1.1,0.7 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.4,0.3 -0.7,0.5 -1.1,0.8 -0.1,0.1 -0.2,0.2 -0.4,0.3 -0.3,0.3 -0.7,0.6 -1,0.9 -0.1,0.1 -0.2,0.1 -0.2,0.2L332.7,474L332.7,136.2h166.7v337.2zM173.5,173.7c23.4,-23.4 54.2,-36.6 87.2,-37.4L260.7,555.7c0,0.3 0,0.7 0.1,1 0,0.3 0.1,0.5 0.1,0.8 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.1,0.9 0,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8 0.1,0.3 0.1,0.6 0.2,0.9 0.1,0.3 0.1,0.5 0.2,0.8l0.3,0.9c0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.5 0.3,0.8 0.1,0.3 0.2,0.6 0.4,0.8 0.1,0.3 0.2,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.1,0.3 0.3,0.5 0.4,0.8 0.2,0.3 0.3,0.5 0.5,0.8 0.1,0.2 0.3,0.5 0.5,0.7 0.2,0.3 0.4,0.5 0.5,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.4,0.5 0.6,0.8 0.2,0.2 0.3,0.4 0.5,0.6 0.2,0.3 0.5,0.6 0.7,0.8l0.3,0.3 0.2,0.2c0.3,0.3 0.6,0.6 0.8,0.9l0.5,0.5 0.8,0.8c0.9,0.9 1.9,1.7 2.9,2.5 0.1,0.1 0.3,0.2 0.4,0.3 0.3,0.2 0.7,0.5 1,0.7 0.2,0.1 0.3,0.2 0.5,0.4 0.3,0.2 0.6,0.4 1,0.6 0.2,0.1 0.4,0.3 0.6,0.4 0.3,0.2 0.6,0.4 0.9,0.5 0.2,0.1 0.5,0.3 0.7,0.4 0.3,0.1 0.5,0.3 0.8,0.4 0.3,0.1 0.6,0.3 0.9,0.4 0.2,0.1 0.5,0.2 0.7,0.3 0.4,0.2 0.7,0.3 1.1,0.5 0.2,0.1 0.4,0.1 0.5,0.2 0.5,0.2 0.9,0.3 1.4,0.5 0.1,0 0.2,0.1 0.3,0.1 0.6,0.2 1.1,0.3 1.7,0.5h0.1c3,0.8 6.1,1.2 9.3,1.2h2.3c0.4,0 0.8,-0.1 1.1,-0.1 0.2,0 0.5,-0.1 0.7,-0.1 0.3,0 0.7,-0.1 1,-0.1 0.3,0 0.5,-0.1 0.8,-0.1 0.3,0 0.6,-0.1 0.9,-0.2 0.3,0 0.5,-0.1 0.8,-0.2 0.3,-0.1 0.6,-0.1 0.9,-0.2 0.3,-0.1 0.5,-0.1 0.8,-0.2l0.9,-0.3c0.2,-0.1 0.5,-0.1 0.7,-0.2 0.4,-0.1 0.7,-0.2 1.1,-0.4 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.5,-0.2 1,-0.4 1.6,-0.6 0.1,0 0.2,-0.1 0.3,-0.1 0.4,-0.2 0.9,-0.4 1.3,-0.6 0.2,-0.1 0.3,-0.2 0.5,-0.2 0.4,-0.2 0.7,-0.4 1,-0.5 0.2,-0.1 0.4,-0.2 0.5,-0.3 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.3 0.8,-0.5 0.2,-0.1 0.4,-0.3 0.6,-0.4 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.3 0.7,-0.5 0.2,-0.2 0.4,-0.3 0.7,-0.5 0.2,-0.2 0.5,-0.4 0.7,-0.6 0.1,-0.1 0.3,-0.2 0.4,-0.3l96.2,-84.3 94.9,84.1c0.2,0.1 0.3,0.3 0.5,0.4 0.2,0.2 0.4,0.4 0.7,0.6 0.2,0.2 0.5,0.4 0.7,0.5 0.2,0.2 0.4,0.3 0.7,0.5 0.3,0.2 0.5,0.4 0.8,0.6 0.2,0.1 0.4,0.3 0.6,0.4l0.9,0.6c0.2,0.1 0.3,0.2 0.5,0.3 0.4,0.2 0.7,0.4 1.1,0.6 0.1,0.1 0.2,0.1 0.3,0.2 0.5,0.3 1,0.5 1.5,0.8 0.5,0.3 1,0.5 1.6,0.7 0.1,0 0.2,0.1 0.2,0.1 0.4,0.2 0.9,0.4 1.3,0.5 0.2,0.1 0.4,0.1 0.6,0.2 0.3,0.1 0.7,0.2 1,0.3 0.2,0.1 0.5,0.1 0.7,0.2l0.9,0.3c0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0.1 0.5,0.1 0.8,0.2 0.3,0.1 0.6,0.1 0.9,0.2 0.3,0 0.5,0.1 0.8,0.1 0.3,0 0.7,0.1 1,0.1 0.2,0 0.5,0.1 0.7,0.1 0.4,0 0.8,0.1 1.1,0.1h2.3c3.8,0 7.5,-0.6 11,-1.7 0.1,0 0.2,-0.1 0.2,-0.1 0.5,-0.2 1,-0.3 1.5,-0.5 0.2,-0.1 0.3,-0.1 0.5,-0.2 0.4,-0.2 0.8,-0.3 1.1,-0.5 0.2,-0.1 0.5,-0.2 0.7,-0.3 0.3,-0.1 0.6,-0.3 0.9,-0.4 0.3,-0.1 0.6,-0.3 0.8,-0.4 0.2,-0.1 0.5,-0.3 0.7,-0.4 0.3,-0.2 0.6,-0.3 0.9,-0.5 0.2,-0.1 0.4,-0.2 0.6,-0.4 0.3,-0.2 0.6,-0.4 1,-0.6 0.2,-0.1 0.4,-0.2 0.5,-0.4 0.3,-0.2 0.6,-0.4 1,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.3,-0.2 0.6,-0.5 0.9,-0.7 0.2,-0.1 0.3,-0.3 0.5,-0.4 0.4,-0.3 0.7,-0.6 1.1,-1 0.4,-0.3 0.7,-0.7 1,-1 0.1,-0.1 0.3,-0.3 0.4,-0.5l0.9,-0.9 0.1,-0.1c0.1,-0.1 0.2,-0.3 0.4,-0.4 0.2,-0.3 0.5,-0.5 0.7,-0.8 0.2,-0.2 0.3,-0.4 0.5,-0.6 0.2,-0.3 0.4,-0.5 0.6,-0.8 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.2 0.3,-0.5 0.5,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.2,-0.3 0.3,-0.5 0.5,-0.8 0.1,-0.2 0.3,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.2 0.2,-0.5 0.4,-0.7 0.1,-0.3 0.3,-0.6 0.4,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.6 0.3,-0.8 0.1,-0.3 0.2,-0.5 0.3,-0.8l0.3,-0.9c0.1,-0.3 0.2,-0.5 0.2,-0.8 0.1,-0.3 0.2,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.5 0.2,-0.8 0.1,-0.3 0.1,-0.6 0.2,-0.9 0.1,-0.3 0.1,-0.6 0.2,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.6 0.1,-0.9 0,-0.3 0.1,-0.5 0.1,-0.8 0,-0.3 0.1,-0.7 0.1,-1v-0.8,-1.1 -417.9h288.8c15.4,0 28,12.6 28,28v504L209.7,668.2c-26.9,0 -52,7.3 -73.7,20v-424c0,-34.2 13.3,-66.3 37.5,-90.5zM860.2,887.6L214,887.6c-43,0 -78,-35 -78,-78v-3.1c3.9,-37.2 35.5,-66.2 73.7,-66.2h678.5v119.3c0,15.4 -12.6,28 -28,28z" /> diff --git a/app/src/main/res/drawable/ic_overtime.xml b/app/src/main/res/drawable/ic_overtime.xml new file mode 100644 index 0000000..6916eca --- /dev/null +++ b/app/src/main/res/drawable/ic_overtime.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_privacy.xml b/app/src/main/res/drawable/ic_privacy.xml index 22ef981..92d2699 100644 --- a/app/src/main/res/drawable/ic_privacy.xml +++ b/app/src/main/res/drawable/ic_privacy.xml @@ -5,5 +5,8 @@ android:viewportHeight="1024"> + android:pathData="M615.51,402.9a34.13,34.13 0,0 1,51.16 45.08l-2.18,2.45 -149.61,154.15a34.13,34.13 0,0 1,-44.07 4.18l-2.65,-2.05 -106.41,-91.39a34.13,34.13 0,0 1,41.9 -53.8l2.6,2.01 82.01,70.46 127.25,-131.09z" /> + diff --git a/app/src/main/res/drawable/ic_push_setting.xml b/app/src/main/res/drawable/ic_push_setting.xml index 69e0c3f..c03f19f 100644 --- a/app/src/main/res/drawable/ic_push_setting.xml +++ b/app/src/main/res/drawable/ic_push_setting.xml @@ -5,30 +5,5 @@ android:viewportHeight="1024"> - + android:pathData="M932.6,832L432.8,832c-9.4,0 -18.4,-4.4 -24,-12 -5.6,-7.6 -7.4,-17.4 -4.8,-26.4l24.4,-84.4c0.4,-1.2 0.8,-2.4 1.4,-3.6 1.6,-3.6 2.4,-7.4 2.4,-11.4L432.2,480.8c0,-137.8 112.2,-250 250,-250 138.4,0 251,112.2 251,250v213.4c0,4 0.8,7.8 2.4,11.4 0.6,1.2 1,2.4 1.4,3.6l24.4,84.4c2.6,9 0.8,18.8 -4.8,26.4 -5.8,7.6 -14.6,12 -24,12zM472.6,772h420l-12.8,-44.4c-4.4,-10.6 -6.6,-21.8 -6.6,-33.4L873.2,480.8c0,-104.8 -85.6,-190 -191,-190 -104.8,0 -190.2,85.2 -190.2,190v213.4c0,11.6 -2.2,22.8 -6.6,33.4l-12.8,44.4zM833.4,507.6c0,-104 -58.2,-176.8 -141.4,-176.8 -16.6,0 -30,13.4 -30,30s13.4,30 30,30c64.2,0 81.4,73.4 81.4,116.8 0,16.6 13.4,30 30,30s30,-13.4 30,-30zM785.8,895c0,-16.6 -13.4,-30 -30,-30h-146.2c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h146.2c16.6,0 30,-13.4 30,-30zM364.6,923.6c0,-16.6 -13.4,-30 -30,-30L180.4,893.6c-32.4,0 -58.8,-26.4 -58.8,-58.8L121.6,189.2c0,-32.4 26.4,-58.8 58.8,-58.8h514.8c32.4,0 58.8,26.4 58.8,58.8 0,16.6 13.4,30 30,30s30,-13.4 30,-30c0,-65.6 -53.4,-118.8 -118.8,-118.8L180.4,70.4c-65.6,0 -118.8,53.4 -118.8,118.8v645.4c0,65.6 53.4,118.8 118.8,118.8h154.2c16.6,0.2 30,-13.2 30,-29.8zM354.4,327.2c0,-16.6 -13.4,-30 -30,-30h-104.2c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h104.2c16.6,0 30,-13.4 30,-30zM317.6,492.6c0,-16.6 -13.4,-30 -30,-30h-67.4c-16.6,0 -30,13.4 -30,30s13.4,30 30,30h67.4c16.6,0 30,-13.4 30,-30zM334,658c0,-16.6 -13.4,-30 -30,-30h-83.8c-16.6,0 -30,13.4 -30,30s13.4,30 30,30L304,688c16.4,0 30,-13.4 30,-30z" /> diff --git a/app/src/main/res/drawable/ic_total_sample.xml b/app/src/main/res/drawable/ic_total_sample.xml new file mode 100644 index 0000000..6bad12a --- /dev/null +++ b/app/src/main/res/drawable/ic_total_sample.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_total_verify.xml b/app/src/main/res/drawable/ic_total_verify.xml new file mode 100644 index 0000000..4ff7f08 --- /dev/null +++ b/app/src/main/res/drawable/ic_total_verify.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_update.xml b/app/src/main/res/drawable/ic_update.xml index b361057..bcc9397 100644 --- a/app/src/main/res/drawable/ic_update.xml +++ b/app/src/main/res/drawable/ic_update.xml @@ -5,5 +5,11 @@ android:viewportHeight="1024"> + android:pathData="M774.56,775.16H558.41a27,27 0,1 1,0 -54.1h216.15a27,27 0,1 1,0 54.1zM327.65,841.85H192.54a27,27 0,1 1,0 -54.09h135.11a27,27 0,1 1,0 54.09zM287.13,950.79h-54a27,27 0,0 1,0 -54.1h54a27,27 0,1 1,0 54.1zM774.56,423.89h-162.1a27,27 0,1 1,0 -54.09h162.1a27,27 0,1 1,0 54.09zM774.56,599.52H558.41a27,27 0,1 1,0 -54.09h216.15a27,27 0,1 1,0 54.09zM937.38,328.67H832.57a81.24,81.24 0,0 1,-81.15 -81.15V112.28a27.05,27.05 0,1 1,54.1 0v135.24a27.06,27.06 0,0 0,27.05 27h104.81a27.05,27.05 0,0 1,0 54.1z" /> + + diff --git a/app/src/main/res/drawable/ic_verified.xml b/app/src/main/res/drawable/ic_verified.xml new file mode 100644 index 0000000..aeb63f6 --- /dev/null +++ b/app/src/main/res/drawable/ic_verified.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/layout/fragment_future_task.xml b/app/src/main/res/layout/fragment_future_task.xml new file mode 100644 index 0000000..dd959d2 --- /dev/null +++ b/app/src/main/res/layout/fragment_future_task.xml @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml index c8d6d99..b319fa0 100644 --- a/app/src/main/res/layout/fragment_mine.xml +++ b/app/src/main/res/layout/fragment_mine.xml @@ -61,6 +61,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_7" android:fontFamily="sans-serif-black" + android:singleLine="true" android:text="北京达佳科技有限公司" android:textColor="@color/mainTextColor" android:textSize="@dimen/sp_18" /> diff --git a/app/src/main/res/layout/fragment_sample.xml b/app/src/main/res/layout/fragment_sample.xml index 41d2ef1..2df9f57 100644 --- a/app/src/main/res/layout/fragment_sample.xml +++ b/app/src/main/res/layout/fragment_sample.xml @@ -1,6 +1,39 @@ + android:layout_height="match_parent" + android:background="@color/mainBackground" + android:orientation="vertical"> + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_total_task.xml b/app/src/main/res/layout/fragment_total_task.xml new file mode 100644 index 0000000..cab9456 --- /dev/null +++ b/app/src/main/res/layout/fragment_total_task.xml @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_under_task.xml b/app/src/main/res/layout/fragment_under_task.xml new file mode 100644 index 0000000..d66f351 --- /dev/null +++ b/app/src/main/res/layout/fragment_under_task.xml @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/include_sample_top_layout.xml b/app/src/main/res/layout/include_sample_top_layout.xml new file mode 100644 index 0000000..ac4f5c5 --- /dev/null +++ b/app/src/main/res/layout/include_sample_top_layout.xml @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 4d44df6..a5a662b 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -43,4 +43,20 @@ @color/mainTextColor @dimen/sp_16 + + + + + \ No newline at end of file