ソースを参照

崩溃bug修复

huyuguo 5 年 前
コミット
fa99484008

+ 14 - 12
app/src/main/java/com/electric/chargingpile/activity/UserCenterActivity.java

@ -1589,18 +1589,20 @@ public class UserCenterActivity extends Activity implements View.OnClickListener
1589 1589
                    }
1590 1590
                    String grow_score_info = JsonUtils.getKeyResult(rtnMsg, "grow_score_info");
1591 1591
                    String name = JsonUtils.getKeyResult(grow_score_info, "name");
1592
                    if (name.equals("普通")) {
1593
                        iv_qiandao.setImageResource(R.drawable.icon_center_putong);
1594
                    } else if (name.equals("青铜")) {
1595
                        iv_qiandao.setImageResource(R.drawable.icon_center_qingtong);
1596
                    } else if (name.equals("白银")) {
1597
                        iv_qiandao.setImageResource(R.drawable.icon_center_baiyin);
1598
                    } else if (name.equals("黄金")) {
1599
                        iv_qiandao.setImageResource(R.drawable.icon_center_huangjin);
1600
                    } else if (name.equals("铂金")) {
1601
                        iv_qiandao.setImageResource(R.drawable.icon_senter_bojin);
1602
                    } else if (name.equals("钻石")) {
1603
                        iv_qiandao.setImageResource(R.drawable.icon_center_zuanshi);
1592
                    if (name != null) {
1593
                        if (name.equals("普通")) {
1594
                            iv_qiandao.setImageResource(R.drawable.icon_center_putong);
1595
                        } else if (name.equals("青铜")) {
1596
                            iv_qiandao.setImageResource(R.drawable.icon_center_qingtong);
1597
                        } else if (name.equals("白银")) {
1598
                            iv_qiandao.setImageResource(R.drawable.icon_center_baiyin);
1599
                        } else if (name.equals("黄金")) {
1600
                            iv_qiandao.setImageResource(R.drawable.icon_center_huangjin);
1601
                        } else if (name.equals("铂金")) {
1602
                            iv_qiandao.setImageResource(R.drawable.icon_senter_bojin);
1603
                        } else if (name.equals("钻石")) {
1604
                            iv_qiandao.setImageResource(R.drawable.icon_center_zuanshi);
1605
                        }
1604 1606
                    }
1605 1607
                } else {
1606 1608
                    ProfileManager.getInstance().setUsername(getApplicationContext(), "");

+ 1 - 1
zxing/src/main/java/com/google/zxing/client/android/CaptureActivity.java

@ -815,7 +815,7 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
815 815
816 816
        if (resultDurationMS > 0) {
817 817
            String rawResultString = String.valueOf(rawResult);
818
            if (rawResultString.length() > 32) {
818
            if (rawResultString != null && rawResultString.length() > 32) {
819 819
                rawResultString = rawResultString.substring(0, 32) + " ...";
820 820
            }
821 821
//            statusView.setText(getString(resultHandler.getDisplayTitle()) + " : " + rawResultString);