动态表单设置

WeiChat/build.gradle

@@ -13,7 +13,7 @@ android {
     }
     signingConfigs {
         config {
-            storeFile file('C:/Users/FANGlh/Desktop/UUAPP/applicationsignname[20150409]')
+            storeFile file('C:/Users/Arison/Desktop/applicationsignname[20150409]')
             storePassword '13237658359'
             keyAlias 'jie-20150409'
             keyPassword '13237658359'

WeiChat/src/main/AndroidManifest.xml

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

WeiChat/src/main/java/com/xzjmyk/pm/activity/CustomCrashActivity.java

@@ -8,6 +8,8 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.ImageView;
 
+import com.afollestad.materialdialogs.MaterialDialog;
+
 import cat.ereza.customactivityoncrash.CustomActivityOnCrash;
 
 /**
@@ -33,8 +35,8 @@ public class CustomCrashActivity extends Activity {
         stackTraceString = CustomActivityOnCrash.getAllErrorDetailsFromIntent(this,intent);
         if (stackTraceString != null){
             //Toast.makeText(this, stackTraceString, Toast.LENGTH_LONG).show();
-//            new MaterialDialog.Builder(this).content(stackTraceString)
-//                    .build().show();
+            new MaterialDialog.Builder(this).content(stackTraceString)
+                    .build().show();
         }
         final Class<? extends Activity> activityClassFromIntent = CustomActivityOnCrash.getRestartActivityClassFromIntent(intent);
         final CustomActivityOnCrash.EventListener listenerFromIntent = CustomActivityOnCrash.getEventListenerFromIntent(intent);

WeiChat/src/main/java/com/xzjmyk/pm/activity/MyApplication.java

@@ -33,6 +33,7 @@ import com.uuzuche.lib_zxing.activity.ZXingLibrary;
 import com.xzjmyk.pm.activity.bean.ConfigBean;
 import com.xzjmyk.pm.activity.bean.User;
 import com.xzjmyk.pm.activity.db.SQLiteHelper;
+import com.xzjmyk.pm.activity.ui.SplashActivity;
 import com.xzjmyk.pm.activity.util.Constants;
 import com.xzjmyk.pm.activity.util.PreferenceUtils;
 import com.xzjmyk.pm.activity.util.SharedUtil;
@@ -44,6 +45,8 @@ import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
 
+import cat.ereza.customactivityoncrash.CustomActivityOnCrash;
+
 public class MyApplication extends Application {
     /**
      * @注释：记录Cookie
@@ -78,16 +81,16 @@ public class MyApplication extends Application {
 
         //Stetho调试工具初始化
         Stetho.initializeWithDefaults(this);
-//        //自定义闪退页面初始化
-//        CustomActivityOnCrash.install(this);
-//        //设置ErrorActivity在后台启动，默认为true
-//        CustomActivityOnCrash.setLaunchErrorActivityWhenInBackground(true);
-//        //设置展示详细错误信息，默认为true
-//        CustomActivityOnCrash.setShowErrorDetails(true);
-//        //启用APP Restart，默认为true
-//        CustomActivityOnCrash.setEnableAppRestart(true);
-//        //设置重新启动的activity
-//        CustomActivityOnCrash.setRestartActivityClass(SplashActivity.class);
+        //自定义闪退页面初始化
+        CustomActivityOnCrash.install(this);
+        //设置ErrorActivity在后台启动，默认为true
+        CustomActivityOnCrash.setLaunchErrorActivityWhenInBackground(true);
+        //设置展示详细错误信息，默认为true
+        CustomActivityOnCrash.setShowErrorDetails(true);
+        //启用APP Restart，默认为true
+        CustomActivityOnCrash.setEnableAppRestart(true);
+        //设置重新启动的activity
+        CustomActivityOnCrash.setRestartActivityClass(SplashActivity.class);
 
         INSTANCE = this;
         ZXingLibrary.initDisplayOpinion(this);
@@ -98,7 +101,7 @@ public class MyApplication extends Application {
 
         SharedUtil.init(this);
         initShareAPI();
-//        CrashReport.initCrashReport(getApplicationContext(), "900050585", false);
+     //  CrashReport.initCrashReport(getApplicationContext(), "900050585", false);
         PreferenceUtils.putBoolean(this, Constants.IS_NOTIFICATION, false);//不进行通知
         new Handler().postDelayed(new Runnable() {
             @Override

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

@@ -252,7 +252,7 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                                             //关联id
                                             key_did = items.getString("dg_value");
                                         }
-                                        data.setMaxlength(String.valueOf(items.getIntValue("fd_maxlength")));
+                                        data.setMaxlength(String.valueOf(items.getIntValue("dg_maxlength")));
                                         data.setName(items.getString("dg_caption"));
                                         data.setReadonly(items.getString("dg_logictype"));
                                         data.setField(items.getString("dg_field"));
@@ -319,7 +319,7 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                                         //明细id
                                         key_did = items.getString("dg_value");
                                     }
-                                    data.setMaxlength(String.valueOf(items.getIntValue("fd_maxlength")));
+                                    data.setMaxlength(String.valueOf(items.getIntValue("dg_maxlength")));
                                     data.setName(items.getString("dg_caption"));
                                     data.setField(items.getString("dg_field"));
                                     data.setReadonly(items.getString("dg_logictype"));
@@ -852,8 +852,10 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                         model.editText.setKeyListener(null);
                         model.editText.setFocusable(false);
                         if (data.getType().equals("D")) {
-                            model.editText.setText(DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd HH:mm:ss"));
-                            data.setValue(DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd HH:mm:ss"));
+                            if (formid==0) {//更新不进入这里
+                                model.editText.setText(DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd HH:mm:ss"));
+                                data.setValue(DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd HH:mm:ss"));
+                            }
                         }
                        
                     }
@@ -1198,7 +1200,8 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                     String key = item.getField();
                     String value = item.getValue();
                     if (StringUtils.isEmpty(value)) value = "";
-                    if ("F".equals(item.getReadonly()) && StringUtils.isEmpty(value)) {
+                    if (("F".equals(item.getReadonly()) && StringUtils.isEmpty(value))
+                            ||( "necessaryField".equals(item.getReadonly())&&StringUtils.isEmpty(value))) {
                         ToastMessage(item.getName() + "不能为空！");
                         return;
                     }
@@ -1245,7 +1248,8 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                         String key = item.getField();
                         String value = item.getValue();
                         if (StringUtils.isEmpty(value)) value = "";
-                        if ("F".equals(item.getReadonly()) && StringUtils.isEmpty(value)) {
+                        if (("F".equals(item.getReadonly()) && StringUtils.isEmpty(value))
+                                ||( "necessaryField".equals(item.getReadonly())&&StringUtils.isEmpty(value))) {
                             ToastMessage(item.getName() + "不能为空！");
                             return;
                         }
@@ -1299,7 +1303,8 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                     String key = item.getField();
                     String value = item.getValue();
                     if (StringUtils.isEmpty(value)) value = "";
-                    if ("F".equals(item.getReadonly()) && StringUtils.isEmpty(value)) {
+                    if (("F".equals(item.getReadonly()) && StringUtils.isEmpty(value))
+                            ||( "necessaryField".equals(item.getReadonly())&&StringUtils.isEmpty(value))) {
                         ToastMessage(item.getName() + "不能为空！");
                         return;
                     }
@@ -1381,14 +1386,15 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
         StringBuffer gridStore = new StringBuffer("[");
         //判断是否有明细项
         if (groupData != null) {//存在明细
-            ArrayList<Data> items = mDatas.get(0).getDatas();
+            ArrayList<Data> items = mAdapter.getmListData().get(0).getDatas();
             if (!ListUtils.isEmpty(items)) {
                 for (int i = 0; i < items.size(); i++) {
                     Data item = items.get(i);
                     String key = item.getField();
                     String value = item.getValue();
                     if (StringUtils.isEmpty(value)) value = "";
-                    if ("F".equals(item.getReadonly()) && StringUtils.isEmpty(value)) {
+                    if (("F".equals(item.getReadonly()) && StringUtils.isEmpty(value))
+                            ||( "necessaryField".equals(item.getReadonly())&&StringUtils.isEmpty(value))) {
                         ToastMessage(item.getName() + "不能为空！");
                         return;
                     }
@@ -1403,8 +1409,8 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
             }
             LogUtil.prinlnLongMsg("update", "forStore:" + forStore.toString());
             //屏蔽第一项
-            for (int i = 1; i < mDatas.size(); i++) {
-                items = mDatas.get(i).getDatas();
+            for (int i = 1; i < mAdapter.getmListData().size(); i++) {
+                items = mAdapter.getmListData().get(i).getDatas();
                 if (!ListUtils.isEmpty(items)) {
                     gridStore.append("{");
                     for (int j = 0; j < items.size(); j++) {
@@ -1414,7 +1420,8 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                         String detailId = item.getDetailId();
                         String detailDid = item.getDetailDid();
                         if (StringUtils.isEmpty(value)) value = "";
-                        if ("F".equals(item.getReadonly()) && StringUtils.isEmpty(value)) {
+                        if (("F".equals(item.getReadonly()) && StringUtils.isEmpty(value))
+                                ||( "necessaryField".equals(item.getReadonly())&&StringUtils.isEmpty(value))) {
                             ToastMessage(item.getName() + "不能为空！");
                             return;
                         }
@@ -1427,7 +1434,7 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                         }
 
                     }
-                    if (i == mDatas.size() - 1) {
+                    if (i == mAdapter.getmListData().size() - 1) {
                         gridStore.append("}");
                     } else {
                         gridStore.append("},");
@@ -1439,14 +1446,15 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
             LogUtil.prinlnLongMsg("update", "girdStore:" + gridStore.toString());
             updateData(forStore.toString(), gridStore.toString());
         } else {
-            ArrayList<Data> items = mDatas.get(0).getDatas();
+            ArrayList<Data> items =mAdapter.getmListData().get(0).getDatas();
             if (!ListUtils.isEmpty(items)) {
                 for (int i = 0; i < items.size(); i++) {
                     Data item = items.get(i);
                     String key = item.getField();
                     String value = item.getValue();
                     if (StringUtils.isEmpty(value)) value = "";
-                    if ("F".equals(item.getReadonly()) && StringUtils.isEmpty(value)) {
+                    if (("F".equals(item.getReadonly()) && StringUtils.isEmpty(value))
+                            ||( "necessaryField".equals(item.getReadonly())&&StringUtils.isEmpty(value))) {
                         ToastMessage(item.getName() + "不能为空！");
                         return;
                     }

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

@@ -220,7 +220,7 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
                     new Thread(new GetSaleData(String.valueOf(cur), "30", where))
                             .start();
                 }
-
+                
             }
 
             @Override
@@ -239,6 +239,7 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
                     new Thread(new GetSaleData(String.valueOf(cur), "30", where))
                             .start();
                 }
+                etSearch.setText("");
             }
         });
 

WeiChat/src/main/res/layout/activity_data_form_detail.xml

@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout  xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.form.DataFormDetailActivity">
     <ScrollView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
@@ -97,5 +93,5 @@
 
         </LinearLayout>
     </ScrollView>
-</LinearLayout>
+