From 05ff5a7488f0575aa3f79736ddabcba6b0ff56d8 Mon Sep 17 00:00:00 2001
From: Gangphon <gangphon@qq.com>
Date: Tue, 5 Mar 2024 16:50:07 +0800
Subject: [PATCH] player

---
 XixunPlayer/app/build.gradle                     |  4 ++--
 XixunPlayer/app/src/main/AndroidManifest.xml     |  1 +
 .../java/com/xixun/xixunplayer/MainActivity.java | 16 ++++++++++------
 .../main/java/com/xixun/xixunplayer/Server.java  |  8 +++++++-
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/XixunPlayer/app/build.gradle b/XixunPlayer/app/build.gradle
index 77c4b86..695f214 100644
--- a/XixunPlayer/app/build.gradle
+++ b/XixunPlayer/app/build.gradle
@@ -8,10 +8,10 @@ android {
 
     defaultConfig {
         applicationId "com.xixun.xixunplayer"
-        minSdk 24
+        minSdk 21
         targetSdk 34
         versionCode 1
-        versionName "1.0.23-sche"
+        versionName "1.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/XixunPlayer/app/src/main/AndroidManifest.xml b/XixunPlayer/app/src/main/AndroidManifest.xml
index 2078efc..38625b6 100644
--- a/XixunPlayer/app/src/main/AndroidManifest.xml
+++ b/XixunPlayer/app/src/main/AndroidManifest.xml
@@ -13,6 +13,7 @@
     <application
         android:allowBackup="true"
         android:usesCleartextTraffic="true"
+        android:launchMode="singleTop"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
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 fddcf5d..e244e1f 100644
--- a/XixunPlayer/app/src/main/java/com/xixun/xixunplayer/MainActivity.java
+++ b/XixunPlayer/app/src/main/java/com/xixun/xixunplayer/MainActivity.java
@@ -309,7 +309,7 @@ public class MainActivity extends ComponentActivity implements Choreographer.Fra
             }
         } catch (FileNotFoundException e) {
             state = 3;
-            Util.printStackTrace(e);
+            Util.println(""+e);
         } catch (Throwable e) {
             state = 7;
             Util.makeText(this, Util.toStr(e)).show();
@@ -319,12 +319,16 @@ public class MainActivity extends ComponentActivity implements Choreographer.Fra
     public void initProg(byte[] json) {
         try {
             Util.println("\nParse Prog Json");
-            var task = JSMap.from(json).jsmap("task");
+            var root = JSMap.from(json);
+            var task = root.jsmap("task");
             if(task==null) {
-                state = 7;
-                Util.println("  Error: task==null\n");
-                Util.println(new String(json, Chsets.UTF8));
-                return;
+                if(! root.containsKey("layers")) {
+                    state = 7;
+                    Util.println("  Error: task==null\n");
+                    Util.println(new String(json, Chsets.UTF8));
+                    return;
+                }
+                task = new JSMap("items", new JSList<>(new JSMap("repeatTimes", 1, "_program", root)));
             }
             var view = new Prog(task, this);
             if(view.getChildCount()==0) {
diff --git a/XixunPlayer/app/src/main/java/com/xixun/xixunplayer/Server.java b/XixunPlayer/app/src/main/java/com/xixun/xixunplayer/Server.java
index 4f297de..9ae0561 100644
--- a/XixunPlayer/app/src/main/java/com/xixun/xixunplayer/Server.java
+++ b/XixunPlayer/app/src/main/java/com/xixun/xixunplayer/Server.java
@@ -233,7 +233,13 @@ public class Server extends Service {
                 } else if(_type.equals("SetPlayerBackground")) {
                     var url = json.str("url");
                     if(url==null) new File(Util.backImgFile).delete();
-                    else IOs.writeClose(new FileOutputStream(Util.backImgFile), new URLConn(url).in());
+                    else {
+                        var fout = new FileOutputStream(Util.backImgFile);
+                        IOs.write(fout, new URLConn(url).in());
+                        fout.flush();
+                        fout.getFD().sync();
+                        fout.close();
+                    }
                     MainActivity.ins.runOnUiThread(() -> {
                         MainActivity.ins.backView.cosImg = url==null ? null : BitmapFactory.decodeFile(Util.backImgFile);
                         MainActivity.ins.backView.invalidate();