产城服务通用表单

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/WorkMenuParentAdapter.java

@@ -10,7 +10,6 @@ import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.TextView;
 
-import com.common.LogUtil;
 import com.common.data.StringUtil;
 import com.common.preferences.PreferenceUtils;
 import com.core.api.wxapi.ApiPlatform;
@@ -105,15 +104,14 @@ public class WorkMenuParentAdapter extends BaseAdapter {
                 try {
                     String menuActivity = typeListBeen.get(position).getMenuActivity();
                     String menuIcon = typeListBeen.get(position).getMenuIcon();
+                    String caller = typeListBeen.get(position).getCaller();
 
                     if ("com.modular.work.WorkFuncSetActivity".equals(menuActivity)) {
                         if (mOnAddFuncClickListener != null) {
                             mOnAddFuncClickListener.onAddFuncClick(view, position);
                         }
                     } else {
-                        LogUtil.d(TAG, "menuActivity:" + menuActivity);
-//                        Intent intent = getWorkIntent(menuActivity, menuIcon);
-                        Intent intent = new Intent("com.modular.work.CommonDataFormActivity");
+                        Intent intent = getWorkIntent(menuActivity, menuIcon, caller);
                         context.startActivity(intent);
                     }
                 } catch (Exception e) {
@@ -126,7 +124,7 @@ public class WorkMenuParentAdapter extends BaseAdapter {
 
     private static final String TAG = "WorkMenuParentAdapter";
 
-    private Intent getWorkIntent(String menuActivity, String menuIcon) {
+    private Intent getWorkIntent(String menuActivity, String menuIcon, String caller) {
         Intent intent = new Intent(menuActivity);
 
         switch (menuActivity) {
@@ -209,6 +207,9 @@ public class WorkMenuParentAdapter extends BaseAdapter {
                     intent.putExtra("p", context.getString(R.string.work_business_find));
                 }
                 break;
+            case "com.modular.work.CommonDataFormActivity":
+                intent.putExtra("serve_id", caller);
+                break;
             default:
                 break;
         }

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Sat Nov 18 18:46:27 CST 2017
+#Mon Nov 20 10:33:40 CST 2017
 debugName=1
 versionName=618
-debugCode=17
+debugCode=21
 versionCode=118

app_modular/appworks/src/main/java/com/uas/appworks/activity/CommonDataFormActivity.java

@@ -78,9 +78,7 @@ import java.util.regex.Pattern;
  * @author：Arison on 2016/11/8
  */
 public class CommonDataFormActivity extends BaseActivity implements View.OnClickListener {
-
-
-    private boolean isLeave = true;
+    boolean isLeave = true;
     private ListViewInScroller lv_datas;
     private TextView tv_item_add;
     private Button click_btn;
@@ -119,6 +117,8 @@ public class CommonDataFormActivity extends BaseActivity implements View.OnClick
     private int formGroupSize;
 
     private int va_id;
+    private String mServeId;
+
     private Handler mHandler = new Handler() {
 
         @Override
@@ -480,7 +480,7 @@ public class CommonDataFormActivity extends BaseActivity implements View.OnClick
                             va_id = JSON.parseObject(result).getIntValue("wod_id");
                         } else {
                             //rp_id
-                          //  va_id = JSON.parseObject(result).getIntValue(formidkey);
+                            //  va_id = JSON.parseObject(result).getIntValue(formidkey);
                             va_id = JSON.parseObject(result).getIntValue("rp_id");
                         }
                         if (success) {
@@ -633,6 +633,8 @@ public class CommonDataFormActivity extends BaseActivity implements View.OnClick
         initIds();
         formid = 0;
         if (intent != null) {
+            mServeId = intent.getStringExtra("serve_id");
+
             formid = intent.getIntExtra("id", 0);
             status = intent.getStringExtra("status");
             if (!StringUtil.isEmpty(intent.getStringExtra("caller"))) {
@@ -837,12 +839,12 @@ public class CommonDataFormActivity extends BaseActivity implements View.OnClick
             url = CommonUtil.getAppBaseUrl(ct) + "mobile/getformandgriddetail.action";
         }
         Map<String, Object> params = new HashMap<>();
-        params.put("serve_id", "75");
+        params.put("serve_id", mServeId);
         params.put("client_type", "cc");
-       // params.put("access_token", "123456");
+//        params.put("access_token", "123456");
 //        LinkedHashMap<String, Object> header = new LinkedHashMap<>();
 //        header.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
-       // params.put("sessionId", CommonUtil.getSharedPreferences(ct, "sessionId"));
+        // params.put("sessionId", CommonUtil.getSharedPreferences(ct, "sessionId"));
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
         ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, load_success, null, null, "get");
@@ -944,7 +946,7 @@ public class CommonDataFormActivity extends BaseActivity implements View.OnClick
         public HashMap<String, Object> isLastItem(int position) {
             HashMap<String, Object> results = new HashMap<>();
             boolean falg = false;
-            // 异常情况处理  
+            // 异常情况处理
             if (null == mListData || position < 0 || position > getCount()) {
                 return null;
             }
@@ -954,7 +956,7 @@ public class CommonDataFormActivity extends BaseActivity implements View.OnClick
                 int categoryIndex = position - categroyFirstIndex;
                 if (i == mListData.size() - 1) {
                     // 在当前分类中的索引值
-                    // item在当前分类内  
+                    // item在当前分类内
                     if (categoryIndex < size) {
                         if (categoryIndex == size - 1) {
                             results.put("categoryIndex", categoryIndex);
@@ -970,7 +972,7 @@ public class CommonDataFormActivity extends BaseActivity implements View.OnClick
                             return results;
                         }
                     }
-                    // 索引移动到当前分类结尾，即下一个分类第一个元素索引  
+                    // 索引移动到当前分类结尾，即下一个分类第一个元素索引
 
                 } else {
                     if (categoryIndex < size) {
@@ -2171,12 +2173,12 @@ public class CommonDataFormActivity extends BaseActivity implements View.OnClick
         }
         progressDialog.show();
         click_btn.setEnabled(false);
-        //  api/serve/save.action?data=?&operate_id=?&access_token=? 
+        //  api/serve/save.action?data=?&operate_id=?&access_token=?
         String url = null;
 //        if ("ExtraWork$".equals(caller)) {
 //            url = CommonUtil.getAppBaseUrl(ct) + "/mobile/oa/ExtraWorkSaveAndSubmit.action";
 //        } else {
-            url = CommonUtil.getAppBaseUrl(ct) + "/api/serve/save.action";
+        url = CommonUtil.getAppBaseUrl(ct) + "/api/serve/save.action";
 //        }
         Map<String, Object> params = new HashMap<>();
 //        params.put("caller", caller);

version.gradle

@@ -16,85 +16,85 @@ ext {
     ]
 
     depsVersion = [
-            junitVersion            : '4.12',
-            supportVersion          : '24.2.1',
-            multidex                : '1.0.1',
-            butterknifeVersion      : '8.2.1',
-            fastjsonVersion         : '1.2.24',
-            logVersion              : '1.15',
-            rxJavaVersion           : '1.1.8',
-            rxAndroidVersion        : '1.2.1',
-            okhttpVersion           : '3.4.1',
-            retrofitVersion         : '2.1.0',
-            stethoVersion           : '1.5.0',
-            glideVersion            : '3.8.0',
-            supertoastsVersion      : '2.0',
-            alerterVersion          : '1.0.6',
-            circleimageviewVersion  : '2.1.0',
-            systembartintVersion    : '1.0.3',
-            photoViewVersion        : '1.2.5',
-            leakcanaryVersion       : '1.5',
-            materialDialogsVersion  : '0.9.0.2',
-            stickyGridHeadersVersion: '1.0.1',
-            stickyListHeadersVersion: '2.7.0',
-            activityOnCrashVersion  : '1.5.0',
-            analyticsVersion        : 'latest.integration',
-            tagGroupVersion         : '1.4@aar',
-            jodatimeVersion         : '2.9.4',
-            gifVersion              : '1.2.8',
-            recyclerLib             : 'v1.0',
-            vlayoutVersion          : '1.2.1',
+            junitVersion                        : '4.12',
+            supportVersion                      : '24.2.1',
+            multidex                            : '1.0.1',
+            butterknifeVersion                  : '8.2.1',
+            fastjsonVersion                     : '1.2.24',
+            logVersion                          : '1.15',
+            rxJavaVersion                       : '1.1.8',
+            rxAndroidVersion                    : '1.2.1',
+            okhttpVersion                       : '3.4.1',
+            retrofitVersion                     : '2.1.0',
+            stethoVersion                       : '1.5.0',
+            glideVersion                        : '3.8.0',
+            supertoastsVersion                  : '2.0',
+            alerterVersion                      : '1.0.6',
+            circleimageviewVersion              : '2.1.0',
+            systembartintVersion                : '1.0.3',
+            photoViewVersion                    : '1.2.5',
+            leakcanaryVersion                   : '1.5',
+            materialDialogsVersion              : '0.9.0.2',
+            stickyGridHeadersVersion            : '1.0.1',
+            stickyListHeadersVersion            : '2.7.0',
+            activityOnCrashVersion              : '1.5.0',
+            analyticsVersion                    : 'latest.integration',
+            tagGroupVersion                     : '1.4@aar',
+            jodatimeVersion                     : '2.9.4',
+            gifVersion                          : '1.2.8',
+            recyclerLib                         : 'v1.0',
+            vlayoutVersion                      : '1.2.1',
             BaseRecyclerViewAdapterHelperVersion: '2.9.30',
-            addSubUtilsVersion      : '1.5.0'
+            addSubUtilsVersion                  : '1.5.0'
     ]
 
     deps = [
-            junit              : 'junit:junit:' + depsVersion.junitVersion,
-            appcompatV7        : 'com.android.support:appcompat-v7:' + depsVersion.supportVersion,
-            supportV4          : 'com.android.support:support-v4:' + depsVersion.supportVersion,
-            supportAnnotations : 'com.android.support:support-annotations:' + depsVersion.supportVersion,
-            design             : 'com.android.support:design:' + depsVersion.supportVersion,
-            gridlayoutV7       : 'com.android.support:gridlayout-v7:' + depsVersion.supportVersion,
-            recyclerviewV7     : 'com.android.support:recyclerview-v7:' + depsVersion.supportVersion,
-            cardviewV7         : 'com.android.support:cardview-v7:' + depsVersion.supportVersion,
-            multidex           : 'com.android.support:multidex:' + depsVersion.multidex,
+            junit                        : 'junit:junit:' + depsVersion.junitVersion,
+            appcompatV7                  : 'com.android.support:appcompat-v7:' + depsVersion.supportVersion,
+            supportV4                    : 'com.android.support:support-v4:' + depsVersion.supportVersion,
+            supportAnnotations           : 'com.android.support:support-annotations:' + depsVersion.supportVersion,
+            design                       : 'com.android.support:design:' + depsVersion.supportVersion,
+            gridlayoutV7                 : 'com.android.support:gridlayout-v7:' + depsVersion.supportVersion,
+            recyclerviewV7               : 'com.android.support:recyclerview-v7:' + depsVersion.supportVersion,
+            cardviewV7                   : 'com.android.support:cardview-v7:' + depsVersion.supportVersion,
+            multidex                     : 'com.android.support:multidex:' + depsVersion.multidex,
 
-            logger             : 'com.orhanobut:logger:' + depsVersion.logVersion,
-            fastjson           : 'com.alibaba:fastjson:' + depsVersion.fastjsonVersion,
-            stetho             : 'com.facebook.stetho:stetho:' + depsVersion.stethoVersion,
+            logger                       : 'com.orhanobut:logger:' + depsVersion.logVersion,
+            fastjson                     : 'com.alibaba:fastjson:' + depsVersion.fastjsonVersion,
+            stetho                       : 'com.facebook.stetho:stetho:' + depsVersion.stethoVersion,
 
-            butterknife        : 'com.jakewharton:butterknife:' + depsVersion.butterknifeVersion,
-            butterknifeCompiler: 'com.jakewharton:butterknife-compiler:' + depsVersion.butterknifeVersion,
-            rxjava             : 'io.reactivex:rxjava:' + depsVersion.rxJavaVersion,
-            rxandroid          : 'io.reactivex:rxandroid:' + depsVersion.rxAndroidVersion,
-            okhttp             : 'com.squareup.okhttp3:okhttp:' + depsVersion.okhttpVersion,
-            retrofit           : 'com.squareup.retrofit2:retrofit:' + depsVersion.retrofitVersion,
-            converterGson      : 'com.squareup.retrofit2:converter-gson:' + depsVersion.retrofitVersion,
-            adapterRxjava      : 'com.squareup.retrofit2:adapter-rxjava:' + depsVersion.retrofitVersion,
+            butterknife                  : 'com.jakewharton:butterknife:' + depsVersion.butterknifeVersion,
+            butterknifeCompiler          : 'com.jakewharton:butterknife-compiler:' + depsVersion.butterknifeVersion,
+            rxjava                       : 'io.reactivex:rxjava:' + depsVersion.rxJavaVersion,
+            rxandroid                    : 'io.reactivex:rxandroid:' + depsVersion.rxAndroidVersion,
+            okhttp                       : 'com.squareup.okhttp3:okhttp:' + depsVersion.okhttpVersion,
+            retrofit                     : 'com.squareup.retrofit2:retrofit:' + depsVersion.retrofitVersion,
+            converterGson                : 'com.squareup.retrofit2:converter-gson:' + depsVersion.retrofitVersion,
+            adapterRxjava                : 'com.squareup.retrofit2:adapter-rxjava:' + depsVersion.retrofitVersion,
 
-            glide              : 'com.github.bumptech.glide:glide:' + depsVersion.glideVersion,
+            glide                        : 'com.github.bumptech.glide:glide:' + depsVersion.glideVersion,
 
-            supertoasts        : 'com.github.johnpersano:supertoasts:' + depsVersion.supertoastsVersion,
-            alerter            : 'com.tapadoo.android:alerter:' + depsVersion.alerterVersion,
+            supertoasts                  : 'com.github.johnpersano:supertoasts:' + depsVersion.supertoastsVersion,
+            alerter                      : 'com.tapadoo.android:alerter:' + depsVersion.alerterVersion,
 
-            circleimageview    : 'de.hdodenhof:circleimageview:' + depsVersion.circleimageviewVersion,
-            systembartint      : 'com.readystatesoftware.systembartint:systembartint:' + depsVersion.systembartintVersion,
-            photoView          : 'com.commit451:PhotoView:' + depsVersion.photoViewVersion,
+            circleimageview              : 'de.hdodenhof:circleimageview:' + depsVersion.circleimageviewVersion,
+            systembartint                : 'com.readystatesoftware.systembartint:systembartint:' + depsVersion.systembartintVersion,
+            photoView                    : 'com.commit451:PhotoView:' + depsVersion.photoViewVersion,
 
-            tagGroup           : 'me.gujun.android.taggroup:library:' + depsVersion.tagGroupVersion,
-            analytics          : 'com.umeng.analytics:analytics:' + depsVersion.analyticsVersion,
-            activityOnCrash    : 'cat.ereza:customactivityoncrash:' + depsVersion.activityOnCrashVersion,
-            stickyListHeaders  : 'se.emilsjolander:stickylistheaders:' + depsVersion.stickyListHeadersVersion,
-            stickyGridHeaders  : 'com.github.TonicArtos:StickyGridHeaders:' + depsVersion.stickyGridHeadersVersion,
-            materialDialogs    : 'com.afollestad.material-dialogs:core:' + depsVersion.materialDialogsVersion,
-            leakcanary         : 'com.squareup.leakcanary:leakcanary-android:' + depsVersion.leakcanaryVersion,
-            leakcanaryNp       : 'com.squareup.leakcanary:leakcanary-android-no-op:' + depsVersion.leakcanaryVersion,
-            jodatime           : 'joda-time:joda-time:' + depsVersion.jodatimeVersion,
-            gif                : 'pl.droidsonroids.gif:android-gif-drawable:' + depsVersion.gifVersion,
-            recyclerLib        : 'com.gxut.ui:recyclerlibrary:' + depsVersion.recyclerLib,
-            vlayout            : 'com.alibaba.android:vlayout:' + depsVersion.vlayoutVersion,
+            tagGroup                     : 'me.gujun.android.taggroup:library:' + depsVersion.tagGroupVersion,
+            analytics                    : 'com.umeng.analytics:analytics:' + depsVersion.analyticsVersion,
+            activityOnCrash              : 'cat.ereza:customactivityoncrash:' + depsVersion.activityOnCrashVersion,
+            stickyListHeaders            : 'se.emilsjolander:stickylistheaders:' + depsVersion.stickyListHeadersVersion,
+            stickyGridHeaders            : 'com.github.TonicArtos:StickyGridHeaders:' + depsVersion.stickyGridHeadersVersion,
+            materialDialogs              : 'com.afollestad.material-dialogs:core:' + depsVersion.materialDialogsVersion,
+            leakcanary                   : 'com.squareup.leakcanary:leakcanary-android:' + depsVersion.leakcanaryVersion,
+            leakcanaryNp                 : 'com.squareup.leakcanary:leakcanary-android-no-op:' + depsVersion.leakcanaryVersion,
+            jodatime                     : 'joda-time:joda-time:' + depsVersion.jodatimeVersion,
+            gif                          : 'pl.droidsonroids.gif:android-gif-drawable:' + depsVersion.gifVersion,
+            recyclerLib                  : 'com.gxut.ui:recyclerlibrary:' + depsVersion.recyclerLib,
+            vlayout                      : 'com.alibaba.android:vlayout:' + depsVersion.vlayoutVersion,
             BaseRecyclerViewAdapterHelper: 'com.github.CymChad:BaseRecyclerViewAdapterHelper:' + depsVersion.BaseRecyclerViewAdapterHelperVersion,
-            addSubUtils        : 'com.mengfei:AddSubUtils:'+depsVersion.addSubUtilsVersion
+            addSubUtils                  : 'com.mengfei:AddSubUtils:' + depsVersion.addSubUtilsVersion
 
     ]
 }