diff --git a/app/build.gradle b/app/build.gradle index 7b477fe..42f4202 100644 --- 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' } \ No newline at end of file diff --git a/app/src/main/java/io/github/javiewer/Javiewer.java b/app/src/main/java/io/github/javiewer/Javiewer.java index 86fd6bc..967e3af 100644 --- 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 index 6eb9f1a..d12358b 100644 --- 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 index 625c96d..a7e5456 100644 --- 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 @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 index 9c0c9a9..18db019 100644 --- a/app/src/main/res/layout/fragment_recycler.xml +++ b/app/src/main/res/layout/fragment_recycler.xml @@ -1,5 +1,4 @@ + android:layout_height="wrap_content"> - + app:adUnitId="ca-app-pub-3531010190175990/7017100668" />--> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 12355af..7b27967 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -7,4 +7,15 @@ Hello blank fragment + 发生了一个错误 :(\n我们深感抱歉 + 未知异常 + 重启 + 关闭 + 错误信息 + 错误信息 + 关闭 + 复制到剪贴板 + 已复制到剪贴板 + 错误信息 + diff --git a/properties.json b/properties.json index fbffa11..c755fcf 100644 --- 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. 收藏夹功能完善" } \ No newline at end of file