Procházet zdrojové kódy

@fun: Task to Space3DActivity

bai před 3 roky
rodič
revize
705412b646

+ 13 - 0
app/src/main/java/com/ys/bdtp/adm/mvvm/ui/examine/Space3DActivity.kt

@@ -1,6 +1,8 @@
 package com.ys.bdtp.adm.mvvm.ui.examine
 
 import android.annotation.SuppressLint
+import android.content.Context
+import android.content.Intent
 import android.os.Bundle
 import android.view.View
 import android.webkit.JavascriptInterface
@@ -84,6 +86,16 @@ class Space3DActivity : ComponentActivity(), DIAware, View.OnClickListener {
 
         /*lateinit var viewModel: Space3DVM*/
         val gson = Gson()
+
+
+        /**
+         * 启动 Space3DActivity
+         */
+        fun startSpace3DActivity(context: Context, projectId: String) {
+            val intent = Intent(context, Space3DActivity::class.java)
+            intent.putExtra("projectId", projectId)
+            context.startActivity(intent)
+        }
     }
 
     @SuppressLint("SetJavaScriptEnabled")
@@ -94,6 +106,7 @@ class Space3DActivity : ComponentActivity(), DIAware, View.OnClickListener {
          buildingId = floor.getString("buildingId", "")
          floorId = floor.getString("floorId", "")
          projectId = floor.getString("projectId", "")*/
+        projectId = intent.getStringExtra("projectId") ?: ""
         initView()
         webview.clearCache(true)
         WebView.setWebContentsDebuggingEnabled(true)

+ 1 - 2
app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/task/Task.kt

@@ -69,9 +69,8 @@ fun Task(projectId: String) {
                     .padding(horizontal = 32.dp, vertical = 30.dp)
             ) {
                 // 工作分类
-                TaskSide(nav)
+                TaskSide(nav, projectId)
                 // 项目切换
-
             }
 
             Spacer(modifier = Modifier.width(1.dp).fillMaxHeight().background(Color(0xFFE5E5E5)))

+ 8 - 3
app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/task/TaskSide.kt

@@ -6,15 +6,18 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavHostController
 import com.ys.bdtp.adm.R
+import com.ys.bdtp.adm.mvvm.ui.examine.Space3DActivity.Companion.startSpace3DActivity
 import com.ys.bdtp.adm.mvvm.ui.screen.home.LocalNavHostController
 import com.ys.bdtp.adm.mvvm.ui.screen.home.Route
 
 @Composable
-fun TaskSide(nav: NavHostController) {
+fun TaskSide(nav: NavHostController, projectId: String) {
+    val context = LocalContext.current
     Column(
         horizontalAlignment = Alignment.CenterHorizontally
     ) {
@@ -22,7 +25,9 @@ fun TaskSide(nav: NavHostController) {
             nav.navigate(Route.Cad)
         }
         Spacer(modifier = Modifier.height(20.dp))
-        TaskType(R.drawable.project_task_space, "空间模型核查") {}
+        TaskType(R.drawable.project_task_space, "空间模型核查") {
+            startSpace3DActivity(context, projectId)
+        }
         Spacer(modifier = Modifier.height(20.dp))
         TaskType(R.drawable.project_task_electric, "机电核查") {}
         Spacer(modifier = Modifier.height(20.dp))
@@ -38,5 +43,5 @@ fun TaskSide(nav: NavHostController) {
 @Composable
 fun PreviewTaskSide() {
     val nav = LocalNavHostController.current!!
-    TaskSide(nav)
+    TaskSide(nav, "")
 }