diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index df6e1a2..20f8bb3 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -46,6 +46,12 @@ + + + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index df6e1a2..20f8bb3 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -46,6 +46,12 @@ + + + + + + diff --git a/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt b/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt index 894d5db..c5d8f19 100644 --- a/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt +++ b/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt @@ -7,17 +7,13 @@ import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.br.R /** * 图片在左,文字在右,九宫格Adapter * */ class ConnectGridAdapter( - private val context: Context, - private val icons: IntArray, - private val titles: Array + context: Context, private val icons: IntArray, private val titles: Array ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index df6e1a2..20f8bb3 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -46,6 +46,12 @@ + + + + + + diff --git a/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt b/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt index 894d5db..c5d8f19 100644 --- a/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt +++ b/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt @@ -7,17 +7,13 @@ import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.br.R /** * 图片在左,文字在右,九宫格Adapter * */ class ConnectGridAdapter( - private val context: Context, - private val icons: IntArray, - private val titles: Array + context: Context, private val icons: IntArray, private val titles: Array ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt index eb7b995..f568db4 100644 --- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.br.fragment +import android.graphics.Color import androidx.lifecycle.ViewModelProvider import com.bumptech.glide.Glide import com.casic.br.R @@ -13,17 +14,20 @@ import com.casic.br.view.LoginActivity import com.casic.br.view.MainActivity import com.casic.br.view.WebsiteActivity +import com.casic.br.view.home.* import com.casic.br.vm.BannerViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog +import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import com.youth.banner.Banner import com.youth.banner.adapter.BannerImageAdapter import com.youth.banner.holder.BannerImageHolder import com.youth.banner.indicator.CircleIndicator import com.youth.banner.transformer.AlphaPageTransformer +import kotlinx.android.synthetic.main.activity_edit_user.* import kotlinx.android.synthetic.main.fragment_home.* import java.util.* @@ -47,7 +51,38 @@ homeRecyclerView.adapter = homeAdapter homeAdapter.setOnGridItemClickListener(object : HomeGridAdapter.OnGridItemClickListener { override fun onItemClick(position: Int) { - + when (position) { + 0 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + 1 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + 2 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + 3 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + 4 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + 5 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + } } }) @@ -57,13 +92,30 @@ ) connectRecyclerView.addItemDecoration(GridItemDecoration(requireContext())) connectRecyclerView.adapter = connectGridAdapter - homeAdapter.setOnGridItemClickListener(object : HomeGridAdapter.OnGridItemClickListener { + connectGridAdapter.setOnGridItemClickListener(object : + ConnectGridAdapter.OnGridItemClickListener { override fun onItemClick(position: Int) { - + when (position) { + 0 -> callPhone(arrayListOf("010-96777")) + 1 -> callPhone(arrayListOf("010-96777")) + } } }) } + private fun callPhone(phoneNumber: ArrayList) { + BottomActionSheet.Builder() + .setContext(requireContext()) + .setActionItemTitle(phoneNumber) + .setItemTextColor(Color.BLUE) + .setOnActionSheetListener(object : BottomActionSheet.OnActionSheetListener { + override fun onActionItemClick(position: Int) { + + } + }) + .build().show() + } + private fun initBanner() { bannerViewModel.obtainBanner("") bannerViewModel.listModel.observe(this, { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index df6e1a2..20f8bb3 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -46,6 +46,12 @@ + + + + + + diff --git a/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt b/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt index 894d5db..c5d8f19 100644 --- a/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt +++ b/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt @@ -7,17 +7,13 @@ import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.br.R /** * 图片在左,文字在右,九宫格Adapter * */ class ConnectGridAdapter( - private val context: Context, - private val icons: IntArray, - private val titles: Array + context: Context, private val icons: IntArray, private val titles: Array ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt index eb7b995..f568db4 100644 --- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.br.fragment +import android.graphics.Color import androidx.lifecycle.ViewModelProvider import com.bumptech.glide.Glide import com.casic.br.R @@ -13,17 +14,20 @@ import com.casic.br.view.LoginActivity import com.casic.br.view.MainActivity import com.casic.br.view.WebsiteActivity +import com.casic.br.view.home.* import com.casic.br.vm.BannerViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog +import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import com.youth.banner.Banner import com.youth.banner.adapter.BannerImageAdapter import com.youth.banner.holder.BannerImageHolder import com.youth.banner.indicator.CircleIndicator import com.youth.banner.transformer.AlphaPageTransformer +import kotlinx.android.synthetic.main.activity_edit_user.* import kotlinx.android.synthetic.main.fragment_home.* import java.util.* @@ -47,7 +51,38 @@ homeRecyclerView.adapter = homeAdapter homeAdapter.setOnGridItemClickListener(object : HomeGridAdapter.OnGridItemClickListener { override fun onItemClick(position: Int) { - + when (position) { + 0 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + 1 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + 2 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + 3 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + 4 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + 5 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + } } }) @@ -57,13 +92,30 @@ ) connectRecyclerView.addItemDecoration(GridItemDecoration(requireContext())) connectRecyclerView.adapter = connectGridAdapter - homeAdapter.setOnGridItemClickListener(object : HomeGridAdapter.OnGridItemClickListener { + connectGridAdapter.setOnGridItemClickListener(object : + ConnectGridAdapter.OnGridItemClickListener { override fun onItemClick(position: Int) { - + when (position) { + 0 -> callPhone(arrayListOf("010-96777")) + 1 -> callPhone(arrayListOf("010-96777")) + } } }) } + private fun callPhone(phoneNumber: ArrayList) { + BottomActionSheet.Builder() + .setContext(requireContext()) + .setActionItemTitle(phoneNumber) + .setItemTextColor(Color.BLUE) + .setOnActionSheetListener(object : BottomActionSheet.OnActionSheetListener { + override fun onActionItemClick(position: Int) { + + } + }) + .build().show() + } + private fun initBanner() { bannerViewModel.obtainBanner("") bannerViewModel.listModel.observe(this, { diff --git a/app/src/main/java/com/casic/br/view/home/AccountManageActivity.kt b/app/src/main/java/com/casic/br/view/home/AccountManageActivity.kt new file mode 100644 index 0000000..e1d9838 --- /dev/null +++ b/app/src/main/java/com/casic/br/view/home/AccountManageActivity.kt @@ -0,0 +1,33 @@ +package com.casic.br.view.home + +import com.casic.br.R +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.include_base_title.* + +class AccountManageActivity : KotlinBaseActivity() { + + override fun initLayoutView(): Int = R.layout.activity_account_manage + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + + leftBackView.setOnClickListener { finish() } + titleView.text = "户号管理" + } + + override fun initData() { + + } + + override fun initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index df6e1a2..20f8bb3 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -46,6 +46,12 @@ + + + + + + diff --git a/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt b/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt index 894d5db..c5d8f19 100644 --- a/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt +++ b/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt @@ -7,17 +7,13 @@ import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.br.R /** * 图片在左,文字在右,九宫格Adapter * */ class ConnectGridAdapter( - private val context: Context, - private val icons: IntArray, - private val titles: Array + context: Context, private val icons: IntArray, private val titles: Array ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt index eb7b995..f568db4 100644 --- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.br.fragment +import android.graphics.Color import androidx.lifecycle.ViewModelProvider import com.bumptech.glide.Glide import com.casic.br.R @@ -13,17 +14,20 @@ import com.casic.br.view.LoginActivity import com.casic.br.view.MainActivity import com.casic.br.view.WebsiteActivity +import com.casic.br.view.home.* import com.casic.br.vm.BannerViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog +import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import com.youth.banner.Banner import com.youth.banner.adapter.BannerImageAdapter import com.youth.banner.holder.BannerImageHolder import com.youth.banner.indicator.CircleIndicator import com.youth.banner.transformer.AlphaPageTransformer +import kotlinx.android.synthetic.main.activity_edit_user.* import kotlinx.android.synthetic.main.fragment_home.* import java.util.* @@ -47,7 +51,38 @@ homeRecyclerView.adapter = homeAdapter homeAdapter.setOnGridItemClickListener(object : HomeGridAdapter.OnGridItemClickListener { override fun onItemClick(position: Int) { - + when (position) { + 0 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + 1 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + 2 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + 3 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + 4 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + 5 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + } } }) @@ -57,13 +92,30 @@ ) connectRecyclerView.addItemDecoration(GridItemDecoration(requireContext())) connectRecyclerView.adapter = connectGridAdapter - homeAdapter.setOnGridItemClickListener(object : HomeGridAdapter.OnGridItemClickListener { + connectGridAdapter.setOnGridItemClickListener(object : + ConnectGridAdapter.OnGridItemClickListener { override fun onItemClick(position: Int) { - + when (position) { + 0 -> callPhone(arrayListOf("010-96777")) + 1 -> callPhone(arrayListOf("010-96777")) + } } }) } + private fun callPhone(phoneNumber: ArrayList) { + BottomActionSheet.Builder() + .setContext(requireContext()) + .setActionItemTitle(phoneNumber) + .setItemTextColor(Color.BLUE) + .setOnActionSheetListener(object : BottomActionSheet.OnActionSheetListener { + override fun onActionItemClick(position: Int) { + + } + }) + .build().show() + } + private fun initBanner() { bannerViewModel.obtainBanner("") bannerViewModel.listModel.observe(this, { diff --git a/app/src/main/java/com/casic/br/view/home/AccountManageActivity.kt b/app/src/main/java/com/casic/br/view/home/AccountManageActivity.kt new file mode 100644 index 0000000..e1d9838 --- /dev/null +++ b/app/src/main/java/com/casic/br/view/home/AccountManageActivity.kt @@ -0,0 +1,33 @@ +package com.casic.br.view.home + +import com.casic.br.R +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.include_base_title.* + +class AccountManageActivity : KotlinBaseActivity() { + + override fun initLayoutView(): Int = R.layout.activity_account_manage + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + + leftBackView.setOnClickListener { finish() } + titleView.text = "户号管理" + } + + override fun initData() { + + } + + override fun initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/view/home/GasAnalysisActivity.kt b/app/src/main/java/com/casic/br/view/home/GasAnalysisActivity.kt new file mode 100644 index 0000000..4da3a68 --- /dev/null +++ b/app/src/main/java/com/casic/br/view/home/GasAnalysisActivity.kt @@ -0,0 +1,25 @@ +package com.casic.br.view.home + +import com.casic.br.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class GasAnalysisActivity : KotlinBaseActivity() { + + override fun initLayoutView(): Int = R.layout.activity_gas_analysis + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } + + override fun initData() { + + } + + override fun initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index df6e1a2..20f8bb3 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -46,6 +46,12 @@ + + + + + + diff --git a/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt b/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt index 894d5db..c5d8f19 100644 --- a/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt +++ b/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt @@ -7,17 +7,13 @@ import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.br.R /** * 图片在左,文字在右,九宫格Adapter * */ class ConnectGridAdapter( - private val context: Context, - private val icons: IntArray, - private val titles: Array + context: Context, private val icons: IntArray, private val titles: Array ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt index eb7b995..f568db4 100644 --- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.br.fragment +import android.graphics.Color import androidx.lifecycle.ViewModelProvider import com.bumptech.glide.Glide import com.casic.br.R @@ -13,17 +14,20 @@ import com.casic.br.view.LoginActivity import com.casic.br.view.MainActivity import com.casic.br.view.WebsiteActivity +import com.casic.br.view.home.* import com.casic.br.vm.BannerViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog +import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import com.youth.banner.Banner import com.youth.banner.adapter.BannerImageAdapter import com.youth.banner.holder.BannerImageHolder import com.youth.banner.indicator.CircleIndicator import com.youth.banner.transformer.AlphaPageTransformer +import kotlinx.android.synthetic.main.activity_edit_user.* import kotlinx.android.synthetic.main.fragment_home.* import java.util.* @@ -47,7 +51,38 @@ homeRecyclerView.adapter = homeAdapter homeAdapter.setOnGridItemClickListener(object : HomeGridAdapter.OnGridItemClickListener { override fun onItemClick(position: Int) { - + when (position) { + 0 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + 1 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + 2 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + 3 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + 4 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + 5 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + } } }) @@ -57,13 +92,30 @@ ) connectRecyclerView.addItemDecoration(GridItemDecoration(requireContext())) connectRecyclerView.adapter = connectGridAdapter - homeAdapter.setOnGridItemClickListener(object : HomeGridAdapter.OnGridItemClickListener { + connectGridAdapter.setOnGridItemClickListener(object : + ConnectGridAdapter.OnGridItemClickListener { override fun onItemClick(position: Int) { - + when (position) { + 0 -> callPhone(arrayListOf("010-96777")) + 1 -> callPhone(arrayListOf("010-96777")) + } } }) } + private fun callPhone(phoneNumber: ArrayList) { + BottomActionSheet.Builder() + .setContext(requireContext()) + .setActionItemTitle(phoneNumber) + .setItemTextColor(Color.BLUE) + .setOnActionSheetListener(object : BottomActionSheet.OnActionSheetListener { + override fun onActionItemClick(position: Int) { + + } + }) + .build().show() + } + private fun initBanner() { bannerViewModel.obtainBanner("") bannerViewModel.listModel.observe(this, { diff --git a/app/src/main/java/com/casic/br/view/home/AccountManageActivity.kt b/app/src/main/java/com/casic/br/view/home/AccountManageActivity.kt new file mode 100644 index 0000000..e1d9838 --- /dev/null +++ b/app/src/main/java/com/casic/br/view/home/AccountManageActivity.kt @@ -0,0 +1,33 @@ +package com.casic.br.view.home + +import com.casic.br.R +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.include_base_title.* + +class AccountManageActivity : KotlinBaseActivity() { + + override fun initLayoutView(): Int = R.layout.activity_account_manage + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + + leftBackView.setOnClickListener { finish() } + titleView.text = "户号管理" + } + + override fun initData() { + + } + + override fun initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/view/home/GasAnalysisActivity.kt b/app/src/main/java/com/casic/br/view/home/GasAnalysisActivity.kt new file mode 100644 index 0000000..4da3a68 --- /dev/null +++ b/app/src/main/java/com/casic/br/view/home/GasAnalysisActivity.kt @@ -0,0 +1,25 @@ +package com.casic.br.view.home + +import com.casic.br.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class GasAnalysisActivity : KotlinBaseActivity() { + + override fun initLayoutView(): Int = R.layout.activity_gas_analysis + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } + + override fun initData() { + + } + + override fun initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/view/home/HistoricalBillActivity.kt b/app/src/main/java/com/casic/br/view/home/HistoricalBillActivity.kt new file mode 100644 index 0000000..b0208ae --- /dev/null +++ b/app/src/main/java/com/casic/br/view/home/HistoricalBillActivity.kt @@ -0,0 +1,33 @@ +package com.casic.br.view.home + +import com.casic.br.R +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.include_base_title.* + +class HistoricalBillActivity : KotlinBaseActivity() { + + override fun initLayoutView(): Int = R.layout.activity_historical_bill + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + + leftBackView.setOnClickListener { finish() } + titleView.text = "历史账单" + } + + override fun initData() { + + } + + override fun initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index df6e1a2..20f8bb3 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -46,6 +46,12 @@ + + + + + + diff --git a/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt b/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt index 894d5db..c5d8f19 100644 --- a/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt +++ b/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt @@ -7,17 +7,13 @@ import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.br.R /** * 图片在左,文字在右,九宫格Adapter * */ class ConnectGridAdapter( - private val context: Context, - private val icons: IntArray, - private val titles: Array + context: Context, private val icons: IntArray, private val titles: Array ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt index eb7b995..f568db4 100644 --- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.br.fragment +import android.graphics.Color import androidx.lifecycle.ViewModelProvider import com.bumptech.glide.Glide import com.casic.br.R @@ -13,17 +14,20 @@ import com.casic.br.view.LoginActivity import com.casic.br.view.MainActivity import com.casic.br.view.WebsiteActivity +import com.casic.br.view.home.* import com.casic.br.vm.BannerViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog +import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import com.youth.banner.Banner import com.youth.banner.adapter.BannerImageAdapter import com.youth.banner.holder.BannerImageHolder import com.youth.banner.indicator.CircleIndicator import com.youth.banner.transformer.AlphaPageTransformer +import kotlinx.android.synthetic.main.activity_edit_user.* import kotlinx.android.synthetic.main.fragment_home.* import java.util.* @@ -47,7 +51,38 @@ homeRecyclerView.adapter = homeAdapter homeAdapter.setOnGridItemClickListener(object : HomeGridAdapter.OnGridItemClickListener { override fun onItemClick(position: Int) { - + when (position) { + 0 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + 1 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + 2 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + 3 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + 4 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + 5 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + } } }) @@ -57,13 +92,30 @@ ) connectRecyclerView.addItemDecoration(GridItemDecoration(requireContext())) connectRecyclerView.adapter = connectGridAdapter - homeAdapter.setOnGridItemClickListener(object : HomeGridAdapter.OnGridItemClickListener { + connectGridAdapter.setOnGridItemClickListener(object : + ConnectGridAdapter.OnGridItemClickListener { override fun onItemClick(position: Int) { - + when (position) { + 0 -> callPhone(arrayListOf("010-96777")) + 1 -> callPhone(arrayListOf("010-96777")) + } } }) } + private fun callPhone(phoneNumber: ArrayList) { + BottomActionSheet.Builder() + .setContext(requireContext()) + .setActionItemTitle(phoneNumber) + .setItemTextColor(Color.BLUE) + .setOnActionSheetListener(object : BottomActionSheet.OnActionSheetListener { + override fun onActionItemClick(position: Int) { + + } + }) + .build().show() + } + private fun initBanner() { bannerViewModel.obtainBanner("") bannerViewModel.listModel.observe(this, { diff --git a/app/src/main/java/com/casic/br/view/home/AccountManageActivity.kt b/app/src/main/java/com/casic/br/view/home/AccountManageActivity.kt new file mode 100644 index 0000000..e1d9838 --- /dev/null +++ b/app/src/main/java/com/casic/br/view/home/AccountManageActivity.kt @@ -0,0 +1,33 @@ +package com.casic.br.view.home + +import com.casic.br.R +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.include_base_title.* + +class AccountManageActivity : KotlinBaseActivity() { + + override fun initLayoutView(): Int = R.layout.activity_account_manage + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + + leftBackView.setOnClickListener { finish() } + titleView.text = "户号管理" + } + + override fun initData() { + + } + + override fun initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/view/home/GasAnalysisActivity.kt b/app/src/main/java/com/casic/br/view/home/GasAnalysisActivity.kt new file mode 100644 index 0000000..4da3a68 --- /dev/null +++ b/app/src/main/java/com/casic/br/view/home/GasAnalysisActivity.kt @@ -0,0 +1,25 @@ +package com.casic.br.view.home + +import com.casic.br.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class GasAnalysisActivity : KotlinBaseActivity() { + + override fun initLayoutView(): Int = R.layout.activity_gas_analysis + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } + + override fun initData() { + + } + + override fun initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/view/home/HistoricalBillActivity.kt b/app/src/main/java/com/casic/br/view/home/HistoricalBillActivity.kt new file mode 100644 index 0000000..b0208ae --- /dev/null +++ b/app/src/main/java/com/casic/br/view/home/HistoricalBillActivity.kt @@ -0,0 +1,33 @@ +package com.casic.br.view.home + +import com.casic.br.R +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.include_base_title.* + +class HistoricalBillActivity : KotlinBaseActivity() { + + override fun initLayoutView(): Int = R.layout.activity_historical_bill + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + + leftBackView.setOnClickListener { finish() } + titleView.text = "历史账单" + } + + override fun initData() { + + } + + override fun initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/view/home/PaymentActivity.kt b/app/src/main/java/com/casic/br/view/home/PaymentActivity.kt new file mode 100644 index 0000000..6bb416d --- /dev/null +++ b/app/src/main/java/com/casic/br/view/home/PaymentActivity.kt @@ -0,0 +1,33 @@ +package com.casic.br.view.home + +import com.casic.br.R +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.include_base_title.* + +class PaymentActivity : KotlinBaseActivity() { + + override fun initLayoutView(): Int = R.layout.activity_payment + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + + leftBackView.setOnClickListener { finish() } + titleView.text = "燃气缴费" + } + + override fun initData() { + + } + + override fun initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index df6e1a2..20f8bb3 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -46,6 +46,12 @@ + + + + + + diff --git a/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt b/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt index 894d5db..c5d8f19 100644 --- a/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt +++ b/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt @@ -7,17 +7,13 @@ import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.br.R /** * 图片在左,文字在右,九宫格Adapter * */ class ConnectGridAdapter( - private val context: Context, - private val icons: IntArray, - private val titles: Array + context: Context, private val icons: IntArray, private val titles: Array ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt index eb7b995..f568db4 100644 --- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.br.fragment +import android.graphics.Color import androidx.lifecycle.ViewModelProvider import com.bumptech.glide.Glide import com.casic.br.R @@ -13,17 +14,20 @@ import com.casic.br.view.LoginActivity import com.casic.br.view.MainActivity import com.casic.br.view.WebsiteActivity +import com.casic.br.view.home.* import com.casic.br.vm.BannerViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog +import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import com.youth.banner.Banner import com.youth.banner.adapter.BannerImageAdapter import com.youth.banner.holder.BannerImageHolder import com.youth.banner.indicator.CircleIndicator import com.youth.banner.transformer.AlphaPageTransformer +import kotlinx.android.synthetic.main.activity_edit_user.* import kotlinx.android.synthetic.main.fragment_home.* import java.util.* @@ -47,7 +51,38 @@ homeRecyclerView.adapter = homeAdapter homeAdapter.setOnGridItemClickListener(object : HomeGridAdapter.OnGridItemClickListener { override fun onItemClick(position: Int) { - + when (position) { + 0 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + 1 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + 2 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + 3 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + 4 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + 5 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + } } }) @@ -57,13 +92,30 @@ ) connectRecyclerView.addItemDecoration(GridItemDecoration(requireContext())) connectRecyclerView.adapter = connectGridAdapter - homeAdapter.setOnGridItemClickListener(object : HomeGridAdapter.OnGridItemClickListener { + connectGridAdapter.setOnGridItemClickListener(object : + ConnectGridAdapter.OnGridItemClickListener { override fun onItemClick(position: Int) { - + when (position) { + 0 -> callPhone(arrayListOf("010-96777")) + 1 -> callPhone(arrayListOf("010-96777")) + } } }) } + private fun callPhone(phoneNumber: ArrayList) { + BottomActionSheet.Builder() + .setContext(requireContext()) + .setActionItemTitle(phoneNumber) + .setItemTextColor(Color.BLUE) + .setOnActionSheetListener(object : BottomActionSheet.OnActionSheetListener { + override fun onActionItemClick(position: Int) { + + } + }) + .build().show() + } + private fun initBanner() { bannerViewModel.obtainBanner("") bannerViewModel.listModel.observe(this, { diff --git a/app/src/main/java/com/casic/br/view/home/AccountManageActivity.kt b/app/src/main/java/com/casic/br/view/home/AccountManageActivity.kt new file mode 100644 index 0000000..e1d9838 --- /dev/null +++ b/app/src/main/java/com/casic/br/view/home/AccountManageActivity.kt @@ -0,0 +1,33 @@ +package com.casic.br.view.home + +import com.casic.br.R +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.include_base_title.* + +class AccountManageActivity : KotlinBaseActivity() { + + override fun initLayoutView(): Int = R.layout.activity_account_manage + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + + leftBackView.setOnClickListener { finish() } + titleView.text = "户号管理" + } + + override fun initData() { + + } + + override fun initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/view/home/GasAnalysisActivity.kt b/app/src/main/java/com/casic/br/view/home/GasAnalysisActivity.kt new file mode 100644 index 0000000..4da3a68 --- /dev/null +++ b/app/src/main/java/com/casic/br/view/home/GasAnalysisActivity.kt @@ -0,0 +1,25 @@ +package com.casic.br.view.home + +import com.casic.br.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class GasAnalysisActivity : KotlinBaseActivity() { + + override fun initLayoutView(): Int = R.layout.activity_gas_analysis + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } + + override fun initData() { + + } + + override fun initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/view/home/HistoricalBillActivity.kt b/app/src/main/java/com/casic/br/view/home/HistoricalBillActivity.kt new file mode 100644 index 0000000..b0208ae --- /dev/null +++ b/app/src/main/java/com/casic/br/view/home/HistoricalBillActivity.kt @@ -0,0 +1,33 @@ +package com.casic.br.view.home + +import com.casic.br.R +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.include_base_title.* + +class HistoricalBillActivity : KotlinBaseActivity() { + + override fun initLayoutView(): Int = R.layout.activity_historical_bill + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + + leftBackView.setOnClickListener { finish() } + titleView.text = "历史账单" + } + + override fun initData() { + + } + + override fun initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/view/home/PaymentActivity.kt b/app/src/main/java/com/casic/br/view/home/PaymentActivity.kt new file mode 100644 index 0000000..6bb416d --- /dev/null +++ b/app/src/main/java/com/casic/br/view/home/PaymentActivity.kt @@ -0,0 +1,33 @@ +package com.casic.br.view.home + +import com.casic.br.R +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.include_base_title.* + +class PaymentActivity : KotlinBaseActivity() { + + override fun initLayoutView(): Int = R.layout.activity_payment + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + + leftBackView.setOnClickListener { finish() } + titleView.text = "燃气缴费" + } + + override fun initData() { + + } + + override fun initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/view/home/ServiceNetworkActivity.kt b/app/src/main/java/com/casic/br/view/home/ServiceNetworkActivity.kt new file mode 100644 index 0000000..dc7f50c --- /dev/null +++ b/app/src/main/java/com/casic/br/view/home/ServiceNetworkActivity.kt @@ -0,0 +1,33 @@ +package com.casic.br.view.home + +import com.casic.br.R +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.include_base_title.* + +class ServiceNetworkActivity : KotlinBaseActivity() { + + override fun initLayoutView(): Int = R.layout.activity_service_network + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + + leftBackView.setOnClickListener { finish() } + titleView.text = "服务网点" + } + + override fun initData() { + + } + + override fun initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index df6e1a2..20f8bb3 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -46,6 +46,12 @@ + + + + + + diff --git a/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt b/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt index 894d5db..c5d8f19 100644 --- a/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt +++ b/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt @@ -7,17 +7,13 @@ import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.br.R /** * 图片在左,文字在右,九宫格Adapter * */ class ConnectGridAdapter( - private val context: Context, - private val icons: IntArray, - private val titles: Array + context: Context, private val icons: IntArray, private val titles: Array ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt index eb7b995..f568db4 100644 --- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.br.fragment +import android.graphics.Color import androidx.lifecycle.ViewModelProvider import com.bumptech.glide.Glide import com.casic.br.R @@ -13,17 +14,20 @@ import com.casic.br.view.LoginActivity import com.casic.br.view.MainActivity import com.casic.br.view.WebsiteActivity +import com.casic.br.view.home.* import com.casic.br.vm.BannerViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog +import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import com.youth.banner.Banner import com.youth.banner.adapter.BannerImageAdapter import com.youth.banner.holder.BannerImageHolder import com.youth.banner.indicator.CircleIndicator import com.youth.banner.transformer.AlphaPageTransformer +import kotlinx.android.synthetic.main.activity_edit_user.* import kotlinx.android.synthetic.main.fragment_home.* import java.util.* @@ -47,7 +51,38 @@ homeRecyclerView.adapter = homeAdapter homeAdapter.setOnGridItemClickListener(object : HomeGridAdapter.OnGridItemClickListener { override fun onItemClick(position: Int) { - + when (position) { + 0 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + 1 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + 2 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + 3 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + 4 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + 5 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + } } }) @@ -57,13 +92,30 @@ ) connectRecyclerView.addItemDecoration(GridItemDecoration(requireContext())) connectRecyclerView.adapter = connectGridAdapter - homeAdapter.setOnGridItemClickListener(object : HomeGridAdapter.OnGridItemClickListener { + connectGridAdapter.setOnGridItemClickListener(object : + ConnectGridAdapter.OnGridItemClickListener { override fun onItemClick(position: Int) { - + when (position) { + 0 -> callPhone(arrayListOf("010-96777")) + 1 -> callPhone(arrayListOf("010-96777")) + } } }) } + private fun callPhone(phoneNumber: ArrayList) { + BottomActionSheet.Builder() + .setContext(requireContext()) + .setActionItemTitle(phoneNumber) + .setItemTextColor(Color.BLUE) + .setOnActionSheetListener(object : BottomActionSheet.OnActionSheetListener { + override fun onActionItemClick(position: Int) { + + } + }) + .build().show() + } + private fun initBanner() { bannerViewModel.obtainBanner("") bannerViewModel.listModel.observe(this, { diff --git a/app/src/main/java/com/casic/br/view/home/AccountManageActivity.kt b/app/src/main/java/com/casic/br/view/home/AccountManageActivity.kt new file mode 100644 index 0000000..e1d9838 --- /dev/null +++ b/app/src/main/java/com/casic/br/view/home/AccountManageActivity.kt @@ -0,0 +1,33 @@ +package com.casic.br.view.home + +import com.casic.br.R +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.include_base_title.* + +class AccountManageActivity : KotlinBaseActivity() { + + override fun initLayoutView(): Int = R.layout.activity_account_manage + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + + leftBackView.setOnClickListener { finish() } + titleView.text = "户号管理" + } + + override fun initData() { + + } + + override fun initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/view/home/GasAnalysisActivity.kt b/app/src/main/java/com/casic/br/view/home/GasAnalysisActivity.kt new file mode 100644 index 0000000..4da3a68 --- /dev/null +++ b/app/src/main/java/com/casic/br/view/home/GasAnalysisActivity.kt @@ -0,0 +1,25 @@ +package com.casic.br.view.home + +import com.casic.br.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class GasAnalysisActivity : KotlinBaseActivity() { + + override fun initLayoutView(): Int = R.layout.activity_gas_analysis + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } + + override fun initData() { + + } + + override fun initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/view/home/HistoricalBillActivity.kt b/app/src/main/java/com/casic/br/view/home/HistoricalBillActivity.kt new file mode 100644 index 0000000..b0208ae --- /dev/null +++ b/app/src/main/java/com/casic/br/view/home/HistoricalBillActivity.kt @@ -0,0 +1,33 @@ +package com.casic.br.view.home + +import com.casic.br.R +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.include_base_title.* + +class HistoricalBillActivity : KotlinBaseActivity() { + + override fun initLayoutView(): Int = R.layout.activity_historical_bill + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + + leftBackView.setOnClickListener { finish() } + titleView.text = "历史账单" + } + + override fun initData() { + + } + + override fun initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/view/home/PaymentActivity.kt b/app/src/main/java/com/casic/br/view/home/PaymentActivity.kt new file mode 100644 index 0000000..6bb416d --- /dev/null +++ b/app/src/main/java/com/casic/br/view/home/PaymentActivity.kt @@ -0,0 +1,33 @@ +package com.casic.br.view.home + +import com.casic.br.R +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.include_base_title.* + +class PaymentActivity : KotlinBaseActivity() { + + override fun initLayoutView(): Int = R.layout.activity_payment + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + + leftBackView.setOnClickListener { finish() } + titleView.text = "燃气缴费" + } + + override fun initData() { + + } + + override fun initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/view/home/ServiceNetworkActivity.kt b/app/src/main/java/com/casic/br/view/home/ServiceNetworkActivity.kt new file mode 100644 index 0000000..dc7f50c --- /dev/null +++ b/app/src/main/java/com/casic/br/view/home/ServiceNetworkActivity.kt @@ -0,0 +1,33 @@ +package com.casic.br.view.home + +import com.casic.br.R +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.include_base_title.* + +class ServiceNetworkActivity : KotlinBaseActivity() { + + override fun initLayoutView(): Int = R.layout.activity_service_network + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + + leftBackView.setOnClickListener { finish() } + titleView.text = "服务网点" + } + + override fun initData() { + + } + + override fun initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/view/home/SubsidyActivity.kt b/app/src/main/java/com/casic/br/view/home/SubsidyActivity.kt new file mode 100644 index 0000000..d85a95a --- /dev/null +++ b/app/src/main/java/com/casic/br/view/home/SubsidyActivity.kt @@ -0,0 +1,25 @@ +package com.casic.br.view.home + +import com.casic.br.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class SubsidyActivity : KotlinBaseActivity() { + + override fun initLayoutView(): Int = R.layout.activity_subsidy + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } + + override fun initData() { + + } + + override fun initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index df6e1a2..20f8bb3 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -46,6 +46,12 @@ + + + + + + diff --git a/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt b/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt index 894d5db..c5d8f19 100644 --- a/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt +++ b/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt @@ -7,17 +7,13 @@ import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.br.R /** * 图片在左,文字在右,九宫格Adapter * */ class ConnectGridAdapter( - private val context: Context, - private val icons: IntArray, - private val titles: Array + context: Context, private val icons: IntArray, private val titles: Array ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt index eb7b995..f568db4 100644 --- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.br.fragment +import android.graphics.Color import androidx.lifecycle.ViewModelProvider import com.bumptech.glide.Glide import com.casic.br.R @@ -13,17 +14,20 @@ import com.casic.br.view.LoginActivity import com.casic.br.view.MainActivity import com.casic.br.view.WebsiteActivity +import com.casic.br.view.home.* import com.casic.br.vm.BannerViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog +import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import com.youth.banner.Banner import com.youth.banner.adapter.BannerImageAdapter import com.youth.banner.holder.BannerImageHolder import com.youth.banner.indicator.CircleIndicator import com.youth.banner.transformer.AlphaPageTransformer +import kotlinx.android.synthetic.main.activity_edit_user.* import kotlinx.android.synthetic.main.fragment_home.* import java.util.* @@ -47,7 +51,38 @@ homeRecyclerView.adapter = homeAdapter homeAdapter.setOnGridItemClickListener(object : HomeGridAdapter.OnGridItemClickListener { override fun onItemClick(position: Int) { - + when (position) { + 0 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + 1 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + 2 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + 3 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + 4 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + 5 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + } } }) @@ -57,13 +92,30 @@ ) connectRecyclerView.addItemDecoration(GridItemDecoration(requireContext())) connectRecyclerView.adapter = connectGridAdapter - homeAdapter.setOnGridItemClickListener(object : HomeGridAdapter.OnGridItemClickListener { + connectGridAdapter.setOnGridItemClickListener(object : + ConnectGridAdapter.OnGridItemClickListener { override fun onItemClick(position: Int) { - + when (position) { + 0 -> callPhone(arrayListOf("010-96777")) + 1 -> callPhone(arrayListOf("010-96777")) + } } }) } + private fun callPhone(phoneNumber: ArrayList) { + BottomActionSheet.Builder() + .setContext(requireContext()) + .setActionItemTitle(phoneNumber) + .setItemTextColor(Color.BLUE) + .setOnActionSheetListener(object : BottomActionSheet.OnActionSheetListener { + override fun onActionItemClick(position: Int) { + + } + }) + .build().show() + } + private fun initBanner() { bannerViewModel.obtainBanner("") bannerViewModel.listModel.observe(this, { diff --git a/app/src/main/java/com/casic/br/view/home/AccountManageActivity.kt b/app/src/main/java/com/casic/br/view/home/AccountManageActivity.kt new file mode 100644 index 0000000..e1d9838 --- /dev/null +++ b/app/src/main/java/com/casic/br/view/home/AccountManageActivity.kt @@ -0,0 +1,33 @@ +package com.casic.br.view.home + +import com.casic.br.R +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.include_base_title.* + +class AccountManageActivity : KotlinBaseActivity() { + + override fun initLayoutView(): Int = R.layout.activity_account_manage + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + + leftBackView.setOnClickListener { finish() } + titleView.text = "户号管理" + } + + override fun initData() { + + } + + override fun initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/view/home/GasAnalysisActivity.kt b/app/src/main/java/com/casic/br/view/home/GasAnalysisActivity.kt new file mode 100644 index 0000000..4da3a68 --- /dev/null +++ b/app/src/main/java/com/casic/br/view/home/GasAnalysisActivity.kt @@ -0,0 +1,25 @@ +package com.casic.br.view.home + +import com.casic.br.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class GasAnalysisActivity : KotlinBaseActivity() { + + override fun initLayoutView(): Int = R.layout.activity_gas_analysis + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } + + override fun initData() { + + } + + override fun initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/view/home/HistoricalBillActivity.kt b/app/src/main/java/com/casic/br/view/home/HistoricalBillActivity.kt new file mode 100644 index 0000000..b0208ae --- /dev/null +++ b/app/src/main/java/com/casic/br/view/home/HistoricalBillActivity.kt @@ -0,0 +1,33 @@ +package com.casic.br.view.home + +import com.casic.br.R +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.include_base_title.* + +class HistoricalBillActivity : KotlinBaseActivity() { + + override fun initLayoutView(): Int = R.layout.activity_historical_bill + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + + leftBackView.setOnClickListener { finish() } + titleView.text = "历史账单" + } + + override fun initData() { + + } + + override fun initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/view/home/PaymentActivity.kt b/app/src/main/java/com/casic/br/view/home/PaymentActivity.kt new file mode 100644 index 0000000..6bb416d --- /dev/null +++ b/app/src/main/java/com/casic/br/view/home/PaymentActivity.kt @@ -0,0 +1,33 @@ +package com.casic.br.view.home + +import com.casic.br.R +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.include_base_title.* + +class PaymentActivity : KotlinBaseActivity() { + + override fun initLayoutView(): Int = R.layout.activity_payment + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + + leftBackView.setOnClickListener { finish() } + titleView.text = "燃气缴费" + } + + override fun initData() { + + } + + override fun initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/view/home/ServiceNetworkActivity.kt b/app/src/main/java/com/casic/br/view/home/ServiceNetworkActivity.kt new file mode 100644 index 0000000..dc7f50c --- /dev/null +++ b/app/src/main/java/com/casic/br/view/home/ServiceNetworkActivity.kt @@ -0,0 +1,33 @@ +package com.casic.br.view.home + +import com.casic.br.R +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.include_base_title.* + +class ServiceNetworkActivity : KotlinBaseActivity() { + + override fun initLayoutView(): Int = R.layout.activity_service_network + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + + leftBackView.setOnClickListener { finish() } + titleView.text = "服务网点" + } + + override fun initData() { + + } + + override fun initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/view/home/SubsidyActivity.kt b/app/src/main/java/com/casic/br/view/home/SubsidyActivity.kt new file mode 100644 index 0000000..d85a95a --- /dev/null +++ b/app/src/main/java/com/casic/br/view/home/SubsidyActivity.kt @@ -0,0 +1,25 @@ +package com.casic.br.view.home + +import com.casic.br.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class SubsidyActivity : KotlinBaseActivity() { + + override fun initLayoutView(): Int = R.layout.activity_subsidy + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } + + override fun initData() { + + } + + override fun initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_account_manage.xml b/app/src/main/res/layout/activity_account_manage.xml new file mode 100644 index 0000000..e73410c --- /dev/null +++ b/app/src/main/res/layout/activity_account_manage.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index df6e1a2..20f8bb3 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -46,6 +46,12 @@ + + + + + + diff --git a/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt b/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt index 894d5db..c5d8f19 100644 --- a/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt +++ b/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt @@ -7,17 +7,13 @@ import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.br.R /** * 图片在左,文字在右,九宫格Adapter * */ class ConnectGridAdapter( - private val context: Context, - private val icons: IntArray, - private val titles: Array + context: Context, private val icons: IntArray, private val titles: Array ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt index eb7b995..f568db4 100644 --- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.br.fragment +import android.graphics.Color import androidx.lifecycle.ViewModelProvider import com.bumptech.glide.Glide import com.casic.br.R @@ -13,17 +14,20 @@ import com.casic.br.view.LoginActivity import com.casic.br.view.MainActivity import com.casic.br.view.WebsiteActivity +import com.casic.br.view.home.* import com.casic.br.vm.BannerViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog +import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import com.youth.banner.Banner import com.youth.banner.adapter.BannerImageAdapter import com.youth.banner.holder.BannerImageHolder import com.youth.banner.indicator.CircleIndicator import com.youth.banner.transformer.AlphaPageTransformer +import kotlinx.android.synthetic.main.activity_edit_user.* import kotlinx.android.synthetic.main.fragment_home.* import java.util.* @@ -47,7 +51,38 @@ homeRecyclerView.adapter = homeAdapter homeAdapter.setOnGridItemClickListener(object : HomeGridAdapter.OnGridItemClickListener { override fun onItemClick(position: Int) { - + when (position) { + 0 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + 1 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + 2 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + 3 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + 4 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + 5 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + } } }) @@ -57,13 +92,30 @@ ) connectRecyclerView.addItemDecoration(GridItemDecoration(requireContext())) connectRecyclerView.adapter = connectGridAdapter - homeAdapter.setOnGridItemClickListener(object : HomeGridAdapter.OnGridItemClickListener { + connectGridAdapter.setOnGridItemClickListener(object : + ConnectGridAdapter.OnGridItemClickListener { override fun onItemClick(position: Int) { - + when (position) { + 0 -> callPhone(arrayListOf("010-96777")) + 1 -> callPhone(arrayListOf("010-96777")) + } } }) } + private fun callPhone(phoneNumber: ArrayList) { + BottomActionSheet.Builder() + .setContext(requireContext()) + .setActionItemTitle(phoneNumber) + .setItemTextColor(Color.BLUE) + .setOnActionSheetListener(object : BottomActionSheet.OnActionSheetListener { + override fun onActionItemClick(position: Int) { + + } + }) + .build().show() + } + private fun initBanner() { bannerViewModel.obtainBanner("") bannerViewModel.listModel.observe(this, { diff --git a/app/src/main/java/com/casic/br/view/home/AccountManageActivity.kt b/app/src/main/java/com/casic/br/view/home/AccountManageActivity.kt new file mode 100644 index 0000000..e1d9838 --- /dev/null +++ b/app/src/main/java/com/casic/br/view/home/AccountManageActivity.kt @@ -0,0 +1,33 @@ +package com.casic.br.view.home + +import com.casic.br.R +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.include_base_title.* + +class AccountManageActivity : KotlinBaseActivity() { + + override fun initLayoutView(): Int = R.layout.activity_account_manage + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + + leftBackView.setOnClickListener { finish() } + titleView.text = "户号管理" + } + + override fun initData() { + + } + + override fun initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/view/home/GasAnalysisActivity.kt b/app/src/main/java/com/casic/br/view/home/GasAnalysisActivity.kt new file mode 100644 index 0000000..4da3a68 --- /dev/null +++ b/app/src/main/java/com/casic/br/view/home/GasAnalysisActivity.kt @@ -0,0 +1,25 @@ +package com.casic.br.view.home + +import com.casic.br.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class GasAnalysisActivity : KotlinBaseActivity() { + + override fun initLayoutView(): Int = R.layout.activity_gas_analysis + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } + + override fun initData() { + + } + + override fun initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/view/home/HistoricalBillActivity.kt b/app/src/main/java/com/casic/br/view/home/HistoricalBillActivity.kt new file mode 100644 index 0000000..b0208ae --- /dev/null +++ b/app/src/main/java/com/casic/br/view/home/HistoricalBillActivity.kt @@ -0,0 +1,33 @@ +package com.casic.br.view.home + +import com.casic.br.R +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.include_base_title.* + +class HistoricalBillActivity : KotlinBaseActivity() { + + override fun initLayoutView(): Int = R.layout.activity_historical_bill + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + + leftBackView.setOnClickListener { finish() } + titleView.text = "历史账单" + } + + override fun initData() { + + } + + override fun initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/view/home/PaymentActivity.kt b/app/src/main/java/com/casic/br/view/home/PaymentActivity.kt new file mode 100644 index 0000000..6bb416d --- /dev/null +++ b/app/src/main/java/com/casic/br/view/home/PaymentActivity.kt @@ -0,0 +1,33 @@ +package com.casic.br.view.home + +import com.casic.br.R +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.include_base_title.* + +class PaymentActivity : KotlinBaseActivity() { + + override fun initLayoutView(): Int = R.layout.activity_payment + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + + leftBackView.setOnClickListener { finish() } + titleView.text = "燃气缴费" + } + + override fun initData() { + + } + + override fun initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/view/home/ServiceNetworkActivity.kt b/app/src/main/java/com/casic/br/view/home/ServiceNetworkActivity.kt new file mode 100644 index 0000000..dc7f50c --- /dev/null +++ b/app/src/main/java/com/casic/br/view/home/ServiceNetworkActivity.kt @@ -0,0 +1,33 @@ +package com.casic.br.view.home + +import com.casic.br.R +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.include_base_title.* + +class ServiceNetworkActivity : KotlinBaseActivity() { + + override fun initLayoutView(): Int = R.layout.activity_service_network + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + + leftBackView.setOnClickListener { finish() } + titleView.text = "服务网点" + } + + override fun initData() { + + } + + override fun initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/view/home/SubsidyActivity.kt b/app/src/main/java/com/casic/br/view/home/SubsidyActivity.kt new file mode 100644 index 0000000..d85a95a --- /dev/null +++ b/app/src/main/java/com/casic/br/view/home/SubsidyActivity.kt @@ -0,0 +1,25 @@ +package com.casic.br.view.home + +import com.casic.br.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class SubsidyActivity : KotlinBaseActivity() { + + override fun initLayoutView(): Int = R.layout.activity_subsidy + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } + + override fun initData() { + + } + + override fun initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_account_manage.xml b/app/src/main/res/layout/activity_account_manage.xml new file mode 100644 index 0000000..e73410c --- /dev/null +++ b/app/src/main/res/layout/activity_account_manage.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_gas_analysis.xml b/app/src/main/res/layout/activity_gas_analysis.xml new file mode 100644 index 0000000..5dd8df0 --- /dev/null +++ b/app/src/main/res/layout/activity_gas_analysis.xml @@ -0,0 +1,11 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index df6e1a2..20f8bb3 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -46,6 +46,12 @@ + + + + + + diff --git a/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt b/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt index 894d5db..c5d8f19 100644 --- a/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt +++ b/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt @@ -7,17 +7,13 @@ import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.br.R /** * 图片在左,文字在右,九宫格Adapter * */ class ConnectGridAdapter( - private val context: Context, - private val icons: IntArray, - private val titles: Array + context: Context, private val icons: IntArray, private val titles: Array ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt index eb7b995..f568db4 100644 --- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.br.fragment +import android.graphics.Color import androidx.lifecycle.ViewModelProvider import com.bumptech.glide.Glide import com.casic.br.R @@ -13,17 +14,20 @@ import com.casic.br.view.LoginActivity import com.casic.br.view.MainActivity import com.casic.br.view.WebsiteActivity +import com.casic.br.view.home.* import com.casic.br.vm.BannerViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog +import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import com.youth.banner.Banner import com.youth.banner.adapter.BannerImageAdapter import com.youth.banner.holder.BannerImageHolder import com.youth.banner.indicator.CircleIndicator import com.youth.banner.transformer.AlphaPageTransformer +import kotlinx.android.synthetic.main.activity_edit_user.* import kotlinx.android.synthetic.main.fragment_home.* import java.util.* @@ -47,7 +51,38 @@ homeRecyclerView.adapter = homeAdapter homeAdapter.setOnGridItemClickListener(object : HomeGridAdapter.OnGridItemClickListener { override fun onItemClick(position: Int) { - + when (position) { + 0 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + 1 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + 2 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + 3 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + 4 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + 5 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + } } }) @@ -57,13 +92,30 @@ ) connectRecyclerView.addItemDecoration(GridItemDecoration(requireContext())) connectRecyclerView.adapter = connectGridAdapter - homeAdapter.setOnGridItemClickListener(object : HomeGridAdapter.OnGridItemClickListener { + connectGridAdapter.setOnGridItemClickListener(object : + ConnectGridAdapter.OnGridItemClickListener { override fun onItemClick(position: Int) { - + when (position) { + 0 -> callPhone(arrayListOf("010-96777")) + 1 -> callPhone(arrayListOf("010-96777")) + } } }) } + private fun callPhone(phoneNumber: ArrayList) { + BottomActionSheet.Builder() + .setContext(requireContext()) + .setActionItemTitle(phoneNumber) + .setItemTextColor(Color.BLUE) + .setOnActionSheetListener(object : BottomActionSheet.OnActionSheetListener { + override fun onActionItemClick(position: Int) { + + } + }) + .build().show() + } + private fun initBanner() { bannerViewModel.obtainBanner("") bannerViewModel.listModel.observe(this, { diff --git a/app/src/main/java/com/casic/br/view/home/AccountManageActivity.kt b/app/src/main/java/com/casic/br/view/home/AccountManageActivity.kt new file mode 100644 index 0000000..e1d9838 --- /dev/null +++ b/app/src/main/java/com/casic/br/view/home/AccountManageActivity.kt @@ -0,0 +1,33 @@ +package com.casic.br.view.home + +import com.casic.br.R +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.include_base_title.* + +class AccountManageActivity : KotlinBaseActivity() { + + override fun initLayoutView(): Int = R.layout.activity_account_manage + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + + leftBackView.setOnClickListener { finish() } + titleView.text = "户号管理" + } + + override fun initData() { + + } + + override fun initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/view/home/GasAnalysisActivity.kt b/app/src/main/java/com/casic/br/view/home/GasAnalysisActivity.kt new file mode 100644 index 0000000..4da3a68 --- /dev/null +++ b/app/src/main/java/com/casic/br/view/home/GasAnalysisActivity.kt @@ -0,0 +1,25 @@ +package com.casic.br.view.home + +import com.casic.br.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class GasAnalysisActivity : KotlinBaseActivity() { + + override fun initLayoutView(): Int = R.layout.activity_gas_analysis + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } + + override fun initData() { + + } + + override fun initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/view/home/HistoricalBillActivity.kt b/app/src/main/java/com/casic/br/view/home/HistoricalBillActivity.kt new file mode 100644 index 0000000..b0208ae --- /dev/null +++ b/app/src/main/java/com/casic/br/view/home/HistoricalBillActivity.kt @@ -0,0 +1,33 @@ +package com.casic.br.view.home + +import com.casic.br.R +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.include_base_title.* + +class HistoricalBillActivity : KotlinBaseActivity() { + + override fun initLayoutView(): Int = R.layout.activity_historical_bill + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + + leftBackView.setOnClickListener { finish() } + titleView.text = "历史账单" + } + + override fun initData() { + + } + + override fun initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/view/home/PaymentActivity.kt b/app/src/main/java/com/casic/br/view/home/PaymentActivity.kt new file mode 100644 index 0000000..6bb416d --- /dev/null +++ b/app/src/main/java/com/casic/br/view/home/PaymentActivity.kt @@ -0,0 +1,33 @@ +package com.casic.br.view.home + +import com.casic.br.R +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.include_base_title.* + +class PaymentActivity : KotlinBaseActivity() { + + override fun initLayoutView(): Int = R.layout.activity_payment + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + + leftBackView.setOnClickListener { finish() } + titleView.text = "燃气缴费" + } + + override fun initData() { + + } + + override fun initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/view/home/ServiceNetworkActivity.kt b/app/src/main/java/com/casic/br/view/home/ServiceNetworkActivity.kt new file mode 100644 index 0000000..dc7f50c --- /dev/null +++ b/app/src/main/java/com/casic/br/view/home/ServiceNetworkActivity.kt @@ -0,0 +1,33 @@ +package com.casic.br.view.home + +import com.casic.br.R +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.include_base_title.* + +class ServiceNetworkActivity : KotlinBaseActivity() { + + override fun initLayoutView(): Int = R.layout.activity_service_network + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + + leftBackView.setOnClickListener { finish() } + titleView.text = "服务网点" + } + + override fun initData() { + + } + + override fun initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/view/home/SubsidyActivity.kt b/app/src/main/java/com/casic/br/view/home/SubsidyActivity.kt new file mode 100644 index 0000000..d85a95a --- /dev/null +++ b/app/src/main/java/com/casic/br/view/home/SubsidyActivity.kt @@ -0,0 +1,25 @@ +package com.casic.br.view.home + +import com.casic.br.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class SubsidyActivity : KotlinBaseActivity() { + + override fun initLayoutView(): Int = R.layout.activity_subsidy + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } + + override fun initData() { + + } + + override fun initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_account_manage.xml b/app/src/main/res/layout/activity_account_manage.xml new file mode 100644 index 0000000..e73410c --- /dev/null +++ b/app/src/main/res/layout/activity_account_manage.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_gas_analysis.xml b/app/src/main/res/layout/activity_gas_analysis.xml new file mode 100644 index 0000000..5dd8df0 --- /dev/null +++ b/app/src/main/res/layout/activity_gas_analysis.xml @@ -0,0 +1,11 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_historical_bill.xml b/app/src/main/res/layout/activity_historical_bill.xml new file mode 100644 index 0000000..d3261bf --- /dev/null +++ b/app/src/main/res/layout/activity_historical_bill.xml @@ -0,0 +1,125 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index df6e1a2..20f8bb3 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -46,6 +46,12 @@ + + + + + + diff --git a/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt b/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt index 894d5db..c5d8f19 100644 --- a/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt +++ b/app/src/main/java/com/casic/br/adapter/ConnectGridAdapter.kt @@ -7,17 +7,13 @@ import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions import com.casic.br.R /** * 图片在左,文字在右,九宫格Adapter * */ class ConnectGridAdapter( - private val context: Context, - private val icons: IntArray, - private val titles: Array + context: Context, private val icons: IntArray, private val titles: Array ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt index eb7b995..f568db4 100644 --- a/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/br/fragment/HomePageFragment.kt @@ -1,5 +1,6 @@ package com.casic.br.fragment +import android.graphics.Color import androidx.lifecycle.ViewModelProvider import com.bumptech.glide.Glide import com.casic.br.R @@ -13,17 +14,20 @@ import com.casic.br.view.LoginActivity import com.casic.br.view.MainActivity import com.casic.br.view.WebsiteActivity +import com.casic.br.view.home.* import com.casic.br.vm.BannerViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog +import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import com.youth.banner.Banner import com.youth.banner.adapter.BannerImageAdapter import com.youth.banner.holder.BannerImageHolder import com.youth.banner.indicator.CircleIndicator import com.youth.banner.transformer.AlphaPageTransformer +import kotlinx.android.synthetic.main.activity_edit_user.* import kotlinx.android.synthetic.main.fragment_home.* import java.util.* @@ -47,7 +51,38 @@ homeRecyclerView.adapter = homeAdapter homeAdapter.setOnGridItemClickListener(object : HomeGridAdapter.OnGridItemClickListener { override fun onItemClick(position: Int) { - + when (position) { + 0 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + 1 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + 2 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + 3 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + 4 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + 5 -> if (DeserializeModel.isLogin()) { + requireContext().navigatePageTo() + } else { + requireContext().navigatePageTo() + } + } } }) @@ -57,13 +92,30 @@ ) connectRecyclerView.addItemDecoration(GridItemDecoration(requireContext())) connectRecyclerView.adapter = connectGridAdapter - homeAdapter.setOnGridItemClickListener(object : HomeGridAdapter.OnGridItemClickListener { + connectGridAdapter.setOnGridItemClickListener(object : + ConnectGridAdapter.OnGridItemClickListener { override fun onItemClick(position: Int) { - + when (position) { + 0 -> callPhone(arrayListOf("010-96777")) + 1 -> callPhone(arrayListOf("010-96777")) + } } }) } + private fun callPhone(phoneNumber: ArrayList) { + BottomActionSheet.Builder() + .setContext(requireContext()) + .setActionItemTitle(phoneNumber) + .setItemTextColor(Color.BLUE) + .setOnActionSheetListener(object : BottomActionSheet.OnActionSheetListener { + override fun onActionItemClick(position: Int) { + + } + }) + .build().show() + } + private fun initBanner() { bannerViewModel.obtainBanner("") bannerViewModel.listModel.observe(this, { diff --git a/app/src/main/java/com/casic/br/view/home/AccountManageActivity.kt b/app/src/main/java/com/casic/br/view/home/AccountManageActivity.kt new file mode 100644 index 0000000..e1d9838 --- /dev/null +++ b/app/src/main/java/com/casic/br/view/home/AccountManageActivity.kt @@ -0,0 +1,33 @@ +package com.casic.br.view.home + +import com.casic.br.R +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.include_base_title.* + +class AccountManageActivity : KotlinBaseActivity() { + + override fun initLayoutView(): Int = R.layout.activity_account_manage + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + + leftBackView.setOnClickListener { finish() } + titleView.text = "户号管理" + } + + override fun initData() { + + } + + override fun initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/view/home/GasAnalysisActivity.kt b/app/src/main/java/com/casic/br/view/home/GasAnalysisActivity.kt new file mode 100644 index 0000000..4da3a68 --- /dev/null +++ b/app/src/main/java/com/casic/br/view/home/GasAnalysisActivity.kt @@ -0,0 +1,25 @@ +package com.casic.br.view.home + +import com.casic.br.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class GasAnalysisActivity : KotlinBaseActivity() { + + override fun initLayoutView(): Int = R.layout.activity_gas_analysis + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } + + override fun initData() { + + } + + override fun initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/view/home/HistoricalBillActivity.kt b/app/src/main/java/com/casic/br/view/home/HistoricalBillActivity.kt new file mode 100644 index 0000000..b0208ae --- /dev/null +++ b/app/src/main/java/com/casic/br/view/home/HistoricalBillActivity.kt @@ -0,0 +1,33 @@ +package com.casic.br.view.home + +import com.casic.br.R +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.include_base_title.* + +class HistoricalBillActivity : KotlinBaseActivity() { + + override fun initLayoutView(): Int = R.layout.activity_historical_bill + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + + leftBackView.setOnClickListener { finish() } + titleView.text = "历史账单" + } + + override fun initData() { + + } + + override fun initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/view/home/PaymentActivity.kt b/app/src/main/java/com/casic/br/view/home/PaymentActivity.kt new file mode 100644 index 0000000..6bb416d --- /dev/null +++ b/app/src/main/java/com/casic/br/view/home/PaymentActivity.kt @@ -0,0 +1,33 @@ +package com.casic.br.view.home + +import com.casic.br.R +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.include_base_title.* + +class PaymentActivity : KotlinBaseActivity() { + + override fun initLayoutView(): Int = R.layout.activity_payment + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + + leftBackView.setOnClickListener { finish() } + titleView.text = "燃气缴费" + } + + override fun initData() { + + } + + override fun initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/view/home/ServiceNetworkActivity.kt b/app/src/main/java/com/casic/br/view/home/ServiceNetworkActivity.kt new file mode 100644 index 0000000..dc7f50c --- /dev/null +++ b/app/src/main/java/com/casic/br/view/home/ServiceNetworkActivity.kt @@ -0,0 +1,33 @@ +package com.casic.br.view.home + +import com.casic.br.R +import com.gyf.immersionbar.ImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import kotlinx.android.synthetic.main.include_base_title.* + +class ServiceNetworkActivity : KotlinBaseActivity() { + + override fun initLayoutView(): Int = R.layout.activity_service_network + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) + + leftBackView.setOnClickListener { finish() } + titleView.text = "服务网点" + } + + override fun initData() { + + } + + override fun initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/view/home/SubsidyActivity.kt b/app/src/main/java/com/casic/br/view/home/SubsidyActivity.kt new file mode 100644 index 0000000..d85a95a --- /dev/null +++ b/app/src/main/java/com/casic/br/view/home/SubsidyActivity.kt @@ -0,0 +1,25 @@ +package com.casic.br.view.home + +import com.casic.br.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class SubsidyActivity : KotlinBaseActivity() { + + override fun initLayoutView(): Int = R.layout.activity_subsidy + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } + + override fun initData() { + + } + + override fun initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_account_manage.xml b/app/src/main/res/layout/activity_account_manage.xml new file mode 100644 index 0000000..e73410c --- /dev/null +++ b/app/src/main/res/layout/activity_account_manage.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_gas_analysis.xml b/app/src/main/res/layout/activity_gas_analysis.xml new file mode 100644 index 0000000..5dd8df0 --- /dev/null +++ b/app/src/main/res/layout/activity_gas_analysis.xml @@ -0,0 +1,11 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_historical_bill.xml b/app/src/main/res/layout/activity_historical_bill.xml new file mode 100644 index 0000000..d3261bf --- /dev/null +++ b/app/src/main/res/layout/activity_historical_bill.xml @@ -0,0 +1,125 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_payment.xml b/app/src/main/res/layout/activity_payment.xml new file mode 100644 index 0000000..95d8730 --- /dev/null +++ b/app/src/main/res/layout/activity_payment.xml @@ -0,0 +1,169 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +