From 2cf19179f972d4c0dd6f0b48ec380776d4ea5cdf Mon Sep 17 00:00:00 2001
From: Caten <catenhu@gmail.com>
Date: Mon, 9 Oct 2023 06:47:57 +0800
Subject: [PATCH] Fix keyboard plug in, streaming don't close

---
 README.md                                |  1 +
 android/app/src/main/AndroidManifest.xml |  2 +-
 lib/main.dart                            | 11 ++++-------
 lib/workflow.dart                        |  3 +++
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 16631e0..96df385 100644
--- a/README.md
+++ b/README.md
@@ -23,6 +23,7 @@ assets的文件来源如下:
 
 - [proot](https://github.com/Cateners/proot), 使用[build-proot-android](https://github.com/green-green-avk/build-proot-android)脚本编译
 - [busybox](https://github.com/meefik/busybox)
+- [mediamtx相关](https://github.com/bluenviron/mediamtx)
 - [tar](https://github.com/Rprop/tar-android-static)
 - [Xserver XSDL, pulseaudio相关文件](https://github.com/pelya/commandergenius/tree/sdl_android/project/jni/application/xserver)
 - [Tmoe Linux, debian包来源](https://github.com/2moe/tmoe)
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index e14dd6d..faa1c60 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -15,7 +15,7 @@
             android:exported="true"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
-            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
+            android:configChanges="navigation|orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
             android:windowSoftInputMode="adjustResize">
             <!-- Specifies an Android theme to apply to this Activity as soon as
diff --git a/lib/main.dart b/lib/main.dart
index 0f5d300..eafdb1f 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -25,6 +25,7 @@ import 'dart:math';
 
 import 'package:clipboard/clipboard.dart';
 import 'package:flutter/gestures.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_pty/flutter_pty.dart';
 import 'package:permission_handler/permission_handler.dart';
 //import 'package:flutter/services.dart';
@@ -677,6 +678,7 @@ SOFTWARE.
 启用小键盘: 观看3个广告
 关闭横幅广告: 观看5个广告
 终端最大行数修改: 观看6个广告
+推流参数修改: 观看8个广告
 
 我设置了每天最多可以看5个广告。
 只要看满1个广告, 就可以在本次使用期间临时解锁全部功能。
@@ -1179,7 +1181,7 @@ class _MyHomePageState extends State<MyHomePage> {
                                   switch (value) {
                                     case true: {
                                       G.streamServerPty = Pty.start("/system/bin/sh");
-                                      G.streamServerPty.write(const Utf8Encoder().convert("${G.dataPath}/bin/mediamtx ${G.dataPath}/bin/mediamtx.yml &\n"));
+                                      G.streamServerPty.write(const Utf8Encoder().convert("${G.dataPath}/bin/mediamtx ${G.dataPath}/bin/mediamtx.yml & pid=\$(echo \$!)\n"));
                                       G.streamServerPty.exitCode.then((value) {
                                         G.isStreamServerStarted = false;
                                         setState(() {});
@@ -1187,12 +1189,7 @@ class _MyHomePageState extends State<MyHomePage> {
                                     }
                                     break;
                                     case false: {
-                                      G.streamServerPty.write(const Utf8Encoder().convert("""
-pids=${G.dataPath}/busybox pgrep '${G.dataPath}/bin/mediamtx';
-for pid in \$pids; do
-    kill \$pid
-done
-exit\n"""));
+                                      G.streamServerPty.write(const Utf8Encoder().convert("kill \$pid\nexit\n"));
                                     }
                                     break;
                                   }
diff --git a/lib/workflow.dart b/lib/workflow.dart
index c91d0f8..d1f2727 100644
--- a/lib/workflow.dart
+++ b/lib/workflow.dart
@@ -587,6 +587,9 @@ done
     G.controller = WebViewController()..setJavaScriptMode(JavaScriptMode.unrestricted);
 
     //恢复临时开启的功能
+    if (Util.shouldWatchAds(G.adsRequired["changeFFmpegCommand"]!)) {
+      await G.prefs.remove("defaultFFmpegCommand");
+    }
     if (Util.shouldWatchAds(G.adsRequired["changeTermMaxLines"]!)) {
       await G.prefs.setInt("termMaxLines", 4095);
     }