修改SMT接料勾选是否校验原料盘逻辑,修改功能排序，增加接口信息日志,

app/src/main/java/com/uas/huiyan/activity/ProcessManagementActivity.java

@@ -255,12 +255,16 @@ public class ProcessManagementActivity extends BaseActivity implements AdapterVi
         ct_indexgangwei.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_DONE
-                        || actionId == EditorInfo.IME_ACTION_SEND
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    String data = ct_indexgangwei.getText().toString().trim();
-                    handleCode(data, true);
-                    return true;
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            String data = ct_indexgangwei.getText().toString().trim();
+                            handleCode(data, true);
+                            return true;
+                        default:
+                            return true;
+                    }
                 }
                 return false;
             }
@@ -646,56 +650,58 @@ public class ProcessManagementActivity extends BaseActivity implements AdapterVi
         editadd_et.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_DONE
-                        || actionId == EditorInfo.IME_ACTION_SEND
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    String mSearchStr = editadd_et.getText().toString().trim();
-                    if (!mSearchStr.isEmpty()) {
-                        List<DlMacodesBean> thisList = new ArrayList<>();
-                        for(int i=0;i<ComaddBeanList.size();i++){
-                            if(ComaddBeanList.get(i).getDL_MACODE().contains(mSearchStr)){
-                                thisList.add(ComaddBeanList.get(i));
-                            }
-                            if(i == ComaddBeanList.size() -1){
-                                dlMacodeAdapter = new DlMacodeAdapter(thisList);
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            String mSearchStr = editadd_et.getText().toString().trim();
+                            if (!mSearchStr.isEmpty()) {
+                                List<DlMacodesBean> thisList = new ArrayList<>();
+                                for(int i=0;i<ComaddBeanList.size();i++){
+                                    if(ComaddBeanList.get(i).getDL_MACODE().contains(mSearchStr)){
+                                        thisList.add(ComaddBeanList.get(i));
+                                    }
+                                    if(i == ComaddBeanList.size() -1){
+                                        dlMacodeAdapter = new DlMacodeAdapter(thisList);
+                                        rv_line_add_port_data.setAdapter(dlMacodeAdapter);
+                                        LogUtil.i("mSearchStr", JSON.toJSONString(thisList));
+
+                                    }
+                                    List<DlMacodesBean> lineCodeEntities = dlMacodeAdapter.getmList();
+                                    for (int j = 0; j < lineCodeEntities.size(); j++) {
+                                        lineCodeEntities.get(j).setChecked(false);
+                                    }
+                                    dlMacodeAdapter.notifyDataSetChanged();
+                                }
+                            } else {
+                                dlMacodeAdapter = new DlMacodeAdapter(ComaddBeanList);
                                 rv_line_add_port_data.setAdapter(dlMacodeAdapter);
-                                LogUtil.i("mSearchStr", JSON.toJSONString(thisList));
+                                List<DlMacodesBean> lineCodeEntities = dlMacodeAdapter.getmList();
+                                for (int i = 0; i < lineCodeEntities.size(); i++) {
+                                    lineCodeEntities.get(i).setChecked(false);
+                                }
+                                dlMacodeAdapter.notifyDataSetChanged();
 
                             }
-                            List<DlMacodesBean> lineCodeEntities = dlMacodeAdapter.getmList();
-                            for (int j = 0; j < lineCodeEntities.size(); j++) {
-                                lineCodeEntities.get(j).setChecked(false);
-                            }
-                            dlMacodeAdapter.notifyDataSetChanged();
-                        }
-
-
-                    } else {
-                        dlMacodeAdapter = new DlMacodeAdapter(ComaddBeanList);
-                        rv_line_add_port_data.setAdapter(dlMacodeAdapter);
-                        List<DlMacodesBean> lineCodeEntities = dlMacodeAdapter.getmList();
-                        for (int i = 0; i < lineCodeEntities.size(); i++) {
-                            lineCodeEntities.get(i).setChecked(false);
-                        }
-                        dlMacodeAdapter.notifyDataSetChanged();
-
+                            dlMacodeAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+
+                                @Override
+                                public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                                    List<DlMacodesBean> ipAndPortBeans = dlMacodeAdapter.getmList();
+                                    dl_macodEdata = ipAndPortBeans.get(position).getDL_MACODE();
+                                    dlstr_macodes = ipAndPortBeans.get(position).getDL_MOULDCODE();
+                                    pr_sdetail = ipAndPortBeans.get(position).getPR_DETAIL();
+                                    for (int i = 0; i < ipAndPortBeans.size(); i++) {
+                                        ipAndPortBeans.get(i).setChecked(false);
+                                    }
+                                    ipAndPortBeans.get(position).setChecked(true);
+                                    dlMacodeAdapter.notifyDataSetChanged();
+                                }
+                            });
+                            return true;
+                        default:
+                            return true;
                     }
-                    dlMacodeAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
-
-                        @Override
-                        public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
-                            List<DlMacodesBean> ipAndPortBeans = dlMacodeAdapter.getmList();
-                            dl_macodEdata = ipAndPortBeans.get(position).getDL_MACODE();
-                            dlstr_macodes = ipAndPortBeans.get(position).getDL_MOULDCODE();
-                            pr_sdetail = ipAndPortBeans.get(position).getPR_DETAIL();
-                            for (int i = 0; i < ipAndPortBeans.size(); i++) {
-                                ipAndPortBeans.get(i).setChecked(false);
-                            }
-                            ipAndPortBeans.get(position).setChecked(true);
-                            dlMacodeAdapter.notifyDataSetChanged();
-                        }
-                    });
-                    return true;
                 }
                 return false;
             }
@@ -907,55 +913,55 @@ public class ProcessManagementActivity extends BaseActivity implements AdapterVi
         edit_et.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_DONE
-                        || actionId == EditorInfo.IME_ACTION_SEND
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    String mSearchStr = edit_et.getText().toString().trim();
-                    if (!mSearchStr.isEmpty()) {
-                        List<ComDataBean> thisList = new ArrayList<>();
-                        for(int i=0;i<ComDataBeanList.size();i++){
-                            if(ComDataBeanList.get(i).getItemremark().contains(mSearchStr)||ComDataBeanList.get(i).getItemName().contains(mSearchStr)){
-                                thisList.add(ComDataBeanList.get(i));
-                            }
-                            if(i == ComDataBeanList.size() -1){
-                                ipAndResourcesPortAdapter = new IpAndResourcesPortAdapter(thisList);
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            String mSearchStr = edit_et.getText().toString().trim();
+                            if (!mSearchStr.isEmpty()) {
+                                List<ComDataBean> thisList = new ArrayList<>();
+                                for(int i=0;i<ComDataBeanList.size();i++){
+                                    if(ComDataBeanList.get(i).getItemremark().contains(mSearchStr)||ComDataBeanList.get(i).getItemName().contains(mSearchStr)){
+                                        thisList.add(ComDataBeanList.get(i));
+                                    }
+                                    if(i == ComDataBeanList.size() -1){
+                                        ipAndResourcesPortAdapter = new IpAndResourcesPortAdapter(thisList);
+                                        rv_line_ip_port_data.setAdapter(ipAndResourcesPortAdapter);
+                                        LogUtil.i("mSearchStr", JSON.toJSONString(thisList));
+                                    }
+                                    List<ComDataBean> lineCodeEntities = ipAndResourcesPortAdapter.getmList();
+                                    for (int j = 0; j < lineCodeEntities.size(); j++) {
+                                        lineCodeEntities.get(j).setChecked(false);
+                                    }
+                                    ipAndResourcesPortAdapter.notifyDataSetChanged();
+                                }
+                            } else {
+                                ipAndResourcesPortAdapter = new IpAndResourcesPortAdapter(ComDataBeanList);
                                 rv_line_ip_port_data.setAdapter(ipAndResourcesPortAdapter);
-                                LogUtil.i("mSearchStr", JSON.toJSONString(thisList));
-
-                            }
-                            List<ComDataBean> lineCodeEntities = ipAndResourcesPortAdapter.getmList();
-                            for (int j = 0; j < lineCodeEntities.size(); j++) {
-                                lineCodeEntities.get(j).setChecked(false);
+                                List<ComDataBean> lineCodeEntities = ipAndResourcesPortAdapter.getmList();
+                                for (int i = 0; i < lineCodeEntities.size(); i++) {
+                                    lineCodeEntities.get(i).setChecked(false);
+                                }
+                                ipAndResourcesPortAdapter.notifyDataSetChanged();
                             }
-                            ipAndResourcesPortAdapter.notifyDataSetChanged();
-                        }
-
-
-                    } else {
-                        ipAndResourcesPortAdapter = new IpAndResourcesPortAdapter(ComDataBeanList);
-                        rv_line_ip_port_data.setAdapter(ipAndResourcesPortAdapter);
-                        List<ComDataBean> lineCodeEntities = ipAndResourcesPortAdapter.getmList();
-                        for (int i = 0; i < lineCodeEntities.size(); i++) {
-                            lineCodeEntities.get(i).setChecked(false);
-                        }
-                        ipAndResourcesPortAdapter.notifyDataSetChanged();
-
+                            ipAndResourcesPortAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+
+                                @Override
+                                public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                                    List<ComDataBean> ipAndPortBeans = ipAndResourcesPortAdapter.getmList();
+                                    itemname = ipAndPortBeans.get(position).getItemName();
+                                    itemremark = ipAndPortBeans.get(position).getItemremark();
+                                    for (int i = 0; i < ipAndPortBeans.size(); i++) {
+                                        ipAndPortBeans.get(i).setChecked(false);
+                                    }
+                                    ipAndPortBeans.get(position).setChecked(true);
+                                    ipAndResourcesPortAdapter.notifyDataSetChanged();
+                                }
+                            });
+                            return true;
+                        default:
+                            return true;
                     }
-                    ipAndResourcesPortAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
-
-                        @Override
-                        public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
-                            List<ComDataBean> ipAndPortBeans = ipAndResourcesPortAdapter.getmList();
-                            itemname = ipAndPortBeans.get(position).getItemName();
-                            itemremark = ipAndPortBeans.get(position).getItemremark();
-                            for (int i = 0; i < ipAndPortBeans.size(); i++) {
-                                ipAndPortBeans.get(i).setChecked(false);
-                            }
-                            ipAndPortBeans.get(position).setChecked(true);
-                            ipAndResourcesPortAdapter.notifyDataSetChanged();
-                        }
-                    });
-                    return true;
                 }
                 return false;
             }

app/src/main/java/com/uas/huiyan/application/PdaApplication.java

@@ -12,6 +12,7 @@ import com.facebook.stetho.Stetho;
 import com.uas.huiyan.R;
 import com.uas.huiyan.util.AndroidUtil;
 import com.uas.huiyan.util.FakeX509TrustManager;
+import com.uas.huiyan.util.MyLog;
 import com.uas.huiyan.util.SoundUtil;
 import com.umeng.analytics.MobclickAgent;
 import com.umeng.commonsdk.UMConfigure;
@@ -83,9 +84,16 @@ public class PdaApplication extends Application {
         mSoundMap.put(SoundUtil.SOUND_SALACIA, mSoundPool.load(this, R.raw.salacia, 1));
         mSoundMap.put(SoundUtil.SOUND_TETHYS, mSoundPool.load(this, R.raw.tethys, 1));
         mSoundMap.put(SoundUtil.SOUND_TITAN, mSoundPool.load(this, R.raw.titan, 1));
+
         //友盟统计SDK
         initUmeng();
 
+        //删除非当天的Log日志, Android8.0以下用不了
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            MyLog.delNotDayFile();
+        }else {
+            MyLog.isFileCreatedTodayDel();
+        }
     }
 
     private void initUmeng() {

app/src/main/java/com/uas/huiyan/fragment/BarcodeProdcodeFragment.java

@@ -140,15 +140,18 @@ public class BarcodeProdcodeFragment extends BaseFragment implements View.OnClic
         mSearchEditText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_DONE
-                        || actionId == EditorInfo.IME_ACTION_SEND
-                        || actionId == EditorInfo.IME_ACTION_SEARCH
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    mPage = 1;
-                    mProdcodeItemBeans.clear();
-                    mCondition = mSearchEditText.getText().toString().trim();
-                    getBarStockByProdcode();
-                    return true;
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            mPage = 1;
+                            mProdcodeItemBeans.clear();
+                            mCondition = mSearchEditText.getText().toString().trim();
+                            getBarStockByProdcode();
+                            return true;
+                        default:
+                            return true;
+                    }
                 }
                 return false;
             }

app/src/main/java/com/uas/huiyan/fragment/CaiPiFragment.java

@@ -189,11 +189,15 @@ public class CaiPiFragment extends BaseFragment {
         ed_pihao.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_SEND
-                        || actionId == EditorInfo.IME_ACTION_DONE
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    getPihaoData();
-                    return true;
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            getPihaoData();
+                            return true;
+                        default:
+                            return true;
+                    }
                 }
                 return false;
             }

app/src/main/java/com/uas/huiyan/fragment/FinishedGoodsCollectFragment.java

@@ -261,11 +261,15 @@ public class FinishedGoodsCollectFragment extends BaseFragment implements View.O
         mCollectMsgCet.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_SEND
-                        || actionId == EditorInfo.IME_ACTION_DONE
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    confirmEvent();
-                    return true;
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            confirmEvent();
+                            return true;
+                        default:
+                            return true;
+                    }
                 }
                 return false;
             }

app/src/main/java/com/uas/huiyan/fragment/FinishedGoodsOutCollectFragment.java

@@ -258,11 +258,15 @@ public class FinishedGoodsOutCollectFragment extends BaseFragment implements Vie
         mCollectMsgCet.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_SEND
-                        || actionId == EditorInfo.IME_ACTION_DONE
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    confirmEvent();
-                    return true;
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            confirmEvent();
+                            return true;
+                        default:
+                            return true;
+                    }
                 }
                 return false;
             }

app/src/main/java/com/uas/huiyan/fragment/FinishedGoodsOutFragment.java

