From 28d2b0a2b33c786670f4999e4b634036de2d6883 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 15 十二月 2025 11:19:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/maanshan' into maanshan
---
keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/main/MainActivity.java | 55 ++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 40 insertions(+), 15 deletions(-)
diff --git a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/main/MainActivity.java b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/main/MainActivity.java
index 64b4cbd..3d9d176 100644
--- a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/main/MainActivity.java
+++ b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/main/MainActivity.java
@@ -18,6 +18,7 @@
import android.text.Spanned;
import android.text.TextUtils;
import android.text.style.TextAppearanceSpan;
+import android.util.Log;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
@@ -117,16 +118,17 @@
import com.example.datalibrary.model.User;
import com.example.datalibrary.utils.ToastUtils;
import com.example.datalibrary.view.PreviewTexture;
-import com.mc.enjoysdk.McHome;
-import com.mc.enjoysdk.McSystemUi;
-import com.mc.enjoysdk.transform.McSystemUiFlag;
+import com.proembed.service.MyService;
import com.yanzhenjie.permission.runtime.Permission;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
@@ -166,8 +168,7 @@
private int downCount = 0;
private Long lastDownTime;
private Long showTime;
- private McSystemUi mcSystemUi;
- private McHome mcHome;
+ private MyService mXService;
private Handler handler = new Handler(){
@Override
@@ -226,9 +227,25 @@
Intent intent2 = new Intent(MainActivity.this, FaceUpdateService.class);
startService(intent2);*/
getPermission();
- Timber.tag("====>").d(LMobileInfo.getDeviceUniqueId());
- mcSystemUi = McSystemUi.getInstance(this);
- mcHome = McHome.getInstance(this);
+ mXService = new MyService(this);
+ //Timber.tag("====>").d(LMobileInfo.getDeviceUniqueId());
+ Thread.setDefaultUncaughtExceptionHandler((thread, throwable) -> {
+ String time2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
+ getVM().addInfo("GlobalException绾跨▼鎶ラ敊锛�" + thread.getName());
+ try {
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ PrintStream print = new PrintStream(out);
+ //瀵煎嚭鍙戠敓寮傚父鐨勬椂闂�
+ print.println(time2);
+ print.println();
+ throwable.printStackTrace(print);
+ SpUtil.saveString(CrashHandler.FILE_NAME+time2,new String(out.toByteArray()));
+ print.close();
+ } catch (Exception e) {
+ e.printStackTrace();
+ getVM().addInfo("閿欒鏃ュ織2"+e.getMessage());
+ }
+ });
}
private void initM(){
@@ -336,9 +353,7 @@
getDB().nsv.setVisibility(View.VISIBLE);
}
//鏄剧ず鐘舵�佹爮
- mcSystemUi.temporarilySwitchStatusBar(true);
- //鏄剧ず瀵艰埅鏍�
- mcSystemUi.temporarilySwitchNavigation(true);
+ MCUtils.show(mXService);
}
});
upErrInfo();
@@ -498,8 +513,8 @@
super.onResume();
isShowing = true;
getVM().setSubmit(true);
- MCUtils.hind(mcSystemUi);
- mcHome.setHomePackage("com.doumee.keyCabinet");
+ MCUtils.hind(mXService);
+ MCUtils.setHomePackage(mXService,"com.doumee.keyCabinet");
showTime = System.currentTimeMillis();
if(isHavePermission) {
checkUpdate();
@@ -1597,7 +1612,17 @@
//涓�鍙风増
bh = 1;
}
- String[] sp = data.split("AA");
+ List<String> sp = new ArrayList<>();
+ String data2 = data.substring(8,data.length());
+ while (data2.length()>0){
+ if (data2.length()<22) {
+ sp.add(data2+"");
+ data2 = "";
+ }else {
+ sp.add(data2.substring(0,22));
+ data2 = data2.substring(22);
+ }
+ }
for(String s:sp){
if(s.length()>=20){
String key = SportUtils.intToHex(bh)+s.substring(4,6);
@@ -1611,7 +1636,7 @@
}else {
gridDo.setCurKeyCode("");
}
- if("0101".equals(key)) {
+ if("0109".equals(key)) {
getVM().addInfo(key+" , "+isHaveKey+" "+keyCode);
getVM().addInfo(key + "璁剧疆閽ュ寵锛�" + gridDo.getCurKeyCode());
}
--
Gitblit v1.9.3