merg

app/src/main/java/com/kuxuan/moneynote/ui/adapter/SkinAdapter.java

@@ -4,12 +4,13 @@ import android.support.annotation.Nullable;
 import android.view.View;
 import android.widget.ImageView;
 
+import com.bumptech.glide.Glide;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.kuxuan.moneynote.R;
 import com.kuxuan.moneynote.common.Constant;
 import com.kuxuan.moneynote.json.netbody.RES;
-import com.kuxuan.moneynote.utils.GlideUtil;
+import com.kuxuan.moneynote.utils.GlideRoundTransform;
 import com.kuxuan.moneynote.utils.SPUtil;
 import com.kuxuan.moneynote.utils.SkinUtil;
 
@@ -52,7 +53,8 @@ public class SkinAdapter extends BaseQuickAdapter<RES,BaseViewHolder> {
         }
 
         ImageView iv_skin = helper.getView(R.id.iv_skin);
-        GlideUtil.setImageWithNoCache(mContext,item.getPreview_img(),iv_skin,false);
+//        GlideUtil.setImageWithNoCache(mContext,item.getPreview_img(),iv_skin,false);
+        Glide.with(mContext).load(item.getPreview_img()).bitmapTransform(new GlideRoundTransform(mContext,4,true)).into(iv_skin);
 
 
     }

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

@@ -16,6 +16,7 @@ import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.WindowManager;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.PopupWindow;
@@ -536,16 +537,17 @@ public class DetialFragment extends MVPFragment<DetialPresent, DetialModel> impl
 
         popupWindow = new PopupWindow(contentView, LinearLayout.LayoutParams.MATCH_PARENT, DisplayUtil.dip2px(138), true);
         popupWindow.setBackgroundDrawable(new ColorDrawable(Color.WHITE));
-        // 设置PopupWindow是否能响应外部点击事件
         popupWindow.setOutsideTouchable(true);
-        // 设置PopupWindow是否能响应点击事件
         popupWindow.setTouchable(true);
-        // 显示PopupWindow，其中：
-        // 第一个参数是PopupWindow的锚点，第二和第三个参数分别是PopupWindow相对锚点的x、y偏移
-//        popupWindow.showAsDropDown(anchor, xoff, yoff);
-        // 或者也可以调用此方法显示PopupWindow，其中：
-        // 第一个参数是PopupWindow的父View，第二个参数是PopupWindow相对父View的位置，
-        // 第三和第四个参数分别是PopupWindow相对父View的x、y偏移
+
+        setBackgroundAlpha(0.5f);
+        popupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
+            @Override
+            public void onDismiss() {
+                // popupWindow隐藏时恢复屏幕正常透明度
+                setBackgroundAlpha(1.0f);
+            }
+        });
         popupWindow.showAtLocation(relativeLayout, Gravity.BOTTOM, 0, 0);
 
         final RecyclerView recyclerView = contentView.findViewById(R.id.recyclerview);
@@ -633,6 +635,19 @@ public class DetialFragment extends MVPFragment<DetialPresent, DetialModel> impl
 
     }
 