@@ -247,31 +247,33 @@ public class FinishedGoodsOutFragment extends BaseFragment implements View.OnCli
         mStorageCompleteTextView.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_SEND
-                        || actionId == EditorInfo.IME_ACTION_SEARCH
-                        || actionId == EditorInfo.IME_ACTION_DONE
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    if (TextUtils.isEmpty(mStorageCompleteTextView.getText().toString().trim())) {
-                        CommonUtil.toastNoRepeat(getActivity(), "请输入出库单号");
-                    } else if (CommonUtil.isStringContainsSpecialChar(mStorageCompleteTextView.getText().toString().trim())) {
-                        CommonUtil.toastNoRepeat(getActivity(), getResources().getString(R.string.barcode_cannot_contain_special));
-                    } else {
-                        //判断单号是否已经存在于变量orders中
-                        boolean isExist = false;
-                        for (int i = 0; i < mFinishedGoodsOutList.size(); i++) {
-                            if ((mFinishedGoodsOutList.get(i).getPI_INOUTNO()).equals(mStorageCompleteTextView.getText().toString().trim())) {
-                                isExist = true;
-                                break;
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            if (TextUtils.isEmpty(mStorageCompleteTextView.getText().toString().trim())) {
+                                CommonUtil.toastNoRepeat(getActivity(), "请输入出库单号");
+                            } else if (CommonUtil.isStringContainsSpecialChar(mStorageCompleteTextView.getText().toString().trim())) {
+                                CommonUtil.toastNoRepeat(getActivity(), getResources().getString(R.string.barcode_cannot_contain_special));
+                            } else {
+                                //判断单号是否已经存在于变量orders中
+                                boolean isExist = false;
+                                for (int i = 0; i < mFinishedGoodsOutList.size(); i++) {
+                                    if ((mFinishedGoodsOutList.get(i).getPI_INOUTNO()).equals(mStorageCompleteTextView.getText().toString().trim())) {
+                                        isExist = true;
+                                        break;
+                                    }
+                                }
+                                if (isExist) {
+                                    Toast.makeText(getActivity(), "单号重复", Toast.LENGTH_SHORT).show();
+                                } else {
+                                    getProdInfoMessage();
+                                }
                             }
-                        }
-
-                        if (isExist) {
-                            Toast.makeText(getActivity(), "单号重复", Toast.LENGTH_SHORT).show();
-                        } else {
-                            getProdInfoMessage();
-                        }
+                            return true;
+                        default:
+                            return true;
                     }
-                    return true;
                 }
                 return false;
             }

app/src/main/java/com/uas/huiyan/fragment/FinishedGoodsStorageFragment.java

@@ -272,34 +272,36 @@ public class FinishedGoodsStorageFragment extends BaseFragment implements View.O
         mStorageNumberActv.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_SEND
-                        || actionId == EditorInfo.IME_ACTION_SEARCH
-                        || actionId == EditorInfo.IME_ACTION_DONE
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    if (TextUtils.isEmpty(mStorageNumberActv.getText().toString().trim())) {
-                        CommonUtil.toastNoRepeat(getActivity(), "请输入入库单号");
-                    } else if (CommonUtil.isStringContainsSpecialChar(mStorageNumberActv.getText().toString().trim())) {
-                        CommonUtil.toastNoRepeat(getActivity(), getResources().getString(R.string.barcode_cannot_contain_special));
-                    } else if (CommonUtil.isStringContainsSpecialChar(mWarehouseEt.getText().toString().trim())) {
-                        CommonUtil.toastNoRepeat(getActivity(), getResources().getString(R.string.whcode_cannot_contain_special));
-                    } else {
-                        //判断单号和仓库组合是否已经存在于变量orders中
-                        boolean isExist = false;
-                        for (int i = 0; i < mProdInfoList.size(); i++) {
-                            if ((mProdInfoList.get(i).getPI_INOUTNO()).equals(mStorageNumberActv.getText().toString().trim()) && (mProdInfoList.get(i).getPD_WHCODE()).equals(mWarehouseEt.getText().toString().trim())) {
-                                isExist = true;
-                                break;
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            if (TextUtils.isEmpty(mStorageNumberActv.getText().toString().trim())) {
+                                CommonUtil.toastNoRepeat(getActivity(), "请输入入库单号");
+                            } else if (CommonUtil.isStringContainsSpecialChar(mStorageNumberActv.getText().toString().trim())) {
+                                CommonUtil.toastNoRepeat(getActivity(), getResources().getString(R.string.barcode_cannot_contain_special));
+                            } else if (CommonUtil.isStringContainsSpecialChar(mWarehouseEt.getText().toString().trim())) {
+                                CommonUtil.toastNoRepeat(getActivity(), getResources().getString(R.string.whcode_cannot_contain_special));
+                            } else {
+                                //判断单号和仓库组合是否已经存在于变量orders中
+                                boolean isExist = false;
+                                for (int i = 0; i < mProdInfoList.size(); i++) {
+                                    if ((mProdInfoList.get(i).getPI_INOUTNO()).equals(mStorageNumberActv.getText().toString().trim()) && (mProdInfoList.get(i).getPD_WHCODE()).equals(mWarehouseEt.getText().toString().trim())) {
+                                        isExist = true;
+                                        break;
+                                    }
+                                }
+                                if (isExist) {
+                                    Toast.makeText(getActivity(), "单号+仓库重复", Toast.LENGTH_SHORT).show();
+                                    reset();
+                                } else {
+                                    getProdInfoMessage();
+                                }
                             }
-                        }
-
-                        if (isExist) {
-                            Toast.makeText(getActivity(), "单号+仓库重复", Toast.LENGTH_SHORT).show();
-                            reset();
-                        } else {
-                            getProdInfoMessage();
-                        }
+                            return true;
+                        default:
+                            return true;
                     }
-                    return true;
                 }
                 return false;
             }

app/src/main/java/com/uas/huiyan/fragment/GdWorkSwitchFragment.java

@@ -742,56 +742,58 @@ public class GdWorkSwitchFragment extends BaseFragment implements View.OnClickLi
         editadd_et.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_DONE
-                        || actionId == EditorInfo.IME_ACTION_SEND
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    String mSearchStr = editadd_et.getText().toString().trim();
-                    if (!mSearchStr.isEmpty()) {
-                        List<DlMacodesBean> thisList = new ArrayList<>();
-                        for(int i=0;i<ComaddBeanList.size();i++){
-                            if(ComaddBeanList.get(i).getDL_MACODE().contains(mSearchStr)){
-                                thisList.add(ComaddBeanList.get(i));
-                            }
-                            if(i == ComaddBeanList.size() -1){
-                                dlMacodeAdapter = new DlMacodeAdapter(thisList);
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            String mSearchStr = editadd_et.getText().toString().trim();
+                            if (!mSearchStr.isEmpty()) {
+                                List<DlMacodesBean> thisList = new ArrayList<>();
+                                for(int i=0;i<ComaddBeanList.size();i++){
+                                    if(ComaddBeanList.get(i).getDL_MACODE().contains(mSearchStr)){
+                                        thisList.add(ComaddBeanList.get(i));
+                                    }
+                                    if(i == ComaddBeanList.size() -1){
+                                        dlMacodeAdapter = new DlMacodeAdapter(thisList);
+                                        rv_line_add_port_data.setAdapter(dlMacodeAdapter);
+                                        LogUtil.i("mSearchStr", JSON.toJSONString(thisList));
+
+                                    }
+                                    List<DlMacodesBean> lineCodeEntities = dlMacodeAdapter.getmList();
+                                    for (int j = 0; j < lineCodeEntities.size(); j++) {
+                                        lineCodeEntities.get(j).setChecked(false);
+                                    }
+                                    dlMacodeAdapter.notifyDataSetChanged();
+                                }
+                            } else {
+                                dlMacodeAdapter = new DlMacodeAdapter(ComaddBeanList);
                                 rv_line_add_port_data.setAdapter(dlMacodeAdapter);
-                                LogUtil.i("mSearchStr", JSON.toJSONString(thisList));
+                                List<DlMacodesBean> lineCodeEntities = dlMacodeAdapter.getmList();
+                                for (int i = 0; i < lineCodeEntities.size(); i++) {
+                                    lineCodeEntities.get(i).setChecked(false);
+                                }
+                                dlMacodeAdapter.notifyDataSetChanged();
 
                             }
-                            List<DlMacodesBean> lineCodeEntities = dlMacodeAdapter.getmList();
-                            for (int j = 0; j < lineCodeEntities.size(); j++) {
-                                lineCodeEntities.get(j).setChecked(false);
-                            }
-                            dlMacodeAdapter.notifyDataSetChanged();
-                        }
-
-
-                    } else {
-                        dlMacodeAdapter = new DlMacodeAdapter(ComaddBeanList);
-                        rv_line_add_port_data.setAdapter(dlMacodeAdapter);
-                        List<DlMacodesBean> lineCodeEntities = dlMacodeAdapter.getmList();
-                        for (int i = 0; i < lineCodeEntities.size(); i++) {
-                            lineCodeEntities.get(i).setChecked(false);
-                        }
-                        dlMacodeAdapter.notifyDataSetChanged();
-
+                            dlMacodeAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+
+                                @Override
+                                public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                                    List<DlMacodesBean> ipAndPortBeans = dlMacodeAdapter.getmList();
+                                    dl_macodEdata = ipAndPortBeans.get(position).getDL_MACODE();
+                                    dlstr_macodes = ipAndPortBeans.get(position).getDL_MOULDCODE();
+                                    pr_sdetail = ipAndPortBeans.get(position).getPR_DETAIL();
+                                    for (int i = 0; i < ipAndPortBeans.size(); i++) {
+                                        ipAndPortBeans.get(i).setChecked(false);
+                                    }
+                                    ipAndPortBeans.get(position).setChecked(true);
+                                    dlMacodeAdapter.notifyDataSetChanged();
+                                }
+                            });
+                            return true;
+                        default:
+                            return true;
                     }
-                    dlMacodeAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
-
-                        @Override
-                        public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
-                            List<DlMacodesBean> ipAndPortBeans = dlMacodeAdapter.getmList();
-                            dl_macodEdata = ipAndPortBeans.get(position).getDL_MACODE();
-                            dlstr_macodes = ipAndPortBeans.get(position).getDL_MOULDCODE();
-                            pr_sdetail = ipAndPortBeans.get(position).getPR_DETAIL();
-                            for (int i = 0; i < ipAndPortBeans.size(); i++) {
-                                ipAndPortBeans.get(i).setChecked(false);
-                            }
-                            ipAndPortBeans.get(position).setChecked(true);
-                            dlMacodeAdapter.notifyDataSetChanged();
-                        }
-                    });
-                    return true;
                 }
                 return false;
             }

app/src/main/java/com/uas/huiyan/fragment/GoodOrBadAddDetailFragment.java

@@ -232,17 +232,21 @@ public class GoodOrBadAddDetailFragment extends BaseFragment implements View.OnC
         edit_et.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_DONE
-                        || actionId == EditorInfo.IME_ACTION_SEND
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    //阻止换行
-                    String trim = edit_et.getText().toString().trim();
-                    if (!TextUtils.isEmpty(trim)) {
-                        edit_et.requestFocus();
-                        edit_et.setText(trim);
-                        edit_et.setSelection(trim.length());
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            //阻止换行
+                            String trim = edit_et.getText().toString().trim();
+                            if (!TextUtils.isEmpty(trim)) {
+                                edit_et.requestFocus();
+                                edit_et.setText(trim);
+                                edit_et.setSelection(trim.length());
+                            }
+                            return true;
+                        default:
+                            return true;
                     }
-                    return true;
                 }
                 return false;
             }

app/src/main/java/com/uas/huiyan/fragment/GoodOrBadFragment.java

@@ -402,55 +402,57 @@ public class GoodOrBadFragment extends BaseFragment implements View.OnClickListe
         edit_et.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_DONE
-                        || actionId == EditorInfo.IME_ACTION_SEND
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    String mSearchStr = edit_et.getText().toString().trim();
-                    if (!mSearchStr.isEmpty()) {
-                        List<ComDataBean> thisList = new ArrayList<>();
-                        for(int i=0;i<ComDataBeanList.size();i++){
-                            if(ComDataBeanList.get(i).getItemremark().contains(mSearchStr)||ComDataBeanList.get(i).getItemName().contains(mSearchStr)){
-                                thisList.add(ComDataBeanList.get(i));
-                            }
-                            if(i == ComDataBeanList.size() -1){
-                                ipAndResourcesPortAdapter = new IpAndResourcesPortAdapter(thisList);
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            String mSearchStr = edit_et.getText().toString().trim();
+                            if (!mSearchStr.isEmpty()) {
+                                List<ComDataBean> thisList = new ArrayList<>();
+                                for(int i=0;i<ComDataBeanList.size();i++){
+                                    if(ComDataBeanList.get(i).getItemremark().contains(mSearchStr)||ComDataBeanList.get(i).getItemName().contains(mSearchStr)){
+                                        thisList.add(ComDataBeanList.get(i));
+                                    }
+                                    if(i == ComDataBeanList.size() -1){
+                                        ipAndResourcesPortAdapter = new IpAndResourcesPortAdapter(thisList);
+                                        rv_line_ip_port_data.setAdapter(ipAndResourcesPortAdapter);
+                                        LogUtil.i("mSearchStr", JSON.toJSONString(thisList));
+
+                                    }
+                                    List<ComDataBean> lineCodeEntities = ipAndResourcesPortAdapter.getmList();
+                                    for (int j = 0; j < lineCodeEntities.size(); j++) {
+                                        lineCodeEntities.get(j).setChecked(false);
+                                    }
+                                    ipAndResourcesPortAdapter.notifyDataSetChanged();
+                                }
+                            } else {
+                                ipAndResourcesPortAdapter = new IpAndResourcesPortAdapter(ComDataBeanList);
                                 rv_line_ip_port_data.setAdapter(ipAndResourcesPortAdapter);
-                                LogUtil.i("mSearchStr", JSON.toJSONString(thisList));
+                                List<ComDataBean> lineCodeEntities = ipAndResourcesPortAdapter.getmList();
+                                for (int i = 0; i < lineCodeEntities.size(); i++) {
+                                    lineCodeEntities.get(i).setChecked(false);
+                                }
+                                ipAndResourcesPortAdapter.notifyDataSetChanged();
 
                             }
-                            List<ComDataBean> lineCodeEntities = ipAndResourcesPortAdapter.getmList();
-                            for (int j = 0; j < lineCodeEntities.size(); j++) {
-                                lineCodeEntities.get(j).setChecked(false);
-                            }
-                            ipAndResourcesPortAdapter.notifyDataSetChanged();
-                        }
-
-
-                    } else {
-                        ipAndResourcesPortAdapter = new IpAndResourcesPortAdapter(ComDataBeanList);
-                        rv_line_ip_port_data.setAdapter(ipAndResourcesPortAdapter);
-                        List<ComDataBean> lineCodeEntities = ipAndResourcesPortAdapter.getmList();
-                        for (int i = 0; i < lineCodeEntities.size(); i++) {
-                            lineCodeEntities.get(i).setChecked(false);
-                        }
-                        ipAndResourcesPortAdapter.notifyDataSetChanged();
-
+                            ipAndResourcesPortAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+
+                                @Override
+                                public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                                    List<ComDataBean> ipAndPortBeans = ipAndResourcesPortAdapter.getmList();
+                                    sc_name = ipAndPortBeans.get(position).getItemName();
+                                    sc_code = ipAndPortBeans.get(position).getItemremark();
+                                    for (int i = 0; i < ipAndPortBeans.size(); i++) {
+                                        ipAndPortBeans.get(i).setChecked(false);
+                                    }
+                                    ipAndPortBeans.get(position).setChecked(true);
+                                    ipAndResourcesPortAdapter.notifyDataSetChanged();
+                                }
+                            });
+                            return true;
+                        default:
+                            return true;
                     }
