This commit is contained in:
parent
619d1c4153
commit
00f4c106a4
|
|
@ -35,3 +35,4 @@ local.properties
|
||||||
/.kotlin/
|
/.kotlin/
|
||||||
/第三方/*
|
/第三方/*
|
||||||
/startopencode
|
/startopencode
|
||||||
|
/docs/*
|
||||||
|
|
|
||||||
|
|
@ -522,6 +522,15 @@
|
||||||
case 'Alarm':
|
case 'Alarm':
|
||||||
msg = "⚠️收到报警: " + payload.memberName + " (纬度:" + payload.latitude + ")";
|
msg = "⚠️收到报警: " + payload.memberName + " (纬度:" + payload.latitude + ")";
|
||||||
break;
|
break;
|
||||||
|
case 'StopAlarm':
|
||||||
|
msg = "群成员停止告警";
|
||||||
|
break;
|
||||||
|
case 'SpeakResult':
|
||||||
|
msg = payload.success ? "话权获取成功" : "话权获取失败";
|
||||||
|
break;
|
||||||
|
case 'SpeakEnd':
|
||||||
|
msg = payload.success ? "话权释放成功" : "话权释放失败";
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
msg = "收到事件: " + eventType;
|
msg = "收到事件: " + eventType;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -199,6 +199,7 @@ public class CallBackResolution {
|
||||||
tempTxt += unicode(stringsSpker.get(i));
|
tempTxt += unicode(stringsSpker.get(i));
|
||||||
}
|
}
|
||||||
talkName = tempTxt;
|
talkName = tempTxt;
|
||||||
|
CallBackUtil.callBackNotifySpker(speckType, indexGroupId, indexGroupName, talkId, talkName);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -90,6 +90,11 @@ public class CallBackUtil {
|
||||||
public static void callBackSpeakPlaySuccess(boolean state) {
|
public static void callBackSpeakPlaySuccess(boolean state) {
|
||||||
Log.d(TAG, "callBackSpeakPlaySuccess state: " + state);
|
Log.d(TAG, "callBackSpeakPlaySuccess state: " + state);
|
||||||
if (state) AudioRecordManager.getInstance().startRecord();
|
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-失败
|
* state true-成功, false-失败
|
||||||
*/
|
*/
|
||||||
public static void callBackSpeakReleaseSuccess(boolean state) {
|
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 () {
|
public static void callBackEnotifyStopAlarm () {
|
||||||
|
com.stand.standapp.MainActivity.executeJs("if(window.onPttEvent){window.onPttEvent('StopAlarm', {});}");
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue