@@ -227,9 +227,9 @@ public class MainActivity extends AppActivity implements | |||
if (!FunHelper.isEmpty(bizContent.SOURCE_TYPE)){//来源类型 | |||
EnumBean.SOURCE_TYPE = (EnumBean[]) bizContent.SOURCE_TYPE.toArray(new EnumBean[bizContent.SOURCE_TYPE.size()]); | |||
} | |||
// if (!FunHelper.isEmpty(bizContent.ID_TYPE)){//用户证件类型枚举 | |||
// EnumBean.ID_TYPE = (EnumBean[]) bizContent.ID_TYPE.toArray(new EnumBean[bizContent.ID_TYPE.size()]); | |||
// } | |||
if (!FunHelper.isEmpty(bizContent.ID_TYPE)){//用户证件类型枚举 | |||
EnumBean.ID_TYPE = (EnumBean[]) bizContent.ID_TYPE.toArray(new EnumBean[bizContent.ID_TYPE.size()]); | |||
} | |||
if (!FunHelper.isEmpty(bizContent.VEHICLE_COLOR_TYPE)){//车牌颜色 | |||
EnumBean.VEHICLE_COLOR = (EnumBean[]) bizContent.VEHICLE_COLOR_TYPE.toArray(new EnumBean[bizContent.VEHICLE_COLOR_TYPE.size()]); | |||
} |
@@ -465,7 +465,29 @@ public class ReleaseVehicleDetailActivity extends AppActivity implements TitleBa | |||
if (detailData.tap != null) { | |||
// 如果有服务器返回的提示信息,使用服务器的 | |||
tipBuilder.append("服务器提示信息:\n"); | |||
tipBuilder.append(detailData.tap.toString()); | |||
// 处理服务器返回的提示信息 | |||
String tapStr = detailData.tap.toString(); | |||
if (tapStr.startsWith("[") && tapStr.endsWith("]")) { | |||
// 去掉方括号 | |||
tapStr = tapStr.substring(1, tapStr.length() - 1); | |||
// 按逗号分割并处理每个提示项 | |||
String[] tips = tapStr.split(","); | |||
for (int i = 0; i < tips.length; i++) { | |||
String tip = tips[i].trim(); | |||
// 去掉引号 | |||
if (tip.startsWith("\"") && tip.endsWith("\"")) { | |||
tip = tip.substring(1, tip.length() - 1); | |||
} | |||
tipBuilder.append(tip); | |||
if (i < tips.length - 1) { | |||
tipBuilder.append("\n"); | |||
} | |||
} | |||
} else { | |||
tipBuilder.append(tapStr); | |||
} | |||
} else { | |||
// 使用默认提示信息 | |||
tipBuilder.append("1、当前车辆已在北京发行方发行,请联系北京发行方010-XXXXXXXX进行处理。\n"); | |||
@@ -658,9 +680,9 @@ public class ReleaseVehicleDetailActivity extends AppActivity implements TitleBa | |||
Button closeButton = new Button(this); | |||
closeButton.setText("关闭"); | |||
closeButton.setTextColor(getResources().getColor(R.color.white)); | |||
closeButton.setBackgroundColor(getResources().getColor(R.color.text_gray)); | |||
closeButton.setBackground(getResources().getDrawable(R.drawable.shape_gray_btn)); | |||
closeButton.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, | |||
(int) getResources().getDimension(R.dimen.dp_40))); | |||
(int) getResources().getDimension(R.dimen.dp_45))); | |||
closeButton.setPadding(0, (int) getResources().getDimension(R.dimen.dp_10), 0, (int) getResources().getDimension(R.dimen.dp_10)); | |||
closeButton.setOnClickListener(v -> { | |||
// 关闭弹窗的逻辑 |
@@ -288,6 +288,7 @@ | |||
android:id="@+id/tv_plate_num1" | |||
android:layout_width="@dimen/dp_35" | |||
android:layout_height="@dimen/dp_42" | |||
android:layout_marginStart="@dimen/dp_2" | |||
android:background="@drawable/shape_plate_input_gray" | |||
android:gravity="center" | |||
android:text="1" | |||
@@ -299,6 +300,7 @@ | |||
android:id="@+id/tv_plate_num2" | |||
android:layout_width="@dimen/dp_35" | |||
android:layout_height="@dimen/dp_42" | |||
android:layout_marginStart="@dimen/dp_2" | |||
android:background="@drawable/shape_plate_input_gray" | |||
android:gravity="center" | |||
android:text="0" | |||
@@ -310,6 +312,7 @@ | |||
android:id="@+id/tv_plate_num3" | |||
android:layout_width="@dimen/dp_35" | |||
android:layout_height="@dimen/dp_42" | |||
android:layout_marginStart="@dimen/dp_2" | |||
android:background="@drawable/shape_plate_input_gray" | |||
android:gravity="center" | |||
android:text="0" | |||
@@ -321,6 +324,7 @@ | |||
android:id="@+id/tv_plate_num4" | |||
android:layout_width="@dimen/dp_35" | |||
android:layout_height="@dimen/dp_42" | |||
android:layout_marginStart="@dimen/dp_2" | |||
android:background="@drawable/shape_plate_input_gray" | |||
android:gravity="center" | |||
android:text="2" | |||
@@ -332,6 +336,7 @@ | |||
android:id="@+id/tv_plate_num5" | |||
android:layout_width="@dimen/dp_35" | |||
android:layout_height="@dimen/dp_42" | |||
android:layout_marginStart="@dimen/dp_2" | |||
android:background="@drawable/shape_plate_input_gray" | |||
android:gravity="center" | |||
android:text="2" |