Merge branch 'master' of http://113.105.137.151:22280/lify/rvapp into dev-member-john

RvWrapper/src/main/java/com/ruiwenliu/wrapper/util/listener/SwitchFragment.java

@@ -4,8 +4,13 @@ public class SwitchFragment {
     public static ChangeFragment sChangeFragment;  //改变选中Frangment的接口
 
     public static void setFragmentSelected(ChangeFragment changeFragment) {
+        if (sChangeFragment == null) {
+            synchronized (SwitchFragment.class) {
+                if (sChangeFragment == null) {
                     sChangeFragment = changeFragment;
-
+                }
+            }
+        }
     }
 
     public interface ChangeFragment {

component_utils/src/main/java/com/rv/component/utils/RvCache.java

@@ -23,9 +23,14 @@ public class RvCache<T extends Serializable> {
     }
 
     public static <T> RvCache getInstance(Context context) {
+        if (instance == null) {
+            synchronized (RvCache.class) {
                 if (instance == null) {
                     instance = new RvCache(context);
                 }
+            }
+
+        }
         return instance;
     }
 

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/GetOnTheCarQRCodeActivity.java

@@ -6,6 +6,7 @@ import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -21,6 +22,8 @@ import com.ruiwenliu.wrapper.base.BaseStatusActivity;
 import com.ruiwenliu.wrapper.util.TimeManager;
 import com.ruiwenliu.wrapper.util.glide.GlideManager;
 import com.ruiwenliu.wrapper.weight.TitleView;
+import com.rv.component.utils.DisplayUtil;
+import com.rv.component.utils.ZxingUtils;
 import com.rv.home.R;
 import com.rv.home.R2;
 import com.ruiwenliu.wrapper.base.presenter.PickerPresenter;
@@ -80,17 +83,17 @@ public class GetOnTheCarQRCodeActivity extends BaseStatusActivity<PickerPresente
             tvCarType.setText(dataBean.getName());
             OrderListBean.DataBeanX.DataBean.OrderTourDetail detail = dataBean.getOrderTourDetail();
             if (detail != null) {
-                tvGetTime.setText(TimeManager.stampToDate(String.valueOf(detail.getStartTime()))+"-"+TimeManager.stampToDate(String.valueOf(detail.getEndTime())));
+                tvGetTime.setText(TimeManager.stampToDate(String.valueOf(detail.getStartTime())) + "-" + TimeManager.stampToDate(String.valueOf(detail.getEndTime())));
                 tvGetAddress.setText(detail.getStartAddr());
                 tvOutAddress.setText(detail.getEndAddr());
-                GlideManager.getInstance(mActivity).loadImage(dataBean.getPicture(), ivGoods);
+                GlideManager.getInstance(mActivity).loadRoundImage(dataBean.getPicture(), ivGoods, 8);
             }
         }
 
-        //生成带中间图标的二维码
-        Bitmap success = createQRImage(dataBean.getQrcodeStr(), 100, 100,
-                BitmapFactory.decodeResource(getResources(), R.mipmap.ic_launcher));
-        ivZxing.setImageBitmap(success);
+        if (!TextUtils.isEmpty(dataBean.getQrcodeStr())) {
+            Bitmap bitmap = ZxingUtils.createQR(dataBean.getQrcodeStr(), DisplayUtil.dip2px(this, 200), DisplayUtil.dip2px(this, 200));
+            ivZxing.setImageBitmap(bitmap);
+        }
     }
 
     @Override
@@ -107,97 +110,4 @@ public class GetOnTheCarQRCodeActivity extends BaseStatusActivity<PickerPresente
             showToast("该功能还在开发中...");
         }
     }
