From 24949134d46533aec17bd29c68eb821d4695c424 Mon Sep 17 00:00:00 2001 From: xiayan Date: Tue, 2 Apr 2024 23:18:34 +0800 Subject: [PATCH] FIX: convert kt --- .../main/ui/dashboard/DashboardFragment.kt | 8 ++--- .../main/ui/dashboard/DashboardViewModel.java | 31 ------------------- .../main/ui/dashboard/DashboardViewModel.kt | 27 ++++++++++++++++ 3 files changed, 30 insertions(+), 36 deletions(-) delete mode 100644 android/app/src/main/java/com/example/myapplication/main/ui/dashboard/DashboardViewModel.java create mode 100644 android/app/src/main/java/com/example/myapplication/main/ui/dashboard/DashboardViewModel.kt diff --git a/android/app/src/main/java/com/example/myapplication/main/ui/dashboard/DashboardFragment.kt b/android/app/src/main/java/com/example/myapplication/main/ui/dashboard/DashboardFragment.kt index fa42d8d..6ce750f 100644 --- a/android/app/src/main/java/com/example/myapplication/main/ui/dashboard/DashboardFragment.kt +++ b/android/app/src/main/java/com/example/myapplication/main/ui/dashboard/DashboardFragment.kt @@ -21,9 +21,7 @@ class DashboardFragment : Fragment() { inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View { - val viewModel = ViewModelProvider(this).get( - DashboardViewModel::class.java - ) + val viewModel = ViewModelProvider(this)[DashboardViewModel::class.java] binding = FragmentDashboardBinding.inflate(inflater, container, false) val root: View = binding!!.getRoot() val textView = binding!!.textDashboard @@ -54,9 +52,9 @@ class DashboardFragment : Fragment() { } } - suspend fun ioCode1() { + private suspend fun ioCode1() { withContext(Dispatchers.IO) { - LogUtils.v(""); + LogUtils.v("io opera 1"); } } diff --git a/android/app/src/main/java/com/example/myapplication/main/ui/dashboard/DashboardViewModel.java b/android/app/src/main/java/com/example/myapplication/main/ui/dashboard/DashboardViewModel.java deleted file mode 100644 index 311b315..0000000 --- a/android/app/src/main/java/com/example/myapplication/main/ui/dashboard/DashboardViewModel.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.example.myapplication.main.ui.dashboard; - -import androidx.lifecycle.LiveData; -import androidx.lifecycle.MutableLiveData; -import androidx.lifecycle.ViewModel; - -import com.example.myapplication.main.ui.dashboard.model.CounterModel; - -public class DashboardViewModel extends ViewModel { - - private final MutableLiveData counterModelLiveData = new MutableLiveData<>(new CounterModel(0)); - - public LiveData getCounterModelLiveData() { - return counterModelLiveData; - } - - public void processIntent(CounterIntent intent) { - CounterModel currentModel = counterModelLiveData.getValue(); - CounterModel newModel = null; - - if (intent instanceof CounterIntent.Increment) { - newModel = new CounterModel(currentModel.getCount() + 1); - } else if (intent instanceof CounterIntent.Decrement) { - newModel = new CounterModel(currentModel.getCount() - 1); - } - - if (newModel != null) { - counterModelLiveData.setValue(newModel); - } - } -} \ No newline at end of file diff --git a/android/app/src/main/java/com/example/myapplication/main/ui/dashboard/DashboardViewModel.kt b/android/app/src/main/java/com/example/myapplication/main/ui/dashboard/DashboardViewModel.kt new file mode 100644 index 0000000..1f25960 --- /dev/null +++ b/android/app/src/main/java/com/example/myapplication/main/ui/dashboard/DashboardViewModel.kt @@ -0,0 +1,27 @@ +package com.example.myapplication.main.ui.dashboard + +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import com.example.myapplication.main.ui.dashboard.CounterIntent.Decrement +import com.example.myapplication.main.ui.dashboard.model.CounterModel + +class DashboardViewModel : ViewModel() { + val counterModelLiveData = MutableLiveData(CounterModel(0)) + fun getCounterModelLiveData(): LiveData { + return counterModelLiveData + } + + fun processIntent(intent: CounterIntent?) { + val currentModel = counterModelLiveData.getValue() + var newModel: CounterModel? = null + if (intent is CounterIntent.Increment) { + newModel = CounterModel(currentModel!!.count + 1) + } else if (intent is Decrement) { + newModel = CounterModel(currentModel!!.count - 1) + } + if (newModel != null) { + counterModelLiveData.value = newModel + } + } +} \ No newline at end of file