临时群,声音
This commit is contained in:
parent
f41557db0e
commit
a74cdb7769
|
|
@ -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<TextView>(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'); }")
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue