升级

袁思汶
1 parent 24032922
Showing 2 changed files with 27 additions and 29 deletions
OutSide_Share/src/main/java/com/cnlive/outside_share/activity/ShareIMActivity.java
config.gradle
@@ -23,7 +23,6 @@ import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.cnlive.libs.base.application.AppConfig;
 import com.cnlive.libs.base.util.AlertUtil;
-import com.cnlive.libs.base.util.DoublePressed;
 import com.cnlive.libs.base.util.MD5Util;
 import com.cnlive.libs.base.util.StatusBarUtil2;
 import com.cnlive.libs.base.util.StringUtils;
@@ -125,17 +124,17 @@ public class ShareIMActivity extends AppCompatActivity {
     public void checkIntent() {
         equals = "shareIM".equals(outTyp);  //是否二次登陆  以下所有type均需要判断是否二次登录
         preferences = this.getSharedPreferences("OutShare", MODE_PRIVATE);
-            switch (action) {
-                case Intent.ACTION_SEND:
-                    jumpToSend(this, bundle);
-                    break;
-                case Intent.ACTION_SEND_MULTIPLE:
-                    jumpToSendMultiple(this, mutil);
-                    break;
-                default:
-                    AlertUtil.showDeftToast(this, "网家家暂不支持此类型信息分享.");
-                    break;
-            }
+        switch (action) {
+            case Intent.ACTION_SEND:
+                jumpToSend(this, bundle);
+                break;
+            case Intent.ACTION_SEND_MULTIPLE:
+                jumpToSendMultiple(this, mutil);
+                break;
+            default:
+                AlertUtil.showDeftToast(this, "网家家暂不支持此类型信息分享.");
+                break;
+        }
     }
     public static String processUrlData(String shareInfoUrl) {
@@ -317,12 +316,12 @@ public class ShareIMActivity extends AppCompatActivity {
                     /*if (cursor != null && cursor.moveToFirst()) {
                         uri = ContentUris.withAppendedId(mediaUri,
                                 cursor.getLong(cursor.getColumnIndex(MediaStore.Files.FileColumns._ID)));*/
-                        String fileName = textUri.toString().substring(textUri.toString().lastIndexOf("/"), textUri.toString().lastIndexOf("."));
-                        String fileType = textUri.toString().substring(textUri.toString().lastIndexOf("."), textUri.toString().length());
-                        String path = AndroidQUtil.copyAndroidQFile(ShareIMActivity.this, textUri.toString(), StringUtils.decode(fileName) + fileType);
-                        //  String path = getPath(context, uri);
-                        startSelectForwardActivity(context, path, TYPE_SHARE_FILE, IN_TYPE_EXT_SHARE);
-                        killTime();
+                    String fileName = textUri.toString().substring(textUri.toString().lastIndexOf("/"), textUri.toString().lastIndexOf("."));
+                    String fileType = textUri.toString().substring(textUri.toString().lastIndexOf("."), textUri.toString().length());
+                    String path = AndroidQUtil.copyAndroidQFile(ShareIMActivity.this, textUri.toString(), StringUtils.decode(fileName) + fileType);
+                    //  String path = getPath(context, uri);
+                    startSelectForwardActivity(context, path, TYPE_SHARE_FILE, IN_TYPE_EXT_SHARE);
+                    killTime();
                    /* } else {
                         AlertUtil.showDeftToast(context, "媒体库中暂未找到相关资源，请从手机相册中分享");
                     }
@@ -387,21 +386,20 @@ public class ShareIMActivity extends AppCompatActivity {
                 startSelectForwardActivity(context, weixin_title, "", weixin_img_url, weixin_text, TYPE_SHARE_LINK);
                 killTime();
             } else {
-                if ("image/gif".equals(type) || "image/vnd.wap.wbmp".equals(type)) {
-                    if (DoublePressed.onDoublePressed()) return;
+                Uri imageUri = equals ? Uri.parse(preferences.getString("extrastream", "")) : bundle.getParcelable(Intent.EXTRA_STREAM);
+                if ("image/gif".equals(type) || "image/vnd.wap.wbmp".equals(type) || imageUri == null) {
                     AlertUtil.showDeftToast(context, "网家家暂不支持此格式图片分享.");
                     killTime();
                 } else {
-                    Uri imageUri = equals ? Uri.parse(preferences.getString("extrastream", "")) : bundle.getParcelable(Intent.EXTRA_STREAM);
                     sendBroadcast(new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE, imageUri));
-                    if (AndroidQUtil.isAndroidQ()) {
-                        path = AndroidQUtil.copyAndroidQFile(ShareIMActivity.this, imageUri.toString(), System.currentTimeMillis() + ".png");
+                    if (imageUri.toString().contains("/") && imageUri.toString().contains(".")) {
+                        String fileName = imageUri.toString().substring(imageUri.toString().lastIndexOf("/"), imageUri.toString().lastIndexOf("."));
+                        String fileType = imageUri.toString().substring(imageUri.toString().lastIndexOf("."), imageUri.toString().length());
+                        path = AndroidQUtil.copyAndroidQFile(this, imageUri.toString(), StringUtils.decode(fileName) + fileType);
                     } else {
-                        path = getPath(context, imageUri);
+                        path = AndroidQUtil.copyAndroidQFile(this, imageUri.toString(), System.currentTimeMillis() + ".png");
                     }
-
                     String fileType = FileType.getFileType(path);
-
                     if (path == null && (equals ? preferences.getString("extratext", "") : bundle.get(TEXT)) == null) {
                         AlertUtil.showDeftToast(context, "该文件路径不存在，无法完成分享.");
                         killTime();
@@ -437,7 +435,7 @@ public class ShareIMActivity extends AppCompatActivity {
                         startSelectForwardActivity(context, path, TYPE_SHARE_IMAGE, IN_TYPE_EXT_SHARE);
                         killTime();
                     } else if ((equals ? preferences.getString("extratext", null) : bundle.get(TEXT)) != null &&
-                            bundle!= null && !(bundle.get(TEXT) + "").contains("http")) {   //腾讯文件Android Q
+                            bundle != null && !(bundle.get(TEXT) + "").contains("http")) {   //腾讯文件Android Q
                         photoTimer.schedule(new TimerTask() {
                             @Override
                             public void run() {
@@ -481,7 +479,7 @@ public class ShareIMActivity extends AppCompatActivity {
                             }
                             killTime();
                         }
-                    } else if (imageUri == null && path.endsWith("gif")) {
+                    } else if (path.endsWith("gif")) {
                         AlertUtil.showDeftToast(this, "网家家暂不支持此类型信息分享.");
                         killTime();
                     } else if (String.valueOf(imageUri).startsWith("content://") && !"wbmp".equals(fileType)) {
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "1.0.1.9",
+            version: "1.0.2.0",
             //Lib库前缀
             packeg : "com.cnlive.outside_share",
             //Lib库名称