功能优化

app/src/main/java/com/fxy/common/CommonDialog.java

@@ -1,10 +1,14 @@
 package com.fxy.common;
 import com.elvishew.xlog.XLog;
 import com.fxy.R;
+
+import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.os.Build;
 import android.os.Bundle;
+import android.os.Handler;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.TextUtils;
@@ -35,6 +39,10 @@ public class CommonDialog extends Dialog implements View.OnClickListener{
     private String title;
     private String typeCode;
 
+
+    private Handler handler = new Handler();
+    private Runnable showKeyboardRunnable;
+
     public CommonDialog(Context context) {
         super(context);
         this.mContext = context;
@@ -146,7 +154,7 @@ public class CommonDialog extends Dialog implements View.OnClickListener{
 
     protected void setLayout(){
         setContentView(R.layout.dialog_normal_layout);
-        setCanceledOnTouchOutside(false);
+//        setCanceledOnTouchOutside(false);
         initView();
     }
     @Override
@@ -253,9 +261,20 @@ public class CommonDialog extends Dialog implements View.OnClickListener{
     }
 
     public void show(){
+        // 在 Dialog 显示后延迟显示软键盘
+        handler.postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                contentTxt.requestFocus();
+                contentTxt.setSelection(contentTxt.getText().length());
+                InputMethodManager imm = (InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+                imm.showSoftInput(contentTxt, InputMethodManager.SHOW_IMPLICIT);
+            }
+        }, 300);
         super.show();
-
     }
+
+
     public interface OnCloseListener{
         void onClickCancel(Dialog dialog, boolean confirm);
         void onClickSubmit(Dialog dialog, boolean confirm);

app/src/main/java/com/fxy/detection/BoxPutInMainActivity.java

@@ -533,6 +533,10 @@ public class BoxPutInMainActivity extends  BaseActivity implements StoJNI.ScanCa
                                 trackingBoxBean =  JsonUtil.jsonString2Bean(bean.data,TrackingBoxBean.class);
                             }
 
+                            if (!trackingBoxBean.getTrackingNumber().isEmpty()){
+                                etTrackingNumber.setText(trackingBoxBean.getTrackingNumber());
+                            }
+
                             String voiceName = trackingBoxBean.getVoiceName();
                             final Bundle bundle = new Bundle();
                             bundle.putString("data",bean.data);

app/src/main/java/com/fxy/detection/TrayMakeMainActivity.java

@@ -363,6 +363,10 @@ public class TrayMakeMainActivity extends BaseActivity implements StoJNI.ScanCal
                                 trayMakeBean =  JsonUtil.jsonString2Bean(bean.data,TrayMakeBean.class);
                             }
 
+                            if (!trayMakeBean.getTrackingNumber().isEmpty()){
+                                etTrackingNumber.setText(trayMakeBean.getTrackingNumber());
+                            }
+
                             final Bundle bundle = new Bundle();
                             bundle.putString("data",bean.data);
 

app/src/main/java/com/fxy/detection/TrayPutInMainActivity.java

@@ -562,6 +562,10 @@ public class TrayPutInMainActivity extends  BaseActivity implements StoJNI.ScanC
                                 trackingBoxBean =  JsonUtil.jsonString2Bean(bean.data,TrackingBoxBean.class);
                             }
 
+                            if (!trackingBoxBean.getTrackingNumber().isEmpty()){
+                                etTrackingNumber.setText(trackingBoxBean.getTrackingNumber());
+                            }
+
                             if (trackingBoxBean.getNeedConfirm().equals("Y")){
                                 new AlertDialog.Builder(mContext).setTitle(R.string.dl_hint)
                                         .setMessage(trackingBoxBean.getConfirmMsg())