开始更改主界面ui界面-822

MPAndroidChart/src/main/java/com/github/mikephil/charting/charts/Chart.java

@@ -126,7 +126,7 @@ public abstract class Chart<T extends ChartData<? extends DataSet<? extends Entr
     protected OnChartValueSelectedListener mSelectionListener;
 
     /** text that is displayed when the chart is empty */
-    private String mNoDataText = "No chart data available.";
+    private String mNoDataText = "暂时没有数据.";
 
     /**
      * Gesture listener for custom callbacks when making gestures on the chart.

WeiChat/build.gradle

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

WeiChat/src/main/AndroidManifest.xml

@@ -433,6 +433,7 @@
             android:name=".ui.erp.activity.oa.OARegisterActivity"
             android:label="查看签到情况" />
         <activity android:name=".ui.erp.activity.crm.CustomerAddActivity"
+            android:theme="@style/CrmThemeBlue"
             android:configChanges="orientation|keyboardHidden"
             android:windowSoftInputMode="adjustUnspecified|stateHidden"/>
         <activity android:name=".ui.erp.activity.crm.CustomerDetailActivity" />
@@ -442,13 +443,18 @@
             android:name=".ui.erp.activity.crm.SalesRankingActivity"
             android:label="@string/title_activity_sales_ranking" />
         <activity android:name=".ui.erp.activity.crm.VisitReportAddActivity"
+            android:theme="@style/CrmThemeTask"
             android:configChanges="orientation|keyboardHidden"
             android:windowSoftInputMode="adjustUnspecified|stateHidden"/>
         <activity android:name=".ui.erp.activity.crm.TaskAddActivity"
             android:configChanges="orientation|keyboardHidden"
             android:windowSoftInputMode="adjustUnspecified|stateHidden"/>
-        <activity android:name=".ui.erp.activity.crm.VisitReportPlanActivity" />
+        <activity android:name=".ui.erp.activity.crm.VisitReportPlanActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:windowSoftInputMode="adjustUnspecified|stateHidden"
+           android:theme="@style/CrmThemeTask"/>
         <activity android:name=".ui.erp.activity.crm.BusinessAddActivity"
+            android:theme="@style/CrmThemeBlue"
             android:configChanges="orientation|keyboardHidden"
             android:windowSoftInputMode="adjustUnspecified|stateHidden"/>
         <activity android:name=".ui.erp.activity.crm.CustomerListSelectActivity" />

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

@@ -586,7 +586,7 @@ public class WorkExtraActivity extends BaseActivity implements OnClickListener {
         items.setWod_woid(va_id);//主表
         items.setWod_id(wo_id);//明细表
         items.setWod_empcode(CommonUtil.getSharedPreferences(ct, "erp_username"));
-        items.setWod_empname(CommonUtil.getSharedPreferences(ct, "erp_emname"));
+        items.setWod_empname(et_extra_company.getText().toString());
         //items.setWod_empcode(va_code);
         items.setWod_count(Integer.valueOf(et_extra_count.getText().toString()));
         items.setWod_type(et_extra_type.getText().toString());

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

@@ -3,6 +3,7 @@ package com.xzjmyk.pm.activity.ui.erp.activity.crm;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+import android.support.v7.widget.PopupMenu;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -21,11 +22,13 @@ 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.view.SingleDialog;
+import com.xzjmyk.pm.activity.util.DateFormatUtil;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.view.wheel.DatePicker;
 
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -45,18 +48,22 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
     private FormEditText et_business_name;
     @ViewInject(R.id.et_business_source)
     private FormEditText et_business_source;
-    @ViewInject(R.id.et_business_phone)
-    private FormEditText et_business_phone;
-    @ViewInject(R.id.et_business_createTime)
-    private FormEditText et_business_createTime;
+    //    @ViewInject(R.id.et_business_phone)
+//    private FormEditText et_business_phone;
     @ViewInject(R.id.et_business)
     private FormEditText et_business;
+
+
     @ViewInject(R.id.et_business_jieDuan)
     private FormEditText et_business_jieDuan;
-    @ViewInject(R.id.et_business_enterTime)
-    private FormEditText et_business_enterTime;
+    //    @ViewInject(R.id.et_business_enterTime)
+//    private FormEditText et_business_enterTime;
     @ViewInject(R.id.et_business_enterMan)
     private FormEditText et_business_enterMan;
+    @ViewInject(R.id.et_business_remark)
+    private FormEditText et_business_remark;
+    @ViewInject(R.id.et_business_type)
+    private FormEditText et_business_type;
     @ViewInject(R.id.et_company_name)
     private FormEditText et_company_name;
     @ViewInject(R.id.et_company_address)
@@ -68,6 +75,7 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
     @ViewInject(R.id.et_company_tele)
     private FormEditText et_company_tele;
 
+
     private List<String> lists = new ArrayList<String>();
 
     @Override
@@ -90,17 +98,18 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
         et_business_jieDuan.setKeyListener(null);
         et_business_source.setKeyListener(null);
         et_business_enterMan.setKeyListener(null);
-        
-        et_business_createTime.setOnClickListener(this);
-        et_business_enterTime.setOnClickListener(this);
-        et_business_createTime.setKeyListener(null);
-        et_business_enterTime.setKeyListener(null);
-        et_business_createTime.setFocusable(false);
-        et_business_enterTime.setFocusable(false);
-        
+
+        et_business_type.setOnClickListener(this);
+//        et_business_enterTime.setOnClickListener(this);
+        et_business_type.setKeyListener(null);
+//        et_business_enterTime.setKeyListener(null);
+        et_business_type.setFocusable(false);
+//        et_business_enterTime.setFocusable(false);
+
         et_business_no.setKeyListener(null);
         et_business_no.setFocusable(false);
     }
+
     private void initData() {
         getCodeByNet();
     }
@@ -108,6 +117,7 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
     private void initView() {
         ViewUtils.inject(this);
         getSupportActionBar().setTitle("新建商机");
+        et_business_enterMan.setText(MyApplication.getInstance().mLoginUser.getNickName());
     }
 
     @Override
@@ -128,12 +138,12 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
             case R.id.et_business_jieDuan:
                 loadJieDuan();
                 break;
-            case R.id.et_business_createTime:
-                showDateDialog((FormEditText) v.findViewById(R.id.et_business_createTime));
-                break;
-            case R.id.et_business_enterTime:
-                showDateDialog((FormEditText) v.findViewById(R.id.et_business_enterTime));
+            case R.id.et_business_type:
+                onPopupButtonClick(v);
                 break;
+//            case R.id.et_business_enterTime:
+//                showDateDialog((FormEditText) v.findViewById(R.id.et_business_enterTime));
+//                break;
         }
     }
 
@@ -148,7 +158,11 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case R.id.btn_save:
-                sendHttpResquest();
+                if (et_business_name.testValidity() && et_business_source.testValidity() &&
+                        et_business.testValidity() && et_business_type.testValidity()&&
+                        et_business_jieDuan.testValidity() && et_business_enterMan.testValidity()) {
+                    sendHttpResquest();
+                }
                 break;
             case android.R.id.home:
                 onBackPressed();
@@ -245,13 +259,14 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     progressDialog.dismiss();
                     Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
+                    ToastMessage(msg.getData().getString("result"));
                     break;
             }
         }
     };
 
 
-    private String getEditText(EditText et) {
+    private String getEditText(FormEditText et) {
         String temp = "";
         temp = et.getText().toString().trim();
         return temp;
@@ -268,39 +283,42 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
         String name = getEditText(et_business_name); //商机名称
         String from = getEditText(et_business_source); //商机来源
         String bt_tel = getEditText(et_company_tele); //电话（联系方式）
-        String bc_recorddate = getEditText(et_business_createTime); //创建时间
+//        String bc_recorddate = getEditText(et_business_createTime); //创建时间
         String bc_nichehouse = getEditText(et_business); //商机库
         String bc_currentprocess = getEditText(et_business_jieDuan); //当前阶段
         String bc_recorder = MyApplication.getInstance().mLoginUser.getNickName(); //创建人
         String bc_address = getEditText(et_company_address); //地址
-        String bc_lastdate = getEditText(et_business_enterTime); //最后跟进时间
+//        String bc_lastdate = getEditText(et_business_enterTime); //最后跟进时间
         String bc_custname = getEditText(et_company_name); //企业名称
         String bc_doman = getEditText(et_business_enterMan);//跟进人
         String bc_contact = getEditText(et_company_man); //联系人
-        String bc_remark = getEditText(et_business_source);//备注
+        String bc_remark = getEditText(et_business_remark);//备注
         String bc_position = getEditText(et_company_position); //职位
-        String bc_type = "私有";  //商机类型
-        String formStore = "{\n"+
-                "\"bc_code\":\"" + et_business_no.getText().toString() + "\",\n" +   //商机名称
-                "\"bc_status\":\"" + "在录入" + "\",\n" + 
-                "\"bc_domancode\":\"" + CommonUtil.getSharedPreferences(ct,"erp_username") + "\",\n" +
-                "\"bc_statuscode\":\"" + "ENTERING" + "\",\n" +
-                "\"bc_description\":\"" + name + "\",\n" +   //商机名称
-                "\"bc_from\":\"" + from + "\",\n" +          //商机来源
-                "\"bc_nichehouse\":\"" + bc_nichehouse + "\",\n" +      //商机库
-                "\"bc_currentprocess\":\"" + bc_currentprocess + "\",\n" +   //当前阶段
-                "\"bc_recorddate\":\"" + bc_recorddate + "\",\n" +   //创建时间
-                "\"bc_recorder\":\"" + bc_recorder + "\",\n" +   //创建人
-                "\"bc_lastdate\":\"" + bc_lastdate + "\",\n" +   //最后跟进时间
-                "\"bc_doman\":\"" + bc_doman + "\",\n" +   //跟进人
-                "\"bc_remark\":\"" + bc_remark + "\",\n" +   //备注
-                "\"bc_custname\":\"" + bc_custname + "\",\n" +   //企业名称
-                "\"bc_address\":\"" + bc_address + "\",\n" +   //地址
-                "\"bc_contact\":\"" + bc_contact + "\",\n" +   //联系人
-                "\"bc_position\":\"" + bc_position + "\",\n" +   //职位
-                "\"bt_tel\":\"" + bt_tel + "\",\n" +   //电话
-                "\"bc_type\":\"" + bc_type + "\"\n" +   //商机类型
-                "}";
+        String bc_type = getEditText(et_business_type);  //商机类型
+        String formStore =
+                "{\n" +
+                        "\"bc_code\":\"" + et_business_no.getText().toString() + "\",\n" +   //商机名称
+                        "\"bc_status\":\"" + "在录入" + "\",\n" +
+                        "\"bc_domancode\":\"" + CommonUtil.getSharedPreferences(ct, "erp_username") + "\",\n" +
+                        "\"bc_statuscode\":\"" + "ENTERING" + "\",\n" +
+                        "\"bc_description\":\"" + name + "\",\n" +   //商机名称
+                        "\"bc_from\":\"" + from + "\",\n" +          //商机来源
+                        "\"bc_nichehouse\":\"" + bc_nichehouse + "\",\n" +      //商机库
+                        "\"bc_currentprocess\":\"" + bc_currentprocess + "\",\n" +   //当前阶段
+                        "\"bc_recorddate\":\"" + DateFormatUtil.getStrDate4Date(new Date(),"yyyy-MM-dd")+ "\",\n" +   //创建时间
+                        "\"bc_recorder\":\"" + bc_recorder + "\",\n" +   //创建人
+                       "\"bc_lastdate\":\"" + DateFormatUtil.getStrDate4Date(new Date(),"yyyy-MM-dd") + "\",\n" +   //最后跟进时间
+                        "\"bc_doman\":\"" + bc_doman + "\",\n" +   //跟进人
+                        "\"bc_remark\":\"" + bc_remark + "\",\n" +   //备注
+                        "\"bc_custname\":\"" + bc_custname + "\",\n" +   //企业名称
+                        "\"bc_address\":\"" + bc_address + "\",\n" +   //地址
+                        "\"bc_contact\":\"" + bc_contact + "\",\n" +   //联系人
+                        "\"bc_position\":\"" + bc_position + "\",\n" +   //职位
+                        "\"bt_tel\":\"" + bt_tel + "\",\n" +   //电话
+                        "\"bc_type\":\"" + bc_type + "\",\n" +   //商机类型
+                     
+                        "}";
+        Log.i(TAG, "sendHttpResquest:" + formStore);
         params.put("formStore", formStore);
         params.put("caller", "BusinessChance");
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
@@ -404,7 +422,7 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
         }*/
     }
 
-    private void showDateDialog(final  FormEditText tv) {
+    private void showDateDialog(final FormEditText tv) {
         DatePicker picker = new DatePicker(this);
         picker.setRange(1950, 2030);
         picker.setSelectedItem(
@@ -414,11 +432,37 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
         picker.setOnDatePickListener(new DatePicker.OnYearMonthDayPickListener() {
             @Override
             public void onDatePicked(String year, String month, String day) {
-//                        ToastUtil.showToast(ct, year + "-" + month + "-" + day);
                 tv.setText(year + "-" + month + "-" + day);
             }
         });
         picker.show();
     }
 
+
+    PopupMenu popup = null;
+
+    public void onPopupButtonClick(View button) {
+        popup = new PopupMenu(this, button);
+        switch (button.getId()) {
+            case R.id.et_business_type:
+                getMenuInflater().inflate(R.menu.menu_business_type, popup.getMenu());
+                break;
+        }
+
+        popup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
+            @Override
+            public boolean onMenuItemClick(MenuItem item) {
+                switch (item.getItemId()) {
+                    case R.id.items_public:
+                        et_business_type.setText(item.getTitle());
+                        break;
+                    case R.id.items_private:
+                        et_business_type.setText(item.getTitle());
+                        break;
+                }
+                return true;
+            }
+        });
+        popup.show();
+    }
 }

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

@@ -340,7 +340,8 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
         String url = Constants.getAppBaseUrl(ct) + "mobile/common/getPanel.action";
         Map<String, Object> params = new HashMap<>();
         params.put("caller", "BusinessChance");
-        params.put("formCondition", "bc_id"+formCondition);
+        if (type==0)formCondition="bc_id"+formCondition;
+        params.put("formCondition", formCondition);
         params.put("gridCondition", gridCondition);
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));

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

@@ -113,33 +113,42 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
     @ViewInject(R.id.tv_sale_huikuan)
     private TextView tv_sale_huikuan;
 
-    @ViewInject(R.id.tv_em_name)
-    private TextView tv_em_name;
-    @ViewInject(R.id.tv_em_depart)
-    private TextView tv_em_depart;
-    @ViewInject(R.id.tv_em_plan)
-    private TextView tv_em_plan;
-    @ViewInject(R.id.tv_em_sale)
-    private TextView tv_em_sale;
-    @ViewInject(R.id.tv_em_planrirun)
-    private TextView tv_em_planrirun;
-    @ViewInject(R.id.tv_em_rirun)
-    private TextView tv_em_rirun;
-
+    @ViewInject(R.id.tv_em_a)
+    private TextView tv_em_a;
+    @ViewInject(R.id.tv_em_b)
+    private TextView tv_em_b;
+    @ViewInject(R.id.tv_em_c)
+    private TextView tv_em_c;
+
+    @ViewInject(R.id. tv_em_plana)
+    private TextView  tv_em_plana;
+    @ViewInject(R.id. tv_em_planb)
+    private TextView  tv_em_planb;
+    @ViewInject(R.id. tv_em_planc)
+    private TextView  tv_em_planc;
+
+    @ViewInject(R.id.tv_em_salea)
+    private TextView tv_em_salea;
+    @ViewInject(R.id.tv_em_saleb)
+    private TextView tv_em_saleb;
+    @ViewInject(R.id.tv_em_salec)
+    private TextView tv_em_salec;
+    
     @ViewInject(R.id.tv_cu_count)
     private TextView tv_cu_count;
     
     @ViewInject(R.id.ib_ranking_condition)
-    private ImageButton  ib_ranking_condition;
-    @ViewInject(R.id.ib_sale_condition)
-    private ImageButton ib_sale_condition;
+    private TextView  ib_ranking_condition;
+ 
     @ViewInject(R.id.ib_index_condition)
-    private ImageButton ib_index_condition;
-    @ViewInject(R.id.ib_em_condition)
-    private ImageButton ib_em_condition;
+    private TextView ib_index_condition;
+
 
     @ViewInject(R.id.crm_chart_bar)
     private BarChart mChart;
+    @ViewInject(R.id.crm_chart_sale)
+    private BarChart sChart;
+    
     private BarData data;
     private ArrayList<BarDataSet> dataSets;
     private MyMarkerView mv;
@@ -159,6 +168,7 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
     private void initView() {
         getSupportActionBar().setTitle("CRM");
         initBarChart();
+        initSaleBarChart();
         initListener();
     }
 
@@ -168,15 +178,16 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
         ib_waller.setOnClickListener(this);
         
         ib_customer_vistor.setOnClickListener(this);
-        ib_sale_condition.setOnClickListener(this);
+       
         ib_ranking_condition.setOnClickListener(this);
         ib_index_condition.setOnClickListener(this);
