Skip to content

HBHAndroid
HBHAndroid
Commit 9289a83a authored by 小费同学阿's avatar 小费同学阿 💬 Committed by 杨秀秀
Browse files
Options

67027 【企业app-android】诉求管理的处理中的界面问题见标注

parent b8a30fec
Hide whitespace changes
Inline Side-by-side
Showing with 122 additions and 107 deletions
hbhbcompany/src/main/java/com/xx/hbhbcompany/data/staticdata/StaticData.kt
View file @ 9289a83a
...@@ -9,6 +9,11 @@ object StaticData { ...@@ -9,6 +9,11 @@ object StaticData {
*/ */
@JvmField @JvmField
var sUserRole: Int = 0 var sUserRole: Int = 0
/**
* 诉求状态:0-待提交,1-待分配,2-已驳回,3-处理中,4-已完成
*/
@JvmField
var appealStatu: Int = 0
@JvmField @JvmField
var statusCode: String = "" var statusCode: String = ""
/** /**
......
hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/appeal/AppealDetailManageActivity.java
View file @ 9289a83a
...@@ -2,6 +2,7 @@ package com.xx.hbhbcompany.ui.appeal; ...@@ -2,6 +2,7 @@ package com.xx.hbhbcompany.ui.appeal;
import android.os.Bundle; import android.os.Bundle;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.view.View;
import androidx.fragment.app.FragmentTransaction; import androidx.fragment.app.FragmentTransaction;
import androidx.navigation.Navigation; import androidx.navigation.Navigation;
...@@ -11,6 +12,7 @@ import com.xx.hbhbcompany.BR; ...@@ -11,6 +12,7 @@ import com.xx.hbhbcompany.BR;
import com.xx.hbhbcompany.R; import com.xx.hbhbcompany.R;
import com.xx.hbhbcompany.data.http.requst.AppealRequest; import com.xx.hbhbcompany.data.http.requst.AppealRequest;
import com.xx.hbhbcompany.data.http.requst.OrderRequest; import com.xx.hbhbcompany.data.http.requst.OrderRequest;
import com.xx.hbhbcompany.data.staticdata.StaticData;
import com.xx.hbhbcompany.databinding.ActivityAppealDetailManagementBinding; import com.xx.hbhbcompany.databinding.ActivityAppealDetailManagementBinding;
import com.xx.hbhbcompany.ui.order.OrderViewModel; import com.xx.hbhbcompany.ui.order.OrderViewModel;
import com.xx.hbhbcompany.ui.order.PointOrderFragment; import com.xx.hbhbcompany.ui.order.PointOrderFragment;
...@@ -32,6 +34,9 @@ public class AppealDetailManageActivity extends BaseActivity<ActivityAppealDetai ...@@ -32,6 +34,9 @@ public class AppealDetailManageActivity extends BaseActivity<ActivityAppealDetai
// 重写初始方法调用参数 // 重写初始方法调用参数
@Override @Override
public void initData() { public void initData() {
if (StaticData.appealStatu==3){
binding.tabs.setVisibility(View.GONE);
}
super.initData(); super.initData();
viewModel.businessId = getIntent().getStringExtra("businessId"); viewModel.businessId = getIntent().getStringExtra("businessId");
/*切换状态Tab*/ /*切换状态Tab*/
......
hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/appeallist/AppealListActivity.kt
View file @ 9289a83a
...@@ -17,7 +17,8 @@ import com.xx.hbhbcompany.ui.appeal.AppealDetailManageActivity ...@@ -17,7 +17,8 @@ import com.xx.hbhbcompany.ui.appeal.AppealDetailManageActivity
import com.xx.xxviewlibrary.base.xxBaseRecyclerViewAdapter.OnItemClick import com.xx.xxviewlibrary.base.xxBaseRecyclerViewAdapter.OnItemClick
import me.goldze.mvvmhabit.base.BaseActivity import me.goldze.mvvmhabit.base.BaseActivity
class AppealListActivity: BaseActivity<ActivityAppealListBinding, AppealListViewModel>(),OnRefreshListener,OnLoadMoreListener { class AppealListActivity : BaseActivity<ActivityAppealListBinding, AppealListViewModel>(),
OnRefreshListener, OnLoadMoreListener {
override fun initContentView(savedInstanceState: Bundle?): Int { override fun initContentView(savedInstanceState: Bundle?): Int {
return R.layout.activity_appeal_list return R.layout.activity_appeal_list
} }
...@@ -30,117 +31,122 @@ class AppealListActivity: BaseActivity<ActivityAppealListBinding, AppealListView ...@@ -30,117 +31,122 @@ class AppealListActivity: BaseActivity<ActivityAppealListBinding, AppealListView
super.initData() super.initData()
binding.refresh.setOnRefreshListener(this) binding.refresh.setOnRefreshListener(this)
binding.refresh.setOnLoadMoreListener(this) binding.refresh.setOnLoadMoreListener(this)
if (StaticData.sUserRole==0 || StaticData.sUserRole==3) if (StaticData.sUserRole == 0 || StaticData.sUserRole == 3) {
{ // 设置初始选中的Tab
// 设置初始选中的Tab binding.tabs.getTabAt(0)?.select()
binding.tabs.getTabAt(0)?.select() binding.tabs.addOnTabSelectedListener(object : TabLayout.OnTabSelectedListener {
binding.tabs.addOnTabSelectedListener(object: TabLayout.OnTabSelectedListener /**
{ * 诉求状态:0-待提交,1-待分配,2-已驳回,3-处理中,4-已完成
/** */
* 诉求状态:0-待提交,1-待分配,2-已驳回,3-处理中,4-已完成 override fun onTabSelected(tab: TabLayout.Tab?) {
*/ viewModel.page = 1
override fun onTabSelected(tab: TabLayout.Tab?) { viewModel.adapter.mList.clear()
viewModel.page=1 when (tab?.position) {
viewModel.adapter.mList.clear() //待分配
when(tab?.position) 0 -> {
{ viewModel.appealStatus = arrayOf("1")
//待分配 StaticData.appealStatu = 1
0-> viewModel.appealStatus = arrayOf("1") }
//待提交 //待提交
1-> viewModel.appealStatus = arrayOf("0") 1 -> {
//处理中 viewModel.appealStatus = arrayOf("0")
2-> viewModel.appealStatus = arrayOf( "3") StaticData.appealStatu = 0
//已完成 }
3-> viewModel.appealStatus = arrayOf( "4") //处理中
} 2 -> {
viewModel.getAppealList() viewModel.appealStatus = arrayOf("3")
} StaticData.appealStatu = 3
}
override fun onTabUnselected(tab: TabLayout.Tab?) { //已完成
} 3 -> {
viewModel.appealStatus = arrayOf("4")
override fun onTabReselected(tab: TabLayout.Tab?) { StaticData.appealStatu = 4
} }
}
}) viewModel.getAppealList()
binding.tabs.visibility= View.VISIBLE }
binding.tabsOrder.visibility= View.GONE
viewModel.adapter= AppealListAdapter(this,viewModel) override fun onTabUnselected(tab: TabLayout.Tab?) {
binding.rvAppealList.adapter= viewModel.adapter }
viewModel.adapter.setOnItemClick(object : OnItemClick<AppealListBean>
{ override fun onTabReselected(tab: TabLayout.Tab?) {
override fun itemClickCalBack(position: Int, data: AppealListBean?) { }
val bundle = Bundle()
/*将要传的businessId传过去*/ })
/*将要传的businessId传过去*/ binding.tabs.visibility = View.VISIBLE
bundle.putString( binding.tabsOrder.visibility = View.GONE
"businessId", viewModel.adapter = AppealListAdapter(this, viewModel)
data?.businessId binding.rvAppealList.adapter = viewModel.adapter
) viewModel.adapter.setOnItemClick(object : OnItemClick<AppealListBean> {
startActivity( override fun itemClickCalBack(position: Int, data: AppealListBean?) {
AppealDetailManageActivity::class.java, val bundle = Bundle()
bundle /*将要传的businessId传过去*/
) /*将要传的businessId传过去*/
} bundle.putString(
"businessId",
}) data?.businessId
)
startActivity(
viewModel.getAppealList() AppealDetailManageActivity::class.java,
bundle
)
}else{ }
binding.tabs.visibility= View.GONE
binding.tabsOrder.visibility= View.VISIBLE })
viewModel.orderAdapter= OrderAppealListAdapter(this)
binding.rvAppealList.adapter= viewModel.orderAdapter viewModel.getAppealList()
viewModel.otherGetAppealList()
binding.tabsOrder.addOnTabSelectedListener(object: TabLayout.OnTabSelectedListener } else {
{ binding.tabs.visibility = View.GONE
/** binding.tabsOrder.visibility = View.VISIBLE
* 诉求状态:0-待提交,1-待分配,2-已驳回,3-处理中,4-已完成
*/ viewModel.orderAdapter = OrderAppealListAdapter(this)
override fun onTabSelected(tab: TabLayout.Tab?) { binding.rvAppealList.adapter = viewModel.orderAdapter
viewModel.page=1 viewModel.otherGetAppealList()
viewModel.orderAdapter.mList.clear()
when(tab?.position) binding.tabsOrder.addOnTabSelectedListener(object : TabLayout.OnTabSelectedListener {
{ /**
//待分配 * 诉求状态:0-待提交,1-待分配,2-已驳回,3-处理中,4-已完成
0-> viewModel.appealStatus = arrayOf("3") */
//待提交 override fun onTabSelected(tab: TabLayout.Tab?) {
1-> viewModel.appealStatus = arrayOf("4") viewModel.page = 1
} viewModel.orderAdapter.mList.clear()
viewModel.otherGetAppealList() when (tab?.position) {
} //待分配
0 -> viewModel.appealStatus = arrayOf("3")
override fun onTabUnselected(tab: TabLayout.Tab?) { //待提交
} 1 -> viewModel.appealStatus = arrayOf("4")
}
override fun onTabReselected(tab: TabLayout.Tab?) { viewModel.otherGetAppealList()
} }
}) override fun onTabUnselected(tab: TabLayout.Tab?) {
}
}
override fun onTabReselected(tab: TabLayout.Tab?) {
}
})
}
viewModel.loadMoreStatic.observe( viewModel.loadMoreStatic.observe(
this this
) { ) {
if (it == 1) { if (it == 1) {
binding.rvAppealList.visibility= View.VISIBLE binding.rvAppealList.visibility = View.VISIBLE
binding.llNoData.visibility= View.GONE binding.llNoData.visibility = View.GONE
binding.refresh.finishLoadMore(); binding.refresh.finishLoadMore();
} else if (it == 2) { } else if (it == 2) {
binding.rvAppealList.visibility= View.VISIBLE binding.rvAppealList.visibility = View.VISIBLE
binding.llNoData.visibility= View.GONE binding.llNoData.visibility = View.GONE
binding.refresh.finishLoadMore(); binding.refresh.finishLoadMore();
binding.refresh.setEnableLoadMore(false); binding.refresh.setEnableLoadMore(false);
}else if(it==3) } else if (it == 3) {
{ binding.rvAppealList.visibility = View.GONE
binding.rvAppealList.visibility= View.GONE binding.llNoData.visibility = View.VISIBLE
binding.llNoData.visibility= View.VISIBLE
binding.refresh.setEnableLoadMore(false); binding.refresh.setEnableLoadMore(false);
} }
binding.refresh.finishRefresh() binding.refresh.finishRefresh()
...@@ -151,7 +157,7 @@ class AppealListActivity: BaseActivity<ActivityAppealListBinding, AppealListView ...@@ -151,7 +157,7 @@ class AppealListActivity: BaseActivity<ActivityAppealListBinding, AppealListView
override fun initViewModel(): AppealListViewModel { override fun initViewModel(): AppealListViewModel {
val lm: AppealListRequest = AppealListRequest() val lm: AppealListRequest = AppealListRequest()
return AppealListViewModel(application,lm) return AppealListViewModel(application, lm)
} }
...@@ -161,10 +167,9 @@ class AppealListActivity: BaseActivity<ActivityAppealListBinding, AppealListView ...@@ -161,10 +167,9 @@ class AppealListActivity: BaseActivity<ActivityAppealListBinding, AppealListView
} }
override fun onRefresh(refreshLayout: RefreshLayout) { override fun onRefresh(refreshLayout: RefreshLayout) {
viewModel.page=1; viewModel.page = 1;
viewModel. getAppealList(); viewModel.getAppealList();
binding.refresh.setEnableLoadMore(true) binding.refresh.setEnableLoadMore(true)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment