From 623c0c4d5bf7183f578be7fa4d66ac660429f8dd Mon Sep 17 00:00:00 2001
From: jinyuera <454386664@qq.com>
Date: Tue, 30 Nov 2021 16:11:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                                          | 2 +-
 .../sl/house_property/discovery/AddDiscoveryActivity.java | 8 +++++++-
 .../house_property/discovery/HistoryRecordFragment.java   | 7 ++++---
 .../main/java/http/FileUpLoad/retrofit/IHttpService.java  | 2 ++
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 79da48f..7c71ba8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -143,7 +143,7 @@ android {
         implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
         implementation 'liji.library.dev:citypickerview:5.2.2'
 
-        implementation 'com.zhihu.android:matisse:0.5.2-beta2'
+        implementation 'com.zhihu.android:matisse:0.5.3-beta3'
         implementation 'com.tencent.bugly:crashreport:latest.release' //其中latest.release指代最新Bugly SDK版本号，也可以指定明确的版本号，例如2.2.0
         implementation 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:+'
         //引入ormlite
diff --git a/app/src/main/java/com/sl/house_property/discovery/AddDiscoveryActivity.java b/app/src/main/java/com/sl/house_property/discovery/AddDiscoveryActivity.java
index 244789f..97cb94e 100644
--- a/app/src/main/java/com/sl/house_property/discovery/AddDiscoveryActivity.java
+++ b/app/src/main/java/com/sl/house_property/discovery/AddDiscoveryActivity.java
@@ -512,7 +512,13 @@ public class AddDiscoveryActivity extends BaseActivity<ActivityAddDiscoveryBindi
 
 
         for (int i = 0; i < additionImageWrapper.getImageList().size(); i++) {
-            map.put("pic" + i + "\"; filename=\"" + additionImageWrapper.getImageList().get(i).getName() + "", RequestBody.create(MediaType.get("multipart/form-data"), additionImageWrapper.getImageList().get(i)));
+            if (additionImageWrapper.getImageList().get(i).getAbsolutePath().endsWith("mp4")){
+                map.put("video" + i + "\"; filename=\"" + additionImageWrapper.getImageList().get(i).getName() + "", RequestBody.create(MediaType.get("multipart/form-data"), additionImageWrapper.getImageList().get(i)));
+
+            }else {
+                map.put("pic" + i + "\"; filename=\"" + additionImageWrapper.getImageList().get(i).getName() + "", RequestBody.create(MediaType.get("multipart/form-data"), additionImageWrapper.getImageList().get(i)));
+
+            }
             Log.e("xxxx", additionImageWrapper.getImageList().get(i).getAbsolutePath());
         }
         if (file != null) {
diff --git a/app/src/main/java/com/sl/house_property/discovery/HistoryRecordFragment.java b/app/src/main/java/com/sl/house_property/discovery/HistoryRecordFragment.java
index fca8e0a..71af40d 100644
--- a/app/src/main/java/com/sl/house_property/discovery/HistoryRecordFragment.java
+++ b/app/src/main/java/com/sl/house_property/discovery/HistoryRecordFragment.java
@@ -64,6 +64,7 @@ import utils.CommonUtils;
 import utils.DateUtils;
 import utils.KeyboardUtil;
 import utils.Md5;
+import utils.TimeUtils;
 import utils.UtilHelpers;
 
 public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBinding> implements MainTabActivity.MyOnTouchListener {
@@ -262,8 +263,8 @@ public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBin
                     final DiscoveryListEntity discoveryListEntity = discoveryListEntities.get(position);
                     homeGridAdapterItemBinding.tvNikeName.setText(discoveryListEntity.getNickname());
                     homeGridAdapterItemBinding.tvContent.setText(discoveryListEntity.getGoods_detail());
-
-
+                   // TimeUtils.getRecentTimeSpanByNow(TimeUtils.dataOne
+                    homeGridAdapterItemBinding.tvTime.setText(TimeUtils.getRecentTimeSpanByNow(TimeUtils.dataOne(discoveryListEntity.getCtime())));
                     if (discoveryListEntity.getLike().isEmpty()) {
                         homeGridAdapterItemBinding.tvLike.setVisibility(View.GONE);
                     } else {
@@ -278,7 +279,7 @@ public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBin
                         }
                         homeGridAdapterItemBinding.tvLike.setText(likeString.toString());
 
-                        homeGridAdapterItemBinding.tvTime.setText(DateUtils.getDate(discoveryListEntity.getCtime()));
+
 
                     }
                     if (discoveryListEntity.getDis_content().isEmpty()) {
diff --git a/app/src/main/java/http/FileUpLoad/retrofit/IHttpService.java b/app/src/main/java/http/FileUpLoad/retrofit/IHttpService.java
index f93eafc..5a029b5 100644
--- a/app/src/main/java/http/FileUpLoad/retrofit/IHttpService.java
+++ b/app/src/main/java/http/FileUpLoad/retrofit/IHttpService.java
@@ -25,4 +25,6 @@ public interface IHttpService {
     @Multipart
     @POST
     Call<Resultcode> upLoadAgree(@Url String url, @PartMap Map<String, RequestBody> params);
+
+
 }