-        ib_em_condition.setOnClickListener(this);
+       
     }
 
     private void initData() {
         sendHttpResquest();
-        setData(5, 50);
+        setData(4, 50);
+        setData1(7, 50);
     }
 
     private void initBarChart() {
@@ -215,7 +226,7 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
         leftAxis.setSpaceTop(25f);
         leftAxis.setAxisLineColor(getResources().getColor(R.color.red));
         mChart.getAxisRight().setEnabled(false);
-        mChart.getAxisLeft().setEnabled(false);
+        mChart.getAxisLeft().setEnabled(true);
         mChart.setMaxVisibleValueCount(10);
         mChart.setOnChartValueSelectedListener(new OnChartValueSelectedListener() {
 
@@ -238,7 +249,72 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
         data = new BarData(xVals, dataSets);
         mChart.setNoDataText(" ");
         mChart.setData(data);
+        mChart.setNoDataText("暂时没有数据");
         mChart.invalidate();
+        
+    }
+    
+    private void initSaleBarChart(){
+        mv = new MyMarkerView(this, R.layout.custom_marker_view);
+        sChart.setMarkerView(mv);
+        sChart.setDescription("");
+        sChart.setMaxVisibleValueCount(60);
+        sChart.setPinchZoom(false);
+        sChart.setDrawBarShadow(false);
+        sChart.setDrawGridBackground(false);
+
+        XAxis xAxis = sChart.getXAxis();
+        xAxis.setPosition(XAxis.XAxisPosition.BOTTOM);
+        // xAxis.setSpaceBetweenLabels(30);
+        xAxis.setLabelsToSkip(0);
+        xAxis.setAxisLineColor(getResources().getColor(R.color.red));
+        xAxis.setSpaceBetweenLabels(8);
+        xAxis.setAxisLineWidth(0f);
+
+        xAxis.setDrawGridLines(false);
+        sChart.getAxisLeft().setDrawGridLines(false);
+        sChart.animateY(2500);
+        tf = Typeface.createFromAsset(getAssets(),
+                "OpenSans-Regular.ttf");
+        Legend l = sChart.getLegend();
+        l.setPosition(Legend.LegendPosition.BELOW_CHART_LEFT);
+        l.setTypeface(tf);
+
+        XAxis xl = sChart.getXAxis();
+        xl.setTypeface(tf);
+
+        YAxis leftAxis = sChart.getAxisLeft();
+        leftAxis.setTypeface(tf);
+        leftAxis.setValueFormatter(new LargeValueFormatter());
+        leftAxis.setDrawGridLines(false);
+        leftAxis.setSpaceTop(25f);
+        leftAxis.setAxisLineColor(getResources().getColor(R.color.red));
+        sChart.getAxisRight().setEnabled(false);
+        sChart.getAxisLeft().setEnabled(true);
+        sChart.setMaxVisibleValueCount(10);
+        sChart.setOnChartValueSelectedListener(new OnChartValueSelectedListener() {
+
+            @Override
+            public void onValueSelected(Entry e, int dataSetIndex, Highlight h) {
+            }
+
+            @Override
+            public void onNothingSelected() {
+
+            }
+        });
+        ArrayList<BarEntry> yVals1 = new ArrayList<BarEntry>();
+        ArrayList<String> xVals = new ArrayList<String>();
+
+        BarDataSet set1 = new BarDataSet(yVals1, "日销售额");
+        set1.setColor(Color.rgb(164, 228, 251));
+        dataSets = new ArrayList<BarDataSet>();
+        dataSets.add(set1);
+        data = new BarData(xVals, dataSets);
+        sChart.setNoDataText(" ");
+        sChart.setData(data);
+        sChart.setNoDataText("暂时没有数据");
+        sChart.invalidate();
     }
 
 
@@ -270,11 +346,13 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
 
 
     protected String[] mMonths = new String[]{
-            "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dec"
+            "实际销售额", "计划销售额", "实际毛利润", "计划毛利润", "May", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dec"
     };
-
+    protected String[] sales = new String[]{
+            "用户", "联系人", "客户", "商机数", "销售订单", "拜访客户数", "拜访数", "Aug", "Sep", "Okt", "Nov", "Dec"
+    };
+    
     private void setData(int count, float range) {
-
         ArrayList<String> xVals = new ArrayList<String>();
         for (int i = 0; i < count; i++) {
             xVals.add(mMonths[i % 12]);
@@ -288,7 +366,7 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
             yVals1.add(new BarEntry(val, i));
         }
         BarDataSet set1 = new BarDataSet(yVals1, "月销售额(单位:人民币 元)");
-        set1.setColors(ColorTemplate.VORDIPLOM_COLORS);
+        set1.setColors(ColorTemplate.JOYFUL_COLORS);
         //set1.setVisible(false);
         //set1.setDrawValues(false);
         dataSets.clear();
@@ -297,9 +375,38 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
         data = new BarData(xVals, dataSets);
         mChart.setData(data);
         mChart.invalidate();
-
+        
     }
 
+
+    private void setData1(int count, float range) {
+        ArrayList<String> xVals = new ArrayList<String>();
+        for (int i = 0; i < count; i++) {
+            xVals.add(sales[i % 12]);
+        }
+
+        ArrayList<BarEntry> yVals1 = new ArrayList<BarEntry>();
+
+        for (int i = 0; i < count; i++) {
+            float mult = (range + 1);
+            float val = (float) (Math.random() * mult);
+            yVals1.add(new BarEntry(val, i));
+        }
+        BarDataSet set1 = new BarDataSet(yVals1, "数量(单位:个)");
+        set1.setColors(ColorTemplate.JOYFUL_COLORS);
+        //set1.setVisible(false);
+        //set1.setDrawValues(false);
+        dataSets.clear();
+        dataSets.add(set1);
+
+        data = new BarData(xVals, dataSets);
+    
+
+        sChart.setData(data);
+        sChart.invalidate();
+    }
+    
+    
     @Override
     public void onClick(View v) {
         switch (v.getId()) {
@@ -316,18 +423,18 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
             case R.id.ib_waller:
                 startActivity(new Intent(this, SalesRankingActivity.class));
                 break;
-            case R.id.ib_sale_condition:
+         /*   case R.id.ib_sale_condition:
                 showDateDialog(R.id.ib_sale_condition);
-                break;
+                break;*/
             case R.id.ib_index_condition:
                 showDateDialog(R.id.ib_index_condition);
                 break;
             case  R.id.ib_ranking_condition:
                 showDateDialog(R.id.ib_ranking_condition);
                 break;
-            case R.id.ib_em_condition:
+         /*   case R.id.ib_em_condition:
                 showDateDialog(R.id.ib_em_condition);
-                break;
+                break;*/
         }
     }
 
@@ -353,12 +460,12 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                             if (sales.size() != 2) {
                                 //__元/第__名   第一名:__金额:__元
                                 CommonUtil.textAarrySpanForStyle(tv_rank_sale_left,
-                                        "__" + "元/第"+"__"+"名",
-                                        new String[]{"__"},ct.getResources().getColor(R.color.yellow_home)
+                                        "￥__" + "/NO."+"1",
+                                        new String[]{"__","1"},ct.getResources().getColor(R.color.yellow_home)
                                         );
                                 CommonUtil.textAarrySpanForStyle(tv_rank_sale_right,
-                                        "第一名:" + sales.getJSONArray(0).getString(1)
-                                                + "金额:" + sales.getJSONArray(0).getIntValue(0) + " 元"
+                                        "NO.1:" + sales.getJSONArray(0).getString(1)
+                                                + "/￥:" + sales.getJSONArray(0).getIntValue(0) + ""
                                 ,new String[]{sales.getJSONArray(0).getString(1),
                                         String.valueOf(sales.getJSONArray(0).getIntValue(0))},
                                         ct.getResources().getColor(R.color.yellow_home));
@@ -367,8 +474,8 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                 
                             } else {
                                 tv_rank_sale_left.setText(sales.getJSONArray(1).getIntValue(0) + "元/第1名");
-                                tv_rank_sale_right.setText("第一名:" + sales.getJSONArray(0).getString(1)
-                                        + "金额:" + sales.getJSONArray(1).getIntValue(0) + "元");
+                                tv_rank_sale_right.setText("NO.1:" + sales.getJSONArray(0).getString(1)
+                                        + "￥:" + sales.getJSONArray(1).getIntValue(0) + "");
                                 sales.getJSONArray(1).getIntValue(0);//自己  元
                                 sales.getJSONArray(1).getString(1);//自己
                             }
@@ -381,15 +488,15 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                             //名称 拜访次数，拜访个数，排名
                             CommonUtil.textAarrySpanForStyle(tv_rank_visit_left,
                                     visits.getJSONArray(0).getIntValue(2) + "个/" +
-                                            visits.getJSONArray(0).getIntValue(1) + "次/第"
-                                            + visits.getJSONArray(0).getIntValue(3) + "名",
+                                           /* visits.getJSONArray(0).getIntValue(1) + "次/第"*/
+                                           "NO."+ visits.getJSONArray(0).getIntValue(3) ,
                                     new String[]{String.valueOf(visits.getJSONArray(0).getIntValue(2))
-                                            , String.valueOf(visits.getJSONArray(0).getIntValue(1))
+                                          /*  , String.valueOf(visits.getJSONArray(0).getIntValue(1))*/
                                             , String.valueOf(visits.getJSONArray(0).getIntValue(3))
                                     }, ct.getResources().getColor(R.color.yellow_home));
                             CommonUtil.textAarrySpanForStyle(tv_rank_visit_right,
-                                    "第一名:" + visits.getJSONArray(0).getString(0)
-                                            + "拜访:" + visits.getJSONArray(0).getIntValue(2)
+                                    "NO.1:" + visits.getJSONArray(0).getString(0)
+                                            + "/" + visits.getJSONArray(0).getIntValue(2)
                                             + "个/" + visits.getJSONArray(0).getIntValue(1) + " 次"
                                     , new String[]{visits.getJSONArray(0).getString(0)
                                             , String.valueOf(visits.getJSONArray(0).getIntValue(2))
@@ -429,12 +536,12 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                             profits.getJSONArray(1).getIntValue(2);//第一名  元
                         } else {
                             CommonUtil.textAarrySpanForStyle(tv_rank_rirun_left,
-                                    profits.getJSONArray(0).getIntValue(0)+ " 元/第"+1+"名",
+                                    "￥"+profits.getJSONArray(0).getIntValue(0)+ " /NO."+1+"",
                                     new String[]{String.valueOf(profits.getJSONArray(0).getIntValue(0)
                                             ),"1"},ct.getResources().getColor(R.color.yellow_home));
                             CommonUtil.textAarrySpanForStyle(tv_rank_rirun_right,
-                                    "第一名:" + profits.getJSONArray(0).getString(1)
-                                            + " 金额:" + profits.getJSONArray(0).getIntValue(0) + " 元"
+                                    "NO.1:" + profits.getJSONArray(0).getString(1)
+                                            + "/￥" + profits.getJSONArray(0).getIntValue(0) + " "
                                     , new String[]{
                                             profits.getJSONArray(0).getString(1),
                                             String.valueOf(profits.getJSONArray(0).getIntValue(0))
@@ -454,12 +561,12 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                             receivables.getJSONArray(1).getIntValue(2);//第一名  元
                         } else {
                             CommonUtil.textSpanForStyle(tv_rank_income_left,
-                                    receivables.getJSONArray(0).getIntValue(0) + " 元/第1名"
+                                    "￥"+receivables.getJSONArray(0).getIntValue(0) + "/NO.1"
                                     , String.valueOf(receivables.getJSONArray(0).getIntValue(0)),
                                     ct.getResources().getColor(R.color.yellow_home));
                             CommonUtil.textAarrySpanForStyle(tv_rank_income_right,
-                                    "第一名:" + receivables.getJSONArray(0).getString(1)
-                                            + " 超期应收:" + receivables.getJSONArray(0).getIntValue(0) + " 元"
+                                    "NO.1:" + receivables.getJSONArray(0).getString(1)
+                                            + "/Y:" + receivables.getJSONArray(0).getIntValue(0) + " "
                                     , new String[]{receivables.getJSONArray(0).getString(1),
                                             String.valueOf(receivables.getJSONArray(0).getIntValue(0))},
                                     ct.getResources().getColor(R.color.yellow_home));
@@ -497,15 +604,10 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                     root = JSON.parseObject(msg.getData().getString("result")).getJSONObject("datas");
                     if(!root.getJSONArray("target").isEmpty()){
                         JSONObject target = root.getJSONArray("target").getJSONObject(0);
-                        tv_em_name.setText(target.getString("EM_CODE"));
-                        tv_em_name.setText(target.getString("CUSTOMERCOUNT"));
-                        tv_em_depart.setText(target.getString("BFCOUNT"));
-                        
-                        
-                        tv_em_plan.setText(target.getIntValue("RANK")+"");
-                        tv_em_sale.setText(target.getIntValue("FIRSTBFCOUNT")+"");
-                        tv_em_planrirun.setText(target.getIntValue("TOPCOUNT")+"");
-                        tv_em_rirun.setText(target.getIntValue("ACTUALPROFIT")+"");
+                        tv_em_a.setText(target.getString("CUSTOMERCOUNT"));
+                        tv_em_plana.setText(target.getIntValue("RANK")+"/"+target.getIntValue("TOPCOUNT")+"");
+                        tv_em_salea.setText(target.getIntValue("FIRSTBFCOUNT")+"/"+target.getIntValue("ACTUALPROFIT")+"");
+                    
                     }
                    
 //                    "EM_CODE":"A021",
@@ -645,6 +747,9 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                         case 7:
                             startActivity(new Intent(ClientActivity.this, VisitReportAddActivity.class));
                             break;
+                        case 8:
+                            startActivity(new Intent(ClientActivity.this, CustomerAddActivity.class).putExtra("type",1));
+                            break;
                     }
                 }
             });
@@ -680,9 +785,10 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
         list.add(map);
 
         map = new HashMap<String, Object>();
-        map.put("item_name", "新增预录入客户");
+        map.put("item_name", "预录入客户");
         list.add(map);
-
+        
+        
         map = new HashMap<String, Object>();
         map.put("item_name", "新增任务");
         list.add(map);
@@ -699,6 +805,10 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
         map = new HashMap<String, Object>();
         map.put("item_name", "拜访报告");
         list.add(map);
+
+        map = new HashMap<String, Object>();
+        map.put("item_name", "录入客户");
+        list.add(map);
         return list;
     }
 
@@ -723,13 +833,13 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                         ToastUtil.showToast(ct, year + "-" + month );
                         sendTargets(year+month);
                         break;
-                    case R.id.ib_sale_condition://销售
+                  /*  case R.id.ib_sale_condition://销售
                         ToastUtil.showToast(ct, year + "-" + month );
                         sendSalesKit(year+month);
-                        break;
-                    case R.id.ib_em_condition://下属
+                        break;*/
+                 /*   case R.id.ib_em_condition://下属
                         sendTargets(year+month);
-                        break;
+                        break;*/
                 }
             }
         });

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

@@ -1,11 +1,15 @@
 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.widget.PopupMenu;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.View;
+import android.widget.LinearLayout;
 
 import com.alibaba.fastjson.JSON;
 import com.andreabaccega.widget.FormEditText;
@@ -23,24 +27,52 @@ import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-public class CustomerAddActivity extends BaseActivity {
-
+public class CustomerAddActivity extends BaseActivity implements View.OnClickListener{
+    
+    @ViewInject(R.id.et_cu_code)
+    private FormEditText et_cu_code;
     @ViewInject(R.id.et_cu_name)
-    private  FormEditText et_cu_name;
-    @ViewInject(R.id.et_cu_source)
-    private  FormEditText et_cu_source;
-    @ViewInject(R.id.et_cu_industry)
-    private  FormEditText  et_cu_industry;
-    @ViewInject(R.id.et_cu_defaultLevel)
-    private  FormEditText et_cu_defaultLevel;
-    @ViewInject(R.id.et_cu_tel)
-    private  FormEditText et_cu_tel;
-    @ViewInject(R.id.tv_cu_lastDate)
-    private  FormEditText tv_cu_lastDate;
+    private FormEditText et_cu_name;
+    @ViewInject(R.id.et_cu_shortname)
+    private FormEditText et_cu_shortname;
     @ViewInject(R.id.tv_cu_address)
-    private  FormEditText tv_cu_address;
+    private FormEditText tv_cu_address;
+    @ViewInject(R.id.et_cu_kind)
+    private FormEditText et_cu_kind;
+    @ViewInject(R.id.et_cu_district)
+    private FormEditText et_cu_district;
+    @ViewInject(R.id.et_cu_payments)
+    private FormEditText et_cu_payments;
+    @ViewInject(R.id.et_cu_sellername)
+    private FormEditText et_cu_sellername;
+    @ViewInject(R.id.tv_cu_contact)
+    private FormEditText tv_cu_contact;
+    @ViewInject(R.id.tv_cu_degree)
+    private FormEditText tv_cu_degree;
+    @ViewInject(R.id.tv_cu_mobile)
+    private FormEditText tv_cu_mobile;
+    @ViewInject(R.id.tv_cu_email)
+    private FormEditText tv_cu_email;
     @ViewInject(R.id.tv_cu_remark)
-    private  FormEditText tv_cu_remark;
+    private FormEditText tv_cu_remark;
+
+    @ViewInject(R.id.tv_cu_businesscode)
+    private FormEditText tv_cu_businesscode;
+    @ViewInject(R.id.tv_cu_currency)
+    private FormEditText tv_cu_currency;
+    @ViewInject(R.id.tv_cu_taxrate)
+    private FormEditText tv_cu_taxrate;
+    @ViewInject(R.id.tv_cu_nichestep)
+    private FormEditText tv_cu_nichestep;
+    
+    @ViewInject(R.id.ll_infomal)
+    private LinearLayout ll_infomal;
+
+    private String tv_code;
+    private int type;//预录入客户，正式客户
+
+    PopupMenu popup=null;
+    
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -51,21 +83,35 @@ public class CustomerAddActivity extends BaseActivity {
     }
 
     private void initListener() {
-
+        et_cu_kind.setOnClickListener(this);
+        et_cu_district.setOnClickListener(this);
+        
+        et_cu_kind.setFocusable(false);
+        et_cu_district.setFocusable(false);
+        
+        et_cu_kind.setKeyListener(null);
+        et_cu_district.setKeyListener(null);
     }
 
     private void initData() {
         getCodeByNet();
     }
-
+    
     private void initView() {
         ViewUtils.inject(this);
-        getSupportActionBar().setTitle("客户预录入");
-        tv_cu_lastDate.setText(DateFormatUtil.getStrDate4Date(new Date(),"yyyy-MM-dd"));
-        tv_cu_lastDate.setKeyListener(null);
+        Intent intent=getIntent();
+        if (intent!=null){
+            type=intent.getIntExtra("type",0);
+            if (type==1){
+                ll_infomal.setVisibility(View.VISIBLE);
+                getSupportActionBar().setTitle("客户录入");
+            }else{
+                ll_infomal.setVisibility(View.GONE);
+                getSupportActionBar().setTitle("客户预录入");
+            }
+        }
     }
-
-
+    
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.main_btn_submit, menu);
@@ -77,14 +123,7 @@ public class CustomerAddActivity extends BaseActivity {
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case R.id.btn_save:
-//                if (   et_cu_name.testValidity()
-//                        &&et_cu_source.testValidity()
-//                        &&et_cu_defaultLevel.testValidity()
-//                        &&et_cu_tel.testValidity()
-//                        &&tv_cu_address.testValidity()
-//                        &&tv_cu_remark.testValidity()){
-                sendHttpResquest(Constants.HTTP_SUCCESS_INIT);
-//                }
+                saveData();
                 break;
             case android.R.id.home:
                 onBackPressed();
@@ -93,11 +132,74 @@ public class CustomerAddActivity extends BaseActivity {
         return true;
     }
 
+    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()){
+                formStore= "{\n" +
+                        " \"cu_code\":\""+et_cu_code.getText().toString()+"\",\n" +
+                        " \"cu_name\":\""+et_cu_name.getText().toString()+"\",\n" +
+                        " \"cu_shortname\":\""+et_cu_shortname.getText().toString()+"\",\n" +
+                        " \"cu_add1\":\""+tv_cu_address.getText().toString()+"\",\n" +
+                        " \"cu_kind\":\""+et_cu_kind.getText().toString()+"\",\n" +
+                        " \"cu_district\":\""+et_cu_district.getText().toString()+"\",\n" +
+                        " \"cu_payments\":\""+et_cu_payments.getText().toString()+"\",\n" +
+                        " \"cu_sellername\":\""+et_cu_sellername.getText().toString()+"\",\n" +
+                        " \"cu_contact\":\""+tv_cu_contact.getText().toString()+"\",\n" +
+                        " \"cu_degree\":\""+tv_cu_degree.getText().toString()+"\",\n" +
+                        " \"cu_mobile\":\""+tv_cu_mobile.getText().toString()+"\",\n" +
+                        " \"cu_email\":\""+tv_cu_email.getText().toString()+"\",\n" +
+                        " \"cu_businesscode\":\""+tv_cu_businesscode.getText().toString()+"\",\n" +
+                        " \"cu_currency\":\""+tv_cu_currency.getText().toString()+"\",\n" +
+                        " \"cu_taxrate\":\""+tv_cu_taxrate.getText().toString()+"\",\n" +
+                        " \"cu_nichestep\":\""+tv_cu_nichestep.getText().toString()+"\",\n" +
+                        " \"cu_remark\":\""+tv_cu_remark.getText().toString()+"\"\n" +
+                        "}";
+            }else{
+                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()){
+                formStore= "{\n" +
+                        " \"cu_code\":\""+et_cu_code.getText().toString()+"\",\n" +
+                        " \"cu_name\":\""+et_cu_name.getText().toString()+"\",\n" +
+                        " \"cu_shortname\":\""+et_cu_shortname.getText().toString()+"\",\n" +
+                        " \"cu_add1\":\""+tv_cu_address.getText().toString()+"\",\n" +
+                        " \"cu_kind\":\""+et_cu_kind.getText().toString()+"\",\n" +
+                        " \"cu_district\":\""+et_cu_district.getText().toString()+"\",\n" +
+                        " \"cu_payments\":\""+et_cu_payments.getText().toString()+"\",\n" +
+                        " \"cu_sellername\":\""+et_cu_sellername.getText().toString()+"\",\n" +
+                        " \"cu_contact\":\""+tv_cu_contact.getText().toString()+"\",\n" +
+                        " \"cu_degree\":\""+tv_cu_degree.getText().toString()+"\",\n" +
+                        " \"cu_mobile\":\""+tv_cu_mobile.getText().toString()+"\",\n" +
+                        " \"cu_email\":\""+tv_cu_email.getText().toString()+"\",\n" +
+                        " \"cu_remark\":\""+tv_cu_remark.getText().toString()+"\"\n" +
+                        "}";
+            }else{
+                return;
+            }
+           
+        }
+        sendHttpResquest(Constants.HTTP_SUCCESS_INIT,formStore);
+    }
+
 
