修复本地图片圆角问题

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/form/DataFormDetailActivity.java

@@ -98,6 +98,7 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                     grids = JSON.parseObject(result).getJSONObject("data").getJSONArray("gridetail");
                     //主表分组
                     HashSet<String> set = new HashSet<String>();
+                    HashSet<Integer> detail = new HashSet<Integer>();
                     if (!ListUtils.isEmpty(forms)) {
                         for (int i = 0; i < forms.size(); i++) {
                             JSONObject items = forms.getJSONObject(i);
@@ -161,39 +162,91 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                         
                         //明细项
                         if (!ListUtils.isEmpty(grids)) {
-                            groupData = new GroupData();//分组
-                            GroupData groupDataNet = new GroupData();
-                            ArrayList<Data> itemData = new ArrayList<>();
-                            ArrayList<Data> itemDataNet = new ArrayList<>();
+                            //明細分組--获取组名
                             for (int i = 0; i < grids.size(); i++) {
-
                                 JSONObject items = grids.getJSONObject(i);
-                                Data data = new Data();
-                                data.setName(items.getString("dg_caption"));
-                                data.setField(items.getString("dg_field"));
-                                data.setDetno(items.getIntValue("dg_sequence"));
-                                data.setFdid(items.getIntValue("gd_id"));
-                                data.setIsDefault(items.getIntValue("mdg_isdefault"));
-                                data.setIsNeed(items.getIntValue("mdg_isdefault"));
-                                data.setType(items.getString("dg_type"));
-                                data.setGroupId(1);
-                                if (data.getIsNeed() != 0) {
-                                    itemData.add(data);
-                                }else{
-                                    data.setGroup("明细项");
-                                    itemDataNet.add(data);//传输给配置界面
+                                detail.add(items.getInteger("dg_group"));
+                            }
+                            //分组大于1开始分组
+                            if (detail.size()>1){
+                                //需要分組
+                                //过滤分组
+                                Iterator<Integer> iter_detail = detail.iterator();
+                                while (iter_detail.hasNext()){
+                                    Integer detailId=iter_detail.next();
+                                    GroupData detailGroup=new GroupData();
+                                    GroupData groupDataNet = new GroupData();
+                                    ArrayList<Data> itemData = new ArrayList<>();
+                                    ArrayList<Data> itemDataNet = new ArrayList<>();
+                                    for (int i = 0; i < grids.size(); i++) {
+                                        JSONObject items = grids.getJSONObject(i);
+                                        Data data = new Data();
+                                        data.setName(items.getString("dg_caption"));
+                                        data.setField(items.getString("dg_field"));
+                                        data.setDetno(items.getIntValue("dg_sequence"));
+                                        data.setFdid(items.getIntValue("gd_id"));
+                                        data.setIsDefault(items.getIntValue("mdg_isdefault"));
+                                        data.setIsNeed(items.getIntValue("mdg_isdefault"));
+                                        data.setType(items.getString("dg_type"));
+                                        if (detailId==items.getInteger("dg_group")){
+                                            //同类分组
+                                            if (data.getIsNeed() != 0) {
+                                                itemData.add(data);
+                                            } else {
+                                                itemDataNet.add(data);
+                                            }
+                                        }else{
+                                            //不同类分组
+                                        }
+                                        
+                                    }
+                                    
+                                    detailGroup.setDatas(itemData);
+                                    detailGroup.setName("明细项"+detailId);
+                                    groupDataNet.setDatas(itemDataNet);
+                                    
+                                    mDatas.add(detailGroup);
+                                    mDatasNet.add(groupDataNet);
+
                                 }
+                            }else{
+                                //不需要分組---减少循环
+                                groupData = new GroupData();//分组
+                                GroupData groupDataNet = new GroupData();
+                                ArrayList<Data> itemData = new ArrayList<>();
+                                ArrayList<Data> itemDataNet = new ArrayList<>();
+                                for (int i = 0; i < grids.size(); i++) {
+
+                                    JSONObject items = grids.getJSONObject(i);
+                                    Data data = new Data();
+                                    data.setName(items.getString("dg_caption"));
+                                    data.setField(items.getString("dg_field"));
+                                    data.setDetno(items.getIntValue("dg_sequence"));
+                                    data.setFdid(items.getIntValue("gd_id"));
+                                    data.setIsDefault(items.getIntValue("mdg_isdefault"));
+                                    data.setIsNeed(items.getIntValue("mdg_isdefault"));
+                                    data.setType(items.getString("dg_type"));
+                                    data.setGroupId(1);
+                                    if (data.getIsNeed() != 0) {
+                                        itemData.add(data);
+                                    }else{
+                                        data.setGroup("明细项");
+                                        itemDataNet.add(data);//传输给配置界面
+                                    }
+                                }
+                                groupData.setId(mDatas.size());
+                                groupData.setDatas(itemData);
+                                groupData.setName("明细项" + mDatas.size());
+
+                                groupDataNet.setDatas(itemDataNet);//传输给配置界面
+
+                                mDatas.add(groupData);
+                                mDatasNet.add(groupDataNet);//传输给配置界面
+
+                                ll_item_add.setVisibility(View.VISIBLE);
+                                
                             }
-                            groupData.setId(mDatas.size());
-                            groupData.setDatas(itemData);
-                            groupData.setName("明细项" + mDatas.size());
-                            
-                            groupDataNet.setDatas(itemDataNet);//传输给配置界面
-                            
-                            mDatas.add(groupData);
-                            mDatasNet.add(groupDataNet);//传输给配置界面
-                            
-                            ll_item_add.setVisibility(View.VISIBLE);
+                          
                         } else {
                             ll_item_add.setVisibility(View.GONE);
                         }
@@ -201,9 +254,7 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                         if (mAdapter == null) {
                             mAdapter = new DataAdapter(mContext, mDatas);
                             lv_datas.setAdapter(mAdapter);
-                        } else {
-                            //空处理
-                        }
+                        } 
                     }
                     break;
                 case Constants.HTTP_SUCCESS_INIT: