0.9.9: fix bug in settings

Lazyeraser · Jan 10, 2018 · f3b2a60 · f3b2a60
1 parent 3039fd3
commit f3b2a60
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 28 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.lazyeraser.imas.derehelper"
         minSdkVersion 17
         targetSdkVersion 25
-        versionCode 8
-        versionName "0.9.8"
+        versionCode 9
+        versionName "0.9.9"
         multiDexEnabled true
         vectorDrawables.useSupportLibrary = true
     }

diff --git a/app/src/main/java/com/lazyeraser/imas/retrofit/RetrofitProvider.java b/app/src/main/java/com/lazyeraser/imas/retrofit/RetrofitProvider.java
@@ -37,9 +37,10 @@ public static Retrofit getInstance(boolean json){
     public static Retrofit getInstance(String baseUrl, boolean json) {
         if (okHttpClient == null){
             okHttpClient = new OkHttpClient.Builder()
-                    .connectTimeout(60, TimeUnit.SECONDS)
-                    .readTimeout(600, TimeUnit.SECONDS)
-                    .writeTimeout(600, TimeUnit.SECONDS)
+                    .connectTimeout(30, TimeUnit.SECONDS)
+                    .readTimeout(100, TimeUnit.SECONDS)
+                    .writeTimeout(100, TimeUnit.SECONDS)
+                    .retryOnConnectionFailure(true)
                     .build();
         }
         if (gson == null){

diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
@@ -33,13 +33,19 @@
             bind:onCheckChanged="@{viewModel.onAutoAppSwitchCheck}"
             bind:checked="@{viewModel.autoApp}" />
 
-        <com.lazyeraser.imas.cgss.utils.view.SettingOptionView
-            android:visibility="@{SStaticR.isJp ? View.GONE : View.VISIBLE}"
+        <RelativeLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            bind:titleTxt="@{R.string.settings_default_tran}"
-            bind:onCheckChanged="@{viewModel.onDefaultTranSwitchCheck}"
-            bind:checked="@{viewModel.defaultTran}" />
+            android:visibility="@{SStaticR.isJp ? View.GONE : View.VISIBLE}">
+
+            <com.lazyeraser.imas.cgss.utils.view.SettingOptionView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                bind:titleTxt="@{R.string.settings_default_tran}"
+                bind:onCheckChanged="@{viewModel.onDefaultTranSwitchCheck}"
+                bind:checked="@{viewModel.defaultTran}" />
+
+        </RelativeLayout>
 
         <com.lazyeraser.imas.cgss.utils.view.SettingOptionView
             android:layout_width="wrap_content"
@@ -48,13 +54,19 @@
             bind:onCheckChanged="@{viewModel.onAnalyticsCheck}"
             bind:checked="@{viewModel.analytics}" />
 
-        <com.lazyeraser.imas.cgss.utils.view.SettingOptionView
-            android:visibility="@{!SStaticR.isCnMainLand ? View.GONE : View.VISIBLE}"
+        <RelativeLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            bind:titleTxt="@{R.string.download_speedup}"
-            bind:onCheckChanged="@{viewModel.onProxyCheck}"
-            bind:checked="@{viewModel.rProxy}" />
+            android:visibility="@{!SStaticR.isCnMainLand ? View.GONE : View.VISIBLE}">
+
+            <com.lazyeraser.imas.cgss.utils.view.SettingOptionView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                bind:titleTxt="@{R.string.download_speedup}"
+                bind:onCheckChanged="@{viewModel.onProxyCheck}"
+                bind:checked="@{viewModel.rProxy}" />
+
+        </RelativeLayout>
 
     </LinearLayout>
 

diff --git a/app/src/main/res/layout/frag_card_list.xml b/app/src/main/res/layout/frag_card_list.xml
@@ -4,7 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical">
 
-
     <data>
         <variable
             name="viewModel"
@@ -20,8 +19,6 @@
         android:fitsSystemWindows="true"
         tools:openDrawer="end">
 
-
-
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent">
@@ -40,7 +37,6 @@
 
         </RelativeLayout>
 
-
         <RelativeLayout
             android:layout_width="250dp"
             android:layout_height="match_parent"
@@ -203,7 +199,6 @@
 
             </ScrollView>
 
-
             <LinearLayout
                 android:id="@+id/filter_btn"
                 android:orientation="horizontal"
@@ -236,5 +231,4 @@
 
     </android.support.v4.widget.DrawerLayout>
 
-
 </layout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -143,4 +143,5 @@
     <string name="bpm" translatable="false">BPM</string>
 
     <string name="cancel">Cancel</string>
+    <string name="download_speedup"> </string>
 </resources>
diff --git a/appupdate/version.json b/appupdate/version.json
@@ -1,10 +1,10 @@
 {
 	"appname": "DereHelper",
-	"apkname": "DereHelper.apk",
-	"verName": "0.9.8",
-	"url": "http://45.32.111.67:8080/derehelper/DereHelper-0.9.8.apk",
-	"verInfo": "1.改进用户体验\n2.数据收集服务改为Google Analytics\n3.为简体中文用户增加下载加速功能，解决部分谱面下载失败问题（加速服务由346lab.org提供）\n4.繁体中文对应",
-	"verInfo_jp": "1.ユーザー体験向上\n2.集計機能をGoogle Analyticsに移行\n3.翻訳データの修正",
-	"verInfo_en": "Minor bug fixes&Improvements",
-	"verCode": 8
+	"apkname": "DereHelper-0.9.9.apk",
+	"verName": " 0.9.9",
+	"url": "http://45.32.111.67:8080/derehelper/DereHelper-0.9.9.apk",
+	"verInfo": "优化下载超时判定逻辑",
+	"verInfo_jp": "設定機能のバグ修正",
+	"verInfo_en": "Fix bug in settings",
+	"verCode": 9
 }