-    private Handler mHandler=new Handler(){
+    private Handler mHandler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
-            switch (msg.what){
+            switch (msg.what) {
                 case Constants.HTTP_SUCCESS_INIT:
                     progressDialog.dismiss();
                     Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
@@ -110,42 +212,28 @@ public class CustomerAddActivity extends BaseActivity {
                     break;
                 case codeWhat://获取编号
                     progressDialog.dismiss();
-                    tv_code= JSON.parseObject(msg.getData().getString("result")).getString("code");
+                    tv_code = JSON.parseObject(msg.getData().getString("result")).getString("code");
+                    et_cu_code.setText(tv_code);
                     break;
             }
         }
     };
 
-    private void sendHttpResquest(int what){
+    private void sendHttpResquest(int what,String formStore) {
         progressDialog.show();
-        String formStore="{\"cu_code\":\"" +tv_code+
-                "\",\"cu_name\":\"" +
-                et_cu_name.getText().toString()+
-                "\",\"cu_source\":\"" +
-                et_cu_source.getText().toString() +
-                "\",\"cu_defaultlevel\":\"" +
-                et_cu_defaultLevel.getText().toString() +
-                "\",\"cu_tel\":\"" +
-                et_cu_tel.getText().toString() +
-                "\",\"cu_lastdate\":\"" +
-                DateFormatUtil.getStrDate4Date(new Date(),"yyyy-MM-dd") +
-                "\",\"cu_add1\":\"" +
-                tv_cu_address.getText().toString() +
-                "\",\"cu_remark\":\"" +
-                tv_cu_address.getText().toString() +
-                "\"}";
-        String url= Constants.getAppBaseUrl(ct)+"scm/sale/savePreCustomer.action";
-        Map<String,Object> params=new HashMap<>();
+        String url = Constants.getAppBaseUrl(ct) + "scm/sale/savePreCustomer.action";
+        Map<String, Object> params = new HashMap<>();
         params.put("formStore", formStore);
         params.put("caller", "PreCustomer");
-        LinkedHashMap<String , Object> headers=new LinkedHashMap<>();
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
         ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, what, null, null, "post");
     }
 
 
     private static final int codeWhat = 0x11;
-    private  String tv_code;
+   
+
     private void getCodeByNet() {
         String url = Constants.getAppBaseUrl(ct) + "common/getCodeString.action";
         final Map<String, Object> param = new HashMap<>();
@@ -155,6 +243,82 @@ public class CustomerAddActivity extends BaseActivity {
         param.put("sessionId", CommonUtil.getSharedPreferences(ct, "sessionId"));
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
-       ViewUtil.httpSendRequest(ct, url, param, mHandler, headers, codeWhat, null, null, "post");
+        ViewUtil.httpSendRequest(ct, url, param, mHandler, headers, codeWhat, null, null, "post");
+    }
+
+    public void onPopupButtonClick(View button){
+        popup=new PopupMenu(this,button);
+        switch (button.getId()){
+            case R.id.et_cu_kind:
+                getMenuInflater().inflate(R.menu.menu_cu_kind, popup.getMenu());
+            break;
+            case R.id.et_cu_district:
+                getMenuInflater().inflate(R.menu.menu_cu_district, popup.getMenu());
+                break;
+        }
+      
+        popup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
+            @Override
+            public boolean onMenuItemClick(MenuItem item) {
+                switch (item.getItemId()){
+                    case R.id.cu_desgin:
+                        et_cu_kind.setText(item.getTitle());
+                        break;
+                    case R.id.cu_project:
+                        et_cu_kind.setText(item.getTitle());
+                        break;
+                    case R.id.cu_proxy:
+                        et_cu_kind.setText(item.getTitle());
+                        break;
+                    case R.id.cu_sale:
+                        et_cu_kind.setText(item.getTitle());
+                        break;
+                    case R.id.cu_eastChina:
+                        et_cu_district.setText(item.getTitle());
+                            break;
+                    case R.id.cu_southChina:
+                        et_cu_district.setText(item.getTitle());
+                        break;
+                    case R.id.cu_northChina:
+                        et_cu_district.setText(item.getTitle());
+                        break;
+                    case R.id.cu_center:
+                        et_cu_district.setText(item.getTitle());
+                        break;
+                    case R.id.cu_southwest:
+                        et_cu_district.setText(item.getTitle());
+                        break;
+                    case R.id.cu_northwest:
+                        et_cu_district.setText(item.getTitle());
+                        break;
+                    case R.id.cu_northeast:
+                        et_cu_district.setText(item.getTitle());
+                        break;
+                    case R.id.cu_webPages:
+                        et_cu_district.setText(item.getTitle());
+                        break;
+                    case R.id.cu_seas:
+                        et_cu_district.setText(item.getTitle());
+                        break;
+                    case R.id.cu_other:
+                        et_cu_district.setText(item.getTitle());
+                        break;
+                }
+                return true;
+            }
+        });
+        popup.show(); //showing popup menu 
+    }
+
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()){
+            case R.id.et_cu_kind:
+                onPopupButtonClick(v);
+                break;
+            case R.id.et_cu_district:
+                onPopupButtonClick(v);
+                break;
+        }
     }
 }

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

