功能优化

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

@@ -249,6 +249,8 @@ public class AsyncFileUpload {
 
         if (awaitUploadList.size()>0){
             filedUpload(0);
+        }else{
+            removeHandler();
         }
     }
 

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

@@ -12,6 +12,7 @@ import android.text.TextWatcher;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.TextView;
@@ -253,7 +254,7 @@ public class CommonDialog extends Dialog implements View.OnClickListener{
 
     public void show(){
         super.show();
-        contentTxt.setSelection(contentTxt.getText().length());
+
     }
     public interface OnCloseListener{
         void onClickCancel(Dialog dialog, boolean confirm);

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

@@ -37,7 +37,6 @@ import com.fxy.baselibrary.util.JsonUtil;
 import com.fxy.baselibrary.views.MarqueeTextView;
 import com.fxy.bean.ActionBean;
 import com.fxy.bean.ScanBean;
-import com.fxy.common.AsyncFileUpload;
 import com.fxy.common.AsyncPictureSelector;
 import com.fxy.common.AsyncPictureUpload;
 import com.fxy.common.UploadProgressEvent;

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

@@ -34,32 +34,18 @@ import com.fxy.baselibrary.util.JsonUtil;
 import com.fxy.baselibrary.views.MarqueeTextView;
 import com.fxy.bean.ActionBean;
 import com.fxy.bean.ScanBean;
-import com.fxy.common.AsyncFileUpload;
-import com.fxy.common.AsyncPictureSelector;
-import com.fxy.common.AsyncPictureSelector;
-import com.fxy.common.AsyncPictureUpload;
 import com.fxy.common.CommonDialog;
-import com.fxy.common.UploadProgressEvent;
 import com.fxy.constant.BaseConfig;
 import com.fxy.constant.EventCode;
-import com.fxy.constant.SPCache;
-import com.fxy.detection.bean.TakePictureBean;
 import com.fxy.detection.bean.TrackingBoxBean;
 import com.fxy.net.MyDialogCallback;
 import com.fxy.net.Urls;
-import com.fxy.putOut.QualityInspectionMainActivity;
-import com.fxy.putOut.QualityVolumeMainActivity;
 import com.fxy.utils.UploadUtils;
 import com.google.gson.Gson;
 import com.google.zxing.Result;
-import com.luck.picture.lib.config.PictureConfig;
 import com.lzy.okgo.OkGo;
 import com.lzy.okgo.model.Response;
 
-import org.greenrobot.eventbus.Subscribe;
-import org.greenrobot.eventbus.ThreadMode;
-import org.json.JSONException;
-import org.json.JSONObject;
 
 import java.util.ArrayList;
 import java.util.HashMap;

app/src/main/java/com/fxy/service/UploadJobService.java

@@ -3,21 +3,10 @@ package com.fxy.service;
 import android.app.job.JobParameters;
 import android.app.job.JobService;
 import android.content.Context;
-import android.os.Build;
-
-import androidx.annotation.RequiresApi;
 
 import com.elvishew.xlog.XLog;
 import com.fxy.base.UploadContentProvider;
 import com.fxy.common.AsyncFileUpload;
-import com.fxy.common.FiledUpload;
-import com.fxy.constant.SPCache;
-import com.fxy.realm.AsyncUploadRealm;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import io.realm.Realm;
 
 public class UploadJobService  extends JobService {
     public static final int CHARGING_JOB_ID = 100;

app/src/main/java/com/fxy/utils/JobUtils.java

@@ -21,6 +21,13 @@ public class JobUtils {
      */
     public static void deviceIdleJob(Context context){
         JobScheduler jobScheduler = (JobScheduler) context.getSystemService(Context.JOB_SCHEDULER_SERVICE);
+        List<JobInfo> jobInfoList = jobScheduler.getAllPendingJobs();
+        for (int i = 0; i < jobInfoList.size(); i++) {
+            if (jobInfoList.get(i).getId()==UploadJobService.DEVICE_IDLE_JOB_ID){
+                return;
+            }
+        }
+
         @SuppressLint("JobSchedulerService")
         JobInfo.Builder builder = new JobInfo.Builder(UploadJobService.DEVICE_IDLE_JOB_ID, new ComponentName(context, UploadJobService.class));
 
@@ -34,12 +41,7 @@ public class JobUtils {
         // 可以设置其他条件，如网络状态等
         builder.setRequiredNetworkType(JobInfo.NETWORK_TYPE_ANY);
 
-        List<JobInfo> jobInfoList = jobScheduler.getAllPendingJobs();
-        for (int i = 0; i < jobInfoList.size(); i++) {
-            if (jobInfoList.get(i).getId()==UploadJobService.DEVICE_IDLE_JOB_ID){
-                return;
-            }
-        }
+
         SPCache spCache = SPCache.getInstance(context);
         int  leisure = spCache.getLeisure();
 
@@ -63,6 +65,12 @@ public class JobUtils {
 
     public static void chargingJob(Context context){
         JobScheduler jobScheduler = (JobScheduler) context.getSystemService(Context.JOB_SCHEDULER_SERVICE);
+        List<JobInfo> jobInfoList = jobScheduler.getAllPendingJobs();
+        for (int i = 0; i < jobInfoList.size(); i++) {
+            if (jobInfoList.get(i).getId()==UploadJobService.CHARGING_JOB_ID){
+                return;
+            }
+        }
         @SuppressLint("JobSchedulerService")
         JobInfo.Builder builder = new JobInfo.Builder(UploadJobService.CHARGING_JOB_ID, new ComponentName(context, UploadJobService.class));
 
@@ -77,12 +85,6 @@ public class JobUtils {
         // 可以设置其他条件，如网络状态等
         builder.setRequiredNetworkType(JobInfo.NETWORK_TYPE_ANY);
 
-        List<JobInfo> jobInfoList = jobScheduler.getAllPendingJobs();
-        for (int i = 0; i < jobInfoList.size(); i++) {
-            if (jobInfoList.get(i).getId()==UploadJobService.CHARGING_JOB_ID){
-                return;
-            }
-        }
 
         // 其他设置，如网络条件、延迟等
         builder.setMinimumLatency(1000 * 30); // 延迟至少60秒

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

@@ -51,12 +51,14 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:padding="@dimen/dp_10"
+            android:padding="@dimen/dp_4"
             android:hint="请输入"
             android:lineSpacingExtra="3dp"
             android:background="@drawable/bg_round_edit_background"
             android:textCursorDrawable="@drawable/color_cursor"
             android:cursorVisible="true"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
             android:textSize="14sp"
             android:inputType="number"
             android:text=""

config.gradle

@@ -5,10 +5,10 @@ ext {
             buildToolsVersion: "26.0.2",
             supportVersion   : "27.0.1",
             applicationId    : "com",
-            minSdkVersion    : 17,
+            minSdkVersion    : 21,
             targetSdkVersion : 23,
             versionCode      : 1,
-            versionName      : "2.9.0",
+            versionName      : "2.9.2",
             versionApi       : "2.9",
             versionRealm     : 2,
     ]