1.3.2

SplashCodes · May 9, 2017 · 79a6a5f · 79a6a5f
1 parent fa2adc1
commit 79a6a5f
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 19 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "io.github.javiewer"
         minSdkVersion 15
         targetSdkVersion 25
-        versionCode 8
-        versionName "1.3.1"
+        versionCode 9
+        versionName "1.3.2"
 
     }
     buildTypes {
@@ -38,6 +38,7 @@ dependencies {
     compile 'com.robertlevonyan.view:MaterialChipView:1.0.1'
     compile 'com.miguelcatalan:materialsearchview:1.4.0'
     compile 'de.hdodenhof:circleimageview:2.1.0'
+    compile 'cat.ereza:customactivityoncrash:1.5.0'
 
     //Utility
     compile 'com.github.bumptech.glide:glide:3.7.0'
@@ -50,7 +51,6 @@ dependencies {
 
     //Firebase
     compile 'com.google.firebase:firebase-crash:10.0.1'
-    compile 'com.google.firebase:firebase-ads:10.0.1'
     testCompile 'junit:junit:4.12'
     apt 'com.jakewharton:butterknife-compiler:8.4.0'
 }
diff --git a/app/src/main/java/io/github/javiewer/Javiewer.java b/app/src/main/java/io/github/javiewer/Javiewer.java
@@ -20,6 +20,7 @@
 import java.util.List;
 import java.util.Map;
 
+import cat.ereza.customactivityoncrash.CustomActivityOnCrash;
 import io.github.javiewer.adapter.item.DataSource;
 import io.github.javiewer.fragment.ActressesFragment;
 import io.github.javiewer.fragment.HomeFragment;
@@ -152,4 +153,10 @@ public static void a(Context context) {
         context.startActivity(intent);
         return;
     }
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        CustomActivityOnCrash.install(this);
+    }
 }
diff --git a/app/src/main/java/io/github/javiewer/fragment/DownloadFragment.java b/app/src/main/java/io/github/javiewer/fragment/DownloadFragment.java
@@ -8,8 +8,6 @@
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
 
-import com.google.android.gms.ads.AdRequest;
-
 import java.util.List;
 
 import io.github.javiewer.JAViewer;
@@ -43,13 +41,13 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
 
     @Override
     public void onActivityCreated(@Nullable Bundle savedInstanceState) {
-        if (JAViewer.CONFIGURATIONS.showAds()) {
+        /*if (JAViewer.CONFIGURATIONS.showAds()) {
             mAdView.setVisibility(View.VISIBLE);
             AdRequest adRequest = new AdRequest.Builder()
                     .addTestDevice("52546C5153814CA9A9714647F5960AFE")
                     .build();
             mAdView.loadAd(adRequest);
-        }
+        }*/
 
         this.setLayoutManager(new LinearLayoutManager(this.getContext()));
         this.setAdapter(new ScaleInAnimationAdapter(new DownloadLinkAdapter(this.getItems(), this.getActivity(), this.provider)));

diff --git a/app/src/main/java/io/github/javiewer/fragment/RecyclerFragment.java b/app/src/main/java/io/github/javiewer/fragment/RecyclerFragment.java
@@ -10,8 +10,6 @@
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.google.android.gms.ads.AdView;
-
 import java.util.ArrayList;
 
 import butterknife.BindView;
@@ -30,8 +28,8 @@ public abstract class RecyclerFragment<I, LM extends RecyclerView.LayoutManager>
     @BindView(R.id.refresh_layout)
     protected SwipeRefreshLayout mRefreshLayout;
 
-    @BindView(R.id.adView)
-    protected AdView mAdView;
+    /*@BindView(R.id.adView)
+    protected AdView mAdView;*/
 
     private SwipeRefreshLayout.OnRefreshListener mRefreshListener;
 

diff --git a/app/src/main/res/layout/fragment_recycler.xml b/app/src/main/res/layout/fragment_recycler.xml
@@ -1,5 +1,4 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -8,8 +7,7 @@
     <android.support.v4.widget.SwipeRefreshLayout
         android:id="@+id/refresh_layout"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_above="@+id/adView">
+        android:layout_height="wrap_content">
 
         <android.support.v7.widget.RecyclerView
             android:id="@+id/recycler_view"
@@ -18,12 +16,12 @@
             android:scrollbars="vertical" />
     </android.support.v4.widget.SwipeRefreshLayout>
 
-    <com.google.android.gms.ads.AdView
+    <!--<com.google.android.gms.ads.AdView
         android:id="@+id/adView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:visibility="gone"
         app:adSize="BANNER"
-        app:adUnitId="ca-app-pub-3531010190175990/7017100668" />
+        app:adUnitId="ca-app-pub-3531010190175990/7017100668" />-->
 </RelativeLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -7,4 +7,15 @@
     <!-- TODO: Remove or change this placeholder text -->
     <string name="hello_blank_fragment">Hello blank fragment</string>
 
+    <string name="customactivityoncrash_error_activity_error_occurred_explanation">发生了一个错误 :(\n我们深感抱歉</string>
+    <string name="customactivityoncrash_error_activity_unknown_exception">未知异常</string>
+    <string name="customactivityoncrash_error_activity_restart_app">重启</string>
+    <string name="customactivityoncrash_error_activity_close_app">关闭</string>
+    <string name="customactivityoncrash_error_activity_error_details">错误信息</string>
+    <string name="customactivityoncrash_error_activity_error_details_title">错误信息</string>
+    <string name="customactivityoncrash_error_activity_error_details_close">关闭</string>
+    <string name="customactivityoncrash_error_activity_error_details_copy">复制到剪贴板</string>
+    <string name="customactivityoncrash_error_activity_error_details_copied">已复制到剪贴板</string>
+    <string name="customactivityoncrash_error_activity_error_details_clipboard_label">错误信息</string>
+
 </resources>
diff --git a/properties.json b/properties.json
@@ -1,5 +1,5 @@
 {
-  "latest_version": "1.3.1",
-  "latest_version_code": "8",
-  "changelog": "**推荐更新**\n1. 修复日本源\n2. 大量界面重新设计，更符合MD规范\n3. 使用Glide加载图片，速度更快\n4. 新的搜索栏\n5. 收藏夹功能完善"
+  "latest_version": "1.3.2",
+  "latest_version_code": "9",
+  "changelog": "**推荐更新**\n1.3.2 终于修复了少部分机型的收藏夹崩溃问题，刷新崩溃问题【抱歉】\n1. 修复日本源\n2. 大量界面重新设计，更符合MD规范\n3. 使用Glide加载图片，速度更快\n4. 新的搜索栏\n5. 收藏夹功能完善"
 }