新增加载功能权限接口

app/src/main/java/com/project/survey/logic/viewmodel/ProjectViewModel.kt

@@ -63,6 +63,25 @@ class ProjectViewModel : BaseViewModel() {
         }
     }
 
+    val loadFuncPermResponse: LiveData<ApprovalBean>
+        get() = _loadFuncPermResponse
+    private val _loadFuncPermResponse = MutableLiveData<ApprovalBean>()
+    val loadFuncPermErrorResponse = MutableLiveData<String?>()
+
+    /**
+     * 加载功能权限
+     */
+    fun loadFuncPerm(bean: ApprovalBean){
+        launch {
+            val res = api.loadFuncPerm()
+            if (res.success) {
+                _loadFuncPermResponse.postValue(bean)
+            } else {
+                loadFuncPermErrorResponse.postValue(res.message)
+            }
+        }
+    }
+
     val measureBeanListResponse: LiveData<ListResult<MeasureBean>>
         get() = _measureBeanListResponse
     private val _measureBeanListResponse = MutableLiveData<ListResult<MeasureBean>>()

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<ApprovalBean>
+    val data: ListResult<ApprovalBean>?
 )
 
 @Keep

app/src/main/java/com/project/survey/network/Api.kt

@@ -93,6 +93,16 @@ interface Api {
         @Field("limit") limit: Int = 30,
     ): HttpResult<ApprovalResponse>
 
+    /**
+     * 加载功能权限
+     */
+    @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<Any>
+
     /**
      * 专用控制网版本列表
      */

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<ActivityApprovalBinding>(), 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<ActivityApprovalBinding>(), 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)
             }
         }
     }

app/src/main/java/com/project/survey/ui/home/MeFragment.kt

@@ -44,7 +44,7 @@ class MeFragment : BaseBindingFragment<FragmentMeBinding>() {
             }
         }
         mBinding.tvName.text = SPUtils.getString(SPConstants.ACCOUNT)
-        mBinding.tvVersion.text = "v${BuildConfig.VERSION_NAME}"
+//        mBinding.tvVersion.text = "v${BuildConfig.VERSION_NAME}"
 
         updateViewByData()
     }

app/src/main/res/layout/fragment_me.xml

@@ -130,13 +130,13 @@
             android:textSize="@dimen/sw_15sp"
             app:drawableStartCompat="@drawable/icon_mine_about" />
 
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tvVersion"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="10dp"
-            android:textSize="@dimen/sw_11sp"
-            tools:text="1.0.0" />
+<!--        <androidx.appcompat.widget.AppCompatTextView-->
+<!--            android:id="@+id/tvVersion"-->
+<!--            android:layout_width="wrap_content"-->
+<!--            android:layout_height="wrap_content"-->
+<!--            android:layout_marginEnd="10dp"-->
+<!--            android:textSize="@dimen/sw_11sp"-->
+<!--            tools:text="1.0.0" />-->
 
         <ImageView
             android:layout_width="wrap_content"