diff --git a/app/src/main/assets/print_demo.html b/app/src/main/assets/print_demo.html index 7199f10..1cdbc09 100644 --- a/app/src/main/assets/print_demo.html +++ b/app/src/main/assets/print_demo.html @@ -658,7 +658,7 @@ } // 更新 PTT 通话状态 (由 Android 原生同步调用) - window.updatePttTalkStatus = function(isTalking) { + function updatePttTalkStatus(isTalking) { var statusNode = document.getElementById('ptt-talk-status'); if (isTalking) { statusNode.style.display = 'inline-block'; @@ -683,7 +683,7 @@ } // 更新 PTT 登录状态 (由 Android 实时推送) - window.updatePttLoginStatus = function(status, loginId) { + function updatePttLoginStatus(status, loginId) { updatePttLoginStatusUI(status); var statusMap = { "00": "未登录", "01": "登录中...", "02": "已登录" }; showPttResult("登录状态变更: " + (statusMap[status] || status) + " (ID:" + loginId + ")"); diff --git a/app/src/main/java/com/example/kingway/ptt/pttActivity.java b/app/src/main/java/com/example/kingway/ptt/pttActivity.java index 0ab8d33..0256d02 100644 --- a/app/src/main/java/com/example/kingway/ptt/pttActivity.java +++ b/app/src/main/java/com/example/kingway/ptt/pttActivity.java @@ -52,7 +52,8 @@ public class pttActivity extends AppCompatActivity { findViewById(R.id.login).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - SendAtUtil.toLogin("admin", "poc123456", "220.154.131.231", 1, 1); +// SendAtUtil.toLogin("gzzdweb01", "123456", "61.243.1.123", 1, 1); + SendAtUtil.toLogin("poc2", "poc123456", "220.154.131.231", 1, 1); } }); diff --git a/app/src/main/java/com/stand/standapp/LoginActivity.kt b/app/src/main/java/com/stand/standapp/LoginActivity.kt index 9d58955..4085a02 100644 --- a/app/src/main/java/com/stand/standapp/LoginActivity.kt +++ b/app/src/main/java/com/stand/standapp/LoginActivity.kt @@ -6,6 +6,8 @@ import android.os.Bundle import android.widget.* import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AppCompatActivity +import com.hjq.permissions.Permission +import com.hjq.permissions.XXPermissions import com.stand.standapp.printer.PrinterManager import okhttp3.* import org.json.JSONObject @@ -20,6 +22,11 @@ class LoginActivity : AppCompatActivity() { super.onCreate(savedInstanceState) setContentView(R.layout.activity_login) + // 新安装时直接申请录音权限 + XXPermissions.with(this) + .permission(Permission.RECORD_AUDIO) + .request(null) + val etUsername = findViewById(R.id.et_username) val etPassword = findViewById(R.id.et_password) val cbRemember = findViewById(R.id.cb_remember)