bug fixed

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

@@ -329,6 +329,14 @@ public class Jump2View {
         context.startActivity(intent);
     }
 
+    public synchronized void goLoginViewWithoutFinish(Context context, String from) {
+        Intent intent = new Intent(context, LoginAct.class);
+        intent.putExtra("where_from", from);
+
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+        context.startActivity(intent);
+    }
+
 
     /**
      * 跳到邀请赚钱页面

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

@@ -782,21 +782,22 @@ public class ViewUtil {
     }
 
     public static void shareLink(final Activity activity, String viewTitle, final String link, final String title, final String content, final ShareCallback callback) {
-        SheepApp.getInstance().getNetComponent().getApiService().getShortUrl(link)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
-
-                    @Override
-                    public void onNext(BaseMessage baseMessage) {
-                        toShare(activity, viewTitle, baseMessage.getData().toString(), title, content, callback);
-                    }
-
-                    @Override
-                    public void onError(BaseMessage baseMessage) {
-                        G.shortToast("分享失败");
-                    }
-                });
+        toShare(activity, viewTitle, link, title, content, callback);
+//        SheepApp.getInstance().getNetComponent().getApiService().getShortUrl(link)
+//                .subscribeOn(Schedulers.io())
+//                .observeOn(AndroidSchedulers.mainThread())
+//                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
+//
+//                    @Override
+//                    public void onNext(BaseMessage baseMessage) {
+//                        toShare(activity, viewTitle, baseMessage.getData().toString(), title, content, callback);
+//                    }
+//
+//                    @Override
+//                    public void onError(BaseMessage baseMessage) {
+//                        G.shortToast("分享失败");
+//                    }
+//                });
     }
 
     private static void toShare(final Activity activity, String viewTitle, final String link, final String title, final String content, final ShareCallback callback) {
@@ -908,14 +909,29 @@ public class ViewUtil {
      * @param media    分享平台
      */
     private static void shareAction(Activity activity, String title, String content, String url, SHARE_MEDIA media, final ShareCallback callback) {
+//        SheepApp.getInstance().getNetComponent().getApiService().getShortUrl(url)
+//                .subscribeOn(Schedulers.io())
+//                .observeOn(AndroidSchedulers.mainThread())
+//                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
+//
+//                    @Override
+//                    public void onNext(BaseMessage baseMessage) {
+//                        toShare(activity, title, baseMessage.getData().toString(), title, content, callback);
+//                    }
+//
+//                    @Override
+//                    public void onError(BaseMessage baseMessage) {
+//                        G.shortToast("分享失败");
+//                    }
+//                });
         /* 缩略图 */
         UMImage image = new UMImage(activity, SkinUtil.getAppIcon());
         /* URL */
         UMWeb web = new UMWeb(url);
         /* 标题 */
-        web.setTitle(TextUtils.isEmpty(title) ? "赚钱就来小绵羊" : title);
+        web.setTitle(TextUtils.isEmpty(title) ? "这里是游戏爱好者集结地！" : title);
         web.setThumb(image);
-        web.setDescription(TextUtils.isEmpty(content) ? "更懂你的赚钱工具，超多福利，超多赏金，拿到你手软！" : content);
+        web.setDescription(TextUtils.isEmpty(content) ? "小绵羊APP——一款只发福利的手游神器，注册立送现金红包，赶紧来领取吧＞＞" : content);
         switch (media) {
             case WEIXIN_CIRCLE:
                 web.setTitle(web.getTitle() + "\n" + web.getDescription());

app/src/main/java/com/sheep/gamegroup/util/share/ShareLinkConfig.java

@@ -162,7 +162,7 @@ public class ShareLinkConfig {
     }
 
     public void toShare(Activity activity) {
-        if (link != null && !link.startsWith("http://kfzs.com/") && !link.contains("?")) {
+        if (link != null && !link.startsWith("http://kfzs.com/") && link.contains("?")) {
             SheepApp.getInstance().getNetComponent().getApiService().getShortUrl(link)
                     .subscribeOn(Schedulers.io())
                     .observeOn(AndroidSchedulers.mainThread())

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

@@ -205,7 +205,7 @@ public class GameCertificationActivity extends BaseActivity {
                 break;
             case R.id.change_account_tv:
                 isChangeAccount = true;
-                Jump2View.getInstance().goLoginView(activity, SheepApp.getInstance().getGameCode());
+                Jump2View.getInstance().goLoginViewWithoutFinish(activity, SheepApp.getInstance().getGameCode());
                 break;
             case R.id.change_commit:
                 commitChange();
@@ -218,7 +218,7 @@ public class GameCertificationActivity extends BaseActivity {
         long expiredTime = (Long.parseLong(user.getLast_login_time()) + (15 * 24 * 60 * 60)) * 1000;
         if (expiredTime < System.currentTimeMillis()) {
             Toast.makeText(this, "Token已过期，需要重新登录", Toast.LENGTH_SHORT).show();
-            Jump2View.getInstance().goLoginView(activity, SheepApp.getInstance().getGameCode());
+            Jump2View.getInstance().goLoginViewWithoutFinish(activity, SheepApp.getInstance().getGameCode());
             return;
         }
         loading_view_img.setVisibility(View.VISIBLE);