2.0.0 小程序和app端地图显示问题

air/src/main/java/com/air/utils/GeomUtils.java

@@ -1,26 +1,48 @@
 package com.air.utils;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.extra.spring.SpringUtil;
 import cn.hutool.json.JSONUtil;
 import com.air.applets.dto.CoordinatePoint;
 import com.air.entity.PolygonGeom;
 import com.air.entity.PolygonPoint;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+import org.springframework.web.util.WebUtils;
 
+import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @author peihao
  * @date 2021-09-14
  **/
+@Slf4j
 public class GeomUtils {
 
-    public static PolygonGeom computeGemo(List<PolygonPoint> polygonPoints,String lineColor,Integer lineOpaqueness,Integer lineWidth,String fillColor,Integer fillOpaqueness){
+    public static PolygonGeom computeGemo(List<PolygonPoint> polygonPoints,String lineColor,Integer lineOpaqueness,Integer lineWidth,
+                                          String fillColor,Integer fillOpaqueness){
         PolygonGeom polygonGeom = new PolygonGeom();
-        polygonGeom.setStrokeColor(computeColor(lineColor,lineOpaqueness));
-        polygonGeom.setFillColor(computeColor(fillColor,fillOpaqueness));
+        HttpServletRequest request = ServletRequestAttributes.class.cast(RequestContextHolder.getRequestAttributes()).getRequest();
+        String s = request.getHeader("request-source");
+        String strokeColor;
+        String fillColor1;
+        if ("wechat_applet".equals(s)){
+            strokeColor = computeColorWechat(lineColor, lineOpaqueness);
+            fillColor1 = computeColorWechat(fillColor, fillOpaqueness);
+        }else {
+            strokeColor = computeColor(lineColor, lineOpaqueness);
+            fillColor1 = computeColor(fillColor, fillOpaqueness);
+        }
+        polygonGeom.setStrokeColor(strokeColor);
+        polygonGeom.setFillColor(fillColor1);
         polygonGeom.setStrokeWidth(Integer.valueOf(lineWidth));
         polygonGeom.setPoints(polygonPoints);
         return polygonGeom;
@@ -60,10 +82,31 @@ public class GeomUtils {
     }
 
     public static String computeColor(String color,Integer opaqueness){
+        if (StrUtil.isEmpty(color) || opaqueness == null){
+            return null;
+        }
+        List<String> collect = null;
+        try {
+            String[] cut = StrUtil.cut(StrUtil.subAfter(color, "#", true), 2);
+            collect = Arrays.stream(cut).map(e -> String.valueOf(Integer.parseInt(e,16))).collect(Collectors.toList());
+        } catch (Exception e) {
+            log.error("颜色解析失败",e);
+        }
+
+        BigDecimal decimal = new BigDecimal(opaqueness);
+        double v = decimal.divide(new BigDecimal(255), 1, BigDecimal.ROUND_HALF_UP).doubleValue();
+
+        StringBuffer colorBuffer = new StringBuffer();
+        colorBuffer.append("rgba(").append(CollectionUtil.join(collect, ",")).append(",").append(v).append(")");
+        return colorBuffer.toString();
+    }
+
+    public static String computeColorWechat(String color,Integer opaqueness){
         if (StrUtil.isEmpty(color) || opaqueness == null){
             return null;
         }
         String hex = Integer.toHexString(opaqueness);
         return color+hex;
     }
+
 }