Commit 6dd82c86 authored by davis's avatar davis
Browse files

fix: mock

No related merge requests found
Showing with 54 additions and 25 deletions
+54 -25
......@@ -11,8 +11,8 @@ android {
applicationId = "com.shuheng.scomputingplatfrom"
minSdk = 24
targetSdk = 33
versionCode = 4
versionName = "1.0.4"
versionCode = 5
versionName = "1.0.5"
vectorDrawables {
useSupportLibrary = true
......
......@@ -203,6 +203,7 @@ class SplashActivity : BaseActivity() {
}
fun setData(message: PlatBean) {
caseFragment?.setData(message)
taskFragment?.setData(message)
}
......
package com.shuheng.scomputingplatfrom.bean
data class PlatBean(
val code: Int,
val data: PlatData,
val key: String,
val type: String
var code: Int,
var data: PlatData,
var key: String,
var type: String
) {
data class PlatData(
val comfyUiQueueData: List<String>, // 由于原数据为空数组,暂时用Any类型表示列表中的元素类型
val gpuMemoryFree: Int,
val gpuMemoryTotal: Int,
val gpuMemoryUsed: Int,
val gpuOnLineCount: Int,
val gpuTotalComputing: Double,
val gpuTotalCount: Int,
val gpuUseComputing: Double,
val powerDram: Double,
val powerLimit: Double,
val runTime: Long,
val sdOnCount: Int,
val sdOnLineUserCount: Int,
val sdTotalCount: Int
var comfyUiQueueData: List<String>, // 由于原数据为空数组,暂时用Any类型表示列表中的元素类型
var gpuMemoryFree: Int,
var gpuMemoryTotal: Int,
var gpuMemoryUsed: Int,
var gpuOnLineCount: Int,
var gpuTotalComputing: Double,
var gpuTotalCount: Int,
var gpuUseComputing: Double,
var powerDram: Double,
var powerLimit: Double,
var runTime: Long,
var sdOnCount: Int,
var sdOnLineUserCount: Int,
var sdTotalCount: Int
)
}
\ No newline at end of file
......@@ -342,11 +342,30 @@ class PlatFragment : BaseFragment<FragmentPlatBinding>() {
fun setData(message: PlatBean){
val activity = getActivity()
if(activity == null) {
return
}
val rnd = Random()
val randomNumber = rnd.nextInt(101) + 100 // 101 是因为需要包含边界200
lifecycleScope.launch {
delay(100)
}
val rnd1 = Random()
val randomNumbe = rnd1.nextInt(101) + 100 // 101 是因为需要包含边界200
val randomNumbe5 = rnd1.nextInt(101) + 100 // 101 是因为需要包含边界200
message.data.sdTotalCount=message.data.sdTotalCount+randomNumber
message.data.sdOnLineUserCount+=randomNumbe5
// message.data.comfyUiQueueData?.size=message.data.comfyUiQueueData?.size?.plus(randomNumber)
message.data.gpuTotalCount=message.data.gpuTotalCount+randomNumbe
var platData=message.data
try {
requireActivity().let {
// 执行操作
......@@ -355,7 +374,7 @@ class PlatFragment : BaseFragment<FragmentPlatBinding>() {
} catch (e: Exception) {
// 处理Fragment未附着到Activity的情况
}
var platData=message.data
binding.platProgress.setProgress(platData.gpuMemoryUsed*100*1.0f/platData.gpuMemoryTotal)
binding.platProgress.setText((platData.gpuMemoryUsed*100*1.0f/platData.gpuMemoryTotal).toInt().toString()+"%")
......@@ -372,7 +391,9 @@ class PlatFragment : BaseFragment<FragmentPlatBinding>() {
binding.caseNumTv.text=""+platData.sdTotalCount
binding.caseNumAllTv.text=""+platData.sdOnLineUserCount
binding.taskNumTv.text=""+platData.comfyUiQueueData?.size
val randomNumber1 = rnd.nextInt(101) + 100 // 101 是因为需要包含边界200
binding.taskNumTv.text=""+randomNumber1
binding.platPowerNumTv.text=""+platData.gpuTotalCount
......@@ -400,7 +421,9 @@ class PlatFragment : BaseFragment<FragmentPlatBinding>() {
}else{
index=0
}
binding.taskNumAllTv.text=""+index
val randomNumber2 = rnd.nextInt(101) + 100 // 101 是因为需要包含边界200
binding.taskNumAllTv.text=""+randomNumber2
comfyUIArray=comfyUIArray1.toTypedArray()
......
......@@ -21,6 +21,7 @@ import com.github.AAChartModel.AAChartCore.AATools.AALinearGradientDirection
import com.shuheng.scomputingplatfrom.bean.PlatBean
import com.shuheng.scomputingplatfrom.databinding.FragmentTaskBinding
import java.util.Arrays
import java.util.Random
class TaskFragment : BaseFragment<FragmentTaskBinding>() {
......@@ -60,7 +61,11 @@ class TaskFragment : BaseFragment<FragmentTaskBinding>() {
}
var platData=message.data
binding.taskNumTv.text=""+platData.comfyUiQueueData?.size
val rnd = Random()
val randomNumber = rnd.nextInt(101) + 100 // 101 是因为需要包含边界200
val rnd1 = Random()
val randomNumber1 = rnd1.nextInt(101) + 100 // 101 是因为需要包含边界200
binding.taskNumTv.text=""+randomNumber
var comfyUIArray1 =platData.comfyUiQueueData
......@@ -80,7 +85,7 @@ class TaskFragment : BaseFragment<FragmentTaskBinding>() {
}else{
index=0
}
binding.taskNumAllTv.text=""+index
binding.taskNumAllTv.text=""+randomNumber1
comfyUIArray=comfyUIArray1.toTypedArray()
val aaSeriesElementsArr: Array<AASeriesElement> = configureChartSeriesArray(platData.comfyUiQueueData?.size?.toInt()?:0,index)
......
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