소스 검색

去除重传,单点登录

zh 10 달 전
부모
커밋
57a908101c

+ 1 - 1
.idea/deploymentTargetSelector.xml

@@ -4,7 +4,7 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2025-05-30T06:42:02.710870900Z">
+        <DropdownSelection timestamp="2025-06-18T05:35:11.144657700Z">
           <Target type="DEFAULT_BOOT">
             <handle>
               <DeviceId pluginId="PhysicalDevice" identifier="serial=1a41f5baec1e896" />

+ 1 - 1
app/build.gradle

@@ -20,7 +20,7 @@ android {
         debug {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-            buildConfigField "String", "WEB_URL", "\"http://192.168.2.175:5173/\""
+            buildConfigField "String", "WEB_URL", "\"https://sit.app.baoshi56.com/\""
             buildConfigField "String", "APK_URL", "\"https://swms.baoshi56.com/\""
             buildConfigField "String", "APK_CNF", '"piece.cnf"'
             signingConfig signingConfigs.debug

+ 1 - 1
app/src/main/java/com/baoshi/piece/db/po/DeliveryRecord.java

@@ -19,7 +19,7 @@ public class DeliveryRecord {
         this.machine = machine;
         this.operator = operator;
         this.operatorName = operatorName;
-        this.isPush = 0; // 待上传
+        this.isPush = 1; // 待上传
         this.operationTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault())
                                 .format(new Date());
     }

+ 7 - 1
app/src/main/java/com/baoshi/piece/utils/JavaScriptInterface.java

@@ -127,10 +127,16 @@ public class JavaScriptInterface {
      */
     @JavascriptInterface
     public void scanRepeatVib() {
-        Log.d("TAG", "scanRepeatVib");
         TipActionUtils.getInstance().scanRepeatTip(activity);
     }
 
+    /**
+     * 请重新登录
+     */
+    @JavascriptInterface
+    public void reLoginTip() {
+        TipActionUtils.getInstance().reLoginTip(activity);
+    }
 
     @JavascriptInterface
     public Boolean isDeliveryNoExists(String deliveryNo) {

+ 15 - 0
app/src/main/java/com/baoshi/piece/utils/TipActionUtils.java

@@ -21,6 +21,7 @@ public class TipActionUtils {
     private MediaPlayer scanErrMedia;
     private MediaPlayer scanRepeatMedia;
     private MediaPlayer scanSucMedia;
+    private MediaPlayer reLoginMedia;
     private Vibrator scanErrVib;
     private Vibrator scanRepeatVib;
     private volatile static TipActionUtils tipAction;
@@ -32,6 +33,13 @@ public class TipActionUtils {
         return tipAction;
     }
 
+    public void reLoginTip(Activity activity){
+        if (reLoginMedia==null){
+            reLoginMedia = MediaPlayer.create(activity,R.raw.relogin);
+        }
+        reLoginMedia.start();
+    }
+
     public void scanRepeatTip(Activity activity){
         if (scanRepeatMedia==null){
             scanRepeatMedia = MediaPlayer.create(activity, R.raw.scanner_repeat);
@@ -81,4 +89,11 @@ public class TipActionUtils {
         }
         scanErrorTip(activity);
     }
+
+    public void loginErrorVib(Activity activity, String... args) {
+        if (args != null && args.length > 0 && args[0] != null) {
+            LogUtil.e(args[0]);
+        }
+        reLoginTip(activity);
+    }
 }

BIN
app/src/main/res/raw/relogin.mp3