-
@@ -244,14 +251,15 @@
appStep2: "2.创建并编辑节目",
appStep3: "3.发送节目到设备",
appNote: "设备需切换至热点模式，手机需连接该设备热点",
- scanDownload: "扫码下载APP",
+ scanDownload: "下载APP",
usbStep1: "1.节目文件存入U盘",
usbStep2: "2.U盘接入设备",
usbStep3: "3.系统自动播放",
usbNote: "无设备模式限制，U盘即插即播",
loading: "正在接收Android宽高...",
loadFail: "接收宽高失败",
- unknownNetwork: "未知网络"
+ unknownNetwork: "未知网络",
+ videoCommentary: "视频详解"
},
// 英文
en: {
@@ -272,14 +280,15 @@
appStep2: "2.Create and edit programs",
appStep3: "3.Send programs to device",
appNote: "The device must be switched to hotspot mode, and the mobile phone must connect to the device's hotspot",
- scanDownload: "Scan to download APP",
+ scanDownload: "Download APP",
usbStep1: "1.Save program files to USB",
usbStep2: "2.Connect USB to device",
usbStep3: "3.System plays automatically",
usbNote: "No device mode restrictions, plug and play with USB",
loading: "Receiving Android width and height...",
loadFail: "Failed to receive width and height",
- unknownNetwork: "Unknown Network"
+ unknownNetwork: "Unknown Network",
+ videoCommentary: "Video commentary"
}
};
@@ -375,7 +384,8 @@
const cardId = document.getElementById("cardId");
const cardVideos = document.querySelectorAll(".card-bg-video"); // 所有卡片视频
const infoBarVideo = document.querySelector(".info-bar-bg-video"); // 顶部信息栏视频
-
+ const qrcodeImg = document.getElementById("videoCommentaryQrcode");
+ qrcodeImg.src = currentLang === "zh" ? "images/code_cn.png" : "images/code_en.png";
try {
// ---------------------- 1. 获取并更新宽高 ----------------------
const sizeJson = AndroidBridge.getSizeFromAndroid();
diff --git a/XixunPlayer/app/src/main/java/com/xixun/xixunplayer/AIDLService.java b/XixunPlayer/app/src/main/java/com/xixun/xixunplayer/AIDLService.java
index a2e3a89..48fd6dd 100644
--- a/XixunPlayer/app/src/main/java/com/xixun/xixunplayer/AIDLService.java
+++ b/XixunPlayer/app/src/main/java/com/xixun/xixunplayer/AIDLService.java
@@ -110,7 +110,7 @@ public class AIDLService extends Service {
@SuppressLint("ResourceType")
@Override
public String executeJosnCommand(String jsonstr) throws RemoteException {
- Util.println("AIDL executeJsonCommand ..."+jsonstr);//{"_type":"DeleteTask","id":"652522a0e81d1e000009201a","sendTo":"yzd-player"}
+ Util.println("AIDL executeJson "+jsonstr);//{"_type":"DeleteTask","id":"652522a0e81d1e000009201a","sendTo":"yzd-player"}
String commandId = null;
try {
var jsonBytes = jsonstr.getBytes(StandardCharsets.UTF_8);
diff --git a/XixunPlayer/app/src/main/java/com/xixun/xixunplayer/AidlUtil.java b/XixunPlayer/app/src/main/java/com/xixun/xixunplayer/AidlUtil.java
new file mode 100644
index 0000000..7697387
--- /dev/null
+++ b/XixunPlayer/app/src/main/java/com/xixun/xixunplayer/AidlUtil.java
@@ -0,0 +1,175 @@
+package com.xixun.xixunplayer;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.os.IBinder;
+import android.util.Log;
+
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+public class AidlUtil {
+ // static final String ACTION_CONN ="xixun.intent.action.CONNECTION_INFO";
+ static final String ACTION_PLAYER ="com.xixun.action.PlayerInfo";
+ static final String ACTION_CARD_SYSTEM ="com.xixun.joey.aidlset.SettingsService";
+ static final String ACTION_LIVE ="xixun.intent.action.Live";
+ static final String ACTION_UPDATE ="xixun.intent.action.UPDATE_APK";
+ static final String ACTION_JIESHUN ="com.xixun.xy.conn.JieShun";
+ static final String ACTION_TaxiAppServer ="com.xixun.xy.conn.aidl.TaxiAppServer";
+ static final String ACTION_CustomServer ="com.xixun.xy.conn.aidl.CustomService";
+ static final String ACTION_ConnServer ="com.xixun.xy.conn.aidl.ConnService";
+ static final String ACTION_AiServer ="com.sysolution.ai.AiAvatarService";
+ public static final String PACKAGE_PLAYER="com.xixun.xixunplayer";
+ public static final String PACKAGE_CARD_SYSTEM="com.xixun.joey.cardsystem";
+ public static final String PACKAGE_LIVE="com.xixun.xy.live";
+ public static final String PACKAGE_UPDATE="com.xixun.xy.update";
+ public static final String PACKAGE_TAXIAPP = "net.sysolution.taxiapp";
+ public static final String PACKAGE_CUSTOMAPP = "com.xixun.xixunledplayer";
+ public static final String PACKAGE_BASICAPP = "net.sysolution.basicapp";
+ public static final String PACKAGE_STARTER = "net.sysolution.starter";
+ public static final String PACKAGE_DISPLAY = "com.xixun.display";
+ public static final String PACKAGE_ORDER_VIDEO = "add.xixun.com.ordervideo";
+ public static final String PACKAGE_JIESHUN = "com.xixun.stopguide";
+ public static final String PACKAGE_TAXIAPP88 = "cn.trans88.taxiappkotlin";
+ public static final String PACKAGE_AI = "com.sysolution.ai";
+ public static final String PACKAGE_CONN = "com.xixun.xy.conn";
+
+ public static Intent newConnIntent(){
+ Intent intent = new Intent(ACTION_ConnServer);
+ intent.setPackage(PACKAGE_CONN);
+ return intent;
+ }
+ public static Intent newAiIntent(){
+ Intent intent = new Intent(ACTION_AiServer);
+ intent.setPackage(PACKAGE_AI);
+ return intent;
+ }
+
+ public static Intent newCustomIntent(){
+ Intent intent = new Intent(ACTION_CustomServer);
+ intent.setPackage(PACKAGE_CUSTOMAPP);
+ return intent;
+ }
+
+
+ public static Intent newTaxiAppIntent(){
+ Intent intent = new Intent(ACTION_TaxiAppServer);
+ intent.setPackage(PACKAGE_TAXIAPP);
+ return intent;
+ }
+
+ public static Intent newPlayerIntent(){
+ Intent intent = new Intent(ACTION_PLAYER);
+ intent.setPackage(PACKAGE_PLAYER);
+ return intent;
+ }
+ public static Intent newCardSystemIntent(){
+ Intent intent = new Intent(ACTION_CARD_SYSTEM);
+ intent.setPackage(PACKAGE_CARD_SYSTEM);
+ return intent;
+ }
+ public static Intent newLiveIntent(){
+ Intent intent = new Intent(ACTION_LIVE);
+ intent.setPackage(PACKAGE_LIVE);
+ return intent;
+ }
+ public static Intent newUpdateIntent(){
+ Intent intent = new Intent(ACTION_UPDATE);
+ intent.setPackage(PACKAGE_UPDATE);
+ return intent;
+ }
+ public static Intent newJieShunIntent(){
+ Intent intent = new Intent(ACTION_JIESHUN);
+ intent.setPackage(PACKAGE_JIESHUN);
+ return intent;
+ }
+
+ CountDownLatch latch = new CountDownLatch(1);
+ IBinder binder = null;
+ private Intent intent;
+ private Context ctx;
+ private int timeout;
+ private IBinder[] container = new IBinder[1];
+ private ServiceConnection conn = new ServiceConnection() {
+ @Override
+ public void onServiceConnected(ComponentName name, IBinder service) {
+ binder =service;
+ ctx.unbindService(this);
+ latch.countDown();
+ }
+
+ @Override
+ public void onServiceDisconnected(ComponentName name) {
+ Log.i("yzd", "aidl disconnected");
+ }
+ };
+
+ public AidlUtil(Context context, Intent intent, int timeout) {
+ ctx = context;
+ this.intent =intent;
+ this.timeout = timeout;
+ }
+
+ public AidlUtil(Context context, Intent intent) {
+ this(context, intent, 3000);
+ }
+ static int rate =200;
+
+ public IBinder getIBinder() {
+ ctx.bindService(intent, conn,
+ Context.BIND_AUTO_CREATE);
+ try {
+ latch.await(timeout, TimeUnit.MILLISECONDS);
+ }catch(Exception e){
+ e.printStackTrace();
+ }
+
+ if(binder==null) {
+ System.out.println("AIDL通讯建立失败");
+ }
+ return binder;
+ }
+
+ /***
+ * Android L (lollipop, API 21) introduced a new problem when trying to invoke implicit intent,
+ * "java.lang.IllegalArgumentException: Service Intent must be explicit"
+ *
+ * If you are using an implicit intent, and know only 1 target would answer this intent,
+ * This method will help you turn the implicit intent into the explicit form.
+ *
+ * Inspired from SO answer: http://stackoverflow.com/a/26318757/1446466
+ * @param context
+ * @param implicitIntent - The original implicit intent
+ * @return Explicit Intent created from the implicit original intent
+ */
+ public static Intent createExplicitFromImplicitIntent(Context context, Intent implicitIntent) {
+ // Retrieve all services that can match the given intent
+ PackageManager pm = context.getPackageManager();
+ List
-
- 注意事项
+
-
+
+
@@ -166,7 +173,7 @@
+
-
+
+ 注意事项
+
+
+ 设备需切换至联网模式并关联云平台账号，云服务器地址：https://www.ledokcloud.com
+
- 设备需切换至联网模式并关联云平台账号，云服务器地址：https://www.ledokcloud.com
+
+
+ 
+
+ 视频详解
-
+ 扫码下载APP