修复bug

1. getSmaliMethod中多了一个空格导致部分功能无法使用 2. 多winev2复制了app快捷方式的类
ewt45 · Aug 3, 2023 · 95d5764 · 95d5764
1 parent eb4b968
commit 95d5764
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/app/src/main/java/com/eltechs/ed/guestContainers/GuestContainerConfig.java b/app/src/main/java/com/eltechs/ed/guestContainers/GuestContainerConfig.java
@@ -77,9 +77,15 @@ void loadDefaults() {
         setStartupActions("");
         setRunGuide("");
         setRunGuideShown(false);
+//        setRendererDefault();
         MutiWine.writeWineVerToContainerConfig(mCont.mId);
     }
 
+    //原exa不存在的方法。可以用这个来设置默认渲染方式
+    public void setRendererDefault(){
+         this.mSp.edit().putString("RENDERER","Turnip_DXVK").apply();
+    }
+
     public String getName() {
         SharedPreferences sharedPreferences = this.mSp;
         return sharedPreferences.getString(KEY_NAME, "Container_" + this.mCont.mId);
@@ -112,7 +118,7 @@ public ScreenInfo getScreenInfo() {
 
     public void setScreenInfo(ScreenInfo screenInfo) {
         SharedPreferences.Editor edit = this.mSp.edit();
-        String str = Integer.toString(screenInfo.widthInPixels) + "," + screenInfo.heightInPixels;
+        String str = screenInfo.widthInPixels + "," + screenInfo.heightInPixels;
         String[] strArr = SUPPORTED_RESOLUTIONS;
         boolean z = false;
         int length = strArr.length;

diff --git a/patchapp/src/main/java/com/ewt45/patchapp/patching/PatcherFile.java b/patchapp/src/main/java/com/ewt45/patchapp/patching/PatcherFile.java
@@ -242,7 +242,7 @@ private static void parsePkgNameInFile(File dstFile) {
 
     public static String[] getSmaliMethod(String smaliLocation, String methodName) throws IOException {
         //定位smali文件
-        File oneFile = new File(PatchUtils.getPatchTmpDir().getAbsolutePath() + "/patcher/smali/ " + smaliLocation);
+        File oneFile = new File(PatchUtils.getPatchTmpDir().getAbsolutePath() + "/patcher/smali/" + smaliLocation);
         List<String> fileLines = FileUtils.readLines(oneFile, StandardCharsets.UTF_8);
         int start = -1, end = -1;
 

diff --git a/patchapp/src/main/java/com/ewt45/patchapp/thread/FuncMultiWine.java b/patchapp/src/main/java/com/ewt45/patchapp/thread/FuncMultiWine.java
@@ -58,7 +58,6 @@ public Integer call() throws Exception {
                 "/com/google/gson", //json依赖
                 "/org/tukaani/xz", //xz解压依赖
                 "/com/example/datainsert/exagear/mutiWine",
-                "/com/example/datainsert/exagear/shortcut",
                 "/com/example/datainsert/exagear/RR.smali",
                 "/com/example/datainsert/exagear/QH.smali",
         });