fix gson crash

HISTORY.md

@@ -1,5 +1,10 @@
 ## 更新日志
 
+### v2.0.8
+
+* 修复部分设备闪退的问题
+* 修复设置页可能显示不全的问题
+
 ### v2.0.5
 
 * 设置页增加恢复默认按钮，目前只用于同步系统时间

Makefile

@@ -16,4 +16,4 @@ gen-version:
 
 #make gen v=v2.0.0
 gen:
-	echo $(v) | sed 's/v/ /g' | sed 's/\./ /g' | sed 's/-/ /g' | awk '{print "{\"version_code\": " ($$1*16777216)+($$2*65536)+($$3*256)+$$4 ", \"version_name\": \"" "$(v)" "\"}"}' > version.json
+	echo $(v) | sed 's/v/ /g' | sed 's/\./ /g' | sed 's/-/ /g' | awk '{print "{\"version_code\": " ($$1*16777216)+($$2*65536)+($$3*256)+$$4 ", \"version_name\": \"" "v$(v)" "\"}"}' > version.json

app/build.gradle

@@ -89,7 +89,7 @@ static def VersionName() {
         process.waitFor()
         def versionName = process.text.trim() - "v"
         if (versionName.isEmpty()) {
-            versionName =   "1.0.0"
+            versionName = "1.0.0"
         }
         return versionName
     } catch (ignored) {
@@ -114,7 +114,11 @@ dependencies {
     def retrofit2_version = "2.6.4"
 
     implementation 'com.google.protobuf:protobuf-kotlin:3.25.1'
-    implementation "com.squareup.retrofit2:converter-gson:$retrofit2_version"
+    // Gson 2.10.1 and older: API level 19
+    implementation("com.google.code.gson:gson:2.10.1")
+    implementation("com.squareup.retrofit2:converter-gson:$retrofit2_version") {
+        exclude group: 'com.google.code.gson', module: 'gson'
+    }
     implementation "com.squareup.retrofit2:converter-protobuf:$retrofit2_version"
     implementation "com.squareup.retrofit2:retrofit:$retrofit2_version"
 

app/src/main/java/com/lizongying/mytv/MainActivity.kt

@@ -45,7 +45,7 @@ class MainActivity : FragmentActivity(), Request.RequestListener, OnSharedPrefer
 
     private val handler = Handler()
     private val delayHideMain: Long = 10000
-    private val delayHideSetting: Long = 10000
+    private val delayHideSetting: Long = 15000
 
     init {
         Utils.setRequestListener(this)

app/src/main/res/layout/setting.xml

@@ -1,18 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/setting"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     >
-    <LinearLayout
+    <ScrollView
+        android:id="@+id/container"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
+        android:layout_height="match_parent"
+        android:fillViewport="true"
+        >
         <LinearLayout
             android:id="@+id/content"
             android:layout_width="300dp"
             android:layout_height="match_parent"
             android:orientation="vertical"
             android:paddingTop="20dp"
+            android:paddingBottom="20dp"
             android:paddingLeft="10dp"
             android:paddingRight="10dp"
             android:background="@drawable/rounded_dark_left"
@@ -105,11 +109,11 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
         </LinearLayout>
-        <ImageView
+    </ScrollView>
-            android:id="@+id/appreciate"
+    <ImageView
-            android:layout_width="300dp"
+        android:id="@+id/appreciate"
-            android:layout_height="wrap_content"
+        android:layout_width="300dp"
-            android:src="@drawable/appreciate"
+        android:layout_height="wrap_content"
-            android:background="@drawable/rounded_white_right" />
+        android:src="@drawable/appreciate"
-    </LinearLayout>
+        android:background="@drawable/rounded_white_right" />
-</FrameLayout>
+</LinearLayout>

version.json

@@ -1 +1 @@
-{"version_code": 33555712, "version_name": "v2.0.5"}
+{"version_code": 33556480, "version_name": "v2.0.8"}