fix:首页功能,出库当前站点

asv2022.3.1
wanghao 18 hours ago
parent 3a6438b659
commit 0bd5b477ad

@ -234,17 +234,14 @@ public class OutStoreHouseActivity extends AppCompatActivity {
ltlb.setText(kind);
String deptNameFromServer = safeGetString(baseTyre.getDeptName()); // 或者 getFactorySite()
String[] siteArray = getResources().getStringArray(R.array.zxzd);
// 遍历数组,寻找与服务器返回数据匹配的站点名称
// 这里假设 baseTyre 返回的是站点名称(如 "光明修理厂"
// 如果返回的是 ID如 200则需要先通过 getDeptId() 反查名称,或者直接根据 ID 逻辑处理
int targetIndex = 0; // 默认选中第一个
String tag = null;
for (int i = 0; i < siteArray.length; i++) {
if (siteArray[i].equals(deptNameFromServer)) {
targetIndex = i;
tag = siteArray[i];
if (tag.equals(deptNameFromServer)) {
break;
}
}
binding.outStoreSiteNow.setSelection(targetIndex);
binding.outStoreSiteNow.setText(tag);
binding.outStoreSiteNow.setBackground(ContextCompat.getDrawable(OutStoreHouseActivity.this, R.drawable.bg_textview_plain));
binding.outStoreSiteNow.setEnabled(false);
currentSpinnerState = STATE_LOCKED;
@ -301,6 +298,8 @@ public class OutStoreHouseActivity extends AppCompatActivity {
return 200;
} else if (name.equals("石岩修理厂")) {
return 201;
}else if (name.equals("运维部门")) {
return 107;
}
return 229;
}

@ -90,8 +90,10 @@ public class BaseActivity extends AppCompatActivity {
return 200;
} else if (name.equals("石岩修理厂")) {
return 201;
}else if (name.equals("运维部门")) {
return 107;
}
return 209;
return 229;
}
public String getTypeCode(String typeName) {

@ -27,12 +27,6 @@
android:layout_marginEnd="10dp"
android:orientation="horizontal">
<RadioButton
android:id="@+id/chaxun"
style="@style/TabRadioButton"
android:drawableTop="@mipmap/icon_home1"
android:text="轮胎信息" />
<RadioButton
android:id="@+id/ruku"
style="@style/TabRadioButton"
@ -64,44 +58,7 @@
<!--/>-->
</RadioGroup>
<RadioGroup
android:id="@+id/homePage_Second"
android:layout_width="match_parent"
android:layout_height="120dp"
android:layout_alignParentBottom="true"
android:layout_marginStart="10dp"
android:layout_marginTop="20dp"
android:layout_marginEnd="10dp"
android:orientation="horizontal">
<RadioButton
android:id="@+id/zhuangxie"
style="@style/TabRadioButton"
android:drawableTop="@mipmap/icon_home4"
android:text="轮胎装车" />
<RadioButton
android:id="@+id/huanwei"
style="@style/TabRadioButton"
android:drawableTop="@mipmap/icon_home5"
android:text="轮胎卸车" />
<RadioButton
android:id="@+id/in_new_system"
style="@style/TabRadioButton"
android:drawableTop="@mipmap/icon_home9"
android:text="维护保养" />
<!-- <RadioButton-->
<!-- android:id="@+id/zhijian"-->
<!-- style="@style/TabRadioButton"-->
<!-- android:text="轮胎质检"-->
<!-- android:drawableTop="@mipmap/check"-->
<!-- />-->
<!--<View-->
<!--style="@style/TabRadioButton" />-->
</RadioGroup>
<RadioGroup
android:id="@+id/homePage_Three"
@ -130,6 +87,12 @@
/>
<RadioButton
android:id="@+id/chaxun"
style="@style/TabRadioButton"
android:drawableTop="@mipmap/icon_home1"
android:text="轮胎信息" />
<!-- <RadioButton-->
<!-- android:id="@+id/test3"-->
@ -140,7 +103,46 @@
<!-- />-->
</RadioGroup>
<RadioGroup
android:id="@+id/homePage_Second"
android:layout_width="match_parent"
android:layout_height="120dp"
android:layout_alignParentBottom="true"
android:layout_marginStart="10dp"
android:layout_marginTop="20dp"
android:layout_marginEnd="10dp"
android:orientation="horizontal">
<RadioButton
android:id="@+id/zhuangxie"
style="@style/TabRadioButton"
android:drawableTop="@mipmap/icon_home4"
android:visibility="gone"
android:text="轮胎装车" />
<RadioButton
android:id="@+id/huanwei"
style="@style/TabRadioButton"
android:drawableTop="@mipmap/icon_home5"
android:visibility="gone"
android:text="轮胎卸车" />
<RadioButton
android:id="@+id/in_new_system"
style="@style/TabRadioButton"
android:drawableTop="@mipmap/icon_home9"
android:text="维护保养" />
<!-- <RadioButton-->
<!-- android:id="@+id/zhijian"-->
<!-- style="@style/TabRadioButton"-->
<!-- android:text="轮胎质检"-->
<!-- android:drawableTop="@mipmap/check"-->
<!-- />-->
<!--<View-->
<!--style="@style/TabRadioButton" />-->
</RadioGroup>
<!--<ImageView-->
<!--android:layout_alignParentBottom="true"-->
<!--android:layout_width="100dp"-->

@ -216,13 +216,11 @@
android:text="当前站点:" />
<Spinner
<TextView
android:id="@+id/out_store_site_now"
android:layout_width="match_parent"
android:layout_height="45dp"
android:background="@drawable/bg_select_grey"
android:entries="@array/zxzd"
android:paddingStart="12dp" />
style="@style/textView_info_style"
android:layout_height="match_parent" />
</LinearLayout>
<LinearLayout
style="@style/layout_t12_s8_style"

Loading…
Cancel
Save