分享 修改

app/src/main/java/com/kfzs/duanduan/fragment/FgtPersonalCenter.java

@@ -207,7 +207,7 @@ public class FgtPersonalCenter extends BaseCompatFragment {
                 break;
             case R.id.recommend_friend_layout://推荐给好友
                 if (userEntity != null) {
-                    ViewUtil.shareLink(activity, CommonUtil.getInstance().jointString(userEntity.getShareLink(), "ohter"));
+                    ViewUtil.shareLink(activity, CommonUtil.getInstance().jointString(userEntity.getShareLink("ohter"), "ohter"));
                 }
                 USER_SHARE.onEvent();
                 break;

app/src/main/java/com/sheep/gamegroup/model/entity/UserEntity.java

@@ -2,6 +2,7 @@ package com.sheep.gamegroup.model.entity;
 
 import android.text.TextUtils;
 
+import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.TestUtil;
 import org.xutils.db.annotation.Column;
 import org.xutils.db.annotation.Table;
@@ -317,7 +318,7 @@ public class UserEntity implements Serializable {
         return must_bind_mobile == 0 && TextUtils.isEmpty(mobile);
     }
     //测试服用测试分享链接，正式服用正式的
-    public String getShareLink(){//测试服对应的下载地址为http://10.8.230.17:7776/newsheep?id=32778005
-        return TestUtil.isSheep() ? getShare_link() : "http://10.8.210.230:8902/share.html?invitation_code="+getInvitation_code();
+    public String getShareLink(String type){//测试服对应的下载地址为http://10.8.230.17:7776/newsheep?id=32778005
+        return TestUtil.isSheep() ? CommonUtil.getInstance().jointString(getShare_link(), type) : CommonUtil.getInstance().jointString("http://10.8.210.230:8902/share.html?invitation_code="+getInvitation_code(),type);
     }
 }

app/src/main/java/com/sheep/gamegroup/util/AppUtil.java

@@ -10,6 +10,7 @@ import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.view.WindowManager;
 
+import java.net.URLEncoder;
 import java.util.Locale;
 
 /**
@@ -23,6 +24,7 @@ public class AppUtil {
     }
 
     public static String getQRLink(String share_link,int w) {
+        share_link = URLEncoder.encode(share_link);
 //        String link = BASE_QR + share_link +"&w="+w;
 //        LogUtil.println("link", link);
         return getQRLink(share_link, w, w);

app/src/main/java/com/sheep/gamegroup/util/CommonUtil.java

@@ -1653,6 +1653,8 @@ public class CommonUtil {
      * 分享 url type 拼接
      */
     public String jointString(String url, String type){
+        if(url.contains("&type="))
+            return url;
         switch (type){
             case "qq":
                 return url + "&type=2";
@@ -1662,4 +1664,6 @@ public class CommonUtil {
                 return url + "&type=4";
         }
     }
+
+
 }

app/src/main/java/com/sheep/gamegroup/util/Jump2View.java

@@ -254,11 +254,11 @@ public class Jump2View {
         CommonUtil.getInstance().updateUserInfo(new Action1<UserEntity>() {
             @Override
             public void call(UserEntity userEntity) {
-                if(userEntity != null && !TextUtils.isEmpty(userEntity.getShareLink())) {
+                if(userEntity != null && !TextUtils.isEmpty(userEntity.getShareLink("other"))) {
 //                                GlideImageLoader.downLoadImage(userEntity.getShare_link().hashCode(), AppUtil.getQRLink(userEntity.getShare_link(), 800), null);
 //                                //PersionInfoAct.java与AskGetMoneyAct.java中分享二维码时的图片预下载
                     Glide.with(activity)
-                            .load(AppUtil.getQRLink(userEntity.getShareLink(), 800))
+                            .load(AppUtil.getQRLink(userEntity.getShareLink("other"), 800))
                             .apply(new RequestOptions().diskCacheStrategy(DiskCacheStrategy.RESOURCE))
                             .preload(800, 800);
                 }
@@ -288,11 +288,11 @@ public class Jump2View {
                     CommonUtil.getInstance().updateUserInfo(new Action1<UserEntity>() {
                         @Override
                         public void call(UserEntity userEntity) {
-                            if(userEntity != null && !TextUtils.isEmpty(userEntity.getShareLink())) {
+                            if(userEntity != null && !TextUtils.isEmpty(userEntity.getShareLink("other"))) {
 //                                GlideImageLoader.downLoadImage(userEntity.getShare_link().hashCode(), AppUtil.getQRLink(userEntity.getShare_link(), 800), null);
 //                                //PersionInfoAct.java与AskGetMoneyAct.java中分享二维码时的图片预下载
                                 Glide.with(activity)
-                                        .load(AppUtil.getQRLink(userEntity.getShareLink(), 800))
+                                        .load(AppUtil.getQRLink(userEntity.getShareLink("other"), 800))
                                         .apply(new RequestOptions().diskCacheStrategy(DiskCacheStrategy.RESOURCE))
                                         .preload(800, 800);
                             }

app/src/main/java/com/sheep/gamegroup/view/activity/AskGetMoneyAct.java

@@ -328,9 +328,11 @@ public class AskGetMoneyAct extends BaseUMActivity implements UMShareListener, A
         if (code == 1) {
             shareAction.setPlatform(SHARE_MEDIA.WEIXIN);
             CommonUtil.getInstance().popShare(AskGetMoneyAct.this, userEntity.getShareLink(), "wx", mEntity.getShare_desc());
+            CommonUtil.getInstance().popShare(AskGetMoneyAct.this, userEntity.getShareLink("wx"), "wx",mEntity.getShare_desc());
         } else {
             shareAction.setPlatform(SHARE_MEDIA.QQ);
             CommonUtil.getInstance().popShare(AskGetMoneyAct.this, userEntity.getShareLink(), "qq", mEntity.getShare_desc());
+            CommonUtil.getInstance().popShare(AskGetMoneyAct.this, userEntity.getShareLink("qq"), "qq",mEntity.getShare_desc());
         }
     }
 
@@ -351,6 +353,16 @@ public class AskGetMoneyAct extends BaseUMActivity implements UMShareListener, A
                         G.showToast("复制链接成功");
                     }
                 }));
+        ViewUtil.showMsgDialog(this, new DialogConfig().setTitle("分享链接").setMsg(userEntity.getShareLink("other"))
+            .setMsgMore("通过连接加入小绵羊即可成为你的好友").setMsgMoreColor(R.color.txt_black_9e9c9c)
+            .setBtnLeftText("复制链接").setBtnLeftOnClickListener(new View.OnClickListener() {
+                        @Override
+                        public void onClick(View view) {
+                            QR_COPY.onEvent();
+                            StringUtils.CopyText(userEntity.getShareLink("other"));
+                            G.showToast("复制链接成功");
+                        }
+                    }));
     }
 
 
@@ -418,7 +430,7 @@ public class AskGetMoneyAct extends BaseUMActivity implements UMShareListener, A
                         G.showToast("数据正在加载中");
                         break;
                     }
-                    ViewUtil.showQR(AskGetMoneyAct.this, userEntity.getShareLink());
+                    ViewUtil.showQR(AskGetMoneyAct.this, userEntity.getShareLink("other"));
                     break;
                 case R.id.rl_link:
                     shareToLink();

app/src/main/java/com/sheep/gamegroup/view/activity/PersonalInfoAct.java

@@ -114,7 +114,7 @@ public class PersonalInfoAct extends AbsChooseImageActivity {
                 USER_INFO_NAME.onEvent();
                 break;
             case R.id.personal_info_qr_container:
-                ViewUtil.showQR(PersonalInfoAct.this, userEntity.getShareLink());
+                ViewUtil.showQR(PersonalInfoAct.this, userEntity.getShareLink("other"));
                 break;
             case R.id.personal_info_phone_container:   //跳转到绑定手机号
                 Jump2View.getInstance().goBindPhone(activity, null);
@@ -200,7 +200,7 @@ public class PersonalInfoAct extends AbsChooseImageActivity {
         personal_info_code.setText(userEntity.getInvitation_code());
 
         Glide.with(PersonalInfoAct.this)
-                .load(AppUtil.getQRLink(userEntity.getShareLink(), 90))
+                .load(AppUtil.getQRLink(userEntity.getShareLink("other"), 90))
                 .into(personal_info_qr);
         GlideImageLoader.setAvatar(personal_info_avatar, userEntity.getAvatar());
         //账号与安全