-                    ipAndResourcesPortAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
-
-                        @Override
-                        public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
-                            List<ComDataBean> ipAndPortBeans = ipAndResourcesPortAdapter.getmList();
-                            sc_name = ipAndPortBeans.get(position).getItemName();
-                            sc_code = ipAndPortBeans.get(position).getItemremark();
-                            for (int i = 0; i < ipAndPortBeans.size(); i++) {
-                                ipAndPortBeans.get(i).setChecked(false);
-                            }
-                            ipAndPortBeans.get(position).setChecked(true);
-                            ipAndResourcesPortAdapter.notifyDataSetChanged();
-                        }
-                    });
-                    return true;
                 }
                 return false;
             }

app/src/main/java/com/uas/huiyan/fragment/IOCOutFreeCollectFragment.java

@@ -81,11 +81,15 @@ public class IOCOutFreeCollectFragment extends BaseFragment implements View.OnCl
         mBarcodeEditText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_SEND
-                        || actionId == EditorInfo.IME_ACTION_DONE
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    doFreeCollectConfirm();
-                    return true;
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            doFreeCollectConfirm();
+                            return true;
+                        default:
+                            return true;
+                    }
                 }
                 return false;
             }

app/src/main/java/com/uas/huiyan/fragment/IOCOutMakeMaterial.java

@@ -197,34 +197,36 @@ public class IOCOutMakeMaterial extends BaseFragment {
         inOutNo.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_SEND
-                        || actionId == EditorInfo.IME_ACTION_SEARCH
-                        || actionId == EditorInfo.IME_ACTION_DONE
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    if (TextUtils.isEmpty(inOutNo.getText().toString().trim())) {
-                        CommonUtil.toastNoRepeat(getActivity(), "请输入出库单号");
-                    } else if (CommonUtil.isStringContainsSpecialChar(inOutNo.getText().toString().trim())) {
-                        CommonUtil.toastNoRepeat(getActivity(), getResources().getString(R.string.barcode_cannot_contain_special));
-                    } else if (CommonUtil.isStringContainsSpecialChar(whCode.getText().toString().trim())) {
-                        CommonUtil.toastNoRepeat(getActivity(), getResources().getString(R.string.whcode_cannot_contain_special));
-                    } else {
-                        //判断单号和仓库组合是否已经存在于变量orders中
-                        boolean isExist = false;
-                        for (int i = 0; i < dataList.size(); i++) {
-                            if ((dataList.get(i).getPI_INOUTNO()).equals(inOutNo.getText().toString().trim()) && (dataList.get(i).getPD_WHCODE()).equals(whCode.getText().toString().trim())) {
-                                isExist = true;
-                                break;
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            if (TextUtils.isEmpty(inOutNo.getText().toString().trim())) {
+                                CommonUtil.toastNoRepeat(getActivity(), "请输入出库单号");
+                            } else if (CommonUtil.isStringContainsSpecialChar(inOutNo.getText().toString().trim())) {
+                                CommonUtil.toastNoRepeat(getActivity(), getResources().getString(R.string.barcode_cannot_contain_special));
+                            } else if (CommonUtil.isStringContainsSpecialChar(whCode.getText().toString().trim())) {
+                                CommonUtil.toastNoRepeat(getActivity(), getResources().getString(R.string.whcode_cannot_contain_special));
+                            } else {
+                                //判断单号和仓库组合是否已经存在于变量orders中
+                                boolean isExist = false;
+                                for (int i = 0; i < dataList.size(); i++) {
+                                    if ((dataList.get(i).getPI_INOUTNO()).equals(inOutNo.getText().toString().trim()) && (dataList.get(i).getPD_WHCODE()).equals(whCode.getText().toString().trim())) {
+                                        isExist = true;
+                                        break;
+                                    }
+                                }
+                                if (isExist) {
+                                    Toast.makeText(getActivity(), "单号重复", Toast.LENGTH_SHORT).show();
+                                    reset();
+                                } else {
+                                    submitBtnClick();
+                                }
                             }
-                        }
-                        if (isExist) {
-                            Toast.makeText(getActivity(), "单号重复", Toast.LENGTH_SHORT).show();
-                            reset();
-                        } else {
-                            submitBtnClick();
-                        }
+                            return true;
+                        default:
+                            return true;
                     }
-
-                    return true;
                 }
                 return false;
             }

app/src/main/java/com/uas/huiyan/fragment/IOCOutMakeMaterialOper.java

@@ -537,11 +537,15 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
         etBarCode.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_SEND
-                        || actionId == EditorInfo.IME_ACTION_DONE
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    confirmEvent();
-                    return true;
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            confirmEvent();
+                            return true;
+                        default:
+                            return true;
+                    }
                 }
                 return false;
             }

app/src/main/java/com/uas/huiyan/fragment/LabeLreprintingFragment.java

@@ -81,12 +81,16 @@ public class LabeLreprintingFragment extends BaseFragment implements View.OnClic
         storage_recharge_collect_ets.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_DONE
-                        || actionId == EditorInfo.IME_ACTION_SEND
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    String data = storage_recharge_collect_ets.getText().toString().trim();
-                    getgetinfo(data,cet_notes.getText().toString().trim());
-                    return true;
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            String data = storage_recharge_collect_ets.getText().toString().trim();
+                            getgetinfo(data,cet_notes.getText().toString().trim());
+                            return true;
+                        default:
+                            return true;
+                    }
                 }
                 return false;
             }

app/src/main/java/com/uas/huiyan/fragment/MaterialCollectionFragment.java

@@ -240,11 +240,15 @@ public class MaterialCollectionFragment extends BaseFragment {
         mBarcodeEt.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_SEND
-                        || actionId == EditorInfo.IME_ACTION_DONE
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    confirmEvent();
-                    return true;
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            confirmEvent();
+                            return true;
+                        default:
+                            return true;
+                    }
                 }
                 return false;
             }

app/src/main/java/com/uas/huiyan/fragment/MaterialInCollectFragment.java

@@ -274,11 +274,15 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
         mBarcodeEditText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_SEND
-                        || actionId == EditorInfo.IME_ACTION_DONE
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    getCodeData();
-                    return true;
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            getCodeData();
+                            return true;
+                        default:
+                            return true;
+                    }
                 }
                 return false;
             }
@@ -289,30 +293,34 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
         mNumEditText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_SEND
-                        || actionId == EditorInfo.IME_ACTION_DONE
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    if (mNumCheck && !TextUtils.isEmpty(mNumEditText.getText().toString().trim()) && !mNumEditText.getText().toString().trim().equals(mCheckProdcode)) {
-                        CommonUtil.toastNoRepeat(mActivity, "料号校验不一致");
-                        mNumEditText.setText(null);
-                        mNumEditText.postDelayed(new Runnable() {
-                            @Override
-                            public void run() {
-                                mNumEditText.requestFocus();
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            if (mNumCheck && !TextUtils.isEmpty(mNumEditText.getText().toString().trim()) && !mNumEditText.getText().toString().trim().equals(mCheckProdcode)) {
+                                CommonUtil.toastNoRepeat(mActivity, "料号校验不一致");
+                                mNumEditText.setText(null);
+                                mNumEditText.postDelayed(new Runnable() {
+                                    @Override
+                                    public void run() {
+                                        mNumEditText.requestFocus();
+                                    }
+                                }, 100);
+                            } else {
+                                if (mLotnoCheck) {
+                                    mLotNoEditText.requestFocus();
+                                } else if (mDateCodeCheck) {
+                                    mDateCodeEditText.requestFocus();
+                                } else if (mOldCheck) {
+                                    mOldEditText.requestFocus();
+                                } else if (mLocationCheck) {
+                                    mLocationEditText.requestFocus();
+                                }
                             }
-                        }, 100);
-                    } else {
-                        if (mLotnoCheck) {
-                            mLotNoEditText.requestFocus();
-                        } else if (mDateCodeCheck) {
-                            mDateCodeEditText.requestFocus();
-                        } else if (mOldCheck) {
-                            mOldEditText.requestFocus();
-                        } else if (mLocationCheck) {
-                            mLocationEditText.requestFocus();
-                        }
+                            return true;
+                        default:
+                            return true;
                     }
-                    return true;
                 }
                 return false;
             }
@@ -323,20 +331,25 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
         mLotNoEditText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_SEND
-                        || actionId == EditorInfo.IME_ACTION_DONE
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    if (isAllEdit()) {
-                        confirmEvent(false);
-                        return true;
-                    } else {
-                        if (mDateCodeCheck) {
-                            mDateCodeEditText.requestFocus();
-                        } else if (mOldCheck) {
-                            mOldEditText.requestFocus();
-                        } else if (mLocationCheck) {
-                            mLocationEditText.requestFocus();
-                        }
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            if (isAllEdit()) {
+                                confirmEvent(false);
+                                return true;
+                            } else {
+                                if (mDateCodeCheck) {
+                                    mDateCodeEditText.requestFocus();
+                                } else if (mOldCheck) {
+                                    mOldEditText.requestFocus();
+                                } else if (mLocationCheck) {
+                                    mLocationEditText.requestFocus();
+                                }
+                            }
+                            return true;
+                        default:
+                            return true;
                     }
                 }
                 return false;
@@ -346,18 +359,23 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
         mDateCodeEditText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_SEND
-                        || actionId == EditorInfo.IME_ACTION_DONE
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    if (isAllEdit()) {
-                        confirmEvent(false);
-                        return true;
-                    } else {
-                        if (mOldCheck) {
-                            mOldEditText.requestFocus();
-                        } else if (mLocationCheck) {
-                            mLocationEditText.requestFocus();
-                        }
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            if (isAllEdit()) {
+                                confirmEvent(false);
+                                return true;
+                            } else {
+                                if (mOldCheck) {
+                                    mOldEditText.requestFocus();
+                                } else if (mLocationCheck) {
+                                    mLocationEditText.requestFocus();
+                                }
+                            }
+                            return true;
+                        default:
+                            return true;
                     }
                 }
                 return false;
@@ -368,12 +386,17 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
 
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_SEND
-                        || actionId == EditorInfo.IME_ACTION_DONE
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    if (isAllEdit()) {
-                        confirmEvent(false);
-                        return true;
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            if (isAllEdit()) {
+                                confirmEvent(false);
+                                return true;
+                            }
+                            return true;
+                        default:
+                            return true;
                     }
                 }
                 return false;
@@ -383,16 +406,21 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
         mOldEditText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_SEND
-                        || actionId == EditorInfo.IME_ACTION_DONE
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    if (isAllEdit()) {
-                        confirmEvent(false);
-                        return true;
-                    } else {
-                        if (mLocationCheck) {
-                            mLocationEditText.requestFocus();
-                        }
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            if (isAllEdit()) {
+                                confirmEvent(false);
+                                return true;
+                            } else {
+                                if (mLocationCheck) {
+                                    mLocationEditText.requestFocus();
+                                }
+                            }
+                            return true;
+                        default:
+                            return true;
                     }
                 }
                 return false;

app/src/main/java/com/uas/huiyan/fragment/MaterialOutRevocationStockFragment.java

@@ -132,11 +132,15 @@ public class MaterialOutRevocationStockFragment extends BaseFragment {
         mBarcodeEditText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_SEND
-                        || actionId == EditorInfo.IME_ACTION_DONE
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    confirmEvent();
-                    return true;
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            confirmEvent();
+                            return true;
+                        default:
+                            return true;
+                    }
                 }
                 return false;
             }

app/src/main/java/com/uas/huiyan/fragment/MaterialStorageFragment.java

@@ -209,34 +209,37 @@ public class MaterialStorageFragment extends BaseFragment implements TextWatcher
         mMaterialStorageTv.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_SEND
