diff --git a/.gitignore b/.gitignore index 3f382e9..c70f2b3 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ local.properties /.kotlin/ /第三方/* /startopencode +/docs/* diff --git a/app/src/main/assets/print_demo.html b/app/src/main/assets/print_demo.html index e6a7e72..d29e545 100644 --- a/app/src/main/assets/print_demo.html +++ b/app/src/main/assets/print_demo.html @@ -522,6 +522,15 @@ case 'Alarm': msg = "⚠️收到报警: " + payload.memberName + " (纬度:" + payload.latitude + ")"; break; + case 'StopAlarm': + msg = "群成员停止告警"; + break; + case 'SpeakResult': + msg = payload.success ? "话权获取成功" : "话权获取失败"; + break; + case 'SpeakEnd': + msg = payload.success ? "话权释放成功" : "话权释放失败"; + break; default: msg = "收到事件: " + eventType; } diff --git a/app/src/main/java/com/example/kingway/ptt/CallBackResolution.java b/app/src/main/java/com/example/kingway/ptt/CallBackResolution.java index 0610af7..bd79674 100644 --- a/app/src/main/java/com/example/kingway/ptt/CallBackResolution.java +++ b/app/src/main/java/com/example/kingway/ptt/CallBackResolution.java @@ -199,6 +199,7 @@ public class CallBackResolution { tempTxt += unicode(stringsSpker.get(i)); } talkName = tempTxt; + CallBackUtil.callBackNotifySpker(speckType, indexGroupId, indexGroupName, talkId, talkName); } break; diff --git a/app/src/main/java/com/example/kingway/ptt/CallBackUtil.java b/app/src/main/java/com/example/kingway/ptt/CallBackUtil.java index f571301..73433a2 100644 --- a/app/src/main/java/com/example/kingway/ptt/CallBackUtil.java +++ b/app/src/main/java/com/example/kingway/ptt/CallBackUtil.java @@ -90,6 +90,11 @@ public class CallBackUtil { public static void callBackSpeakPlaySuccess(boolean state) { Log.d(TAG, "callBackSpeakPlaySuccess state: " + state); if (state) AudioRecordManager.getInstance().startRecord(); + try { + org.json.JSONObject obj = new org.json.JSONObject(); + obj.put("success", state); + com.stand.standapp.MainActivity.executeJs("if(window.onPttEvent){window.onPttEvent('SpeakResult', " + obj.toString() + ");}"); + } catch (Exception e) {} } /** @@ -97,6 +102,11 @@ public class CallBackUtil { * state true-成功, false-失败 */ public static void callBackSpeakReleaseSuccess(boolean state) { + try { + org.json.JSONObject obj = new org.json.JSONObject(); + obj.put("success", state); + com.stand.standapp.MainActivity.executeJs("if(window.onPttEvent){window.onPttEvent('SpeakEnd', " + obj.toString() + ");}"); + } catch (Exception e) {} } /** @@ -284,7 +294,7 @@ public class CallBackUtil { * 收到群成员停止警告通知 * */ public static void callBackEnotifyStopAlarm () { - + com.stand.standapp.MainActivity.executeJs("if(window.onPttEvent){window.onPttEvent('StopAlarm', {});}"); } /**