+    /**
+     * 设置添加屏幕的背景透明度
+     *
+     * @param bgAlpha
+     *            屏幕透明度0.0-1.0 1表示完全不透明
+     */
+    public void setBackgroundAlpha(float bgAlpha) {
+        WindowManager.LayoutParams lp = getActivity().getWindow()
+                .getAttributes();
+        lp.alpha = bgAlpha;
+        getActivity().getWindow().setAttributes(lp);
+    }
+
 
     private void setSkinData() {
 

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

@@ -95,7 +95,7 @@ public class DetialModel implements DetialContract.DetialModel {
 
 
 
-    Thread mThread;
+
     @Override
     public void getDataListsForDB(final String year, final String month, final HashMap<String, Integer> maps, final MVPListener<UserAllBillJson> listMVPListener) {
         io.reactivex.Observable.create(new ObservableOnSubscribe<UserAllBillJson>() {
@@ -130,7 +130,7 @@ public class DetialModel implements DetialContract.DetialModel {
 
     }
 
-    String  mVideoPath;
+    String  mPICPath;
     File mFile;
     @Override
     public void downLoadPic(String url, int size, int position, final DetialContract.DownloadListener downloadListener) {
@@ -144,33 +144,24 @@ public class DetialModel implements DetialContract.DetialModel {
             file.mkdirs() ;
         }
         switch (size){
-
             case 0:
-
-                mVideoPath = fileheader + Constant.Skin.SKINICON+position+".png";
-
+                mPICPath = fileheader + Constant.Skin.SKINICON+position+".png";
                 break;
-
             case 1:
-
-                mVideoPath = fileheader + Constant.Skin.MINE+position+".png";
-
+                mPICPath = fileheader + Constant.Skin.MINE+position+".png";
                 break;
-
             case 2:
-
-                mVideoPath = fileheader + Constant.Skin.HOMEPICNAME+position+".png";
-
+                mPICPath = fileheader + Constant.Skin.HOMEPICNAME+position+".png";
                 break;
         }
 
-        if (TextUtils.isEmpty(mVideoPath)) {
+        if (TextUtils.isEmpty(mPICPath)) {
             Log.e(TAG, "存储路径为空");
             return;
         }
 
         //建立一个文件
-        mFile = new File(mVideoPath);
+        mFile = new File(mPICPath);
 
         Call<ResponseBody> mCall= ApiHelper.getInstance().buildRetrofit().createService(ApiService.class).downloadPic(url);
 
@@ -179,16 +170,13 @@ public class DetialModel implements DetialContract.DetialModel {
             public void onResponse(Call<ResponseBody> call, final Response<ResponseBody> response) {
 
 
-                //下载文件放在子线程
-                mThread = new Thread() {
+                new Thread(new Runnable() {
                     @Override
                     public void run() {
-                        super.run();
-                        //保存到本地
                         writeFile2Disk(response, mFile, downloadListener);
                     }
-                };
-                mThread.start();
+                }).start();
+
 
             }
 
@@ -203,7 +191,9 @@ public class DetialModel implements DetialContract.DetialModel {
     }
 
 
-    private void writeFile2Disk(Response<ResponseBody> response, File file, DetialContract.DownloadListener downloadListener) {
+    private  void writeFile2Disk(Response<ResponseBody> response, File file, DetialContract.DownloadListener downloadListener) {
+
+
         downloadListener.onStart();
         long currentLength = 0;
         OutputStream os = null;
@@ -220,10 +210,18 @@ public class DetialModel implements DetialContract.DetialModel {
                 currentLength += len;
 //                Log.e(TAG, "当前进度: " + currentLength);
                 //计算当前下载百分比，并经由回调传出
+
+                try {
+                    Thread.sleep(10);
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+
+
                 downloadListener.onProgress((int) (100 * currentLength / totalLength));
                 //当百分比为100时下载结束，调用结束回调，并传出下载后的本地路径
                 if ((int) (100 * currentLength / totalLength) == 100) {
-                    downloadListener.onFinish(mVideoPath); //下载完成
+                    downloadListener.onFinish(mPICPath); //下载完成
                 }
             }
         } catch (FileNotFoundException e) {

app/src/main/java/com/kuxuan/moneynote/utils/GlideRoundTransform.java

@@ -24,6 +24,12 @@ public class GlideRoundTransform extends BitmapTransformation {
         radius = Resources.getSystem().getDisplayMetrics().density * dp;
     }
 
+    public GlideRoundTransform(Context context, int px,boolean isPx) {
+        super(context);
+        radius = px;
+    }
+
+
     @Override protected Bitmap transform(BitmapPool pool, Bitmap toTransform, int outWidth, int outHeight) {
         return roundCrop(pool, toTransform);
     }

app/src/main/res/drawable/corn.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+
+    <!-- 设置矩形的四个角为弧形 -->
+    <corners
+        android:topLeftRadius="10px"
+        android:topRightRadius="10px"
+        android:bottomLeftRadius="10px"
+        android:bottomRightRadius="10px" />
+
+
+    <!-- 各方向的间隔 -->
+    <!-- 大小 -->
+    <size
+        android:width="80px"
+        android:height="50px"/>
+
+
+    <solid
+        android:color="#66000000"
+        />
+
+
+
+</shape>

app/src/main/res/drawable/progressbar_my.xml

@@ -2,28 +2,27 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item android:id="@android:id/background">
-
         <shape >
-
-            <stroke android:color="#0d0f11" android:width="1dp"/>
+            <stroke android:color="#ffffff" android:width="1dp"/>
+            <corners android:radius="5dip" />
             <gradient
                 android:angle="270"
                 android:centerY="0.75"
-                android:endColor="#F5F5F5"
-                android:startColor="#BEBEBE" />
+                android:endColor="#ffffff"
+                android:startColor="#ffffff" />
         </shape>
     </item>
 
     <item android:id="@android:id/secondaryProgress">
         <clip >
             <shape >
-                <corners android:radius="0dip" />
+                <corners android:radius="5dip" />
 
                 <gradient
                     android:angle="270"
                     android:centerY="0.75"
-                    android:endColor="#165CBC"
-                    android:startColor="#85B0E9" />
+                    android:endColor="#ffffff"
+                    android:startColor="#ffffff" />
             </shape>
         </clip>
     </item>
@@ -32,11 +31,12 @@
 
         <clip >
             <shape >
+                <corners android:radius="5dip" />
                 <gradient
                     android:angle="270"
                     android:centerY="0.75"
-                    android:endColor="#FE7F00"
-                    android:startColor="#FE7F00" />
+                    android:endColor="@color/bu_yellow_bg"
+                    android:startColor="@color/bu_yellow_bg" />
             </shape>
         </clip>
     </item>

app/src/main/res/layout/skinadapter_item.xml

@@ -12,7 +12,6 @@
         android:layout_marginLeft="10px"
         android:layout_marginRight="10px"
         android:layout_marginTop="5px"
-        android:scaleType="fitXY"
         android:src="@drawable/skin_icon"
         />
 
@@ -23,14 +22,14 @@
         android:layout_marginLeft="10px"
         android:layout_marginRight="10px"
         android:layout_marginTop="5px"
-        android:background="#66000000"
+        android:background="@drawable/corn"
         />
 
 
     <ProgressBar
         android:id="@+id/progressbar"
-        android:layout_width="80px"
-        android:layout_height="3px"
+        android:layout_width="60px"
+        android:layout_height="5px"
         android:progress="0"
         style="@style/progressbar_my"
         android:layout_centerInParent="true"

app/src/main/res/values-v19/styles.xml

@@ -16,6 +16,8 @@
     <style name="progressbar_my" parent="@android:style/Widget.ProgressBar.Horizontal">
         <item name="android:maxHeight" >50px</item>
         <item name="android:minHeight">8px</item>
+        <item name="android:maxWidth">80px</item>
+        <item name="android:minWidth">50px</item>
         <item name="android:indeterminateOnly">false</item>
         <item name="android:indeterminateDrawable">@android:drawable/progress_indeterminate_horizontal</item>
         <item name="android:progressDrawable">@drawable/progressbar_my</item>

app/src/main/res/values-v21/styles.xml

@@ -17,6 +17,8 @@
     <style name="progressbar_my" parent="@android:style/Widget.ProgressBar.Horizontal">
         <item name="android:maxHeight" >50px</item>
         <item name="android:minHeight">8px</item>
+        <item name="android:maxWidth">80px</item>
+        <item name="android:minWidth">50px</item>
         <item name="android:indeterminateOnly">false</item>
         <item name="android:indeterminateDrawable">@android:drawable/progress_indeterminate_horizontal</item>
         <item name="android:progressDrawable">@drawable/progressbar_my</item>

app/src/main/res/values/styles.xml

@@ -95,6 +95,8 @@
     <style name="progressbar_my" parent="@android:style/Widget.ProgressBar.Horizontal">
         <item name="android:maxHeight" >50px</item>
         <item name="android:minHeight">8px</item>
+        <item name="android:maxWidth">80px</item>
+        <item name="android:minWidth">50px</item>
         <item name="android:indeterminateOnly">false</item>
         <item name="android:indeterminateDrawable">@android:drawable/progress_indeterminate_horizontal</item>
         <item name="android:progressDrawable">@drawable/progressbar_my</item>