edpatch v1.0.0

ewt45 · Nov 26, 2023 · 81add29 · 81add29
1 parent 618e836
commit 81add29
Show file tree

Hide file tree

Showing 39 changed files with 643 additions and 1,259 deletions.
diff --git a/app/src/main/java/com/example/datainsert/exagear/FAB/FabMenu.java b/app/src/main/java/com/example/datainsert/exagear/FAB/FabMenu.java
@@ -45,7 +45,8 @@ public class FabMenu {
     3: 修复了左右布局编辑一列按键时，重新选择按键之后会导致按键顺序被打乱的问题
 
     pulseaudio
-    2：保留 deamon.conf
+    2: 保留 deamon.conf
+    3: 将工作目录 以及 日志输出 移动到 z:/opt/edpatch/pulseaudio-xsdl
 
     xegw
     1: 为xegw2.0准备的更多选项， -legacy-drawing 和关闭电池优化
@@ -56,7 +57,7 @@ public class FabMenu {
     private static final int VERSION_FOR_EDPATCH =
             0x3 //自定义d盘的版本号
                     | 0x3 << 4 //自定义按键的版本号
-                    | 0x2 << 8 //pulseaudio
+                    | 0x3 << 8 //pulseaudio
                     | 0x1 << 12 //Xegw
                     | 0x1 << 16 //VirglOverlay
             ;

diff --git a/app/src/main/java/com/example/datainsert/exagear/FAB/dialogfragment/BaseFragment.java b/app/src/main/java/com/example/datainsert/exagear/FAB/dialogfragment/BaseFragment.java
@@ -69,34 +69,10 @@ public static TextView getTextViewWithText(Context c, String s) {
      * @return 线性布局
      * @deprecated 请使用QH的同名函数
      */
-    @Deprecated
     public static LinearLayout getOneLineWithTitle(Context c, @Nullable String s, @Nullable View view, boolean vertical) {
-//        return QH.getOneLineWithTitle(c,s,view,vertical);
-        LinearLayout linearLayout = new LinearLayout(c);
-        linearLayout.setOrientation(vertical ? LinearLayout.VERTICAL : LinearLayout.HORIZONTAL);
-        if (s != null && !s.equals("")) {
-            TextView textView = getTextViewWithText(c, s);
-            //加粗一下吧
-            textView.getPaint().setFakeBoldText(true);
-//        textView.setTypeface(Typeface.DEFAULT_BOLD);
-            textView.invalidate();
-            linearLayout.addView(textView);
-        }
-        if (view != null) {
-            LinearLayout.LayoutParams params = view.getLayoutParams() != null
-                    ? new LinearLayout.LayoutParams(view.getLayoutParams())
-                    : new LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT);
-            if (linearLayout.getChildCount() > 0)
-                params.setMarginStart(20);
-            if(vertical)
-                params.topMargin=20;
-            linearLayout.addView(view, params);
-        }
-        linearLayout.setPadding(0, 20, 0, 0);
-        return linearLayout;
+        return QH.getOneLineWithTitle(c, s, view, vertical);
     }
 
-
     /**
      * 获取设置相关的sharepreference 写入或读取。 写入：.edit().apply()
      *