@@ -43,22 +43,40 @@ public class CustomerDetailActivity extends BaseActivity {
     private TextView tv_lastDate;
     @ViewInject(R.id.tv_address)
     private TextView tv_address;
-    @ViewInject(R.id.tv_receiveTime)
-    private TextView tv_receiveTime;
+//    @ViewInject(R.id.tv_receiveTime)
+//    private TextView tv_receiveTime;
     @ViewInject(R.id.tv_source)
     private TextView tv_source;
     @ViewInject(R.id.tv_industry)
     private TextView tv_industry;
-    @ViewInject(R.id.tv_tel)
-    private TextView tv_tel;
-    @ViewInject(R.id.tv_reimbursementIng)
-    private TextView tv_reimbursementIng;
-    @ViewInject(R.id.tv_reimbursement_end)
-    private TextView tv_reimbursement_end;
+    @ViewInject(R.id.tv_type)
+    private TextView tv_type;
+
+    @ViewInject(R.id.tv_diqu)
+    private TextView  tv_diqu;
+    @ViewInject(R.id.tv_zhihzhao)
+    private TextView  tv_zhihzhao;
+//    @ViewInject(R.id.tv_tel)
+//    private TextView tv_tel;
+    @ViewInject(R.id.tv_email)
+    private TextView tv_email;
+    @ViewInject(R.id.tv_name)
+    private TextView     tv_name;
+    @ViewInject(R.id.tv_position)
+    private TextView    tv_position;
+    @ViewInject(R.id.tv_mobile)
+    private TextView tv_mobile;
+                
+  
     @ViewInject(R.id.tv_modifyRecord)
     private TextView tv_modifyRecord;
     @ViewInject(R.id.tv_visitTimes)
     private TextView tv_visitTimes;
+
+    @ViewInject(R.id.tv_feilv)
+    private TextView  tv_feilv;
+    @ViewInject(R.id.tv_feiyonged)
+    private TextView  tv_feiyonged;
     @ViewInject(R.id.stepsView)
     private StepsView mStepsView;
     private Context ct;
@@ -127,13 +145,26 @@ public class CustomerDetailActivity extends BaseActivity {
                     JSONObject jsonArray = JSON.parseObject(msg.getData().getString("result")).getJSONObject("customer");
                     if (jsonArray != null) {
                         tv_company_name.setText(jsonArray.getString("cu_name"));
-                        tv_leader.setText("负责人："+jsonArray.getString("cu_contact"));
+                        tv_leader.setText(jsonArray.getString("cu_contact"));
                         tv_state.setText(jsonArray.getString("cu_dealstatus")+"|普通客户");
-                        tv_lastDate.setText("最后跟进："+jsonArray.getString("cu_lastdate"));
+                        tv_lastDate.setText(jsonArray.getString("cu_lastdate"));
                         tv_address.setText(jsonArray.getString("cu_add1"));
                         tv_source.setText(jsonArray.getString("cu_source"));
                         tv_industry.setText(jsonArray.getString("cu_kind"));
-                        tv_tel.setText(jsonArray.getString("cu_mobile"));
+                        tv_diqu.setText(jsonArray.getString("cu_district"));
+                        tv_type.setText(jsonArray.getString("cu_kind"));
+                        tv_zhihzhao.setText(jsonArray.getString("cu_businesscode"));
+                        tv_email.setText(jsonArray.getString("cu_email"));
+                        tv_mobile.setText(jsonArray.getString("cu_mobile"));
+                        tv_position.setText(jsonArray.getString("cu_degree"));
+                        tv_name.setText(jsonArray.getString("cu_name"));
+                        
+                        tv_visitTimes.setText(jsonArray.getString("bfcount"));
+                        tv_modifyRecord.setText(jsonArray.getString("cu_remark"));
+                        tv_feilv.setText(jsonArray.getString("cu_taxrate"));
+                        tv_feiyonged.setText(jsonArray.getString("bxamount"));
+                                
+                   
                     }
 
                     break;

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

@@ -12,6 +12,7 @@ import android.widget.EditText;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
+import com.andreabaccega.widget.FormEditText;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
@@ -33,22 +34,24 @@ import java.util.Map;
 public class TaskAddActivity extends BaseActivity implements View.OnClickListener {
 
     @ViewInject(R.id.tv_name)
-    private EditText tv_name;
+    private FormEditText tv_name;
     @ViewInject(R.id.tv_executive)
-    private EditText tv_executive;
+    private FormEditText tv_executive;
     @ViewInject(R.id.tv_date)
-    private EditText tv_date;
+    private FormEditText tv_date;
     @ViewInject(R.id.tv_priority)
-    private EditText tv_priority;
+    private FormEditText tv_priority;
     @ViewInject(R.id.tv_type)
-    private TextView tv_type;
+    private FormEditText tv_type;
     @ViewInject(R.id.tv_customer)
-    private EditText tv_customer;
+    private FormEditText tv_customer;
     @ViewInject(R.id.tv_notice)
-    private EditText tv_notice;
+    private FormEditText tv_notice;
     @ViewInject(R.id.tv_content)
-    private EditText tv_content;
-
+    private FormEditText tv_content;
+    @ViewInject(R.id.tv_date_start)
+    private FormEditText  tv_date_start;
+    
     private String code = null;
 
     @Override
@@ -73,9 +76,12 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
         tv_notice.setOnClickListener(this);
         tv_priority.setOnClickListener(this);
         tv_date.setOnClickListener(this);
+        tv_date_start.setOnClickListener(this);
         findViewById(R.id.sex_erp_rl).setOnClickListener(this);
         tv_date.setKeyListener(null);
         tv_date.setFocusable(false);
+        tv_date_start.setKeyListener(null);
+        tv_date_start.setFocusable(false);
         tv_notice.setKeyListener(null);
         tv_notice.setFocusable(false);
         tv_priority.setKeyListener(null);
@@ -86,7 +92,6 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
 
     private void initData() {
         getCodeByNet();
-
     }
 
     @Override
@@ -99,7 +104,10 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case R.id.btn_save:
-                sendHttpResquest(Constants.HTTP_SUCCESS_INIT);
+                if (tv_name.testValidity()&&tv_executive.testValidity()&&tv_date.testValidity()
+                        &&tv_priority.testValidity()) {
+                    sendHttpResquest(Constants.HTTP_SUCCESS_INIT);
+                }
                 break;
             case android.R.id.home:
                 onBackPressed();
@@ -140,28 +148,29 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
     private void sendHttpResquest(int what) {
         progressDialog.show();
         String formStore = "{\n" +
-                "\"taskcode\":\"" + tv_code + "\",\n" +
-                "\"name\":\"" + tv_name.getText().toString() + "\",\n" +
-                "\"resourcename\":\"" +
+                "\"taskcode\":\"" + tv_code + "\",\n" +//编号
+                "\"name\":\"" + tv_name.getText().toString() + "\",\n" +//名称
+                "\"resourcename\":\"" +//执行人
                 tv_executive.getText().toString() +
                 "\",\n" +
-                "\"enddate\":\"" +
+                "\"enddate\":\"" +//结束时间
                 tv_date.getText().toString() +
                 "\",\n" +
                 "\"tasklevel\":\"" +
-                tv_priority.getText().toString() +
+                tv_priority.getText().toString() +//任务优先级
                 "\",\n" +
-                "\"taskorschedule\":\"" + tv_type.getText().toString() + "\",\n" +
+                "\"taskorschedule\":\"" + tv_type.getText().toString()//任务类型
+                + "\",\n" +
                 "\"custname\":\"" +
-                tv_customer.getText().toString() +
+                tv_customer.getText().toString() +//联系人
                 "\",\n" +
                 "\"timealert\":\"" +
-                tv_notice.getText().toString() +
+                tv_notice.getText().toString() +//提醒
                 "\",\n" +
                 "\"description\":\"" +
                 tv_content.getText().toString() +
                 "\",\n" +
-          /*      "\"SOURCECOD\":\"U0316\"\n" +*/
+       
                 "}";
         String url = Constants.getAppBaseUrl(ct) + "plm/task/addbilltask.action";
         Map<String, Object> params = new HashMap<>();
@@ -213,7 +222,7 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
         sex_option.show();
     }
 
-    private void showDateDialog() {
+    private void showDateDialog(final FormEditText view) {
         DatePicker picker = new DatePicker(this);
         picker.setRange(1950, 2030);
         picker.setSelectedItem(
@@ -223,7 +232,16 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
         picker.setOnDatePickListener(new DatePicker.OnYearMonthDayPickListener() {
             @Override
             public void onDatePicked(String year, String month, String day) {
-                tv_date.setText(year + "-" + month + "-" + day);
+                switch (view.getId()){
+                    case R.id.tv_date:
+                       view.setText(year + "-" + month + "-" + day);
+                        break;
+                    case R.id.tv_date_start:
+                        view.setText(year + "-" + month + "-" + day);
+                        break;
+                }
+                    
+               
             }
         });
         picker.show();
@@ -232,8 +250,11 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
     @Override
     public void onClick(View v) {
         switch (v.getId()) {
+            case R.id.tv_date_start:
+                showDateDialog((FormEditText) v.findViewById(R.id.tv_date_start));
+                break;
             case R.id.tv_date:
-                showDateDialog();
+                showDateDialog((FormEditText) v.findViewById(R.id.tv_date));
                 break;
             case R.id.tv_notice:
                 showNoticeDialog();

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

@@ -42,14 +42,14 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
     private EditText tv_linksman_login;
     @ViewInject(R.id.tv_visit_login)
     private EditText tv_visit_login;
-    @ViewInject(R.id.tv_depart_login)
-    private EditText tv_depart_login;
-    @ViewInject(R.id.tv_startTim_login)
-    private EditText tv_startTim_login;
-    @ViewInject(R.id.tv_endTime_login)
-    private EditText tv_endTime_login;
-    @ViewInject(R.id.tv_businessState_login)
-    private EditText tv_businessState_login;
+//    @ViewInject(R.id.tv_depart_login)
+//    private EditText tv_depart_login;
+//    @ViewInject(R.id.tv_startTim_login)
+//    private EditText tv_startTim_login;
+//    @ViewInject(R.id.tv_endTime_login)
+//    private EditText tv_endTime_login;
+//    @ViewInject(R.id.tv_businessState_login)
+//    private EditText tv_businessState_login;
     @ViewInject(R.id.tv_notes_login)
     private EditText tv_notes_login;
 
@@ -72,12 +72,12 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
     private void initListener() {
         tv_address_refresh.setOnClickListener(this);
         tv_date_select.setOnClickListener(this);
-        tv_startTim_login.setOnClickListener(this);
-        tv_endTime_login.setOnClickListener(this);
+//        tv_startTim_login.setOnClickListener(this);
+//        tv_endTime_login.setOnClickListener(this);
 
         tv_date_select.setKeyListener(null);
-        tv_endTime_login.setKeyListener(null);
-        tv_startTim_login.setKeyListener(null);
+//        tv_endTime_login.setKeyListener(null);
+//        tv_startTim_login.setKeyListener(null);
 
     }
 
@@ -128,7 +128,8 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
 
     private void sendHttpResquest(int what) {
         progressDialog.show();
-        String formStore = "{\n" +
+        String formStore ="";
+         /*       "{\n" +
                 "\"vr_code\":\"" + tv_code + "\",\n" +
                 "\"vr_visittime\":\"" + tv_date_select.getText().toString() + "\",\n" +
                 "\"vr_visitplace\":\"" +
@@ -155,7 +156,7 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
                 "\"vr_recorder\":\"" +
                 CommonUtil.getSharedPreferences(ct, "erp_username") +
                 "\"\n" +
-                "}";
+                "}";*/
         String url = Constants.getAppBaseUrl(ct) + "crm/customermgr/saveVisitRecord.action";
         Map<String, Object> params = new HashMap<>();
         params.put("formStore", formStore);
@@ -178,12 +179,12 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
             case R.id.tv_date_select:
                 showDateDialog((EditText) v.findViewById(R.id.tv_date_select));
                 break;
-            case R.id.tv_startTim_login:
+           /* case R.id.tv_startTim_login:
                 showDateDialog((EditText) v.findViewById(R.id.tv_startTim_login));
                 break;
             case R.id.tv_endTime_login:
                 showDateDialog((EditText) v.findViewById(R.id.tv_endTime_login));
-                break;
+                break;*/
             case R.id.tv_address_refresh:
                 BaiduMapUtil.getInstence().getPoiInfo(ct, new BaiduMapUtil.OnLocationListener() {
                     @Override

WeiChat/src/main/java/com/xzjmyk/pm/activity/view/FunnelView.java

@@ -153,7 +153,6 @@ public class FunnelView extends View implements ValueAnimator.AnimatorUpdateList
     @Override
     protected void onDraw(Canvas canvas) {
         super.onDraw(canvas);
-      
         for (int i = 0; i < mMoneys.size(); i++) {
             draw2(canvas, mPaints.get(i), mPathAngleWidths.get(i), mPathHeights.get(i),i);
         }
@@ -192,8 +191,8 @@ public class FunnelView extends View implements ValueAnimator.AnimatorUpdateList
         } else {
             
             size = maxHight + 20;
-            if (size<900)
-                size=900;
+//            if (size<900)
+//                size=900;
             Log.i("Arison", "getMeasuredLength:size :" + size  );
         }
         return size;

WeiChat/src/main/res/drawable/shape_crm_card.xml

@@ -2,10 +2,10 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <corners
-        android:topLeftRadius="12dp"
-        android:topRightRadius="12dp"
-        android:bottomRightRadius="12dp"
-        android:bottomLeftRadius="12dp"></corners>
+        android:topLeftRadius="1dp"
+        android:topRightRadius="1dp"
+        android:bottomRightRadius="1dp"
+        android:bottomLeftRadius="1dp"></corners>
     <stroke
         android:width="1dp"
         android:color="#ffffff"></stroke>

WeiChat/src/main/res/drawable/shape_from_edit.xml

@@ -9,7 +9,7 @@
     </item>
     <item  android:state_pressed="true"><shape>
             <solid android:color="#FFFFFF" />
-            <stroke android:width="0.6dp" android:color="#00EEEE" />
+            <stroke android:width="0.6dp" android:color="#949494" />
             <corners android:radius="8dp" />
             <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
         </shape>

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

@@ -16,11 +16,19 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
-
+           <TextView
+               android:layout_width="match_parent"
+               android:layout_height="wrap_content"
+               android:textSize="@dimen/text_main"
+               android:background="@color/white"
+               android:drawablePadding="5dp"
+               android:padding="10dp"
+               android:drawableLeft="@drawable/icon_crm_basicinfo"
+               android:text="基本信息"/>
             <RelativeLayout
                 android:id="@+id/ry_business_no"
                 style="@style/form_relative_customer"
-                android:background="@color/item_color1">
+                android:background="@color/item_color2">
 
 
                 <TextView
@@ -50,11 +58,17 @@
                     android:text="商机名称："
                     android:textColor="@color/text_main"
                     android:textSize="@dimen/text_main" />
-
+                <TextView
+                    style="@style/form_relative_left_text"
+                    android:layout_marginLeft="10dp"
+                    android:layout_toRightOf="@+id/tv_leave_mankind"
+                    android:text="*"
+                    android:textColor="@color/red" />
                 <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                     android:id="@+id/et_business_name"
                     style="@style/form_relative_right_text"
-                    editTextFormExample:testType="nocheck" />
+                    editTextFormExample:testType="nocheck"
+                    android:hint="请输入" />
             </RelativeLayout>
 
             <RelativeLayout
@@ -80,7 +94,7 @@
             <RelativeLayout
                 android:id="@+id/ry_business_source"
                 style="@style/form_relative_customer"
-                android:background="@color/item_color1">
+                android:background="@color/item_color2">
 
 
                 <TextView
@@ -89,86 +103,85 @@
                     android:text="商机来源："
                     android:textColor="@color/text_main"
                     android:textSize="@dimen/text_main" />
-
+                <TextView
+                    style="@style/form_relative_left_text"
+                    android:layout_marginLeft="10dp"
+                    android:layout_toRightOf="@+id/tv_leave_category"
+                    android:text="*"
+                    android:textColor="@color/red" />
                 <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                     android:id="@+id/et_business_source"
                     style="@style/form_relative_right_text"
-                    editTextFormExample:testType="nocheck" />
+                    android:drawableRight="@drawable/nav_icon_search_default"
+                    editTextFormExample:testType="nocheck"
+                    android:hint="请选择" />
             </RelativeLayout>
-
-            <!--<ImageView style="@style/app_comm_list_line_gray" />-->
-
             <RelativeLayout
-                android:id="@+id/ry_business_phone"
+                android:id="@+id/ry_business"
                 style="@style/form_relative_customer"
                 android:background="@color/item_color2">
 
 
                 <TextView
-                    android:id="@+id/tv_iv_leave_days"
+                    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
+                    style="@style/form_relative_left_text"
+                    android:layout_marginLeft="25dp"
+                    android:layout_toRightOf="@+id/tv_leave_reason"
+                    android:text="*"
+                    android:textColor="@color/red" />
                 <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
-                    android:id="@+id/et_business_phone"
+                    android:id="@+id/et_business"
+                    android:drawableRight="@drawable/nav_icon_search_default"
                     style="@style/form_relative_right_text"
-                    whatever:customRegexp="^(([0-9])|([0-9]+\\.?[0-9]+))$"
-                    whatever:testErrorString="@string/error_only_numeric_digits_allowed"
-                    whatever:testType="regexp" />
+                    editTextFormExample:testType="nocheck"
+                    android:hint="请选择" />
             </RelativeLayout>
-
             <!--<ImageView style="@style/app_comm_list_line_gray" />-->
 
             <RelativeLayout
-                android:id="@+id/ry_business_createTime"
+                android:id="@+id/ry_business_phone"
                 style="@style/form_relative_customer"
-                android:background="@color/item_color1">
+                android:background="@color/item_color2">
 
 
                 <TextView
-                    android:id="@+id/tv_leave_hours"
+                    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
+                    style="@style/form_relative_left_text"
+                    android:layout_marginLeft="10dp"
+                    android:layout_toRightOf="@+id/tv_iv_leave_days"
+                    android:text="*"
+                    android:textColor="@color/red" />
                 <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
-                    android:id="@+id/et_business_createTime"
+                    android:id="@+id/et_business_type"
                     style="@style/form_relative_right_text"
+                    android:drawableRight="@drawable/nav_icon_search_default"
                     whatever:customRegexp="^(([0-9])|([0-9]+\\.?[0-9]+))$"
                     whatever:testErrorString="@string/error_only_numeric_digits_allowed"
-                    whatever:testType="date" />
+                    whatever:testType="nocheck"
+                    android:hint="请选择" />
             </RelativeLayout>
 
             <!--<ImageView style="@style/app_comm_list_line_gray" />-->
 
-            <RelativeLayout
-                android:id="@+id/ry_business"
-                style="@style/form_relative_customer"
-                android:background="@color/item_color2">
-
-
-                <TextView
-                    android:id="@+id/tv_leave_reason"
-                    style="@style/form_relative_left_text"
-                    android:text="商机库："
-                    android:textColor="@color/text_main"
-                    android:textSize="@dimen/text_main" />
+            <!--<ImageView style="@style/app_comm_list_line_gray" />-->
 
-                <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
-                    android:id="@+id/et_business"
-                    style="@style/form_relative_right_text"
-                    editTextFormExample:testType="nocheck" />
-            </RelativeLayout>
+        
 
 
             <RelativeLayout
                 android:id="@+id/ry_business_jieDuan"
                 style="@style/form_relative_customer"
-                android:background="@color/item_color1">
+                android:background="@color/item_color2">
 
 
                 <TextView
@@ -177,53 +190,80 @@
                     android:text="当前阶段："
                     android:textColor="@color/text_main"
                     android:textSize="@dimen/text_main" />
-
+                <TextView
+                    style="@style/form_relative_left_text"
+                    android:layout_marginLeft="10dp"
+                    android:layout_toRightOf="@+id/tv_set_"
+                    android:text="*"
+                    android:textColor="@color/red" />
                 <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                     android:id="@+id/et_business_jieDuan"
                     style="@style/form_relative_right_text"
+                    android:drawableRight="@drawable/nav_icon_search_default"
                     editTextFormExample:customFormat="yyyy-MM-dd HH:mm"
-                    editTextFormExample:testType="date" />
+                    editTextFormExample:testType="nocheck"
+                    android:hint="请选择" />
             </RelativeLayout>
 
 
+       
+
             <RelativeLayout
-                android:id="@+id/ry_business_enterTime"
+                android:id="@+id/ry_business_enterMan"
                 style="@style/form_relative_customer"
                 android:background="@color/item_color2">
 
+
                 <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
+                    style="@style/form_relative_left_text"
+                    android:layout_marginLeft="25dp"
+                    android:layout_toRightOf="@+id/id_tv1"
+                    android:text="*"
+                    android:textColor="@color/red" />
                 <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
-                    android:id="@+id/et_business_enterTime"
+                    android:id="@+id/et_business_enterMan"
                     style="@style/form_relative_right_text"
+                    android:drawableRight="@drawable/nav_icon_search_default"
                     editTextFormExample:customFormat="yyyy-MM-dd HH:mm"
-                    editTextFormExample:testType="date" />
+                    editTextFormExample:testType="nocheck"
+                    android:hint="请选择" />
             </RelativeLayout>
-
             <RelativeLayout
-                android:id="@+id/ry_business_enterMan"
+                android:id="@+id/ry_business_enterTime"
                 style="@style/form_relative_customer"
-                android:background="@color/item_color1">
-
+                android:background="@color/item_color2">
 
                 <TextView
-
                     style="@style/form_relative_left_text"
-                    android:text="跟进人："
+                    android:text="备注："
                     android:textColor="@color/text_main"
                     android:textSize="@dimen/text_main" />
 
                 <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
-                    android:id="@+id/et_business_enterMan"
+                    android:id="@+id/et_business_remark"
                     style="@style/form_relative_right_text"
                     editTextFormExample:customFormat="yyyy-MM-dd HH:mm"
-                    editTextFormExample:testType="date" />
+                    editTextFormExample:testType="date"
+                    android:hint="请输入" />
             </RelativeLayout>
-
+            <LinearLayout
+                android:layout_marginTop="20dp"
+                style="@style/crm_ll_card">
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textSize="@dimen/text_main"
+                    android:background="@color/white"
+                    android:drawablePadding="5dp"
+                    android:padding="10dp"
+                    android:drawableLeft="@drawable/icon_crm_links"
+                    android:text="联系方式"/>
             <RelativeLayout
                 android:id="@+id/ry_company_name"
                 style="@style/form_relative_customer"
@@ -240,13 +280,13 @@
                     android:id="@+id/et_company_name"
                     style="@style/form_relative_right_text"
                     editTextFormExample:customFormat="yyyy-MM-dd HH:mm"
-                    editTextFormExample:testType="date" />
+                    editTextFormExample:testType="date"
+                    android:hint="请输入" />
             </RelativeLayout>
-
             <RelativeLayout
                 android:id="@+id/ry_company_address"
                 style="@style/form_relative_customer"
-                android:background="@color/item_color1">
+                android:background="@color/item_color2">
 
 
                 <TextView
@@ -260,10 +300,9 @@
                     android:id="@+id/et_company_address"
                     style="@style/form_relative_right_text"
                     editTextFormExample:customFormat="yyyy-MM-dd HH:mm"
-                    editTextFormExample:testType="date" />
+                    editTextFormExample:testType="date"
+                    android:hint="请输入" />
             </RelativeLayout>
-
-
             <RelativeLayout
                 android:id="@+id/ry_company_man"
                 style="@style/form_relative_customer"
@@ -279,15 +318,14 @@
                 <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                     android:id="@+id/et_company_man"
                     style="@style/form_relative_right_text"
-                    android:hint="不能超过3个字符"
+                    android:hint="请输入"
                     editTextFormExample:customFormat="yyyy-MM-dd HH:mm"
                     editTextFormExample:testType="date" />
             </RelativeLayout>
-
             <RelativeLayout
                 android:id="@+id/ry_company_position"
                 style="@style/form_relative_customer"
-                android:background="@color/item_color1">
+                android:background="@color/item_color2">
 
 
                 <TextView
@@ -300,12 +338,10 @@
                 <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                     android:id="@+id/et_company_position"
                     style="@style/form_relative_right_text"
-                    android:hint="不能超过3个字符"
+                    android:hint="请输入"
                     editTextFormExample:customFormat="yyyy-MM-dd HH:mm"
                     editTextFormExample:testType="date" />
             </RelativeLayout>
-
-
             <RelativeLayout
                 android:id="@+id/ry_company_tele"
                 style="@style/form_relative_customer"
@@ -322,9 +358,10 @@
                     android:id="@+id/et_company_tele"
                     style="@style/form_relative_right_text"
                     editTextFormExample:customFormat="yyyy-MM-dd HH:mm"
-                    editTextFormExample:testType="phone" />
+                    editTextFormExample:testType="phone"
+                    android:hint="请输入" />
             </RelativeLayout>
-
+            </LinearLayout>
         </LinearLayout>
     </RelativeLayout>
 

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

@@ -4,7 +4,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/crm_basic_bg"
+    android:background="@color/gray_light"
     tools:context="com.xzjmyk.pm.activity.ui.erp.activity.crm.ClientActivity">
 
     <LinearLayout
@@ -15,12 +15,15 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:padding="10dp"
+            android:background="@drawable/nav_bg"
             android:weightSum="4"
             android:orientation="horizontal">
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginBottom="10dp"
                 android:layout_weight="1"
                 android:orientation="vertical">
 
@@ -31,7 +34,7 @@
                     android:background="@drawable/shape_crm_round"
                     android:layout_gravity="center_horizontal"
                     android:layout_margin="10dp"
-                    android:src="@drawable/icon_crm_round" />
+                    android:src="@drawable/tab_icon4" />
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -54,7 +57,7 @@
                     android:background="@drawable/shape_crm_round"
                     android:layout_margin="10dp"
                     android:layout_gravity="center_horizontal"
-                    android:src="@drawable/icon_crm_round" />
+                    android:src="@drawable/tab_icon1"  />
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -77,7 +80,7 @@
                     android:background="@drawable/shape_crm_round"
                     android:layout_margin="10dp"
                     android:layout_gravity="center_horizontal"
-                    android:src="@drawable/icon_crm_round" />
+                    android:src="@drawable/tab_icon2"  />
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -100,7 +103,7 @@
                     android:background="@drawable/shape_crm_round"
                     android:layout_margin="10dp"
                     android:layout_gravity="center_horizontal"
-                    android:src="@drawable/icon_crm_round" />
+                    android:src="@drawable/tab_icon3"  />
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -121,10 +124,14 @@
 
                 <TextView
                     android:id="@+id/tv_ranking"
+                    android:layout_height="match_parent"
+                    android:background="@drawable/icon_crm_tag"
                     style="@style/crm_tv_card_topLeft"
                     android:text="@string/crm_ranking" />
 
-                <ImageButton
+                <TextView
+                    android:text="筛选"
+                    android:drawableRight="@drawable/nav_icon_search_default"
                     android:id="@+id/ib_ranking_condition"
                     style="@style/crm_ib_card_topRight" />
             </RelativeLayout>
@@ -211,23 +218,63 @@
             </LinearLayout>
         </LinearLayout>
    
-        <LinearLayout style="@style/crm_ll_card">
+        <LinearLayout
+            android:layout_marginTop="10dp"
+            android:layout_marginLeft="0dp"
+            android:layout_marginRight="0dp"
+            android:layout_height="wrap_content"
+            style="@style/crm_ll_card">
 
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="40dp">
 
                 <TextView
+                    android:background="@drawable/icon_crm_tag"
                     style="@style/crm_tv_card_topLeft"
                     android:text="@string/crm_sale_msg" />
 
-                <ImageButton style="@style/crm_ib_card_topRight"
-                    android:id="@+id/ib_sale_condition" />
+             <!--   <ImageButton style="@style/crm_ib_card_topRight"
+                    android:id="@+id/ib_sale_condition" />-->
             </RelativeLayout>
 
             <View style="@style/app_line_gray_1dp"></View>
-
-            <LinearLayout style="@style/crm_ll_sale">
+            <LinearLayout style="@style/crm_ll_sale"
+                android:layout_marginTop="5dp"
+                android:layout_weight="2">
+                <TextView
+                    android:layout_marginLeft="20dp"
+                    android:drawablePadding="0dp"
+                    android:drawableLeft="@drawable/icon_mony"
+                    android:gravity="left"
+                    android:layout_weight="1"
+                    android:text="回款5000元"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+                <TextView
+                    android:drawableLeft="@drawable/icon_mony"
+                    android:gravity="left"
+                    android:layout_weight="1"
+                    android:text="出货6000元"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content" />
+            </LinearLayout>
+            <!--图表-->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical"
+                style="@style/crm_ll_sale">
+                <com.github.mikephil.charting.charts.BarChart
+                    android:id="@+id/crm_chart_sale"
+                    android:layout_width="match_parent"
+                    android:layout_height="200dp"
+                    android:layout_marginTop="10dp"
+                    android:layout_marginBottom="10dp"/>
+            </LinearLayout>
+            
+            <LinearLayout style="@style/crm_ll_sale"
+                android:visibility="gone">
 
                 <LinearLayout
                     android:layout_weight="1"
@@ -258,9 +305,11 @@
                 </LinearLayout>
             </LinearLayout>
 
-            <View style="@style/app_line_gray_1dp"></View>
+            <View style="@style/app_line_gray_1dp"
+                android:visibility="gone"></View>
 
-            <LinearLayout style="@style/crm_ll_sale">
+            <LinearLayout style="@style/crm_ll_sale"
+                android:visibility="gone">
 
                 <LinearLayout
                     android:layout_weight="1"
@@ -291,9 +340,11 @@
                 </LinearLayout>
             </LinearLayout>
 
-            <View style="@style/app_line_gray_1dp"></View>
+            <View style="@style/app_line_gray_1dp"
+                android:visibility="gone"></View>
 
-            <LinearLayout style="@style/crm_ll_sale">
+            <LinearLayout style="@style/crm_ll_sale"
+                android:visibility="gone">
 
                 <LinearLayout
                     android:layout_weight="1"
@@ -324,9 +375,11 @@
                 </LinearLayout>
             </LinearLayout>
 
-            <View style="@style/app_line_gray_1dp"></View>
+            <View style="@style/app_line_gray_1dp"
+                android:visibility="gone"></View>
 
-            <LinearLayout style="@style/crm_ll_sale">
+            <LinearLayout style="@style/crm_ll_sale"
+                android:visibility="gone">
 
                 <LinearLayout
                     android:layout_weight="1"
@@ -357,11 +410,15 @@
                 </LinearLayout>
             </LinearLayout>
 
-            <View style="@style/app_line_gray_1dp"></View>
+            <View style="@style/app_line_gray_1dp"
+                android:visibility="gone"></View>
         </LinearLayout>
 
 
         <LinearLayout
+            android:layout_marginTop="10dp"
+            android:layout_marginLeft="0dp"
+            android:layout_marginRight="0dp"
             style="@style/crm_ll_card"
             android:layout_height="wrap_content">
 
@@ -370,101 +427,110 @@
                 android:layout_height="40dp">
 
                 <TextView
+                    android:background="@drawable/icon_crm_tag"
                     style="@style/crm_tv_card_topLeft"
                     android:text="@string/crm_branch" />
 
-                <ImageButton style="@style/crm_ib_card_topRight"
-                    android:id="@+id/ib_em_condition" />
+               <!-- <ImageButton style="@style/crm_ib_card_topRight"
+                    android:id="@+id/ib_em_condition" />-->
             </RelativeLayout>
 
             <View style="@style/app_line_gray_1dp"></View>
-
-            <LinearLayout style="@style/LinearLayout_vertical">
+            <LinearLayout style="@style/LinearLayout_horizontal"
+                android:padding="10dp"
+                android:layout_weight="3">
+                <TextView
+                    android:layout_weight="2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                    android:text="              " />
+                <TextView
+                    android:text="计划销售额/毛利润"
+                    android:layout_weight="1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content" />
+                <TextView
+                    android:text="实际销售额/毛利润"
+                    android:layout_weight="1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content" />
+                </LinearLayout>
+            <LinearLayout style="@style/LinearLayout_horizontal"
+                android:padding="8dp">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_margin="5dp"
+                    android:layout_weight="1"
                     android:text="沈佳"
-                    android:id="@+id/tv_em_name" />
+                    android:id="@+id/tv_em_a" />
+                <TextView
+                    android:layout_weight="2"
+                    style="@style/TextView_VerticalCenter"
+                    android:text=" 元"
+                    android:id="@+id/tv_em_plana" />
+                <TextView
+                    android:layout_weight="2"
+                    style="@style/TextView_VerticalCenter"
+                    android:text=" 元"
+                    android:id="@+id/tv_em_salea" />
+
+                
+
+            </LinearLayout>
+            <LinearLayout style="@style/LinearLayout_horizontal"
+                android:padding="8dp">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_margin="5dp"
-                    android:text="第三事业部"
-                    android:id="@+id/tv_em_depart" />
-
-                <LinearLayout
-                    style="@style/crm_ll_sale_item"
-                    android:weightSum="2">
-
-                    <LinearLayout
-                        style="@style/LinearLayout_horizontal"
-                        android:layout_weight="1">
-
-                        <TextView
-                            style="@style/TextView_VerticalCenter"
-                            android:text="计划销售额：" />
-
-                        <TextView
-                            style="@style/TextView_VerticalCenter"
-                            android:text=" 元"
-                            android:id="@+id/tv_em_plan" />
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:layout_weight="1"
-                        style="@style/LinearLayout_horizontal">
-
-                        <TextView
-                            style="@style/TextView_VerticalCenter"
-                            android:text="实际销售额：" />
-
-                        <TextView
-                            style="@style/TextView_VerticalCenter"
-                            android:text=" 元"
-                            android:id="@+id/tv_em_sale" />
-                    </LinearLayout>
-                </LinearLayout>
+                    android:layout_weight="1"
+                    android:text="沈佳"
+                    android:id="@+id/tv_em_b" />
+                <TextView
+                    android:layout_weight="2"
+                    style="@style/TextView_VerticalCenter"
+                    android:text=" 元"
+                    android:id="@+id/tv_em_planb" />
+                <TextView
+                    android:layout_weight="2"
+                    style="@style/TextView_VerticalCenter"
+                    android:text=" 元"
+                    android:id="@+id/tv_em_saleb" />
 
-                <LinearLayout
-                    style="@style/crm_ll_sale_item"
-                    android:weightSum="2">
 
-                    <LinearLayout
-                        style="@style/LinearLayout_horizontal"
-                        android:layout_weight="1">
 
-                        <TextView
-                            style="@style/TextView_VerticalCenter"
-                            android:text="计划毛利润：" />
+            </LinearLayout>
+            <LinearLayout style="@style/LinearLayout_horizontal"
+                android:padding="8dp">
 
-                        <TextView
-                            style="@style/TextView_VerticalCenter"
-                            android:text=" 元"
-                            android:id="@+id/tv_em_planrirun" />
-                    </LinearLayout>
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="5dp"
+                    android:layout_weight="1"
+                    android:text="沈佳"
+                    android:id="@+id/tv_em_c" />
+                <TextView
+                    android:layout_weight="2"
+                    style="@style/TextView_VerticalCenter"
+                    android:text=" 元"
+                    android:id="@+id/tv_em_planc" />
+                <TextView
+                    android:layout_weight="2"
+                    style="@style/TextView_VerticalCenter"
+                    android:text=" 元"
+                    android:id="@+id/tv_em_salec" />
 
-                    <LinearLayout
-                        android:layout_weight="1"
-                        style="@style/LinearLayout_horizontal">
 
-                        <TextView
-                            style="@style/TextView_VerticalCenter"
-                            android:text="实际毛利润：" />
 
-                        <TextView
-                            style="@style/TextView_VerticalCenter"
-                            android:text=" 元"
-                            android:id="@+id/tv_em_rirun" />
-                    </LinearLayout>
-                </LinearLayout>
             </LinearLayout>
-
             <View style="@style/app_line_gray_1dp"></View>
 
-            <LinearLayout style="@style/LinearLayout_vertical">
+            <LinearLayout style="@style/LinearLayout_vertical"
+                android:visibility="gone">
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -543,7 +609,8 @@
 
             <View style="@style/app_line_gray_1dp"></View>
 
-            <LinearLayout style="@style/LinearLayout_vertical">
+            <LinearLayout style="@style/LinearLayout_vertical"
+                android:visibility="gone">
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -623,18 +690,26 @@
         </LinearLayout>
 
 
-        <LinearLayout style="@style/crm_ll_card">
+        <LinearLayout
+            android:layout_marginTop="10dp"
+            android:layout_marginLeft="0dp"
+            android:layout_marginRight="0dp"
+            style="@style/crm_ll_card">
 
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="40dp">
 
                 <TextView
+                    android:background="@drawable/icon_crm_tag"
                     style="@style/crm_tv_card_topLeft"
                     android:text="@string/crm_target" />
 
-                <ImageButton style="@style/crm_ib_card_topRight"
-                    android:id="@+id/ib_index_condition" />
+                <TextView
+                    android:text="筛选"
+                    android:drawableRight="@drawable/nav_icon_search_default"
+                    android:id="@+id/ib_index_condition"
+                    style="@style/crm_ib_card_topRight" />
             </RelativeLayout>
 
             <View style="@style/app_line_gray_1dp"></View>
@@ -644,6 +719,7 @@
                 android:weightSum="2">
 
                 <LinearLayout
+                    android:visibility="gone"
                     android:layout_weight="1"
                     android:padding="10dp"
                     style="@style/LinearLayout_vertical">
@@ -691,7 +767,6 @@
                         android:id="@+id/crm_chart_bar"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-
                         android:layout_marginTop="10dp"
                         android:layout_marginBottom="10dp" />
                 </LinearLayout>
@@ -699,6 +774,9 @@
         </LinearLayout>
 
         <LinearLayout
+            android:layout_marginTop="10dp"
+            android:layout_marginLeft="0dp"
+            android:layout_marginRight="0dp"
             style="@style/crm_ll_card"
             android:layout_height="wrap_content">
 
@@ -707,6 +785,7 @@
                 android:layout_height="40dp">
 
                 <TextView
+                    android:background="@drawable/icon_crm_tag"
                     android:id="@+id/tv_leave_title"
                     style="@style/crm_tv_card_topLeft"
                     android:text="@string/crm_customer_forget" />

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

@@ -8,15 +8,16 @@
     <LinearLayout
         android:layout_margin="0dp"
         android:layout_height="wrap_content"
-        android:background="@color/crm_basic_bg"
+        android:background="@color/gray_light"
         style="@style/crm_ll_card">
 
         <LinearLayout
             android:layout_height="wrap_content"
-            style="@style/LinearLayout_vertical">
+            style="@style/LinearLayout_vertical"
+            android:visibility="gone">
 
             <TextView
-                android:id="@+id/tv_company_name"
+              
                 android:textSize="18sp"
                 android:layout_margin="20dp"
                 android:textColor="@color/white"
@@ -24,7 +25,7 @@
                 style="@style/TextView_VerticalCenter" />
 
             <TextView
-                android:id="@+id/tv_leader"
+              
                 android:layout_marginLeft="20dp"
                 android:layout_marginBottom="5dp"
                 android:textColor="@color/white"
@@ -40,7 +41,7 @@
                 style="@style/TextView_VerticalCenter" />
 
             <TextView
-                android:id="@+id/tv_lastDate"
+              
                 android:layout_marginLeft="20dp"
                 android:layout_marginBottom="5dp"
                 android:textColor="@color/white"
@@ -68,15 +69,32 @@
                     android:layout_margin="10dp"
                     android:textSize="15sp"
                     android:textColor="#FF8E57"
-                    android:text="客户信息" />
+                    android:text="基本信息" />
             </LinearLayout>
 
             <LinearLayout
-                android:layout_margin="10dp"
+                android:layout_margin="5dp"
                 style="@style/LinearLayout_horizontal">
 
                 <TextView
-                    android:text="地址"
+                    android:text="客户名称"
+                    android:textColor="@color/gray_light"
+                    android:layout_marginLeft="10dp"
+                    android:layout_width="70dp"
+                    style="@style/TextView_VerticalCenter" />
+
+                <TextView
+                    android:id="@+id/tv_company_name"
+                    android:layout_marginLeft="5dp"
+                    style="@style/TextView_VerticalCenter" />
+            </LinearLayout>
+       
+            <LinearLayout
+                android:layout_margin="5dp"
+                style="@style/LinearLayout_horizontal">
+
+                <TextView
+                    android:text="客户地址"
                     android:textColor="@color/gray_light"
                     android:layout_marginLeft="10dp"
                     android:layout_width="70dp"
@@ -85,32 +103,95 @@
                 <TextView
                     android:id="@+id/tv_address"
                     android:layout_marginLeft="5dp"
-                    android:text="深圳市南山区科技园科技南五路"
+                    style="@style/TextView_VerticalCenter" />
+            </LinearLayout>
+            <LinearLayout
+                android:layout_margin="5dp"
+                style="@style/LinearLayout_horizontal">
+
+                <TextView
+                    android:text="客户类型"
+                    android:textColor="@color/gray_light"
+                    android:layout_marginLeft="10dp"
+                    android:layout_width="70dp"
+                    style="@style/TextView_VerticalCenter" />
+
+                <TextView
+                    android:id="@+id/tv_type"
+                    android:layout_marginLeft="5dp"
+                    style="@style/TextView_VerticalCenter" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_margin="5dp"
+                style="@style/LinearLayout_horizontal">
+
+                <TextView
+                    android:text="所属地区"
+                    android:textColor="@color/gray_light"
+                    android:layout_marginLeft="10dp"
+                    android:layout_width="70dp"
+                    style="@style/TextView_VerticalCenter" />
+
+                <TextView
+                    android:id="@+id/tv_diqu"
+                    android:layout_marginLeft="5dp"
                     style="@style/TextView_VerticalCenter" />
             </LinearLayout>
 
             <LinearLayout
-                android:layout_margin="10dp"
+                android:layout_margin="5dp"
                 style="@style/LinearLayout_horizontal">
 
                 <TextView
-                    android:text="领取时间"
+                    android:text="业务员"
                     android:textColor="@color/gray_light"
                     android:layout_marginLeft="10dp"
                     android:layout_width="70dp"
                     style="@style/TextView_VerticalCenter" />
 
                 <TextView
-                    android:id="@+id/tv_receiveTime"
+                    android:id="@+id/tv_leader"
                     android:layout_marginLeft="5dp"
-                    android:text="2016-07-05 18:00"
                     style="@style/TextView_VerticalCenter" />
             </LinearLayout>
+            <LinearLayout
+                android:layout_margin="5dp"
+                style="@style/LinearLayout_horizontal">
 
+                <TextView
+                    android:text="营业执照"
+                    android:textColor="@color/gray_light"
+                    android:layout_marginLeft="10dp"
+                    android:layout_width="70dp"
+                    style="@style/TextView_VerticalCenter" />
+
+                <TextView
+                    android:id="@+id/tv_zhihzhao"
+                    android:layout_marginLeft="5dp"
+                    style="@style/TextView_VerticalCenter" />
+            </LinearLayout>
             <LinearLayout
-                android:layout_margin="10dp"
+                android:layout_margin="5dp"
                 style="@style/LinearLayout_horizontal">
 
+                <TextView
+                    android:text="跟进时间"
+                    android:textColor="@color/gray_light"
+                    android:layout_marginLeft="10dp"
+                    android:layout_width="70dp"
+                    style="@style/TextView_VerticalCenter" />
+
+                <TextView
+                    android:id="@+id/tv_lastDate"
+                    android:layout_marginLeft="5dp"
+                    style="@style/TextView_VerticalCenter" />
+            </LinearLayout>
+            <LinearLayout
+                android:layout_margin="5dp"
+                style="@style/LinearLayout_horizontal"
+                android:visibility="gone">
+
                 <TextView
                     android:text="来源"
                     android:textColor="@color/gray_light"
@@ -126,8 +207,9 @@
             </LinearLayout>
 
             <LinearLayout
-                android:layout_margin="10dp"
-                style="@style/LinearLayout_horizontal">
+                android:layout_margin="5dp"
+                style="@style/LinearLayout_horizontal"
+                android:visibility="gone">
 
                 <TextView
                     android:text="行业"
@@ -144,8 +226,9 @@
             </LinearLayout>
 
             <LinearLayout
-                android:layout_margin="10dp"
-                style="@style/LinearLayout_horizontal">
+                android:layout_margin="5dp"
+                style="@style/LinearLayout_horizontal"
+                android:visibility="gone">
 
                 <TextView
                     android:text="电话"
@@ -163,6 +246,7 @@
         </LinearLayout>
 
         <LinearLayout
+            android:layout_marginTop="10dp"
             android:layout_height="wrap_content"
             style="@style/crm_ll_card">
 
@@ -190,25 +274,81 @@
             </LinearLayout>
 
             <LinearLayout
-                android:layout_margin="10dp"
+                android:layout_margin="5dp"
                 style="@style/LinearLayout_horizontal">
 
                 <TextView
-                    android:text="郑国栋"
+                    android:text="姓名"
 
                     android:layout_marginLeft="10dp"
                     android:layout_width="70dp"
-                    style="@style/TextView_VerticalCenter" />
+                    style="@style/TextView_VerticalCenter"
+                    android:textColor="@color/gray_light" />
 
                 <TextView
                     android:textColor="@color/gray_light"
                     android:layout_marginLeft="5dp"
-                    android:text="销售经理"
-                    style="@style/TextView_VerticalCenter" />
+                    style="@style/TextView_VerticalCenter"
+                    android:id="@+id/tv_name" />
+            </LinearLayout>
+            <LinearLayout
+                android:layout_margin="5dp"
+                style="@style/LinearLayout_horizontal">
+
+                <TextView
+                    android:text="岗位"
+
+                    android:layout_marginLeft="10dp"
+                    android:layout_width="70dp"
+                    style="@style/TextView_VerticalCenter"
+                    android:textColor="@color/gray_light" />
+
+                <TextView
+                    android:textColor="@color/gray_light"
+                    android:layout_marginLeft="5dp"
+                    style="@style/TextView_VerticalCenter"
+                    android:id="@+id/tv_position" />
+            </LinearLayout>
+            <LinearLayout
+                android:layout_margin="5dp"
+                style="@style/LinearLayout_horizontal">
+
+                <TextView
+                    android:text="电话"
+
+                    android:layout_marginLeft="10dp"
+                    android:layout_width="70dp"
+                    style="@style/TextView_VerticalCenter"
+                    android:textColor="@color/gray_light" />
+
+                <TextView
+                    android:textColor="@color/gray_light"
+                    android:layout_marginLeft="5dp"
+                    style="@style/TextView_VerticalCenter"
+                    android:id="@+id/tv_mobile" />
+            </LinearLayout>
+            <LinearLayout
+                android:layout_margin="5dp"
+                style="@style/LinearLayout_horizontal">
+
+                <TextView
+                    android:text="邮箱"
+
+                    android:layout_marginLeft="10dp"
+                    android:layout_width="70dp"
+                    style="@style/TextView_VerticalCenter"
+                    android:textColor="@color/gray_light" />
+
+                <TextView
+                    android:textColor="@color/gray_light"
+                    android:layout_marginLeft="5dp"
+                    style="@style/TextView_VerticalCenter"
+                    android:id="@+id/tv_email" />
             </LinearLayout>
         </LinearLayout>
 
         <LinearLayout
+            android:layout_marginTop="10dp"
             android:layout_height="wrap_content"
             style="@style/crm_ll_card">
 
@@ -238,6 +378,7 @@
         </LinearLayout>
 
         <LinearLayout
+            android:layout_marginTop="10dp"
             android:layout_height="wrap_content"
             style="@style/crm_ll_card">
 
@@ -256,7 +397,7 @@
                     android:layout_margin="10dp"
                     android:textSize="15sp"
                     android:textColor="#FF8E57"
-                    android:text="费用" />
+                    android:text="财务信息" />
             </LinearLayout>
 
             <RelativeLayout
@@ -266,35 +407,53 @@
                 <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_alignParentLeft="true"
-                    style="@style/LinearLayout_vertical">
+                    style="@style/LinearLayout_horizontal">
 
                     <TextView
-                        android:text="报销中"
+                        android:text="币别"
                         android:layout_margin="10dp"
                         style="@style/TextView_VerticalCenter" />
 
                     <TextView
-                        android:id="@+id/tv_reimbursementIng"
-                        android:text="0元"
-                        android:layout_gravity="center_horizontal"
+                     
+                        android:text="人民币"
+                       
+                        android:layout_gravity="center"
                         android:layout_margin="10dp"
                         style="@style/TextView_VerticalCenter" />
                 </LinearLayout>
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_centerInParent="true"
+                    style="@style/LinearLayout_horizontal">
 
+                    <TextView
+                        android:text="费率"
+                        android:layout_margin="10dp"
+                        style="@style/TextView_VerticalCenter" />
+
+                    <TextView
+                        android:id="@+id/tv_feilv"
+                        android:text="0元"
+
+                        android:layout_gravity="center"
+                        android:layout_margin="10dp"
+                        style="@style/TextView_VerticalCenter" />
+                </LinearLayout>
                 <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_alignParentRight="true"
-                    style="@style/LinearLayout_vertical">
+                    style="@style/LinearLayout_horizontal">
 
                     <TextView
-                        android:text="已报销"
+                        android:text="费用报销"
                         android:layout_margin="10dp"
                         style="@style/TextView_VerticalCenter" />
 
                     <TextView
-                        android:id="@+id/tv_reimbursement_end"
+                        android:id="@+id/tv_feiyonged"
                         android:text="0元"
-                        android:layout_gravity="center_horizontal"
+                        android:layout_gravity="center"
                         android:layout_margin="10dp"
                         style="@style/TextView_VerticalCenter" />
                 </LinearLayout>
@@ -304,6 +463,7 @@
         </LinearLayout>
 
         <LinearLayout
+            android:layout_marginTop="10dp"
             android:layout_height="wrap_content"
             style="@style/crm_ll_card">
 
@@ -330,27 +490,30 @@
                 android:layout_height="wrap_content">
 
                 <LinearLayout
+                    android:id="@+id/ll_left"
+                    android:layout_below="@+id/ll_right"
                     android:layout_width="wrap_content"
                     android:layout_alignParentLeft="true"
-                    style="@style/LinearLayout_vertical">
+                    style="@style/LinearLayout_horizontal">
 
                     <TextView
-                        android:text="修改记录"
+                        android:text="备注"
                         android:layout_margin="10dp"
                         style="@style/TextView_VerticalCenter" />
 
                     <TextView
                         android:id="@+id/tv_modifyRecord"
                         android:text="0条"
-                        android:layout_gravity="center_horizontal"
+                        android:layout_gravity="center"
                         android:layout_margin="10dp"
                         style="@style/TextView_VerticalCenter" />
                 </LinearLayout>
 
                 <LinearLayout
+                    android:id="@+id/ll_right"
                     android:layout_width="wrap_content"
-                    android:layout_alignParentRight="true"
-                    style="@style/LinearLayout_vertical">
+                   
+                    style="@style/LinearLayout_horizontal">
 
                     <TextView
                         android:text="拜访次数"
@@ -360,13 +523,28 @@
                     <TextView
                         android:id="@+id/tv_visitTimes"
                         android:text="0次"
-                        android:layout_gravity="center_horizontal"
+                        android:layout_gravity="center"
                         android:layout_margin="10dp"
                         style="@style/TextView_VerticalCenter" />
                 </LinearLayout>
 
             </RelativeLayout>
         </LinearLayout>
+
+        <LinearLayout
+           
+            android:layout_height="wrap_content"
+            style="@style/crm_ll_card">
+            <View style="@style/app_line_gray_1dp"
+                ></View>
+           <Button
+               android:layout_width="match_parent"
+               android:layout_height="wrap_content" 
+               android:padding="10dp"
+               android:background="@null"
+               android:text="添加到拜访记录"
+               />
+        </LinearLayout>
     </LinearLayout>
 
 </ScrollView>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:whatever="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -7,217 +7,471 @@
     tools:context="com.xzjmyk.pm.activity.ui.erp.activity.crm.CustomerAddActivity">
 
     <LinearLayout
-        android:id="@+id/ly_head_display"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
+        <!--<ImageView style="@style/app_comm_list_line_gray" />-->
+
         <RelativeLayout
-            android:visibility="gone"
-            android:id="@+id/ry_leave_man"
             style="@style/form_relative_customer"
-            android:background="@color/item_color1">
+            android:background="@color/item_color2">
 
 
             <TextView
-                android:id="@+id/tv_leave_man"
+                android:id="@+id/tv_c13"
                 style="@style/form_relative_left_text"
                 android:text="客户编号："
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
 
+            <TextView
+                style="@style/form_relative_left_text"
+                android:layout_marginLeft="10dp"
+                android:layout_toRightOf="@+id/tv_c13"
+                android:text="*"
+                android:textColor="@color/red" />
+
             <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
-                android:id="@+id/et_leave_man"
+                android:id="@+id/et_cu_code"
                 style="@style/form_relative_right_text"
+                android:hint="请输入"
                 editTextFormExample:testType="nocheck" />
         </RelativeLayout>
 
-        <!--<ImageView style="@style/app_comm_list_line_gray" />-->
-
         <RelativeLayout
-            android:id="@+id/ry_leave_mankind"
             style="@style/form_relative_customer"
             android:background="@color/item_color2">
 
 
             <TextView
-                android:id="@+id/tv_leave_mankind"
+                android:id="@+id/tv_c12"
                 style="@style/form_relative_left_text"
                 android:text="客户名称："
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
 
+            <TextView
+                style="@style/form_relative_left_text"
+                android:layout_marginLeft="10dp"
+                android:layout_toRightOf="@+id/tv_c12"
+                android:text="*"
+                android:textColor="@color/red" />
+
             <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                 android:id="@+id/et_cu_name"
                 style="@style/form_relative_right_text"
+                android:hint="请输入"
                 editTextFormExample:testType="nocheck" />
         </RelativeLayout>
 
+        <!--<ImageView style="@style/app_comm_list_line_gray" />-->
         <RelativeLayout
-            android:id="@+id/ry_leave_type"
             style="@style/form_relative_customer"
-            android:visibility="gone">
+            android:background="@color/item_color2">
 
 
             <TextView
-                android:id="@+id/tv_leave_type"
+                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" />
 
             <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
-                android:id="@+id/et_leave_type"
+                android:id="@+id/et_cu_shortname"
                 style="@style/form_relative_right_text"
-                android:focusableInTouchMode="false"
+                android:hint="请输入"
+                editTextFormExample:testType="nocheck" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            style="@style/form_relative_customer"
+            android:background="@color/item_color2">
+
+            <TextView
+                android:id="@+id/tv_c1"
+                style="@style/form_relative_left_text"
+                android:text="客户地址："
+                android:textColor="@color/text_main"
+                android:textSize="@dimen/text_main" />
+
+            <TextView
+                style="@style/form_relative_left_text"
+                android:layout_marginLeft="10dp"
+                android:layout_toRightOf="@+id/tv_c1"
+                android:text="*"
+                android:textColor="@color/red" />
+
+            <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+                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>
 
-        <!--<ImageView style="@style/app_comm_list_line_gray" />-->
 
         <RelativeLayout
-            android:id="@+id/ry_leave_category"
             style="@style/form_relative_customer"
-            android:background="@color/item_color1">
+            android:background="@color/item_color2">
 
             <TextView
-                android:id="@+id/tv_leave_category"
+                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" />
 
+            <TextView
+                style="@style/form_relative_left_text"
+                android:layout_marginLeft="10dp"
+                android:layout_toRightOf="@+id/tv_c2"
+                android:text="*"
+                android:textColor="@color/red" />
+
             <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
-                android:id="@+id/et_cu_source"
+                android:id="@+id/et_cu_kind"
                 style="@style/form_relative_right_text"
+                android:drawableRight="@drawable/nav_icon_search_default"
+                android:hint="请选择"
                 editTextFormExample:testType="nocheck" />
+
         </RelativeLayout>
 
         <!--<ImageView style="@style/app_comm_list_line_gray" />-->
 
         <RelativeLayout
-            android:id="@+id/ry_set_website"
             style="@style/form_relative_customer"
             android:background="@color/item_color2">
 
 
             <TextView
-                android:id="@+id/tv_iv_leave_days"
+                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" />
 
+            <TextView
+                style="@style/form_relative_left_text"
+                android:layout_marginLeft="10dp"
+                android:layout_toRightOf="@+id/tv_c3"
+                android:text="*"
+                android:textColor="@color/red" />
+
             <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
-                android:id="@+id/et_cu_industry"
+                android:id="@+id/et_cu_district"
                 style="@style/form_relative_right_text"
+                android:drawableRight="@drawable/nav_icon_search_default"
+                android:hint="请选择"
                 whatever:customRegexp="^(([0-9])|([0-9]+\\.?[0-9]+))$"
                 whatever:testErrorString="@string/error_only_numeric_digits_allowed"
-                whatever:testType="regexp" />
+                whatever:testType="nocheck" />
         </RelativeLayout>
 
         <!--<ImageView style="@style/app_comm_list_line_gray" />-->
 
         <RelativeLayout
-            android:id="@+id/ry_leave_hours"
             style="@style/form_relative_customer"
-            android:background="@color/item_color1">
+            android:background="@color/item_color2">
 
 
             <TextView
-                android:id="@+id/tv_leave_hours"
+                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" />
 
+            <TextView
+                style="@style/form_relative_left_text"
+                android:layout_marginLeft="10dp"
+                android:layout_toRightOf="@+id/tv_c4"
+                android:text="*"
+                android:textColor="@color/red" />
+
             <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
-                android:id="@+id/et_cu_defaultLevel"
+                android:id="@+id/et_cu_payments"
                 style="@style/form_relative_right_text"
-
+                android:drawableRight="@drawable/nav_icon_search_default"
+                android:hint="请选择"
                 whatever:customRegexp="^(([0-9])|([0-9]+\\.?[0-9]+))$"
                 whatever:testErrorString="@string/error_only_numeric_digits_allowed"
-                whatever:testType="regexp" />
+                whatever:testType="nocheck" />
         </RelativeLayout>
 
         <!--<ImageView style="@style/app_comm_list_line_gray" />-->
 
         <RelativeLayout
-            android:id="@+id/ry_leave_reason"
             style="@style/form_relative_customer"
             android:background="@color/item_color2">
 
 
             <TextView
-                android:id="@+id/tv_leave_reason"
+                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" />
 
+            <TextView
+                style="@style/form_relative_left_text"
+                android:layout_marginLeft="25dp"
+                android:layout_toRightOf="@+id/tv_c5"
+                android:text="*"
+                android:textColor="@color/red" />
+
             <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
-                android:id="@+id/et_cu_tel"
+                android:id="@+id/et_cu_sellername"
                 style="@style/form_relative_right_text"
+                android:drawableRight="@drawable/nav_icon_search_default"
+                android:hint="请选择"
                 editTextFormExample:testType="nocheck" />
         </RelativeLayout>
 
 
         <RelativeLayout
-            android:id="@+id/ry_set_startTime"
             style="@style/form_relative_customer"
-            android:background="@color/item_color1">
+            android:background="@color/item_color2">
+
+
+            <TextView
+                android:id="@+id/tv_c6"
+                style="@style/form_relative_left_text"
+                android:text="联系人："
+                android:textColor="@color/text_main"
+                android:textSize="@dimen/text_main" />
+
+            <TextView
+                style="@style/form_relative_left_text"
+                android:layout_marginLeft="25dp"
+                android:layout_toRightOf="@+id/tv_c6"
+                android:text="*"
+                android:textColor="@color/red" />
+
+            <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+                android:id="@+id/tv_cu_contact"
+                style="@style/form_relative_right_text"
+                android:hint="请输入"
+                editTextFormExample:customFormat="yyyy-MM-dd HH:mm"
+                editTextFormExample:testType="nocheck" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            style="@style/form_relative_customer"
+            android:background="@color/item_color2">
+
+
+            <TextView
+                android:id="@+id/tv_c7"
+                style="@style/form_relative_left_text"
+                android:text="岗位："
+                android:textColor="@color/text_main"
+                android:textSize="@dimen/text_main" />
+
+            <TextView
+                style="@style/form_relative_left_text"
+                android:layout_marginLeft="42dp"
+                android:layout_toRightOf="@+id/tv_c7"
+                android:text="*"
+                android:textColor="@color/red" />
+
+            <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+                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>
+
+        <RelativeLayout
+            style="@style/form_relative_customer"
+            android:background="@color/item_color2">
 
 
             <TextView
-                android:id="@+id/tv_set_"
+                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" />
 
+            <TextView
+                style="@style/form_relative_left_text"
+                android:layout_marginLeft="42dp"
+                android:layout_toRightOf="@+id/tv_c8"
+                android:text="*"
+                android:textColor="@color/red" />
+
             <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
-                android:id="@+id/tv_cu_lastDate"
+                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>
 
 
         <RelativeLayout
-            android:id="@+id/ry_set_endTime"
             style="@style/form_relative_customer"
             android:background="@color/item_color2">
 
             <TextView
-                android:id="@+id/tv_date_gh"
+                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" />
 
+            <TextView
+                style="@style/form_relative_left_text"
+                android:layout_marginLeft="42dp"
+                android:layout_toRightOf="@+id/tv_c9"
+                android:text="*"
+                android:textColor="@color/red" />
+
             <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
-                android:id="@+id/tv_cu_address"
+                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>
 
+        <LinearLayout
+            android:id="@+id/ll_infomal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <RelativeLayout
+                style="@style/form_relative_customer"
+                android:background="@color/item_color2">
+
+                <TextView
+                    android:id="@+id/tv_c14"
+                    style="@style/form_relative_left_text"
+                    android:text="营业执照："
+                    android:textColor="@color/text_main"
+                    android:textSize="@dimen/text_main" />
+
+                <TextView
+                    style="@style/form_relative_left_text"
+                    android:layout_marginLeft="10dp"
+                    android:layout_toRightOf="@+id/tv_c14"
+                    android:text="*"
+                    android:textColor="@color/red" />
+
+                <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+                    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>
+
+            <RelativeLayout
+                style="@style/form_relative_customer"
+                android:background="@color/item_color2">
+
+                <TextView
+                    android:id="@+id/tv_c15"
+                    style="@style/form_relative_left_text"
+                    android:text="币别："
+                    android:textColor="@color/text_main"
+                    android:textSize="@dimen/text_main" />
+
+                <TextView
+                    style="@style/form_relative_left_text"
+                    android:layout_marginLeft="42dp"
+                    android:layout_toRightOf="@+id/tv_c15"
+                    android:text="*"
+                    android:textColor="@color/red" />
+
+                <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+                    android:id="@+id/tv_cu_currency"
+                    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>
+
+            <RelativeLayout
+                style="@style/form_relative_customer"
+                android:background="@color/item_color2">
+
+                <TextView
+                    android:id="@+id/tv_c16"
+                    style="@style/form_relative_left_text"
+                    android:text="税率："
+                    android:textColor="@color/text_main"
+                    android:textSize="@dimen/text_main" />
+
+                <TextView
+                    style="@style/form_relative_left_text"
+                    android:layout_marginLeft="42dp"
+                    android:layout_toRightOf="@+id/tv_c16"
+                    android:text="*"
+                    android:textColor="@color/red" />
+
+                <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+                    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>
+
+            <RelativeLayout
+                style="@style/form_relative_customer"
+                android:background="@color/item_color2">
+
+                <TextView
+                    android:id="@+id/tv_c17"
+                    style="@style/form_relative_left_text"
+                    android:text="当前阶段："
+                    android:textColor="@color/text_main"
+                    android:textSize="@dimen/text_main" />
+
+                <TextView
+                    style="@style/form_relative_left_text"
+                    android:layout_marginLeft="10dp"
+                    android:layout_toRightOf="@+id/tv_c17"
+                    android:text="*"
+                    android:textColor="@color/red" />
+
+                <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+                    android:id="@+id/tv_cu_nichestep"
+                    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>
+
         <RelativeLayout
             style="@style/form_relative_customer"
-            android:background="@color/item_color1">
+            android:background="@color/item_color2">
 
 
             <TextView
-                android:id="@+id/tv_note_"
+                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" />
 
             <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                 android:id="@+id/tv_cu_remark"
                 style="@style/form_relative_right_text"
+                android:hint="请输入"
                 editTextFormExample:customFormat="yyyy-MM-dd HH:mm"
-                editTextFormExample:testType="nocheck"/>
+                editTextFormExample:testType="nocheck" />
         </RelativeLayout>
     </LinearLayout>
-</RelativeLayout>
+</ScrollView>

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

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:whatever="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fillViewport="true">
@@ -13,36 +14,37 @@
 
         <RelativeLayout
             android:id="@+id/rl_name"
-            style="@style/IMTbleLine_UP_Me"
-            android:layout_marginBottom="20dp"
-            android:background="@color/white">
+            style="@style/form_relative_customer"
+            android:background="@color/item_color2">
 
             <TextView
                 android:id="@+id/name_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:drawableLeft="@drawable/oa_client"
                 android:drawablePadding="10dp"
                 android:gravity="center"
-                android:text="任务标题"
+                android:layout_marginLeft="20dp"
+                android:text="名称"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
-
-            <EditText
-                android:id="@+id/tv_name"
-                style="@style/IMTbleLine_TextValue"
+            <TextView
+                style="@style/form_relative_left_text"
+                android:layout_marginLeft="60dp"
                 android:layout_toRightOf="@+id/name_text"
-                android:background="@null"
-                android:textColor="@color/text_hine"
-                android:textSize="@dimen/text_hine" />
-
+                android:text="*"
+                android:textColor="@color/red" />
+            <!--  android:drawableRight="@drawable/nav_icon_search_default"-->
+            <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+                android:id="@+id/tv_name"
+                style="@style/form_relative_right_text"
+                editTextFormExample:testType="nocheck"
+                android:hint="请输入" />
         </RelativeLayout>
 
         <RelativeLayout
             android:id="@+id/sex_erp_rl"
-            style="@style/IMTbleLine_UP_Me"
-            android:layout_marginBottom="1dp"
+            style="@style/form_relative_customer"
             android:background="@color/white">
 
             <TextView
@@ -50,116 +52,121 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:drawableLeft="@drawable/oa_client"
-                android:drawablePadding="10dp"
+                android:layout_marginLeft="20dp"
                 android:gravity="center"
                 android:text="执行人"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
 
-            <EditText
-                android:id="@+id/tv_executive"
-                style="@style/IMTbleLine_TextValue"
-                android:layout_toLeftOf="@+id/sex_arrow_img"
+            <TextView
+                style="@style/form_relative_left_text"
+                android:layout_marginLeft="43dp"
                 android:layout_toRightOf="@+id/sex_text"
-                android:background="@null"
-                android:focusable="false"
-                android:textColor="@color/text_hine"
-                android:textSize="@dimen/text_hine" />
-
-            <ImageView
-                android:id="@+id/sex_arrow_img"
-                android:layout_width="@dimen/next_width"
-                android:layout_height="@dimen/next_height"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:alpha="0.26"
-                android:background="@drawable/set_list_next"
-                android:contentDescription="@string/app_name" />
+                android:text="*"
+                android:textColor="@color/red" />
+
+            <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+                android:id="@+id/tv_executive"
+                style="@style/form_relative_right_text"
+                android:drawableRight="@drawable/nav_icon_search_default"
+                editTextFormExample:testType="nocheck"
+                android:hint="请选择" />
         </RelativeLayout>
 
+        <RelativeLayout
+            style="@style/form_relative_customer"
+            android:background="@color/white">
+
+            <TextView
+                android:id="@+id/tv_id1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="20dp"
+                android:layout_centerVertical="true"
+                android:gravity="center"
+                android:text="开始日期"
+                android:textColor="@color/text_main"
+                android:textSize="@dimen/text_main" />
+            <TextView
+                style="@style/form_relative_left_text"
+                android:layout_marginLeft="25dp"
+                android:layout_toRightOf="@+id/tv_id1"
+                android:text="*"
+                android:textColor="@color/red" />
+          
+            <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+                android:id="@+id/tv_date_start"
+                style="@style/form_relative_right_text"
+                android:drawableRight="@drawable/nav_icon_search_default"
+                editTextFormExample:testType="nocheck"
+                android:hint="请选择" />
+          
+        </RelativeLayout>
         <RelativeLayout
             android:id="@+id/company_erp_rl"
-            style="@style/IMTbleLine_UP_Me"
-            android:layout_marginBottom="1dp"
+            style="@style/form_relative_customer"
             android:background="@color/white">
 
             <TextView
-                android:id="@+id/company_text"
+                android:id="@+id/tv_id2"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:drawableLeft="@drawable/oa_client"
+                android:layout_marginLeft="20dp"
                 android:drawablePadding="10dp"
                 android:gravity="center"
-                android:text="执行日期"
+                android:text="截止日期"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
+            <TextView
+                style="@style/form_relative_left_text"
+                android:layout_marginLeft="25dp"
+                android:layout_toRightOf="@+id/tv_id2"
+                android:text="*"
+                android:textColor="@color/red" />
 
-            <EditText
+            <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                 android:id="@+id/tv_date"
-                style="@style/IMTbleLine_TextValue"
-                android:layout_toLeftOf="@+id/company_arrow_img"
-                android:layout_toRightOf="@+id/company_text"
-                android:background="@null"
-                android:focusable="false"
-                android:textColor="@color/text_hine"
-                android:textSize="@dimen/text_hine" />
-
-            <ImageView
-                android:id="@+id/company_arrow_img"
-                android:layout_width="@dimen/next_width"
-                android:layout_height="@dimen/next_height"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:alpha="0.26"
-                android:background="@drawable/set_list_next"
-                android:contentDescription="@string/app_name" />
-        </RelativeLayout>
+                style="@style/form_relative_right_text"
+                android:drawableRight="@drawable/nav_icon_search_default"
+                editTextFormExample:testType="nocheck"
+                android:hint="请选择" />
 
+        </RelativeLayout>
         <RelativeLayout
             android:id="@+id/deparment_erp_rl"
-            style="@style/IMTbleLine_UP_Me"
-            android:layout_marginBottom="20dp"
+            style="@style/form_relative_customer"
+          
             android:background="@color/white">
 
             <TextView
-                android:id="@+id/deparment_text"
+                android:id="@+id/tv_id3"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:drawableLeft="@drawable/oa_client"
+                android:layout_marginLeft="20dp"
                 android:drawablePadding="10dp"
                 android:gravity="center"
                 android:text="紧急程度"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
-
-            <EditText
+            <TextView
+                style="@style/form_relative_left_text"
+                android:layout_marginLeft="25dp"
+                android:layout_toRightOf="@+id/tv_id3"
+                android:text="*"
+                android:textColor="@color/red" />
+            <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                 android:id="@+id/tv_priority"
-                style="@style/IMTbleLine_TextValue"
-                android:layout_toLeftOf="@+id/deparment_arrow_img"
-                android:layout_toRightOf="@+id/deparment_text"
-                android:background="@null"
-                android:focusable="false"
-                android:textColor="@color/text_hine"
-                android:textSize="@dimen/text_hine" />
-
-            <ImageView
-                android:id="@+id/deparment_arrow_img"
-                android:layout_width="@dimen/next_width"
-                android:layout_height="@dimen/next_height"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:alpha="0.26"
-                android:background="@drawable/set_list_next"
-                android:contentDescription="@string/app_name" />
+                style="@style/form_relative_right_text"
+                android:drawableRight="@drawable/nav_icon_search_default"
+                editTextFormExample:testType="nocheck"
+                android:hint="请选择" />
         </RelativeLayout>
 
         <RelativeLayout
             android:id="@+id/position_erp_rl"
-            style="@style/IMTbleLine_UP_Me"
-            android:layout_marginBottom="1dp"
+            style="@style/form_relative_customer"
             android:background="@color/white">
 
             <TextView
@@ -167,60 +174,44 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:drawableLeft="@drawable/oa_client"
+                android:layout_marginLeft="20dp"
                 android:drawablePadding="10dp"
                 android:gravity="center"
                 android:text="类型"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
-
-            <TextView
+            
+            <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                 android:id="@+id/tv_type"
-                style="@style/IMTbleLine_TextValue"
-                android:layout_toRightOf="@+id/position_text"
-                android:background="@null"
-                android:textColor="@color/text_hine"
-                android:textSize="@dimen/text_hine" />
-
+                style="@style/form_relative_right_text"
+                editTextFormExample:testType="nocheck"
+                android:text="任务" />
         </RelativeLayout>
 
         <RelativeLayout
             android:id="@+id/tel_erp_rl"
             style="@style/IMTbleLine_UP_Me"
             android:layout_marginBottom="1dp"
-            android:background="@color/white">
+            android:background="@color/white"
+            android:visibility="gone">
 
             <TextView
                 android:id="@+id/customer_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:drawableLeft="@drawable/oa_client"
+           
                 android:drawablePadding="10dp"
                 android:gravity="center"
                 android:text="关联客户"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
-
-            <EditText
+            
+            <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                 android:id="@+id/tv_customer"
-                style="@style/IMTbleLine_TextValue"
-                android:layout_marginBottom="1dp"
-                android:layout_toLeftOf="@+id/customer_arrow_img"
-                android:layout_toRightOf="@+id/customer_text"
-                android:background="@null"
-                android:textColor="@color/text_hine"
-                android:textSize="@dimen/text_hine" />
-
-            <ImageView
-                android:id="@+id/customer_arrow_img"
-                android:layout_width="@dimen/next_width"
-                android:layout_height="@dimen/next_height"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:alpha="0.26"
-                android:background="@drawable/set_list_next"
-                android:contentDescription="@string/app_name" />
+                style="@style/form_relative_right_text"
+                editTextFormExample:testType="nocheck"
+                android:hint="请选择" />
         </RelativeLayout>
 
 
@@ -228,45 +219,36 @@
             android:id="@+id/startTime_erp_rl"
             style="@style/IMTbleLine_UP_Me"
             android:layout_marginBottom="1dp"
-            android:background="@color/white">
+            android:background="@color/white"
+            android:visibility="gone">
 
             <TextView
                 android:id="@+id/startTime_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:drawableLeft="@drawable/oa_client"
+          
                 android:drawablePadding="10dp"
                 android:gravity="center"
                 android:text="提醒"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
 
-            <EditText
+          
+
+            <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                 android:id="@+id/tv_notice"
-                style="@style/IMTbleLine_TextValue"
-                android:layout_toLeftOf="@+id/startTime_arrow_img"
-                android:layout_toRightOf="@+id/startTime_text"
-                android:background="@null"
-                android:textColor="@color/text_hine"
-                android:textSize="@dimen/text_hine" />
-
-            <ImageView
-                android:id="@+id/startTime_arrow_img"
-                android:layout_width="@dimen/next_width"
-                android:layout_height="@dimen/next_height"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:alpha="0.26"
-                android:background="@drawable/set_list_next"
-                android:contentDescription="@string/app_name" />
+                style="@style/form_relative_right_text"
+                editTextFormExample:testType="nocheck"
+                android:hint="请选择" />
         </RelativeLayout>
 
 
         <RelativeLayout
 
             android:id="@+id/email_erp_rl"
-            style="@style/IMTbleLine_UP_Me"
+            style="@style/form_relative_customer"
+            android:layout_height="wrap_content"
             android:layout_marginBottom="20dp"
             android:background="@color/white">
 
@@ -275,21 +257,18 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:drawableLeft="@drawable/oa_client"
                 android:drawablePadding="10dp"
+                android:layout_marginLeft="20dp"
                 android:gravity="center"
-                android:text="内容"
+                android:text="详情"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
-
-            <EditText
+            <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                 android:id="@+id/tv_content"
-                style="@style/IMTbleLine_TextValue"
-                android:layout_toRightOf="@+id/email_text"
-                android:background="@null"
-                android:textColor="@color/text_hine"
-                android:textSize="@dimen/text_hine" />
-
+                android:layout_height="80dp"
+                style="@style/form_relative_right_text"
+                editTextFormExample:testType="nocheck"
+                android:hint="最多输入十五个字符" />
         </RelativeLayout>
 
 

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

@@ -1,418 +1,270 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<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:fillViewport="true">
-
-    <LinearLayout
+    android:orientation="vertical"
+    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.crm.VisitReportPlanActivity">
+
+    <RelativeLayout
+        android:id="@+id/rl_dateSelect"
+        style="@style/form_relative_customer"
+        android:background="@color/white">
+
+        <TextView
+            android:id="@+id/tv_id1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="20dp"
+            android:drawablePadding="10dp"
+            android:gravity="center"
+            android:text="开始时间"
+            android:textColor="@color/text_main"
+            android:textSize="@dimen/text_main" />
+        <TextView
+            style="@style/form_relative_left_text"
+            android:layout_marginLeft="20dp"
+            android:layout_toRightOf="@+id/tv_id1"
+            android:text="*"
+            android:textColor="@color/red" />
+
+        <com.andreabaccega.widget.FormEditText
+            xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+            android:id="@+id/tv_date_select"
+            style="@style/form_relative_right_text"
+            android:drawableRight="@drawable/nav_icon_search_default"
+            editTextFormExample:testType="nocheck"
+            android:hint="请选择" />
+
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:id="@+id/visit_erp_rl"
+        style="@style/form_relative_customer"
+        android:background="@color/white">
+
+        <TextView
+            android:id="@+id/tv_id2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="20dp"
+            android:drawablePadding="10dp"
+            android:gravity="center"
+            android:text="截止时间"
+            android:textColor="@color/text_main"
+            android:textSize="@dimen/text_main" />
+        <TextView
+            style="@style/form_relative_left_text"
+            android:layout_marginLeft="20dp"
+            android:layout_toRightOf="@+id/tv_id2"
+            android:text="*"
+            android:textColor="@color/red" />
+        <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+            android:id="@+id/tv_visit_login"
+            style="@style/form_relative_right_text"
+            android:drawableRight="@drawable/nav_icon_search_default"
+            editTextFormExample:testType="nocheck"
+            android:hint="请选择" />
+    </RelativeLayout>
+
+    <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        tools:context="com.xzjmyk.pm.activity.ui.erp.activity.crm.VisitReportPlanActivity">
-
-        <RelativeLayout
-            android:id="@+id/rl_dateSelect"
-            style="@style/IMTbleLine_UP_Me"
-            android:layout_marginBottom="20dp"
-            android:background="@color/white">
-
-            <TextView
-                android:id="@+id/date_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:drawableLeft="@drawable/oa_client"
-                android:drawablePadding="10dp"
-                android:gravity="center"
-                android:text="拜访日期"
-                android:textColor="@color/text_main"
-                android:textSize="@dimen/text_main" />
-
-            <EditText
-                android:id="@+id/tv_date_select"
-                style="@style/IMTbleLine_TextValue"
-                android:layout_toLeftOf="@+id/name_arrow_img"
-                android:layout_toRightOf="@+id/date_text"
-                android:background="@null"
-                android:textColor="@color/text_hine"
-                android:textSize="@dimen/text_hine" />
-
-            <ImageView
-                android:id="@+id/name_arrow_img"
-                android:layout_width="@dimen/next_width"
-                android:layout_height="@dimen/next_height"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:alpha="0.26"
-                android:background="@drawable/set_list_next"
-                android:contentDescription="@string/app_name" />
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:id="@+id/address_erp_rl"
-            style="@style/IMTbleLine_UP_Me"
-            android:layout_marginBottom="1dp"
-            android:background="@color/white">
-
-            <TextView
-                android:id="@+id/address_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:drawableLeft="@drawable/oa_signin"
-                android:drawablePadding="10dp"
-                android:gravity="center"
-                android:text="地址"
-                android:textColor="@color/text_main"
-                android:textSize="@dimen/text_main" />
-
-            <EditText
-                android:id="@+id/tv_address_login"
-                style="@style/IMTbleLine_TextValue"
-                android:layout_toLeftOf="@+id/address_arrow_img"
-                android:layout_toRightOf="@+id/address_text"
-                android:background="@null"
-                android:textColor="@color/text_hine"
-                android:textSize="@dimen/text_hine" />
-
-            <ImageView
-                android:id="@+id/address_arrow_img"
-                android:layout_width="@dimen/next_width"
-                android:layout_height="@dimen/next_height"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:alpha="0.26"
-                android:background="@drawable/set_list_next"
-                android:contentDescription="@string/app_name" />
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="40dp">
-
-            <TextView
-                android:id="@+id/tv_address_refresh"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:layout_alignParentRight="true"
-                android:layout_marginRight="10dp"
-                android:text="定位不准？点我重试"
-                android:textColor="#415dea"
-                android:textSize="13sp" />
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:id="@+id/customer_erp_rl"
-            style="@style/IMTbleLine_UP_Me"
-            android:layout_marginBottom="1dp"
-            android:background="@color/white">
-
-            <TextView
-                android:id="@+id/company_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:drawableLeft="@drawable/oa_client"
-                android:drawablePadding="10dp"
-                android:gravity="center"
-                android:text="客户"
-                android:textColor="@color/text_main"
-                android:textSize="@dimen/text_main" />
-
-            <EditText
-                android:id="@+id/tv_customer_login"
-                style="@style/IMTbleLine_TextValue"
-                android:layout_toLeftOf="@+id/company_arrow_img"
-                android:layout_toRightOf="@+id/company_text"
-                android:background="@null"
-                android:textColor="@color/text_hine"
-                android:textSize="@dimen/text_hine" />
-
-            <ImageView
-                android:id="@+id/company_arrow_img"
-                android:layout_width="@dimen/next_width"
-                android:layout_height="@dimen/next_height"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:alpha="0.26"
-                android:background="@drawable/set_list_next"
-                android:contentDescription="@string/app_name" />
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:id="@+id/linksman_erp_rl"
-            style="@style/IMTbleLine_UP_Me"
-            android:layout_marginBottom="20dp"
-            android:background="@color/white">
-
-            <TextView
-                android:id="@+id/deparment_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:drawableLeft="@drawable/oa_client"
-                android:drawablePadding="10dp"
-                android:gravity="center"
-                android:text="联系人"
-                android:textColor="@color/text_main"
-                android:textSize="@dimen/text_main" />
-
-            <EditText
-                android:id="@+id/tv_linksman_login"
-                style="@style/IMTbleLine_TextValue"
-                android:layout_toLeftOf="@+id/deparment_arrow_img"
-                android:layout_toRightOf="@+id/deparment_text"
-                android:background="@null"
-                android:textColor="@color/text_hine"
-                android:textSize="@dimen/text_hine" />
-
-            <ImageView
-                android:id="@+id/deparment_arrow_img"
-                android:layout_width="@dimen/next_width"
-                android:layout_height="@dimen/next_height"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:alpha="0.26"
-                android:background="@drawable/set_list_next"
-                android:contentDescription="@string/app_name" />
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:id="@+id/visit_erp_rl"
-            style="@style/IMTbleLine_UP_Me"
-            android:layout_marginBottom="1dp"
-            android:background="@color/white">
-
-            <TextView
-                android:id="@+id/position_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:drawableLeft="@drawable/oa_client"
-                android:drawablePadding="10dp"
-                android:gravity="center"
-                android:text="业务员"
-                android:textColor="@color/text_main"
-                android:textSize="@dimen/text_main" />
-
-            <EditText
-                android:id="@+id/tv_visit_login"
-                style="@style/IMTbleLine_TextValue"
-                android:layout_toLeftOf="@+id/position_arrow_img"
-                android:layout_toRightOf="@+id/position_text"
-                android:background="@null"
-                android:textColor="@color/text_hine"
-                android:textSize="@dimen/text_hine" />
-
-            <ImageView
-                android:id="@+id/position_arrow_img"
-                android:layout_width="@dimen/next_width"
-                android:layout_height="@dimen/next_height"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:alpha="0.26"
-                android:background="@drawable/set_list_next"
-                android:contentDescription="@string/app_name" />
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:id="@+id/depart_erp_rl"
-            style="@style/IMTbleLine_UP_Me"
-            android:layout_marginBottom="1dp"
-            android:background="@color/white">
-
-            <TextView
-                android:id="@+id/tel_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:drawableLeft="@drawable/oa_client"
-                android:drawablePadding="10dp"
-                android:gravity="center"
-                android:text="部门"
-                android:textColor="@color/text_main"
-                android:textSize="@dimen/text_main" />
-
-            <EditText
-                android:id="@+id/tv_depart_login"
-                style="@style/IMTbleLine_TextValue"
-                android:layout_marginBottom="1dp"
-                android:layout_toLeftOf="@+id/tel_arrow_img"
-                android:layout_toRightOf="@+id/tel_text"
-                android:background="@null"
-                android:textColor="@color/text_hine"
-                android:textSize="@dimen/text_hine" />
-
-            <ImageView
-                android:id="@+id/tel_arrow_img"
-                android:layout_width="@dimen/next_width"
-                android:layout_height="@dimen/next_height"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:alpha="0.26"
-                android:background="@drawable/set_list_next"
-                android:contentDescription="@string/app_name" />
-        </RelativeLayout>
-
-
-        <RelativeLayout
-            android:id="@+id/startTime_erp_rl"
-            style="@style/IMTbleLine_UP_Me"
-            android:layout_marginBottom="1dp"
-            android:background="@color/white">
-
-            <TextView
-                android:id="@+id/startTime_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:drawableLeft="@drawable/oa_client"
-                android:drawablePadding="10dp"
-                android:gravity="center"
-                android:text="开始时间"
-                android:textColor="@color/text_main"
-                android:textSize="@dimen/text_main" />
-
-            <EditText
-                android:id="@+id/tv_startTim_login"
-                style="@style/IMTbleLine_TextValue"
-                android:layout_toLeftOf="@+id/startTime_arrow_img"
-                android:layout_toRightOf="@+id/startTime_text"
-                android:background="@null"
-                android:textColor="@color/text_hine"
-                android:textSize="@dimen/text_hine" />
-
-            <ImageView
-                android:id="@+id/startTime_arrow_img"
-                android:layout_width="@dimen/next_width"
-                android:layout_height="@dimen/next_height"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:alpha="0.26"
-                android:background="@drawable/set_list_next"
-                android:contentDescription="@string/app_name" />
-        </RelativeLayout>
-
-
-        <RelativeLayout
-            android:id="@+id/endTime_erp_rl"
-            style="@style/IMTbleLine_UP_Me"
-            android:layout_marginBottom="1dp"
-            android:background="@color/white">
-
-            <TextView
-                android:id="@+id/email_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:drawableLeft="@drawable/oa_client"
-                android:drawablePadding="10dp"
-                android:gravity="center"
-                android:text="截止时间"
-                android:textColor="@color/text_main"
-                android:textSize="@dimen/text_main" />
-
-            <EditText
-                android:id="@+id/tv_endTime_login"
-                style="@style/IMTbleLine_TextValue"
-                android:layout_toLeftOf="@+id/email_arrow_img"
-                android:layout_toRightOf="@+id/email_text"
-                android:background="@null"
-                android:textColor="@color/text_hine"
-                android:textSize="@dimen/text_hine" />
-
-            <ImageView
-                android:id="@+id/email_arrow_img"
-                android:layout_width="@dimen/next_width"
-                android:layout_height="@dimen/next_height"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:alpha="0.26"
-                android:background="@drawable/set_list_next"
-                android:contentDescription="@string/app_name" />
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:id="@+id/businessState_erp_rl"
-            style="@style/IMTbleLine_UP_Me"
-            android:layout_marginBottom="1dp"
-            android:background="@color/white">
-
-            <TextView
-                android:id="@+id/businessState_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:drawableLeft="@drawable/oa_client"
-                android:drawablePadding="10dp"
-                android:gravity="center"
-                android:text="当前商机阶段"
-                android:textColor="@color/text_main"
-                android:textSize="@dimen/text_main" />
-
-            <EditText
-                android:id="@+id/tv_businessState_login"
-                style="@style/IMTbleLine_TextValue"
-                android:layout_toLeftOf="@+id/businessState_arrow_img"
-                android:layout_toRightOf="@+id/businessState_text"
-                android:background="@null"
-                android:textColor="@color/text_hine"
-                android:textSize="@dimen/text_hine" />
-
-            <ImageView
-                android:id="@+id/businessState_arrow_img"
-                android:layout_width="@dimen/next_width"
-                android:layout_height="@dimen/next_height"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:alpha="0.26"
-                android:background="@drawable/set_list_next"
-                android:contentDescription="@string/app_name" />
-        </RelativeLayout>
-
-
-        <RelativeLayout
-            android:id="@+id/notes_erp_rl"
-            style="@style/IMTbleLine_UP_Me"
-            android:background="@color/white">
-
-            <TextView
-                android:id="@+id/notes_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:drawableLeft="@drawable/oa_client"
-                android:drawablePadding="10dp"
-                android:gravity="center"
-                android:text="备注"
-                android:textColor="@color/text_main"
-                android:textSize="@dimen/text_main" />
-
-            <EditText
-                android:id="@+id/tv_notes_login"
-                style="@style/IMTbleLine_TextValue"
-                android:layout_toLeftOf="@+id/notes_arrow_img"
-                android:layout_toRightOf="@+id/notes_text"
-                android:background="@null"
-                android:textColor="@color/text_hine"
-                android:textSize="@dimen/text_hine" />
-
-            <ImageView
-                android:id="@+id/notes_arrow_img"
-                android:layout_width="@dimen/next_width"
-                android:layout_height="@dimen/next_height"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:alpha="0.26"
-                android:background="@drawable/set_list_next"
-                android:contentDescription="@string/app_name" />
-        </RelativeLayout>
-
-    </LinearLayout>
-
-
-</ScrollView>
-
-
+        android:layout_height="40dp"
+        android:visibility="gone">
+
+        <TextView
+            android:id="@+id/tv_address_refresh"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:layout_marginRight="10dp"
+            android:text="定位不准？点我重试"
+            android:textColor="@color/light_green"
+            android:textSize="13sp" />
+    </RelativeLayout>
+
+
+    <RelativeLayout
+        android:id="@+id/customer_erp_rl"
+        style="@style/form_relative_customer"
+        android:layout_marginBottom="1dp"
+        android:background="@color/white">
+
+        <TextView
+            android:id="@+id/tv_id3"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="20dp"
+            android:drawablePadding="10dp"
+            android:gravity="center"
+            android:text="客户名称"
+            android:textColor="@color/text_main"
+            android:textSize="@dimen/text_main" />
+
+        <TextView
+            style="@style/form_relative_left_text"
+            android:layout_marginLeft="20dp"
+            android:layout_toRightOf="@+id/tv_id3"
+            android:text="*"
+            android:textColor="@color/red" />
+
+        <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+            android:id="@+id/tv_customer_login"
+            style="@style/form_relative_right_text"
+            android:drawableRight="@drawable/nav_icon_search_default"
+            editTextFormExample:testType="nocheck"
+            android:hint="请输入" />
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:id="@+id/linksman_erp_rl"
+        style="@style/form_relative_customer"
+        android:layout_marginBottom="1dp"
+        android:background="@color/white">
+
+        <TextView
+            android:id="@+id/tv_id4"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="20dp"
+            android:drawablePadding="10dp"
+            android:gravity="center"
+            android:text="联系人"
+            android:textColor="@color/text_main"
+            android:textSize="@dimen/text_main" />
+        <TextView
+            style="@style/form_relative_left_text"
+            android:layout_marginLeft="35dp"
+            android:layout_toRightOf="@+id/tv_id4"
+            android:text="*"
+            android:textColor="@color/red" />
+        <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+            android:id="@+id/tv_linksman_login"
+            style="@style/form_relative_right_text"
+            editTextFormExample:testType="nocheck"
+            android:hint="请输入" />
+    </RelativeLayout>
+
+
+    <RelativeLayout
+        android:id="@+id/address_erp_rl"
+        style="@style/form_relative_customer"
+        android:layout_marginBottom="1dp"
+        android:background="@color/white">
+
+        <TextView
+            android:id="@+id/tv_id5"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="20dp"
+            android:drawablePadding="10dp"
+            android:editable="true"
+            android:gravity="center"
+            android:text="客户地址"
+            android:textColor="@color/text_main"
+            android:textSize="@dimen/text_main" />
+
+        <TextView
+            style="@style/form_relative_left_text"
+            android:layout_marginLeft="20dp"
+            android:layout_toRightOf="@+id/tv_id5"
+            android:text="*"
+            android:textColor="@color/red" />
+
+        <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+            android:id="@+id/tv_address_login"
+            style="@style/form_relative_right_text"
+            android:maxHeight="70dp"
+            editTextFormExample:testType="nocheck"
+            android:hint="请输入" />
+    </RelativeLayout>
+    <RelativeLayout
+        style="@style/form_relative_customer"
+        android:background="@color/white">
+
+        <TextView
+            android:id="@+id/tv_id6"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="20dp"
+            android:drawablePadding="10dp"
+            android:gravity="center"
+            android:text="拜访主题"
+            android:textColor="@color/text_main"
+            android:textSize="@dimen/text_main" />
+        <TextView
+            style="@style/form_relative_left_text"
+            android:layout_marginLeft="20dp"
+            android:layout_toRightOf="@+id/tv_id6"
+            android:text="*"
+            android:textColor="@color/red" />
+        <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+            android:id="@+id/tv_visit_theme"
+            style="@style/form_relative_right_text"
+            editTextFormExample:testType="nocheck"
+            android:hint="请输入" />
+    </RelativeLayout>
+    <RelativeLayout
+        style="@style/form_relative_customer"
+        android:background="@color/white">
+
+        <TextView
+            android:id="@+id/tv_id7"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="20dp"
+            android:drawablePadding="10dp"
+            android:gravity="center"
+            android:text="当前阶段"
+            android:textColor="@color/text_main"
+            android:textSize="@dimen/text_main" />
+        <TextView
+            style="@style/form_relative_left_text"
+            android:layout_marginLeft="20dp"
+            android:layout_toRightOf="@+id/tv_id7"
+            android:text="*"
+            android:textColor="@color/red" />
+        <com.andreabaccega.widget.FormEditText
+            xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+            android:id="@+id/tv_visit_steps"
+            style="@style/form_relative_right_text"
+            android:drawableRight="@drawable/nav_icon_search_default"
+            editTextFormExample:testType="nocheck"
+            android:hint="请选择" />
+    </RelativeLayout>
+    <RelativeLayout
+        style="@style/form_relative_customer"
+        android:background="@color/white">
+
+        <TextView
+            android:id="@+id/tv_id8"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="20dp"
+            android:drawablePadding="10dp"
+            android:gravity="center"
+            android:text="拜访内容"
+            android:textColor="@color/text_main"
+            android:textSize="@dimen/text_main" />
+        <TextView
+            style="@style/form_relative_left_text"
+            android:layout_marginLeft="20dp"
+            android:layout_toRightOf="@+id/tv_id8"
+            android:text="*"
+            android:textColor="@color/red" />
+        <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+            android:id="@+id/tv_visit_content"
+            style="@style/form_relative_right_text"
+            editTextFormExample:testType="nocheck"
+            android:hint="请输入" />
+    </RelativeLayout>
+</LinearLayout>

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

@@ -8,84 +8,71 @@
 
     <RelativeLayout
         android:id="@+id/rl_dateSelect"
-        style="@style/IMTbleLine_UP_Me"
-        android:layout_marginBottom="20dp"
+        style="@style/form_relative_customer"
         android:background="@color/white">
 
         <TextView
-            android:id="@+id/date_text"
+            android:id="@+id/tv_id1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:drawableLeft="@drawable/oa_client"
+            android:layout_marginLeft="20dp"
             android:drawablePadding="10dp"
             android:gravity="center"
-            android:text="日期"
+            android:text="开始时间"
             android:textColor="@color/text_main"
             android:textSize="@dimen/text_main" />
-
-        <EditText
+        <TextView
+            style="@style/form_relative_left_text"
+            android:layout_marginLeft="20dp"
+            android:layout_toRightOf="@+id/tv_id1"
+            android:text="*"
+            android:textColor="@color/red" />
+      
+        <com.andreabaccega.widget.FormEditText 
+            xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
             android:id="@+id/tv_date_select"
-            style="@style/IMTbleLine_TextValue"
-            android:layout_toLeftOf="@+id/name_arrow_img"
-            android:layout_toRightOf="@+id/date_text"
-            android:background="@null"
-            android:textColor="@color/text_hine"
-            android:textSize="@dimen/text_hine" />
-
-        <ImageView
-            android:id="@+id/name_arrow_img"
-            android:layout_width="@dimen/next_width"
-            android:layout_height="@dimen/next_height"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:alpha="0.26"
-            android:background="@drawable/set_list_next"
-            android:contentDescription="@string/app_name" />
+            style="@style/form_relative_right_text"
+            android:drawableRight="@drawable/nav_icon_search_default"
+            editTextFormExample:testType="nocheck"
+            android:hint="请输入" />
+        
     </RelativeLayout>
 
     <RelativeLayout
-        android:id="@+id/address_erp_rl"
-        style="@style/IMTbleLine_UP_Me"
-        android:layout_marginBottom="1dp"
+        android:id="@+id/visit_erp_rl"
+        style="@style/form_relative_customer"
         android:background="@color/white">
 
         <TextView
-            android:id="@+id/address_text"
+            android:id="@+id/tv_id2"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:drawableLeft="@drawable/oa_signin"
+            android:layout_marginLeft="20dp"
             android:drawablePadding="10dp"
-            android:editable="true"
             android:gravity="center"
-            android:text="地址"
+            android:text="截止时间"
             android:textColor="@color/text_main"
             android:textSize="@dimen/text_main" />
-
-        <EditText
-            android:id="@+id/tv_address_login"
-            style="@style/IMTbleLine_TextValue"
-            android:layout_toLeftOf="@+id/address_arrow_img"
-            android:layout_toRightOf="@+id/address_text"
-            android:background="@null"
-            android:textColor="@color/text_hine"
-            android:textSize="@dimen/text_hine" />
-
-        <ImageView
-            android:id="@+id/address_arrow_img"
-            android:layout_width="@dimen/next_width"
-            android:layout_height="@dimen/next_height"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:alpha="0.26"
-            android:background="@drawable/set_list_next"
-            android:contentDescription="@string/app_name" />
+        <TextView
+            style="@style/form_relative_left_text"
+            android:layout_marginLeft="20dp"
+            android:layout_toRightOf="@+id/tv_id2"
+            android:text="*"
+            android:textColor="@color/red" />
+        <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+            android:id="@+id/tv_visit_login"
+            style="@style/form_relative_right_text"
+            android:drawableRight="@drawable/nav_icon_search_default"
+            editTextFormExample:testType="nocheck"
+            android:hint="请输入" />
     </RelativeLayout>
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="40dp">
+        android:layout_height="40dp"
+        android:visibility="gone">
 
         <TextView
             android:id="@+id/tv_address_refresh"
@@ -102,116 +89,182 @@
 
     <RelativeLayout
         android:id="@+id/customer_erp_rl"
-        style="@style/IMTbleLine_UP_Me"
+        style="@style/form_relative_customer"
         android:layout_marginBottom="1dp"
         android:background="@color/white">
 
         <TextView
-            android:id="@+id/company_text"
+            android:id="@+id/tv_id3"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:drawableLeft="@drawable/oa_client"
+            android:layout_marginLeft="20dp"
             android:drawablePadding="10dp"
             android:gravity="center"
-            android:text="客户"
+            android:text="客户名称"
             android:textColor="@color/text_main"
             android:textSize="@dimen/text_main" />
 
-        <EditText
+        <TextView
+            style="@style/form_relative_left_text"
+            android:layout_marginLeft="20dp"
+            android:layout_toRightOf="@+id/tv_id3"
+            android:text="*"
+            android:textColor="@color/red" />
+
+        <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
             android:id="@+id/tv_customer_login"
-            style="@style/IMTbleLine_TextValue"
-            android:layout_toLeftOf="@+id/company_arrow_img"
-            android:layout_toRightOf="@+id/company_text"
-            android:background="@null"
-            android:textColor="@color/text_hine"
-            android:textSize="@dimen/text_hine" />
-
-        <ImageView
-            android:id="@+id/company_arrow_img"
-            android:layout_width="@dimen/next_width"
-            android:layout_height="@dimen/next_height"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:alpha="0.26"
-            android:background="@drawable/set_list_next"
-            android:contentDescription="@string/app_name" />
+            style="@style/form_relative_right_text"
+            android:drawableRight="@drawable/nav_icon_search_default"
+            editTextFormExample:testType="nocheck"
+            android:hint="请输入" />
     </RelativeLayout>
 
     <RelativeLayout
         android:id="@+id/linksman_erp_rl"
-        style="@style/IMTbleLine_UP_Me"
+        style="@style/form_relative_customer"
         android:layout_marginBottom="1dp"
         android:background="@color/white">
 
         <TextView
-            android:id="@+id/deparment_text"
+            android:id="@+id/tv_id4"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:drawableLeft="@drawable/oa_client"
+            android:layout_marginLeft="20dp"
             android:drawablePadding="10dp"
             android:gravity="center"
             android:text="联系人"
             android:textColor="@color/text_main"
             android:textSize="@dimen/text_main" />
-
-        <EditText
+        <TextView
+            style="@style/form_relative_left_text"
+            android:layout_marginLeft="35dp"
+            android:layout_toRightOf="@+id/tv_id4"
+            android:text="*"
+            android:textColor="@color/red" />
+        <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
             android:id="@+id/tv_linksman_login"
-            style="@style/IMTbleLine_TextValue"
-            android:layout_toLeftOf="@+id/deparment_arrow_img"
-            android:layout_toRightOf="@+id/deparment_text"
-            android:background="@null"
-            android:textColor="@color/text_hine"
-            android:textSize="@dimen/text_hine" />
-
-        <ImageView
-            android:id="@+id/deparment_arrow_img"
-            android:layout_width="@dimen/next_width"
-            android:layout_height="@dimen/next_height"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:alpha="0.26"
-            android:background="@drawable/set_list_next"
-            android:contentDescription="@string/app_name" />
+            style="@style/form_relative_right_text"
+            editTextFormExample:testType="nocheck"
+            android:hint="请输入" />
     </RelativeLayout>
 
+  
     <RelativeLayout
-        android:id="@+id/visit_erp_rl"
-        style="@style/IMTbleLine_UP_Me"
+        android:id="@+id/address_erp_rl"
+        style="@style/form_relative_customer"
+        android:layout_marginBottom="1dp"
         android:background="@color/white">
 
         <TextView
-            android:id="@+id/position_text"
+            android:id="@+id/tv_id5"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:drawableLeft="@drawable/oa_client"
+            android:layout_marginLeft="20dp"
             android:drawablePadding="10dp"
+            android:editable="true"
             android:gravity="center"
-            android:text="拜访人"
+            android:text="客户地址"
             android:textColor="@color/text_main"
             android:textSize="@dimen/text_main" />
 
-        <EditText
-            android:id="@+id/tv_visit_login"
-            style="@style/IMTbleLine_TextValue"
-            android:layout_toLeftOf="@+id/position_arrow_img"
-            android:layout_toRightOf="@+id/position_text"
-            android:background="@null"
-            android:textColor="@color/text_hine"
-            android:textSize="@dimen/text_hine" />
-
-        <ImageView
-            android:id="@+id/position_arrow_img"
-            android:layout_width="@dimen/next_width"
-            android:layout_height="@dimen/next_height"
-            android:layout_alignParentRight="true"
+        <TextView
+            style="@style/form_relative_left_text"
+            android:layout_marginLeft="20dp"
+            android:layout_toRightOf="@+id/tv_id5"
+            android:text="*"
+            android:textColor="@color/red" />
+
+        <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+            android:id="@+id/tv_address_login"
+            style="@style/form_relative_right_text"
+            android:maxHeight="70dp"
+            editTextFormExample:testType="nocheck"
+            android:hint="请输入" />
+    </RelativeLayout>
+    <RelativeLayout
+        style="@style/form_relative_customer"
+        android:background="@color/white">
+
+        <TextView
+            android:id="@+id/tv_id6"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:alpha="0.26"
-            android:background="@drawable/set_list_next"
-            android:contentDescription="@string/app_name" />
+            android:layout_marginLeft="20dp"
+            android:drawablePadding="10dp"
+            android:gravity="center"
+            android:text="拜访主题"
+            android:textColor="@color/text_main"
+            android:textSize="@dimen/text_main" />
+        <TextView
+            style="@style/form_relative_left_text"
+            android:layout_marginLeft="20dp"
+            android:layout_toRightOf="@+id/tv_id6"
+            android:text="*"
+            android:textColor="@color/red" />
+        <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+            android:id="@+id/tv_visit_theme"
+            style="@style/form_relative_right_text"
+            editTextFormExample:testType="nocheck"
+            android:hint="请输入" />
     </RelativeLayout>
+    <RelativeLayout
+        style="@style/form_relative_customer"
+        android:background="@color/white">
 
+        <TextView
+            android:id="@+id/tv_id7"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="20dp"
+            android:drawablePadding="10dp"
+            android:gravity="center"
+            android:text="当前阶段"
+            android:textColor="@color/text_main"
+            android:textSize="@dimen/text_main" />
+        <TextView
+            style="@style/form_relative_left_text"
+            android:layout_marginLeft="20dp"
+            android:layout_toRightOf="@+id/tv_id7"
+            android:text="*"
+            android:textColor="@color/red" />
+        <com.andreabaccega.widget.FormEditText 
+            xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+            android:id="@+id/tv_visit_steps"
+            style="@style/form_relative_right_text"
+            android:drawableRight="@drawable/nav_icon_search_default"
+            editTextFormExample:testType="nocheck"
+            android:hint="请选择" />
+    </RelativeLayout>
+    <RelativeLayout
+        style="@style/form_relative_customer"
+        android:background="@color/white">
 
+        <TextView
+            android:id="@+id/tv_id8"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="20dp"
+            android:drawablePadding="10dp"
+            android:gravity="center"
+            android:text="拜访内容"
+            android:textColor="@color/text_main"
+            android:textSize="@dimen/text_main" />
+        <TextView
+            style="@style/form_relative_left_text"
+            android:layout_marginLeft="20dp"
+            android:layout_toRightOf="@+id/tv_id8"
+            android:text="*"
+            android:textColor="@color/red" />
+        <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+            android:id="@+id/tv_visit_content"
+            style="@style/form_relative_right_text"
+            editTextFormExample:testType="nocheck"
+            android:hint="请输入" />
+    </RelativeLayout>
 </LinearLayout>

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

@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
-
     <TextView
         android:id="@+id/tv_item_name"
         android:paddingLeft="2dp"

WeiChat/src/main/res/menu/menu_business_type.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+            android:id="@+id/items_public"
+            android:title="公有"/>
+    <item
+            android:id="@+id/items_private"
+            android:title="私有"/>
+</menu>

WeiChat/src/main/res/menu/menu_cu_district.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    android:background="@color/black">
+    <!--华东地区，华南地区，华北地区，华中地区，西南地区，西北地区，东北地区，港澳台地区，海外地区，其它地区-->
+    <item
+        android:id="@+id/cu_eastChina"
+        android:background="@color/light_gray"
+        android:title="华东地区" />
+    <item
+        android:id="@+id/cu_southChina"
+        android:title="华南地区" />
+    <item
+        android:id="@+id/cu_northChina"
+        android:title="华北地区" />
+    <item
+        android:id="@+id/cu_center"
+        android:title="华中地区" />
+    <item
+        android:id="@+id/cu_southwest"
+        android:title="西南地区" />
+    <item
+        android:id="@+id/cu_northwest"
+        android:title="西北地区" />
+    <item
+        android:id="@+id/cu_northeast"
+        android:title="东北地区" />
+    <item
+        android:id="@+id/cu_webPages"
+        android:title="港澳台地区" />
+    <item
+        android:id="@+id/cu_seas"
+        android:title="海外地区" />
+    <item
+        android:id="@+id/cu_other"
+        android:title="其它地区" />
+</menu>

WeiChat/src/main/res/menu/menu_cu_kind.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <!--贸易型，生产型，代理商，设计-->
+    <item
+            android:id="@+id/cu_sale"
+            android:title="贸易型"/>
+    <item
+            android:id="@+id/cu_project"
+            android:title="生产型"/>
+    <item
+        android:id="@+id/cu_proxy"
+        android:title="代理商"/>
+    <item
+        android:id="@+id/cu_desgin"
+        android:title="设计"/>
+</menu>

WeiChat/src/main/res/values-v14/styles.xml

@@ -4,7 +4,28 @@
     <style name="AppTheme" parent="AppBaseTheme">
         <!-- All customizations that are NOT specific to a particular API-level can go here. -->
     </style>
-
+    
+    <style name="AppBaseThemeBule" parent="Theme.AppCompat.Light.DarkActionBar">
+        <item name="android:buttonStyle">@android:style/Widget.Button</item>
+        <item name="android:windowAnimationStyle">@style/IMAnimationStyle</item>
+        <item name="android:actionBarStyle">@style/CRM_Ttile_Bule</item>
+        <item name="android:homeAsUpIndicator">@drawable/actionbar_up_indicator</item>
+        <item name="android:actionBarItemBackground">@drawable/actionbar_menu_selector</item>
+        <item name="actionBarStyle">@style/CRM_Ttile_Bule</item>
+        <item name="actionBarItemBackground">@drawable/actionbar_menu_selector</item>
+        <item name="homeAsUpIndicator">@drawable/actionbar_up_indicator</item>
+        <item name="android:listViewStyle">@style/IMListView</item>
+        <item name="actionBarTabStyle">@style/MyActionBar</item>
+        <item name="android:actionBarTabStyle">@style/MyActionBar</item>
+    </style>
+    <!--crm title theme-->
+    <style name="CrmThemeBlue" parent="AppBaseThemeBule">
+        <item name="actionBarStyle">@style/CRM_Ttile_Bule</item>
+    </style>
+    <style name="CrmThemeTask" parent="AppBaseThemeBule">
+        <item name="actionBarStyle">@style/CRM_Ttile_Task</item>
+    </style>
+   
     <style name="AppBaseTheme" parent="Theme.AppCompat.Light.DarkActionBar">
         <item name="android:buttonStyle">@android:style/Widget.Button</item>
         <item name="android:windowAnimationStyle">@style/IMAnimationStyle</item>
@@ -19,7 +40,17 @@
         <item name="android:actionBarTabStyle">@style/MyActionBar</item>
     </style>
 
-    <style name="IMActionBar" parent="@style/Widget.AppCompat.ActionBar">
+    <style name="CRM_Ttile_Bule" parent="IMActionBar">
+        <item name="android:background">@color/titleBlue</item>
+        <item name="background">@color/titleBlue</item>
+    </style>
+
+    <style name="CRM_Ttile_Task" parent="IMActionBar">
+        <item name="android:background">@color/crm_title_task</item>
+        <item name="background">@color/crm_title_task</item>
+    </style>
+    
+    <style name="IMActionBar" parent="Widget.AppCompat.ActionBar">
         <item name="android:actionBarSize">11dp</item>
         <item name="android:icon">@drawable/action_bar_divider</item>
         <item name="android:background">@drawable/BackBar</item>

WeiChat/src/main/res/values/colors.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
+   <color name="crm_title_task">#91B43D</color>
     <!--by gongpengming-->
     <color name="subscrip_text">#60a0a0a0</color>
     <color name="item_color1">#30a0a0a0</color>
@@ -220,6 +220,8 @@
     <color name="green">#008000</color> <!-- 绿色 -->
     <color name="darkgreen">#006400</color> <!-- 暗绿色 -->
     <color name="blue">#0000FF</color> <!-- 蓝色 -->
+    <color name="titleBlue">#3C97D7</color> <!-- 青蓝色 -->
+  
     <color name="mediumblue">#0000CD</color> <!-- 中兰色 -->
     <color name="darkblue">#00008B</color> <!-- 暗蓝色 -->
     <color name="navy">#000080</color> <!-- 海军色 -->

WeiChat/src/main/res/values/strings.xml

@@ -13,7 +13,7 @@
 
 
     <string name="crm_ranking">我的排名</string>
-    <string name="crm_sale_msg">本周销售简报</string>
+    <string name="crm_sale_msg">本月销售简报</string>
     <string name="crm_branch">我的下属</string>
     <string name="crm_target">我的指标</string>
     <string name="crm_customer_forget">遗忘的客户</string>

WeiChat/src/main/res/values/styles.xml

@@ -9,18 +9,26 @@
         <item name="android:background">@color/antionbarcolor</item>
     </style>
 
+    <style name="style_bg_bar_bule">
+        <item name="android:background">@color/titleBlue</item>
+    </style>
+
     <drawable name="BackBar">@color/antionbarcolor</drawable>
 
     <style name="AppBaseTheme" parent="Theme.AppCompat.Light">
         <item name="android:buttonStyle">@android:style/Widget.Button</item>
         <item name="android:windowAnimationStyle">@style/IMAnimationStyle</item>
         <item name="actionBarStyle">@style/style_bg_bar</item>
-
         <item name="android:listViewStyle">@style/IMListView</item>
         <item name="actionBarItemBackground">@drawable/actionbar_menu_selector</item>
         <item name="homeAsUpIndicator">@drawable/actionbar_up_indicator</item>
     </style>
 
+
+    
+    
+    
+
     <!-- Application theme. -->
     <style name="AppTheme" parent="AppBaseTheme">
         <!-- All customizations that are NOT specific to a particular API-level can go here. -->
@@ -175,8 +183,8 @@
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">@dimen/item_height</item>
         <item name="android:minHeight">60dp</item>
-        <item name="android:paddingLeft">9dp</item>
-        <item name="android:paddingRight">5dp</item>
+        <item name="android:paddingLeft">20dp</item>
+        <item name="android:paddingRight">0dp</item>
     </style>
 
     <style name="IMTbleLine_UP">
@@ -294,10 +302,12 @@
         <item name="android:layout_centerVertical">true</item>
         <item name="android:layout_alignParentRight">true</item>
         <item name="android:layout_marginRight">20dp</item>
-        <item name="android:layout_marginLeft">150dp</item>
+        <item name="android:layout_marginLeft">130dp</item>
         <item name="android:background">@drawable/shape_from_edit</item>
-        <item name="android:gravity">left</item>
+        <item name="android:gravity">left|center_vertical</item>
         <item name="android:maxWidth">290dp</item>
+        <item name="android:minHeight">35dp</item>
+        <item name="android:maxHeight">35dp</item>
         <item name="android:padding">5dp</item>
         <item name="android:width">160dp</item>
         <item name="android:layout_marginTop">8dp</item>
@@ -557,8 +567,16 @@
     <style name="crm_tv_card_topLeft">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:textColor">#00CED1</item>
-        <item name="android:layout_margin">10dp</item>
+        <item name="android:paddingLeft">5dp</item>
+        <item name="android:paddingRight">15dp</item>
+        <item name="android:paddingTop">10dp</item>
+        <item name="android:paddingBottom">10dp</item>
+        <item name="android:gravity">center</item>
+        <item name="android:textColor">@color/white</item>
+        <item name="android:layout_marginLeft">0dp</item>
+        <item name="android:layout_marginRight">10dp</item>
+        <item name="android:layout_marginTop">2dp</item>
+        <item name="android:layout_marginBottom">2dp</item>
         <item name="android:layout_alignParentLeft">true</item>
     </style>
 
@@ -579,7 +597,7 @@
     <style name="crm_ll_card">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">310dp</item>
-        <item name="android:layout_margin">10dp</item>
+       
         <item name="android:orientation">vertical</item>
         <item name="android:background">@drawable/shape_crm_card</item>
     </style>
@@ -595,13 +613,13 @@
     <style name="crm_card_round_tv">
         <item name="android:layout_width">50dp</item>
         <item name="android:layout_height">50dp</item>
-        <item name="android:textColor">@color/white</item>
+       
         <item name="android:layout_marginLeft">8dp</item>
         <item name="android:layout_marginTop">8dp</item>
         <item name="android:layout_marginBottom">8dp</item>
         <item name="android:layout_marginRight">1dp</item>
         <item name="android:gravity">center</item>
-        <item name="android:background">@drawable/shape_crm_round_new</item>
+       
     </style>
 
     <style name="crm_ll_card_ranking">
@@ -622,7 +640,7 @@
         <item name="android:layout_gravity">center_vertical</item>
         <item name="android:layout_marginRight">3dp</item>
         <item name="android:layout_weight">2</item>
-        <item name="android:text">"__元/第__名"</item>
+        <item name="android:text">"￥__/NO._"</item>
     </style>
 
     <style name="crm_tv_ranking_right">
@@ -631,7 +649,7 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_gravity">center_vertical</item>
         <item name="android:layout_weight">3</item>
-        <item name="android:text">"第一名:__金额:__元"</item>
+        <item name="android:text">"NO._:__/￥__"</item>
     </style>
     <!--crm sale-->
     <style name="crm_ll_sale" parent="LinearLayout_horizontal">