-                        || actionId == EditorInfo.IME_ACTION_SEARCH
-                        || actionId == EditorInfo.IME_ACTION_DONE
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    if (TextUtils.isEmpty(mMaterialStorageTv.getText().toString().trim())) {
-                        CommonUtil.toastNoRepeat(getActivity(), "请输入入库单号");
-                    } else if (CommonUtil.isStringContainsSpecialChar(mMaterialStorageTv.getText().toString().trim())) {
-                        CommonUtil.toastNoRepeat(getActivity(), getResources().getString(R.string.barcode_cannot_contain_special));
-                    } else if (CommonUtil.isStringContainsSpecialChar(mWarehouseEt.getText().toString().trim())) {
-                        CommonUtil.toastNoRepeat(getActivity(), getResources().getString(R.string.whcode_cannot_contain_special));
-                    } else {
-                        //判断单号和仓库组合是否已经存在于变量orders中
-                        boolean isExist = false;
-                        for (int i = 0; i < mDataList.size(); i++) {
-                            if ((mDataList.get(i).getPI_INOUTNO()).equals(mMaterialStorageTv.getText().toString().trim()) && (mDataList.get(i).getPD_WHCODE()).equals(mWarehouseEt.getText().toString().trim())) {
-                                isExist = true;
-                                break;
-                            }
-                        }
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            if (TextUtils.isEmpty(mMaterialStorageTv.getText().toString().trim())) {
+                                CommonUtil.toastNoRepeat(getActivity(), "请输入入库单号");
+                            } else if (CommonUtil.isStringContainsSpecialChar(mMaterialStorageTv.getText().toString().trim())) {
+                                CommonUtil.toastNoRepeat(getActivity(), getResources().getString(R.string.barcode_cannot_contain_special));
+                            } else if (CommonUtil.isStringContainsSpecialChar(mWarehouseEt.getText().toString().trim())) {
+                                CommonUtil.toastNoRepeat(getActivity(), getResources().getString(R.string.whcode_cannot_contain_special));
+                            } else {
+                                //判断单号和仓库组合是否已经存在于变量orders中
+                                boolean isExist = false;
+                                for (int i = 0; i < mDataList.size(); i++) {
+                                    if ((mDataList.get(i).getPI_INOUTNO()).equals(mMaterialStorageTv.getText().toString().trim()) && (mDataList.get(i).getPD_WHCODE()).equals(mWarehouseEt.getText().toString().trim())) {
+                                        isExist = true;
+                                        break;
+                                    }
+                                }
 
-                        if (isExist) {
-                            Toast.makeText(getActivity(), "单号重复", Toast.LENGTH_SHORT).show();
-                            reset();
-                        } else {
-                            getMaterialMessage();
-                        }
+                                if (isExist) {
+                                    Toast.makeText(getActivity(), "单号重复", Toast.LENGTH_SHORT).show();
+                                    reset();
+                                } else {
+                                    getMaterialMessage();
+                                }
+                            }
+                            return true;
+                        default:
+                            return true;
                     }
-                    return true;
                 }
                 return false;
             }

app/src/main/java/com/uas/huiyan/fragment/ModifyBarcodeQuantityFragment.java

@@ -104,12 +104,15 @@ public class ModifyBarcodeQuantityFragment extends BaseFragment {
         mBarcodeEditText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_SEND
-                        || actionId == EditorInfo.IME_ACTION_DONE
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    getBarcodeData();
-
-                    return true;
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            getBarcodeData();
+                            return true;
+                        default:
+                            return true;
+                    }
                 }
                 return false;
             }

app/src/main/java/com/uas/huiyan/fragment/ModifyQuantityOutFragment.java

@@ -110,12 +110,15 @@ public class ModifyQuantityOutFragment extends BaseFragment {
         mBarcodeEditText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_SEND
-                        || actionId == EditorInfo.IME_ACTION_DONE
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    getBarcodeData();
-
-                    return true;
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            getBarcodeData();
+                            return true;
+                        default:
+                            return true;
+                    }
                 }
                 return false;
             }

app/src/main/java/com/uas/huiyan/fragment/NewBePutInStorageOrderDetailFragment2.java

@@ -126,12 +126,16 @@ public class NewBePutInStorageOrderDetailFragment2 extends BaseFragment{
         jlt_storage_in_barcode_barcode_et.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_DONE
-                        || actionId == EditorInfo.IME_ACTION_SEND
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    String input = jlt_storage_in_barcode_barcode_et.getText().toString().trim();
-                    getmakeInWarhouse(input);
-                    return true;
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            String input = jlt_storage_in_barcode_barcode_et.getText().toString().trim();
+                            getmakeInWarhouse(input);
+                            return true;
+                        default:
+                            return true;
+                    }
                 }
                 return false;
             }

app/src/main/java/com/uas/huiyan/fragment/PostPunchFragment.java

@@ -197,12 +197,16 @@ public class PostPunchFragment extends BaseFragment implements View.OnClickListe
         ct_qty.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_DONE
-                        || actionId == EditorInfo.IME_ACTION_SEND
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    String data = ct_qty.getText().toString().trim();
-                    getSourcePunchInfo(data);
-                    return true;
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            String data = ct_qty.getText().toString().trim();
+                            getSourcePunchInfo(data);
+                            return true;
+                        default:
+                            return true;
+                    }
                 }
                 return false;
             }
@@ -210,12 +214,15 @@ public class PostPunchFragment extends BaseFragment implements View.OnClickListe
         ce_yuanyin.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_DONE
-                        || actionId == EditorInfo.IME_ACTION_SEND
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-//                    getcardPunching();
-                    cet_point.requestFocus();
-                    return true;
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            cet_point.requestFocus();
+                            return true;
+                        default:
+                            return true;
+                    }
                 }
                 return false;
             }
@@ -253,11 +260,15 @@ public class PostPunchFragment extends BaseFragment implements View.OnClickListe
         cet_point.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_DONE
-                        || actionId == EditorInfo.IME_ACTION_SEND
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    getcardPunching();
-                    return true;
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            getcardPunching();
+                            return true;
+                        default:
+                            return true;
+                    }
                 }
                 return false;
             }
@@ -300,17 +311,21 @@ public class PostPunchFragment extends BaseFragment implements View.OnClickListe
         edit_et.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_DONE
-                        || actionId == EditorInfo.IME_ACTION_SEND
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    //阻止换行
-                    String trim = edit_et.getText().toString().trim();
-                    if (!TextUtils.isEmpty(trim)) {
-                        edit_et.requestFocus();
-                        edit_et.setText(trim);
-                        edit_et.setSelection(trim.length());
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                           //阻止换行
+                            String trim = edit_et.getText().toString().trim();
+                            if (!TextUtils.isEmpty(trim)) {
+                                edit_et.requestFocus();
+                                edit_et.setText(trim);
+                                edit_et.setSelection(trim.length());
+                            }
+                            return true;
+                        default:
+                            return true;
                     }
-                    return true;
                 }
                 return false;
             }
@@ -575,55 +590,57 @@ public class PostPunchFragment extends BaseFragment implements View.OnClickListe
         edit_et.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_DONE
-                        || actionId == EditorInfo.IME_ACTION_SEND
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    String mSearchStr = edit_et.getText().toString().trim();
-                    if (!mSearchStr.isEmpty()) {
-                        List<ComDataBean> thisList = new ArrayList<>();
-                        for (int i = 0; i < ComDataBeanList.size(); i++) {
-                            if (ComDataBeanList.get(i).getItemremark().contains(mSearchStr) || ComDataBeanList.get(i).getItemName().contains(mSearchStr)) {
-                                thisList.add(ComDataBeanList.get(i));
-                            }
-                            if (i == ComDataBeanList.size() - 1) {
-                                ipAndResourcesPortAdapter = new IpAndResourcesPortAdapter(thisList);
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            String mSearchStr = edit_et.getText().toString().trim();
+                            if (!mSearchStr.isEmpty()) {
+                                List<ComDataBean> thisList = new ArrayList<>();
+                                for (int i = 0; i < ComDataBeanList.size(); i++) {
+                                    if (ComDataBeanList.get(i).getItemremark().contains(mSearchStr) || ComDataBeanList.get(i).getItemName().contains(mSearchStr)) {
+                                        thisList.add(ComDataBeanList.get(i));
+                                    }
+                                    if (i == ComDataBeanList.size() - 1) {
+                                        ipAndResourcesPortAdapter = new IpAndResourcesPortAdapter(thisList);
+                                        rv_line_ip_port_data.setAdapter(ipAndResourcesPortAdapter);
+                                        LogUtil.i("mSearchStr", JSON.toJSONString(thisList));
+
+                                    }
+                                    List<ComDataBean> lineCodeEntities = ipAndResourcesPortAdapter.getmList();
+                                    for (int j = 0; j < lineCodeEntities.size(); j++) {
+                                        lineCodeEntities.get(j).setChecked(false);
+                                    }
+                                    ipAndResourcesPortAdapter.notifyDataSetChanged();
+                                }
+                            } else {
+                                ipAndResourcesPortAdapter = new IpAndResourcesPortAdapter(ComDataBeanList);
                                 rv_line_ip_port_data.setAdapter(ipAndResourcesPortAdapter);
-                                LogUtil.i("mSearchStr", JSON.toJSONString(thisList));
+                                List<ComDataBean> lineCodeEntities = ipAndResourcesPortAdapter.getmList();
+                                for (int i = 0; i < lineCodeEntities.size(); i++) {
+                                    lineCodeEntities.get(i).setChecked(false);
+                                }
+                                ipAndResourcesPortAdapter.notifyDataSetChanged();
 
                             }
-                            List<ComDataBean> lineCodeEntities = ipAndResourcesPortAdapter.getmList();
-                            for (int j = 0; j < lineCodeEntities.size(); j++) {
-                                lineCodeEntities.get(j).setChecked(false);
-                            }
-                            ipAndResourcesPortAdapter.notifyDataSetChanged();
-                        }
-
-
-                    } else {
-                        ipAndResourcesPortAdapter = new IpAndResourcesPortAdapter(ComDataBeanList);
-                        rv_line_ip_port_data.setAdapter(ipAndResourcesPortAdapter);
-                        List<ComDataBean> lineCodeEntities = ipAndResourcesPortAdapter.getmList();
-                        for (int i = 0; i < lineCodeEntities.size(); i++) {
-                            lineCodeEntities.get(i).setChecked(false);
-                        }
-                        ipAndResourcesPortAdapter.notifyDataSetChanged();
-
+                            ipAndResourcesPortAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+
+                                @Override
+                                public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                                    List<ComDataBean> ipAndPortBeans = ipAndResourcesPortAdapter.getmList();
+                                    sc_name = ipAndPortBeans.get(position).getItemName();
+                                    sc_code = ipAndPortBeans.get(position).getItemremark();
+                                    for (int i = 0; i < ipAndPortBeans.size(); i++) {
+                                        ipAndPortBeans.get(i).setChecked(false);
+                                    }
+                                    ipAndPortBeans.get(position).setChecked(true);
+                                    ipAndResourcesPortAdapter.notifyDataSetChanged();
+                                }
+                            });
+                            return true;
+                        default:
+                            return true;
                     }
-                    ipAndResourcesPortAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
-
-                        @Override
-                        public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
-                            List<ComDataBean> ipAndPortBeans = ipAndResourcesPortAdapter.getmList();
-                            sc_name = ipAndPortBeans.get(position).getItemName();
-                            sc_code = ipAndPortBeans.get(position).getItemremark();
-                            for (int i = 0; i < ipAndPortBeans.size(); i++) {
-                                ipAndPortBeans.get(i).setChecked(false);
-                            }
-                            ipAndPortBeans.get(position).setChecked(true);
-                            ipAndResourcesPortAdapter.notifyDataSetChanged();
-                        }
-                    });
-                    return true;
                 }
                 return false;
             }

app/src/main/java/com/uas/huiyan/fragment/PostStockAdvocateFragment.java

@@ -240,12 +240,15 @@ public class PostStockAdvocateFragment extends BaseFragment implements OnColumnI
         ce_station.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_DONE
-                        || actionId == EditorInfo.IME_ACTION_SEND
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-
-                    getPositionLocation();
-                    return true;
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            getPositionLocation();
+                            return true;
+                        default:
+                            return true;
+                    }
                 }
                 return false;
             }
@@ -253,12 +256,15 @@ public class PostStockAdvocateFragment extends BaseFragment implements OnColumnI
         ce_material_lot_number.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_DONE
-                        || actionId == EditorInfo.IME_ACTION_SEND
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-
-                    getDataByBarcode();
-                    return true;
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            getDataByBarcode();
+                            return true;
+                        default:
+                            return true;
+                    }
                 }
                 return false;
             }

app/src/main/java/com/uas/huiyan/fragment/PreProcessingReportFragment.java

@@ -252,17 +252,21 @@ public class PreProcessingReportFragment extends BaseFragment implements View.On
         edit_et.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_DONE
-                        || actionId == EditorInfo.IME_ACTION_SEND
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    //阻止换行
-                    String trim = edit_et.getText().toString().trim();
-                    if (!TextUtils.isEmpty(trim)) {
-                        edit_et.requestFocus();
-                        edit_et.setText(trim);
-                        edit_et.setSelection(trim.length());
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            //阻止换行
+                            String trim = edit_et.getText().toString().trim();
+                            if (!TextUtils.isEmpty(trim)) {
+                                edit_et.requestFocus();
+                                edit_et.setText(trim);
+                                edit_et.setSelection(trim.length());
+                            }
+                            return true;
+                        default:
+                            return true;
                     }
-                    return true;
                 }
                 return false;
             }

app/src/main/java/com/uas/huiyan/fragment/PutintoAdd_Fragment.java

@@ -114,12 +114,16 @@ public class PutintoAdd_Fragment extends BaseFragment implements  View.OnClickLi
         storage_recharge_collect_ets.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_DONE
-                        || actionId == EditorInfo.IME_ACTION_SEND
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    String data = storage_recharge_collect_ets.getText().toString().trim();
-                    getDatalistCodes(data);
-                    return true;
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            String data = storage_recharge_collect_ets.getText().toString().trim();
+                            getDatalistCodes(data);
+                            return true;
+                        default:
+                            return true;
+                    }
                 }
                 return false;
             }

app/src/main/java/com/uas/huiyan/fragment/RandomCheckBarcodeFragment.java

