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 @@
-#Tue Dec 04 15:32:34 CST 2018
-debugName=940
+#Wed Dec 05 11:36:01 CST 2018
+debugName=944
 versionName=651
-debugCode=940
+debugCode=944
 versionCode=206

app_modular/apputils/src/main/java/com/modular/apputils/model/BillGroupModel.java

@@ -20,6 +20,7 @@ public class BillGroupModel {
     private boolean isForm;//是否为主表
     private boolean lastInType;//是否当前单据明细的最后一个
     private int groupIndex;//当前组所在的整个显示集合里面的索引
+    private int minDetno = 10000000;//最小的序号
     private String group;//组名
     private String keyField;//提交时候主表或明细表id字段名称
     private Map<String, Object> mTagMap;//附带信息
@@ -39,6 +40,14 @@ public class BillGroupModel {
         return mTagMap;
     }
 
+    public int getMinDetno() {
+        return minDetno;
+    }
+
+    public void setMinDetno(int minDetno) {
+        this.minDetno = minDetno;
+    }
+
     public void setTagMap(Map<String, Object> mTagMap) {
         this.mTagMap = mTagMap;
     }
@@ -166,6 +175,7 @@ public class BillGroupModel {
     public static class BillModel {
         private int id;//id
         private int groupIndex;//所在组索引
+        private int detno=1000000;//序号
         private int length;//字符长度
         private int appwidth;//宽度
         private int isdefault;//是否显示
@@ -182,6 +192,7 @@ public class BillGroupModel {
         private String allowBlank;//是否允许为空(注:当作为标题的时候T:表示可以删除 F:表示不可删除)
         private List<LocalData> localDatas;//获取到的本地选择数据
         private BillJump mBillJump;//判断是否需要要跳转字段
+
         public BillModel() {
         }
 
@@ -189,6 +200,7 @@ public class BillGroupModel {
             this.id = e.id;
             this.groupIndex = e.groupIndex + 1;
             this.length = e.length;
+            this.detno = e.detno;
             this.appwidth = e.appwidth;//宽度
             this.isdefault = e.isdefault;//是否
             this.dbfind = e.dbfind;//是否
@@ -204,6 +216,14 @@ public class BillGroupModel {
             this.mBillJump = e.mBillJump;
         }
 
+        public int getDetno() {
+            return detno;
+        }
+
+        public void setDetno(int detno) {
+            this.detno = detno;
+        }
+
         public BillJump getBillJump() {
             return mBillJump;
         }

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

@@ -33,6 +33,8 @@ import com.modular.apputils.presenter.imp.IBill;
 import java.io.File;
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -74,7 +76,7 @@ public class BillPresenter extends BaseNetPresenter implements OnSmartHttpListen
     public int getFormId() {
         return mId;
     }
-    
+
     public void setmId(int mId) {
         this.mId = mId;
     }
@@ -439,6 +441,12 @@ public class BillPresenter extends BaseNetPresenter implements OnSmartHttpListen
         }
     }
 
+    private final Comparator<BillGroupModel> mComparator=new Comparator<BillGroupModel>() {
+        @Override
+        public int compare(BillGroupModel billGroupModel, BillGroupModel t1) {
+            return billGroupModel.getMinDetno()-t1.getMinDetno();
+        }
+    };
     //处理表单返回配置
     protected void handlerBill(JSONObject object) {
         LogUtil.i("gong", "object=" + object);
@@ -456,6 +464,9 @@ public class BillPresenter extends BaseNetPresenter implements OnSmartHttpListen
             for (Map.Entry<String, BillGroupModel> entry : formdeMap.entrySet()) {
                 showBillModels.add(entry.getValue());
             }
+            if (!ListUtils.isEmpty(showBillModels)){
+                Collections.sort(showBillModels,mComparator);
+            }
         }
         JSONArray gridetail = JSONUtil.getJSONArray(data, "gridetail");
         BillGroupModel mGridetailModel = handlerGridetail(showBillModels.size(), gridetail);
@@ -491,6 +502,11 @@ public class BillPresenter extends BaseNetPresenter implements OnSmartHttpListen
                         modelMap.put(group, mapBillGroupModel);
                     }
                     mBillModel.setGroupIndex(mapBillGroupModel.getGroupIndex());
+                    int minDetno = mapBillGroupModel.getMinDetno();
+                    if (minDetno > mBillModel.getDetno()) {
+                        minDetno = mBillModel.getDetno();
+                    }
+                    mapBillGroupModel.setMinDetno(minDetno);
                     if (isShow(mBillModel)) {
                         mapBillGroupModel.addShow(mBillModel);
                     } else {
@@ -553,6 +569,7 @@ public class BillPresenter extends BaseNetPresenter implements OnSmartHttpListen
         BillGroupModel.BillModel mBillModel = new BillGroupModel.BillModel();
         String caption = JSONUtil.getText(object, "fd_caption", "dg_caption");//字段名称
         String value = JSONUtil.getText(object, "fd_value", "dg_value");//字段名称
+        int fd_detno = JSONUtil.getInt(object, "fd_detno");//序号
         int id = JSONUtil.getInt(object, "fd_id", "gd_id");//id
         int length = JSONUtil.getInt(object, "fd_maxlength", "dg_maxlength");//字符长度
         int appwidth = JSONUtil.getInt(object, "fd_appwidth", "dg_appwidth");//宽度
@@ -592,6 +609,7 @@ public class BillPresenter extends BaseNetPresenter implements OnSmartHttpListen
             }
         }
         mBillModel.setFindFunctionName(findFunctionName);
+        mBillModel.setDetno(fd_detno);
         mBillModel.setCaption(caption);
         mBillModel.setId(id);
         mBillModel.setValue(value);

app_modular/appworks/src/main/java/com/uas/appworks/crm3_0/activity/CustomerBillInputActivity.java

@@ -27,6 +27,8 @@ import com.modular.apputils.utils.UUHttpHelper;
 import com.uas.appworks.R;
 import com.uas.appworks.adapter.CustomerBillInputAdapter;
 
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 
@@ -35,6 +37,8 @@ import java.util.List;
  */
 public class CustomerBillInputActivity extends BillInputActivity {
 
+
+
     @Override
     public BillAdapter newBillAdapter(List<BillGroupModel> groupModels) {
         return new CustomerBillInputAdapter(ct, groupModels, this, new CustomerBillInputAdapter.CompanyClickListener() {

app_third/libbdupdatesdk/src/main/AndroidManifest.xml

@@ -36,15 +36,6 @@
         <!-- ↑↑↑ 百度移动统计SDK ↑↑↑ -->
         <!-- android:theme="@style/bdp_update_dialog_style_fullscreen" -->
 
-        <provider
-            android:name="android.support.v4.content.FileProvider"
-            android:authorities="${applicationId}.provider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/provider_paths" />
-        </provider>
     </application>