外部分享、地址参数签名增加域名限定

朱显松
1 parent bcffdad7
Showing 3 changed files with 20 additions and 17 deletions
OutSide_Share/src/main/java/com/cnlive/outside_share/activity/ShareIMActivity.java
build.gradle
config.gradle
@@ -138,17 +138,20 @@ public class ShareIMActivity extends AppCompatActivity {
     }
     public static String processUrlData(String shareInfoUrl) {
-        Uri uri = Uri.parse(shareInfoUrl);
-        String[] urls = shareInfoUrl.split("\\?");
-        String url = urls[0];
-        StringBuilder pageUrl = new StringBuilder(url);
-        pageUrl.append("?");
-        for (String key : uri.getQueryParameterNames()) {
-            String value = UriUtil.getQueryParameterWithDecode(uri.getEncodedQuery(), key);
-            pageUrl.append(key).append("=").append(Uri.encode(TextUtils.isEmpty(value) ? "" : value)).append("&");
+        if (shareInfoUrl == null) return "";
+        if (shareInfoUrl.contains("wjjh5test.cnlive.com") || shareInfoUrl.contains("wjjh5.cnlive.com")) {
+            Uri uri = Uri.parse(shareInfoUrl);
+            String[] urls = shareInfoUrl.split("\\?");
+            String url = urls[0];
+            StringBuilder pageUrl = new StringBuilder(url);
+            pageUrl.append("?");
+            for (String key : uri.getQueryParameterNames()) {
+                String value = UriUtil.getQueryParameterWithDecode(uri.getEncodedQuery(), key);
+                pageUrl.append(key).append("=").append(Uri.encode(TextUtils.isEmpty(value) ? "" : value)).append("&");
+            }
+            pageUrl = deleteCharOfEnd(pageUrl, "&", true);
+            shareInfoUrl = pageUrl.toString();
         }
-        pageUrl = deleteCharOfEnd(pageUrl, "&", true);
-        shareInfoUrl = pageUrl.toString();
         return shareInfoUrl;
     }
@@ -223,14 +226,14 @@ public class ShareIMActivity extends AppCompatActivity {
                                 startSelectForwardActivity(context, equals ? preferences.getString(SUBJECT, "") : bundle.get(SUBJECT) + "", "", AppConfig.getShareLink(), processUrlData(equals ? preferences.getString("extratext", "") : bundle.get(TEXT) + ""), TYPE_SHARE_LINK);
                                 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)+"").contains("mp.weixin.qq.com")) {
+                        } 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")) {
                             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);
                                 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)+"").contains("mp.weixin.qq.com")) {
+                        } 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")) {
                             new Thread(new Runnable() {
                                 private String srcjsoup;
@@ -273,7 +276,7 @@ public class ShareIMActivity extends AppCompatActivity {
                                 }
                             }).start();
                         } else {
-                            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);
+                            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);
                             killTime();
                         }
                     } else {
@@ -721,8 +724,8 @@ public class ShareIMActivity extends AppCompatActivity {
      * @param shareType  SelectForwardFragment.TYPE_SHARE_LINK
      */
     public static void startSelectForwardActivity(Context context, String shareTitle, String shareDesc, String shareImg, String shareLink, int shareType) {
-        if(shareLink!=null && shareLink.contains("(") && shareLink.contains(")")) {
-             shareLink = shareLink.substring(0, shareLink.indexOf("("));
+        if (shareLink != null && shareLink.contains("(") && shareLink.contains(")")) {
+            shareLink = shareLink.substring(0, shareLink.indexOf("("));
         }
         ARouter.getInstance().build("/cnconversation/SelectForwardActivity")
                 .withString("shareTitle", shareTitle)
@@ -64,7 +64,7 @@ ext {
     qmui = '1.1.5'
     libLargeImage = '1.0.4-androidx'
-    libBase = '1.9.2.0-androidx'
+    libBase = '2.0.0'
     libVideoQiniu = '1.0.7.2'
     //阿里路由框架
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "1.0.2.9",
+            version: "1.0.3",
             //Lib库前缀
             packeg : "com.cnlive.outside_share",
             //Lib库名称