Merge remote-tracking branch 'origin/master'

# Conflicts: # README.md
cpacm · Nov 15, 2016 · 20f4ac1 · 20f4ac1
2 parents 6800c20 + 6f5ae28
commit 20f4ac1
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -4,8 +4,7 @@
 
 [大尺寸原图](http://ofrf20oms.bkt.clouddn.com/beats_origin.jpg)
 
-
-[app下载地址](https://github.com/cpacm/MoeMusic/releases/download/1.0.0/beats_1.0.0.apk)
+[app下载地址](http://fir.im/beats)
 
 `Beats` 是一款基于萌否网站api的音乐管理软件，它既可以从萌否网站上获取网络上的音乐资源也可以在本地音乐上进行私人化定制管理。
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -19,6 +19,10 @@ android {
         }*/
     }
     buildTypes {
+        debug {
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
         release {
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -64,6 +64,19 @@
 -keep class com.google.gson.stream.** { *; }
 -keep class org.json.** {*;}
 
+# Explicitly preserve all serialization members. The Serializable interface
+# is only a marker interface, so it wouldn't save them.
+-keepclassmembers class * implements java.io.Serializable {
+    static final long serialVersionUID;
+    private static final java.io.ObjectStreamField[] serialPersistentFields;
+    private void writeObject(java.io.ObjectOutputStream);
+    private void readObject(java.io.ObjectInputStream);
+    java.lang.Object writeReplace();
+    java.lang.Object readResolve();
+}
+
+-keep public class * implements java.io.Serializable {*;}
+
 #################################### retrofit ###################################
 -dontwarn retrofit2.**
 -keep class retrofit2.** { *; }
@@ -100,4 +113,5 @@
 
 #################################### app ###################################
 -keep class net.cpacm.core.bean.**{ *; }
+-keep class net.cpacm.core.bean.data.**{ *; }
 -keep class net.cpacm.moemusic.ui.account.WebAppBridge