@@ -142,14 +142,18 @@ public class RandomCheckBarcodeFragment extends BaseFragment {
         mBarcodeEt.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_SEND
-                        || actionId == EditorInfo.IME_ACTION_DONE
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    if (CommonUtil.isNetWorkConnected(getActivity()))
-                        checkBarcode();
-                    else
-                        CommonUtil.toastNoRepeat(getActivity(), getResources().getString(R.string.str_net_not_connect));
-                    return true;
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            if (CommonUtil.isNetWorkConnected(getActivity()))
+                                checkBarcode();
+                            else
+                                CommonUtil.toastNoRepeat(getActivity(), getResources().getString(R.string.str_net_not_connect));
+                            return true;
+                        default:
+                            return true;
+                    }
                 }
                 return false;
             }

app/src/main/java/com/uas/huiyan/fragment/RandomCheckFragment.java

@@ -154,19 +154,23 @@ public class RandomCheckFragment extends BaseFragment implements TextWatcher {
         mRandomCheckTv.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_SEND
-                        || actionId == EditorInfo.IME_ACTION_DONE
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    if (TextUtils.isEmpty(mRandomCheckTv.getText().toString().trim())) {
-                        CommonUtil.toastNoRepeat(getActivity(), "请输入入库单号");
-                    } else if (CommonUtil.isStringContainsSpecialChar(mRandomCheckTv.getText().toString().trim())) {
-                        CommonUtil.toastNoRepeat(getActivity(), getResources().getString(R.string.barcode_cannot_contain_special));
-                    } else if (CommonUtil.isStringContainsSpecialChar(mWarehouseEt.getText().toString().trim())) {
-                        CommonUtil.toastNoRepeat(getActivity(), getResources().getString(R.string.whcode_cannot_contain_special));
-                    } else {
-                        getMaterialMessage();
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            if (TextUtils.isEmpty(mRandomCheckTv.getText().toString().trim())) {
+                                CommonUtil.toastNoRepeat(getActivity(), "请输入入库单号");
+                            } else if (CommonUtil.isStringContainsSpecialChar(mRandomCheckTv.getText().toString().trim())) {
+                                CommonUtil.toastNoRepeat(getActivity(), getResources().getString(R.string.barcode_cannot_contain_special));
+                            } else if (CommonUtil.isStringContainsSpecialChar(mWarehouseEt.getText().toString().trim())) {
+                                CommonUtil.toastNoRepeat(getActivity(), getResources().getString(R.string.whcode_cannot_contain_special));
+                            } else {
+                                getMaterialMessage();
+                            }
+                            return true;
+                        default:
+                            return true;
                     }
-                    return true;
                 }
                 return false;
             }

app/src/main/java/com/uas/huiyan/fragment/RolloutFragment.java

@@ -176,12 +176,16 @@ public class RolloutFragment extends BaseFragment implements View.OnClickListene
         storage_recharge_collect_ets.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_DONE
-                        || actionId == EditorInfo.IME_ACTION_SEND
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    String data = storage_recharge_collect_ets.getText().toString().trim();
-                    getlotnoData(data);
-                    return true;
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            String data = storage_recharge_collect_ets.getText().toString().trim();
+                            getlotnoData(data);
+                            return true;
+                        default:
+                            return true;
+                    }
                 }
                 return false;
             }
@@ -305,56 +309,58 @@ public class RolloutFragment extends BaseFragment implements View.OnClickListene
         editadd_et.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_DONE
-                        || actionId == EditorInfo.IME_ACTION_SEND
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    String mSearchStr = editadd_et.getText().toString().trim();
-                    if (!mSearchStr.isEmpty()) {
-                        List<DlMacodesBean> thisList = new ArrayList<>();
-                        for(int i=0;i<ComaddBeanList.size();i++){
-                            if(ComaddBeanList.get(i).getDL_MACODE().contains(mSearchStr)){
-                                thisList.add(ComaddBeanList.get(i));
-                            }
-                            if(i == ComaddBeanList.size() -1){
-                                dlMacodeAdapter = new DlMacodeAdapter(thisList);
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            String mSearchStr = editadd_et.getText().toString().trim();
+                            if (!mSearchStr.isEmpty()) {
+                                List<DlMacodesBean> thisList = new ArrayList<>();
+                                for(int i=0;i<ComaddBeanList.size();i++){
+                                    if(ComaddBeanList.get(i).getDL_MACODE().contains(mSearchStr)){
+                                        thisList.add(ComaddBeanList.get(i));
+                                    }
+                                    if(i == ComaddBeanList.size() -1){
+                                        dlMacodeAdapter = new DlMacodeAdapter(thisList);
+                                        rv_line_add_port_data.setAdapter(dlMacodeAdapter);
+                                        LogUtil.i("mSearchStr", JSON.toJSONString(thisList));
+
+                                    }
+                                    List<DlMacodesBean> lineCodeEntities = dlMacodeAdapter.getmList();
+                                    for (int j = 0; j < lineCodeEntities.size(); j++) {
+                                        lineCodeEntities.get(j).setChecked(false);
+                                    }
+                                    dlMacodeAdapter.notifyDataSetChanged();
+                                }
+                            } else {
+                                dlMacodeAdapter = new DlMacodeAdapter(ComaddBeanList);
                                 rv_line_add_port_data.setAdapter(dlMacodeAdapter);
-                                LogUtil.i("mSearchStr", JSON.toJSONString(thisList));
+                                List<DlMacodesBean> lineCodeEntities = dlMacodeAdapter.getmList();
+                                for (int i = 0; i < lineCodeEntities.size(); i++) {
+                                    lineCodeEntities.get(i).setChecked(false);
+                                }
+                                dlMacodeAdapter.notifyDataSetChanged();
 
                             }
-                            List<DlMacodesBean> lineCodeEntities = dlMacodeAdapter.getmList();
-                            for (int j = 0; j < lineCodeEntities.size(); j++) {
-                                lineCodeEntities.get(j).setChecked(false);
-                            }
-                            dlMacodeAdapter.notifyDataSetChanged();
-                        }
-
-
-                    } else {
-                        dlMacodeAdapter = new DlMacodeAdapter(ComaddBeanList);
-                        rv_line_add_port_data.setAdapter(dlMacodeAdapter);
-                        List<DlMacodesBean> lineCodeEntities = dlMacodeAdapter.getmList();
-                        for (int i = 0; i < lineCodeEntities.size(); i++) {
-                            lineCodeEntities.get(i).setChecked(false);
-                        }
-                        dlMacodeAdapter.notifyDataSetChanged();
-
+                            dlMacodeAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+
+                                @Override
+                                public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                                    List<DlMacodesBean> ipAndPortBeans = dlMacodeAdapter.getmList();
+                                    dl_macodEdata = ipAndPortBeans.get(position).getDL_MACODE();
+                                    dlstr_macodes = ipAndPortBeans.get(position).getDL_MOULDCODE();
+                                    pr_sdetail = ipAndPortBeans.get(position).getPR_DETAIL();
+                                    for (int i = 0; i < ipAndPortBeans.size(); i++) {
+                                        ipAndPortBeans.get(i).setChecked(false);
+                                    }
+                                    ipAndPortBeans.get(position).setChecked(true);
+                                    dlMacodeAdapter.notifyDataSetChanged();
+                                }
+                            });
+                            return true;
+                        default:
+                            return true;
                     }
-                    dlMacodeAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
-
-                        @Override
-                        public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
-                            List<DlMacodesBean> ipAndPortBeans = dlMacodeAdapter.getmList();
-                            dl_macodEdata = ipAndPortBeans.get(position).getDL_MACODE();
-                            dlstr_macodes = ipAndPortBeans.get(position).getDL_MOULDCODE();
-                            pr_sdetail = ipAndPortBeans.get(position).getPR_DETAIL();
-                            for (int i = 0; i < ipAndPortBeans.size(); i++) {
-                                ipAndPortBeans.get(i).setChecked(false);
-                            }
-                            ipAndPortBeans.get(position).setChecked(true);
-                            dlMacodeAdapter.notifyDataSetChanged();
-                        }
-                    });
-                    return true;
                 }
                 return false;
             }

app/src/main/java/com/uas/huiyan/fragment/SCSMTChangeFragment.java

@@ -137,13 +137,17 @@ public class SCSMTChangeFragment extends BaseFragment implements TextViewWithBut
         mCollectEditText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                String collect = mCollectEditText.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;
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            String collect = mCollectEditText.getText().toString().trim();
+                            if (!TextUtils.isEmpty(collect)) {
+                                confirmEvent(collect);
+                            }
+                            return true;
+                        default:
+                            return true;
                     }
                 }
                 return false;

app/src/main/java/com/uas/huiyan/fragment/SCSMTCheckFragment.java

@@ -221,13 +221,17 @@ public class SCSMTCheckFragment extends BaseFragment implements View.OnClickList
         mCollectEditText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                String collect = mCollectEditText.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;
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            String collect = mCollectEditText.getText().toString().trim();
+                            if (!TextUtils.isEmpty(collect)) {
+                                confirmEvent(collect);
+                            }
+                            return true;
+                        default:
+                            return true;
                     }
                 }
                 return false;

app/src/main/java/com/uas/huiyan/fragment/SCSMTDownFragment.java

@@ -125,14 +125,18 @@ public class SCSMTDownFragment extends BaseFragment implements View.OnClickListe
         mCollectEditText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_SEND
-                        || actionId == EditorInfo.IME_ACTION_DONE
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    String collect = mCollectEditText.getText().toString().trim();
-                    if (!TextUtils.isEmpty(collect)) {
-                        downMaterial(collect);
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            String collect = mCollectEditText.getText().toString().trim();
+                            if (!TextUtils.isEmpty(collect)) {
+                                downMaterial(collect);
+                            }
+                            return true;
+                        default:
+                            return true;
                     }
-                    return true;
                 }
                 return false;
             }

app/src/main/java/com/uas/huiyan/fragment/SCSMTFragment.java

@@ -204,18 +204,21 @@ public class SCSMTFragment extends BaseFragment implements View.OnClickListener,
         etLineCode.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_SEND
-                        || actionId == EditorInfo.IME_ACTION_DONE
-                        || actionId == EditorInfo.IME_ACTION_GO
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    String devCode = etLineCode.getText().toString().trim();
-                    if (TextUtils.isEmpty(devCode)) {
-                        CommonUtil.toastNoRepeat(mActivity, "请输入线别");
-                    } else {
-                        mIgnoreFocusChange = true;
-                        getLineInfo(devCode);
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            String devCode = etLineCode.getText().toString().trim();
+                            if (TextUtils.isEmpty(devCode)) {
+                                CommonUtil.toastNoRepeat(mActivity, "请输入线别");
+                            } else {
+                                mIgnoreFocusChange = true;
+                                getLineInfo(devCode);
+                            }
+                            return true;
+                        default:
+                            return true;
                     }
-                    return true;
                 }
                 return false;
             }
@@ -224,13 +227,25 @@ public class SCSMTFragment extends BaseFragment implements View.OnClickListener,
         etJobCode.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            //disposeClick();
+                            String trim = etJobCode.getText().toString().trim();
+                            //getPasteBarcodeData(trim,isPasteBarcode);
+                            return true;
+                        default:
+                            return true;
+                    }
+                }
+
+
                 if (actionId == EditorInfo.IME_ACTION_SEND
                         || actionId == EditorInfo.IME_ACTION_DONE
                         || actionId == EditorInfo.IME_ACTION_GO
                         || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    //disposeClick();
-                    String trim = etJobCode.getText().toString().trim();
-                    //getPasteBarcodeData(trim,isPasteBarcode);
+
                     return true;
                 }
                 return false;
@@ -814,54 +829,55 @@ public class SCSMTFragment extends BaseFragment implements View.OnClickListener,
         edit_et.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_DONE
-                        || actionId == EditorInfo.IME_ACTION_SEND
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    String mSearchStr = edit_et.getText().toString().trim();
-                    if (!mSearchStr.isEmpty()) {
-                        List<SmtWorkorder> thisList = new ArrayList<>();
-                        for (int i = 0; i < smtWorkorderList.size(); i++) {
-                            if (smtWorkorderList.get(i).getPS_PROCESSCODE().contains(mSearchStr) || smtWorkorderList.get(i).getPS_PRODCODE().contains(mSearchStr)) {
-                                thisList.add(smtWorkorderList.get(i));
-                            }
-                            if (i == smtWorkorderList.size() - 1) {
-                                smtWorkorderAdapter = new SmtWorkorderAdapter(thisList);
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            String mSearchStr = edit_et.getText().toString().trim();
+                            if (!mSearchStr.isEmpty()) {
+                                List<SmtWorkorder> thisList = new ArrayList<>();
+                                for (int i = 0; i < smtWorkorderList.size(); i++) {
+                                    if (smtWorkorderList.get(i).getPS_PROCESSCODE().contains(mSearchStr) || smtWorkorderList.get(i).getPS_PRODCODE().contains(mSearchStr)) {
+                                        thisList.add(smtWorkorderList.get(i));
+                                    }
+                                    if (i == smtWorkorderList.size() - 1) {
+                                        smtWorkorderAdapter = new SmtWorkorderAdapter(thisList);
+                                        rv_line_ip_port_data.setAdapter(smtWorkorderAdapter);
+                                        LogUtil.i("mSearchStr", JSON.toJSONString(thisList));
+                                    }
+                                    List<SmtWorkorder> lineCodeEntities = smtWorkorderAdapter.getmList();
+                                    for (int j = 0; j < lineCodeEntities.size(); j++) {
+                                        lineCodeEntities.get(j).setIsSelect(false);
+                                    }
+                                    smtWorkorderAdapter.notifyDataSetChanged();
+                                }
+                            } else {
+                                smtWorkorderAdapter = new SmtWorkorderAdapter(smtWorkorderList);
                                 rv_line_ip_port_data.setAdapter(smtWorkorderAdapter);
-                                LogUtil.i("mSearchStr", JSON.toJSONString(thisList));
-                            }
-                            List<SmtWorkorder> lineCodeEntities = smtWorkorderAdapter.getmList();
-                            for (int j = 0; j < lineCodeEntities.size(); j++) {
-                                lineCodeEntities.get(j).setIsSelect(false);
-                            }
-                            smtWorkorderAdapter.notifyDataSetChanged();
-                        }
-
-
-                    } else {
-                        smtWorkorderAdapter = new SmtWorkorderAdapter(smtWorkorderList);
-                        rv_line_ip_port_data.setAdapter(smtWorkorderAdapter);
-                        List<SmtWorkorder> lineCodeEntities = smtWorkorderAdapter.getmList();
-                        for (int i = 0; i < lineCodeEntities.size(); i++) {
-                            lineCodeEntities.get(i).setIsSelect(false);
-                        }
-                        smtWorkorderAdapter.notifyDataSetChanged();
-
-                    }
-                    smtWorkorderAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+                                List<SmtWorkorder> lineCodeEntities = smtWorkorderAdapter.getmList();
+                                for (int i = 0; i < lineCodeEntities.size(); i++) {
+                                    lineCodeEntities.get(i).setIsSelect(false);
+                                }
+                                smtWorkorderAdapter.notifyDataSetChanged();
 
-                        @Override
-                        public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
-                            List<SmtWorkorder> ipAndPortBeans = smtWorkorderAdapter.getmList();
-                            processcode = ipAndPortBeans.get(position).getPS_PROCESSCODE();
-                            prodcode = ipAndPortBeans.get(position).getPS_PRODCODE();
-                            for (int i = 0; i < ipAndPortBeans.size(); i++) {
-                                ipAndPortBeans.get(i).setIsSelect(false);
                             }
-                            ipAndPortBeans.get(position).setIsSelect(true);
-                            smtWorkorderAdapter.notifyDataSetChanged();
-                        }
-                    });
-                    return true;
+                            smtWorkorderAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+                                @Override
+                                public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                                    List<SmtWorkorder> ipAndPortBeans = smtWorkorderAdapter.getmList();
+                                    processcode = ipAndPortBeans.get(position).getPS_PROCESSCODE();
+                                    prodcode = ipAndPortBeans.get(position).getPS_PRODCODE();
+                                    for (int i = 0; i < ipAndPortBeans.size(); i++) {
+                                        ipAndPortBeans.get(i).setIsSelect(false);
+                                    }
+                                    ipAndPortBeans.get(position).setIsSelect(true);
+                                    smtWorkorderAdapter.notifyDataSetChanged();
+                                }
+                            });
+                            return true;
+                        default:
+                            return true;
+                    }
                 }
                 return false;
             }

