瀏覽代碼

fix bugs on bugly

billyyoyo 5 年之前
父節點
當前提交
534942f9d6

+ 3 - 0
app/src/main/java/com/sheep/gamegroup/module/game/activity/ActGameGroupOrGameDetail.java

@@ -403,6 +403,9 @@ public class ActGameGroupOrGameDetail extends BaseActivity {
                 .subscribe(new SheepSubscriber<BaseMessage>(this) {
                     @Override
                     public void onNext(BaseMessage baseMessage) {
+                        if (ActGameGroupOrGameDetail.this.isDestroyed()) {
+                            return;
+                        }
                         boolean isNewData = DataUtil.getInstance().isNewData(ApiKey.playGameDetail(id));
                         // todo
                         isNewData = true;

+ 3 - 0
app/src/main/java/com/sheep/gamegroup/module/login/AccountConsistenceAct.java

@@ -86,6 +86,9 @@ public class AccountConsistenceAct extends BaseActivity {
 
     private void getUserInfo(String token, boolean needAsk) {
         CommonUtil.getInstance().getUserInfo(token, (user) -> {
+            if (this.isDestroyed()) {
+                return;
+            }
             if (user != null) {
                 this.user = user;
                 this.resultToken = token;

+ 3 - 1
app/src/main/java/com/sheep/gamegroup/module/login/fragments/EditUserInfoFgt.java

@@ -114,7 +114,9 @@ public class EditUserInfoFgt extends BaseFragment {
         builder.setOnDateSelectedListener(new DatePickerDialog.OnDateSelectedListener() {
             @Override
             public void onDateSelected(int[] dates) {
-                birthdayBox.setText(dates[0] + "-" + (dates[1] > 9 ? dates[1] : ("0" + dates[1])) + "-" + (dates[2] > 9 ? dates[2] : ("0" + dates[2])));
+                if (birthdayBox != null) {
+                    birthdayBox.setText(dates[0] + "-" + (dates[1] > 9 ? dates[1] : ("0" + dates[1])) + "-" + (dates[2] > 9 ? dates[2] : ("0" + dates[2])));
+                }
             }
 
             @Override

+ 6 - 2
app/src/main/java/com/sheep/gamegroup/module/login/fragments/SignInFgt.java

@@ -212,7 +212,9 @@ public class SignInFgt extends AbsLoginFgt {
                             } else {
                                 SpUtils.saveUp(getContext(), loginEty.getUser().getId(), "");
                             }
-                            mController.whenLoginSuccess(LoginController.PLATFORM_ACCOUNT, loginEty);
+                            if (mController != null) {
+                                mController.whenLoginSuccess(LoginController.PLATFORM_ACCOUNT, loginEty);
+                            }
                         }
                     }
                 });
@@ -297,7 +299,9 @@ public class SignInFgt extends AbsLoginFgt {
                                 SpUtils.saveToken(getActivity(), loginEty.getToken());
                                 DataUtil.getInstance().initUserEntity(loginEty.getUser());
                             }
-                            mController.whenLoginSuccess(LoginController.PLATFORM_PHONE, loginEty);
+                            if (mController != null) {
+                                mController.whenLoginSuccess(LoginController.PLATFORM_PHONE, loginEty);
+                            }
                         }
                     }
                 });

+ 7 - 1
app/src/main/java/com/sheep/gamegroup/module/pay/fragment/CheckCaptchaFragment.java

@@ -14,6 +14,7 @@ import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.module.pay.activity.ActPayPassword;
+import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.view.customview.CountDownButton;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
@@ -22,6 +23,7 @@ import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
 
 import org.greenrobot.eventbus.EventBus;
+import org.wysaid.common.Common;
 
 import butterknife.BindView;
 import butterknife.OnClick;
@@ -131,7 +133,11 @@ public class CheckCaptchaFragment extends AbsConfirmFragment {
 
                     @Override
                     public void onNext(BaseMessage baseMessage) {
-                        DataUtil.getInstance().getUserEntity().setHas_pay_pwd(0);
+                        if(DataUtil.getInstance().getUserEntity()!=null) {
+                            DataUtil.getInstance().getUserEntity().setHas_pay_pwd(0);
+                        }else {
+                            CommonUtil.getInstance().getUserInfo(true, (u)->{});
+                        }
                         G.showToast("已关闭支付密码");
                         Intent out = new Intent();
                         out.putExtra("ext", ext);

+ 1 - 0
app/src/main/java/com/sheep/gamegroup/module/pay/fragment/VerifyPayPwdFragment.java

@@ -88,6 +88,7 @@ public class VerifyPayPwdFragment extends AbsConfirmFragment {
 
                     @Override
                     public void onNext(BaseMessage baseMessage) {
+                        if (getActivity() == null) return;
                         Intent out = new Intent();
                         out.putExtra("ext", ext);
                         getActivity().setResult(Activity.RESULT_OK, out);

+ 3 - 0
app/src/main/java/com/sheep/gamegroup/util/CommonUtil.java

@@ -1980,6 +1980,9 @@ public class CommonUtil {
      * @param tabLayout
      */
     public void reflex(final TabLayout tabLayout, final Context context, final boolean reMeasure, int tw) {
+        if (tabLayout == null) {
+            return;
+        }
         //了解源码得知 线的宽度是根据 tabView的宽度来设置的
         tabLayout.post(() -> {
             try {

+ 6 - 0
app/src/main/java/com/sheep/gamegroup/util/ViewUtil.java

@@ -178,6 +178,12 @@ public class ViewUtil {
         return viewUtil;
     }
 
+    public static void setClickable(View view, boolean able) {
+        if (view != null) {
+            view.setClickable(able);
+        }
+    }
+
     public static void showQR(final Activity activity, String link) {
         QR_SHARE.onEvent();
         View dialog_parent = View.inflate(activity, R.layout.dialog_parent, null);

+ 6 - 0
app/src/main/java/com/sheep/gamegroup/view/activity/ActNewbieTaskList.java

@@ -92,6 +92,9 @@ public class ActNewbieTaskList extends BaseActivity {
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
                     @Override
                     public void onNext(BaseMessage baseMessage) {
+                        if (ActNewbieTaskList.this.isDestroyed()) {
+                            return;
+                        }
                         swipe_container.setRefreshing(false);
                         JSONObject json = JSONObject.parseObject(baseMessage.getData().toString());
                         NewbieTaskResult result = new NewbieTaskResult();
@@ -107,6 +110,9 @@ public class ActNewbieTaskList extends BaseActivity {
 
                     @Override
                     public void onError(BaseMessage baseMessage) {
+                        if (ActNewbieTaskList.this.isDestroyed()) {
+                            return;
+                        }
                         swipe_container.setRefreshing(false);
                         etyList.clear();
                         adp.notifyDataSetChanged();

+ 3 - 1
app/src/main/java/com/sheep/gamegroup/view/activity/ActWebX5.java

@@ -103,7 +103,9 @@ public class ActWebX5 extends BaseContainerActivity implements UMShareListener {
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-        fragment.onActivityResult(requestCode, resultCode, data);
+        if (fragment != null) {
+            fragment.onActivityResult(requestCode, resultCode, data);
+        }
         try {
             UMShareAPI.get(this).onActivityResult(requestCode, resultCode, data);
         } catch (Exception e) {

+ 3 - 0
app/src/main/java/com/sheep/gamegroup/view/activity/RechargeAct.java

@@ -183,6 +183,9 @@ public class RechargeAct extends BaseActivity {
     }
 
     private void configView(String invitationCode, String nickname) {
+        if (sheep_no_view == null || nickname_view == null) {
+            return;
+        }
         sheep_no_view.append(invitationCode);
         nickname_view.append(nickname);
         addDatas();

+ 2 - 2
app/src/main/java/com/sheep/gamegroup/view/adapter/TaskListItemAdp.java

@@ -88,10 +88,10 @@ public class TaskListItemAdp extends BaseAdapter {
         ViewUtil.setText(holder.date_tv, context.getString(R.string.commit_time_point) + TimeUtil.getDate(TimeUtil.FORMAT, NumberFormatUtils.parseLong(ety.getUpdate_time())));
         String stateStr;
         if (ety.getStatus() == 3) {
-            stateStr = String.format(Locale.CHINA, "+%s", ety.getRelease_task().getShowValue(user.isVIP()));
+            stateStr = String.format(Locale.CHINA, "+%s", ety.getRelease_task().getShowValue(user != null && user.isVIP()));
             holder.price_tv.setTextColor(context.getResources().getColor(R.color.txt_red));
         } else {
-            stateStr = String.format(Locale.CHINA, "%s", ety.getRelease_task().getShowValue(user.isVIP()));
+            stateStr = String.format(Locale.CHINA, "%s", ety.getRelease_task().getShowValue(user != null && user.isVIP()));
             holder.price_tv.setTextColor(context.getResources().getColor(R.color.time_created));
         }
         CommonUtil.getInstance().setTaskTag(context, convertView, ety.getRelease_task(), CommonUtil.TASK_AUDIT);

+ 5 - 6
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtPersonalCenter.java

@@ -395,21 +395,20 @@ public class FgtPersonalCenter extends BaseFragment {
     private void initWidget() {
         ViewUtil.setVisibility(shop_assist_layout, userEntity.isShopAssist());
         ViewUtil.setVisibility(fgt_pc_item_shop_assist_v, userEntity.isShopAssist());
-        personalcenter_item_price_tv.setText(String.format(Locale.CHINA, "%s\u0020元", NumberFormatUtils.retainMost2W(userEntity.getBalance())));
+        ViewUtil.setText(personalcenter_item_price_tv, String.format(Locale.CHINA, "%s\u0020元", NumberFormatUtils.retainMost2W(userEntity.getBalance())));
         ViewUtil.setText(nameTv, userEntity.getNickname());
-        sheepNumTv.setText(String.format(Locale.CHINA, "绵羊号:%s", userEntity.getInvitation_code()));
+        ViewUtil.setText(sheepNumTv, String.format(Locale.CHINA, "绵羊号:%s", userEntity.getInvitation_code()));
         GlideImageLoader.setAvatar(iconImgIv, userEntity.getAvatar(), Color.argb(128, 255, 255, 255));
-
         ViewUtil.setImageRes(vipFlagView, (userEntity.isVIP() ? R.mipmap.level_vip : R.mipmap.level_vip_un));
         ViewUtil.setText(vipTipView, userEntity.getVIPInfo().toString());
         ViewUtil.setVisibility(beVipBtn, !userEntity.isVIP());
         ViewUtil.setVisibility(vipTipView, userEntity.isVIP());
         if (TextUtils.isEmpty(userEntity.getUser_name())) {
             ViewUtil.setText(loginNameTv, "登录账号: 去设置>");
-            loginNameTv.setClickable(true);
+            ViewUtil.setClickable(loginNameTv, true);
         } else {
             ViewUtil.setText(loginNameTv, "登录账号: " + userEntity.getUser_name());
-            loginNameTv.setClickable(false);
+            ViewUtil.setClickable(loginNameTv, false);
         }
 
         ViewUtil.setVisibility(voucher_red_dot, SpUtils.isVoucherFirst());
@@ -631,7 +630,7 @@ public class FgtPersonalCenter extends BaseFragment {
                 EventBus.getDefault().post(new PersonVoucherClickEvent());
                 break;
             case R.id.login_name_tv:
-                if (userEntity.getSet_password() == 0) {
+                if (userEntity != null && userEntity.getSet_password() == 0) {
                     Jump2View.getInstance().goChangePassword(getActivity());
                 } else {
                     G.shortToast("设置登录密码后不可修改登录名");