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

# Conflicts:
#	WeiChat/version.properties

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Mon Oct 15 18:51:18 CST 2018
-debugName=921
+#Tue Oct 16 11:53:57 CST 2018
+debugName=926
 versionName=653
-debugCode=921
+debugCode=926
 versionCode=193

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

@@ -3,8 +3,6 @@ package com.modular.apputils.presenter;
 import android.content.Context;
 import android.content.Intent;
 import android.text.TextUtils;
-import android.util.Log;
-import android.util.SparseArray;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -14,12 +12,8 @@ import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
-import com.common.data.TextUtil;
-import com.common.ui.ImageUtil;
 import com.core.app.Constants;
-import com.core.app.MyApplication;
 import com.core.model.SelectBean;
-import com.core.net.http.ViewUtil;
 import com.core.utils.CommonUtil;
 import com.core.widget.view.Activity.SelectActivity;
 import com.lidroid.xutils.HttpUtils;
@@ -28,17 +22,13 @@ import com.lidroid.xutils.http.RequestParams;
 import com.lidroid.xutils.http.ResponseInfo;
 import com.lidroid.xutils.http.callback.RequestCallBack;
 import com.lidroid.xutils.http.client.HttpRequest;
-import com.me.network.app.http.HttpClient;
 import com.me.network.app.http.Method;
-import com.me.network.app.http.rx.Result2Listener;
-import com.me.network.app.http.rx.ResultSubscriber;
 import com.modular.apputils.R;
 import com.modular.apputils.listener.OnSmartHttpListener;
 import com.modular.apputils.model.BillGroupModel;
 import com.modular.apputils.network.Parameter;
 import com.modular.apputils.network.Tags;
 import com.modular.apputils.presenter.imp.IBill;
-import com.modular.apputils.utils.TestDataUtils;
 
 import java.io.File;
 import java.io.Serializable;
@@ -84,6 +74,10 @@ public class BillPresenter extends BaseNetPresenter implements OnSmartHttpListen
     public int getFormId() {
         return mId;
     }
