外分生活圈修改

袁思汶
1 parent 23d1081a
Showing 2 changed files with 20 additions and 20 deletions
OutSide_Share/src/main/java/com/cnlive/outside_share/activity/ShareIMActivity.java
OutSide_Share/src/main/java/com/cnlive/outside_share/activity/ShareMomentActivity.java
@@ -219,19 +219,19 @@ public class ShareIMActivity extends AppCompatActivity {
                                         String s = rich_media_content.replaceAll(reg, "");
                                         String desc = s.substring(0, Math.min(s.length(), 40));
                                         startSelectForwardActivity(context, h2 == null ? equals ? preferences.getString(SUBJECT, "") : bundle.get(SUBJECT) + "" : h2, desc, srcjs == null ? AppConfig.getShareLink() : srcjs, processUrlData(equals ? preferences.getString("extratext", "") : bundle.get(TEXT) + ""), TYPE_SHARE_LINK);
-                                        finish();
+                                        killTime();
                                     }
                                 }).start();
                             } else {
                                 startSelectForwardActivity(context, equals ? preferences.getString(SUBJECT, "") : bundle.get(SUBJECT) + "", "", AppConfig.getShareLink(), processUrlData(equals ? preferences.getString("extratext", "") : bundle.get(TEXT) + ""), TYPE_SHARE_LINK);
-                                finish();
+                                killTime();
                             }
                         } else if ((equals ? preferences.getString("extratext", "") : bundle.get(TEXT) + "").contains("http") && !Objects.requireNonNull(equals ? preferences.getString("extratext", "") : bundle.get(TEXT)).toString().startsWith("http") && !(equals ? preferences.getString("extratext", "") : bundle.get(TEXT)).toString().contains("mp.weixin.qq.com")) {
                             int begin = Objects.requireNonNull(equals ? preferences.getString("extratext", "") : bundle.get(TEXT)).toString().indexOf("http");
                             int end = Objects.requireNonNull(equals ? preferences.getString("extratext", "") : bundle.get(TEXT)).toString().length();
                             if (begin > 0 && end > 0) {
                                 startSelectForwardActivity(context, Objects.requireNonNull(equals ? preferences.getString("extratext", "") : bundle.get(TEXT)).toString().substring(0, begin), Objects.requireNonNull(equals ? preferences.getString("extratext", "") : bundle.get(TEXT)).toString().substring(0, begin), AppConfig.getShareLink(), processUrlData(Objects.requireNonNull(equals ? preferences.getString("extratext", "") : bundle.get(TEXT)).toString().substring(begin, end)), TYPE_SHARE_LINK);
-                                finish();
+                                killTime();
                             }
                         } else if ((equals ? preferences.getString("extratext", "") : bundle.get(TEXT)).toString().contains("http") && !Objects.requireNonNull(equals ? preferences.getString("extratext", "") : bundle.get(TEXT)).toString().startsWith("http") && (equals ? preferences.getString("extratext", "") : bundle.get(TEXT)).toString().contains("mp.weixin.qq.com")) {
                             new Thread(new Runnable() {
@@ -272,17 +272,17 @@ public class ShareIMActivity extends AppCompatActivity {
                                         }
                                     }
                                     startSelectForwardActivity(context, h2, "", srcjsoup, processUrlData(substring), TYPE_SHARE_LINK);
-                                    finish();
+                                    killTime();
                                 }
                             }).start();
                         } else {
                             startSelectForwardActivity(context, (equals ? preferences.getString("extratext", "") : bundle.get(TEXT)) == null ? (equals ? preferences.getString(SUBJECT, "") : bundle.get(SUBJECT)).toString() : (equals ? preferences.getString("extratext", "") : bundle.get(TEXT)).toString(), TYPE_SHARE_TEXT, IN_TYPE_EXT_SHARE);
-                            finish();
+                            killTime();
                         }
                     } else {
                         if (Objects.requireNonNull(equals ? preferences.getString("extratext", "") : bundle.get(TEXT)).toString().startsWith("http")) {
                             startSelectForwardActivity(context, "链接", "", AppConfig.getShareLink(), processUrlData(Objects.requireNonNull(equals ? preferences.getString("extratext", "") : bundle.get(TEXT)).toString()), TYPE_SHARE_LINK);
-                            finish();
+                            killTime();
                         } else {
                             String linkcontext = Objects.requireNonNull(equals ? preferences.getString("extratext", "") : bundle.get(TEXT)).toString().replaceAll("\\s*", "");
                             int end;
@@ -295,10 +295,10 @@ public class ShareIMActivity extends AppCompatActivity {
                             if (begin > 0 && end > 0) {
                                 startSelectForwardActivity(context, Objects.requireNonNull(equals ? preferences.getString("extratext", "") : bundle.get(TEXT)).toString().substring(0, begin), "", AppConfig.getShareLink(), linkcontext.substring(begin, end), TYPE_SHARE_LINK);
-                                finish();
+                                killTime();
                             } else {
                                 startSelectForwardActivity(context, (equals ? preferences.getString(SUBJECT, "") : bundle.get(SUBJECT)) == null ? (equals ? preferences.getString("extratext", "") : bundle.get(TEXT)).toString() : (equals ? preferences.getString(SUBJECT, "") : bundle.get(SUBJECT)).toString() + "  " + (equals ? preferences.getString("extratext", "") : bundle.get(TEXT)).toString(), TYPE_SHARE_TEXT, IN_TYPE_EXT_SHARE);
-                                finish();
+                                killTime();
                             }
                         }
                     }
@@ -385,14 +385,14 @@ public class ShareIMActivity extends AppCompatActivity {
                     String qqLink = bundle.get(TEXT).toString().substring(bundle.get(TEXT).toString().indexOf("http"));
                     String qqTitle = bundle.get(TEXT).toString().substring(0, bundle.get(TEXT).toString().indexOf("http"));
                     startSelectForwardActivity(context, qqTitle, "", AppConfig.getShareLink(), qqLink, TYPE_SHARE_LINK);
-                    finish();
+                    killTime();
                 }
             } else if (bundle != null && bundle.get(TEXT) == null && bundle.get("weixin_text") != null && bundle.get("weixin_text").toString().contains("liebao.cn")) {
                 String weixin_text = bundle.get("weixin_text").toString().substring(bundle.get("weixin_text").toString().indexOf("http"));
                 String weixin_title = bundle.get("weixin_title").toString();
                 String weixin_img_url = bundle.get("weixin_img_url").toString();
                 startSelectForwardActivity(context, weixin_title, "", weixin_img_url, weixin_text, TYPE_SHARE_LINK);
-                finish();
+                killTime();
             } else {
                 if ("image/gif".equals(type) || "image/vnd.wap.wbmp".equals(type)) {
                     if (DoublePressed.onDoublePressed()) return;
@@ -570,7 +570,7 @@ public class ShareIMActivity extends AppCompatActivity {
                         }
                         if (file.length() <= VIDEO_MAX_SIZE) {
                             startSelectForwardActivity(context, pathVideo, TYPE_SHARE_VIDEO, IN_TYPE_EXT_SHARE);
-                            finish();
+                            killTime();
                         } else if (file.length() > VIDEO_MAX_SIZE) {
                             AlertUtil.showDeftToast(context, "文件太大无法压缩发送（原文件大小需小于100MB）");
                             killTime();
@@ -602,7 +602,7 @@ public class ShareIMActivity extends AppCompatActivity {
                     }
                     if (file.length() <= VIDEO_MAX_SIZE) {
                         startSelectForwardActivity(context, pathVideo, TYPE_SHARE_VIDEO, IN_TYPE_EXT_SHARE);
-                        finish();
+                        killTime();
                     } else if (file.length() > VIDEO_MAX_SIZE) {
                         AlertUtil.showDeftToast(context, "文件太大无法压缩发送（原文件大小需小于100MB）");
                         killTime();
@@ -643,7 +643,7 @@ public class ShareIMActivity extends AppCompatActivity {
                         killTime();
                     } else {
                         startSelectForwardActivity(context, pathAudio, TYPE_SHARE_FILE, IN_TYPE_EXT_SHARE);
-                        finish();
+                        killTime();
                     }
                 } else {
                     AlertUtil.showDeftToast(this, "网家家暂不支持此类型信息分享.");
@@ -824,7 +824,7 @@ public class ShareIMActivity extends AppCompatActivity {
             } else {
                 startSelectForwardActivity(context, path1, TYPE_SHARE_IMAGE, IN_TYPE_EXT_SHARE);
             }
-            finish();
+            killTime();
             //TODO 文件缓存已经完成  待优化~!!
         } catch (Exception e) {
             Log.e("ShareIM", "Exception  ", e);
@@ -890,7 +890,7 @@ public class ShareIMActivity extends AppCompatActivity {
                         killTime();
                     } else {
                         startSelectForwardActivity(context, imgurilist, TYPE_SHARE_IMAGE);
-                        finish();
+                        killTime();
                     }
                 }
             }
@@ -383,7 +383,7 @@ public class ShareMomentActivity extends AppCompatActivity {
                             Media media = new Media(filevideo.getPath(), filevideo.getName(), 1, 3, filevideo.length(), 0, "", (int) time, "");
                             medialist.add(media);
                             jumpReleaseActivity(context, medialist, 3, "", "nocircle");
-                            finish();
+                            killTime();
                         }
                     } else if (("jpg".equals(fileType) || "png".equals(fileType)) && !(imageUri + "").contains("com.tencent.mtt")) {   //媒体文件类型混乱问题处理 //pic 1  video 3
                         File file = new File(pathreal);
@@ -391,7 +391,7 @@ public class ShareMomentActivity extends AppCompatActivity {
                         Media media = new Media(file.getPath(), file.getName(), 1, 1, file.length(), 0, "", "");
                         medialist.add(media);
                         jumpReleaseActivity(context, medialist, 3, "", "nocircle");
-                        finish();
+                        killTime();
                     } else if ((equals ? preferences.getString("extratext", null) : bundle.get(TEXT)) != null &&
                             bundle.get(TEXT) != null && !(bundle.get(TEXT) + "").contains("http")) {   //腾讯文件Android Q
                         String pathImg = getPath(context, imageUri);
@@ -459,7 +459,7 @@ public class ShareMomentActivity extends AppCompatActivity {
                                 Media media = new Media(file.getPath(), file.getName(), 1, 1, file.length(), 0, "", "");
                                 medialist.add(media);
                                 jumpReleaseActivity(context, medialist, 3, "", "nocircle");
-                                finish();
+                                killTime();
                             }
                         }
                     }
@@ -517,7 +517,7 @@ public class ShareMomentActivity extends AppCompatActivity {
                         Media media = new Media(filevideo.getPath(), filevideo.getName(), 1, 3, filevideo.length(), 0, "", (int) time, "");
                         medialist.add(media);
                         jumpReleaseActivity(context, medialist, 3, "", "nocircle");
-                        finish();
+                        killTime();
                     }
                 } else {
                     AlertUtil.showDeftToast(this, "网家家暂不支持此类型信息分享.");
@@ -822,7 +822,7 @@ public class ShareMomentActivity extends AppCompatActivity {
                         killTime();
                     } else {
                         jumpReleaseActivity(context, medialist, 3, "", "nocircle");
-                        finish();
+                        killTime();
                     }
                 }
             }