Merge branch 'master' of http://192.168.40.220/dmc/jz_app into master

app/src/main/java/com/huntersun/vkyes/etcopencard/src/other/CodeCountDown.java

@@ -52,7 +52,7 @@ public class CodeCountDown extends CountDownTimer {
     @Override
     public void onFinish() {
         mTextView.setText("重新获取");
-        ColorStateList colors = context.getResources().getColorStateList(R.color.white);
+        ColorStateList colors = context.getResources().getColorStateList(color != 0 ? color : R.color.white);
         mTextView.setTextColor(colors);
         mTextView.setClickable(true);//重新获得点击
         //mTextView.setBackgroundResource(R.drawable.bg_identify_code_normal);  //还原背景色