From 86c3b6be509d6d397d853231eb471e777f48346c Mon Sep 17 00:00:00 2001 From: wenfei Date: Fri, 21 Nov 2025 15:28:52 +0800 Subject: [PATCH] =?UTF-8?q?=E8=93=9D=E7=89=99=E6=9C=8D=E5=8A=A1=E5=AE=8C?= =?UTF-8?q?=E6=88=90=EF=BC=8C=E5=90=91=E4=BC=A0=E6=84=9F=E5=99=A8=E5=86=99?= =?UTF-8?q?=E5=85=A5=E6=95=B0=E6=8D=AE=E5=AE=8C=E6=88=90=EF=BC=8C=E8=AF=BB?= =?UTF-8?q?=E5=8F=96=E8=93=9D=E7=89=99=E9=80=9A=E7=9F=A5=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/rehome/dywoa/ui/activity/LoginActivity.kt | 8 ++++---- .../rehome/dywoa/ui/activity/sbxdjgl/SbxdjglActivity.java | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/LoginActivity.kt b/app/src/main/java/com/rehome/dywoa/ui/activity/LoginActivity.kt index aa92cd9..53c4e19 100755 --- a/app/src/main/java/com/rehome/dywoa/ui/activity/LoginActivity.kt +++ b/app/src/main/java/com/rehome/dywoa/ui/activity/LoginActivity.kt @@ -210,12 +210,12 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { // binding.etPassword.setText("A000000a.") //ceshi1 -// binding.etUsername.setText("ceshi01") -// binding.etPassword.setText("CS01hwf.") + binding.etUsername.setText("ceshi1") + binding.etPassword.setText("CS20251119.") //黄文飞 - binding.etUsername.setText("RH00002") - binding.etPassword.setText("RH20251029.") +// binding.etUsername.setText("RH00002") +// binding.etPassword.setText("RH20251029.") // binding.etUsername.setText("972526") // binding.etPassword.setText("Wq20001221.") diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/SbxdjglActivity.java b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/SbxdjglActivity.java index 6f7869c..c9d593a 100755 --- a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/SbxdjglActivity.java +++ b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/SbxdjglActivity.java @@ -20,6 +20,7 @@ import com.rehome.dywoa.adapter.GridViewYXAdapter; import com.rehome.dywoa.base.BaseActivity2; import com.rehome.dywoa.bean.GridViewBean; import com.rehome.dywoa.bleUtil.BlueToothDeviceActivity; +import com.rehome.dywoa.bleUtil.BlueToothDeviceSdkActivity; import com.rehome.dywoa.ui.activity.sbxj.NFCInfoActivity; import com.rehome.dywoa.utils.GsonUtils; import com.rehome.dywoa.utils.HttpListener; @@ -123,7 +124,8 @@ public class SbxdjglActivity extends BaseActivity2 { startActivity(intent); break; case 6: - intent = new Intent(SbxdjglActivity.this, BlueToothDeviceActivity.class); + //intent = new Intent(SbxdjglActivity.this, BlueToothDeviceActivity.class); + intent = new Intent(SbxdjglActivity.this, BlueToothDeviceSdkActivity.class); intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP); startActivity(intent); break;