From 165fa232853294f06cd5257d646b66e75a487440 Mon Sep 17 00:00:00 2001
From: Runt <qingingrunt2010@qq.com>
Date: Fri, 08 Nov 2024 15:16:33 +0000
Subject: [PATCH] listener命名修改 uri返回路径
---
libmvi/src/main/java/com/runt/open/mvi/base/model/BaseViewModel.kt | 28 ++++++++++++++++++++++++++++
libmvi/src/main/java/com/runt/open/mvi/retrofit/net/NetWorkListener.java | 4 ++--
libmvi/src/main/java/com/runt/open/mvi/retrofit/utils/RetrofitUtils.java | 4 ++--
libmvi/src/main/java/com/runt/open/mvi/retrofit/Interceptor/HttpLoggingInterceptor.java | 10 +++++-----
4 files changed, 37 insertions(+), 9 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 59f9956..8ecb0d2 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
@@ -3,6 +3,7 @@
import android.content.Intent
import android.net.Uri
import android.os.Build
+import android.provider.MediaStore
import android.util.Log
import androidx.activity.ComponentActivity
import androidx.core.content.FileProvider
@@ -19,6 +20,7 @@
import okhttp3.Request
import okhttp3.Response
import java.io.File
+import java.io.FileInputStream
import java.io.FileOutputStream
import java.io.IOException
import java.io.InputStream
@@ -204,4 +206,30 @@
}.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;
+ }
+ }
}
\ No newline at end of file
diff --git a/libmvi/src/main/java/com/runt/open/mvi/retrofit/Interceptor/HttpLoggingInterceptor.java b/libmvi/src/main/java/com/runt/open/mvi/retrofit/Interceptor/HttpLoggingInterceptor.java
index ee2fbb0..20bb448 100644
--- a/libmvi/src/main/java/com/runt/open/mvi/retrofit/Interceptor/HttpLoggingInterceptor.java
+++ b/libmvi/src/main/java/com/runt/open/mvi/retrofit/Interceptor/HttpLoggingInterceptor.java
@@ -6,7 +6,7 @@
import com.runt.open.mvi.OpenApplication;
import com.runt.open.mvi.data.PhoneDevice;
import com.runt.open.mvi.retrofit.net.NetWorkCost;
-import com.runt.open.mvi.retrofit.net.NetWorkListenear;
+import com.runt.open.mvi.retrofit.net.NetWorkListener;
import com.runt.open.mvi.retrofit.utils.HttpPrintUtils;
import com.runt.open.mvi.utils.DeviceUtil;
@@ -76,11 +76,11 @@
int position = logArrays.size() +2;
response = chain.proceed(request);
logArrays.addAll(getResponseLog(response));
- NetWorkCost netWorkCost = NetWorkListenear.workCostMap.get(hashCode);
+ NetWorkCost netWorkCost = NetWorkListener.workCostMap.get(hashCode);
if(netWorkCost != null) {
logArrays.add(position, "<-- costtimes : " + netWorkCost);
}
- NetWorkListenear.workCostMap.remove(hashCode);
+ NetWorkListener.workCostMap.remove(hashCode);
new Thread(){
@Override
public void run() {
@@ -96,12 +96,12 @@
e.printStackTrace();
} catch (Exception e) {
logArrays.add("<-- response url:" + URLDecoder.decode(request.url().toString(), "UTF-8"));
- NetWorkCost netWorkCost = NetWorkListenear.workCostMap.get(hashCode);
+ NetWorkCost netWorkCost = NetWorkListener.workCostMap.get(hashCode);
if (netWorkCost != null) {
netWorkCost.total = new Date().getTime() - netWorkCost.total;
logArrays.add("<-- costtimes : " + netWorkCost);
}
- NetWorkListenear.workCostMap.remove(hashCode);
+ NetWorkListener.workCostMap.remove(hashCode);
logArrays.add("<-- response failed " + e.getLocalizedMessage());
logArrays.add("<-- " + e.toString());
new Thread(){
diff --git a/libmvi/src/main/java/com/runt/open/mvi/retrofit/net/NetWorkListenear.java b/libmvi/src/main/java/com/runt/open/mvi/retrofit/net/NetWorkListener.java
similarity index 98%
rename from libmvi/src/main/java/com/runt/open/mvi/retrofit/net/NetWorkListenear.java
rename to libmvi/src/main/java/com/runt/open/mvi/retrofit/net/NetWorkListener.java
index dd4dbd8..6019abd 100644
--- a/libmvi/src/main/java/com/runt/open/mvi/retrofit/net/NetWorkListenear.java
+++ b/libmvi/src/main/java/com/runt/open/mvi/retrofit/net/NetWorkListener.java
@@ -28,7 +28,7 @@
*/
-public class NetWorkListenear extends EventListener {
+public class NetWorkListener extends EventListener {
private static final String TAG = "NetworkEventListener";
final Charset UTF8 = Charset.forName("UTF-8");
@@ -39,7 +39,7 @@
@NotNull
@Override
public EventListener create(@NotNull Call call) {
- return new NetWorkListenear();
+ return new NetWorkListener();
}
};
return factory;
diff --git a/libmvi/src/main/java/com/runt/open/mvi/retrofit/utils/RetrofitUtils.java b/libmvi/src/main/java/com/runt/open/mvi/retrofit/utils/RetrofitUtils.java
index 093c738..39695c3 100644
--- a/libmvi/src/main/java/com/runt/open/mvi/retrofit/utils/RetrofitUtils.java
+++ b/libmvi/src/main/java/com/runt/open/mvi/retrofit/utils/RetrofitUtils.java
@@ -5,7 +5,7 @@
import com.runt.open.mvi.retrofit.Interceptor.AddHeadersInterceptor;
import com.runt.open.mvi.retrofit.Interceptor.HttpLoggingInterceptor;
import com.runt.open.mvi.retrofit.converter.GsonConverterFactory;
-import com.runt.open.mvi.retrofit.net.NetWorkListenear;
+import com.runt.open.mvi.retrofit.net.NetWorkListener;
import java.util.Collections;
import java.util.concurrent.TimeUnit;
@@ -96,7 +96,7 @@
return builder.connectTimeout(10, TimeUnit.SECONDS)//设置连接超时时间
.readTimeout(30, TimeUnit.SECONDS)//设置读取超时时间
.protocols(Collections.singletonList(Protocol.HTTP_1_1))
- .eventListenerFactory(NetWorkListenear.get())
+ .eventListenerFactory(NetWorkListener.get())
.build();
}
--
Gitblit v1.9.1