正在接收Android宽高...
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
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 9994042..a2e3a89 100644
--- a/XixunPlayer/app/src/main/java/com/xixun/xixunplayer/AIDLService.java
+++ b/XixunPlayer/app/src/main/java/com/xixun/xixunplayer/AIDLService.java
@@ -13,9 +13,13 @@ import com.xixun.util.PlayerInfo;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
+import java.io.OutputStreamWriter;
import java.nio.charset.StandardCharsets;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Base64;
+import java.util.Date;
import java.util.HashSet;
import gnph.util.IOs;
@@ -102,7 +106,7 @@ public class AIDLService extends Service {
public void setUSBProgramPwd(String pwd) throws RemoteException {
}
-
+ SimpleDateFormat fmt = new SimpleDateFormat("yy-MM-dd HH:mm:ss");
@SuppressLint("ResourceType")
@Override
public String executeJosnCommand(String jsonstr) throws RemoteException {
@@ -186,17 +190,22 @@ public class AIDLService extends Service {
if(t>0) {
var len = new File(Util.programDir+"/"+src.filename).length();
conn.setHeader("Range", "bytes="+len+"-");
- Util.println(" Range "+len);
+ Util.println(" Range: bytes="+len+"-");
}
var input = conn.in();
var code = conn.hconn().getResponseCode();
- var fout = new FileOutputStream(Util.programDir+"/"+src.filename, code==206);
- IOs.writeCloseIn(fout, input);
- fout.flush();
- fout.getFD().sync();
- fout.close();
- if(code==200 || code==206) break;
- else Util.println(" error "+code+" "+conn.hconn().getResponseMessage()+" size: "+new File(src.filename).length()+" "+src.filename);
+ Util.println(" "+code+" - "+conn.hconn().getResponseMessage());
+ if(code==200 || code==206) {
+ var fOut = new FileOutputStream(Util.programDir+"/"+src.filename, code==206);
+ IOs.writeCloseIn(fOut, input);
+ fOut.flush();
+ fOut.getFD().sync();
+ fOut.close();
+ break;
+ } else {
+ Util.println(" body "+IOs.readStrClose(input));
+ Util.println(" size: "+new File(Util.programDir+"/"+src.filename).length()+" "+src.filename);
+ }
} catch (Throwable e) {
Util.println(Util.toStr(e));
}
@@ -247,6 +256,8 @@ public class AIDLService extends Service {
try {
var fOut = new FileOutputStream(Util.programDir + "/program");
fOut.write(jsonBytes);
+ var spaces = " ".getBytes();
+ for(int i=0;i<1000; i++) fOut.write(spaces);
fOut.flush();
fOut.getFD().sync();
fOut.close();
@@ -337,6 +348,51 @@ public class AIDLService extends Service {
"cardId", Util.getCardId(),
"commandId", commandId
).toString();
+ } else if(_type.equalsIgnoreCase("GetLog")) {
+ return new JSMap(
+ "_type", "Success",
+ "cardId", Util.getCardId(),
+ "commandId", commandId,
+ "text", Util.buf.toString()
+ ).toString();
+ } else if(_type.equalsIgnoreCase("ListProgFiles")) {
+ var files = new File(Util.programDir).listFiles();
+ var writer = new StringBuilder();
+ if(files!=null) {
+ Arrays.sort(files, (f1, f2) -> Long.signum(f2.lastModified() - f1.lastModified()));
+ for(var file : files) writer.append(fmt.format(new Date(file.lastModified()))).append(' ').append(file.getName()).append(' ').append(String.valueOf(file.length())).append('\n');
+ }
+ return new JSMap(
+ "_type", "Success",
+ "cardId", Util.getCardId(),
+ "commandId", commandId,
+ "text", writer.toString()
+ ).toString();
+ } else if("GetJson".equalsIgnoreCase(_type)) {
+ var inse = new File(Util.programDir+"/insert");
+ var files = new File(Util.programDir).listFiles();
+ var writer = new StringBuilder();
+ if(inse.isFile()) {
+ var text = IOs.readStrClose(new FileInputStream(inse)).trim();
+ if(files!=null) for(var file : files) if(! "program".equals(file.getName())) text = text.replace("\""+file.getName()+"\"", "\""+file.getName()+"\"/*"+file.length()+" "+fmt.format(new Date(file.lastModified()))+"*/");
+ writer.append("insert:\n");
+ writer.append(text);
+ if(! text.endsWith("\n")) writer.append("\n");
+ }
+ var prog = new File(Util.programDir+"/program");
+ if(! prog.isFile()) writer.append("'program' file not exist");
+ else {
+ var text = IOs.readStrClose(new FileInputStream(prog)).trim();
+ if(files!=null) for(var file : files) if(! "program".equals(file.getName())) text = text.replace("\""+file.getName()+"\"", "\""+file.getName()+"\"/*"+file.length()+" "+fmt.format(new Date(file.lastModified()))+"*/");
+ writer.append("\nprogram:\n");
+ writer.append(text);
+ }
+ return new JSMap(
+ "_type", "Success",
+ "cardId", Util.getCardId(),
+ "commandId", commandId,
+ "text", writer.toString()
+ ).toString();
}
return new JSMap(
"_type", "Error",
@@ -391,7 +447,7 @@ public class AIDLService extends Service {
@Override
public String getProgramTask() throws RemoteException {
try {
- return IOs.readStrClose(new FileInputStream(Util.programDir+"/program"));
+ return IOs.readStrClose(new FileInputStream(Util.programDir+"/program")).trim();
} catch (Exception e) {
Util.printStackTrace(e);
return Util.toStr(e);
diff --git a/XixunPlayer/app/src/main/java/com/xixun/xixunplayer/MainActivity.java b/XixunPlayer/app/src/main/java/com/xixun/xixunplayer/MainActivity.java
index 9aefca3..c64fb45 100644
--- a/XixunPlayer/app/src/main/java/com/xixun/xixunplayer/MainActivity.java
+++ b/XixunPlayer/app/src/main/java/com/xixun/xixunplayer/MainActivity.java
@@ -11,6 +11,7 @@ import android.content.ServiceConnection;
import android.content.pm.PackageManager;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper;
+import android.graphics.Color;
import android.media.AudioFocusRequest;
import android.media.AudioManager;
import android.os.Build;
@@ -19,6 +20,8 @@ import android.os.IBinder;
import android.os.StrictMode;
import android.view.Choreographer;
import android.view.View;
+import android.webkit.JavascriptInterface;
+import android.webkit.WebView;
import androidx.annotation.NonNull;
import androidx.core.app.ActivityCompat;
@@ -40,6 +43,7 @@ import java.util.LinkedList;
import gnph.util.Chsets;
import gnph.util.JSList;
import gnph.util.JSMap;
+import gnph.util.O;
public class MainActivity extends Activity implements Choreographer.FrameCallback {
@@ -49,9 +53,9 @@ public class MainActivity extends Activity implements Choreographer.FrameCallbac
public Intent environIntent = new Intent();
HashSet
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+ 设备ID
+
+ 3568S-2C5-00641
+
+
+
+
+
+
+ 
+
+
+
+
+ 网络状态
+
+ 未知网络
+
+
+
+
+ 
+
+
+
+
+ IP地址
+
+ 0.0.0.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 云平台发布
+
+
+
+
+
+
+ 操作步骤
+
+
+
+ 1.登录到云平台
+ 2.创建并编辑节目
+ 3.发送节目到设备
+
+
+
+ 
+ 
+ 
+
+ 
+
+
+
+
+
+
+
+
+
+
+ 注意事项
+
+
+ 设备需切换至联网模式并关联云平台账号，云服务器地址：https://www.ledokcloud.com
+
+
+
+
+
+
+
+
+
+
+ 手机APP发布
+
+
+
+
+
+
+ 操作步骤
+
+
+
+ 1.打开LEDOK Lite APP
+ 2.创建并编辑节目
+ 3.发送节目到设备
+
+
+
+ 
+
+ 
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 注意事项
+
+
+ 设备需切换至热点模式，手机需连接该设备热点
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+ U盘发布
+
+
+
+
+
+
+ 操作步骤
+
+
+
+ 1.节目文件存入U盘
+ 2.U盘接入设备
+ 3.系统自动播放
+
+
+
+ 
+
+ 
+
+ 
+
+
+
+
+
+
+
+
+
+
+ 注意事项
+
+
+ 无设备模式限制，U盘即插即播
+
+