app/src/main/java/com/uas/huiyan/fragment/SCSMTInFragment.java

@@ -136,13 +136,17 @@ public class SCSMTInFragment extends BaseFragment implements View.OnClickListene
         mCollectEditText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                String collect = mCollectEditText.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;
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            String collect = mCollectEditText.getText().toString().trim();
+                            if (!TextUtils.isEmpty(collect)) {
+                                confirmEvent(collect);
+                            }
+                            return true;
+                        default:
+                            return true;
                     }
                 }
                 return false;

app/src/main/java/com/uas/huiyan/fragment/SCSMTInspectionFragment.java

@@ -221,13 +221,17 @@ public class SCSMTInspectionFragment extends BaseFragment implements View.OnClic
         mCollectEditText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                String collect = mCollectEditText.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;
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            String collect = mCollectEditText.getText().toString().trim();
+                            if (!TextUtils.isEmpty(collect)) {
+                                confirmEvent(collect);
+                            }
+                            return true;
+                        default:
+                            return true;
                     }
                 }
                 return false;

app/src/main/java/com/uas/huiyan/fragment/SCSMTJointFragment.java

@@ -34,7 +34,6 @@ import com.uas.huiyan.tools.VolleyUtil;
 import com.uas.huiyan.util.CommonUtil;
 import com.uas.huiyan.util.Constants;
 import com.uas.huiyan.util.JsonUtils;
-import com.uas.huiyan.util.MyLog;
 import com.uas.huiyan.view.ClearableEditText;
 import com.uas.huiyan.view.TextViewWithButton;
 
@@ -145,13 +144,17 @@ public class SCSMTJointFragment extends BaseFragment implements View.OnClickList
         mCollectEditText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                String collect = mCollectEditText.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;
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            String collect = mCollectEditText.getText().toString().trim();
+                            if (!TextUtils.isEmpty(collect)) {
+                                confirmEvent(collect);
+                            }
+                            return true;
+                        default:
+                            return true;
                     }
                 }
                 return false;
@@ -176,7 +179,6 @@ public class SCSMTJointFragment extends BaseFragment implements View.OnClickList
         cb_xiaoyan.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                MyLog.e("aaa","勾选框的值：" + isChecked + ",是否输入了站位：" + isScanLocation);
                 if (isScanLocation) {
                     cb_xiaoyan.setChecked(isLocationState);
                 }
@@ -299,8 +301,9 @@ public class SCSMTJointFragment extends BaseFragment implements View.OnClickList
                 new Response.Listener<String>() {
                     @Override
                     public void onResponse(String s) {
-                        if (progressDialog.isShowing())
+                        if (progressDialog.isShowing()) {
                             progressDialog.dismiss();
+                        }
                         try {
                             JSONObject resultObject = new JSONObject(s);
                             JSONObject dataObject = resultObject.optJSONObject("data");
@@ -337,7 +340,6 @@ public class SCSMTJointFragment extends BaseFragment implements View.OnClickList
                         tvMsgNotice.setTextColor(getResources().getColor(R.color.red));
                         tvMsgNotice.setText(errorToast);
                         mLocationTextView.setText(null);
-                        setCbState(false);
                     }
                 }) {
             @Override
@@ -365,8 +367,9 @@ public class SCSMTJointFragment extends BaseFragment implements View.OnClickList
                 new Response.Listener<String>() {
                     @Override
                     public void onResponse(String s) {
-                        if (progressDialog.isShowing())
+                        if (progressDialog.isShowing()) {
                             progressDialog.dismiss();
+                        }
                         joinDataCheck(collect, location, "原物料号校验正确", true);
                     }
                 },
@@ -380,7 +383,6 @@ public class SCSMTJointFragment extends BaseFragment implements View.OnClickList
                         mCollectEditText.setText("");
                         tvMsgNotice.setTextColor(getResources().getColor(R.color.red));
                         tvMsgNotice.setText(errorToast);
-                        setCbState(false);
                     }
                 }) {
             @Override
@@ -525,6 +527,7 @@ public class SCSMTJointFragment extends BaseFragment implements View.OnClickList
 
                                 mSmtDslBean = new SmtDslBean();
                                 mCollectEditText.setHint("请采集接料站位");
+                                setCbState(false);
                             }
                         } catch (JSONException e) {
                             e.printStackTrace();
@@ -769,7 +772,6 @@ public class SCSMTJointFragment extends BaseFragment implements View.OnClickList
             case VolleyUtil.FRAGMENT_SCMAKE_SMTJOINT_BARREMAIN:
                 tmpJson = (JSONObject) msg.obj;
                 disposeBarcodeSuccess(tmpJson);
-                setCbState(false);
                 break;
             //接料成功
             case VolleyUtil.FRAGMENT_SCMAKE_SMTJOINT_JOINT:

app/src/main/java/com/uas/huiyan/fragment/SolderChargingFragment.java

@@ -159,12 +159,16 @@ public class SolderChargingFragment extends BaseFragment {
         ct_id.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_DONE
-                        || actionId == EditorInfo.IME_ACTION_SEND
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    String va_code = ct_id.getText().toString().trim();
-                    getfuzzySearchData(va_code,"");
-                    return true;
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            String va_code = ct_id.getText().toString().trim();
+                            getfuzzySearchData(va_code,"");
+                            return true;
+                        default:
+                            return true;
+                    }
                 }
                 return false;
             }

app/src/main/java/com/uas/huiyan/fragment/SolderPasteManageFragment.java

@@ -62,8 +62,8 @@ public class SolderPasteManageFragment extends BaseFragment {
                 SolderOperateFragment.class, createArgument(Constants.CONSTANT.EXTRA_WHICH_PAGE, SOLDER_RECYCLE)));
         mMenuBeanList.add(new CommonMenuBean("日志查询", R.drawable.ic_solder_query,
                 SolderOperateFragment.class, createArgument(Constants.CONSTANT.EXTRA_WHICH_PAGE, SOLDER_QUERY)));
-        mMenuBeanList.add(new CommonMenuBean("钢网管控", R.drawable.ic_solder_charging, SteelMeshControlFragment.class));
-        mMenuBeanList.add(new CommonMenuBean("MSD管理", R.drawable.storage_msd_manager, MSDManageFragment.class));
+//        mMenuBeanList.add(new CommonMenuBean("钢网管控", R.drawable.ic_solder_charging, SteelMeshControlFragment.class));
+//        mMenuBeanList.add(new CommonMenuBean("MSD管理", R.drawable.storage_msd_manager, MSDManageFragment.class));
         mCommonMenuAdapter = new CommonMenuAdapter(mMenuBeanList);
         mMenuRecyclerView.setAdapter(mCommonMenuAdapter);
     }

app/src/main/java/com/uas/huiyan/fragment/SpecialMaterialOutFragment.java

@@ -280,11 +280,15 @@ public class SpecialMaterialOutFragment extends BaseFragment {
         mBarcodeEditText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_DONE
-                        || actionId == EditorInfo.IME_ACTION_SEND
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    getBarcodeData();
-                    return true;
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            getBarcodeData();
+                            return true;
+                        default:
+                            return true;
+                    }
                 }
                 return false;
             }

app/src/main/java/com/uas/huiyan/fragment/StockBarcodeListFragment.java

@@ -167,20 +167,23 @@ public class StockBarcodeListFragment extends BaseFragment implements View.OnCli
         mSearchEditText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_DONE
-                        || actionId == EditorInfo.IME_ACTION_SEND
-                        || actionId == EditorInfo.IME_ACTION_SEARCH
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    mPage = 1;
-                    mBarcodeItemBeans.clear();
-                    if (mSearchEditText.getText() == null || mSearchEditText.getText().toString().trim().length() == 0) {
-                        mKeyword = null;
-                        getStockBarocdeList();
-                    } else {
-                        mKeyword = mSearchEditText.getText().toString().trim();
-                        searchEvent();
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            mPage = 1;
+                            mBarcodeItemBeans.clear();
+                            if (mSearchEditText.getText() == null || mSearchEditText.getText().toString().trim().length() == 0) {
+                                mKeyword = null;
+                                getStockBarocdeList();
+                            } else {
+                                mKeyword = mSearchEditText.getText().toString().trim();
+                                searchEvent();
+                            }
+                            return true;
+                        default:
+                            return true;
                     }
-                    return true;
                 }
                 return false;
             }

app/src/main/java/com/uas/huiyan/fragment/StorageIQCInFragment.java

@@ -147,12 +147,16 @@ public class StorageIQCInFragment extends BaseFragment implements View.OnClickLi
         mBarcodeEditText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_DONE
-                        || actionId == EditorInfo.IME_ACTION_SEND
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    String barcode = mBarcodeEditText.getText().toString().trim();
-                    getDataByBarcode(barcode);
-                    return true;
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            String barcode = mBarcodeEditText.getText().toString().trim();
+                            getDataByBarcode(barcode);
+                            return true;
+                        default:
+                            return true;
+                    }
                 }
                 return false;
             }

app/src/main/java/com/uas/huiyan/fragment/StorageInspectionFragment.java

@@ -114,12 +114,16 @@ public class StorageInspectionFragment extends BaseFragment implements View.OnCl
         mBarcodeEditText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_DONE
-                        || actionId == EditorInfo.IME_ACTION_SEND
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    String barcode = mBarcodeEditText.getText().toString().trim();
-                    getDataByBarcode(barcode);
-                    return true;
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            String barcode = mBarcodeEditText.getText().toString().trim();
+                            getDataByBarcode(barcode);
+                            return true;
+                        default:
+                            return true;
+                    }
                 }
                 return false;
             }

app/src/main/java/com/uas/huiyan/fragment/StorageRechargeFragment.java

@@ -171,12 +171,16 @@ public class StorageRechargeFragment extends BaseFragment implements View.OnClic
         mBarcodeEditText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_DONE
-                        || actionId == EditorInfo.IME_ACTION_SEND
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    String barcode = mBarcodeEditText.getText().toString().trim();
-                    getDataByBarcode(barcode);
-                    return true;
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            String barcode = mBarcodeEditText.getText().toString().trim();
+                            getDataByBarcode(barcode);
+                            return true;
+                        default:
+                            return true;
+                    }
                 }
                 return false;
             }

app/src/main/java/com/uas/huiyan/fragment/VersionUpgradeFragment.java

@@ -185,8 +185,7 @@ public class VersionUpgradeFragment extends BaseFragment implements ProgressResp
                         File apk = new File(Constants.CONSTANT.APK_FILE_PATH, Constants.CONSTANT.APK_FILE_NAME);
                         Intent intent = new Intent(Intent.ACTION_VIEW);
                         if (Build.VERSION.SDK_INT >= 24) {
-                            Uri apkUri = FileProvider.getUriForFile(mActivity,
-                                    "com.uas.huiyan.fileprovider", apk);
+                            Uri apkUri = FileProvider.getUriForFile(mActivity, "com.uas.huiyan.fileprovider", apk);
                             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                             intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
                             intent.setDataAndType(apkUri, "application/vnd.android.package-archive");

app/src/main/java/com/uas/huiyan/fragment/WHBatchBreakPackageFragment.java

@@ -101,11 +101,15 @@ public class WHBatchBreakPackageFragment extends BaseFragment implements VolleyU
         etOutbox.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_DONE
-                        || actionId == EditorInfo.IME_ACTION_SEND
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    disposeOnClickEnterOutbox();
-                    return true;
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            disposeOnClickEnterOutbox();
+                            return true;
+                        default:
+                            return true;
+                    }
                 }
                 return false;
             }
@@ -114,11 +118,15 @@ public class WHBatchBreakPackageFragment extends BaseFragment implements VolleyU
         etInnerCode.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_DONE
-                        || actionId == EditorInfo.IME_ACTION_SEND
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    disposeOnClickEnterInnerCode();
-                    return true;
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            disposeOnClickEnterInnerCode();
+                            return true;
+                        default:
+                            return true;
+                    }
                 }
                 return false;
             }