-
-
-    public static Bitmap createQRImage(String content, int widthPix, int heightPix, Bitmap logoBm) {
-        try {
-            //配置参数
-            Map<EncodeHintType, Object> hints = new HashMap<>();
-            hints.put(EncodeHintType.CHARACTER_SET, "utf-8");
-            //容错级别
-            hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.H);
-            //设置空白边距的宽度
-            hints.put(EncodeHintType.MARGIN, 1); //default is 4
-
-            // 图像数据转换，使用了矩阵转换
-            BitMatrix bitMatrix = null;
-            try {
-                bitMatrix = new QRCodeWriter().encode(content, BarcodeFormat.QR_CODE, widthPix,
-                        heightPix, hints);
-            } catch (WriterException e) {
-                e.printStackTrace();
-            }
-            int[] pixels = new int[widthPix * heightPix];
-            // 下面这里按照二维码的算法，逐个生成二维码的图片，
-            // 两个for循环是图片横列扫描的结果
-            for (int y = 0; y < heightPix; y++) {
-                for (int x = 0; x < widthPix; x++) {
-                    if (bitMatrix.get(x, y)) {
-                        pixels[y * widthPix + x] = 0xff000000;
-                    } else {
-                        pixels[y * widthPix + x] = 0xffffffff;
-                    }
-                }
-            }
-
-            // 生成二维码图片的格式，使用ARGB_8888
-            Bitmap bitmap = Bitmap.createBitmap(widthPix, heightPix, Bitmap.Config.ARGB_8888);
-            bitmap.setPixels(pixels, 0, widthPix, 0, 0, widthPix, heightPix);
-
-            if (logoBm != null) {
-                bitmap = Logo(bitmap, logoBm);
-            }
-
-            //必须使用compress方法将bitmap保存到文件中再进行读取。直接返回的bitmap是没有任何压缩的，
-            // 内存消耗巨大！
-            return bitmap;
-//            return bitmap != null && bitmap.compress(Bitmap.CompressFormat.JPEG, 100);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        return null;
-    }
-
-    private static Bitmap Logo(Bitmap src, Bitmap logo) {
-        if (src == null) {
-            return null;
-        }
-
-        if (logo == null) {
-            return src;
-        }
-
-        //获取图片的宽高
-        int srcWidth = src.getWidth();
-        int srcHeight = src.getHeight();
-        int logoWidth = logo.getWidth();
-        int logoHeight = logo.getHeight();
-
-        if (srcWidth == 0 || srcHeight == 0) {
-            return null;
-        }
-
-        if (logoWidth == 0 || logoHeight == 0) {
-            return src;
-        }
-
-        //logo大小为二维码整体大小的1/5
-        float scaleFactor = srcWidth * 1.0f / 5 / logoWidth;
-        Bitmap bitmap = Bitmap.createBitmap(srcWidth, srcHeight, Bitmap.Config.ARGB_8888);
-        try {
-            Canvas canvas = new Canvas(bitmap);
-            canvas.drawBitmap(src, 0, 0, null);
-            canvas.scale(scaleFactor, scaleFactor, srcWidth / 2, srcHeight / 2);
-            canvas.drawBitmap(logo, (srcWidth - logoWidth) / 2, (srcHeight - logoHeight) / 2, null);
-
-            canvas.save();
-            canvas.restore();
-        } catch (Exception e) {
-            bitmap = null;
-            e.getStackTrace();
-        }
-
-        return bitmap;
-    }
 }

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/PickUpTheCarQRCodeActivity.java

@@ -17,6 +17,7 @@ import com.ruiwenliu.wrapper.base.BaseStatusActivity;
 import com.ruiwenliu.wrapper.util.TimeManager;
 import com.ruiwenliu.wrapper.util.glide.GlideManager;
 import com.ruiwenliu.wrapper.weight.TitleView;
+import com.rv.component.utils.DisplayUtil;
 import com.rv.component.utils.ZxingUtils;
 import com.rv.home.R;
 import com.rv.home.R2;
@@ -90,20 +91,19 @@ public class PickUpTheCarQRCodeActivity extends BaseStatusActivity<PickerPresent
                 tvOutTime.setText(TimeManager.stampToDate(String.valueOf(detail.getEnd_time())));
                 tvPrice.setText(String.format("¥%1$s", dataBean.getRealAmount()));
 
-                String icon ="";
-                if (!TextUtils.isEmpty(dataBean.getCoverPic())){
+                String icon = "";
+                if (!TextUtils.isEmpty(dataBean.getCoverPic())) {
                     icon = dataBean.getCoverPic();
-                }else {
+                } else {
                     icon = dataBean.getIcon();
                 }
-                GlideManager.getInstance(mActivity).loadImage(icon, ivGoods);
+                GlideManager.getInstance(mActivity).loadRoundImage(icon, ivGoods,8);
             }
         }
-
-        //生成带中间图标的二维码
-        Bitmap success = ZxingUtils.createQRImage(dataBean.getQrcodeStr(), 100, 100,
-                BitmapFactory.decodeResource(getResources(), R.mipmap.ic_launcher));
-        ivZxing.setImageBitmap(success);
+        if (!TextUtils.isEmpty(dataBean.getQrcodeStr())) {
+            Bitmap bitmap = ZxingUtils.createQR(dataBean.getQrcodeStr(), DisplayUtil.dip2px(this, 200), DisplayUtil.dip2px(this, 200));
+            ivZxing.setImageBitmap(bitmap);
+        }
     }
 
     @Override