From 977f8ef15175ae5ce3b2df610af1ea2b1ad4ed48 Mon Sep 17 00:00:00 2001 From: Matthew Date: Tue, 31 Oct 2023 09:12:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B7=AF=E5=BE=84=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/xypower/mpapp/MainActivity.java | 3 ++- app/src/main/res/layout-land/activity_main.xml | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/xypower/mpapp/MainActivity.java b/app/src/main/java/com/xypower/mpapp/MainActivity.java index 93bb377f..dafd10e8 100644 --- a/app/src/main/java/com/xypower/mpapp/MainActivity.java +++ b/app/src/main/java/com/xypower/mpapp/MainActivity.java @@ -146,6 +146,7 @@ public class MainActivity extends AppCompatActivity { binding.logs.setMovementMethod(ScrollingMovementMethod.getInstance()); binding.logs.setScrollbarFadingEnabled(false); + mHandler = new Handler(Looper.myLooper()) { @Override public void handleMessage(@NonNull Message msg) { @@ -575,7 +576,7 @@ public class MainActivity extends AppCompatActivity { dataPath.mkdirs(); } - inputStreamReader = new InputStreamReader(new FileInputStream(new File(appPath + "data/App.json")), "UTF-8"); + inputStreamReader = new InputStreamReader(new FileInputStream(new File(appPath + "App.json")), "UTF-8"); bufferedReader = new BufferedReader(inputStreamReader); String line; StringBuilder stringBuilder = new StringBuilder(); diff --git a/app/src/main/res/layout-land/activity_main.xml b/app/src/main/res/layout-land/activity_main.xml index 8432cd19..33692594 100644 --- a/app/src/main/res/layout-land/activity_main.xml +++ b/app/src/main/res/layout-land/activity_main.xml @@ -229,15 +229,14 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_margin="4dp" + android:background="@drawable/textview_border" android:orientation="horizontal" android:padding="4dp" android:scrollbars="vertical" + android:singleLine="false" android:text="Logs" android:textColor="@color/black" - android:inputType="textMultiLine" android:textIsSelectable="true" - android:singleLine="false" - android:background="@drawable/textview_border" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/takePhotoBtn4"