app/src/main/java/com/uas/huiyan/fragment/WHBreakingBatchFragment.java

@@ -259,32 +259,36 @@ public class WHBreakingBatchFragment extends BaseFragment implements View.OnClic
         etOrBarcode.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_SEND
-                        || actionId == EditorInfo.IME_ACTION_DONE
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    String str = etOrBarcode.getText().toString().trim();
-                    if (TextUtils.isEmpty(str)) {
-                        etOrBarcode.setWarnIconVisible();
-                        return true;
-                    }
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            String str = etOrBarcode.getText().toString().trim();
+                            if (TextUtils.isEmpty(str)) {
+                                etOrBarcode.setWarnIconVisible();
+                                return true;
+                            }
 
-                    if (!str.matches(Constants.REGEX.NO_CN_SYMBOL)) {
-                        CommonUtil.toastNoRepeat(getActivity(), getResources().getString(R.string.barcode_cannot_contain_special));
-                        etOrBarcode.setText("");
-                        etOrBarcode.postDelayed(new Runnable() {
-                            @Override
-                            public void run() {
-                                etOrBarcode.requestFocus();
+                            if (!str.matches(Constants.REGEX.NO_CN_SYMBOL)) {
+                                CommonUtil.toastNoRepeat(getActivity(), getResources().getString(R.string.barcode_cannot_contain_special));
+                                etOrBarcode.setText("");
+                                etOrBarcode.postDelayed(new Runnable() {
+                                    @Override
+                                    public void run() {
+                                        etOrBarcode.requestFocus();
+                                    }
+                                }, 100);
+                                return true;
                             }
-                        }, 100);
-                        return true;
-                    }
 
-                    CommonUtil.closeKeybord(etOrBarcode, mActivity);
-                    //请求详细数据
-                    getLoadingView();
-                    barcodeEnterEvent(str);
-                    return true;
+                            CommonUtil.closeKeybord(etOrBarcode, mActivity);
+                            //请求详细数据
+                            getLoadingView();
+                            barcodeEnterEvent(str);
+                            return true;
+                        default:
+                            return true;
+                    }
                 }
                 return false;
             }

app/src/main/java/com/uas/huiyan/fragment/WHCombineBatchFragment.java

@@ -226,27 +226,31 @@ public class WHCombineBatchFragment extends BaseFragment implements View.OnClick
         etBarCode.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_SEND
-                        || actionId == EditorInfo.IME_ACTION_DONE
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    String str = etBarCode.getText().toString().trim();
-                    etBarCode.setText("");
-                    if (TextUtils.isEmpty(str)) {
-                        ((ClearableEditText) etBarCode).setWarnIconVisible();
-                        return true;
-                    }
-                    for (int i = 0; i < dataList.size(); i++) {
-                        if (str.equals(dataList.get(i).getBAR_CODE())) {
-                            Toast.makeText(getActivity().getApplicationContext(), "条码重复", Toast.LENGTH_LONG).show();
-                            CommonUtil.editTextGetFocus(etBarCode);
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            String str = etBarCode.getText().toString().trim();
+                            etBarCode.setText("");
+                            if (TextUtils.isEmpty(str)) {
+                                ((ClearableEditText) etBarCode).setWarnIconVisible();
+                                return true;
+                            }
+                            for (int i = 0; i < dataList.size(); i++) {
+                                if (str.equals(dataList.get(i).getBAR_CODE())) {
+                                    Toast.makeText(getActivity().getApplicationContext(), "条码重复", Toast.LENGTH_LONG).show();
+                                    CommonUtil.editTextGetFocus(etBarCode);
+                                    return true;
+                                }
+                            }
+                            CommonUtil.closeKeybord(etBarCode, mActivity);
+                            getLoadingView();
+                            confirmBtnClick(str);
+                            etBarCode.setText("");
+                            return true;
+                        default:
                             return true;
-                        }
                     }
-                    CommonUtil.closeKeybord(etBarCode, mActivity);
-                    getLoadingView();
-                    confirmBtnClick(str);
-                    etBarCode.setText("");
-                    return true;
                 }
                 return false;
             }

app/src/main/java/com/uas/huiyan/fragment/WHRevokeStockFragment.java

@@ -233,11 +233,15 @@ public class WHRevokeStockFragment extends BaseFragment {
         mBarcodeEditText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_SEND
-                        || actionId == EditorInfo.IME_ACTION_SEARCH
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    getSonBarcode();
-                    return true;
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            getSonBarcode();
+                            return true;
+                        default:
+                            return true;
+                    }
                 }
                 return false;
             }

app/src/main/java/com/uas/huiyan/fragment/WHTransferLocationFragment.java

@@ -106,12 +106,15 @@ public class WHTransferLocationFragment extends BaseFragment implements Compound
         etCode.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_DONE
-                        || actionId == EditorInfo.IME_ACTION_SEND
-                        || actionId == EditorInfo.IME_ACTION_GO
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    disposeConfirmClickEnter();
-                    return true;
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            disposeConfirmClickEnter();
+                            return true;
+                        default:
+                            return true;
+                    }
                 }
                 return false;
             }
@@ -120,12 +123,15 @@ public class WHTransferLocationFragment extends BaseFragment implements Compound
         etNewLocation.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_DONE
-                        || actionId == EditorInfo.IME_ACTION_SEND
-                        || actionId == EditorInfo.IME_ACTION_GO
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    disposeTransferClickEnter();
-                    return true;
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            disposeTransferClickEnter();
+                            return true;
+                        default:
+                            return true;
+                    }
                 }
                 return false;
             }

app/src/main/java/com/uas/huiyan/fragment/WorkOrderSearchFragment.java

@@ -183,9 +183,18 @@ public class WorkOrderSearchFragment extends BaseFragment {
         mSearch.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                String code = mSearch.getText().toString().trim();
-                if (actionId == EditorInfo.IME_ACTION_UNSPECIFIED && !StringUtil.isEmpty(code)){
-                    getLastBean(code);
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            String code = mSearch.getText().toString().trim();
+                            if (actionId == EditorInfo.IME_ACTION_UNSPECIFIED && !StringUtil.isEmpty(code)){
+                                getLastBean(code);
+                            }
+                            return true;
+                        default:
+                            return true;
+                    }
                 }
                 return false;
             }

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

