bugly fixed

app/src/main/java/com/sheep/gamegroup/module/game/activity/ActGameGroupOrGameDetail.java

@@ -362,7 +362,9 @@ public class ActGameGroupOrGameDetail extends BaseActivity {
         mAdapter.add(fgtGameComment, "评价");
         pingJiaIndex = mAdapter.getCount() - 1;
         mAdapter.notifyDataSetChanged();
-        viewPager.setOffscreenPageLimit(mAdapter.getCount());
+        if (viewPager != null) {
+            viewPager.setOffscreenPageLimit(mAdapter.getCount());
+        }
     }
 
     //通过网络获取游戏数据并尝试加载

app/src/main/java/com/sheep/gamegroup/module/login/ChangePasswordAct.java

@@ -20,6 +20,7 @@ import com.sheep.gamegroup.module.login.fragments.NewPasswordFgt;
 import com.sheep.gamegroup.module.login.fragments.NoPhoneTipFgt;
 import com.sheep.gamegroup.module.login.fragments.OldPasswordFgt;
 import com.sheep.gamegroup.module.login.fragments.SignInFgt;
+import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
@@ -49,8 +50,14 @@ public class ChangePasswordAct extends BaseActivity implements ChangePasswordCon
     public void initView() {
         TitleBarUtils.getInstance().setShowOrHide(this, true);
         TitleBarUtils.getInstance().setTitleBack(this).setTitle(this, "设置密码");
-        user = DataUtil.getInstance().getUserEntity();
         mode = getIntent().getIntExtra("mode", -1);
+        CommonUtil.getInstance().getUserInfo(false, (u) -> {
+            user = u;
+            configView();
+        });
+    }
+
+    private void configView() {
         if (mode == MODE_CHANGE) {
             if (user.getSet_password() == 0) {
                 BindAccountFgt fgt = BindAccountFgt.newInstance(this);

app/src/main/java/com/sheep/gamegroup/module/login/LoginAct.java

@@ -111,8 +111,10 @@ public class LoginAct extends BaseUMActivity implements LoginController {
                 getSupportActionBar().show();
             }
         }
-        titleStack.pop();
-        TitleBarUtils.getInstance().setTitle(this, titleStack.peek());
+        if (!titleStack.empty()) {
+            titleStack.pop();
+            TitleBarUtils.getInstance().setTitle(this, titleStack.peek());
+        }
     }
 
     @Override
@@ -141,8 +143,8 @@ public class LoginAct extends BaseUMActivity implements LoginController {
 
     private void getUserInfoFromUM(int platform, final LoginEntity entity) {
         if (platform == LoginController.PLATFORM_WX) {
-            WXAPIUtil.loadWXUserInfo(entity.getOpenid(),entity.getAccesstoken(), (ret, map)->{
-                if(ret){
+            WXAPIUtil.loadWXUserInfo(entity.getOpenid(), entity.getAccesstoken(), (ret, map) -> {
+                if (ret) {
                     entity.getUser().setNickname(map.get("screen_name"));
                     entity.getUser().setAvatar(map.get("profile_image_url"));
                     entity.getUser().setGender("男".equals(map.get("gender")) ? 1 : 2);

app/src/main/java/com/sheep/gamegroup/module/login/fragments/EditUserInfoFgt.java

@@ -169,6 +169,7 @@ public class EditUserInfoFgt extends BaseFragment {
     }
 
     private void submit() {
+        if (nickNameBox == null || birthdayBox == null || genderRadio == null) return;
         final JSONObject json = new JSONObject();
         json.put("nickname", nickNameBox.getText().toString().trim());
         json.put("avatar", mLoginResult.getUser().getAvatar());

app/src/main/java/com/sheep/gamegroup/module/login/fragments/SignInFgt.java

@@ -226,7 +226,9 @@ public class SignInFgt extends AbsLoginFgt {
                         blob = blob.substring(22);
                         byte[] decodedString = Base64.decode(blob, Base64.DEFAULT);
                         Bitmap decodedByte = BitmapFactory.decodeByteArray(decodedString, 0, decodedString.length);
-                        verifyImageView.setImageBitmap(decodedByte);
+                        if (verifyImageView != null) {
+                            verifyImageView.setImageBitmap(decodedByte);
+                        }
                     }
 
                     @Override

app/src/main/java/com/sheep/gamegroup/module/login/fragments/SignUpFgt.java

@@ -208,7 +208,7 @@ public class SignUpFgt extends BaseFragment {
                         }
                         if (loginEty != null) {
                             if (TextUtils.isEmpty(SheepApp.getInstance().getGameCode())) {
-                                SpUtils.saveToken(getActivity(), loginEty.getToken());
+                                SpUtils.saveToken(SheepApp.getInstance(), loginEty.getToken());
                                 DataUtil.getInstance().initUserEntity(loginEty.getUser());
                             }
                             mController.whenLoginSuccess(LoginController.PLATFORM_PHONE, loginEty);

app/src/main/java/com/sheep/gamegroup/module/pay/activity/ActPayPassword.java

@@ -86,6 +86,7 @@ public class ActPayPassword extends BaseContainerActivity {
 
     public static void setPwd(Context context) {
         CommonUtil.getInstance().getUserInfo(SpUtils.getToken(context), (user) -> {
+            if (user == null) return;
             Intent in = new Intent(context, ActPayPassword.class);
             if (TextUtils.isEmpty(user.getMobile())) {
                 in.putExtra("action", ACTION_COMPLETION);
@@ -102,7 +103,7 @@ public class ActPayPassword extends BaseContainerActivity {
 
     public static void verifyPwd(Activity activity, String token, String ext, PayPasswordCallback callback) {
         CommonUtil.getInstance().getUserInfo(token, (user) -> {
-            if (user.hasPayPwd()) {
+            if (user != null && user.hasPayPwd()) {
                 Intent in = new Intent(activity, ActPayPassword.class);
                 in.putExtra("action", ACTION_VERIFY_PAY_PWD);
                 in.putExtra("token", token);

app/src/main/java/com/sheep/gamegroup/module/search/ActSearch.java

@@ -155,8 +155,10 @@ public class ActSearch extends BaseContainerActivity {
         if (hintKeyword != null) {
             TitleBarUtils.getInstance().setSearchHint(ActSearch.this, hintKeyword.getKeyword());
         }
-        addHotView(hotListLayout, hotKeywords);
-        addHistoryView(historyListLayout, historyKeywords);
+        if (hotListLayout != null && historyListLayout != null) {
+            addHotView(hotListLayout, hotKeywords);
+            addHistoryView(historyListLayout, historyKeywords);
+        }
     }
 
     private void addHotView(TagFlowLayout keywordLayout, List<Keyword> keywords) {
@@ -209,11 +211,11 @@ public class ActSearch extends BaseContainerActivity {
             return;
         }
         String inputText = TitleBarUtils.getInstance().getSearchText(this);
-        if(TextUtils.isEmpty(inputText)){
-            if(hintKeyword!=null){
+        if (TextUtils.isEmpty(inputText)) {
+            if (hintKeyword != null) {
                 inputText = hintKeyword.getKeyword();
                 TitleBarUtils.getInstance().setSearchText(ActSearch.this, inputText);
-            } else{
+            } else {
                 return;
             }
         }

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

@@ -44,7 +44,7 @@ public class ActWebX5 extends BaseContainerActivity {
 
     @Override
     public void onBackPressed() {
-        if (!fragment.onBackPressed()) {
+        if (fragment != null && !fragment.onBackPressed()) {
             finish();
         }
     }

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtSmallSheep.java

@@ -1149,7 +1149,8 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
 
     @Override
     public void successSlideshow(BaseMessage baseMessage) {
-        if (this.getActivity().isDestroyed() || this.isDetached()) return;
+        if (this.getActivity() != null && this.getActivity().isDestroyed() || this.isDetached())
+            return;
         boolean isNewData = DataUtil.getInstance().isNewData(ApiKey.slideshow);
         if (isNewData) {
             List<SlideshowEty> slideshowEtyList = baseMessage.getDataList(SlideshowEty.class);
@@ -1190,7 +1191,8 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
 
     @Override
     public void successhomeList(BaseMessage baseMessage) {
-        if (this.getActivity().isDestroyed() || this.isDetached()) return;
+        if (this.getActivity() != null && this.getActivity().isDestroyed() || this.isDetached())
+            return;
         boolean isNewData = DataUtil.getInstance().isNewData(ApiKey.home_list);
         if (isNewData) {
             List<HomeListEntity> homeListEntityList = baseMessage.getDataList(HomeListEntity.class);
@@ -1200,7 +1202,8 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
 
     @Override
     public void failhomeList(BaseMessage baseMessage) {
-        if (this.getActivity().isDestroyed() || this.isDetached()) return;
+        if (this.getActivity() != null && this.getActivity().isDestroyed() || this.isDetached())
+            return;
         ViewUtil.setVisibility(home_list_rv, !homeListList.isEmpty());
         ViewUtil.setVisibility(full_home_list_rv, !fullHomeList.isEmpty());
     }