xiazai

app/src/main/java/com/kuxuan/moneynote/api/ApiHelper.java

@@ -40,7 +40,7 @@ public class ApiHelper {
     public ApiHelper buildRetrofit() {
         mRetrofit = new Retrofit.Builder()
                 .client(mHttpClient)
-                .baseUrl("http://baidu.com")
+                .baseUrl("http://182.92.118.1:8090")
                 .build();
         return this;
     }

app/src/main/java/com/kuxuan/moneynote/ui/fragments/details/DetialContract.java

@@ -10,6 +10,7 @@ import com.kuxuan.moneynote.base.mvpbase.BasePresent;
 import com.kuxuan.moneynote.base.mvpbase.BaseView;
 import com.kuxuan.moneynote.json.TypeDataJson;
 import com.kuxuan.moneynote.json.UserAllBillJson;
+import com.kuxuan.moneynote.json.netbody.RES;
 import com.kuxuan.moneynote.json.netbody.SkinBean;
 import com.kuxuan.moneynote.listener.MVPListener;
 import com.lcodecore.tkrefreshlayout.TwinklingRefreshLayout;
@@ -62,7 +63,7 @@ public interface DetialContract {
 
         void showSkinData(SkinBean skinBean);
 
-        void showDownLoad(int positon,View background,ProgressBar progressBar,int current);
+        void showDownLoad(RES res, int size, int positon, View background, ProgressBar progressBar, int current);
 
     }
 
@@ -110,7 +111,7 @@ public interface DetialContract {
         abstract void InitPopWindow();
 
 
-        abstract void downLoadPic(View background,ProgressBar progressBar, String url, int size, int position);
+        abstract void downLoadPic(RES res,View background,ProgressBar progressBar, String url, int size, int position);
 
     }
 

app/src/main/java/com/kuxuan/moneynote/ui/fragments/details/DetialFragment.java

@@ -338,24 +338,6 @@ public class DetialFragment extends MVPFragment<DetialPresent, DetialModel> impl
 
     }
 
-    @Override
-    public void showDownLoad(int position,final View background,final ProgressBar progressBar, final int current) {
-
-        progressBar.setProgress(current);
-
-        if(current==100) {
-
-            handler.post(new Runnable() {
-                @Override
-                public void run() {
-                    background.setVisibility(View.GONE);
-                    progressBar.setVisibility(View.GONE);
-                }
-            });
-
-            SkinUtil.markDownload(position);
-        }
-    }
 
 
     @Subscribe(threadMode = ThreadMode.MAIN)
@@ -397,6 +379,37 @@ public class DetialFragment extends MVPFragment<DetialPresent, DetialModel> impl
     PopupWindow popupWindow;
     Handler handler;
 
+
+
+
+    @Override
+    public void showDownLoad(RES res,int size,int position,final View background,final ProgressBar progressBar, final int current) {
+
+        if(size<2) {
+            size ++;
+            if(size==1) {
+                mPresenter.downLoadPic(res, background, progressBar, res.getMine_banner(), size, position);
+            }else if(size==2) {
+                mPresenter.downLoadPic(res, background, progressBar, res.getBanner(), size, position);
+            }
+            }
+        if(size==2) {
+            progressBar.setProgress(current);
+            if (current == 100) {
+                handler.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        background.setVisibility(View.GONE);
+                        progressBar.setVisibility(View.GONE);
+                    }
+                });
+
+                SkinUtil.markDownload(position);
+            }
+        }
+
+    }
+
     private void showPopWindow() {
 
 
@@ -442,9 +455,11 @@ public class DetialFragment extends MVPFragment<DetialPresent, DetialModel> impl
                         progressBar.setVisibility(View.VISIBLE);
                     }
                      RES res = (RES) adapter.getData().get(position);
-                     mPresenter.downLoadPic(background,progressBar,res.getBanner(),2,position);
-                     mPresenter.downLoadPic(background,progressBar,res.getPreview_img(),0,position);
-                     mPresenter.downLoadPic(background,progressBar,res.getMine_banner(),1,position);
+
+                     mPresenter.downLoadPic(res,background,progressBar,res.getPreview_img(),0,position);
+//
+//                     mPresenter.downLoadPic(background,progressBar,res.getBanner(),2,position);
+
                 }else {
                     SPUtil.putAndApply(getContext(), Constant.Skin.CHECKED, position);
                     adapter.notifyDataSetChanged();

app/src/main/java/com/kuxuan/moneynote/ui/fragments/details/DetialModel.java

@@ -157,7 +157,7 @@ public class DetialModel implements DetialContract.DetialModel {
         }
 
         if (TextUtils.isEmpty(mVideoPath)) {
-            Log.e(TAG, "downloadVideo: 存储路径为空");
+            Log.e(TAG, "存储路径为空");
             return;
         }
 

app/src/main/java/com/kuxuan/moneynote/ui/fragments/details/DetialPresent.java

@@ -18,6 +18,7 @@ import com.kuxuan.moneynote.json.TimeJson;
 import com.kuxuan.moneynote.json.TypeDataJson;
 import com.kuxuan.moneynote.json.UserAllBillJson;
 import com.kuxuan.moneynote.json.YearData;
+import com.kuxuan.moneynote.json.netbody.RES;
 import com.kuxuan.moneynote.json.netbody.SkinBean;
 import com.kuxuan.moneynote.listener.MVPListener;
 import com.kuxuan.moneynote.ui.adapter.DetialAdapter;
@@ -357,21 +358,19 @@ public class DetialPresent extends DetialContract.DetialPresent implements View.
     }
 
     @Override
-    void downLoadPic(final View background, final ProgressBar progressBar, String url, final int size, final int position) {
+    void downLoadPic(final RES res, final View background, final ProgressBar progressBar, String url, final int size, final int position) {
 
 
         mModel.downLoadPic(url, size, position, new DetialContract.DownloadListener() {
             @Override
             public void onStart() {
 
-                Log.e("allence","开始了");
 
             }
 
             @Override
             public void onProgress(int currentLength) {
 
-                Log.e("allence","进度"+currentLength);
 
                 if(size==2){
                     try {
@@ -379,16 +378,16 @@ public class DetialPresent extends DetialContract.DetialPresent implements View.
                     } catch (InterruptedException e) {
                         e.printStackTrace();
                     }
-                    view.showDownLoad(position,background,progressBar,currentLength);
+                    view.showDownLoad(res,size,position,background,progressBar,currentLength);
                 }
 
             }
 
             @Override
             public void onFinish(String localPath) {
-
-                Log.e("allence","结束了");
-
+                if(size!=2) {
+                    view.showDownLoad(res, size, position, background, progressBar,0);
+                }
             }
 
             @Override