From 14f71ac633709c27a796e02048a1a1e35153fce4 Mon Sep 17 00:00:00 2001 From: htjcAdmin Date: Wed, 25 Jun 2025 20:30:49 +0800 Subject: [PATCH] =?UTF-8?q?/*=20=E6=B3=A2=E7=89=B9=E7=8E=87=E4=B8=BA9600?= =?UTF-8?q?=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B=EF=BC=9A=201.=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E7=AC=AC=E4=B8=80=E6=AC=A1=E7=99=BB=E5=BD=95=E8=83=BD?= =?UTF-8?q?=E5=A4=9F=E6=88=90=E5=8A=9F=EF=BC=8C=E9=80=80=E5=87=BA=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E4=B9=8B=E5=90=8E=E5=86=8D=E6=AC=A1=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E4=B8=80=E7=9B=B4=E4=BC=9A=E5=A4=B1=E8=B4=A5=EF=BC=8C=E8=80=8C?= =?UTF-8?q?=E4=B8=94=E7=82=B9=E5=87=BB=E5=BC=80=E5=A7=8B=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E6=8C=89=E9=92=AE=EF=BC=8C=E6=A3=80=E6=B5=8B=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E4=B9=9F=E6=97=A0=E6=B3=95=E6=AD=A3=E5=B8=B8=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E3=80=82=202.=20=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E9=97=AE=E9=A2=98=EF=BC=9A=E6=A0=B9=E6=9C=AC=E5=8E=9F?= =?UTF-8?q?=E5=9B=A0=E6=98=AFBBBB=E5=8C=85=E5=92=8C=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E5=91=BD=E4=BB=A4=E7=9A=84=E8=BF=94=E5=9B=9EDDDD=E5=8C=85?= =?UTF-8?q?=E7=B2=98=E5=8C=85=EF=BC=9ABBBBA402C800D7010046DDDD190104070026?= =?UTF-8?q?0078C4=EF=BC=8C=20=E5=AF=BC=E8=87=B4=E4=B8=B2=E5=8F=A3=E9=80=82?= =?UTF-8?q?=E9=85=8D=E7=A8=8B=E5=BA=8F=E8=A7=A3=E6=9E=90=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E3=80=82=E8=A7=A3=E5=86=B3=E6=96=B9=E6=B3=95=EF=BC=9A=E9=92=88?= =?UTF-8?q?=E5=AF=B9=E8=BF=99=E7=A7=8D=E6=83=85=E5=86=B5=E6=89=93=E4=B8=AA?= =?UTF-8?q?=E8=A1=A5=E4=B8=81=E3=80=82Y=20*/?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zzf/cacacaca/activity/LoginActivity.java | 1 + .../cacacaca/presenter/SurfacePresenter.java | 27 ++++++++++++++++--- .../zzf/cacacaca/utils/ToastHelper.java | 1 + build.gradle | 15 +++++++++++ 4 files changed, 40 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/boheng/zzf/cacacaca/activity/LoginActivity.java b/app/src/main/java/com/boheng/zzf/cacacaca/activity/LoginActivity.java index 3bad2f2..4b3b292 100644 --- a/app/src/main/java/com/boheng/zzf/cacacaca/activity/LoginActivity.java +++ b/app/src/main/java/com/boheng/zzf/cacacaca/activity/LoginActivity.java @@ -204,6 +204,7 @@ public class LoginActivity extends BaseActivity implements SurfaceContract.ISeri removeHandlerWatchDog(); removeHandlerAlertDialog(); mPresenter.stopIs(); + mPresenter.close();//每次login之后，点击开始检测，数据上报异常问题修改 new Thread( () -> { Looper.prepare(); diff --git a/app/src/main/java/com/boheng/zzf/cacacaca/presenter/SurfacePresenter.java b/app/src/main/java/com/boheng/zzf/cacacaca/presenter/SurfacePresenter.java index fe2c7fd..492cdbd 100644 --- a/app/src/main/java/com/boheng/zzf/cacacaca/presenter/SurfacePresenter.java +++ b/app/src/main/java/com/boheng/zzf/cacacaca/presenter/SurfacePresenter.java @@ -541,7 +541,13 @@ public class SurfacePresenter { private boolean crcVerify(String rawData) { try { Log.v(logTag, ("crcVerify: " + rawData)); - for (String str : SplitUtils.split(rawData)) { + String rawDataEx = rawData; + if(rawData.startsWith("BBBB") && rawData.contains("DDDD")) { + int index = rawData.indexOf("DDDD"); + rawDataEx = rawData.substring(index); + } + Log.w(logTag, ("rawDataEx: " + rawDataEx)); + for (String str : SplitUtils.split(rawDataEx)) { if (TextUtils.isEmpty(str) || str.length() < 4) continue; if (!CRCUtils.genCrc(str.substring(4, str.length() - 4)).equals(str.substring(str.length() - 4))) { Log.w(logTag, ("str: " + str + " crc fail!")); @@ -572,7 +578,14 @@ public class SurfacePresenter { } return true; } else { - return rawData.length() > 4 && "DDDD".equals(rawData.substring(0, 4)); + Log.d(logTag, "dataVerify2, rawData: " + rawData); + String rawDataEx = rawData; + if(rawData.startsWith("BBBB") && rawData.contains("DDDD")) { + int index = rawData.indexOf("DDDD"); + rawDataEx = rawData.substring(index); + } + Log.d(logTag, ("rawDataEx2: " + rawDataEx)); + return rawDataEx.length() > 4 && "DDDD".equals(rawDataEx.substring(0, 4)); } } catch (Exception e) { return rawData.length() > 5 && "DDDD".equals(rawData.substring(0, 4)); @@ -585,8 +598,14 @@ public class SurfacePresenter { * parameters: raw message * return value: String */ - private String getBody(String body) { - return body; + private String getBody(String rawData) { + String rawDataEx = rawData; + if(rawData.startsWith("BBBB") && rawData.contains("DDDD")) { + int index = rawData.indexOf("DDDD"); + rawDataEx = rawData.substring(index); + } + Log.d(logTag, ("rawDataEx3: " + rawDataEx)); + return rawDataEx; } /** diff --git a/app/src/main/java/com/boheng/zzf/cacacaca/utils/ToastHelper.java b/app/src/main/java/com/boheng/zzf/cacacaca/utils/ToastHelper.java index d260c10..7125192 100644 --- a/app/src/main/java/com/boheng/zzf/cacacaca/utils/ToastHelper.java +++ b/app/src/main/java/com/boheng/zzf/cacacaca/utils/ToastHelper.java @@ -194,6 +194,7 @@ public class ToastHelper { dialog.getWindow().setBackgroundDrawableResource(android.R.color.transparent); } dialog.setView(view); + dialog.setCanceledOnTouchOutside(false); dialog.setCancelable(false); ImageView ivImg = view.findViewById(R.id.iv_loading); diff --git a/build.gradle b/build.gradle index f0c1700..1eb256f 100644 --- a/build.gradle +++ b/build.gradle @@ -3,6 +3,20 @@ apply from: 'config.gradle' buildscript { repositories { + maven() { + url 'https://maven.aliyun.com/repository/jcenter' + } + maven(){ + url 'https://maven.aliyun.com/repository/google' + } + maven { + url 'https://maven.aliyun.com/repository/public' + } + maven { + url 'https://maven.aliyun.com/repository/mapr-public' + } + + google() jcenter() mavenCentral() @@ -11,6 +25,7 @@ buildscript { classpath 'com.android.tools.build:gradle:3.5.3' //首先添加这个 + //classpath 'com.novoda:bintray-release:+' classpath 'com.novoda:bintray-release:+' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files