From ecaf8069072e71db4bff94671e72764b211d6af1 Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期四, 26 十月 2023 00:43:51 +0800
Subject: [PATCH] 功能完善
---
app/src/main/java/com/application/zhangshi_app_android/adapter/ElectronicFileAddAdapter.java | 88 +++++++++++++++++++++++++++-----------------
1 files changed, 54 insertions(+), 34 deletions(-)
diff --git a/app/src/main/java/com/application/zhangshi_app_android/adapter/ElectronicFileAddAdapter.java b/app/src/main/java/com/application/zhangshi_app_android/adapter/ElectronicFileAddAdapter.java
index 19895e1..3f27eeb 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/adapter/ElectronicFileAddAdapter.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/adapter/ElectronicFileAddAdapter.java
@@ -2,22 +2,21 @@
import android.app.Activity;
import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
+import android.util.Base64;
import android.view.View;
import androidx.annotation.Nullable;
-import androidx.core.app.ActivityCompat;
-import androidx.core.app.ActivityOptionsCompat;
-import androidx.core.util.Pair;
+import com.android.app_base.base.BaseConfig;
import com.android.app_base.base.adapter.BaseRVAdapter;
import com.application.zhangshi_app_android.R;
import com.application.zhangshi_app_android.databinding.ItemElectronicFileAddBinding;
+import com.application.zhangshi_app_android.ui.BrowserActivity;
import com.application.zhangshi_app_android.ui.ImagePreviewActivity;
-import com.application.zhangshi_app_android.ui.PlayActivity;
-import com.application.zhangshi_app_android.ui.VideoPlayActivity;
+import com.application.zhangshi_app_android.ui.PlayerActivity;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -93,7 +92,6 @@
if (getItemViewType(position) == TYPE_Add) {
holder.getBinding().flAdd.setVisibility(View.VISIBLE);
holder.getBinding().flImage.setVisibility(View.GONE);
-
holder.itemView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -109,6 +107,30 @@
holder.getBinding().flAdd.setVisibility(View.GONE);
holder.getBinding().flImage.setVisibility(View.VISIBLE);
+ String item = mDataList.get(position);
+ if (isShowAddItem) {
+ holder.getBinding().ivDelete.setVisibility(View.VISIBLE);
+ } else {
+ holder.getBinding().ivDelete.setVisibility(View.GONE);
+ }
+
+ if (isShowDeleteIcon) {
+ holder.getBinding().ivDelete.setVisibility(View.VISIBLE);
+ } else {
+ holder.getBinding().ivDelete.setVisibility(View.GONE);
+ }
+
+ if (isShowSelectIcon) {
+ holder.getBinding().ivSelect.setVisibility(View.VISIBLE);
+ if (selectedItems.contains(item)){
+ holder.getBinding().ivSelect.setBackgroundResource(R.drawable.ic_checked);
+ } else {
+ holder.getBinding().ivSelect.setBackgroundResource(R.drawable.ic_unchecked);
+ }
+ } else {
+ holder.getBinding().ivSelect.setVisibility(View.GONE);
+ }
+
//闈為瑙堢姸鎬佷笅锛岀偣鍑籭tem 璋冪敤 mItemAndAddClickListener.onItemClick
//棰勮鐘舵�佷笅锛岀偣鍑籭tem 璋冪敤 鐩稿簲鐨� 鏂囦欢棰勮
if (!isPreview){
@@ -120,10 +142,32 @@
}
}
});
+ }else {
+ holder.itemView.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ String url = mDataList.get(position);
+ if (url.contains("profile/upload")) {//濡傛灉鏄笂浼犲埌鏈嶅姟鍣ㄧ殑鏂囦欢
+ //鍙彇profile/upload浠ュ悗鐨勯儴鍒�
+ url = url.substring(url.indexOf("profile/upload"));
+ url = BaseConfig.BASE_URL_DOMAIN + "/" + url;
+ //澶勭悊url杩涜Base64缂栫爜锛屽�熷姪 kkfileview 杩涜鏂囦欢棰勮
+ // URL缂栫爜Base64缂栫爜鍚庣殑URL
+ try {
+ String encodedUrl = URLEncoder.encode(Base64.encodeToString(url.getBytes(), Base64.NO_WRAP), "UTF-8");
+ String kkFileViewUrl = "https://www.bendudu.com:8085/preview/onlinePreview?url=" + encodedUrl;
+ BrowserActivity.start(mContext, kkFileViewUrl);
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ });
}
- String item = mDataList.get(position);
if (item != null) {
+ //闈炲浘鐗囪棰戯紝鎵撳紑鏂囦欢棰勮
+
if (item.endsWith(".pdf")) {
holder.getBinding().ivImage.setImageResource(R.drawable.ic_pdf);
} else if (item.endsWith(".zip") || item.endsWith(".aar") || item.endsWith(".7z")) {
@@ -157,8 +201,7 @@
// .setVideoSource(item)
// .setActivityOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT)
// .start(mContext);
- PlayActivity.start((Activity) mContext, item,holder.itemView,true);
-
+ PlayerActivity.startWrapUrl((Activity) mContext, item,holder.itemView,true);
}
});
}
@@ -169,29 +212,6 @@
} else {
holder.getBinding().ivImage.setImageResource(R.drawable.ic_others);
}
- }
-
- if (isShowAddItem) {
- holder.getBinding().ivDelete.setVisibility(View.VISIBLE);
- } else {
- holder.getBinding().ivDelete.setVisibility(View.GONE);
- }
-
- if (isShowDeleteIcon) {
- holder.getBinding().ivDelete.setVisibility(View.VISIBLE);
- } else {
- holder.getBinding().ivDelete.setVisibility(View.GONE);
- }
-
- if (isShowSelectIcon) {
- holder.getBinding().ivSelect.setVisibility(View.VISIBLE);
- if (selectedItems.contains(item)){
- holder.getBinding().ivSelect.setBackgroundResource(R.drawable.ic_checked);
- } else {
- holder.getBinding().ivSelect.setBackgroundResource(R.drawable.ic_unchecked);
- }
- } else {
- holder.getBinding().ivSelect.setVisibility(View.GONE);
}
}
--
Gitblit v1.9.1