@@ -1024,9 +1024,9 @@ public class GloableParams {
     public static final String GRIDNAME_INOUT_STORAGE = "出入库";
     public static final String GRIDNAME_SHOPCONTENT = "车间管理";
     public static final String GRIDNAME_STORAGE_MANAGER = "仓库管理";
-    public static final String GRIDNAME_MSD_MANAGER = "MSD管理";
     public static final String GRIDNAME_SMTMATERIAL_ADD = "SMT上料";
     public static final String GRIDNAME_SOLDER_MANAGER = "锡膏管理";
+    public static final String GRIDNAME_MSD_MANAGER = "MSD管理";
     public static final String GRIDNAME_SETTING = "设置";
     public static final String GRIDNAME_MODIFY_QUANTITY2 = "条码数量修改";
     public static final String GRIDNAME_POST_STOCK = "岗位备料";
@@ -1041,13 +1041,13 @@ public class GloableParams {
             //            GRIDNAME_STORAGE_MANAGER,
             GRIDNAME_POST_STOCK,
             GRIDNAME_MODIFY_QUANTITY2,
-            //            GRIDNAME_MSD_MANAGER,
-            GRIDNAME_SMTMATERIAL_ADD,GRIDNAME_SOLDER_MANAGER
-                        ,
+            GRIDNAME_SMTMATERIAL_ADD,
+            GRIDNAME_SOLDER_MANAGER,
 //            POSTPUNCH,
 //            HOME_DISPATCH_MANAGE,
             FINISHED_PRODUCT_STORAGE,
 //            OBTAIN_RANKING_CHART,
+            GRIDNAME_MSD_MANAGER,
             GRIDNAME_SETTING
     };
     public static int[] indexMainGridImgs = {
@@ -1055,13 +1055,14 @@ public class GloableParams {
             R.drawable.mainmenu_workhousemanager,
             //            R.drawable.mainmenu_storehousemanager,
             R.drawable.ic_modify_quantity,
-            //            R.drawable.storage_msd_manager,
+
             R.drawable.ic_smt_feed,
                         R.drawable.ic_solder_manage,
 //            R.drawable.iv_postpunch,
 //            R.drawable.ic_dispatch_manage,
             R.drawable.ic_finished_product_storage,
 //            R.drawable.paiweitu,
+            R.drawable.storage_msd_manager,
             R.drawable.mainmenu_usersetting
     };
 

app/src/main/java/com/uas/huiyan/util/CommonUtil.java

@@ -571,9 +571,11 @@ public class CommonUtil {
             if (errorMsg != null && errorMsg.exceptionInfo != null) {
                 errorStr = errorMsg.exceptionInfo;
             } else {
-                errorStr = "系统错误";
+//                errorStr = "系统错误";
+                errorStr = new String(volleyError.networkResponse.data);
             }
         }
+        MyLog.d("aaa","接口错误信息：" + errorStr);
         //振动提示
         makeNotice();
         /*MediaPlayer mp = new MediaPlayer();
@@ -849,13 +851,25 @@ public class CommonUtil {
         editText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView textView, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_SEND
-                        || actionId == EditorInfo.IME_ACTION_DONE
-                        || actionId == EditorInfo.IME_ACTION_NEXT
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    String text = textView.getText().toString().trim();
-                    myEditorActionListener.MyEditorAction(text, actionId, event);
-                    return true;
+//                if (actionId == EditorInfo.IME_ACTION_SEND
+//                        || actionId == EditorInfo.IME_ACTION_DONE
+//                        || actionId == EditorInfo.IME_ACTION_NEXT
+//                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+//                    String text = textView.getText().toString().trim();
+//                    myEditorActionListener.MyEditorAction(text, actionId, event);
+//                    return true;
+//                }
+                //解决部分PDA机器的重复调用,(按下和抬起都执行一次)
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            String text = textView.getText().toString().trim();
+                            myEditorActionListener.MyEditorAction(text, actionId, event);
+                            return true;
+                        default:
+                            return true;
+                    }
                 }
                 return false;
             }

app/src/main/java/com/uas/huiyan/util/FileUtils.java

@@ -15,6 +15,7 @@ import java.io.InputStream;
 import java.security.SecureRandom;
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
+import java.util.Calendar;
 
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLContext;
@@ -29,7 +30,7 @@ import okhttp3.OkHttpClient;
 import okhttp3.Request;
 
 /**
- * Created by RaoMeng on 2017/3/27.
+ * 文件管理
  */
 public class FileUtils {
     public static File getAssetsFileToCacheDir(Context context, String fileName) {
@@ -116,6 +117,7 @@ public class FileUtils {
         }
     }
 
+    //删除所有文件
     public static boolean delAllFile(String path) {
         boolean flag = false;
         File file = new File(path);
@@ -282,4 +284,66 @@ public class FileUtils {
             return true;
         }
     }
+
+    /**
+     * 判断文件是否为当天创建（使用最后修改时间）
+     * Android 7.0推荐使用此方法
+     */
+    public static boolean isFileCreatedToday(File file) {
+        if (file == null || !file.exists()) {
+            return false;
+        }
+
+        // 获取文件的最后修改时间
+        long lastModified = file.lastModified();
+
+        // 获取当前时间的Calendar
+        Calendar today = Calendar.getInstance();
+
+        // 获取文件时间的Calendar
+        Calendar fileDate = Calendar.getInstance();
+        fileDate.setTimeInMillis(lastModified);
+
+        // 比较年、月、日是否相同
+        return today.get(Calendar.YEAR) == fileDate.get(Calendar.YEAR) &&
+                today.get(Calendar.MONTH) == fileDate.get(Calendar.MONTH) &&
+                today.get(Calendar.DAY_OF_MONTH) == fileDate.get(Calendar.DAY_OF_MONTH);
+    }
+
+    /**
+     * 获取文件创建时间的字符串表示
+     */
+    public static String getFileCreationTimeString(File file) {
+        if (file == null || !file.exists()) {
+            return "文件不存在";
+        }
+
+        long lastModified = file.lastModified();
+        Calendar cal = Calendar.getInstance();
+        cal.setTimeInMillis(lastModified);
+
+        return String.format("%04d-%02d-%02d %02d:%02d:%02d",
+                cal.get(Calendar.YEAR),
+                cal.get(Calendar.MONTH) + 1, // 月份从0开始
+                cal.get(Calendar.DAY_OF_MONTH),
+                cal.get(Calendar.HOUR_OF_DAY),
+                cal.get(Calendar.MINUTE),
+                cal.get(Calendar.SECOND));
+    }
+
+    /**
+     * 格式化文件大小
+     */
+    public static String formatFileSize(long size) {
+        if (size < 1024) {
+            return size + " B";
+        } else if (size < 1024 * 1024) {
+            return String.format("%.2f KB", size / 1024.0);
+        } else if (size < 1024 * 1024 * 1024) {
+            return String.format("%.2f MB", size / (1024.0 * 1024));
+        } else {
+            return String.format("%.2f GB", size / (1024.0 * 1024 * 1024));
+        }
+    }
+
 }

app/src/main/java/com/uas/huiyan/util/MyLog.java

@@ -1,13 +1,25 @@
 package com.uas.huiyan.util;
 
 import android.annotation.SuppressLint;
+import android.os.Build;
+import android.support.annotation.RequiresApi;
 import android.util.Log;
 
+import com.uas.huiyan.application.PdaApplication;
+
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.nio.file.attribute.FileTime;
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.util.Date;
 
 /**
@@ -15,147 +27,205 @@ import java.util.Date;
  */
 @SuppressLint("SimpleDateFormat")
 public class MyLog {
-	public static Boolean MYLOG_SWITCH = true; // 日志文件总开关
-	private static Boolean MYLOG_WRITE_TO_FILE = true;// 日志写入文件开关
-	private static char MYLOG_TYPE = 'v';// 输入日志类型，w代表只输出告警信息等，v代表输出所有信息
-	@SuppressLint("SdCardPath")
-	private static String MYLOG_PATH_SDCARD_DIR1 = "/sdcard/MSShow";    // 日志文件在sdcard中的路径
-	private static String MYLOG_PATH_SDCARD_DIR2 = "/Log";
-	private static String MYLOG_PATH_SDCARD_DIR = MYLOG_PATH_SDCARD_DIR1+MYLOG_PATH_SDCARD_DIR2;
-	private static String MYLOGFILEName = "Log.txt";// 本类输出的日志文件名称
-
-	@SuppressLint("SimpleDateFormat")
-	private static SimpleDateFormat myLogSdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");// 日志的输出格式
-
-	private static boolean isDebug = true;		//普通log的开关
-	private static String TAG = "英唐" +"-----------";
-
-	public static void e(String msg){
-		if(isDebug){
-			Log.e(TAG, msg);
-		}
-	}
-
-	public static void w(String msg){
-		if(isDebug){
-			Log.w(TAG, msg);
-		}
-	}
-
-	public static void d(String msg){
-		if(isDebug){
-			Log.d(TAG, msg);
-		}
-	}
-
-	public static void i(String msg){
-		if(isDebug){
-			Log.i(TAG, msg);
-		}
-	}
-
-	public static void w(String tag, Object msg) { // 警告信息
-		log(tag, msg.toString(), 'w');
-	}
-
-	public static void e(String tag, Object msg) { // 错误信息
-		log(tag, msg.toString(), 'e');
-	}
-
-	public static void d(String tag, Object msg) {// 调试信息
-		log(tag, msg.toString(), 'd');
-	}
-
-	public static void i(String tag, Object msg) {//
-		log(tag, msg.toString(), 'i');
-	}
-
-	public static void v(String tag, Object msg) {
-		log(tag, msg.toString(), 'v');
-	}
-
-	public static void w(String tag, String text) {
-		log(tag, text, 'w');
-	}
-
-	public static void e(String tag, String text) {
-		log(tag, text, 'e');
-	}
-
-	public static void d(String tag, String text) {
-		log(tag, text, 'd');
-	}
-
-	public static void i(String tag, String text) {
-		log(tag, text, 'i');
-	}
-
-	public static void v(String tag, String text) {
-		log(tag, text, 'v');
-	}
-
-	/**
-	 * 根据tag, msg和等级，输出日志
-	 */
-	private static void log(String tag, String msg, char level) {
-		msg = "\r\n"+msg;
-		if (MYLOG_SWITCH) {
-			if ('e' == level && ('e' == MYLOG_TYPE || 'v' == MYLOG_TYPE)) { // 输出错误信息
-				Log.e(tag, msg);
-			} else if ('w' == level && ('w' == MYLOG_TYPE || 'v' == MYLOG_TYPE)) {
-				Log.w(tag, msg);
-			} else if ('d' == level && ('d' == MYLOG_TYPE || 'v' == MYLOG_TYPE)) {
-				Log.d(tag, msg);
-			} else if ('i' == level && ('d' == MYLOG_TYPE || 'v' == MYLOG_TYPE)) {
-				Log.i(tag, msg);
-			} else {
-				Log.v(tag, msg);
-			}
-			if (MYLOG_WRITE_TO_FILE) {
-				writeLogtoFile(String.valueOf(level), tag, msg);
-			}
-		}
-	}
-
-	/**
-	 * 打开日志文件并写入日志
-	 * **/
-	private static void writeLogtoFile(String mylogtype, String tag, String text) {// 新建或打开日志文件
-		isExist(MYLOG_PATH_SDCARD_DIR1);
-		isExist(MYLOG_PATH_SDCARD_DIR);
-		Date nowtime = new Date();
-//		String needWriteFiel = logfile.format(nowtime);
-		String needWriteMessage = myLogSdf.format(nowtime) + "    " + mylogtype
-				+ "    " + tag + "    " + text;
-		File file = new File(MYLOG_PATH_SDCARD_DIR, MYLOGFILEName);
-		try {
-			FileWriter filerWriter = new FileWriter(file, true);// 后面这个参数代表是不是要接上文件中原来的数据，不进行覆盖
-			BufferedWriter bufWriter = new BufferedWriter(filerWriter);
-			bufWriter.write(needWriteMessage);
-			bufWriter.newLine();
-			bufWriter.close();
-			filerWriter.close();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * 删除制定的日志文件
-	 * */
-	public static void delFile() {// 删除日志文件
-		File file = new File(MYLOG_PATH_SDCARD_DIR, MYLOGFILEName);
-		if (file.exists()) {
-			file.delete();
-		}
-	}
-
-	public static void isExist(String path) {
-		File file = new File(path);
-		// 判断文件夹是否存在,如果不存在则创建文件夹
-		if (!file.exists()) {
-			file.mkdir();
-		}
-
-	}
+    public static Boolean MYLOG_SWITCH = true; // 日志文件总开关
+    private static Boolean MYLOG_WRITE_TO_FILE = true;// 日志写入文件开关
+    private static char MYLOG_TYPE = 'v';// 输入日志类型，w代表只输出告警信息等，v代表输出所有信息
+    @SuppressLint("SdCardPath")
+//    private static String MYLOG_PATH_SDCARD_DIR1 = "/sdcard/MSShow";    // 日志文件在sdcard中的路径
+//    private static String MYLOG_PATH_SDCARD_DIR1 = "/data/data/" + PdaApplication.getmContext().getPackageName();  //APP包下创建的文件不需要权限
+    private static String MYLOG_PATH_SDCARD_DIR1 = "/sdcard/Android/data/" + PdaApplication.getmContext().getPackageName();  //模拟器的APP包下创建的文件
+    private static String MYLOG_PATH_SDCARD_DIR2 = "/Log";
+    private static String MYLOG_PATH_SDCARD_DIR = MYLOG_PATH_SDCARD_DIR1 + MYLOG_PATH_SDCARD_DIR2;
+    private static String MYLOGFILEName = "Log.txt";// 本类输出的日志文件名称
+
+    @SuppressLint("SimpleDateFormat")
+    private static SimpleDateFormat myLogSdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");// 日志的输出格式
+
+    private static boolean isDebug = true;        //普通log的开关
+    private static String TAG = "英唐" + "-----------";
+
+    public static void e(String msg) {
+        if (isDebug) {
+            Log.e(TAG, msg);
+        }
+    }
+
+    public static void w(String msg) {
+        if (isDebug) {
+            Log.w(TAG, msg);
+        }
+    }
+
+    public static void d(String msg) {
+        if (isDebug) {
+            Log.d(TAG, msg);
+        }
+    }
+
+    public static void i(String msg) {
+        if (isDebug) {
+            Log.i(TAG, msg);
+        }
+    }
+
+    public static void w(String tag, Object msg) { // 警告信息
+        log(tag, msg.toString(), 'w');
+    }
+
+    public static void e(String tag, Object msg) { // 错误信息
+        log(tag, msg.toString(), 'e');
+    }
+
+    public static void d(String tag, Object msg) {// 调试信息
+        log(tag, msg.toString(), 'd');
+    }
+
+    public static void i(String tag, Object msg) {//
+        log(tag, msg.toString(), 'i');
+    }
+
+    public static void v(String tag, Object msg) {
+        log(tag, msg.toString(), 'v');
+    }
+
+    public static void w(String tag, String text) {
+        log(tag, text, 'w');
+    }
+
+    public static void e(String tag, String text) {
+        log(tag, text, 'e');
+    }
+
+    public static void d(String tag, String text) {
+        log(tag, text, 'd');
+    }
+
+    public static void i(String tag, String text) {
+        log(tag, text, 'i');
+    }
+
+    public static void v(String tag, String text) {
+        log(tag, text, 'v');
+    }
+
+    /**
+     * 根据tag, msg和等级，输出日志
+     */
+    private static void log(String tag, String msg, char level) {
+        msg = "\r\n" + msg;
+        if (MYLOG_SWITCH) {
+            if ('e' == level && ('e' == MYLOG_TYPE || 'v' == MYLOG_TYPE)) { // 输出错误信息
+                Log.e(tag, msg);
+            } else if ('w' == level && ('w' == MYLOG_TYPE || 'v' == MYLOG_TYPE)) {
+                Log.w(tag, msg);
+            } else if ('d' == level && ('d' == MYLOG_TYPE || 'v' == MYLOG_TYPE)) {
+                Log.d(tag, msg);
+            } else if ('i' == level && ('d' == MYLOG_TYPE || 'v' == MYLOG_TYPE)) {
+                Log.i(tag, msg);
+            } else {
+                Log.v(tag, msg);
+            }
+            if (MYLOG_WRITE_TO_FILE && 'd' == level) {
+                writeLogtoFile(String.valueOf(level), tag, msg);
+            }
+        }
+    }
+
+    /**
+     * 打开日志文件并写入日志，
+     **/
+    private static void writeLogtoFile(String mylogtype, String tag, String text) {
+    	// 新建或打开日志文件
+        isExist(MYLOG_PATH_SDCARD_DIR1);
+        isExist(MYLOG_PATH_SDCARD_DIR);
+        Date nowtime = new Date();
+        //		String needWriteFiel = logfile.format(nowtime);
+        String needWriteMessage = myLogSdf.format(nowtime) + "    " + mylogtype
+                + "    " + tag + "    " + text;
+        File file = new File(MYLOG_PATH_SDCARD_DIR, MYLOGFILEName);
+        try {
+            FileWriter filerWriter = new FileWriter(file, true);// 后面这个参数代表是不是要接上文件中原来的数据，不进行覆盖
+            BufferedWriter bufWriter = new BufferedWriter(filerWriter);
+            bufWriter.write(needWriteMessage);
+            bufWriter.newLine();
+            bufWriter.close();
+            filerWriter.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 删除制定的日志文件
+     */
+    public static void delFile() {// 删除日志文件
+        File file = new File(MYLOG_PATH_SDCARD_DIR, MYLOGFILEName);
+        if (file.exists()) {
+            file.delete();
+        }
+    }
+
+    public static void isExist(String path) {
+        File file = new File(path);
+        // 判断文件夹是否存在,如果不存在则创建文件夹
+        if (!file.exists()) {
+            file.mkdir();
+        }
+    }
+
+    /**
+     * 取消Android8.0的提示限制
+     */
+    @RequiresApi(api = Build.VERSION_CODES.O)
+    public static void delNotDayFile(){
+        File fileP = new File(MYLOG_PATH_SDCARD_DIR, MYLOGFILEName);
+        if (fileP.exists()) {
+            Path path = Paths.get(MYLOG_PATH_SDCARD_DIR + "/" + MYLOGFILEName); //文件路径
+            try {
+                // 获取文件的属性
+                BasicFileAttributes attrs = Files.readAttributes(path, BasicFileAttributes.class);
+                // 获取文件的创建时间
+                FileTime creationTime = attrs.creationTime();
+                // 转换为LocalDateTime以便于比较
+                //将FileTime对象转换为LocalDateTime以便于与当前日期进行比较。这里使用了系统的默认时区（ZoneId.systemDefault()）。如果需要特定时区，可以替换为相应的ZoneId。
+                //通过LocalDateTime 的 toLocalDate()方法将时间转换为仅包含日期（忽略时间），然后与当前日期进行比较。
+                LocalDateTime creationDateTime = creationTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+                LocalDateTime now = LocalDateTime.now();
+
+                // 比较是否为当天创建
+                if (isToday(creationDateTime)) {
+                    //System.out.println("文件是今天创建的。");
+                } else {
+                    //System.out.println("文件不是今天创建的。");
+                    delFile();  //删除不是当天日期
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    // 辅助方法，检查日期是否为今天
+    @RequiresApi(api = Build.VERSION_CODES.O)
+    private static boolean isToday(LocalDateTime dateTime) {
+        LocalDate today = LocalDate.now();
+        LocalDate fileDate = dateTime.toLocalDate();
+        return today.equals(fileDate);
+    }
+
+    /**
+     * 判断文件是否为当天创建（使用最后修改时间），不同则删除
+     * Android 7.0推荐使用此方法
+     */
+    public static void isFileCreatedTodayDel() {
+        File fileP = new File(MYLOG_PATH_SDCARD_DIR, MYLOGFILEName);
+        if (fileP.exists()) {
+            if (!FileUtils.isFileCreatedToday(fileP)) {
+                delFile();  //删除不是当天创建的日期
+            }
+        }
+    }
+
+
+
 }

app/src/main/java/com/uas/huiyan/util/VolleyRequest.java

@@ -100,7 +100,7 @@ public class VolleyRequest {
                 index++;
             }
         }
-        MyLog.e("aaa","接口地址:" + url);
+        MyLog.d("aaa","*************************" + "\n" + "接口地址:" + url);
         PdaApplication.mRequestQueue.cancelAll(httpParams.getUrl());
 
         stringRequest = new StringRequest(httpParams.getMethod(), url,
@@ -108,7 +108,8 @@ public class VolleyRequest {
                     @Override
                     public void onResponse(String s) {
                         try {
-                            LogUtil.prinlnLongMsg("responseSucc", s);
+                            MyLog.d("aaa","响应成功：" + s);
+                            //LogUtil.prinlnLongMsg("responseSucc", s);
                             httpCallback.onSuccess(httpParams.getFlag(), s);
                         } catch (Exception e) {
                             e.printStackTrace();
@@ -119,8 +120,9 @@ public class VolleyRequest {
                     @Override
                     public void onErrorResponse(VolleyError volleyError) {
                         try {
+                            new String(volleyError.networkResponse.data);
                             String errorToast = CommonUtil.showErrorToast(volleyError, false);
-                            LogUtil.e("responErr", errorToast);
+                            //LogUtil.e("responErr", errorToast);
                             if (errorToast.length() >= 500) {
                                 httpCallback.onFail(httpParams.getFlag(), "请求异常");
                             } else {

build.gradle

@@ -64,8 +64,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 9,
-            versionName      : "v1.0.8"
+            versionCode      : 12,
+            versionName      : "v1.1.1"
     ]
 
     depsVersion = [