wuhb 10 miesięcy temu
rodzic
commit
64066c05c8

+ 2 - 2
app/build.gradle

@@ -9,8 +9,8 @@ android {
         applicationId "com.rms.agv"
         minSdk 27
         targetSdk 31
-        versionCode 13
-        versionName "1.2.4"
+        versionCode 15
+        versionName "1.2.5"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

+ 6 - 1
app/src/main/java/com/qy/agv/activity/MainActivity.java

@@ -3,6 +3,7 @@ package com.qy.agv.activity;
 import static com.qy.agv.comm.BaseApplication.mScanManager;
 import static com.qy.agv.util.Constant.CACHE_BIND_CONTROL;
 import static com.qy.agv.util.Constant.CACHE_LOGIN_KEY;
+import static com.qy.agv.util.Constant.CACHE_SYS_CONFIG;
 import static com.qy.agv.util.ToolUtils.getIp;
 
 import android.app.AlertDialog;
@@ -170,9 +171,13 @@ public class MainActivity extends BaseActivity {
                 checkToken(user.getLoginName(), user.getLoginPwd());
             }
         }
+        String server_src_ip = CacheService.getInstance(context).getCache(CACHE_SYS_CONFIG,"server_ip");
+        if(!StringUtils.isEmpty(server_src_ip)){
+            Constant.server_ip = server_src_ip;
+            Constant.HTTP_URL = "http://"+Constant.server_ip+"/api";
+        }
     }
 
-
     private void initData(){
         mList = new ArrayList<>();
         listViewAdapter = new MainListViewAdapter(mList, context);

+ 4 - 0
app/src/main/java/com/qy/agv/activity/RobotInfoActivity.java

@@ -1,5 +1,7 @@
 package com.qy.agv.activity;
 
+import static com.qy.agv.util.Constant.CACHE_SYS_CONFIG;
+
 import android.annotation.SuppressLint;
 import android.app.AlertDialog;
 import android.content.Context;
@@ -13,6 +15,7 @@ import android.widget.EditText;
 
 import com.qy.agv.R;
 import com.qy.agv.comm.BaseActivity;
+import com.qy.agv.comm.CacheService;
 import com.qy.agv.databinding.QyRobotInfoBinding;
 import com.qy.agv.update.UpdateManager;
 import com.qy.agv.update.UpdateXmlService;
@@ -157,6 +160,7 @@ public class RobotInfoActivity extends BaseActivity {
                     Constant.server_ip = inputServer.getText().toString();
                     Constant.HTTP_URL = "http://"+Constant.server_ip+"/api";
                     Constant.UPDATE_URL = "http://"+Constant.server_ip+"/app";
+                    CacheService.getInstance(context).saveCache(CACHE_SYS_CONFIG,"server_ip", Constant.server_ip);
                     binding.tvIp.setText(Constant.server_ip);
                     ToastUtils.showToast(context, "设置成功");
                     dialog.dismiss();

+ 13 - 1
app/src/main/java/com/qy/agv/comm/BaseActivity.java

@@ -50,6 +50,7 @@ public abstract class BaseActivity extends AppCompatActivity {
     private  Context context;
     private SoundPoolMgr soundPoolMgr;
     public ActivityResultLauncher<Intent> intentActivityResultLauncher;
+    private long startTime = 0L;
 
 
     @Override
@@ -276,11 +277,22 @@ public abstract class BaseActivity extends AppCompatActivity {
         }
     };
 
-    private void process(String barcode) {
+    private synchronized void process(String barcode) {
+        if(startTime == 0L) {
+            startTime = new Date().getTime();
+        }else{
+            long sleep = new Date().getTime() - startTime;
+            System.out.println("延时:" + sleep);
+            if(sleep < 2000){
+                return;
+            }
+            startTime = 0L;
+        }
         System.out.println("当前扫码:" + barcode);
         if (StringUtils.isEmpty(barcode)) {
             return;
         }
+
         BaseActivity scan = (BaseActivity)getCurrentActivity();
         scan.receiverTask(barcode);
     }

+ 1 - 0
app/src/main/java/com/qy/agv/util/Constant.java

@@ -48,6 +48,7 @@ public class Constant {
 
     public static final String CACHE_LOGIN_KEY = "LOGIN";
     public static final String CACHE_BIND_CONTROL = "BIND_CONTROL";
+    public static final String CACHE_SYS_CONFIG = "SYS_CONFIG";
     public static UserModel user;
     public static RobotModel robotModel;
     public static int SOCKET_PORT = 502;