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

WeiChat/build.gradle

@@ -4,7 +4,7 @@ apply plugin: 'com.getkeepsafe.dexcount'
 android {
     signingConfigs {
         config {
-            storeFile file('D:/config/applicationsignname[20150409]')
+            storeFile file('C:/CompanyProject/applicationsignname[20150409]')
             storePassword '13237658359'
             keyAlias 'jie-20150409'
             keyPassword '13237658359'

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/BusinessActivity.java

@@ -28,7 +28,6 @@ import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.adapter.HListViewAdapter;
 import com.xzjmyk.pm.activity.ui.erp.adapter.HListViewOneAdapter;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
@@ -46,6 +45,9 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+/**
+ * 商机页面
+ */
 public class BusinessActivity extends BaseActivity implements View.OnClickListener {
 
     private static final String TAG = "BusinessActivity";

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/BusinessDetailInfoActivity.java

@@ -3,9 +3,9 @@ package com.xzjmyk.pm.activity.ui.erp.activity.crm;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.drawable.BitmapDrawable;
+import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.os.Bundle;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -32,7 +32,6 @@ import com.xzjmyk.pm.activity.ui.erp.activity.DbfindListActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
-import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.util.DisplayUtil;
 
 import java.util.ArrayList;
@@ -361,6 +360,7 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
                     ToastMessage("商机释放成功！");
                     progressDialog.dismiss();
                     popupWindow.dismiss();
+                    jumpToStateActivity();
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     progressDialog.dismiss();
@@ -371,6 +371,12 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
         }
     };
 
+    private void jumpToStateActivity() {
+        Intent intent = new Intent();
+        intent.setClass(BusinessDetailInfoActivity.this,BusinessStateActivity.class);
+        startActivity(intent);
+    }
+
     private void sendHttpResquest(int what, String formCondition, String gridCondition) {
         progressDialog.show();
         String url = Constants.getAppBaseUrl(ct) + "mobile/common/getPanel.action";

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/BusinessLessActivity.java

@@ -1,10 +1,9 @@
 package com.xzjmyk.pm.activity.ui.erp.activity.crm;
 
 import android.content.Intent;
+import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.support.v7.app.AppCompatActivity;
-import android.os.Bundle;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -130,7 +129,8 @@ public class BusinessLessActivity extends BaseActivity implements View.OnClickLi
                 case Constants.HTTP_SUCCESS_INIT:
                     progressDialog.dismiss();
                     Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
-                    ViewUtil.ToastMessage(ct,"操作成功！");
+                    ViewUtil.ToastMessage(ct, "操作成功！");
+                    jumpToStateActivity();
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     progressDialog.dismiss();
@@ -148,6 +148,12 @@ public class BusinessLessActivity extends BaseActivity implements View.OnClickLi
         }
     };
 
+    private void jumpToStateActivity() {
+        Intent intent = new Intent();
+        intent.setClass(BusinessLessActivity.this, BusinessStateActivity.class);
+        startActivity(intent);
+    }
+
     private void sendHttpResquest(int what,String type){
         progressDialog.show();
         String remark=et_remark.getText().toString();

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/BusinessSelectCustomerActivity.java

@@ -1,6 +1,7 @@
 package com.xzjmyk.pm.activity.ui.erp.activity.crm;
 
 import android.content.Context;
+import android.content.Intent;
 import android.os.Handler;
 import android.os.Message;
 import android.os.Bundle;
@@ -213,6 +214,7 @@ public class BusinessSelectCustomerActivity extends BaseActivity {
                     progressDialog.dismiss();
                     Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
                     ToastMessage("操作成功！");
+                    jumpToStateActivity();
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     progressDialog.dismiss();
@@ -223,6 +225,12 @@ public class BusinessSelectCustomerActivity extends BaseActivity {
         }
     };
 
+    private void jumpToStateActivity() {
+        Intent intent = new Intent();
+        intent.setClass(BusinessSelectCustomerActivity.this, BusinessStateActivity.class);
+        startActivity(intent);
+    }
+
     private void sendHttpResquest(int what,String code){
         progressDialog.show();
         String url= Constants.getAppBaseUrl(ct)+"mobile/crm/getCustomerbySeller.action";

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/BusinessStateActivity.java

@@ -42,6 +42,9 @@ import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+/**
+ * 商机跟进页面
+ */
 public class BusinessStateActivity extends BaseActivity implements View.OnClickListener{
     private BussinessDetailAdapter mAdapter;
     @ViewInject(R.id.ll_top_state)

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/BusinessTransferActivity.java

@@ -2,10 +2,9 @@ package com.xzjmyk.pm.activity.ui.erp.activity.crm;
 
 import android.content.Context;
 import android.content.Intent;
+import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.support.v7.app.AppCompatActivity;
-import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -14,7 +13,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
-import android.widget.Button;
 import android.widget.ListView;
 import android.widget.TextView;
 
@@ -224,7 +222,7 @@ public class BusinessTransferActivity extends BaseActivity {
                     break;
                 case BUSSINE_TRANSFER:
                     progressDialog.dismiss();
-                    ToastMessage("转移成功！");
+                    jumpToStateActivity();
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     progressDialog.dismiss();
@@ -235,6 +233,13 @@ public class BusinessTransferActivity extends BaseActivity {
         }
     };
 
+    private void jumpToStateActivity() {
+        ToastMessage("转移成功！");
+        Intent intent = new Intent();
+        intent.setClass(BusinessTransferActivity.this, BusinessStateActivity.class);
+        startActivity(intent);
+    }
+
     private void sendHttpResquest(int what){
         progressDialog.show();
         String url= Constants.getAppBaseUrl(ct)+"/mobile/crm/getBusinessChanceCombo.action";

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/CustomerAddActivity.java

@@ -157,14 +157,14 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
     private void saveData() {
         String formStore = "";
         if (type == 1) {
-            if (et_cu_code.testValidity() || et_cu_name.testValidity()
-                    || tv_cu_address.testValidity() || et_cu_kind.testValidity()
-                    || et_cu_district.testValidity() || et_cu_kind.testValidity()
-                    || et_cu_payments.testValidity() || et_cu_sellername.testValidity()
-                    || tv_cu_contact.testValidity() || tv_cu_degree.testValidity()
-                    || tv_cu_mobile.testValidity() || tv_cu_email.testValidity()
-                    || tv_cu_businesscode.testValidity() || tv_cu_currency.testValidity()
-                    || tv_cu_taxrate.testValidity() || tv_cu_nichestep.testValidity()) {
+            if (et_cu_code.testValidity() && et_cu_name.testValidity()
+                    && tv_cu_address.testValidity() && et_cu_kind.testValidity()
+                    && et_cu_district.testValidity() && et_cu_kind.testValidity()
+                    && et_cu_payments.testValidity() && et_cu_sellername.testValidity()
+                    && tv_cu_contact.testValidity() && tv_cu_degree.testValidity()
+                    && tv_cu_mobile.testValidity() && tv_cu_email.testValidity()
+                    && tv_cu_businesscode.testValidity() && tv_cu_currency.testValidity()
+                    && tv_cu_taxrate.testValidity() && tv_cu_nichestep.testValidity()) {
                 formStore = "{\n" +
                         " \"cu_code\":\"" + et_cu_code.getText().toString() + "\",\n" +
                         " \"cu_name\":\"" + et_cu_name.getText().toString() + "\",\n" +
@@ -188,12 +188,12 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
                 return;
             }
         } else {
-            if (et_cu_code.testValidity() || et_cu_name.testValidity()
-                    || tv_cu_address.testValidity() || et_cu_kind.testValidity()
-                    || et_cu_district.testValidity() || et_cu_kind.testValidity()
-                    || et_cu_payments.testValidity() || et_cu_sellername.testValidity()
-                    || tv_cu_contact.testValidity() || tv_cu_degree.testValidity()
-                    || tv_cu_mobile.testValidity() || tv_cu_email.testValidity()) {
+            if (et_cu_code.testValidity() && et_cu_name.testValidity()
+                    && tv_cu_address.testValidity() && et_cu_kind.testValidity()
+                    && et_cu_district.testValidity() && et_cu_kind.testValidity()
+                    && et_cu_payments.testValidity() && et_cu_sellername.testValidity()
+                    && tv_cu_contact.testValidity() && tv_cu_degree.testValidity()
+                    && tv_cu_mobile.testValidity() && tv_cu_email.testValidity()) {
                 formStore = "{\n" +
                         " \"cu_code\":\"" + et_cu_code.getText().toString() + "\",\n" +
                         " \"cu_name\":\"" + et_cu_name.getText().toString() + "\",\n" +
@@ -231,6 +231,7 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
                     progressDialog.dismiss();
                     Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
                     ToastMessage("录入成功！");
+                    jumpToStateActivity();
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     progressDialog.dismiss();
@@ -296,6 +297,12 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
         }
     };
 
+    private void jumpToStateActivity() {
+        Intent intent = new Intent();
+        intent.setClass(CustomerAddActivity.this, BusinessStateActivity.class);
+        startActivity(intent);
+    }
+
     private SingleDialog singleDialog;
 
     public void showSimpleDialog(final FormEditText et, String title) {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/CustomerListActivity.java

@@ -36,7 +36,6 @@ import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.util.DisplayUtil;
-import com.xzjmyk.pm.activity.view.crouton.Crouton;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -231,6 +230,17 @@ public class CustomerListActivity extends BaseActivity  implements View.OnClickL
             holder.tv_datetv.setText("最后跟进时间:");
             holder.tv_leader.setText(mdata.getJSONObject(position).getString("cu_contact"));
             holder.tv_code.setText(mdata.getJSONObject(position).getString("cu_code"));
+            if (type == 0){
+                holder.tv_state.setText("未成交");
+            }else if (type == 1){
+                holder.tv_state.setText("已成交");
+            }else if (type == 2){
+                if (position <= (unEndSize -1)){
+                    holder.tv_state.setText("未成交");
+                }else {
+                    holder.tv_state.setText("已成交");
+                }
+            }
             return convertView;
         }
 
@@ -328,7 +338,7 @@ public class CustomerListActivity extends BaseActivity  implements View.OnClickL
         return list;
     }
     JSONArray jsonArray=new JSONArray();
-
+    private int unEndSize = -1;
     private Handler mHandler=new Handler(){
         @Override
         public void handleMessage(Message msg) {
@@ -340,6 +350,7 @@ public class CustomerListActivity extends BaseActivity  implements View.OnClickL
                     JSONArray json1= JSON.parseObject(msg.getData().getString("result")).getJSONArray("customers1");
                    if (json0!=null&&json1!=null) {
                        int unEnd=json0.size();
+                       unEndSize = json0.size();
                        int end=json1.size();
                        int total=json.size();
                        CommonUtil.textSpanForStyle(tv_count_unend,unEnd+"\n未成交",String.valueOf(unEnd),

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/CustomerListSelectActivity.java

@@ -9,13 +9,10 @@ import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.Log;
 import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
-import android.widget.Button;
 import android.widget.Filter;
 import android.widget.Filterable;
 import android.widget.ListView;
@@ -85,7 +82,8 @@ public class CustomerListSelectActivity extends BaseActivity {
         mlist.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                startActivity(new Intent(ct, CustomerDetailActivity.class));
+                BussinessDetailAdapter.ViewHolder viewHolder= (BussinessDetailAdapter.ViewHolder) view.getTag();
+                startActivity(new Intent(ct, CustomerDetailActivity.class).putExtra("code",viewHolder.tv_code.getText().toString()));
             }
         });
         search_edit.addTextChangedListener(new TextWatcher() {
@@ -158,6 +156,8 @@ public class CustomerListSelectActivity extends BaseActivity {
                 holder.tv_datetv = (TextView) convertView.findViewById(R.id.tv_crm_business_datetv);
                 holder.tv_step = (TextView) convertView.findViewById(R.id.tv_cu_step);
                 holder.tv_code=(TextView)convertView.findViewById(R.id.tv_cu_code);
+
+                holder.tv_state.setVisibility(View.GONE);
                 convertView.setTag(holder);
             } else {
                 holder = (ViewHolder) convertView.getTag();

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/VisitReportAddActivity.java

@@ -36,6 +36,9 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+/**
+ * 拜访报告页面
+ */
 public class VisitReportAddActivity extends BaseActivity implements View.OnClickListener {
 
     @ViewInject(R.id.tv_address_login)
@@ -55,6 +58,10 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
     private FormEditText tv_date_end;
     @ViewInject(R.id.tv_visit_theme)
     private FormEditText tv_visit_theme;
+    @ViewInject(R.id.tv_visit_steps)
+    private FormEditText tv_visit_steps;
+    @ViewInject(R.id.tv_visit_content)
+    private FormEditText tv_visit_content;
 //    @ViewInject(R.id.tv_notes_login)
 //    private FormEditText tv_notes_login;
 
@@ -153,42 +160,51 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
     };
 
     private void sendHttpResquest(int what) {
+        String formStore = "";
+        if (tv_date_start.testValidity() && tv_date_end.testValidity()
+                && tv_customer_login.testValidity() && tv_linksman_login.testValidity()
+                && tv_address_login.testValidity() && tv_visit_theme.testValidity()
+                && tv_visit_steps.testValidity() && tv_visit_content.testValidity()){
+            formStore =
+                    "{\n" +
+                            "\"vr_code\":\"" + tv_code
+                            + "\",\n" +
+                            "\"vr_visittime\":\""
+                            + tv_date_start.getText().toString() + //开始时间
+                            "\",\n" +
+                            "\"vr_visitplace\":\"" +
+                            tv_address_login.getText().toString() +
+                            "\",\n" +
+                            "\"vr_cuname\":\"" +
+                            tv_customer_login.getText().toString() +
+                            "\",\n" +
+                            "\"vr_cucontact\":\"" +
+                            tv_linksman_login.getText().toString() +
+                            "\",\n" +
+                            "\"vr_title\":\"" +
+                            tv_visit_theme.getText().toString() +//主题
+                            "\",\n" +
+                            "\"vr_nichestep\":\"" +
+                            tv_visit_steps.getText().toString() +
+                            "\",\n" +
+                            "\"vr_remark\":\"" +
+                            tv_visit_content.getText().toString() +
+                            "\",\n" +
+                            "\"vr_recorddate\":\"" +
+                            DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd") +
+                            "\",\n" +
+                            "\"vr_recorder\":\"" +
+                            CommonUtil.getSharedPreferences(ct, "erp_username") +
+                            "\",\n" +
+                            "\"vr_visitend\":\"" +
+                            tv_date_end.getText().toString() +//结束时间
+                            "\"\n" +
+                            "}";
+        }else {
+            return;
+        }
         progressDialog.show();
-        String formStore =
-                "{\n" +
-                        "\"vr_code\":\"" + tv_code
-                        + "\",\n" +
-                        "\"vr_visittime\":\""
-                        + tv_date_start.getText().toString() + //开始时间
-                        "\",\n" +
-                        "\"vr_visitplace\":\"" +
-                        tv_address_login.getText().toString() +
-                        "\",\n" +
-                        "\"vr_cuname\":\"" +
-                        tv_customer_login.getText().toString() +
-                        "\",\n" +
-                        "\"vr_cucontact\":\"" +
-                        tv_linksman_login.getText().toString() +
-                        "\",\n" +
-                        "\"vr_title\":\"" +
-                        tv_visit_theme.getText().toString() +//主题
-                        "\",\n" +
-                        "\"vr_nichestep\":\"" +
-                        "初次沟通" +
-                        "\",\n" +
-                        "\"vr_remark\":\"" +
-                        "" +
-                        "\",\n" +
-                        "\"vr_recorddate\":\"" +
-                        DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd") +
-                        "\",\n" +
-                        "\"vr_recorder\":\"" +
-                        CommonUtil.getSharedPreferences(ct, "erp_username") +
-                        "\",\n" +
-                        "\"vr_visitend\":\"" +
-                        tv_date_end.getText().toString() +//结束时间
-                        "\"\n" +
-                        "}";
+
         String url = Constants.getAppBaseUrl(ct) + "crm/customermgr/saveVisitRecord.action";
         Map<String, Object> params = new HashMap<>();
         params.put("formStore", formStore);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/VisitReportPlanActivity.java

@@ -151,50 +151,58 @@ public class VisitReportPlanActivity extends BaseActivity implements View.OnClic
     };
 
     private void sendHttpResquest(int what) {
+        String formStore = "";
+        if (tv_date_select.testValidity() && tv_date_end.testValidity()
+                && tv_customer_login.testValidity() && tv_linksman_login.testValidity()
+                && tv_address_login.testValidity() && tv_visit_theme.testValidity()){
+            formStore = "\n" +
+                    "{\n" +
+                    "\"vp_date\":\"" +DateFormatUtil.getStrDate4Date(new Date(),"yyyy-MM-dd")  +
+                    "\",\n" +
+                    "\"vp_code\":\"" + tv_code +
+                    "\",\n" +
+                    "\"vp_startdate\":\"" +
+                    tv_date_select.getText().toString() + " 00:00:00" +
+                    "\",\n" +
+                    "\"vp_enddate\":\"" +
+                    tv_date_end.getText().toString() + " 00:00:00" +
+                    "\",\n" +
+                    "\"vp_remark\":\"" +
+                    tv_visit_theme.getText().toString() +
+                    "\",\n" +
+                    "\"vp_custcode\":\"" +//客户编号
+                    vp_code +
+                    "\",\n" +
+                    "\"vp_custname\":\"" +//客户名称
+                    tv_customer_login.getText().toString() +
+                    "\",\n" +
+                    "\"vp_address\":\"" +
+                    tv_address_login.getText().toString() +
+                    "\",\n" +
+                    "\"vp_contact\":\"" +
+                    tv_linksman_login.getText().toString() +
+                    "\",\n" +
+                    "\"vp_visitman\":\"" +
+                    MyApplication.getInstance().mLoginUser.getNickName() +
+                    "\",\n" +
+                    "\"vp_recordman\":\"" +
+                    MyApplication.getInstance().mLoginUser.getNickName() +
+                    "\",\n" +
+                    "\"vp_status\":\"" +
+                    "未拜访" +
+                    "\",\n" +
+                    "\"vp_visitmancode\":\"" +
+                    CommonUtil.getSharedPreferences(ct, "erp_username") +
+                    "\",\n" +
+                    "\"vp_recordate\":\"" +
+                    DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd") +
+                    "\"\n" +
+                    "}";
+        }else {
+            return;
+        }
         progressDialog.show();
-        String formStore = "\n" +
-                "{\n" +
-                "\"vp_date\":\"" +DateFormatUtil.getStrDate4Date(new Date(),"yyyy-MM-dd")  +
-                "\",\n" +
-                "\"vp_code\":\"" + tv_code +
-                "\",\n" +
-                "\"vp_startdate\":\"" +
-                tv_date_select.getText().toString() + " 00:00:00" +
-                "\",\n" +
-                "\"vp_enddate\":\"" +
-                tv_date_end.getText().toString() + " 00:00:00" +
-                "\",\n" +
-                "\"vp_remark\":\"" +
-                tv_visit_theme.getText().toString() +
-                "\",\n" +
-                "\"vp_custcode\":\"" +//客户编号
-                vp_code +
-                "\",\n" +
-                "\"vp_custname\":\"" +//客户名称
-                tv_customer_login.getText().toString() +
-                "\",\n" +
-                "\"vp_address\":\"" +
-                tv_address_login.getText().toString() +
-                "\",\n" +
-                "\"vp_contact\":\"" +
-                tv_linksman_login.getText().toString() +
-                "\",\n" +
-                "\"vp_visitman\":\"" +
-                MyApplication.getInstance().mLoginUser.getNickName() +
-                "\",\n" +
-                "\"vp_recordman\":\"" +
-                MyApplication.getInstance().mLoginUser.getNickName() +
-                "\",\n" +
-                "\"vp_status\":\"" +
-                "未拜访" +
-                "\",\n" +
-                "\"vp_visitmancode\":\"" +
-                CommonUtil.getSharedPreferences(ct, "erp_username") +
-                "\",\n" +
-                "\"vp_recordate\":\"" +
-                DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd") +
-                "\"\n" +
-                "}";
+
         String url = Constants.getAppBaseUrl(ct) + "mobile/crm/saveVisitPlan.action";
         Map<String, Object> params = new HashMap<>();
         params.put("formStore", formStore);

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

@@ -34,7 +34,7 @@
                 <TextView
                     android:id="@+id/tv_leave_man"
                     style="@style/form_relative_left_text"
-                    android:text="商机编号："
+                    android:text="商机编号"
                     android:textColor="@color/text_main"
                     android:textSize="@dimen/text_main" />
 
@@ -55,7 +55,7 @@
                 <TextView
                     android:id="@+id/tv_leave_mankind"
                     style="@style/form_relative_left_text"
-                    android:text="商机名称："
+                    android:text="商机名称"
                     android:textColor="@color/text_main"
                     android:textSize="@dimen/text_main" />
                 <TextView
@@ -100,7 +100,7 @@
                 <TextView
                     android:id="@+id/tv_leave_category"
                     style="@style/form_relative_left_text"
-                    android:text="商机来源："
+                    android:text="商机来源"
                     android:textColor="@color/text_main"
                     android:textSize="@dimen/text_main" />
                 <TextView
@@ -125,7 +125,7 @@
                 <TextView
                     android:id="@+id/tv_leave_reason"
                     style="@style/form_relative_left_text"
-                    android:text="商机库："
+                    android:text="商机库"
                     android:textColor="@color/text_main"
                     android:textSize="@dimen/text_main" />
                 <TextView
@@ -152,7 +152,7 @@
                 <TextView
                     android:id="@+id/tv_iv_leave_days"
                     style="@style/form_relative_left_text"
-                    android:text="商机类型："
+                    android:text="商机类型"
                     android:textColor="@color/text_main"
                     android:textSize="@dimen/text_main" />
                 <TextView
@@ -187,7 +187,7 @@
                 <TextView
                     android:id="@+id/tv_set_"
                     style="@style/form_relative_left_text"
-                    android:text="当前阶段："
+                    android:text="当前阶段"
                     android:textColor="@color/text_main"
                     android:textSize="@dimen/text_main" />
                 <TextView
@@ -217,7 +217,7 @@
                 <TextView
                     android:id="@+id/id_tv1"
                     style="@style/form_relative_left_text"
-                    android:text="跟进人："
+                    android:text="跟进人"
                     android:textColor="@color/text_main"
                     android:textSize="@dimen/text_main" />
                 <TextView
@@ -242,7 +242,7 @@
 
                 <TextView
                     style="@style/form_relative_left_text"
-                    android:text="备注："
+                    android:text="备注"
                     android:textColor="@color/text_main"
                     android:textSize="@dimen/text_main" />
 
@@ -273,7 +273,7 @@
                 <TextView
 
                     style="@style/form_relative_left_text"
-                    android:text="企业名称："
+                    android:text="企业名称"
                     android:textColor="@color/text_main"
                     android:textSize="@dimen/text_main" />
 
@@ -312,7 +312,7 @@
                 <TextView
 
                     style="@style/form_relative_left_text"
-                    android:text="联系人："
+                    android:text="联系人"
                     android:textColor="@color/text_main"
                     android:textSize="@dimen/text_main" />
 
@@ -332,7 +332,7 @@
                 <TextView
                     android:id="@+id/tv_note_"
                     style="@style/form_relative_left_text"
-                    android:text="职位："
+                    android:text="职位"
                     android:textColor="@color/text_main"
                     android:textSize="@dimen/text_main" />
 
@@ -351,7 +351,7 @@
                 <TextView
                     android:id="@+id/tv_date_gh"
                     style="@style/form_relative_left_text"
-                    android:text="电话："
+                    android:text="电话"
                     android:textColor="@color/text_main"
                     android:textSize="@dimen/text_main" />
 

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

@@ -47,7 +47,7 @@
             <TextView
                 android:id="@+id/tv_c12"
                 style="@style/form_relative_left_text"
-                android:text="客户名称："
+                android:text="客户名称"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
 
@@ -74,7 +74,7 @@
             <TextView
                 android:id="@+id/tv_c11"
                 style="@style/form_relative_left_text"
-                android:text="简称："
+                android:text="简称"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
 
@@ -92,7 +92,7 @@
             <TextView
                 android:id="@+id/tv_c1"
                 style="@style/form_relative_left_text"
-                android:text="客户地址："
+                android:text="客户地址"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
 
@@ -107,7 +107,6 @@
                 android:id="@+id/tv_cu_address"
                 style="@style/form_relative_right_text"
                 android:hint="请输入"
-                editTextFormExample:customFormat="yyyy-MM-dd HH:mm"
                 editTextFormExample:testType="nocheck" />
         </RelativeLayout>
 
@@ -119,7 +118,7 @@
             <TextView
                 android:id="@+id/tv_c2"
                 style="@style/form_relative_left_text"
-                android:text="客户类型："
+                android:text="客户类型"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
 
@@ -149,7 +148,7 @@
             <TextView
                 android:id="@+id/tv_c3"
                 style="@style/form_relative_left_text"
-                android:text="所属地区："
+                android:text="所属地区"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
 
@@ -181,7 +180,7 @@
                 android:id="@+id/tv_c4"
                 style="@style/form_relative_left_text"
 
-                android:text="收款方式："
+                android:text="收款方式"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
 
@@ -212,7 +211,7 @@
             <TextView
                 android:id="@+id/tv_c5"
                 style="@style/form_relative_left_text"
-                android:text="业务员："
+                android:text="业务员"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
 
@@ -240,7 +239,7 @@
             <TextView
                 android:id="@+id/tv_c6"
                 style="@style/form_relative_left_text"
-                android:text="联系人："
+                android:text="联系人"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
 
@@ -267,7 +266,7 @@
             <TextView
                 android:id="@+id/tv_c7"
                 style="@style/form_relative_left_text"
-                android:text="岗位："
+                android:text="岗位"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
 
@@ -282,7 +281,6 @@
                 android:id="@+id/tv_cu_degree"
                 style="@style/form_relative_right_text"
                 android:hint="请输入"
-                editTextFormExample:customFormat="yyyy-MM-dd HH:mm"
                 editTextFormExample:testType="nocheck" />
         </RelativeLayout>
 
@@ -294,7 +292,7 @@
             <TextView
                 android:id="@+id/tv_c8"
                 style="@style/form_relative_left_text"
-                android:text="电话："
+                android:text="电话"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
 
@@ -309,7 +307,6 @@
                 android:id="@+id/tv_cu_mobile"
                 style="@style/form_relative_right_text"
                 android:hint="请输入"
-                editTextFormExample:customFormat="yyyy-MM-dd HH:mm"
                 editTextFormExample:testType="nocheck" />
         </RelativeLayout>
 
@@ -321,7 +318,7 @@
             <TextView
                 android:id="@+id/tv_c9"
                 style="@style/form_relative_left_text"
-                android:text="邮箱："
+                android:text="邮箱"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
 
@@ -336,7 +333,6 @@
                 android:id="@+id/tv_cu_email"
                 style="@style/form_relative_right_text"
                 android:hint="请输入"
-                editTextFormExample:customFormat="yyyy-MM-dd HH:mm"
                 editTextFormExample:testType="nocheck" />
 
         </RelativeLayout>
@@ -354,7 +350,7 @@
                 <TextView
                     android:id="@+id/tv_c14"
                     style="@style/form_relative_left_text"
-                    android:text="营业执照："
+                    android:text="营业执照"
                     android:textColor="@color/text_main"
                     android:textSize="@dimen/text_main" />
 
@@ -369,7 +365,6 @@
                     android:id="@+id/tv_cu_businesscode"
                     style="@style/form_relative_right_text"
                     android:hint="请输入"
-                    editTextFormExample:customFormat="yyyy-MM-dd HH:mm"
                     editTextFormExample:testType="nocheck" />
             </RelativeLayout>
 
@@ -380,7 +375,7 @@
                 <TextView
                     android:id="@+id/tv_c15"
                     style="@style/form_relative_left_text"
-                    android:text="币别："
+                    android:text="币别"
                     android:textColor="@color/text_main"
                     android:textSize="@dimen/text_main" />
 
@@ -396,7 +391,6 @@
                     style="@style/form_relative_right_text"
                     android:drawableRight="@drawable/nav_icon_search_default"
                     android:hint="请选择"
-                    editTextFormExample:customFormat="yyyy-MM-dd HH:mm"
                     editTextFormExample:testType="nocheck" />
             </RelativeLayout>
 
@@ -407,7 +401,7 @@
                 <TextView
                     android:id="@+id/tv_c16"
                     style="@style/form_relative_left_text"
-                    android:text="税率："
+                    android:text="税率"
                     android:textColor="@color/text_main"
                     android:textSize="@dimen/text_main" />
 
@@ -422,7 +416,6 @@
                     android:id="@+id/tv_cu_taxrate"
                     style="@style/form_relative_right_text"
                     android:hint="请输入"
-                    editTextFormExample:customFormat="yyyy-MM-dd HH:mm"
                     editTextFormExample:testType="nocheck" />
             </RelativeLayout>
 
@@ -433,7 +426,7 @@
                 <TextView
                     android:id="@+id/tv_c17"
                     style="@style/form_relative_left_text"
-                    android:text="当前阶段："
+                    android:text="当前阶段"
                     android:textColor="@color/text_main"
                     android:textSize="@dimen/text_main" />
 
@@ -449,7 +442,6 @@
                     style="@style/form_relative_right_text"
                     android:drawableRight="@drawable/nav_icon_search_default"
                     android:hint="请选择"
-                    editTextFormExample:customFormat="yyyy-MM-dd HH:mm"
                     editTextFormExample:testType="nocheck" />
             </RelativeLayout>
         </LinearLayout>
@@ -462,7 +454,7 @@
             <TextView
                 android:id="@+id/tv_c10"
                 style="@style/form_relative_left_text"
-                android:text="备注："
+                android:text="备注"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />