From 89e35a1933ba40513a96572b27291c0aa65c918c Mon Sep 17 00:00:00 2001
From: Runt <qingingrunt2010@qq.com>
Date: Sat, 11 Oct 2025 10:21:42 +0000
Subject: [PATCH] 框架优化
---
libmvi/src/main/java/com/runt/open/mvi/base/model/BaseViewModel.kt | 77 ++++++++++++++++++++------------------
1 files changed, 41 insertions(+), 36 deletions(-)
diff --git a/libmvi/src/main/java/com/runt/open/mvi/base/model/BaseViewModel.kt b/libmvi/src/main/java/com/runt/open/mvi/base/model/BaseViewModel.kt
index 12fedd1..7c8909b 100644
--- a/libmvi/src/main/java/com/runt/open/mvi/base/model/BaseViewModel.kt
+++ b/libmvi/src/main/java/com/runt/open/mvi/base/model/BaseViewModel.kt
@@ -5,9 +5,9 @@
import android.os.Build
import android.provider.MediaStore
import android.util.Log
-import androidx.activity.ComponentActivity
import androidx.core.content.FileProvider
import androidx.lifecycle.ViewModel
+import com.google.gson.Gson
import com.runt.open.mvi.base.BaseActivity
import com.runt.open.mvi.base.LayoutView
import com.runt.open.mvi.data.LoadingState
@@ -20,8 +20,11 @@
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.asStateFlow
import okhttp3.Callback
+import okhttp3.MediaType.Companion.toMediaType
import okhttp3.OkHttpClient
import okhttp3.Request
+import okhttp3.RequestBody
+import okhttp3.RequestBody.Companion.toRequestBody
import okhttp3.Response
import java.io.File
import java.io.FileInputStream
@@ -57,7 +60,27 @@
TAG = javaClass.simpleName;
}
- fun getActivity(): ComponentActivity {
+ open fun onPause(){
+
+ }
+
+ open fun onResume(){
+
+ }
+
+ open fun onStart(){
+
+ }
+
+ open fun onStop(){
+
+ }
+
+ open fun onDestroy(){
+
+ }
+
+ fun getActivity(): BaseActivity<LayoutView<BaseViewModel> , BaseViewModel> {
return mActivity!!;
}
@@ -69,16 +92,18 @@
_isLoading.value = _isLoading.value.copy(isVisible = false);
}
- fun showDialog( title:String = "", message: String = "", confirmText:String = "确定", cancelText:String = "",
- touchOutside:Boolean = true,//空白和系统返回 是否关闭
- showClose:Boolean = false,//显示关闭图标（默认不显示）
- confirmDissmiss:Boolean = true,//点击确定是否关闭
- cancelDissmiss:Boolean = true,//点击取消是否关闭
- onDismissRequest : () -> Unit = {},
- onConfirmRequest : () -> Unit = {}, ){
-
+ fun showDialog(
+ title : String = "" , message : String = "" , confirmText : String = "确定" , cancelText : String = "" ,
+ touchOutside : Boolean = true , //空白和系统返回 是否关闭
+ showClose : Boolean = false , //显示关闭图标（默认不显示）
+ confirmDissmiss : Boolean = true , //点击确定是否关闭
+ cancelDissmiss : Boolean = true , //点击取消是否关闭
+ onDismissRequest : () -> Unit = {} ,
+ onCancelRequest : () -> Unit = {} ,
+ onConfirmRequest : () -> Unit = {} ,
+ ){
_messageState.value = MessageState(title = title, message = message, touchOutside = touchOutside, showClose = showClose, confirmText = confirmText,
- cancelText = cancelText, confirmDissmiss = confirmDissmiss, cancelDissmiss = cancelDissmiss, onDismissRequest = onDismissRequest,
+ cancelText = cancelText, confirmDissmiss = confirmDissmiss, cancelDissmiss = cancelDissmiss, onCancelRequest = onCancelRequest, onDismissRequest = onDismissRequest,
onConfirmRequest = onConfirmRequest, setDismiss = messageSetDismiss);
}
@@ -250,30 +275,10 @@
}.subscribe(observer)
}
- fun getFilePathFromUri(uri:Uri):String?{
- var filePath = "";
- var filePathColumn = arrayOf(MediaStore.Video.Media.DATA)
- var cursor = mActivity!!.contentResolver.query(uri!!,filePathColumn,null,null,null)
- cursor?.let {
- it.moveToFirst()
- var index = it.getColumnIndex(filePathColumn[0])
- if(index > -1 && index < it.columnCount){
- filePath = it.getString(index)
- }
- it.close();
- }
- var file = File(filePath);
- Log.i(TAG,"文件是否存在=${file.exists()} file=${filePath} ")
- if(file.exists()){
- try {
- var inputStream = FileInputStream(file)
- inputStream.close();
- return filePath;
- }catch (e:Exception){
- return null;
- }
- }else{
- return null;
- }
+ fun createJsonBody(obj : Any) : RequestBody {
+ val mediaType = "application/json; charset=utf-8".toMediaType()
+ val json = if (obj is String) obj else Gson().toJson(obj)
+ val requestBody = json.toString().toRequestBody(mediaType)
+ return requestBody;
}
}
\ No newline at end of file
--
Gitblit v1.9.1