diff --git a/app/src/main/java/com/example/tyre/OutStoreHouseActivity.java b/app/src/main/java/com/example/tyre/OutStoreHouseActivity.java
index 8d26bca..f6cdaa7 100644
--- a/app/src/main/java/com/example/tyre/OutStoreHouseActivity.java
+++ b/app/src/main/java/com/example/tyre/OutStoreHouseActivity.java
@@ -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;
}
diff --git a/app/src/main/java/com/example/tyre/maintenance/base/BaseActivity.java b/app/src/main/java/com/example/tyre/maintenance/base/BaseActivity.java
index d745d32..ba1a7c4 100644
--- a/app/src/main/java/com/example/tyre/maintenance/base/BaseActivity.java
+++ b/app/src/main/java/com/example/tyre/maintenance/base/BaseActivity.java
@@ -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) {
diff --git a/app/src/main/res/layout/activity_home_page.xml b/app/src/main/res/layout/activity_home_page.xml
index 745617b..9628cb5 100644
--- a/app/src/main/res/layout/activity_home_page.xml
+++ b/app/src/main/res/layout/activity_home_page.xml
@@ -27,12 +27,6 @@
android:layout_marginEnd="10dp"
android:orientation="horizontal">
-
-
-->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -140,7 +103,46 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/activity_out_store_house.xml b/app/src/main/res/layout/activity_out_store_house.xml
index 1b5a2eb..80552ef 100644
--- a/app/src/main/res/layout/activity_out_store_house.xml
+++ b/app/src/main/res/layout/activity_out_store_house.xml
@@ -216,13 +216,11 @@
android:text="当前站点:" />
-
+ style="@style/textView_info_style"
+ android:layout_height="match_parent" />