From 99b89dc0ae4fbe90c6d629a223ad730986ffd8f3 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 10 十二月 2025 14:34:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/maanshan' into maanshan

---
 keyCabinet-android/app/src/test/java/com/doumee/ticketmachine/ExampleUnitTest.java |   21 ++++++++++++++++-----
 1 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/keyCabinet-android/app/src/test/java/com/doumee/ticketmachine/ExampleUnitTest.java b/keyCabinet-android/app/src/test/java/com/doumee/ticketmachine/ExampleUnitTest.java
index ada3742..59b3a17 100644
--- a/keyCabinet-android/app/src/test/java/com/doumee/ticketmachine/ExampleUnitTest.java
+++ b/keyCabinet-android/app/src/test/java/com/doumee/ticketmachine/ExampleUnitTest.java
@@ -1,16 +1,27 @@
 package com.doumee.ticketmachine;
 
+import android.text.TextUtils;
+
+import com.doumee.keyCabinet.MApplication;
+import com.doumee.keyCabinet.utils.CircularQueue;
+import com.doumee.keyCabinet.utils.i485.SportUtils;
+import com.example.datalibrary.utils.ToastUtils;
+
 import org.junit.Test;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static com.doumee.keyCabinet.utils.i485.SportUtils.hexToBinary;
 
 public class ExampleUnitTest {
     @Test
     public void addition_isCorrect() {
-        String m = "2025-03-10 15:46:06    寮�濮嬪綊杩榎n2025-03-10 15:46:10    涓嶅彲浠ュ綊杩�(1977169908),鍘熷洜锛氭墜鐜湭缁戝畾\n鏃犳硶褰掕繕\n2025-03-10 15:46:10    onStopBack 鍋滄杩斿洖\n2025-03-10 15:46:10    onCompleted 鎵ц瀹屾垚\n2025-03-10 15:46:10    onStopBack 鍋滄杩斿洖\n2025-03-10 15:46:10    onCompleted 鎵ц瀹屾垚\n2025-03-10 15:46:10    杩樻墜鐜け璐�,鎵嬬幆鏈粦瀹歕n鏃犳硶褰掕繕\n2025-03-10 15:46:10    onStopBack 鍋滄杩斿洖\n2025-03-10 15:46:10    onCompleted 鎵ц瀹屾垚\n2025-03-10 15:46:13    寮�濮嬪綊杩榎n2025-03-10 15:46:15    涓嶅彲浠ュ綊杩�(1977169908),鍘熷洜锛氭墜鐜湭缁戝畾\n鏃犳硶褰掕繕\n2025-03-10 15:46:15    onStopBack 鍋滄杩斿洖\n2025-03-10 15:46:15    onCompleted 鎵ц瀹屾垚\n2025-03-10 15:46:15    onStopBack 鍋滄杩斿洖\n2025-03-10 15:46:15    onCompleted 鎵ц瀹屾垚\n2025-03-10 15:46:15    杩樻墜鐜け璐�,鎵嬬幆鏈粦瀹歕n鏃犳硶褰掕繕\n2025-03-10 15:46:15    onStopBack 鍋滄杩斿洖\n2025-03-10 15:46:15    onCompleted 鎵ц瀹屾垚\n2025-03-10 15:46:18    寮�濮嬪綊杩榎n2025-03-10 15:46:22    寮�濮嬪綊杩榎n2025-03-10 15:46:23    onStopBack 鍋滄杩斿洖\n2025-03-10 15:46:23    onCompleted 鎵ц瀹屾垚\n";
-        String[] sp = m.split("\n");
-        for(String s:sp){
-            System.out.println(s);
-        }
+       String code = "EF 01 FF FF FF FF 01 00 03 1D 00";
+       String x = SportUtils.getBCC(code);
+       System.out.println(x);
     }
 
 
+
 }
\ No newline at end of file

--
Gitblit v1.9.3