增加 - 颜色、弹窗判断

app/build.gradle

@@ -10,8 +10,8 @@ android {
         applicationId "com.example.aucma_mes"
         minSdk 24
         targetSdk 33
-        versionCode 13
-        versionName "1.13"
+        versionCode 15
+        versionName "1.15"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/java/com/example/aucma_mes/CheckActivity.java

@@ -37,6 +37,7 @@ import com.lzy.okgo.request.base.Request;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
 import okhttp3.RequestBody;
 
@@ -121,13 +122,18 @@ public class CheckActivity extends BaseActivity implements CheckAdapter.CheckIte
                             checkViewModel.setName(result.getMsg());
                             topDefects = gson.fromJson(gson.toJson(result.getData()), new TypeToken<List<DefectBeen>>() {
                             }.getType());
-                            if (topDefects == null || topDefects.isEmpty()) {
+                            if (topDefects == null || topDefects.isEmpty() ) {
                                 Toast.makeText(CheckActivity.this, "本工位无需检查返修情况", Toast.LENGTH_SHORT).show();
                                 return;
                             }
                             checkViewModel.setButtonVisbleState(true);
                             tipDialog.setList(topDefects);
-                            tipDialog.show();
+                            Optional<Boolean> checkState = topDefects.stream().findFirst().map(item -> !item.getQualityDefectName().equals("完成"));
+
+                            if (checkState.get()){
+                                tipDialog.show();
+                            }
+
 
                     /*// 直接添加提交数据中submitList.addAll(defectBeens);
                     checkAdapter.notifyDataSetChanged();*/
@@ -151,8 +157,9 @@ public class CheckActivity extends BaseActivity implements CheckAdapter.CheckIte
 
 
     public void checkSubmint1(View view) {
-        sanInfo("B24031483025025351528");
-    } // 提交
+        sanInfo(binding.checkTeskCode.getText().toString());
+    }
+    // 提交
     public void checkSubmint(View view) {
         if (checkViewModel.getName() == null || checkViewModel.getName().isEmpty()) return;
         checkViewModel.setList(submitList);

app/src/main/java/com/example/aucma_mes/MainActivity.java

@@ -48,7 +48,7 @@ public class MainActivity extends BaseActivity {
         String loginName = SharedPreferencesUtils.getstring("loginName", "");
         user = new User();
         user.setUsername(loginName);
-        user.setPassword("123456");
+        user.setPassword(SharedPreferencesUtils.getstring("password", "123456"));
         getSupportActionBar().hide();   // 隐藏原生标题栏
         binding.setUser(user);
         OkGo.<Result>get(url + "/base/teamMembers/getTeamMemberList").tag(this)
@@ -181,6 +181,7 @@ public class MainActivity extends BaseActivity {
                     intent.putExtra("role", loginBack.getRoles());
                     intent.putExtra("info", body);
                     SharedPreferencesUtils.putstring("loginName", user.username);
+                    SharedPreferencesUtils.putstring("password", user.password);
                     SharedPreferencesUtils.putstring("teamCode", user.getTeamCode());
                     SharedPreferencesUtils.putstring("teamName", user.getTeamName());
                     SharedPreferencesUtils.putstring("token", token);

app/src/main/java/com/example/aucma_mes/adapter/RepaitSubmintInfoAdapter.java

@@ -56,13 +56,13 @@ public class RepaitSubmintInfoAdapter extends RecyclerView.Adapter<RepaitSubmint
             databing.itemLinear.setBackgroundColor(context.getResources().getColor(R.color.yellow));
 
         }else if (processResult.equals("KA")){
-            databing.itemLinear.setBackgroundColor(context.getResources().getColor(R.color.red));
+            databing.itemLinear.setBackgroundColor(context.getResources().getColor(R.color.red1));
             defectBeen.setProcessResult("样品机");
         }else if (processResult.equals("未完成")){
             databing.itemLinear.setBackgroundColor(context.getResources().getColor(R.color.item1));
         }else {
             defectBeen.setProcessResult("下返修");
-            databing.itemLinear.setBackgroundColor(context.getResources().getColor(R.color.item1));
+            databing.itemLinear.setBackgroundColor(context.getResources().getColor(R.color.red));
             databing.itemButtom.setOnClickListener(t -> {
                 checkItemClickCall.submintRepair(position);
             });

app/src/main/java/com/example/aucma_mes/base/BaseActivity.java

@@ -26,8 +26,8 @@ import okhttp3.MediaType;
 
 public abstract class BaseActivity extends AppCompatActivity {
     private MyBroad receiver;
-    // public static String url="http://192.168.0.102:8080";
-    public static String url = "http://10.100.72.10:8080";
+    // public static String url="http://192.168.100.100:6061";
+    public static String url = "http://10.100.72.10:8080";//现场IP
     public ProgressDialog dialog;
     public Gson gson;
     public MediaType JSON = MediaType.parse("application/json; charset=utf-8");

app/src/main/res/layout/activity_check.xml

@@ -188,6 +188,11 @@
                 android:onClick="checkSubmint"
                 android:text="提交" />
 
+            <EditText
+                android:id="@+id/check_tesk_code"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:visibility="gone"/>
 
             <Button
                 style="@style/button_true_style"
@@ -195,9 +200,10 @@
                 android:layout_height="40dp"
                 android:layout_marginTop="5dp"
                 android:layout_marginLeft="20dp"
+                android:visibility="gone"
                 android:layout_marginRight="20dp"
                 android:onClick="checkSubmint1"
-                android:visibility="gone"
+
                 android:text="test" />
 
 

app/src/main/res/layout/dialog_repair_submint_info.xml

@@ -32,10 +32,10 @@
 
         <Button
             android:id="@+id/dialog_repair_submintbutton"
-            android:layout_margin="10dp"
             style="@style/button_true_style"
             android:layout_width="match_parent"
             android:layout_height="45dp"
+            android:layout_margin="10dp"
             android:text="完成" />
     </LinearLayout>
 </layout>

app/src/main/res/values/colors.xml

@@ -13,5 +13,6 @@
     <color name="blue">#377CF9</color>
     <color name="item1">#DEE3E6</color>
     <color name="red">#6AFF5722</color>
+    <color name="red1">#FF6D00</color>
     <color name="yellow">#FFEB3B</color>
 </resources>