修复些泄漏问题

aa112901 · Mar 21, 2017 · 94e0299 · 94e0299
1 parent 0b5eb85
commit 94e0299
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 12 deletions.
diff --git a/app-release.apk b/app-release.apk
diff --git a/app/app.iml b/app/app.iml
@@ -61,20 +61,20 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />

diff --git a/app/src/main/java/com/wm/remusic/activity/AlbumsDetailActivity.java b/app/src/main/java/com/wm/remusic/activity/AlbumsDetailActivity.java
@@ -251,7 +251,7 @@ protected Boolean doInBackground(final Void... unused) {
                 }
 
                 int tryCount = 0;
-                while (sparseArray.size() != musicCount && tryCount < 1000){
+                while (sparseArray.size() != musicCount && tryCount < 1000 && !isCancelled()){
                     tryCount++;
                     try {
                         Thread.sleep(30);

diff --git a/app/src/main/java/com/wm/remusic/activity/ArtistDetailActivity.java b/app/src/main/java/com/wm/remusic/activity/ArtistDetailActivity.java
@@ -180,7 +180,7 @@ protected Boolean doInBackground(final Void... unused) {
                 }
 
                 int tryCount = 0;
-                while (sparseArray.size() != musicCount && tryCount < 1000){
+                while (sparseArray.size() != musicCount && tryCount < 1000 && !isCancelled()){
                     tryCount++;
                     try {
                         Thread.sleep(30);

diff --git a/app/src/main/java/com/wm/remusic/activity/PlaylistActivity.java b/app/src/main/java/com/wm/remusic/activity/PlaylistActivity.java
@@ -380,7 +380,7 @@ protected Boolean doInBackground(final Void... unused) {
                     RequestThreadPool.post(new MusicDetailInfoGet(geDanGeInfo.getSong_id(), i, sparseArray));
                 }
                 int tryCount = 0;
-                while (sparseArray.size() != musicCount && tryCount < 1000){
+                while (sparseArray.size() != musicCount && tryCount < 1000 && !isCancelled()){
                     tryCount++;
                     try {
                         Thread.sleep(30);
@@ -389,6 +389,7 @@ protected Boolean doInBackground(final Void... unused) {
                     }
                 }
 
+
                 if(sparseArray.size() == musicCount){
                     for (int i = 0; i < mList.size(); i++) {
                         try {
@@ -431,8 +432,10 @@ protected void onPostExecute(Boolean complete) {
         }
 
         public void cancleTask(){
+
             cancel(true);
             RequestThreadPool.finish();
+            Log.e(TAG," cancled task , + thread" + Thread.currentThread().getName());
         }
     }
 
@@ -461,13 +464,14 @@ public void onPause() {
 
     @Override
     protected void onDestroy() {
-        super.onDestroy();
+
         if(mLoadNetList != null){
             mLoadNetList.cancleTask();
         }
         if(mLoadLocalList != null){
             mLoadLocalList.cancel(true);
         }
+        super.onDestroy();
     }
 
     private void setAlbumart() {

diff --git a/app/src/main/java/com/wm/remusic/activity/RankPlaylistActivity.java b/app/src/main/java/com/wm/remusic/activity/RankPlaylistActivity.java
@@ -255,7 +255,7 @@ protected Boolean doInBackground(final Void... unused) {
                     RequestThreadPool.post(new MusicDetailInfoGet(billboardJson.getSong_id(), i, sparseArray));
                 }
                 int tryCount = 0;
-                while (sparseArray.size() != musicCount && tryCount < 1000) {
+                while (sparseArray.size() != musicCount && tryCount < 1000 && !isCancelled()) {
                     tryCount++;
                     try {
                         Thread.sleep(30);