From 7e3e5cc8f683b6ed8d070a29d9a29ba246ab7618 Mon Sep 17 00:00:00 2001
From: chentao <1076559197@qq.com>
Date: Fri, 21 Aug 2015 11:24:48 +0800
Subject: [PATCH 01/22] fixed issue problem about music player #9
---
.idea/codeStyleSettings.xml | 229 ++
.idea/gradle.xml | 8 +
.../CocoUnion_AD_SDK_Android_v4_1_2.xml | 9 +
.idea/libraries/InMobi_4_0_4.xml | 9 +
.idea/libraries/YoukuAnalytics.xml | 9 +
.idea/libraries/ZBarDecoder.xml | 9 +
.idea/libraries/analytics_5_5_3.xml | 11 +
.idea/libraries/appcompat_v7_22_2_0.xml | 15 +
.idea/libraries/baseproject.xml | 9 +
.idea/libraries/butterknife_5_1_1.xml | 11 +
.idea/libraries/cardview_v7_22_2_0.xml | 12 +
.idea/libraries/comscore.xml | 9 +
.idea/libraries/design_22_2_0.xml | 13 +
.idea/libraries/domob_android_sdk.xml | 9 +
.idea/libraries/eventbus_2_4_0.xml | 11 +
.idea/libraries/fastjson_1_1_24.xml | 9 +
.idea/libraries/fb_5_4_0.xml | 10 +
.idea/libraries/gson_2_2_4.xml | 11 +
.idea/libraries/library_1_2_3.xml | 10 +
.idea/libraries/library_1_4.xml | 10 +
.idea/libraries/library_2_4_0.xml | 11 +
.idea/libraries/mAppTracker.xml | 9 +
.idea/libraries/material_dialogs_0_7_6_0.xml | 13 +
.idea/libraries/message_2_4_1.xml | 11 +
.idea/libraries/mobisageSDK.xml | 9 +
.idea/libraries/okhttp_2_4_0.xml | 11 +
.idea/libraries/okio_1_4_0.xml | 11 +
.idea/libraries/playerBase.xml | 9 +
.idea/libraries/recyclerview_v7_22_2_0.xml | 12 +
.../libraries/support_annotations_22_2_0.xml | 11 +
.idea/libraries/support_v4_22_2_0.xml | 16 +
.idea/libraries/systembartint_1_0_3.xml | 11 +
.idea/libraries/tracking.xml | 9 +
.idea/libraries/umeng_update_v2_6_0_1.xml | 9 +
.../universal_image_loader_1_9_3.xml | 11 +
.idea/libraries/xadsdk.xml | 9 +
.idea/libraries/zxing_4_7_3.xml | 9 +
.idea/misc.xml | 56 +-
.idea/modules.xml | 3 +
.idea/runConfigurations.xml | 12 +
.idea/vcs.xml | 2 +-
.idea/workspace.xml | 3476 ++++++++++++++++-
SimplifyReaderGit.iml | 12 +-
.../simplifyreader/player/MusicPlayer.java | 1 +
library/library.iml | 2 +-
library_youku/library_youku.iml | 2 +-
46 files changed, 4034 insertions(+), 136 deletions(-)
create mode 100644 .idea/codeStyleSettings.xml
create mode 100644 .idea/libraries/CocoUnion_AD_SDK_Android_v4_1_2.xml
create mode 100644 .idea/libraries/InMobi_4_0_4.xml
create mode 100644 .idea/libraries/YoukuAnalytics.xml
create mode 100644 .idea/libraries/ZBarDecoder.xml
create mode 100644 .idea/libraries/analytics_5_5_3.xml
create mode 100644 .idea/libraries/appcompat_v7_22_2_0.xml
create mode 100644 .idea/libraries/baseproject.xml
create mode 100644 .idea/libraries/butterknife_5_1_1.xml
create mode 100644 .idea/libraries/cardview_v7_22_2_0.xml
create mode 100644 .idea/libraries/comscore.xml
create mode 100644 .idea/libraries/design_22_2_0.xml
create mode 100644 .idea/libraries/domob_android_sdk.xml
create mode 100644 .idea/libraries/eventbus_2_4_0.xml
create mode 100644 .idea/libraries/fastjson_1_1_24.xml
create mode 100644 .idea/libraries/fb_5_4_0.xml
create mode 100644 .idea/libraries/gson_2_2_4.xml
create mode 100644 .idea/libraries/library_1_2_3.xml
create mode 100644 .idea/libraries/library_1_4.xml
create mode 100644 .idea/libraries/library_2_4_0.xml
create mode 100644 .idea/libraries/mAppTracker.xml
create mode 100644 .idea/libraries/material_dialogs_0_7_6_0.xml
create mode 100644 .idea/libraries/message_2_4_1.xml
create mode 100644 .idea/libraries/mobisageSDK.xml
create mode 100644 .idea/libraries/okhttp_2_4_0.xml
create mode 100644 .idea/libraries/okio_1_4_0.xml
create mode 100644 .idea/libraries/playerBase.xml
create mode 100644 .idea/libraries/recyclerview_v7_22_2_0.xml
create mode 100644 .idea/libraries/support_annotations_22_2_0.xml
create mode 100644 .idea/libraries/support_v4_22_2_0.xml
create mode 100644 .idea/libraries/systembartint_1_0_3.xml
create mode 100644 .idea/libraries/tracking.xml
create mode 100644 .idea/libraries/umeng_update_v2_6_0_1.xml
create mode 100644 .idea/libraries/universal_image_loader_1_9_3.xml
create mode 100644 .idea/libraries/xadsdk.xml
create mode 100644 .idea/libraries/zxing_4_7_3.xml
create mode 100644 .idea/runConfigurations.xml
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
new file mode 100644
index 0000000..d194a3f
--- /dev/null
+++ b/.idea/codeStyleSettings.xml
@@ -0,0 +1,229 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index afade3d..2b79c36 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -6,6 +6,14 @@
+
diff --git a/.idea/libraries/CocoUnion_AD_SDK_Android_v4_1_2.xml b/.idea/libraries/CocoUnion_AD_SDK_Android_v4_1_2.xml
new file mode 100644
index 0000000..11c5e43
--- /dev/null
+++ b/.idea/libraries/CocoUnion_AD_SDK_Android_v4_1_2.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/InMobi_4_0_4.xml b/.idea/libraries/InMobi_4_0_4.xml
new file mode 100644
index 0000000..3cdc7be
--- /dev/null
+++ b/.idea/libraries/InMobi_4_0_4.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/YoukuAnalytics.xml b/.idea/libraries/YoukuAnalytics.xml
new file mode 100644
index 0000000..57510fe
--- /dev/null
+++ b/.idea/libraries/YoukuAnalytics.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/ZBarDecoder.xml b/.idea/libraries/ZBarDecoder.xml
new file mode 100644
index 0000000..e3dfa83
--- /dev/null
+++ b/.idea/libraries/ZBarDecoder.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/analytics_5_5_3.xml b/.idea/libraries/analytics_5_5_3.xml
new file mode 100644
index 0000000..eaebd65
--- /dev/null
+++ b/.idea/libraries/analytics_5_5_3.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/appcompat_v7_22_2_0.xml b/.idea/libraries/appcompat_v7_22_2_0.xml
new file mode 100644
index 0000000..9660325
--- /dev/null
+++ b/.idea/libraries/appcompat_v7_22_2_0.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/baseproject.xml b/.idea/libraries/baseproject.xml
new file mode 100644
index 0000000..ffaec19
--- /dev/null
+++ b/.idea/libraries/baseproject.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/butterknife_5_1_1.xml b/.idea/libraries/butterknife_5_1_1.xml
new file mode 100644
index 0000000..3d241f5
--- /dev/null
+++ b/.idea/libraries/butterknife_5_1_1.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/cardview_v7_22_2_0.xml b/.idea/libraries/cardview_v7_22_2_0.xml
new file mode 100644
index 0000000..8bb997e
--- /dev/null
+++ b/.idea/libraries/cardview_v7_22_2_0.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/comscore.xml b/.idea/libraries/comscore.xml
new file mode 100644
index 0000000..8a36e79
--- /dev/null
+++ b/.idea/libraries/comscore.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/design_22_2_0.xml b/.idea/libraries/design_22_2_0.xml
new file mode 100644
index 0000000..7a73bc2
--- /dev/null
+++ b/.idea/libraries/design_22_2_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/domob_android_sdk.xml b/.idea/libraries/domob_android_sdk.xml
new file mode 100644
index 0000000..8bc93c2
--- /dev/null
+++ b/.idea/libraries/domob_android_sdk.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/eventbus_2_4_0.xml b/.idea/libraries/eventbus_2_4_0.xml
new file mode 100644
index 0000000..defb4b3
--- /dev/null
+++ b/.idea/libraries/eventbus_2_4_0.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/fastjson_1_1_24.xml b/.idea/libraries/fastjson_1_1_24.xml
new file mode 100644
index 0000000..3bedbad
--- /dev/null
+++ b/.idea/libraries/fastjson_1_1_24.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/fb_5_4_0.xml b/.idea/libraries/fb_5_4_0.xml
new file mode 100644
index 0000000..fb6fae5
--- /dev/null
+++ b/.idea/libraries/fb_5_4_0.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/gson_2_2_4.xml b/.idea/libraries/gson_2_2_4.xml
new file mode 100644
index 0000000..8e039c3
--- /dev/null
+++ b/.idea/libraries/gson_2_2_4.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/library_1_2_3.xml b/.idea/libraries/library_1_2_3.xml
new file mode 100644
index 0000000..0d34519
--- /dev/null
+++ b/.idea/libraries/library_1_2_3.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/library_1_4.xml b/.idea/libraries/library_1_4.xml
new file mode 100644
index 0000000..5292c73
--- /dev/null
+++ b/.idea/libraries/library_1_4.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/library_2_4_0.xml b/.idea/libraries/library_2_4_0.xml
new file mode 100644
index 0000000..eedfc0d
--- /dev/null
+++ b/.idea/libraries/library_2_4_0.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/mAppTracker.xml b/.idea/libraries/mAppTracker.xml
new file mode 100644
index 0000000..884cc38
--- /dev/null
+++ b/.idea/libraries/mAppTracker.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/material_dialogs_0_7_6_0.xml b/.idea/libraries/material_dialogs_0_7_6_0.xml
new file mode 100644
index 0000000..7dbdb85
--- /dev/null
+++ b/.idea/libraries/material_dialogs_0_7_6_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/message_2_4_1.xml b/.idea/libraries/message_2_4_1.xml
new file mode 100644
index 0000000..a1d2d9e
--- /dev/null
+++ b/.idea/libraries/message_2_4_1.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/mobisageSDK.xml b/.idea/libraries/mobisageSDK.xml
new file mode 100644
index 0000000..bee601b
--- /dev/null
+++ b/.idea/libraries/mobisageSDK.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/okhttp_2_4_0.xml b/.idea/libraries/okhttp_2_4_0.xml
new file mode 100644
index 0000000..2a5c90c
--- /dev/null
+++ b/.idea/libraries/okhttp_2_4_0.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/okio_1_4_0.xml b/.idea/libraries/okio_1_4_0.xml
new file mode 100644
index 0000000..454ae43
--- /dev/null
+++ b/.idea/libraries/okio_1_4_0.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/playerBase.xml b/.idea/libraries/playerBase.xml
new file mode 100644
index 0000000..3216591
--- /dev/null
+++ b/.idea/libraries/playerBase.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/recyclerview_v7_22_2_0.xml b/.idea/libraries/recyclerview_v7_22_2_0.xml
new file mode 100644
index 0000000..e673560
--- /dev/null
+++ b/.idea/libraries/recyclerview_v7_22_2_0.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/support_annotations_22_2_0.xml b/.idea/libraries/support_annotations_22_2_0.xml
new file mode 100644
index 0000000..b30e3ef
--- /dev/null
+++ b/.idea/libraries/support_annotations_22_2_0.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/support_v4_22_2_0.xml b/.idea/libraries/support_v4_22_2_0.xml
new file mode 100644
index 0000000..ca6b03d
--- /dev/null
+++ b/.idea/libraries/support_v4_22_2_0.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/systembartint_1_0_3.xml b/.idea/libraries/systembartint_1_0_3.xml
new file mode 100644
index 0000000..3082833
--- /dev/null
+++ b/.idea/libraries/systembartint_1_0_3.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/tracking.xml b/.idea/libraries/tracking.xml
new file mode 100644
index 0000000..099569d
--- /dev/null
+++ b/.idea/libraries/tracking.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/umeng_update_v2_6_0_1.xml b/.idea/libraries/umeng_update_v2_6_0_1.xml
new file mode 100644
index 0000000..7a9d85d
--- /dev/null
+++ b/.idea/libraries/umeng_update_v2_6_0_1.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/universal_image_loader_1_9_3.xml b/.idea/libraries/universal_image_loader_1_9_3.xml
new file mode 100644
index 0000000..eb7c67d
--- /dev/null
+++ b/.idea/libraries/universal_image_loader_1_9_3.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/xadsdk.xml b/.idea/libraries/xadsdk.xml
new file mode 100644
index 0000000..8386cdc
--- /dev/null
+++ b/.idea/libraries/xadsdk.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/zxing_4_7_3.xml b/.idea/libraries/zxing_4_7_3.xml
new file mode 100644
index 0000000..c1d5817
--- /dev/null
+++ b/.idea/libraries/zxing_4_7_3.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3eaf84b..5d19981 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,32 @@
+
+
+
+
+
+
+
+
+
@@ -10,37 +37,10 @@
-
+
-
-
-
-
- Obsessive
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index e633446..9b09622 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,6 +3,9 @@
+
+
+
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
new file mode 100644
index 0000000..7f68460
--- /dev/null
+++ b/.idea/runConfigurations.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 35eb1dd..94a25f7 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8915565..d0238fc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,59 +1,28 @@
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
@@ -66,23 +35,65 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -94,10 +105,3018 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/SimplifyReaderGit.iml b/SimplifyReaderGit.iml
index f915c84..457c4aa 100644
--- a/SimplifyReaderGit.iml
+++ b/SimplifyReaderGit.iml
@@ -7,23 +7,13 @@
-
-
-
-
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/app/src/main/java/com/github/obsessive/simplifyreader/player/MusicPlayer.java b/app/src/main/java/com/github/obsessive/simplifyreader/player/MusicPlayer.java
index eeac696..4d27cd2 100755
--- a/app/src/main/java/com/github/obsessive/simplifyreader/player/MusicPlayer.java
+++ b/app/src/main/java/com/github/obsessive/simplifyreader/player/MusicPlayer.java
@@ -125,6 +125,7 @@ public void replay() {
mMediaPlayer.start();
mPlayState = MusicPlayState.MPS_PLAYING;
+ sendPlayCurrentPosition();
}
public void pause() {
diff --git a/library/library.iml b/library/library.iml
index 53a93d9..4dca4ec 100644
--- a/library/library.iml
+++ b/library/library.iml
@@ -93,8 +93,8 @@
-
+
diff --git a/library_youku/library_youku.iml b/library_youku/library_youku.iml
index 59e95ee..571d2db 100644
--- a/library_youku/library_youku.iml
+++ b/library_youku/library_youku.iml
@@ -95,8 +95,8 @@
-
+
From fe7d18cef6503046905efcd9de11a81116816ebf Mon Sep 17 00:00:00 2001
From: Sausure <839604535@qq.com>
Date: Sat, 29 Aug 2015 17:04:57 +0800
Subject: [PATCH 02/22] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=80=89=E4=B8=AD?=
=?UTF-8?q?=E5=9B=BE=E7=89=87=E5=90=8E=E5=9B=BE=E7=89=87=E4=BC=9A=E7=A8=8D?=
=?UTF-8?q?=E5=BE=AE=E4=B8=8A=E7=A7=BB=E5=86=8D=E6=94=BE=E5=A4=A7=E7=9A=84?=
=?UTF-8?q?BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../simplifyreader/ui/fragment/ImagesListFragment.java | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/app/src/main/java/com/github/obsessive/simplifyreader/ui/fragment/ImagesListFragment.java b/app/src/main/java/com/github/obsessive/simplifyreader/ui/fragment/ImagesListFragment.java
index e71aff4..8282903 100644
--- a/app/src/main/java/com/github/obsessive/simplifyreader/ui/fragment/ImagesListFragment.java
+++ b/app/src/main/java/com/github/obsessive/simplifyreader/ui/fragment/ImagesListFragment.java
@@ -16,6 +16,7 @@
package com.github.obsessive.simplifyreader.ui.fragment;
+import android.graphics.Rect;
import android.os.Bundle;
import android.support.v4.widget.SwipeRefreshLayout;
import android.view.LayoutInflater;
@@ -276,8 +277,14 @@ public void onClick(View v) {
@Override
public void onItemClick(PLAAdapterView parent, View view, int position, long id) {
+ Rect frame = new Rect();
+ getActivity().getWindow().getDecorView().getWindowVisibleDisplayFrame(frame);
+ int statusBarHeight = frame.top;
+
int[] location = new int[2];
view.getLocationOnScreen(location);
+ location[1] += statusBarHeight;
+
int width = view.getWidth();
int height = view.getHeight();
From 7cff3a31d8860b1093d09b3012c7badba97c5d56 Mon Sep 17 00:00:00 2001
From: audiebant
Date: Mon, 7 Sep 2015 12:07:12 +0800
Subject: [PATCH 03/22] Update SmoothImageView.java
---
.../com/github/obsessive/library/widgets/SmoothImageView.java | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/library/src/main/java/com/github/obsessive/library/widgets/SmoothImageView.java b/library/src/main/java/com/github/obsessive/library/widgets/SmoothImageView.java
index 1f0ca53..f2022c9 100644
--- a/library/src/main/java/com/github/obsessive/library/widgets/SmoothImageView.java
+++ b/library/src/main/java/com/github/obsessive/library/widgets/SmoothImageView.java
@@ -168,6 +168,10 @@ private void initTransform() {
if (getDrawable() == null) {
return;
}
+
+ //防止转换失败
+ if (getDrawable() instanceof ColorDrawable) return;
+
if (mBitmap == null || mBitmap.isRecycled()) {
mBitmap = ((BitmapDrawable) getDrawable()).getBitmap();
}
From 610e0f173a9aeeaa4fa1bf37a7256ec2fbc221d5 Mon Sep 17 00:00:00 2001
From: audiebant
Date: Thu, 10 Sep 2015 10:13:37 +0800
Subject: [PATCH 04/22] Update BaseAppCompatActivity.java
---
.../github/obsessive/library/base/BaseAppCompatActivity.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/library/src/main/java/com/github/obsessive/library/base/BaseAppCompatActivity.java b/library/src/main/java/com/github/obsessive/library/base/BaseAppCompatActivity.java
index 53b7d9b..4e1ce99 100644
--- a/library/src/main/java/com/github/obsessive/library/base/BaseAppCompatActivity.java
+++ b/library/src/main/java/com/github/obsessive/library/base/BaseAppCompatActivity.java
@@ -362,8 +362,9 @@ protected void readyGoForResult(Class clazz, int requestCode, Bundle bundle)
* @param msg
*/
protected void showToast(String msg) {
+ //防止遮盖虚拟按键
if (null != msg && !CommonUtils.isEmpty(msg)) {
- Snackbar.make(getWindow().getDecorView(), msg, Snackbar.LENGTH_SHORT).show();
+ Snackbar.make(getLoadingTargetView(), msg, Snackbar.LENGTH_SHORT).show();
}
}
@@ -478,4 +479,4 @@ protected void setTranslucentStatus(boolean on) {
win.setAttributes(winParams);
}
}
-}
\ No newline at end of file
+}
From 656eb9c97987f20323338f079df4be4319627867 Mon Sep 17 00:00:00 2001
From: Obsessive <1076559197@qq.com>
Date: Thu, 17 Sep 2015 15:19:22 +0800
Subject: [PATCH 05/22] Update .gitignore
update .gitignore
---
.gitignore | 40 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 40 insertions(+)
diff --git a/.gitignore b/.gitignore
index ccf2efe..6217875 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,43 @@ proguard/
# Log Files
*.log
+
+# Android generated
+bin
+gen
+lint.xml
+
+# IntelliJ IDEA
+.idea
+*.iml
+*.ipr
+*.iws
+classes
+gen-external-apklibs
+
+# Eclipse
+.project
+.classpath
+.settings
+.checkstyle
+
+# Gradle
+.gradle
+build
+out
+
+# Maven
+target
+release.properties
+pom.xml.*
+
+# Ant
+ant.properties
+local.properties
+proguard.cfg
+proguard-project.txt
+
+# Other
+.DS_Store
+dist
+tmp
From c080361237ec31751c685171ab2cad4d5bc2d48f Mon Sep 17 00:00:00 2001
From: Xing Li
Date: Thu, 17 Sep 2015 15:22:05 +0800
Subject: [PATCH 06/22] Update .gitignore file.
---
.gitignore | 52 ++++++++++++++++++++++++++++++++--------------------
1 file changed, 32 insertions(+), 20 deletions(-)
diff --git a/.gitignore b/.gitignore
index ccf2efe..94114d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,27 +1,39 @@
-# Built application files
-*.apk
-*.ap_
+# Android generated
+bin
+gen
+lint.xml
-# Files for the Dalvik VM
-*.dex
+# IntelliJ IDEA
+.idea
+*.iml
+*.ipr
+*.iws
+classes
+gen-external-apklibs
-# Java class files
-*.class
+# Eclipse
+.project
+.classpath
+.settings
+.checkstyle
-# Generated files
-bin/
-gen/
+# Gradle
+.gradle
+build
+out
-# Gradle files
-.gradle/
-build/
-/*/build/
+# Maven
+target
+release.properties
+pom.xml.*
-# Local configuration file (sdk path, etc)
+# Ant
+ant.properties
local.properties
+proguard.cfg
+proguard-project.txt
-# Proguard folder generated by Eclipse
-proguard/
-
-# Log Files
-*.log
+# Other
+.DS_Store
+dist
+tmp
\ No newline at end of file
From 9312ae85998a9f20dc1b11889de5b0760dbcb81b Mon Sep 17 00:00:00 2001
From: Xing Li
Date: Thu, 17 Sep 2015 15:26:25 +0800
Subject: [PATCH 07/22] Downgrade `com.github.chrisbanes.photoview:library`
from 1.2.3 to 1.2.2.
---
.idea/.name | 2 +-
.idea/codeStyleSettings.xml | 229 --------
.idea/copyright/obsessive.xml | 6 -
.idea/copyright/profiles_settings.xml | 20 +-
.idea/dictionaries/chentao.xml | 3 -
.idea/libraries/appcompat_v7_22_2_0.xml | 9 +-
.idea/libraries/cardview_v7_22_2_0.xml | 4 +-
.idea/libraries/design_22_2_0.xml | 5 +-
.idea/libraries/library_1_2_3.xml | 10 -
.idea/libraries/library_1_4.xml | 2 +-
.idea/libraries/material_dialogs_0_7_6_0.xml | 3 -
.idea/libraries/message_2_4_1.xml | 4 +-
.idea/libraries/recyclerview_v7_22_2_0.xml | 6 +-
.../libraries/support_annotations_22_2_0.xml | 4 +-
.idea/libraries/support_v4_22_2_0.xml | 9 +-
.idea/misc.xml | 11 +-
.idea/modules.xml | 2 +-
.idea/workspace.xml | 544 ++++++++----------
app/app.iml | 21 +-
library/build.gradle | 2 +-
library/library.iml | 20 +-
.../library/widgets/SmoothImageView.java | 1 +
library_youku/library_youku.iml | 27 +-
23 files changed, 317 insertions(+), 627 deletions(-)
delete mode 100644 .idea/codeStyleSettings.xml
delete mode 100644 .idea/copyright/obsessive.xml
delete mode 100644 .idea/dictionaries/chentao.xml
delete mode 100644 .idea/libraries/library_1_2_3.xml
diff --git a/.idea/.name b/.idea/.name
index 3b70d9a..905d26d 100644
--- a/.idea/.name
+++ b/.idea/.name
@@ -1 +1 @@
-SimplifyReaderGit
\ No newline at end of file
+SimplifyReader
\ No newline at end of file
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
deleted file mode 100644
index d194a3f..0000000
--- a/.idea/codeStyleSettings.xml
+++ /dev/null
@@ -1,229 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/copyright/obsessive.xml b/.idea/copyright/obsessive.xml
deleted file mode 100644
index de40639..0000000
--- a/.idea/copyright/obsessive.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
index 9cc2906..e7bedf3 100644
--- a/.idea/copyright/profiles_settings.xml
+++ b/.idea/copyright/profiles_settings.xml
@@ -1,21 +1,3 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/.idea/dictionaries/chentao.xml b/.idea/dictionaries/chentao.xml
deleted file mode 100644
index f92347d..0000000
--- a/.idea/dictionaries/chentao.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/appcompat_v7_22_2_0.xml b/.idea/libraries/appcompat_v7_22_2_0.xml
index 9660325..63498e8 100644
--- a/.idea/libraries/appcompat_v7_22_2_0.xml
+++ b/.idea/libraries/appcompat_v7_22_2_0.xml
@@ -1,15 +1,10 @@
-
-
-
-
+
-
-
-
+
\ No newline at end of file
diff --git a/.idea/libraries/cardview_v7_22_2_0.xml b/.idea/libraries/cardview_v7_22_2_0.xml
index 8bb997e..0636ed7 100644
--- a/.idea/libraries/cardview_v7_22_2_0.xml
+++ b/.idea/libraries/cardview_v7_22_2_0.xml
@@ -5,8 +5,6 @@
-
-
-
+
\ No newline at end of file
diff --git a/.idea/libraries/design_22_2_0.xml b/.idea/libraries/design_22_2_0.xml
index 7a73bc2..e39fea4 100644
--- a/.idea/libraries/design_22_2_0.xml
+++ b/.idea/libraries/design_22_2_0.xml
@@ -1,11 +1,8 @@
-
-
-
-
+
diff --git a/.idea/libraries/library_1_2_3.xml b/.idea/libraries/library_1_2_3.xml
deleted file mode 100644
index 0d34519..0000000
--- a/.idea/libraries/library_1_2_3.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/library_1_4.xml b/.idea/libraries/library_1_4.xml
index 5292c73..4df9cf2 100644
--- a/.idea/libraries/library_1_4.xml
+++ b/.idea/libraries/library_1_4.xml
@@ -1,8 +1,8 @@
-
+
diff --git a/.idea/libraries/material_dialogs_0_7_6_0.xml b/.idea/libraries/material_dialogs_0_7_6_0.xml
index 7dbdb85..eeafdb6 100644
--- a/.idea/libraries/material_dialogs_0_7_6_0.xml
+++ b/.idea/libraries/material_dialogs_0_7_6_0.xml
@@ -1,8 +1,5 @@
-
-
-
diff --git a/.idea/libraries/message_2_4_1.xml b/.idea/libraries/message_2_4_1.xml
index a1d2d9e..6a236db 100644
--- a/.idea/libraries/message_2_4_1.xml
+++ b/.idea/libraries/message_2_4_1.xml
@@ -1,9 +1,9 @@
-
-
+
+
diff --git a/.idea/libraries/recyclerview_v7_22_2_0.xml b/.idea/libraries/recyclerview_v7_22_2_0.xml
index e673560..e25b86c 100644
--- a/.idea/libraries/recyclerview_v7_22_2_0.xml
+++ b/.idea/libraries/recyclerview_v7_22_2_0.xml
@@ -1,12 +1,10 @@
-
+
-
-
-
+
\ No newline at end of file
diff --git a/.idea/libraries/support_annotations_22_2_0.xml b/.idea/libraries/support_annotations_22_2_0.xml
index b30e3ef..4cc0d93 100644
--- a/.idea/libraries/support_annotations_22_2_0.xml
+++ b/.idea/libraries/support_annotations_22_2_0.xml
@@ -1,11 +1,11 @@
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/support_v4_22_2_0.xml b/.idea/libraries/support_v4_22_2_0.xml
index ca6b03d..726cbb1 100644
--- a/.idea/libraries/support_v4_22_2_0.xml
+++ b/.idea/libraries/support_v4_22_2_0.xml
@@ -1,16 +1,11 @@
-
-
-
-
+
-
-
-
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 5d19981..aaa3655 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,14 @@
+
+
+
+
+
+
+
+
+
@@ -37,7 +46,7 @@
-
+
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 9b09622..c227f5f 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d0238fc..87685f3 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,19 +9,31 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
-
+
@@ -35,70 +47,92 @@
+
+
+
+
+
+
+
-
+
-
-
+
+
-
+
-
-
-
-
-
-
-
-
+
-
-
+
+
-
-
+
+
+
+
-
-
+
+
-
-
-
+
+
+
+
+
-
-
+
+
+
+
+
-
-
+
+
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -110,7 +144,7 @@
-
+
@@ -129,7 +163,7 @@
-
+
@@ -143,17 +177,17 @@
-
+
-
+
-
+
@@ -168,22 +202,22 @@
-
+
-
+
-
+
-
+
@@ -584,11 +618,6 @@
-
-
-
-
-
@@ -625,14 +654,14 @@
-
+
-
+
-
+
-
+
@@ -1234,11 +1263,6 @@
-
-
-
-
-
@@ -1275,14 +1299,14 @@
-
+
-
+
-
+
-
+
@@ -1857,11 +1881,6 @@
-
-
-
-
-
@@ -2446,11 +2465,6 @@
-
-
-
-
-
@@ -2477,9 +2491,9 @@
-
+
-
+
@@ -2586,7 +2600,7 @@
-
-
+
+
@@ -2859,22 +2873,22 @@
-
-
-
+
+
+
-
+
-
-
-
+
+
+
@@ -3113,40 +3127,20 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Android
-
-
-
-
+
+
@@ -3171,12 +3165,33 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -3186,27 +3201,27 @@
-
+
-
+
-
+
-
+
-
+
@@ -3216,11 +3231,11 @@
-
+
-
+
@@ -3228,17 +3243,21 @@
-
+
+
+
+
+
-
+
-
+
@@ -3246,43 +3265,37 @@
-
+
-
-
-
-
-
+
+
+
-
-
-
-
-
-
+
+
-
-
+
+
-
-
+
+
-
+
@@ -3293,29 +3306,18 @@
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
+
-
-
+
+
+
@@ -3347,36 +3349,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -3413,11 +3385,6 @@
-
-
-
-
-
@@ -3502,43 +3469,44 @@
-
- 1440060732746
+
+ 1442472507182
- 1440060732746
+ 1442472507182
-
-
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
@@ -3549,133 +3517,129 @@
-
+
-
-
-
+
+
+
+
+
+
-
+
-
+
-
+
+
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
+
+
+
-
-
-
-
-
+
+
+
-
+
+
+
+
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
+
-
-
+
+
-
+
-
+
-
+
-
-
+
+
-
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
- Obsessive
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/app.iml b/app/app.iml
index e6cbf7d..cae5f2b 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -1,5 +1,5 @@
-
+
@@ -91,23 +91,24 @@
-
-
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
+
+
\ No newline at end of file
diff --git a/library/build.gradle b/library/build.gradle
index 93ae84e..7cf8ce6 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -50,7 +50,7 @@ dependencies {
compile 'com.nineoldandroids:library:2.4.0'
compile 'com.readystatesoftware.systembartint:systembartint:1.0.3'
compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.3'
- compile 'com.github.chrisbanes.photoview:library:1.2.3'
+ compile 'com.github.chrisbanes.photoview:library:1.2.2'
compile 'com.afollestad:material-dialogs:0.7.6.0'
compile 'de.greenrobot:eventbus:2.4.0'
compile 'com.squareup.okhttp:okhttp:2.4.0'
diff --git a/library/library.iml b/library/library.iml
index 4dca4ec..b8fe189 100644
--- a/library/library.iml
+++ b/library/library.iml
@@ -1,5 +1,5 @@
-
+
@@ -89,22 +89,22 @@
-
-
-
+
-
-
-
+
-
-
+
+
+
+
-
+
+
+
\ No newline at end of file
diff --git a/library/src/main/java/com/github/obsessive/library/widgets/SmoothImageView.java b/library/src/main/java/com/github/obsessive/library/widgets/SmoothImageView.java
index f2022c9..61a8d88 100644
--- a/library/src/main/java/com/github/obsessive/library/widgets/SmoothImageView.java
+++ b/library/src/main/java/com/github/obsessive/library/widgets/SmoothImageView.java
@@ -24,6 +24,7 @@
import android.graphics.Paint;
import android.graphics.Paint.Style;
import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.ColorDrawable;
import android.util.AttributeSet;
import android.util.Log;
import android.view.animation.AccelerateDecelerateInterpolator;
diff --git a/library_youku/library_youku.iml b/library_youku/library_youku.iml
index 571d2db..f7ea478 100644
--- a/library_youku/library_youku.iml
+++ b/library_youku/library_youku.iml
@@ -1,5 +1,5 @@
-
+
@@ -89,26 +89,27 @@
-
-
-
-
+
+
-
-
-
-
-
-
+
+
-
+
+
+
+
+
+
-
+
+
+
From 1a606359a20ee39b7de9e179d79791627784b59b Mon Sep 17 00:00:00 2001
From: Xing Li
Date: Thu, 17 Sep 2015 15:28:47 +0800
Subject: [PATCH 08/22] Delete all files from `.idea` directory.
---
.idea/.name | 1 -
.idea/compiler.xml | 22 -
.idea/copyright/profiles_settings.xml | 3 -
.idea/gradle.xml | 20 -
.../CocoUnion_AD_SDK_Android_v4_1_2.xml | 9 -
.idea/libraries/InMobi_4_0_4.xml | 9 -
.idea/libraries/YoukuAnalytics.xml | 9 -
.idea/libraries/ZBarDecoder.xml | 9 -
.idea/libraries/analytics_5_5_3.xml | 11 -
.idea/libraries/appcompat_v7_22_2_0.xml | 10 -
.idea/libraries/baseproject.xml | 9 -
.idea/libraries/butterknife_5_1_1.xml | 11 -
.idea/libraries/cardview_v7_22_2_0.xml | 10 -
.idea/libraries/comscore.xml | 9 -
.idea/libraries/design_22_2_0.xml | 10 -
.idea/libraries/domob_android_sdk.xml | 9 -
.idea/libraries/eventbus_2_4_0.xml | 11 -
.idea/libraries/fastjson_1_1_24.xml | 9 -
.idea/libraries/fb_5_4_0.xml | 10 -
.idea/libraries/gson_2_2_4.xml | 11 -
.idea/libraries/library_1_4.xml | 10 -
.idea/libraries/library_2_4_0.xml | 11 -
.idea/libraries/mAppTracker.xml | 9 -
.idea/libraries/material_dialogs_0_7_6_0.xml | 10 -
.idea/libraries/message_2_4_1.xml | 11 -
.idea/libraries/mobisageSDK.xml | 9 -
.idea/libraries/okhttp_2_4_0.xml | 11 -
.idea/libraries/okio_1_4_0.xml | 11 -
.idea/libraries/playerBase.xml | 9 -
.idea/libraries/recyclerview_v7_22_2_0.xml | 10 -
.../libraries/support_annotations_22_2_0.xml | 11 -
.idea/libraries/support_v4_22_2_0.xml | 11 -
.idea/libraries/systembartint_1_0_3.xml | 11 -
.idea/libraries/tracking.xml | 9 -
.idea/libraries/umeng_update_v2_6_0_1.xml | 9 -
.../universal_image_loader_1_9_3.xml | 11 -
.idea/libraries/xadsdk.xml | 9 -
.idea/libraries/zxing_4_7_3.xml | 9 -
.idea/misc.xml | 55 -
.idea/modules.xml | 11 -
.idea/runConfigurations.xml | 12 -
.idea/vcs.xml | 6 -
.idea/workspace.xml | 3645 -----------------
43 files changed, 4112 deletions(-)
delete mode 100644 .idea/.name
delete mode 100644 .idea/compiler.xml
delete mode 100644 .idea/copyright/profiles_settings.xml
delete mode 100644 .idea/gradle.xml
delete mode 100644 .idea/libraries/CocoUnion_AD_SDK_Android_v4_1_2.xml
delete mode 100644 .idea/libraries/InMobi_4_0_4.xml
delete mode 100644 .idea/libraries/YoukuAnalytics.xml
delete mode 100644 .idea/libraries/ZBarDecoder.xml
delete mode 100644 .idea/libraries/analytics_5_5_3.xml
delete mode 100644 .idea/libraries/appcompat_v7_22_2_0.xml
delete mode 100644 .idea/libraries/baseproject.xml
delete mode 100644 .idea/libraries/butterknife_5_1_1.xml
delete mode 100644 .idea/libraries/cardview_v7_22_2_0.xml
delete mode 100644 .idea/libraries/comscore.xml
delete mode 100644 .idea/libraries/design_22_2_0.xml
delete mode 100644 .idea/libraries/domob_android_sdk.xml
delete mode 100644 .idea/libraries/eventbus_2_4_0.xml
delete mode 100644 .idea/libraries/fastjson_1_1_24.xml
delete mode 100644 .idea/libraries/fb_5_4_0.xml
delete mode 100644 .idea/libraries/gson_2_2_4.xml
delete mode 100644 .idea/libraries/library_1_4.xml
delete mode 100644 .idea/libraries/library_2_4_0.xml
delete mode 100644 .idea/libraries/mAppTracker.xml
delete mode 100644 .idea/libraries/material_dialogs_0_7_6_0.xml
delete mode 100644 .idea/libraries/message_2_4_1.xml
delete mode 100644 .idea/libraries/mobisageSDK.xml
delete mode 100644 .idea/libraries/okhttp_2_4_0.xml
delete mode 100644 .idea/libraries/okio_1_4_0.xml
delete mode 100644 .idea/libraries/playerBase.xml
delete mode 100644 .idea/libraries/recyclerview_v7_22_2_0.xml
delete mode 100644 .idea/libraries/support_annotations_22_2_0.xml
delete mode 100644 .idea/libraries/support_v4_22_2_0.xml
delete mode 100644 .idea/libraries/systembartint_1_0_3.xml
delete mode 100644 .idea/libraries/tracking.xml
delete mode 100644 .idea/libraries/umeng_update_v2_6_0_1.xml
delete mode 100644 .idea/libraries/universal_image_loader_1_9_3.xml
delete mode 100644 .idea/libraries/xadsdk.xml
delete mode 100644 .idea/libraries/zxing_4_7_3.xml
delete mode 100644 .idea/misc.xml
delete mode 100644 .idea/modules.xml
delete mode 100644 .idea/runConfigurations.xml
delete mode 100644 .idea/vcs.xml
delete mode 100644 .idea/workspace.xml
diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index 905d26d..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-SimplifyReader
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
deleted file mode 100644
index 96cc43e..0000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
deleted file mode 100644
index 2b79c36..0000000
--- a/.idea/gradle.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/CocoUnion_AD_SDK_Android_v4_1_2.xml b/.idea/libraries/CocoUnion_AD_SDK_Android_v4_1_2.xml
deleted file mode 100644
index 11c5e43..0000000
--- a/.idea/libraries/CocoUnion_AD_SDK_Android_v4_1_2.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/InMobi_4_0_4.xml b/.idea/libraries/InMobi_4_0_4.xml
deleted file mode 100644
index 3cdc7be..0000000
--- a/.idea/libraries/InMobi_4_0_4.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/YoukuAnalytics.xml b/.idea/libraries/YoukuAnalytics.xml
deleted file mode 100644
index 57510fe..0000000
--- a/.idea/libraries/YoukuAnalytics.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/ZBarDecoder.xml b/.idea/libraries/ZBarDecoder.xml
deleted file mode 100644
index e3dfa83..0000000
--- a/.idea/libraries/ZBarDecoder.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/analytics_5_5_3.xml b/.idea/libraries/analytics_5_5_3.xml
deleted file mode 100644
index eaebd65..0000000
--- a/.idea/libraries/analytics_5_5_3.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/appcompat_v7_22_2_0.xml b/.idea/libraries/appcompat_v7_22_2_0.xml
deleted file mode 100644
index 63498e8..0000000
--- a/.idea/libraries/appcompat_v7_22_2_0.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/baseproject.xml b/.idea/libraries/baseproject.xml
deleted file mode 100644
index ffaec19..0000000
--- a/.idea/libraries/baseproject.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/butterknife_5_1_1.xml b/.idea/libraries/butterknife_5_1_1.xml
deleted file mode 100644
index 3d241f5..0000000
--- a/.idea/libraries/butterknife_5_1_1.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/cardview_v7_22_2_0.xml b/.idea/libraries/cardview_v7_22_2_0.xml
deleted file mode 100644
index 0636ed7..0000000
--- a/.idea/libraries/cardview_v7_22_2_0.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/comscore.xml b/.idea/libraries/comscore.xml
deleted file mode 100644
index 8a36e79..0000000
--- a/.idea/libraries/comscore.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/design_22_2_0.xml b/.idea/libraries/design_22_2_0.xml
deleted file mode 100644
index e39fea4..0000000
--- a/.idea/libraries/design_22_2_0.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/domob_android_sdk.xml b/.idea/libraries/domob_android_sdk.xml
deleted file mode 100644
index 8bc93c2..0000000
--- a/.idea/libraries/domob_android_sdk.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/eventbus_2_4_0.xml b/.idea/libraries/eventbus_2_4_0.xml
deleted file mode 100644
index defb4b3..0000000
--- a/.idea/libraries/eventbus_2_4_0.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/fastjson_1_1_24.xml b/.idea/libraries/fastjson_1_1_24.xml
deleted file mode 100644
index 3bedbad..0000000
--- a/.idea/libraries/fastjson_1_1_24.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/fb_5_4_0.xml b/.idea/libraries/fb_5_4_0.xml
deleted file mode 100644
index fb6fae5..0000000
--- a/.idea/libraries/fb_5_4_0.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/gson_2_2_4.xml b/.idea/libraries/gson_2_2_4.xml
deleted file mode 100644
index 8e039c3..0000000
--- a/.idea/libraries/gson_2_2_4.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/library_1_4.xml b/.idea/libraries/library_1_4.xml
deleted file mode 100644
index 4df9cf2..0000000
--- a/.idea/libraries/library_1_4.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/library_2_4_0.xml b/.idea/libraries/library_2_4_0.xml
deleted file mode 100644
index eedfc0d..0000000
--- a/.idea/libraries/library_2_4_0.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/mAppTracker.xml b/.idea/libraries/mAppTracker.xml
deleted file mode 100644
index 884cc38..0000000
--- a/.idea/libraries/mAppTracker.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/material_dialogs_0_7_6_0.xml b/.idea/libraries/material_dialogs_0_7_6_0.xml
deleted file mode 100644
index eeafdb6..0000000
--- a/.idea/libraries/material_dialogs_0_7_6_0.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/message_2_4_1.xml b/.idea/libraries/message_2_4_1.xml
deleted file mode 100644
index 6a236db..0000000
--- a/.idea/libraries/message_2_4_1.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/mobisageSDK.xml b/.idea/libraries/mobisageSDK.xml
deleted file mode 100644
index bee601b..0000000
--- a/.idea/libraries/mobisageSDK.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/okhttp_2_4_0.xml b/.idea/libraries/okhttp_2_4_0.xml
deleted file mode 100644
index 2a5c90c..0000000
--- a/.idea/libraries/okhttp_2_4_0.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/okio_1_4_0.xml b/.idea/libraries/okio_1_4_0.xml
deleted file mode 100644
index 454ae43..0000000
--- a/.idea/libraries/okio_1_4_0.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/playerBase.xml b/.idea/libraries/playerBase.xml
deleted file mode 100644
index 3216591..0000000
--- a/.idea/libraries/playerBase.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/recyclerview_v7_22_2_0.xml b/.idea/libraries/recyclerview_v7_22_2_0.xml
deleted file mode 100644
index e25b86c..0000000
--- a/.idea/libraries/recyclerview_v7_22_2_0.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/support_annotations_22_2_0.xml b/.idea/libraries/support_annotations_22_2_0.xml
deleted file mode 100644
index 4cc0d93..0000000
--- a/.idea/libraries/support_annotations_22_2_0.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/support_v4_22_2_0.xml b/.idea/libraries/support_v4_22_2_0.xml
deleted file mode 100644
index 726cbb1..0000000
--- a/.idea/libraries/support_v4_22_2_0.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/systembartint_1_0_3.xml b/.idea/libraries/systembartint_1_0_3.xml
deleted file mode 100644
index 3082833..0000000
--- a/.idea/libraries/systembartint_1_0_3.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/tracking.xml b/.idea/libraries/tracking.xml
deleted file mode 100644
index 099569d..0000000
--- a/.idea/libraries/tracking.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/umeng_update_v2_6_0_1.xml b/.idea/libraries/umeng_update_v2_6_0_1.xml
deleted file mode 100644
index 7a9d85d..0000000
--- a/.idea/libraries/umeng_update_v2_6_0_1.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/universal_image_loader_1_9_3.xml b/.idea/libraries/universal_image_loader_1_9_3.xml
deleted file mode 100644
index eb7c67d..0000000
--- a/.idea/libraries/universal_image_loader_1_9_3.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/xadsdk.xml b/.idea/libraries/xadsdk.xml
deleted file mode 100644
index 8386cdc..0000000
--- a/.idea/libraries/xadsdk.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/zxing_4_7_3.xml b/.idea/libraries/zxing_4_7_3.xml
deleted file mode 100644
index c1d5817..0000000
--- a/.idea/libraries/zxing_4_7_3.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index aaa3655..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index c227f5f..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 7f68460..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 94a25f7..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index 87685f3..0000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,3645 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1442472507182
-
- 1442472507182
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
From e8f9adabe861586ca3d7383e290cf11f6baabba7 Mon Sep 17 00:00:00 2001
From: Xing Li
Date: Thu, 17 Sep 2015 15:33:16 +0800
Subject: [PATCH 09/22] Delete *.iml from root directory.
---
SimplifyReader.iml | 19 -------------------
SimplifyReaderGit.iml | 19 -------------------
2 files changed, 38 deletions(-)
delete mode 100644 SimplifyReader.iml
delete mode 100644 SimplifyReaderGit.iml
diff --git a/SimplifyReader.iml b/SimplifyReader.iml
deleted file mode 100644
index 53dad9e..0000000
--- a/SimplifyReader.iml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/SimplifyReaderGit.iml b/SimplifyReaderGit.iml
deleted file mode 100644
index 457c4aa..0000000
--- a/SimplifyReaderGit.iml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
From c85903a14fc531e565594a6e9e47f3fdeb7d6020 Mon Sep 17 00:00:00 2001
From: Obsessive <1076559197@qq.com>
Date: Thu, 17 Sep 2015 16:32:20 +0800
Subject: [PATCH 10/22] Update .gitignore
---
.gitignore | 44 +-------------------------------------------
1 file changed, 1 insertion(+), 43 deletions(-)
diff --git a/.gitignore b/.gitignore
index 5d85960..d231812 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,55 +33,13 @@ local.properties
proguard.cfg
proguard-project.txt
-<<<<<<< HEAD
# Other
.DS_Store
dist
tmp
-=======
+
# Proguard folder generated by Eclipse
proguard/
# Log Files
*.log
-
-# Android generated
-bin
-gen
-lint.xml
-
-# IntelliJ IDEA
-.idea
-*.iml
-*.ipr
-*.iws
-classes
-gen-external-apklibs
-
-# Eclipse
-.project
-.classpath
-.settings
-.checkstyle
-
-# Gradle
-.gradle
-build
-out
-
-# Maven
-target
-release.properties
-pom.xml.*
-
-# Ant
-ant.properties
-local.properties
-proguard.cfg
-proguard-project.txt
-
-# Other
-.DS_Store
-dist
-tmp
->>>>>>> master
From 473ae8b911d209686ae1f7d79177616c48469f1a Mon Sep 17 00:00:00 2001
From: Xing Li
Date: Thu, 17 Sep 2015 16:48:24 +0800
Subject: [PATCH 11/22] Change .gitignore files of submodules.
---
app/.gitignore | 40 ++++++++++-
app/app.iml | 2 +-
library/.gitignore | 40 ++++++++++-
library/library.iml | 110 ------------------------------
library_youku/.gitignore | 40 ++++++++++-
library_youku/library_youku.iml | 116 --------------------------------
6 files changed, 118 insertions(+), 230 deletions(-)
delete mode 100644 library/library.iml
delete mode 100644 library_youku/library_youku.iml
diff --git a/app/.gitignore b/app/.gitignore
index 796b96d..94114d9 100644
--- a/app/.gitignore
+++ b/app/.gitignore
@@ -1 +1,39 @@
-/build
+# Android generated
+bin
+gen
+lint.xml
+
+# IntelliJ IDEA
+.idea
+*.iml
+*.ipr
+*.iws
+classes
+gen-external-apklibs
+
+# Eclipse
+.project
+.classpath
+.settings
+.checkstyle
+
+# Gradle
+.gradle
+build
+out
+
+# Maven
+target
+release.properties
+pom.xml.*
+
+# Ant
+ant.properties
+local.properties
+proguard.cfg
+proguard-project.txt
+
+# Other
+.DS_Store
+dist
+tmp
\ No newline at end of file
diff --git a/app/app.iml b/app/app.iml
index cae5f2b..d4780cb 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -96,8 +96,8 @@
-
+
diff --git a/library/.gitignore b/library/.gitignore
index 796b96d..94114d9 100644
--- a/library/.gitignore
+++ b/library/.gitignore
@@ -1 +1,39 @@
-/build
+# Android generated
+bin
+gen
+lint.xml
+
+# IntelliJ IDEA
+.idea
+*.iml
+*.ipr
+*.iws
+classes
+gen-external-apklibs
+
+# Eclipse
+.project
+.classpath
+.settings
+.checkstyle
+
+# Gradle
+.gradle
+build
+out
+
+# Maven
+target
+release.properties
+pom.xml.*
+
+# Ant
+ant.properties
+local.properties
+proguard.cfg
+proguard-project.txt
+
+# Other
+.DS_Store
+dist
+tmp
\ No newline at end of file
diff --git a/library/library.iml b/library/library.iml
deleted file mode 100644
index b8fe189..0000000
--- a/library/library.iml
+++ /dev/null
@@ -1,110 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- generateDebugAndroidTestSources
- generateDebugSources
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/library_youku/.gitignore b/library_youku/.gitignore
index 796b96d..94114d9 100644
--- a/library_youku/.gitignore
+++ b/library_youku/.gitignore
@@ -1 +1,39 @@
-/build
+# Android generated
+bin
+gen
+lint.xml
+
+# IntelliJ IDEA
+.idea
+*.iml
+*.ipr
+*.iws
+classes
+gen-external-apklibs
+
+# Eclipse
+.project
+.classpath
+.settings
+.checkstyle
+
+# Gradle
+.gradle
+build
+out
+
+# Maven
+target
+release.properties
+pom.xml.*
+
+# Ant
+ant.properties
+local.properties
+proguard.cfg
+proguard-project.txt
+
+# Other
+.DS_Store
+dist
+tmp
\ No newline at end of file
diff --git a/library_youku/library_youku.iml b/library_youku/library_youku.iml
deleted file mode 100644
index f7ea478..0000000
--- a/library_youku/library_youku.iml
+++ /dev/null
@@ -1,116 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- generateDebugAndroidTestSources
- generateDebugSources
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
From cc43884bfcd3e97d114de1aee6ebe14e72382fbd Mon Sep 17 00:00:00 2001
From: songzhiyong
Date: Fri, 18 Sep 2015 10:24:22 +0800
Subject: [PATCH 12/22] =?UTF-8?q?=E6=9D=A1=E5=BD=A2=E7=A0=81=E6=89=AB?=
=?UTF-8?q?=E6=8F=8F=E7=95=8C=E9=9D=A2=E6=8C=89=E9=92=AE=E5=9C=A8=E8=A2=AB?=
=?UTF-8?q?=E9=81=AE=E7=9B=96=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/src/main/res/layout/activity_capture.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/app/src/main/res/layout/activity_capture.xml b/app/src/main/res/layout/activity_capture.xml
index 1d5c2ea..e5a0bd3 100644
--- a/app/src/main/res/layout/activity_capture.xml
+++ b/app/src/main/res/layout/activity_capture.xml
@@ -18,6 +18,7 @@
From bcec8085f6dc97652ce6f86e849085db6641a26b Mon Sep 17 00:00:00 2001
From: Xing Li
Date: Fri, 18 Sep 2015 11:23:39 +0800
Subject: [PATCH 13/22] Optimize concurrent efficiency.
---
.../github/obsessive/library/base/BaseAppManager.java | 10 +++++++---
.../obsessive/library/netstatus/NetStateReceiver.java | 8 ++++++--
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/library/src/main/java/com/github/obsessive/library/base/BaseAppManager.java b/library/src/main/java/com/github/obsessive/library/base/BaseAppManager.java
index 44ad6a9..f4794d8 100644
--- a/library/src/main/java/com/github/obsessive/library/base/BaseAppManager.java
+++ b/library/src/main/java/com/github/obsessive/library/base/BaseAppManager.java
@@ -63,9 +63,13 @@ private BaseAppManager() {
}
- public synchronized static BaseAppManager getInstance() {
- if (instance == null) {
- instance = new BaseAppManager();
+ public static BaseAppManager getInstance() {
+ if (null == instance) {
+ synchronized (BaseAppManager.class) {
+ if (null == instance) {
+ instance = new BaseAppManager();
+ }
+ }
}
return instance;
}
diff --git a/library/src/main/java/com/github/obsessive/library/netstatus/NetStateReceiver.java b/library/src/main/java/com/github/obsessive/library/netstatus/NetStateReceiver.java
index 4eda1e5..14e14c6 100644
--- a/library/src/main/java/com/github/obsessive/library/netstatus/NetStateReceiver.java
+++ b/library/src/main/java/com/github/obsessive/library/netstatus/NetStateReceiver.java
@@ -43,8 +43,12 @@ public class NetStateReceiver extends BroadcastReceiver {
private static BroadcastReceiver mBroadcastReceiver;
private static BroadcastReceiver getReceiver() {
- if (mBroadcastReceiver == null) {
- mBroadcastReceiver = new NetStateReceiver();
+ if (null == mBroadcastReceiver) {
+ synchronized (NetStateReceiver.class) {
+ if (null == mBroadcastReceiver) {
+ mBroadcastReceiver = new NetStateReceiver();
+ }
+ }
}
return mBroadcastReceiver;
}
From 691722ce1fb997b133fe67eba8c50f8d39bda3eb Mon Sep 17 00:00:00 2001
From: Xing Li
Date: Fri, 18 Sep 2015 14:19:13 +0800
Subject: [PATCH 14/22] Add supports to english.
---
.../impl/ImagesContainerInteractorImpl.java | 15 ++--
.../ui/fragment/ImagesListFragment.java | 2 +-
app/src/main/res/layout/activity_splash.xml | 2 +-
app/src/main/res/values-zh/arrays.xml | 68 +++++++++++++++++++
app/src/main/res/values-zh/strings.xml | 39 +++++++++++
app/src/main/res/values/arrays.xml | 54 ++++++++-------
app/src/main/res/values/errors.xml | 4 +-
app/src/main/res/values/strings.xml | 49 ++++++-------
app/src/main/res/values/tb_munion_strings.xml | 1 -
library/src/main/res/values-zh/strings.xml | 28 ++++++++
library/src/main/res/values/strings.xml | 8 +--
11 files changed, 207 insertions(+), 63 deletions(-)
create mode 100644 app/src/main/res/values-zh/arrays.xml
create mode 100644 app/src/main/res/values-zh/strings.xml
create mode 100644 library/src/main/res/values-zh/strings.xml
diff --git a/app/src/main/java/com/github/obsessive/simplifyreader/interactor/impl/ImagesContainerInteractorImpl.java b/app/src/main/java/com/github/obsessive/simplifyreader/interactor/impl/ImagesContainerInteractorImpl.java
index d6ffb44..11c4c61 100644
--- a/app/src/main/java/com/github/obsessive/simplifyreader/interactor/impl/ImagesContainerInteractorImpl.java
+++ b/app/src/main/java/com/github/obsessive/simplifyreader/interactor/impl/ImagesContainerInteractorImpl.java
@@ -35,13 +35,14 @@ public class ImagesContainerInteractorImpl implements CommonContainerInteractor
@Override
public List getCommonCategoryList(Context context) {
List resultData = new ArrayList<>();
- String[] imagesCategoryArray = context.getResources().getStringArray(R.array.images_category_list);
- resultData.add(new BaseEntity(imagesCategoryArray[0], imagesCategoryArray[0]));
- resultData.add(new BaseEntity(imagesCategoryArray[1], imagesCategoryArray[1]));
- resultData.add(new BaseEntity(imagesCategoryArray[2], imagesCategoryArray[2]));
- resultData.add(new BaseEntity(imagesCategoryArray[3], imagesCategoryArray[3]));
- resultData.add(new BaseEntity(imagesCategoryArray[4], imagesCategoryArray[4]));
- resultData.add(new BaseEntity(imagesCategoryArray[5], imagesCategoryArray[5]));
+ String[] imagesCategoryArrayId = context.getResources().getStringArray(R.array.images_category_list_id);
+ String[] imagesCategoryArrayName = context.getResources().getStringArray(R.array.images_category_list_name);
+ resultData.add(new BaseEntity(imagesCategoryArrayId[0], imagesCategoryArrayName[0]));
+ resultData.add(new BaseEntity(imagesCategoryArrayId[1], imagesCategoryArrayName[1]));
+ resultData.add(new BaseEntity(imagesCategoryArrayId[2], imagesCategoryArrayName[2]));
+ resultData.add(new BaseEntity(imagesCategoryArrayId[3], imagesCategoryArrayName[3]));
+ resultData.add(new BaseEntity(imagesCategoryArrayId[4], imagesCategoryArrayName[4]));
+ resultData.add(new BaseEntity(imagesCategoryArrayId[5], imagesCategoryArrayName[5]));
return resultData;
}
}
diff --git a/app/src/main/java/com/github/obsessive/simplifyreader/ui/fragment/ImagesListFragment.java b/app/src/main/java/com/github/obsessive/simplifyreader/ui/fragment/ImagesListFragment.java
index 8282903..51082b7 100644
--- a/app/src/main/java/com/github/obsessive/simplifyreader/ui/fragment/ImagesListFragment.java
+++ b/app/src/main/java/com/github/obsessive/simplifyreader/ui/fragment/ImagesListFragment.java
@@ -80,7 +80,7 @@ public class ImagesListFragment extends BaseFragment implements ImagesListView,
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- mCurrentImagesCategory = getResources().getStringArray(R.array.images_category_list)[0];
+ mCurrentImagesCategory = getResources().getStringArray(R.array.images_category_list_id)[0];
}
@Override
diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml
index fc0e1b7..511a906 100644
--- a/app/src/main/res/layout/activity_splash.xml
+++ b/app/src/main/res/layout/activity_splash.xml
@@ -33,7 +33,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/app_name"
- android:textSize="60sp"
+ android:textSize="50sp"
android:textStyle="bold"
android:textColor="@android:color/white"
android:layout_centerHorizontal="true"
diff --git a/app/src/main/res/values-zh/arrays.xml b/app/src/main/res/values-zh/arrays.xml
new file mode 100644
index 0000000..30d2070
--- /dev/null
+++ b/app/src/main/res/values-zh/arrays.xml
@@ -0,0 +1,68 @@
+
+
+
+
+
+ - 图片浏览
+ - 视频爽看
+ - 音乐轻听
+
+
+
+ - 头条
+ - 汽车
+ - 房产
+ - 科技
+ - 星座
+ - 旅游
+ - 时尚
+ - 娱乐
+
+
+
+ - 美女
+ - 动漫
+ - 明星
+ - 汽车
+ - 摄影
+ - 美食
+
+
+
+ - 美女
+ - 动漫
+ - 明星
+ - 汽车
+ - 摄影
+ - 美食
+
+
+
+ - 热门
+ - 搞笑
+ - 动漫
+ - 综艺
+
+
+
+ - 当前版本
+ - 关于作者
+ - 项目主页
+ - 项目介绍
+ - 开源项目说明
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
new file mode 100644
index 0000000..592fa2e
--- /dev/null
+++ b/app/src/main/res/values-zh/strings.xml
@@ -0,0 +1,39 @@
+
+
+ 简阅
+ DrawerOpen
+ DrawerClose
+ 扫一扫
+ 关于我们
+ 意见反馈
+ Copyright © 2015 SimplifyReader All Rights Reserved\nPowered by Obsessive and Chris
+ 看尽生活中的点滴
+ V %1$s
+ 再按一次退出
+ 没有更多了
+ 感谢您提出反馈意见,我会尽快回复
+
+
+ 视频播放
+ 观看次数\t
+ 收藏次数\t
+ 评论次数\t
+ 发布于\t
+ 标签
+
+ 历史
+ 图片
+ 灯光
+ 确定
+ 二维码
+ 条形码
+ 打开相机失败,请确保允许应用使用相机权限后重试!
+ 未解析到任何数据
+
+ 本地相册
+ 2.6.0.1.20150312
+ 图片下载失败
+ 获取新闻URL失败
+ 正在下载:
+ 图标
+
\ No newline at end of file
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 4eb76db..e7014fe 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -1,5 +1,4 @@
-
-
- 获取新闻URL失败
- 图片下载失败
+ Failed to fetch news url
+ Failed to download the picture
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c7f3bb9..0922472 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -17,36 +17,37 @@
- 简阅
+ SimplifyReader
DrawerOpen
DrawerClose
- 扫一扫
- 关于我们
- 意见反馈
- Copyright © 2015 SimplifyReader All Rights Reserved\nPower by Obsessive and Chris
- 看尽生活中的点滴
+ Scan QR Code
+ About us
+ Feedback
+ Copyright © 2015 SimplifyReader All Rights Reserved\nPowered by Obsessive and Chris
+ Go through the every bit of life
V %1$s
- 再按一次退出
- 没有更多了
- 感谢您提出反馈意见,我会尽快回复
+ Press again to exit
+ No more content
+ Thanks for your feedback, I will reply as soon as possible
- 视频播放
- 观看次数\t
- 收藏次数\t
- 评论次数\t
- 发布于\t
- 标签
+ Media Player
+ Times watched\t
+ Favorites\t
+ Comments\t
+ Posted on\t
+ Tags
- 历史
- 图片
- 灯光
- 确定
- 二维码
- 条形码
- 打开相机失败,请确保允许应用使用相机权限后重试!
- 未解析到任何数据
+ History
+ Picture
+ Light
+ Ok
+ QR Code
+ Barcode
+ Failed to open camera, please ensure the permission is allowed and try again
+ No data resolved
- 本地相册
+ Local photo album
+ Downloading:
diff --git a/app/src/main/res/values/tb_munion_strings.xml b/app/src/main/res/values/tb_munion_strings.xml
index b12a733..25db0b3 100644
--- a/app/src/main/res/values/tb_munion_strings.xml
+++ b/app/src/main/res/values/tb_munion_strings.xml
@@ -18,6 +18,5 @@
#e3e3e3
- 正在下载:
\ No newline at end of file
diff --git a/library/src/main/res/values-zh/strings.xml b/library/src/main/res/values-zh/strings.xml
new file mode 100644
index 0000000..8194325
--- /dev/null
+++ b/library/src/main/res/values-zh/strings.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+ library
+ 正在加载中...
+ 抱歉,暂未获取到数据!\n请点击屏幕重试~
+ 抱歉,系统出错了!\n请点击屏幕重试~
+ 暂未连接上网络!\n请连接后点击屏幕重试~
+ 1
+ 1
+
+
diff --git a/library/src/main/res/values/strings.xml b/library/src/main/res/values/strings.xml
index a40208f..b45b43e 100644
--- a/library/src/main/res/values/strings.xml
+++ b/library/src/main/res/values/strings.xml
@@ -18,9 +18,9 @@
library
- 正在加载中...
- 抱歉,暂未获取到数据!\n请点击屏幕重试~
- 抱歉,系统出错了!\n请点击屏幕重试~
- 暂未连接上网络!\n请连接后点击屏幕重试~
+ Loading...
+ Oops, failed to resolve data\nPlease hit the screen and try again~
+ Oops, something wrong!\nPlease hit the screen and try again~
+ No network connected!\nPlease hit the screen and try again after connecting~
From f48535f445c68fca2cd93bd83130c34a833a6fb9 Mon Sep 17 00:00:00 2001
From: Jiang Chen
Date: Fri, 23 Oct 2015 12:06:16 +0800
Subject: [PATCH 15/22] Update build.gradle
---
library/build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/library/build.gradle b/library/build.gradle
index 7cf8ce6..56e1233 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -51,7 +51,7 @@ dependencies {
compile 'com.readystatesoftware.systembartint:systembartint:1.0.3'
compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.3'
compile 'com.github.chrisbanes.photoview:library:1.2.2'
- compile 'com.afollestad:material-dialogs:0.7.6.0'
+ compile 'com.afollestad:material-dialogs:0.7.9.1'
compile 'de.greenrobot:eventbus:2.4.0'
compile 'com.squareup.okhttp:okhttp:2.4.0'
}
From d6af25677c4924b499cc7ef7eaa1a59a708b4f59 Mon Sep 17 00:00:00 2001
From: match
Date: Fri, 4 Dec 2015 15:35:38 +0800
Subject: [PATCH 16/22] Fix invalid douban url param
---
.../com/github/obsessive/simplifyreader/utils/UriHelper.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/src/main/java/com/github/obsessive/simplifyreader/utils/UriHelper.java b/app/src/main/java/com/github/obsessive/simplifyreader/utils/UriHelper.java
index 422bb73..b9ffb51 100644
--- a/app/src/main/java/com/github/obsessive/simplifyreader/utils/UriHelper.java
+++ b/app/src/main/java/com/github/obsessive/simplifyreader/utils/UriHelper.java
@@ -114,7 +114,7 @@ public String getDoubanPlayListUrl(String channelId) {
sb.append(ApiConstants.Urls.DOUBAN_PLAY_LIST_URLS);
sb.append("?channel=");
sb.append(channelId);
- sb.append("&app_name=radio_desktop_win&version=100&type=&sid=0");
+ sb.append("&app_name=radio_android&version=100&type=&sid=0");
return sb.toString().trim();
}
}
From 5b4da3c78f60d8c191a9c6332737284dfebe2013 Mon Sep 17 00:00:00 2001
From: paul
Date: Mon, 11 Jan 2016 13:54:45 +0800
Subject: [PATCH 17/22] build config migerate to latest gradle version &
android 23
---
app/build.gradle | 6 ++++--
.../ui/activity/SplashActivity.java | 2 +-
build.gradle | 3 ++-
library/build.gradle | 18 +++++++++++-------
library_youku/build.gradle | 4 ++--
5 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index 8b0e741..791dd28 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -18,8 +18,8 @@ apply plugin: 'com.android.application'
android {
- compileSdkVersion 22
- buildToolsVersion '22.0.1'
+ compileSdkVersion 23
+ buildToolsVersion '23.0.2'
defaultConfig {
applicationId "com.github.obsessive.simplifyreader"
minSdkVersion 10
@@ -48,6 +48,8 @@ android {
packagingOptions {
exclude 'META-INF/services/javax.annotation.processing.Processor'
+ exclude 'META-INF/maven/com.squareup.okio/okio/pom.xml'
+ exclude 'META-INF/maven/com.squareup.okio/okio/pom.properties'
}
productFlavors {
diff --git a/app/src/main/java/com/github/obsessive/simplifyreader/ui/activity/SplashActivity.java b/app/src/main/java/com/github/obsessive/simplifyreader/ui/activity/SplashActivity.java
index 056be00..e434425 100644
--- a/app/src/main/java/com/github/obsessive/simplifyreader/ui/activity/SplashActivity.java
+++ b/app/src/main/java/com/github/obsessive/simplifyreader/ui/activity/SplashActivity.java
@@ -128,7 +128,7 @@ public void initializeViews(String versionName, String copyright, int background
@Override
public void initializeUmengConfig() {
- AnalyticsConfig.setAppkey("55018d77fd98c5901e000a09");
+ AnalyticsConfig.setAppkey(this, "55018d77fd98c5901e000a09");
AnalyticsConfig.setChannel("SimplifyReader");
}
diff --git a/build.gradle b/build.gradle
index 795b6b3..64a1575 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,7 +19,7 @@ buildscript {
jcenter()
}
dependencies{
- classpath 'com.android.tools.build:gradle:1.3.0'
+ classpath 'com.android.tools.build:gradle:1.5.0'
}
}
@@ -28,5 +28,6 @@ allprojects {
jcenter()
mavenCentral()
maven { url "https://raw.githubusercontent.com/umeng/mvn-repo-umeng/master/repository" }
+ maven { url "https://jitpack.io" }
}
}
diff --git a/library/build.gradle b/library/build.gradle
index 56e1233..402e4e0 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -17,8 +17,10 @@
apply plugin: 'com.android.library'
android {
- compileSdkVersion 22
- buildToolsVersion '22.0.1'
+ compileSdkVersion 23
+ buildToolsVersion '23.0.2'
+ useLibrary 'org.apache.http.legacy'
+
defaultConfig {
minSdkVersion 10
targetSdkVersion 22
@@ -40,10 +42,10 @@ android {
}
dependencies {
- compile fileTree(dir: 'libs', include: ['*.jar'])
- compile 'com.android.support:appcompat-v7:22.2.0'
- compile 'com.android.support:cardview-v7:22.2.0'
- compile 'com.android.support:design:22.2.0'
+ compile fileTree(include: ['*.jar'], dir: 'libs')
+ compile 'com.android.support:appcompat-v7:23.1.1'
+ compile 'com.android.support:cardview-v7:23.1.1'
+ compile 'com.android.support:design:23.1.1'
compile 'com.jakewharton:butterknife:5.1.1'
compile 'com.google.code.gson:gson:2.2.4'
compile 'me.gujun.android.taggroup:library:1.4@aar'
@@ -51,7 +53,9 @@ dependencies {
compile 'com.readystatesoftware.systembartint:systembartint:1.0.3'
compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.3'
compile 'com.github.chrisbanes.photoview:library:1.2.2'
- compile 'com.afollestad:material-dialogs:0.7.9.1'
+ compile('com.github.afollestad.material-dialogs:core:0.8.5.3@aar') {
+ transitive = true
+ }
compile 'de.greenrobot:eventbus:2.4.0'
compile 'com.squareup.okhttp:okhttp:2.4.0'
}
diff --git a/library_youku/build.gradle b/library_youku/build.gradle
index e5ed684..e6cf4d7 100644
--- a/library_youku/build.gradle
+++ b/library_youku/build.gradle
@@ -17,8 +17,8 @@
apply plugin: 'com.android.library'
android {
- compileSdkVersion 22
- buildToolsVersion "22.0.1"
+ compileSdkVersion 23
+ buildToolsVersion "23.0.2"
defaultConfig {
minSdkVersion 10
From 5dac527a2c83d349bf3b602a16a35f650f6e9f80 Mon Sep 17 00:00:00 2001
From: paul
Date: Mon, 11 Jan 2016 14:10:04 +0800
Subject: [PATCH 18/22] fixed: close the app in recent Apps window can case
crash
---
.../obsessive/simplifyreader/ui/fragment/MusicsFragment.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/app/src/main/java/com/github/obsessive/simplifyreader/ui/fragment/MusicsFragment.java b/app/src/main/java/com/github/obsessive/simplifyreader/ui/fragment/MusicsFragment.java
index dc6066f..b9a225e 100644
--- a/app/src/main/java/com/github/obsessive/simplifyreader/ui/fragment/MusicsFragment.java
+++ b/app/src/main/java/com/github/obsessive/simplifyreader/ui/fragment/MusicsFragment.java
@@ -151,7 +151,9 @@ public void onActivityCreated(Bundle savedInstanceState) {
@Override
public void onDetach() {
super.onDetach();
- mMusicsPresenter.onStopPlay();
+ if(mMusicsPresenter != null) {
+ mMusicsPresenter.onStopPlay();
+ }
mContext.unregisterReceiver(mBundleBroadCast);
mContext.unregisterReceiver(mPositionBroadCast);
mContext.unregisterReceiver(mSecondProgressBroadCast);
From 01d6467dd434ef8210c1a465f4a70fa710cddbc5 Mon Sep 17 00:00:00 2001
From: Obsessive <1076559197@qq.com>
Date: Thu, 5 May 2016 16:08:32 +0800
Subject: [PATCH 19/22] Update README.md
---
README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 5d489a8..4643355 100644
--- a/README.md
+++ b/README.md
@@ -161,7 +161,7 @@
###关于我
* **QQ:** 1076559197
-* **QQ Tribe:** 271918140 [https://github.com/liaohuqiu/qq-tribe-rule](https://github.com/liaohuqiu/qq-tribe-rule)
+* **QQ Tribe:** 345470463
* **Weibo:** [http://weibo.com/obsessive1990](http://weibo.com/obsessive1990)
* **Email:** [1076559197@qq.com](mailto:1076559197@qq.com) | [tchen0707@gmail.com](mailto:tchen0707@gmail.com)
* **Github:** [https://github.com/skillcollege](https://github.com/skillcollege)
@@ -187,4 +187,4 @@ distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-```
\ No newline at end of file
+```
From db81b5dd8bcac604ed84a2f144c5044a9fef1f79 Mon Sep 17 00:00:00 2001
From: CHEN TAO <1076559197@qq.com>
Date: Sat, 5 Nov 2016 16:42:16 +0800
Subject: [PATCH 20/22] Update README.md
---
README.md | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/README.md b/README.md
index 4643355..a167194 100644
--- a/README.md
+++ b/README.md
@@ -5,19 +5,19 @@
###效果图
-
+
-
+
-
+
-
+
###Demo下载
-[火速跳转](https://fir.im/simplifyreader) | [Download-APK](https://raw.githubusercontent.com/SkillCollege/server/master/SimplifyReader/apks/app-debug.apk)
+[火速跳转](https://fir.im/simplifyreader) | [Download-APK](https://raw.githubusercontent.com/chentao0707/server/master/SimplifyReader/apks/app-debug.apk)
-
+
###模块分析
@@ -164,12 +164,12 @@
* **QQ Tribe:** 345470463
* **Weibo:** [http://weibo.com/obsessive1990](http://weibo.com/obsessive1990)
* **Email:** [1076559197@qq.com](mailto:1076559197@qq.com) | [tchen0707@gmail.com](mailto:tchen0707@gmail.com)
-* **Github:** [https://github.com/skillcollege](https://github.com/skillcollege)
-* **Blog:** [https://skillcollege.github.io](https://skillcollege.github.io) | [http://blog.csdn.net/skillcollege](http://blog.csdn.net/skillcollege)
+* **Github:** [https://github.com/chentao0707](https://github.com/chentao0707)
+* **Blog:** [http://www.qingcore.com](http://www.qingcore.com)
###项目主页
-[http://skillcollege.github.io/SimplifyReader/](http://skillcollege.github.io/SimplifyReader/)
+[http://www.qingcore.com/SimplifyReader/](http://www.qingcore.com/SimplifyReader/)
###License
From 6f3983dff7a97c31f26c4ea8f467f5be1e4256ad Mon Sep 17 00:00:00 2001
From: CHEN TAO <1076559197@qq.com>
Date: Fri, 24 Mar 2017 10:07:54 +0800
Subject: [PATCH 21/22] Update README.md
---
README.md | 3 +++
1 file changed, 3 insertions(+)
diff --git a/README.md b/README.md
index a167194..ecdfdb6 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,6 @@
+## 说明
+***由于项目是几年前开发的，很多第三方库都已经更新了，导致安装或者编译失败，如果不能正常运行的，请查看Log自行解决，代码也是几年前的代码，只做参考。***
+
###简阅
From ae24bdbb6fdbba7d8beb3d222fcabd4be93d15bf Mon Sep 17 00:00:00 2001
From: CHEN TAO <1076559197@qq.com>
Date: Fri, 24 Mar 2017 10:08:28 +0800
Subject: [PATCH 22/22] Update README.md
---
README.md | 2 ++
1 file changed, 2 insertions(+)
diff --git a/README.md b/README.md
index ecdfdb6..f4b88d1 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
## 说明
***由于项目是几年前开发的，很多第三方库都已经更新了，导致安装或者编译失败，如果不能正常运行的，请查看Log自行解决，代码也是几年前的代码，只做参考。***
+
+
###简阅