Sfoglia il codice sorgente

出库扫码采集增加音效

ChengJH 9 mesi fa
parent
commit
fc0047f989

+ 1 - 1
app/build.gradle

@@ -7,7 +7,7 @@ android {
             keyAlias 'zdxw_smart_com_key'
             keyPassword 'zdxwkeystone'
             storeFile file('C:\\sigin\\zdxw_smart_com_keystone.jks')
-            storePassword 'pdakeystone'
+            storePassword 'zdxwkeystone'
         }
     }
     compileSdkVersion rootProject.ext.android.compileSdkVersion

+ 2 - 1
app/src/main/java/com/uas/zdxw_smart_com/fragment/IOCOutMakeMaterialOper.java

@@ -75,6 +75,7 @@ import com.uas.zdxw_smart_com.util.JsonTools;
 import com.uas.zdxw_smart_com.util.JsonUtils;
 import com.uas.zdxw_smart_com.util.LogUtil;
 import com.uas.zdxw_smart_com.util.PrintUtils;
+import com.uas.zdxw_smart_com.util.SoundUtil;
 import com.uas.zdxw_smart_com.util.VolleyRequest;
 import com.uas.zdxw_smart_com.view.ClearableEditText;
 import com.uuzuche.lib_zxing.activity.CaptureActivity;
@@ -786,6 +787,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
             @Override
             public void onResponse(JSONObject jsonObject) {
                 progressDialog.dismiss();
+                SoundUtil.play(SoundUtil.SOUND_TETHYS);
                 mResults = new ArrayList<>();
                 mCollectTypeRadioGroup.setEnabled(true);
                 LogUtil.e("!!!ok", jsonObject.toString());
@@ -2680,5 +2682,4 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
             return false;
         }
     }
-
 }

+ 1 - 1
app/src/main/java/com/uas/zdxw_smart_com/tools/RegexUtil.java

@@ -10,7 +10,7 @@ public class RegexUtil {
     //正则表达式
 //    public static String IP_FORMAT = "((2[0-4]\\d|25[0-5]|[01]?\\d\\d?)\\.){3}(2[0-4]\\d|25[0-5]|[01]?\\d\\d?)";
     public static String IP_FORMAT = "^((25[0-5])|(2[0-4]\\d)|(1\\d\\d)|([1-9]\\d)|\\d)(\\.((25[0-5])|(2[0-4]\\d)|(1\\d\\d)|([1-9]\\d)|\\d)){3}$|^([a-zA-Z0-9]([a-zA-Z0-9\\-]{0,61}[a-zA-Z0-9])?\\.)+[a-zA-Z]{2,6}$";
-    public static String PORT_FORMAT = "^[1-9]$|(^[1-9][0-9]$)|(^[1-9][0-9][0-9]$)|(^[1-9][0-9][0-9][0-9]$)|(^[1-6][0-5][0-5][0-3][0-9]$)";
+    public static String PORT_FORMAT = "^[0-9]$|(^[0-9][0-9]$)|(^[0-9][0-9][0-9]$)|(^[0-9][0-9][0-9][0-9]$)|(^[0-9][0-90-9][0-9][0-9]$)|(^[0-9][0-9][0-9][0-9][0-9]$)";
     // public static String PORT_FORMAT = "(\\d)+";
 
     public static boolean checkString(String str, String regx) {

+ 1 - 0
app/src/main/java/com/uas/zdxw_smart_com/util/SoundUtil.java

@@ -18,6 +18,7 @@ public class SoundUtil {
     public static final int SOUND_SALACIA = 0x09;
     public static final int SOUND_TETHYS = 0x0a;
     public static final int SOUND_TITAN = 0x0b;
+    public static final int SOUND_ten = 0x0c;
 
     private static Object mSoundPoolLock = new Object();
 

+ 2 - 2
build.gradle

@@ -43,8 +43,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 23,
-            versionName      : "v2.3"
+            versionCode      : 24,
+            versionName      : "v2.4"
     ]
 
     depsVersion = [