SMT作业增加新功能飞达校验, 修复SMT功能名称错误, 修复飞达校验列表只显示一条问题, 去除多余功能,调整飞达校验接口逻辑

app/build.gradle

@@ -41,7 +41,7 @@ android {
             if (outputFile != null && outputFile.name.endsWith('.apk')) {
                 if (variant.buildType.name.equals('release')) {
                     def releaseInfo = getVersionName()
-                    fileName = "微浦_WMS_Workshop_RELEASE_${releaseInfo}.apk"
+                    fileName = "微浦_UAS_Workshop_RELEASE_${releaseInfo}.apk"
                 } else if (variant.buildType.name.equals('debug')) {
                     def debugInfo = getVersionName()
                     fileName = "UAS_PDA_WANLIDA_DEBUG_${debugInfo}.apk"

app/src/main/java/com/uas/pda_wps/adapter/FeidaCalibrationAda.java

@@ -0,0 +1,79 @@
+package com.uas.pda_wps.adapter;
+
+import android.content.Context;
+import android.os.Handler;
+import android.support.annotation.NonNull;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import com.uas.pda_wps.R;
+import com.uas.pda_wps.bean.FeidaCalibrationBean;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class FeidaCalibrationAda extends  RecyclerView.Adapter<FeidaCalibrationAda.ViewHolder> {
+
+    private List<FeidaCalibrationBean> objects = new ArrayList<FeidaCalibrationBean>();
+
+    private Context context;
+    private LayoutInflater layoutInflater;
+    private Handler mHandler;
+
+    public FeidaCalibrationAda(Context context,List<FeidaCalibrationBean> objects) {
+        this.context = context;
+        this.layoutInflater = LayoutInflater.from(context);
+        this.objects = objects;
+    }
+
+    /**
+     * 初始化布局文件
+     * @param parent
+     * @param viewType
+     * @return
+     */
+    @NonNull
+    @Override
+    public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View root_view = LayoutInflater.from(context)
+                .inflate(R.layout.item_feida_calibration, parent, false);
+        return new ViewHolder(root_view);
+    }
+
+    /**
+     * 设置每个列表项的显示内容
+     * @param holder
+     * @param position
+     */
+    @Override
+    public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
+        FeidaCalibrationBean feidaCalibrationBean = objects.get(position);
+        holder.tv_text.setText("飞达:" + feidaCalibrationBean.getDSL_FECODE() + " ,站位:" + feidaCalibrationBean.getDSL_LOCATION());
+    }
+
+    /**
+     * 获取列表项个数
+     * @return
+     */
+    @Override
+    public int getItemCount() {
+        return objects.size();
+    }
+
+    /**
+     * 布局容器
+     */
+    public class ViewHolder extends RecyclerView.ViewHolder {
+        TextView tv_text;
+
+        public ViewHolder(@NonNull View itemView) {
+            super(itemView);
+            tv_text = itemView.findViewById(R.id.tv_text);
+        }
+    }
+
+
+}

app/src/main/java/com/uas/pda_wps/adapter/FeidaCalibrationAdapter.java

@@ -0,0 +1,25 @@
+package com.uas.pda_wps.adapter;
+
+import android.support.annotation.Nullable;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.uas.pda_wps.R;
+import com.uas.pda_wps.bean.FeidaCalibrationBean;
+import com.uas.pda_wps.util.MyLog;
+
+import java.util.List;
+
+public class FeidaCalibrationAdapter extends BaseQuickAdapter<FeidaCalibrationBean, BaseViewHolder> {
+
+    public FeidaCalibrationAdapter(@Nullable  List<FeidaCalibrationBean> data) {
+        super(R.layout.item_feida_calibration, data);
+    }
+
+    @Override
+    protected void convert(BaseViewHolder helper, FeidaCalibrationBean item) {
+        //飞达：xxx  ,站位:xxx
+        helper.setText(R.id.tv_text, "飞达:" + item.getDSL_FECODE() + " ,站位:" + item.getDSL_LOCATION());
+        MyLog.e("aaa","展示的数据是:" + "飞达:" + item.getDSL_FECODE() + " ,站位:" + item.getDSL_LOCATION());
+    }
+}

app/src/main/java/com/uas/pda_wps/bean/FeidaCalibrationBean.java

@@ -0,0 +1,27 @@
+package com.uas.pda_wps.bean;
+
+public
+        /**
+         * Created by sw on 2026-08-19
+         */
+class FeidaCalibrationBean {
+
+    private String DSL_LOCATION;    //站位
+    private String DSL_FECODE;      //飞达
+
+    public String getDSL_LOCATION() {
+        return DSL_LOCATION;
+    }
+
+    public void setDSL_LOCATION(String DSL_LOCATION) {
+        this.DSL_LOCATION = DSL_LOCATION;
+    }
+
+    public String getDSL_FECODE() {
+        return DSL_FECODE;
+    }
+
+    public void setDSL_FECODE(String DSL_FECODE) {
+        this.DSL_FECODE = DSL_FECODE;
+    }
+}

app/src/main/java/com/uas/pda_wps/fragment/FeidaCalibrationFra.java

@@ -0,0 +1,239 @@
+package com.uas.pda_wps.fragment;
+
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
+import android.view.KeyEvent;
+import android.view.inputmethod.EditorInfo;
+import android.widget.TextView;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.android.volley.Request;
+import com.uas.pda_wps.R;
+import com.uas.pda_wps.activity.FunctionActivity;
+import com.uas.pda_wps.adapter.FeidaCalibrationAdapter;
+import com.uas.pda_wps.application.PdaApplication;
+import com.uas.pda_wps.bean.FeidaCalibrationBean;
+import com.uas.pda_wps.bean.LineInfoBean;
+import com.uas.pda_wps.global.GloableParams;
+import com.uas.pda_wps.util.CommonUtil;
+import com.uas.pda_wps.util.Constants;
+import com.uas.pda_wps.util.FastjsonUtil;
+import com.uas.pda_wps.util.HttpCallback;
+import com.uas.pda_wps.util.HttpParams;
+import com.uas.pda_wps.util.VolleyRequest;
+import com.uas.pda_wps.view.ClearableEditText;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 飞达校验
+ */
+public class FeidaCalibrationFra extends BaseFragment {
+
+    private TextView tv_xianbie, tv_banmian, tv_gongdanbianhao, tv_not_jiaoyan;
+    private LineInfoBean mLineInfoBean;
+    String deviceLineMake = "";
+    private ClearableEditText cet_feida_bianhao;
+    private RecyclerView rv_not_cailibration;
+    private List<FeidaCalibrationBean> fidaCailibrationBeans;
+    private FeidaCalibrationAdapter feidaCalibrationAdapter;
+//    private FeidaCalibrationAda feidaCalibrationAdapter;
+
+    @Override
+    protected int getLayout() {
+        return R.layout.frag_fada_calibration;
+    }
+
+    @Override
+    protected void initViews() {
+        tv_xianbie = (TextView) root.findViewById(R.id.tv_xianbie);
+        tv_banmian = (TextView) root.findViewById(R.id.tv_banmian);
+        tv_gongdanbianhao = (TextView) root.findViewById(R.id.tv_gongdanbianhao);
+        tv_not_jiaoyan = (TextView) root.findViewById(R.id.tv_not_jiaoyan);
+        rv_not_cailibration = (RecyclerView) root.findViewById(R.id.rv_not_cailibration);
+
+        cet_feida_bianhao = (ClearableEditText) root.findViewById(R.id.cet_feida_bianhao);
+        cet_feida_bianhao.requestFocus();
+
+        mLineInfoBean = (LineInfoBean) PdaApplication.getDataCacheFromMap(Constants.FLAG.SMT_DEVICE_LINE_CACHE);
+        if (mLineInfoBean != null) {
+            deviceLineMake = JSON.toJSONString(mLineInfoBean);
+        }
+    }
+
+    @Override
+    protected void initEvents() {
+        cet_feida_bianhao.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+            @Override
+            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+                String collect = v.getText().toString().trim();
+                if (!TextUtils.isEmpty(collect)) {
+                    if (actionId == EditorInfo.IME_ACTION_DONE
+                            || actionId == EditorInfo.IME_ACTION_SEND
+                            || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                        confirmEvent(collect);
+                        return true;
+                    }
+                }
+                return false;
+            }
+        });
+    }
+
+    @Override
+    protected void initDatas() {
+        ((TextView) (getActivity().findViewById(R.id.tv_actionbar_withback))).setText("飞达校验");
+
+        if (mLineInfoBean != null) {
+            tv_xianbie.setText(mLineInfoBean.getDL_LINECODE());
+            tv_banmian.setText(mLineInfoBean.getDL_TABLE() + "面");
+            tv_gongdanbianhao.setText(mLineInfoBean.getDL_MACODE());
+        }
+
+        rv_not_cailibration.setLayoutManager(new LinearLayoutManager(mActivity));
+        fidaCailibrationBeans = new ArrayList<>();
+        feidaCalibrationAdapter = new FeidaCalibrationAdapter(fidaCailibrationBeans);
+//        feidaCalibrationAdapter = new FeidaCalibrationAda(getActivity(), fidaCailibrationBeans);
+        rv_not_cailibration.setAdapter(feidaCalibrationAdapter);
+
+        getUncheckLocation();
+    }
+
+    /**
+     * 获取未校验站位
+     */
+    private void getUncheckLocation() {
+        progressDialog.show();
+        VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
+                .url(GloableParams.ADDRESS_SMT_QUAGETUNCHECKFEEDER)
+                .method(Request.Method.GET)
+                .addParam("linecode", (mLineInfoBean == null ? "" : mLineInfoBean.getDL_LINECODE()))
+                .addParam("table", (mLineInfoBean == null ? "" : mLineInfoBean.getDL_TABLE()))
+                .build(), new HttpCallback() {
+            @Override
+            public void onSuccess(int flag, Object o) throws Exception {
+                progressDialog.dismiss();
+                try {
+                    String result = o.toString();
+                    if (FastjsonUtil.validate(result)) {
+                        JSONObject resultObject = JSON.parseObject(result);
+                        JSONObject dataObject = resultObject.getJSONObject("data");
+
+                        String NotCheckCount = dataObject.getString("NotCheckCount");
+                        JSONArray dataArray = dataObject.getJSONArray("NotCheckFeeder");
+                        fidaCailibrationBeans.clear();
+                        if (dataArray != null && dataArray.size() > 0) {
+                            tv_not_jiaoyan.setTextColor(getResources().getColor(R.color.green));
+                            tv_not_jiaoyan.setText("未校验飞达 " + NotCheckCount + "条");
+                            for (int i = 0; i < dataArray.size(); i++) {
+                                JSONObject jb = dataArray.getJSONObject(i);
+                                FeidaCalibrationBean feidaCalibrationBean = new FeidaCalibrationBean();
+                                String dsl_location = jb.getString("DSL_LOCATION");
+                                String dsl_fecode = jb.getString("DSL_FECODE");
+                                feidaCalibrationBean.setDSL_LOCATION(dsl_location);
+                                feidaCalibrationBean.setDSL_FECODE(dsl_fecode);
+                                fidaCailibrationBeans.add(feidaCalibrationBean);
+                            }
+                        }else {
+                            tv_not_jiaoyan.setTextColor(getResources().getColor(R.color.green));
+                            tv_not_jiaoyan.setText("无未校验数据");
+                        }
+                        feidaCalibrationAdapter.notifyDataSetChanged();
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+
+            @Override
+            public void onFail(int flag, String failStr) throws Exception {
+                progressDialog.dismiss();
+                cet_feida_bianhao.setText("");
+                cet_feida_bianhao.requestFocus();
+                tv_not_jiaoyan.setTextColor(getResources().getColor(R.color.red));
+                tv_not_jiaoyan.setText(failStr);
+                CommonUtil.toastNoRepeat(mActivity, failStr);
+            }
+        });
+    }
+
+    private void confirmEvent(final String collect) {
+        progressDialog.show();
+        VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
+                .url(GloableParams.ADDRESS_SMT_QUACHECKFEEDERDATA)
+                .method(Request.Method.POST)
+                .addParam("deviceLineMake", deviceLineMake)
+                .addParam("fe_code", collect)
+                .build(), new HttpCallback() {
+            @Override
+            public void onSuccess(int flag, Object o) throws Exception {
+                progressDialog.dismiss();
+                try {
+                    String result = o.toString();
+                    cet_feida_bianhao.setText("");
+                    cet_feida_bianhao.requestFocus();
+                    if (FastjsonUtil.validate(result)) {
+                        JSONObject resultObject = JSON.parseObject(result);
+                        JSONObject dataObject = resultObject.getJSONObject("data");
+
+                        String NotCheckCount = dataObject.getString("NotCheckCount");
+                        JSONArray dataArray = dataObject.getJSONArray("NotCheckFeeder");
+                        fidaCailibrationBeans.clear();
+                        if (dataArray != null && dataArray.size() > 0) {
+                            tv_not_jiaoyan.setTextColor(getResources().getColor(R.color.green));
+                            tv_not_jiaoyan.setText("未校验飞达 " + NotCheckCount + "条");
+                            for (int i = 0; i < dataArray.size(); i++) {
+                                JSONObject jb = dataArray.getJSONObject(i);
+                                FeidaCalibrationBean feidaCalibrationBean = new FeidaCalibrationBean();
+                                String dsl_location = jb.getString("DSL_LOCATION");
+                                String dsl_fecode = jb.getString("DSL_FECODE");
+                                feidaCalibrationBean.setDSL_LOCATION(dsl_location);
+                                feidaCalibrationBean.setDSL_FECODE(dsl_fecode);
+                                fidaCailibrationBeans.add(feidaCalibrationBean);
+                            }
+                        }else {
+                            tv_not_jiaoyan.setTextColor(getResources().getColor(R.color.green));
+                            tv_not_jiaoyan.setText("无未校验数据");
+                        }
+                        feidaCalibrationAdapter.notifyDataSetChanged();
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+
+            @Override
+            public void onFail(int flag, String failStr) throws Exception {
+                progressDialog.dismiss();
+                cet_feida_bianhao.setText("");
+                cet_feida_bianhao.requestFocus();
+                tv_not_jiaoyan.setTextColor(getResources().getColor(R.color.red));
+                tv_not_jiaoyan.setText(failStr);
+                CommonUtil.toastNoRepeat(mActivity, failStr);
+            }
+        });
+
+    }
+
+    @Override
+    public void onHiddenChanged(boolean hidden) {
+        super.onHiddenChanged(hidden);
+        if (!hidden) {
+            FunctionActivity.setTitle("飞达校验");
+        } else { }
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        return false;
+    }
+
+    @Override
+    public boolean onFragmentBackPressed() {
+        return false;
+    }
+}

app/src/main/java/com/uas/pda_wps/fragment/SCSMTIndexFragment.java

@@ -335,6 +335,11 @@ public class SCSMTIndexFragment extends BaseFragment implements AdapterView.OnIt
                         fragment = new SMTMaterialPreparation();
                         FragmentUtils.switchFragment(this, fragment);
                         break;
+                        //飞达校验
+                    case GloableParams.LISTNAME_FEIDA_CALIBRATION:
+                        fragment = new FeidaCalibrationFra();
+                        FragmentUtils.switchFragment(this, fragment);
+                        break;
                 }
             }
 

app/src/main/java/com/uas/pda_wps/global/GloableParams.java

@@ -264,7 +264,8 @@ public class GloableParams {
 
     public static String ADDRESS_QUA_CHECKLOC;      //校验和品质套料 采集栏--站位校验--实时校验
 
-
+    public static String ADDRESS_SMT_QUAGETUNCHECKFEEDER;
+    public static String ADDRESS_SMT_QUACHECKFEEDERDATA;
 
 
     //连接服务器请求地址
@@ -555,6 +556,14 @@ public class GloableParams {
     //校验和品质套料 采集栏--站位校验--实时校验
     private static final String ADDRESSTAIL_QUA_CHECKLOC = "/api/pda/smt/quaCheckLoc.action";
 
+    //飞达校验-->获取校验数据
+    private static final String ADDRESSTAIL_SMT_QUAGETUNCHECKFEEDER = "/api/pda/smt/quaGetUnCheckFeeder.action";
+    //飞达校验-->Enter校验
+    private static final String ADDRESSTAIL_SMT_QUACHECKFEEDERDATA = "/api/pda/smt/quaCheckFeederData.action";
+
+
+
+
     /**
      * 材料入库
      */
@@ -811,6 +820,7 @@ public class GloableParams {
     public static final String LISTNAME_FEEDER_UNBIND = "飞达料盘解绑";
 //    public static final String LISTNAME_FEEDER_CHECKINSPECTION = "复检校验";
     public static final String LISTNAME_QUALITY_VERIFICATION = "品质套料";
+    public static final String LISTNAME_FEIDA_CALIBRATION = "飞达校验";
 
     public static final String[] feederListNames = {
             LISTNAME_FEEDER_IN, LISTNAME_FEEDER_JOIN,  LISTNAME_FEEDER_DOWN,
@@ -820,6 +830,7 @@ public class GloableParams {
             LISTNAME_FEEDER_UNBIND,
 //            LISTNAME_FEEDER_CHECKINSPECTION
             LISTNAME_QUALITY_VERIFICATION,
+            LISTNAME_FEIDA_CALIBRATION
     };
 
     public static final int[] feederListImgs = {R.drawable.index_smt_up, R.drawable.index_smt_joint,
@@ -830,7 +841,8 @@ public class GloableParams {
             R.drawable.index_location_query, R.drawable.index_prematerial_query,
             R.drawable.index_prematerial_query, R.drawable.index_smt_query,
 //            R.drawable.index_smt_check,
-            R.drawable.index_smt_check
+            R.drawable.index_smt_check,
+            R.drawable.feidajiaoyan
     };
 
     //-->SMT备料
@@ -1187,6 +1199,8 @@ public class GloableParams {
 
         GloableParams.ADDRESS_QUA_CHECKLOC = uriHead + GloableParams.ADDRESSTAIL_QUA_CHECKLOC;
 
+        GloableParams.ADDRESS_SMT_QUAGETUNCHECKFEEDER = uriHead + GloableParams.ADDRESSTAIL_SMT_QUAGETUNCHECKFEEDER;
+        GloableParams.ADDRESS_SMT_QUACHECKFEEDERDATA = uriHead + GloableParams.ADDRESSTAIL_SMT_QUACHECKFEEDERDATA;
 
     }
 }

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

@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:padding="10dp">
+
+        <TextView
+            android:id="@+id/tv_xianbie"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:gravity="center_vertical"
+            android:textSize="@dimen/textsize_16"
+            tools:text="LINE01" />
+
+        <TextView
+            android:id="@+id/tv_banmian"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="10dp"
+            android:layout_weight="1"
+            android:gravity="center_vertical"
+            android:textSize="@dimen/textsize_16"
+            tools:text="A面" />
+
+        <TextView
+            android:id="@+id/tv_gongdanbianhao"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="10dp"
+            android:layout_weight="2"
+            android:gravity="center_vertical"
+            android:textSize="@dimen/textsize_16"
+            tools:text="BZBD2308943434434" />
+
+    </LinearLayout>
+
+    <View style="@style/view_gray_line" />
+
+    <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_marginTop="3dp"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+       >
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="horizontal">
+
+                <TextView
+                    style="@style/tl_tv_style"
+                    android:layout_height="match_parent"
+                    android:gravity="center"
+                    android:paddingLeft="20dp"
+                    android:paddingRight="20dp"
+                    android:text="飞达编号"
+                    android:textColor="@color/body_text_1"
+                    android:textSize="16sp" />
+
+                <com.uas.pda_wps.view.ClearableEditText
+                    android:id="@+id/cet_feida_bianhao"
+                    android:layout_width="match_parent"
+                    android:layout_height="40dp"
+                    style="@style/Table_li_right"
+                    android:background="@drawable/bg_line_edittext"
+                    android:layout_marginRight="16dp"
+                    android:textColor="@color/black"
+                    />
+
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/tv_not_jiaoyan"
+                android:layout_marginTop="3dp"
+                android:layout_marginBottom="3dp"
+                android:layout_marginStart="16dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="14sp"
+                android:textColor="@color/red"
+                tools:text="未校验飞达XX条"
+                />
+
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/rv_not_cailibration"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginBottom="3dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                />
+
+
+        </LinearLayout>
+
+
+    </ScrollView>
+
+
+
+</LinearLayout>

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

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    >
+
+    <TextView
+        android:id="@+id/tv_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="6dp"
+        android:textColor="@color/green"
+        android:textSize="14sp"
+        tools:text="功能名称" />
+
+</LinearLayout>

build.gradle

@@ -50,8 +50,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 22,
-            versionName      : "v1.2.1"
+            versionCode      : 24,
+            versionName      : "v1.2.3"
     ]
 
     depsVersion = [