Merge branch 'release' of ssh://10.10.100.21/source/uu-android into feature_arison

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Sat Jul 20 17:37:53 CST 2019
+#Mon Aug 12 14:43:32 CST 2019
 debugName=972
-versionName=692
+versionName=694
 debugCode=972
-versionCode=247
+versionCode=249

app_modular/appmessages/src/main/java/com/modular/appmessages/activity/ApprovalActivity.java

@@ -104,6 +104,7 @@ public class ApprovalActivity extends BaseActivity implements IApproval, Approva
         getMenuInflater().inflate(R.menu.menu_aproval_set, menu);
         MenuItem item = menu.getItem(1);
         item.setTitle("返回旧版");
+        item.setVisible(false);
         boolean hiteAble = !PreferenceUtils.getBoolean(AppConfig.IS_ADMIN, false);
         if (hiteAble) {
             MenuItem setItem = menu.getItem(0);
@@ -240,7 +241,7 @@ public class ApprovalActivity extends BaseActivity implements IApproval, Approva
                 @Override
                 public void run() {
                     int top = StatusBarUtil.getStatusBarHeight(ct);
-                    mRootLL.invalidate(0, 0, mRootLL.getMeasuredWidth(), mRootLL.getMeasuredHeight() +top);
+                    mRootLL.invalidate(0, 0, mRootLL.getMeasuredWidth(), mRootLL.getMeasuredHeight() + top);
                     mRootLL.setTranslationY(-top);
                 }
             });

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/DeviceDataFormAddActivity.java

@@ -1077,9 +1077,12 @@ public class DeviceDataFormAddActivity extends SupportToolBarActivity implements
                         }
                     }
                     LogUtil.d(str.toString());
-
-                    Toast.makeText(ct, "下拉项：" + datas.get(id - 1).getName() + "返回值：" + str.toString(), Toast.LENGTH_LONG).show();
-                    mAdapter.notifyDataSetChanged();
+                    try {
+                        mAdapter.getmListData().get(currentGroupId).getDatas().get(id - 1).setValue(str.toString());
+                        mAdapter.notifyDataSetChanged();
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
 //                    mHandler.postDelayed(new Runnable() {
 //                        @Override
 //                        public void run() {
@@ -2473,7 +2476,7 @@ public class DeviceDataFormAddActivity extends SupportToolBarActivity implements
                                 param.put("page", "1");
                                 param.put("which", "form");
                                 param.put("condition", "1=1");
-                                param.put("pageSize", "30");
+                                param.put("pageSize", "1000");
                                 param.put("field", data.getField());
                                 Bundle bundle = new Bundle();
                                 bundle.putSerializable("param", param);
@@ -2484,6 +2487,7 @@ public class DeviceDataFormAddActivity extends SupportToolBarActivity implements
                                 } else {
                                     intent.putExtra("isSingle", false);
                                 }
+                                currentGroupId = data.getGroupId();
 
                                 intent.putExtra("reid", R.style.OAThemeMeet);
                                 intent.putExtras(bundle);
@@ -2524,7 +2528,7 @@ public class DeviceDataFormAddActivity extends SupportToolBarActivity implements
                                     }
                                     param.put("page", "1");
                                     param.put("condition", "1=1");
-                                    param.put("pageSize", "30");
+                                    param.put("pageSize", "1000");
                                     param.put("field", data.getField());
                                     Bundle bundle = new Bundle();
                                     bundle.putSerializable("param", param);

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

@@ -281,7 +281,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
             if ("FeePlease!FYBX".equals(mCaller)) {
                 mTitle = getString(R.string.Expense_reimbursement);
             }