+    
+    public void setmId(int mId) {
+        this.mId = mId;
+    }
 
     public String getStatusField() {
         return statusField;

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

@@ -68,6 +68,8 @@ public class BillInputBindActivity extends OABaseActivity implements IBill, Bill
     private String mListCondition;
     public int selectPosition = -1;//当前选择调转界面的index，本来不想添加全局变量的，没有办法
     private HashMap<String, String> dbFindCondition;
+    private String phone;
+    private String name;
 
     //TODO 重写方法实现自定义的 BillPresenter,必须继承于BillPresenter
     public BillPresenter newBillPresenter() {
@@ -117,6 +119,8 @@ public class BillInputBindActivity extends OABaseActivity implements IBill, Bill
         mBillPresenter.start(getIntent());
         if (getIntent() != null) {
             mListCondition = getIntent().getStringExtra(Constants.Intents.LIST_CONDITION);
+            phone=getIntent().getStringExtra("phone");
+            name=getIntent().getStringExtra("name");
         }
         if (TextUtils.isEmpty(mListCondition)) {
             mListCondition = "1=1";
@@ -196,7 +200,7 @@ public class BillInputBindActivity extends OABaseActivity implements IBill, Bill
             mBillAdapter.notifyDataSetChanged();
         }
 
-        updateItemsValue();
+        updateItemsValue(name,phone);
     }
 
 
@@ -489,50 +493,70 @@ public class BillInputBindActivity extends OABaseActivity implements IBill, Bill
     }
 
     protected void handlerSelectDbFind(JSONObject object, int groupId) {
-        LogUtil.d("Arison", "groupId:" + groupId + " object:" + object.toJSONString());
-        BillGroupModel mBillGroupModel = mBillAdapter.getBillGroupModel(groupId);
-        if (mBillGroupModel != null) {
-            if (!ListUtils.isEmpty(mBillGroupModel.getShowBillFields())) {
-                for (BillGroupModel.BillModel e : mBillGroupModel.getShowBillFields()) {
-                    if (object.containsKey(e.getField())) {
-                        e.setValue(JSONUtil.getText(object, e.getField()));
+        try {
+            mBillPresenter.setmId(Integer.valueOf(object.getString("cu_id")));
+            LogUtil.d("Arison", "groupId:" + groupId + " object:" + object.toJSONString());
+            BillGroupModel mBillGroupModel = mBillAdapter.getBillGroupModel(groupId);
+            if (mBillGroupModel != null) {
+                if (!ListUtils.isEmpty(mBillGroupModel.getShowBillFields())) {
+                    for (BillGroupModel.BillModel e : mBillGroupModel.getShowBillFields()) {
+                        if (object.containsKey(e.getField())) {
+                            e.setValue(JSONUtil.getText(object, e.getField()));
+                        }
                     }
                 }
-            }
-            if (!ListUtils.isEmpty(mBillGroupModel.getHideBillFields())) {
-                for (BillGroupModel.BillModel e : mBillGroupModel.getHideBillFields()) {
-                    if (object.containsKey(e.getField())) {
-                        e.setValue(JSONUtil.getText(object, e.getField()));
+                if (!ListUtils.isEmpty(mBillGroupModel.getHideBillFields())) {
+                    for (BillGroupModel.BillModel e : mBillGroupModel.getHideBillFields()) {
+                        if (object.containsKey(e.getField())) {
+                            e.setValue(JSONUtil.getText(object, e.getField()));
+                        }
                     }
                 }
             }
+            mBillAdapter.notifyDataSetChanged();
+        } catch (Exception e) {
+            e.printStackTrace();
         }
-        mBillAdapter.notifyDataSetChanged();
     }
 
 
 
 //    关联客户
-    protected void updateItemsValue() {
-        List<BillGroupModel>  groupModels=  mBillAdapter.getBillGroupModels();
-        if (groupModels.size()>2){
-            for (int i=2;i<groupModels.size();i++){
-                groupModels.remove(i);
+    protected void updateItemsValue(String name,String phone) {
+        try {
+            List<BillGroupModel>  groupModels=  mBillAdapter.getBillGroupModels();
+            if (groupModels.size()>2){
+                for (int i=2;i<groupModels.size();i++){
+                    groupModels.remove(i);
+                }
             }
-        }
-        BillGroupModel mBillGroupModel=groupModels.get(1);//第一个明细
-       LogUtil.d("arison","BillGroupModel:"+JSON.toJSONString(mBillGroupModel));
-        if (!ListUtils.isEmpty(mBillGroupModel.getShowBillFields())) {
-            for (BillGroupModel.BillModel e : mBillGroupModel.getShowBillFields()) {
-                if ("ct_name".equals(e.getField())) {
-                    e.setValue("刘杰");
+
+            BillGroupModel mBillGroupModel=groupModels.get(1);//第一个明细
+            LogUtil.d("arison","BillGroupModel:"+JSON.toJSONString(mBillGroupModel));
+            if (!ListUtils.isEmpty(mBillGroupModel.getShowBillFields())) {
+                for (BillGroupModel.BillModel e : mBillGroupModel.getShowBillFields()) {
+                    if ("ct_name".equals(e.getField())) {
+                        e.setValue(name);
+                    }
+                    if ("ct_mobile".equals(e.getField())) {
+                        e.setValue(phone);
+                    }
                 }
-                if ("ct_mobile".equals(e.getField())) {
-                    e.setValue("13266699268");
+    
+                for (BillGroupModel.BillModel e : mBillGroupModel.getHideBillFields()) {
+                    if ("ct_id".equals(e.getField())) {
+                        e.setValue("0");
+                    }
+                    //ct_cuid
+    //                if ("ct_mobile".equals(e.getField())) {
+    //                    e.setValue("13266699268");
+    //                }
                 }
             }
+
+            mBillAdapter.notifyDataSetChanged();
+        } catch (Exception e) {
+            e.printStackTrace();
         }
-        
-        mBillAdapter.notifyDataSetChanged();
     }
 }

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

@@ -223,11 +223,27 @@ public class ContactsDetialActivity extends BaseActivity implements OnItemsButto
       findViewById(R.id.tv_timeout).setOnClickListener(new View.OnClickListener() {
           @Override
           public void onClick(View view) {
+              if (!ListUtils.isEmpty(pData)){
+                  String phones = "";
+                  for (int i = 0; i < pData.size(); i++) {
+                      if (!StringUtil.isEmpty(pData.get(i).getValue())) {
+                          if (i == pData.size() - 1) {
+                              phones = phones + pData.get(i).getValue();
+                          } else {
+                              phones = phones + pData.get(i).getValue() + "/";
+                          }
+                      }else{
+                          ToastMessage("请输入手机号！");
+                          return;
+                      }
+                  }
+              }
               startActivity(new Intent(mContext,BillInputBindActivity.class)
                       .putExtra(com.core.app.Constants.Intents.CALLER, "Contact")
                       .putExtra(com.core.app.Constants.Intents.TITLE, "客户联系人")
+                      .putExtra("phone",pData.get(0).getValue())
+                      .putExtra("name",getEtName().getText().toString())
                       .putExtra(com.core.app.Constants.Intents.ID, 0));
-              ;
           }
       });