现场修改8

app/src/main/java/com/bonait/bnframework/business/ConfigData.java

@@ -609,10 +609,13 @@ public class ConfigData {
                                         boolean iswl = false;
                                         List<ActionJsonMode> gyActions = new Json<List<ActionJsonMode>>().jsonToListobject(ActionJsonMode.class, ((String) k.actionJson));
                                         for (ActionJsonMode m : gyActions) {
-                                            data += m.ActionName + "," + m.ActionValue + "|";
-                                            desc += m.ActionValue + ",";
-                                            if (!m.BatchingId.isEmpty()) {
-                                                iswl = true;
+                                            if(m.ActionName!=null && m.ActionValue!="")
+                                            {
+                                                data += m.ActionName + "," + m.ActionValue + "|";
+                                                desc += m.ActionValue + ",";
+                                                if (!m.BatchingId.isEmpty()) {
+                                                    iswl = true;
+                                                }
                                             }
                                         }
                                         if (data.contains("|")) {

app/src/main/java/com/bonait/bnframework/common/image/MyBitmapUtils.java

@@ -31,7 +31,8 @@ public class MyBitmapUtils {
         Bitmap bitmap;
         //内存缓存
         String name="";
-        if(url.contains("https://hbl-test-1305371387.cos.ap-chengdu.myqcloud.com/"))
+        //https://hbl-1305371387.cos.ap-chengdu.myqcloud.com/Franchisee/jccy@163.com/goods/133381212328681942.jpg
+        if(url.contains("http"))
         {
             name=url.substring(url.lastIndexOf('/')+1);
         }else
@@ -56,7 +57,7 @@ public class MyBitmapUtils {
             return;
         }
         //网络缓存
-        if(url.contains("https://hbl-test-1305371387.cos.ap-chengdu.myqcloud.com/"))
+        if(url.contains("http"))
         {
             mNetCacheUtils.getBitmapFromNet(ivPic,url);
         }