From a74cdb77693f95fffa2bf7e64586593e4af425e4 Mon Sep 17 00:00:00 2001 From: fengge <844143714@qq.com> Date: Mon, 6 Jul 2026 13:32:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E7=BE=A4=EF=BC=8C=E5=A3=B0?= =?UTF-8?q?=E9=9F=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/stand/standapp/TempCallActivity.kt | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/stand/standapp/TempCallActivity.kt b/app/src/main/java/com/stand/standapp/TempCallActivity.kt index 2642276..264404b 100644 --- a/app/src/main/java/com/stand/standapp/TempCallActivity.kt +++ b/app/src/main/java/com/stand/standapp/TempCallActivity.kt @@ -105,12 +105,10 @@ class TempCallActivity : AppCompatActivity() { val groupName = if (rawGroupName.isNullOrEmpty() || rawGroupName == "null") "临时会话" else rawGroupName val gid = intent.getStringExtra("gid") ?: "" currentGroupName = groupName - currentTempGroupId = if (gid.isNotEmpty()) { - com.example.kingway.ptt.SendAtUtil.str2HexStr(gid) - } else { - com.example.kingway.ptt.SendAtUtil.str2HexStr(groupName) + if (gid.isNotEmpty()) { + currentTempGroupId = com.example.kingway.ptt.SendAtUtil.str2HexStr(gid) + MainActivity.executeJs("if(window.startPullGroupLock){ window.startPullGroupLock('$currentTempGroupId'); }") } - MainActivity.executeJs("if(window.startPullGroupLock){ window.startPullGroupLock('$currentTempGroupId'); }") findViewById(R.id.tv_group_name).text = groupName setupMinimizeButton() @@ -382,7 +380,7 @@ class TempCallActivity : AppCompatActivity() { val pullTime = record.optString("pullTime", "") val sourceUnitName = record.optString("sourceUnitName", "") val pocGid = record.optString("pocGid", "") - if (pocGid.isNotEmpty()) { + if (pocGid.isNotEmpty() && currentTempGroupId.isEmpty()) { currentTempGroupId = pocGid MainActivity.executeJs("if(window.startPullGroupLock){ window.startPullGroupLock('$currentTempGroupId'); }") }