CNLive Android Team / ExternalSharing · Commits

Commit 77393d994f3c3046a2913c339f7216bfb784f68e

Authored by 袁思汶
1 parent 47f35a7d

文件类型分享

Inline Side-by-side
Showing 3 changed files with 6 additions and 4 deletions
OutSide_Share/src/main/java/com/cnlive/outside_share/activity/ShareIMActivity.java
  View file @77393d9
@@ -223,14 +223,14 @@ public class ShareIMActivity extends AppCompatActivity { @@ -223,14 +223,14 @@ public class ShareIMActivity extends AppCompatActivity {
223 startSelectForwardActivity(context, equals ? preferences.getString(SUBJECT, "") : bundle.get(SUBJECT) + "", "", AppConfig.getShareLink(), processUrlData(equals ? preferences.getString("extratext", "") : bundle.get(TEXT) + ""), TYPE_SHARE_LINK); 223 startSelectForwardActivity(context, equals ? preferences.getString(SUBJECT, "") : bundle.get(SUBJECT) + "", "", AppConfig.getShareLink(), processUrlData(equals ? preferences.getString("extratext", "") : bundle.get(TEXT) + ""), TYPE_SHARE_LINK);
224 killTime(); 224 killTime();
225 } 225 }
226 - } 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")) { 226 + } 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)+"").contains("mp.weixin.qq.com")) {
227 int begin = Objects.requireNonNull(equals ? preferences.getString("extratext", "") : bundle.get(TEXT)).toString().indexOf("http"); 227 int begin = Objects.requireNonNull(equals ? preferences.getString("extratext", "") : bundle.get(TEXT)).toString().indexOf("http");
228 int end = Objects.requireNonNull(equals ? preferences.getString("extratext", "") : bundle.get(TEXT)).toString().length(); 228 int end = Objects.requireNonNull(equals ? preferences.getString("extratext", "") : bundle.get(TEXT)).toString().length();
229 if (begin > 0 && end > 0) { 229 if (begin > 0 && end > 0) {
230 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); 230 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);
231 killTime(); 231 killTime();
232 } 232 }
233 - } 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")) { 233 + } 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)+"").contains("mp.weixin.qq.com")) {
234 new Thread(new Runnable() { 234 new Thread(new Runnable() {
235 235
236 private String srcjsoup; 236 private String srcjsoup;
@@ -273,7 +273,7 @@ public class ShareIMActivity extends AppCompatActivity { @@ -273,7 +273,7 @@ public class ShareIMActivity extends AppCompatActivity {
273 } 273 }
274 }).start(); 274 }).start();
275 } else { 275 } else {
276 - 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); 276 + startSelectForwardActivity(context, (equals ? preferences.getString("extratext", "") : bundle.get(TEXT)) == null ? (equals ? preferences.getString(SUBJECT, "") : bundle.get(SUBJECT)+"") : (equals ? preferences.getString("extratext", "") : bundle.get(TEXT)+""), TYPE_SHARE_TEXT, IN_TYPE_EXT_SHARE);
277 killTime(); 277 killTime();
278 } 278 }
279 } else { 279 } else {
app/src/main/AndroidManifest.xml
  View file @77393d9
@@ -36,6 +36,8 @@ @@ -36,6 +36,8 @@
36 <data android:mimeType="video/*" /> 36 <data android:mimeType="video/*" />
37 <!-- 文字类型 --> 37 <!-- 文字类型 -->
38 <data android:mimeType="text/plain" /> 38 <data android:mimeType="text/plain" />
  39 + <!-- 文件类型 -->
  40 + <data android:mimeType="application/*" />
39 </intent-filter> 41 </intent-filter>
40 <!-- 系统分享 多个文件 --> 42 <!-- 系统分享 多个文件 -->
41 <intent-filter> 43 <intent-filter>
config.gradle
  View file @77393d9
@@ -21,7 +21,7 @@ ext { @@ -21,7 +21,7 @@ ext {
21 //编译方式 21 //编译方式
22 debug : false, 22 debug : false,
23 //版本号 23 //版本号
24 - version: "1.0.2.5", 24 + version: "1.0.2.6",
25 //Lib库前缀 25 //Lib库前缀
26 packeg : "com.cnlive.outside_share", 26 packeg : "com.cnlive.outside_share",
27 //Lib库名称 27 //Lib库名称