From 3f80e6f133b2a50c8ccf7f54ece8c24741194bbc Mon Sep 17 00:00:00 2001 From: chenglifeng Date: Mon, 11 Nov 2024 18:51:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8A=A0=E8=BD=BD=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E6=9D=83=E9=99=90=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logic/viewmodel/ProjectViewModel.kt | 19 +++++++ .../project/survey/model/ApprovalResponse.kt | 2 +- .../java/com/project/survey/network/Api.kt | 10 ++++ .../survey/ui/approval/ApprovalActivity.kt | 55 +++++++++++-------- .../com/project/survey/ui/home/MeFragment.kt | 2 +- app/src/main/res/layout/fragment_me.xml | 14 ++--- 6 files changed, 71 insertions(+), 31 deletions(-) diff --git a/app/src/main/java/com/project/survey/logic/viewmodel/ProjectViewModel.kt b/app/src/main/java/com/project/survey/logic/viewmodel/ProjectViewModel.kt index 8fb7606..e38937f 100644 --- a/app/src/main/java/com/project/survey/logic/viewmodel/ProjectViewModel.kt +++ b/app/src/main/java/com/project/survey/logic/viewmodel/ProjectViewModel.kt @@ -63,6 +63,25 @@ class ProjectViewModel : BaseViewModel() { } } + val loadFuncPermResponse: LiveData + get() = _loadFuncPermResponse + private val _loadFuncPermResponse = MutableLiveData() + val loadFuncPermErrorResponse = MutableLiveData() + + /** + * 加载功能权限 + */ + fun loadFuncPerm(bean: ApprovalBean){ + launch { + val res = api.loadFuncPerm() + if (res.success) { + _loadFuncPermResponse.postValue(bean) + } else { + loadFuncPermErrorResponse.postValue(res.message) + } + } + } + val measureBeanListResponse: LiveData> get() = _measureBeanListResponse private val _measureBeanListResponse = MutableLiveData>() diff --git a/app/src/main/java/com/project/survey/model/ApprovalResponse.kt b/app/src/main/java/com/project/survey/model/ApprovalResponse.kt index ee8a4a8..b0b5ea1 100644 --- a/app/src/main/java/com/project/survey/model/ApprovalResponse.kt +++ b/app/src/main/java/com/project/survey/model/ApprovalResponse.kt @@ -6,7 +6,7 @@ import com.project.survey.logic.bean.ListResult @Keep data class ApprovalResponse( val badges: Badge, - val data: ListResult + val data: ListResult? ) @Keep diff --git a/app/src/main/java/com/project/survey/network/Api.kt b/app/src/main/java/com/project/survey/network/Api.kt index 4774798..5ab4ae2 100644 --- a/app/src/main/java/com/project/survey/network/Api.kt +++ b/app/src/main/java/com/project/survey/network/Api.kt @@ -93,6 +93,16 @@ interface Api { @Field("limit") limit: Int = 30, ): HttpResult + /** + * 加载功能权限 + */ + @Headers("usePD:false") + @GET("je/rbac/permission/loadFuncPerm") + suspend fun loadFuncPerm( + @Header("projectId") projectId: String = SPUtils.getString(SPConstants.PROJECT_ID), + @Query("funcCode") funcCode: String = "BD_CGSP" + ): HttpResult + /** * 专用控制网版本列表 */ diff --git a/app/src/main/java/com/project/survey/ui/approval/ApprovalActivity.kt b/app/src/main/java/com/project/survey/ui/approval/ApprovalActivity.kt index a7170dd..ef22e78 100644 --- a/app/src/main/java/com/project/survey/ui/approval/ApprovalActivity.kt +++ b/app/src/main/java/com/project/survey/ui/approval/ApprovalActivity.kt @@ -10,6 +10,7 @@ import com.project.survey.databinding.ActivityApprovalBinding import com.project.survey.extend.isVisibleOrGone import com.project.survey.extend.setOnClickNoRepeatListener import com.project.survey.extend.smartDismiss +import com.project.survey.extend.toast import com.project.survey.logic.viewmodel.ProjectViewModel import com.project.survey.ui.approval.adapter.ApprovalAdapter import com.project.survey.ui.base.BaseBindingActivity @@ -92,31 +93,44 @@ class ApprovalActivity : BaseBindingActivity(), OnRefre } viewModel.workTaskListResponse.observe(this) { mBinding.smartRefreshLayout.smartDismiss() - if (currentPage == 1) { - adapter.submitList(it.data.rows, type) - if (it.data.rows.isEmpty()) { - mBinding.smartRefreshLayout.finishLoadMoreWithNoMoreData() - adapter.setStateViewLayout(this, R.layout.layout_no_data) - } else { - if (adapter.itemCount < it.data.totalCount) { - currentPage++ - } else { + it.data?.let { data -> + if (currentPage == 1) { + adapter.submitList(data.rows, type) + if (data.rows.isEmpty()) { mBinding.smartRefreshLayout.finishLoadMoreWithNoMoreData() + adapter.setStateViewLayout(this, R.layout.layout_no_data) + } else { + if (adapter.itemCount < data.totalCount) { + currentPage++ + } else { + mBinding.smartRefreshLayout.finishLoadMoreWithNoMoreData() + } } - } - } else { - if (it.data.rows.isEmpty()) { - mBinding.smartRefreshLayout.finishLoadMoreWithNoMoreData() } else { - if (adapter.itemCount < it.data.totalCount) { - adapter.addAll(it.data.rows) - currentPage++ - } else { + if (data.rows.isEmpty()) { mBinding.smartRefreshLayout.finishLoadMoreWithNoMoreData() + } else { + if (adapter.itemCount < data.totalCount) { + adapter.addAll(data.rows) + currentPage++ + } else { + mBinding.smartRefreshLayout.finishLoadMoreWithNoMoreData() + } } } } } + // 加载功能权限 + viewModel.loadFuncPermErrorResponse.observe(this) { + toast(it) + } + viewModel.loadFuncPermResponse.observe(this) { + // http://10.190.183.37/app/micro/func/#/pages/func/form/{功能编码}/{流程ID}?authorization={登录token}&appId=2024-0926-1104-0165 + val token = SPUtils.getString(SPConstants.TOKEN) + val url = + BuildConfig.BASE_URL + "app/micro/func/#/pages/func/form/${it.funcCode}/${it.pkValue}?authorization=${token}&appId=2024-0926-1104-0165" + AgentWebActivity.navigation2(this, Uri.parse(url)) + } // if (type == PI_PREAPPROV) { // viewModel.fetchWorkTask(SPUtils.getString(SPConstants.PROJECT_ID) ?: "", type) @@ -166,11 +180,8 @@ class ApprovalActivity : BaseBindingActivity(), OnRefre } adapter.setOnItemClickListener { _, _, position -> adapter.getItem(position)?.let { bean -> - // http://10.190.183.37/app/micro/func/#/pages/func/form/{功能编码}/{流程ID}?authorization={登录token}&appId=2024-0926-1104-0165 - val token = SPUtils.getString(SPConstants.TOKEN) - val url = - BuildConfig.BASE_URL + "app/micro/func/#/pages/func/form/${bean.funcCode}/${bean.pkValue}?authorization=${token}&appId=2024-0926-1104-0165" - AgentWebActivity.navigation2(this, Uri.parse(url)) + // 加载功能权限 + viewModel.loadFuncPerm(bean) } } } diff --git a/app/src/main/java/com/project/survey/ui/home/MeFragment.kt b/app/src/main/java/com/project/survey/ui/home/MeFragment.kt index 8ce7c43..f3f146c 100644 --- a/app/src/main/java/com/project/survey/ui/home/MeFragment.kt +++ b/app/src/main/java/com/project/survey/ui/home/MeFragment.kt @@ -44,7 +44,7 @@ class MeFragment : BaseBindingFragment() { } } mBinding.tvName.text = SPUtils.getString(SPConstants.ACCOUNT) - mBinding.tvVersion.text = "v${BuildConfig.VERSION_NAME}" +// mBinding.tvVersion.text = "v${BuildConfig.VERSION_NAME}" updateViewByData() } diff --git a/app/src/main/res/layout/fragment_me.xml b/app/src/main/res/layout/fragment_me.xml index 1759438..bed3afc 100644 --- a/app/src/main/res/layout/fragment_me.xml +++ b/app/src/main/res/layout/fragment_me.xml @@ -130,13 +130,13 @@ android:textSize="@dimen/sw_15sp" app:drawableStartCompat="@drawable/icon_mine_about" /> - + + + + + + +