-            if (StringUtil.isEmpty(mTitle)){
+            if (StringUtil.isEmpty(mTitle)) {
                 mTitle = intent.getStringExtra("title");
             }
             setTitle(mTitle + getString(R.string.doc_detail));
@@ -291,11 +291,10 @@ public class CommonDocDetailsActivity extends BaseActivity {
             Map<String, Object> param_am = new HashMap<>();
             param_am.put("caller", mCaller);
             param_am.put("id", mkeyValue);
+            param_am.put("isprocess", 1);
             LinkedHashMap headers_am = new LinkedHashMap();
             headers_am.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(getApplicationContext(), "sessionId"));
             ViewUtil.httpSendRequest(getApplicationContext(), docmsg_url, param_am, mHandler, headers_am, COMMON_DOC_MSG_REQUEST, null, null, "post");
-
-
         } else {
             appflow_lv.setVisibility(View.GONE);
             hide_above_af.setVisibility(View.GONE);
@@ -319,7 +318,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        if (!"FeePlease!FYBX".equals(mCaller) && !device&&!form_new_bill) {
+        if (!"FeePlease!FYBX".equals(mCaller) && !device && !form_new_bill) {
             getMenuInflater().inflate(R.menu.menu_common_docdetails, menu);
             MenuItem item = menu.getItem(0);
             String title = null;
@@ -346,15 +345,16 @@ public class CommonDocDetailsActivity extends BaseActivity {
             finish();
         }
         if (item.getItemId() == android.R.id.home) {
-           if(back_normal){
-               onBackPressed();
-           } if (message) {
+            if (back_normal) {
+                onBackPressed();
+            }
+            if (message) {
                 endMessage();
             } else if (device) {
                 endDevice();
-            } else if (form_new_bill){
+            } else if (form_new_bill) {
                 endNewBill();
-            }else {
+            } else {
                 if (ActivityUtils.isExsitMianActivity(mContext, FormListSelectActivity.class)) {
                     LogUtil.d("正常返回...");
                     onBackPressed();
@@ -427,13 +427,13 @@ public class CommonDocDetailsActivity extends BaseActivity {
                             String result = msg.getData().getString("result");
                             LogUtil.prinlnLongMsg("RESUBMITTED_message", result);
 //                            Toast.makeText(ct, "单据反提交成功", Toast.LENGTH_SHORT).show();
-                            if (form_new_bill){
+                            if (form_new_bill) {
                                 startActivity(new Intent(ct, CustomerBillInputActivity.class)
                                         .putExtra(Constants.Intents.CALLER, mCaller)
                                         .putExtra(Constants.Intents.TITLE, getToolBarTitle())
                                         .putExtra(Constants.Intents.MY_DOIT, true)
                                         .putExtra(Constants.Intents.ID, mkeyValue));
-                            }else{
+                            } else {
                                 startActivity(new Intent(CommonDocDetailsActivity.this, device ? DeviceDataFormAddActivity.class : DataFormDetailActivity.class)
                                         .putExtra("caller", mCaller)
                                         .putExtra("id", mkeyValue)
@@ -1026,7 +1026,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
             resubmit_ll.setOnClickListener(new View.OnClickListener() { // 重新提交
                 @Override
                 public void onClick(View v) {
-                    if ((device||form_new_bill) && StringUtil.getText(status_tv).equals(getString(R.string.status_pending))) {
+                    if ((device || form_new_bill) && StringUtil.getText(status_tv).equals(getString(R.string.status_pending))) {
                         reSubmit();
                     } else if (ListUtils.isEmpty(mCommonApprovalFlowBean.getProcesss())
                             && ListUtils.isEmpty(mCommonApprovalFlowBean.getNodes())
@@ -1245,6 +1245,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
                 .putExtra(Constants.Intents.CALLER, mCaller)
                 .putExtra(Constants.Intents.TITLE, getToolBarTitle()));
     }
+
     private void endDevice() {
         String dc_class = null;
         if (mCaller.equals("DeviceChange!Use")) {

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

@@ -1336,7 +1336,7 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                                 param.put("page", "1");
                                 param.put("which", "form");
                                 param.put("condition", "1=1");
-                                param.put("pageSize", "30");
+                                param.put("pageSize", "1000");
                                 param.put("field", data.getField());
                                 Bundle bundle = new Bundle();
                                 bundle.putSerializable("param", param);
@@ -1348,6 +1348,7 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                                     intent.putExtra("isSingle", false);
                                 }
 
+                                currentGroupId = data.getGroupId();
                                 intent.putExtra("reid", R.style.OAThemeMeet);
                                 intent.putExtras(bundle);
                                 intent.putExtra("key", "combdatas");
@@ -1387,7 +1388,7 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                                     }
                                     param.put("page", "1");
                                     param.put("condition", "1=1");
-                                    param.put("pageSize", "30");
+                                    param.put("pageSize", "1000");
                                     param.put("field", data.getField());
                                     Bundle bundle = new Bundle();
                                     bundle.putSerializable("param", param);
@@ -1669,14 +1670,18 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                             if (i == (muliData.size() - 1)) {
                                 str.append(muliData.get(i).getName());
                             } else {
-                                str.append(muliData.get(i).getName() + ",");
+                                str.append(muliData.get(i).getName() + "#");
                             }
 
                         }
                     }
                     LogUtil.d(str.toString());
-//                    Toast.makeText(ct, "下拉项：" + datas.get(id - 1).getName() + "返回值：" + str.toString(), Toast.LENGTH_LONG).show();
-                    mAdapter.notifyDataSetChanged();
+                    try {
+                        mAdapter.getmListData().get(currentGroupId).getDatas().get(id - 1).setValue(str.toString());
+                        mAdapter.notifyDataSetChanged();
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
                 }
                 break;
             case 0x25:

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

@@ -1231,7 +1231,7 @@ public class TravelDataFormDetailActivity extends BaseActivity implements View.O
                                 param.put("page", "1");
                                 param.put("which", "form");
                                 param.put("condition", "1=1");
-                                param.put("pageSize", "30");
+                                param.put("pageSize", "1000");
                                 param.put("field", data.getField());
                                 Bundle bundle = new Bundle();
                                 bundle.putSerializable("param", param);
@@ -1242,6 +1242,7 @@ public class TravelDataFormDetailActivity extends BaseActivity implements View.O
                                 } else {
                                     intent.putExtra("isSingle", false);
                                 }
+                                currentGroupId = data.getGroupId();
 
                                 intent.putExtra("reid", R.style.OAThemeMeet);
                                 intent.putExtras(bundle);
@@ -1282,7 +1283,7 @@ public class TravelDataFormDetailActivity extends BaseActivity implements View.O
                                     }
                                     param.put("page", "1");
                                     param.put("condition", "1=1");
-                                    param.put("pageSize", "30");
+                                    param.put("pageSize", "1000");
                                     param.put("field", data.getField());
                                     Bundle bundle = new Bundle();
                                     bundle.putSerializable("param", param);
@@ -1535,10 +1536,10 @@ public class TravelDataFormDetailActivity extends BaseActivity implements View.O
                                     sa_custaddress = i + 1;
                                 }
                             }
-                            if (sa_custname>0){
+                            if (sa_custname > 0) {
                                 mAdapter.getmListData().get(currentGroupId).getDatas().get(sa_custname - 1).setValue(cu_name);
                             }
-                            if (sa_custaddress>0){
+                            if (sa_custaddress > 0) {
                                 mAdapter.getmListData().get(currentGroupId).getDatas().get(sa_custaddress - 1).setValue(cu_address);
                             }
                             mAdapter.notifyDataSetChanged();
@@ -1554,19 +1555,21 @@ public class TravelDataFormDetailActivity extends BaseActivity implements View.O
                     StringBuilder str = new StringBuilder("");
                     if (!ListUtils.isEmpty(muliData)) {
                         for (int i = 0; i < muliData.size(); i++) {
-                            LogUtil.d(muliData.get(i).getName());
                             if (i == (muliData.size() - 1)) {
                                 str.append(muliData.get(i).getName());
                             } else {
-                                str.append(muliData.get(i).getName() + ",");
+                                str.append(muliData.get(i).getName() + "#");
                             }
 
                         }
                     }
                     LogUtil.d(str.toString());
-
-                    Toast.makeText(ct, "下拉项：" + datas.get(id - 1).getName() + "返回值：" + str.toString(), Toast.LENGTH_LONG).show();
-                    mAdapter.notifyDataSetChanged();
+                    try {
+                        mAdapter.getmListData().get(currentGroupId).getDatas().get(id - 1).setValue(str.toString());
+                        mAdapter.notifyDataSetChanged();
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
 //                    mHandler.postDelayed(new Runnable() {
 //                        @Override
 //                        public void run() {

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

@@ -1291,7 +1291,7 @@ public class CommonDataFormActivity extends BaseActivity implements View.OnClick
                                     }
                                     param.put("page", "1");
                                     param.put("condition", "1=1");
-                                    param.put("pageSize", "30");
+                                    param.put("pageSize", "1000");
                                     param.put("field", data.getField());
                                     Bundle bundle = new Bundle();
                                     bundle.putSerializable("param", param);

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

@@ -1288,7 +1288,7 @@ public class WorkDataFormActivity extends BaseActivity implements View.OnClickLi
                                     }
                                     param.put("page", "1");
                                     param.put("condition", "1=1");
-                                    param.put("pageSize", "30");
+                                    param.put("pageSize", "1000");
                                     param.put("field", data.getField());
                                     Bundle bundle = new Bundle();
                                     bundle.putSerializable("param", param);

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

@@ -1263,7 +1263,7 @@ public class ContactDynamicAddActivity extends BaseActivity implements View.OnCl
                                 param.put("page", "1");
                                 param.put("which", "form");
                                 param.put("condition", "1=1");
-                                param.put("pageSize", "30");
+                                param.put("pageSize", "1000");
                                 param.put("field", data.getField());
                                 Bundle bundle = new Bundle();
                                 bundle.putSerializable("param", param);
@@ -1274,6 +1274,7 @@ public class ContactDynamicAddActivity extends BaseActivity implements View.OnCl
                                 } else {
                                     intent.putExtra("isSingle", false);
                                 }
+                                currentGroupId = data.getGroupId();
 
                                 intent.putExtra("reid", R.style.OAThemeMeet);
                                 intent.putExtras(bundle);
@@ -1314,7 +1315,7 @@ public class ContactDynamicAddActivity extends BaseActivity implements View.OnCl
                                     }
                                     param.put("page", "1");
                                     param.put("condition", "1=1");
-                                    param.put("pageSize", "30");
+                                    param.put("pageSize", "1000");
                                     param.put("field", data.getField());
                                     Bundle bundle = new Bundle();
                                     bundle.putSerializable("param", param);
@@ -1602,8 +1603,12 @@ public class ContactDynamicAddActivity extends BaseActivity implements View.OnCl
                         }
                     }
                     LogUtil.d(str.toString());
-//                    Toast.makeText(ct, "下拉项：" + datas.get(id - 1).getName() + "返回值：" + str.toString(), Toast.LENGTH_LONG).show();
-                    mAdapter.notifyDataSetChanged();
+                    try {
+                        mAdapter.getmListData().get(currentGroupId).getDatas().get(id - 1).setValue(str.toString());
+                        mAdapter.notifyDataSetChanged();
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
                 }
                 break;
             case 0x25: