Bladeren bron

修改个人信息页面,认证车主字体颜色更改

hy 3 jaren geleden
bovenliggende
commit
51d9800fe6

+ 12 - 6
app/src/main/java/com/electric/chargingpile/activity/SkipUserInfoActivity.java

@ -6,6 +6,7 @@ import android.content.Context;
6 6
import android.content.Intent;
7 7
import android.graphics.Bitmap;
8 8
import android.graphics.BitmapFactory;
9
import android.graphics.Color;
9 10
import android.graphics.Matrix;
10 11
import android.net.Uri;
11 12
import android.os.Build;
@ -945,8 +946,9 @@ public class SkipUserInfoActivity extends Activity implements View.OnClickListen
945 946
                e.printStackTrace();
946 947
                loadDialog.dismiss();
947 948
                Toast.makeText(getApplicationContext(), e.getLocalizedMessage(), Toast.LENGTH_SHORT).show();
948
                go_title.setText("认证车主(获得充电优惠)");
949
                go_desc.setText("");
949
                go_title.setText("认证车主");
950
                go_desc.setText("去认证车主(得充电优惠券)");
951
                go_desc.setTextColor(Color.parseColor("#3AB948"));
950 952
                go_cursor.setVisibility(View.VISIBLE);
951 953
            }
952 954
@ -976,16 +978,19 @@ public class SkipUserInfoActivity extends Activity implements View.OnClickListen
976 978
                    if (certificateStatus == 2) {
977 979
                        go_title.setText("认证车主");
978 980
                        go_desc.setText("审核中");
981
                        go_desc.setTextColor(Color.RED);
979 982
                        go_cursor.setVisibility(View.GONE);
980 983
                    } else if (certificateStatus == 3) {
981 984
                        go_title.setText("认证车主");
982 985
                        if (carSeriesEntity != null) {
983 986
                            go_desc.setText(carSeriesEntity.getSeriesName());
984 987
                        }
988
                        go_desc.setTextColor(Color.parseColor("#0E0E0E"));
985 989
                        go_cursor.setVisibility(View.GONE);
986 990
                    } else {
987
                        go_title.setText("认证车主(获得充电优惠)");
988
                        go_desc.setText("");
991
                        go_title.setText("认证车主");
992
                        go_desc.setText("去认证车主(得充电优惠券)");
993
                        go_desc.setTextColor(Color.parseColor("#3AB948"));
989 994
                        go_cursor.setVisibility(View.VISIBLE);
990 995
                    }
991 996
@ -997,8 +1002,9 @@ public class SkipUserInfoActivity extends Activity implements View.OnClickListen
997 1002
                    String rtnMsg = JsonUtils.getKeyResult(response, "rtnMsg");
998 1003
                    Toast.makeText(getApplicationContext(), rtnMsg, Toast.LENGTH_SHORT).show();
999 1004
1000
                    go_title.setText("认证车主(获得充电优惠)");
1001
                    go_desc.setText("");
1005
                    go_title.setText("认证车主");
1006
                    go_desc.setText("去认证车主(得充电优惠券)");
1007
                    go_desc.setTextColor(Color.parseColor("#3AB948"));
1002 1008
                    go_cursor.setVisibility(View.VISIBLE);
1003 1009
                }
1004 1010
            }

+ 12 - 6
app/src/main/java/com/electric/chargingpile/activity/UserInfoActivity.java

@ -7,6 +7,7 @@ import android.content.Intent;
7 7
import android.graphics.Bitmap;
8 8
import android.graphics.BitmapFactory;
9 9
import android.graphics.Canvas;
10
import android.graphics.Color;
10 11
import android.graphics.Matrix;
11 12
import android.graphics.Paint;
12 13
import android.graphics.PorterDuff;
@ -1092,8 +1093,9 @@ public class UserInfoActivity extends Activity implements View.OnClickListener,
1092 1093
                e.printStackTrace();
1093 1094
                loadDialog.dismiss();
1094 1095
                Toast.makeText(getApplicationContext(), e.getLocalizedMessage(), Toast.LENGTH_SHORT).show();
1095
                go_title.setText("认证车主(获得充电优惠)");
1096
                go_desc.setText("");
1096
                go_title.setText("认证车主");
1097
                go_desc.setText("去认证车主(得充电优惠券)");
1098
                go_desc.setTextColor(Color.parseColor("#3AB948"));
1097 1099
                go_cursor.setVisibility(View.VISIBLE);
1098 1100
            }
1099 1101
@ -1123,16 +1125,19 @@ public class UserInfoActivity extends Activity implements View.OnClickListener,
1123 1125
                    if (certificateStatus == 2) {
1124 1126
                        go_title.setText("认证车主");
1125 1127
                        go_desc.setText("审核中");
1128
                        go_desc.setTextColor(Color.RED);
1126 1129
                        go_cursor.setVisibility(View.GONE);
1127 1130
                    } else if (certificateStatus == 3) {
1128 1131
                        go_title.setText("认证车主");
1129 1132
                        if (carSeriesEntity != null) {
1130 1133
                            go_desc.setText(carSeriesEntity.getSeriesName());
1131 1134
                        }
1135
                        go_desc.setTextColor(Color.parseColor("#0E0E0E"));
1132 1136
                        go_cursor.setVisibility(View.GONE);
1133 1137
                    } else {
1134
                        go_title.setText("认证车主(获得充电优惠)");
1135
                        go_desc.setText("");
1138
                        go_title.setText("认证车主");
1139
                        go_desc.setText("去认证车主(得充电优惠券)");
1140
                        go_desc.setTextColor(Color.parseColor("#3AB948"));
1136 1141
                        go_cursor.setVisibility(View.VISIBLE);
1137 1142
                    }
1138 1143
@ -1144,8 +1149,9 @@ public class UserInfoActivity extends Activity implements View.OnClickListener,
1144 1149
                    String rtnMsg = JsonUtils.getKeyResult(response, "rtnMsg");
1145 1150
                    Toast.makeText(getApplicationContext(), rtnMsg, Toast.LENGTH_SHORT).show();
1146 1151
1147
                    go_title.setText("认证车主(获得充电优惠)");
1148
                    go_desc.setText("");
1152
                    go_title.setText("认证车主");
1153
                    go_desc.setText("去认证车主(得充电优惠券)");
1154
                    go_desc.setTextColor(Color.parseColor("#3AB948"));
1149 1155
                    go_cursor.setVisibility(View.VISIBLE);
1150 1156
                }
1151 1157
            }

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

@ -431,7 +431,7 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
431 431
            surfaceHolder.addCallback(this);
432 432
        }
433 433
        //放在此处便于刷新数据
434
        showSettleAccountsDialog();
434
//        showSettleAccountsDialog();
435 435
    }
436 436
437 437
    private int getCurrentOrientation() {