Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into developer

# Conflicts:
#	app_modular/appme/src/main/java/com/uas/appme/settings/activity/SettingActivity.java

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Wed Dec 05 11:36:01 CST 2018
-debugName=944
+#Wed Dec 05 14:08:27 CST 2018
+debugName=948
 versionName=651
-debugCode=944
+debugCode=948
 versionCode=206

app_core/common/src/main/java/com/core/utils/time/wheel/DateTimePicker.java

@@ -55,6 +55,7 @@ public class DateTimePicker extends WheelPicker {
     private String hourLabel = "时", minuteLabel = "分";
     private String selectedHour = "", selectedMinute = "";
     private OnDateTimePickListener onDateTimePickListener;
+    private OnCancelListener onCancelListener;
     private int mode;
 
 
@@ -310,6 +311,14 @@ public class DateTimePicker extends WheelPicker {
         }
     }
 
+    @Override
+    protected void onCancel() {
+        super.onCancel();
+        if (onCancelListener != null) {
+            onCancelListener.onCancel();
+        }
+    }
+
     /**
      * Gets selected year.
      *
@@ -507,4 +516,11 @@ public class DateTimePicker extends WheelPicker {
         this.onDateTimePickListener = listener;
     }
 
+    public void setOnCancelListener(OnCancelListener onCancelListener) {
+        this.onCancelListener = onCancelListener;
+    }
+
+    public interface OnCancelListener {
+        void onCancel();
+    }
 }

app_modular/apputils/src/main/java/com/modular/apputils/activity/BillInputActivity.java

@@ -326,10 +326,15 @@ public class BillInputActivity extends OABaseActivity implements IBill, BillAdap
             public void onDateTimePicked(String year, String month, String day, String hour, String minute) {
                 String date = year + "-" + month + "-" + day;
                 String dateTime = date + " " + hour + ":" + minute + ":00";
-                mBillAdapter.updateBillModelValues(position, needTime ? dateTime : date,  needTime ? dateTime : date);
+                mBillAdapter.updateBillModelValues(position, needTime ? dateTime : date, needTime ? dateTime : date);
+            }
+        });
+        picker.setOnCancelListener(new DateTimePicker.OnCancelListener() {
+            @Override
+            public void onCancel() {
+                mBillAdapter.updateBillModelValues(position, "", "");
             }
         });
-
         picker.show();
     }
 

app_modular/apputils/src/main/java/com/modular/apputils/presenter/BillPresenter.java

@@ -600,14 +600,15 @@ public class BillPresenter extends BaseNetPresenter implements OnSmartHttpListen
             }
             mBillModel.setLocalDatas(localDatas);
         }
-        if ((type.equals("D") || type.equals("T")) && TextUtils.isEmpty(defValue)) {
-            defValue = DateFormatUtil.long2Str(System.currentTimeMillis() + 1000 * 10 * 60, DateFormatUtil.YMD_HMS);
-            if (caption.contains("生日")) {
-                String day = DateFormatUtil.long2Str(System.currentTimeMillis(), DateFormatUtil.YMD);
-                mBillModel.setValue(day);
-                mBillModel.setDisplay(defValue);
-            }
-        }
+        //时间格式，默认添加时间（已取消）
+//        if ((type.equals("D") || type.equals("T")) && TextUtils.isEmpty(defValue)) {
+//            defValue = DateFormatUtil.long2Str(System.currentTimeMillis() + 1000 * 10 * 60, DateFormatUtil.YMD_HMS);
+//            if (caption.contains("生日")) {
+//                String day = DateFormatUtil.long2Str(System.currentTimeMillis(), DateFormatUtil.YMD);
+//                mBillModel.setValue(day);
+//                mBillModel.setDisplay(defValue);
+//            }
+//        }
         mBillModel.setFindFunctionName(findFunctionName);
         mBillModel.setDetno(fd_detno);
         mBillModel.setCaption(caption);

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/form/DataFormDetailActivity.java

@@ -54,6 +54,7 @@ import com.core.widget.view.selectcalendar.SelectCalendarActivity;
 import com.core.widget.view.selectcalendar.bean.Data;
 import com.lidroid.xutils.ViewUtils;
 import com.modular.apputils.activity.SelectNetAcitivty;
+import com.modular.apputils.model.BillGroupModel;
 import com.modular.apputils.utils.PopupWindowHelper;
 import com.uas.appworks.OA.erp.activity.CommonDocDetailsActivity;
 import com.uas.appworks.OA.erp.model.form.GroupData;
@@ -64,13 +65,17 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -123,7 +128,14 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
 
     private int va_id;//订单ID
     private int formid;//主表ID
-
+    private final Comparator<Object> mComparator=new Comparator<Object>() {
+        @Override
+        public int compare(Object t0, Object t1) {
+            int detno0=JSONUtil.getInt((JSONObject) t0,"fd_detno");
+            int detno1=JSONUtil.getInt((JSONObject) t1,"fd_detno");
+            return detno0-detno1;
+        }
+    };
     private Handler mHandler = new Handler() {
 
         @Override
@@ -142,6 +154,7 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                     if (!ListUtils.isEmpty(mDatasNet)) mDatasNet.clear();
                     if (StringUtil.isEmpty(result)) return;
                     JSONArray forms = JSON.parseObject(result).getJSONObject("data").getJSONArray("formdetail");
+                    Collections.sort(forms,mComparator);
                     grids = JSON.parseObject(result).getJSONObject("data").getJSONArray("gridetail");
                     try {
                         JSONObject config = JSON.parseObject(result).getJSONObject("config");
@@ -154,8 +167,8 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                         e.printStackTrace();
                     }
                     //主表分组
-                    HashSet<String> set = new HashSet<String>();
-                    HashSet<Integer> detail = new HashSet<Integer>();
+                    Set<String> set = new LinkedHashSet<>();
+                    Set<Integer> detail = new LinkedHashSet<Integer>();
                     List<Integer> detailist = new ArrayList<Integer>();
                     if (!ListUtils.isEmpty(forms)) {
                         for (int i = 0; i < forms.size(); i++) {
@@ -253,8 +266,8 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                             }
                             //默认空字符不显示主form分组名字
                             if (!StringUtil.isEmpty(value)) {
-                                groupData.setName("");
-                                groupDataNet.setName("");//传输给配置界面
+                                groupData.setName(value);
+                                groupDataNet.setName(value);//传输给配置界面
                             } else {
                                 groupData.setName("");
                                 groupDataNet.setName("");//传输给配置界面