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

# Conflicts:
#	WeiChat/build.gradle
#	WeiChat/src/main/AndroidManifest.xml

WeiChat/src/main/AndroidManifest.xml

@@ -783,10 +783,12 @@
             android:label="@string/activity_select_aims" />
         <!-- 动态表单 -->
         <activity android:name=".ui.erp.activity.form.DataFormDetailActivity"
-            android:windowSoftInputMode="adjustNothing"
+            android:windowSoftInputMode="adjustPan"
             android:hardwareAccelerated="false"/>
-        <activity android:name=".ui.erp.activity.form.DataFormFieldActivity" />
-        <activity android:name=".ui.erp.activity.form.FormListSelectActivity" />
+        <activity android:name=".ui.erp.activity.form.DataFormFieldActivity" 
+            android:windowSoftInputMode="adjustPan|stateHidden"/>
+        <activity android:name=".ui.erp.activity.form.FormListSelectActivity"
+            android:launchMode="singleTask"/>
         <activity
             android:name=".ui.erp.activity.oa.SigningActivity"
             android:label="@string/activity_signing" />

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

@@ -910,8 +910,8 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                         public void afterTextChanged(Editable s) {
                             String type = data.getType();
                             if ("N".equals(type) && !RegexUtil.checkRegex(s.toString(), "^[0-9]+(.[0-9]{1})?$")) {
-                                if (!StringUtils.isEmpty(s.toString()) & !StringUtils.isEmpty(text)) {
-                                    if (s.toString().length() > text.length()) {
+                                if (!StringUtils.isEmpty(s.toString()) && !StringUtils.isEmpty(text)) {
+                                    if (s.toString().length() >=text.length()) {
                                         ToastMessage(data.getName() + "只能输入数值！");
                                     } else {
                                         ViewUtil.cancelToast();