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

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

@@ -25,6 +25,7 @@ import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.adapter.HListViewAdapter;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.ListViewInScroller;
+import com.xzjmyk.pm.activity.util.DisplayUtil;
 import com.xzjmyk.pm.activity.view.FunnelView;
 
 import java.util.ArrayList;
@@ -122,6 +123,9 @@ public class BusinessActivity extends BaseActivity implements View.OnClickListen
                 View view = getWindow().findViewById(item.getItemId());
                 showPopupWindow(view);
                 break;
+            case android.R.id.home:
+                onBackPressed();
+                break;
         }
         return true;
     }
@@ -170,6 +174,13 @@ public class BusinessActivity extends BaseActivity implements View.OnClickListen
         // 设置允许在外点击消失
         popupWindow.setOutsideTouchable(true);
         // 这个是为了点击“返回Back”也能使其消失，并且并不会影响你的背景
+        DisplayUtil.backgroundAlpha(this, 0.5f);
+        popupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
+            @Override
+            public void onDismiss() {
+                DisplayUtil.backgroundAlpha(BusinessActivity.this, 1f);
+            }
+        });
         popupWindow.setBackgroundDrawable(new BitmapDrawable());
         popupWindow.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
         // 显示的位置为:屏幕的宽度的一半-PopupWindow的高度的一半

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

@@ -2,6 +2,8 @@ package com.xzjmyk.pm.activity.ui.erp.activity.crm;
 
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
 
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
@@ -18,5 +20,39 @@ public class BusinessAddActivity extends BaseActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_business_add);
+        initView();
+        initData();
+        initListener();
+    }
+
+    private void initListener() {
+
+    }
+
+    private void initData() {
+
+    }
+
+    private void initView() {
+        getSupportActionBar().setTitle("新建商机");
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.main_btn_submit, menu);
+        menu.findItem(R.id.btn_save).setTitle("保存");
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.btn_save:
+                break;
+            case android.R.id.home:
+                onBackPressed();
+                break;
+        }
+        return true;
     }
 }

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

@@ -79,8 +79,13 @@ public class BusinessDetailActivty extends BaseActivity {
             type = intent.getIntExtra("bt_type", 0);
         }
         if (type == 0) {
+            getSupportActionBar().setTitle("跟进");
             ll_top_state.setVisibility(View.VISIBLE);
-        } else {
+        } else if (type == 1) {
+            getSupportActionBar().setTitle("抢");
+            ll_top_state.setVisibility(View.GONE);
+        } else if (type == 2) {
+            getSupportActionBar().setTitle("分配");
             ll_top_state.setVisibility(View.GONE);
         }
         for (int i = 0; i < 22; i++) {

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

@@ -1,10 +1,22 @@
 package com.xzjmyk.pm.activity.ui.erp.activity.crm;
 
+import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
+import android.graphics.drawable.BitmapDrawable;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.util.Log;
+import android.view.Gravity;
+import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.widget.AdapterView;
 import android.widget.Button;
+import android.widget.ListView;
+import android.widget.PopupWindow;
+import android.widget.SimpleAdapter;
 
 import com.afollestad.materialdialogs.GravityEnum;
 import com.afollestad.materialdialogs.MaterialDialog;
@@ -13,6 +25,13 @@ import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
+import com.xzjmyk.pm.activity.util.DisplayUtil;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @功能:商机详情
@@ -39,6 +58,7 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
 
     private void initView() {
         ViewUtils.inject(this);
+        getSupportActionBar().setTitle("商机详情");
     }
 
     private void initListener() {
@@ -54,7 +74,8 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
     public void onClick(View v) {
         switch (v.getId()) {
             case R.id.bt_manage_go:
-                new MaterialDialog.Builder(this)
+                showPopupWindow(v.findViewById(R.id.bt_manage_go));
+             /*   new MaterialDialog.Builder(this)
                         .items(R.array.crm_dialog_followup)
                         .itemsGravity(GravityEnum.CENTER)
                         .dividerColorRes(R.color.yellow_home)
@@ -87,11 +108,97 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
                             }
                         })
                         .show().getListView().setDivider(getResources().getDrawable(R.color.yellow_home));
-
+*/
                 break;
             case R.id.bt_manage_date:
 
                 break;
         }
     }
+
+
+    private PopupWindow popupWindow = null;
+
+    public void showPopupWindow(View parent) {
+        View view = null;
+        WindowManager windowManager = (WindowManager) getSystemService(Context.WINDOW_SERVICE);
+        if (popupWindow == null) {
+            LayoutInflater layoutInflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+            view = layoutInflater.inflate(R.layout.pop_crm_list, null);
+            ListView plist = (ListView) view.findViewById(R.id.mList);
+            SimpleAdapter adapter = new SimpleAdapter(
+                    this,
+                    getPopData(),
+                    R.layout.item_pop_list,
+                    new String[]{"item_name"}, new int[]{R.id.tv_item_name});
+            plist.setAdapter(adapter);
+            plist.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+                @Override
+                public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                    position = position + 1;
+                    switch (position) {
+                        case 1:
+                            ViewUtil.ToastMessage(BusinessDetailInfoActivity.this, "释放");
+                            break;
+                        case 2:
+                            startActivity(new Intent(BusinessDetailInfoActivity.this, BusinessLessActivity.class).putExtra("type", 1));
+                            break;
+                        case 3:
+                            startActivity(new Intent(BusinessDetailInfoActivity.this, BusinessLessActivity.class).putExtra("type", 2));
+                            break;
+                        case 4:
+                            startActivity(new Intent(BusinessDetailInfoActivity.this, BusinessTransferActivity.class));
+                            break;
+                        case 5:
+                            break;
+                        case 6:
+                            startActivity(new Intent(BusinessDetailInfoActivity.this, BusinessSelectCustomerActivity.class));
+                            break;
+                    }
+                }
+            });
+
+            popupWindow = new PopupWindow(view, parent.getWidth(), ViewUtil.setListViewHeightBasedOnChildren1(plist));
+        }
+        // 使其聚集
+        popupWindow.setFocusable(true);
+        // 设置允许在外点击消失
+        popupWindow.setOutsideTouchable(true);
+        // 这个是为了点击“返回Back”也能使其消失，并且并不会影响你的背景
+        popupWindow.setBackgroundDrawable(new BitmapDrawable());
+        // popupWindow.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
+        // 显示的位置为:屏幕的宽度的一半-PopupWindow的高度的一半
+        DisplayUtil.backgroundAlpha(this, 0.5f);
+        popupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
+            @Override
+            public void onDismiss() {
+                DisplayUtil.backgroundAlpha(BusinessDetailInfoActivity.this, 1f);
+            }
+        });
+
+        int[] location = new int[2];
+        parent.getLocationOnScreen(location);
+        Log.i("Arison", "parent hight:" + location[1]);
+        Log.i("Arison", "popupWindow hight:" + popupWindow.getHeight());
+        Log.i("Arison", "parent width:" + parent.getWidth());
+        Log.i("Arison", "parent width:" + parent.getHeight());
+        popupWindow.showAtLocation(parent.findViewById(R.id.bt_manage_go), Gravity.NO_GRAVITY, location[0],
+                location[1] - popupWindow.getHeight() - 5);
+
+//        popupWindow.showAsDropDown(parent,windowManager.getDefaultDisplay().getWidth()
+//        ,0);
+    }
+
+    private List<Map<String, Object>> getPopData() {
+        List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
+        String[] lists = getResources().getStringArray(R.array.crm_dialog_followup);
+        for (String str : lists) {
+            Map<String, Object> map = new HashMap<String, Object>();
+            map.put("item_name", str);
+            list.add(map);
+        }
+        return list;
+    }
+
+
 }

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

@@ -3,12 +3,15 @@ package com.xzjmyk.pm.activity.ui.erp.activity.crm;
 import android.content.Intent;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.LinearLayout;
 
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 
 /**
  * @功能:商机失效
@@ -16,7 +19,7 @@ import com.xzjmyk.pm.activity.R;
  * @param:
  * @return:
  */
-public class BusinessLessActivity extends AppCompatActivity {
+public class BusinessLessActivity extends BaseActivity {
     @ViewInject(R.id.ll_moment)
     private LinearLayout ll_moment;
     @ViewInject(R.id.ll_leader)
@@ -47,15 +50,34 @@ public class BusinessLessActivity extends AppCompatActivity {
         if (intent != null) {
             type = intent.getIntExtra("type", 1);
         }
+
         switch (type) {
             case 1:
+                getSupportActionBar().setTitle("商机失效");
                 ll_leader.setVisibility(View.VISIBLE);
                 ll_moment.setVisibility(View.GONE);
                 break;
             case 2:
+                getSupportActionBar().setTitle("商机跟进");
                 ll_leader.setVisibility(View.GONE);
                 ll_moment.setVisibility(View.VISIBLE);
                 break;
         }
     }
+
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.main_btn_submit, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.bt_save:
+                break;
+        }
+        return true;
+    }
 }

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

@@ -4,6 +4,8 @@ import android.content.Context;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
@@ -17,11 +19,12 @@ import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.crm.Business;
+import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.view.SmoothCheckBox;
 
 import java.util.ArrayList;
 
-public class BusinessSelectCustomerActivity extends AppCompatActivity {
+public class BusinessSelectCustomerActivity extends BaseActivity {
     private BussinessDetailAdapter mAdapter;
     @ViewInject(R.id.list_business)
     private PullToRefreshListView mlist;
@@ -38,6 +41,7 @@ public class BusinessSelectCustomerActivity extends AppCompatActivity {
 
     private void initView() {
         ViewUtils.inject(this);
+        getSupportActionBar().setTitle("选择客户");
     }
 
     private void initListener() {
@@ -79,6 +83,20 @@ public class BusinessSelectCustomerActivity extends AppCompatActivity {
         mlist.setAdapter(mAdapter);
     }
 
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.main_btn_submit, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.bt_save:
+                break;
+        }
+        return true;
+    }
 
     private class BussinessDetailAdapter extends BaseAdapter {
         private Context ct;

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

@@ -5,6 +5,8 @@ import android.content.Intent;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
@@ -19,6 +21,7 @@ import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.crm.Business;
+import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.view.SmoothCheckBox;
 
 import java.util.ArrayList;
@@ -29,7 +32,7 @@ import java.util.ArrayList;
  * @param:
  * @return:
  */
-public class BusinessTransferActivity extends AppCompatActivity {
+public class BusinessTransferActivity extends BaseActivity {
 
     private BussinessDetailAdapter mAdapter;
     @ViewInject(R.id.list_business)
@@ -47,6 +50,7 @@ public class BusinessTransferActivity extends AppCompatActivity {
 
     private void initView() {
         ViewUtils.inject(this);
+        getSupportActionBar().setTitle("转移到商机库");
     }
 
     private void initListener() {
@@ -88,6 +92,22 @@ public class BusinessTransferActivity extends AppCompatActivity {
         mlist.setAdapter(mAdapter);
     }
 
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.main_btn_submit, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.bt_save:
+                break;
+        }
+        return true;
+    }
+
     private class BussinessDetailAdapter extends BaseAdapter {
         private Context ct;
         private ArrayList<Business> mdata = new ArrayList<>();

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

@@ -38,6 +38,7 @@ import com.xzjmyk.pm.activity.ui.erp.activity.DetailTaskActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.crm.BusinessActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.crm.CustomerListActivity;
 import com.xzjmyk.pm.activity.ui.erp.view.MyMarkerView;
+import com.xzjmyk.pm.activity.util.DisplayUtil;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -171,6 +172,9 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                 View view = getWindow().findViewById(item.getItemId());
                 showPopupWindow(view);
                 break;
+            case android.R.id.home:
+                onBackPressed();
+                break;
         }
         return true;
     }
@@ -227,6 +231,7 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
             case R.id.ib_waller:
                 startActivity(new Intent(this, SalesRankingActivity.class));
                 break;
+
         }
     }
 
@@ -248,7 +253,20 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
             plist.setOnItemClickListener(new AdapterView.OnItemClickListener() {
                 @Override
                 public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-
+                    switch (position) {
+                        case 0:
+                            break;
+                        case 1:
+                            startActivity(new Intent(ClientActivity.this, BusinessAddActivity.class));
+                            break;
+                        case 2:
+                            startActivity(new Intent(ClientActivity.this, CustomerAddActivity.class));
+                            break;
+                        case 3:
+                            break;
+                        case 4:
+                            break;
+                    }
                 }
             });
             popupWindow = new PopupWindow(view, windowManager.getDefaultDisplay().getWidth() / 3, windowManager.getDefaultDisplay().getHeight() / 3);
@@ -257,6 +275,13 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
         popupWindow.setFocusable(true);
         // 设置允许在外点击消失
         popupWindow.setOutsideTouchable(true);
+        popupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
+            @Override
+            public void onDismiss() {
+                DisplayUtil.backgroundAlpha(ClientActivity.this, 1f);
+            }
+        });
+        DisplayUtil.backgroundAlpha(this, 0.5f);
         // 这个是为了点击“返回Back”也能使其消失，并且并不会影响你的背景
         popupWindow.setBackgroundDrawable(new BitmapDrawable());
         popupWindow.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);

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

@@ -2,6 +2,9 @@ package com.xzjmyk.pm.activity.ui.erp.activity.crm;
 
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
 
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
@@ -12,5 +15,40 @@ public class CustomerAddActivity extends BaseActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_customter_add);
+        initView();
+        initData();
+        initListener();
+    }
+
+    private void initListener() {
+
+    }
+
+    private void initData() {
+
+    }
+
+    private void initView() {
+        getSupportActionBar().setTitle("客户预录入");
+    }
+
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.main_btn_submit, menu);
+        menu.findItem(R.id.btn_save).setTitle("保存");
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.btn_save:
+                break;
+            case android.R.id.home:
+                onBackPressed();
+                break;
+        }
+        return true;
     }
 }

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

@@ -1,7 +1,11 @@
 package com.xzjmyk.pm.activity.ui.erp.activity.crm;
 
+import android.content.Intent;
 import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
 
+import com.lidroid.xutils.ViewUtils;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 
@@ -17,5 +21,40 @@ public class CustomerDetailActivity extends BaseActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_customer_detail);
+        initView();
+        initData();
+        initListener();
+    }
+
+    private void initView() {
+        ViewUtils.inject(this);
+        getSupportActionBar().setTitle("客户详情");
+    }
+
+    private void initListener() {
+
+    }
+
+    private void initData() {
+
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_add_icon, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.add_item:
+                startActivity(new Intent(this, CustomerAddActivity.class));
+                break;
+            case android.R.id.home:
+                onBackPressed();
+                break;
+        }
+        return true;
     }
 }

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

@@ -2,16 +2,20 @@ package com.xzjmyk.pm.activity.ui.erp.activity.crm;
 
 import android.content.Context;
 import android.content.Intent;
+import android.graphics.drawable.BitmapDrawable;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowManager;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.Button;
 import android.widget.ListView;
+import android.widget.PopupWindow;
+import android.widget.SimpleAdapter;
 import android.widget.TextView;
 
 
@@ -22,8 +26,12 @@ import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.crm.Business;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.util.DisplayUtil;
 
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @功能:客户列表
@@ -33,6 +41,8 @@ import java.util.ArrayList;
  */
 public class CustomerListActivity extends BaseActivity {
     private BussinessDetailAdapter mAdapter;
+    @ViewInject(R.id.tv_change)
+    private TextView tv_change;
     @ViewInject(R.id.list_business)
     private PullToRefreshListView mlist;
     private ArrayList<Business> mData = new ArrayList<Business>();
@@ -49,9 +59,11 @@ public class CustomerListActivity extends BaseActivity {
     private void initView() {
         ct = this;
         ViewUtils.inject(this);
+        getSupportActionBar().setTitle("客户");
     }
 
     private void initListener() {
+
         mlist.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener2<ListView>() {
             @Override
             public void onPullDownToRefresh(PullToRefreshBase<ListView> refreshView) {
@@ -71,6 +83,15 @@ public class CustomerListActivity extends BaseActivity {
         });
     }
 
+
+    public void changeOnChange(View v) {
+        switch (v.getId()) {
+            case R.id.tv_change:
+                showPopupWindow(v);
+                break;
+        }
+    }
+
     private void initData() {
         for (int i = 0; i < 22; i++) {
             Business model = new Business();
@@ -105,6 +126,9 @@ public class CustomerListActivity extends BaseActivity {
             case R.id.crm_data_select:
                 startActivity(new Intent(ct, CustomerMutilSelectActivity.class));
                 break;
+            case android.R.id.home:
+                onBackPressed();
+                break;
         }
         return true;
     }
@@ -199,4 +223,65 @@ public class CustomerListActivity extends BaseActivity {
             Button bt_event;
         }
     }
+
+
+    private PopupWindow popupWindow = null;
+
+    public void showPopupWindow(View parent) {
+        View view = null;
+        WindowManager windowManager = (WindowManager) getSystemService(Context.WINDOW_SERVICE);
+        if (popupWindow == null) {
+            LayoutInflater layoutInflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+            view = layoutInflater.inflate(R.layout.pop_crm_list, null);
+            ListView plist = (ListView) view.findViewById(R.id.mList);
+            SimpleAdapter adapter = new SimpleAdapter(
+                    this,
+                    getPopData(),
+                    R.layout.item_pop_list,
+                    new String[]{"item_name"}, new int[]{R.id.tv_item_name});
+            plist.setAdapter(adapter);
+            plist.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+                @Override
+                public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+
+                }
+            });
+            popupWindow = new PopupWindow(view, windowManager.getDefaultDisplay().getWidth() / 3, windowManager.getDefaultDisplay().getHeight() / 3);
+        }
+        // 使其聚集
+        popupWindow.setFocusable(true);
+        // 设置允许在外点击消失
+        popupWindow.setOutsideTouchable(true);
+        popupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
+            @Override
+            public void onDismiss() {
+                DisplayUtil.backgroundAlpha(CustomerListActivity.this, 1f);
+            }
+        });
+        DisplayUtil.backgroundAlpha(this, 0.5f);
+        // 这个是为了点击“返回Back”也能使其消失，并且并不会影响你的背景
+        popupWindow.setBackgroundDrawable(new BitmapDrawable());
+        popupWindow.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
+        // 显示的位置为:屏幕的宽度的一半-PopupWindow的高度的一半
+        popupWindow.showAsDropDown(parent, windowManager.getDefaultDisplay().getWidth(), 0);
+    }
+
+
+    private List<Map<String, Object>> getPopData() {
+        List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("item_name", "我自己");
+        list.add(map);
+
+        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;
+    }
 }

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

@@ -2,6 +2,7 @@ package com.xzjmyk.pm.activity.ui.erp.activity.crm;
 
 import android.os.Bundle;
 
+import com.lidroid.xutils.ViewUtils;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 
@@ -17,5 +18,22 @@ public class CustomerMutilSelectActivity extends BaseActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_customer_mutil_select);
+        initView();
+        initData();
+        initListener();
+    }
+
+
+    private void initView() {
+        ViewUtils.inject(this);
+        getSupportActionBar().setTitle("筛选");
+    }
+
+    private void initListener() {
+
+    }
+
+    private void initData() {
+
     }
 }

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

@@ -101,6 +101,9 @@ public class SalesRankingActivity extends BaseActivity {
                 });
                 picker.show();
                 break;
+            case android.R.id.home:
+                onBackPressed();
+                break;
         }
         return true;
     }

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

@@ -1,8 +1,13 @@
 package com.xzjmyk.pm.activity.ui.erp.activity.crm;
 
 
+import android.content.Intent;
 import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
 
+import com.lidroid.xutils.ViewUtils;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 
@@ -12,5 +17,39 @@ public class VisitReportAddActivity extends BaseActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_visit_report_add);
+        initView();
+        initData();
+        initListener();
+    }
+
+    private void initView() {
+        ViewUtils.inject(this);
+        getSupportActionBar().setTitle("拜访报告");
+    }
+
+    private void initListener() {
+
+    }
+
+    private void initData() {
+
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.main_btn_submit, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.bt_save:
+                break;
+            case android.R.id.home:
+                onBackPressed();
+                break;
+        }
+        return true;
     }
 }

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

@@ -2,7 +2,10 @@ package com.xzjmyk.pm.activity.ui.erp.activity.crm;
 
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
 
+import com.lidroid.xutils.ViewUtils;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 
@@ -18,5 +21,40 @@ public class VisitReportPlanActivity extends BaseActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_visit_report_plan);
+        initView();
+        initData();
+        initListener();
+    }
+
+
+    private void initView() {
+        ViewUtils.inject(this);
+        getSupportActionBar().setTitle("拜访计划");
+    }
+
+    private void initListener() {
+
+    }
+
+    private void initData() {
+
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.main_btn_submit, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.bt_save:
+                break;
+            case android.R.id.home:
+                onBackPressed();
+                break;
+        }
+        return true;
     }
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/DisplayUtil.java

@@ -1,6 +1,8 @@
 package com.xzjmyk.pm.activity.util;
 
+import android.app.Activity;
 import android.content.Context;
+import android.view.WindowManager;
 
 public class DisplayUtil {
 
@@ -25,4 +27,16 @@ public class DisplayUtil {
 		final int dpLen = (int) ((seconds / voice_max_length) * (voice_view_max_width - voice_view_min_width)) + voice_view_min_width;
 		return dip2px(context, dpLen);
 	}
+
+
+	/**
+	 * 设置添加屏幕的背景透明度
+	 *
+	 * @param bgAlpha
+	 */
+	public static void backgroundAlpha(Activity activity, float bgAlpha) {
+		WindowManager.LayoutParams lp = activity.getWindow().getAttributes();
+		lp.alpha = bgAlpha; //0.0-1.0
+		activity.getWindow().setAttributes(lp);
+	}
 }

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

@@ -472,8 +472,8 @@ public class FunnelView extends View implements ValueAnimator.AnimatorUpdateList
         mPath9.lineTo(mLastX + mPath9AngleWidth, mLastY + mPath9Height);
         mPath9.close();
         canvas.drawPath(mPath9, mPaint9);
-        mLastWidth = mLastWidth - 2 * mPath9AngleWidth;//最新长度
-        mLastX = mLastX + mPath9AngleWidth;//第四个点的x坐标
+//        mLastWidth = mLastWidth - 2 * mPath9AngleWidth;//最新长度
+//        mLastX = mLastX + mPath9AngleWidth;//第四个点的x坐标
         mLastY = mLastY + mPath9Height;//第四个点的y坐标
     }
 
@@ -640,9 +640,10 @@ public class FunnelView extends View implements ValueAnimator.AnimatorUpdateList
         float offY = fontTotalHeight / 2 - fontMetrics.bottom;
         //float newY = baseY + offY;
 
-        canvas.drawText("销售漏斗", maxWidth + textStartOffsetX, mLastY - mPath9Height / 2 + offY, mPaintText);
+        canvas.drawText("销售漏斗", mLastX + mLastWidth - mPath9AngleWidth + 3 * textStartOffsetX, mLastY - mPath9Height / 2 + offY, mPaintText);
     }
 
+
     private void drawLine5(Canvas canvas) {
         canvas.drawLine(mPath5LineStartX + lineStartOffsetX, mPath5LineStartY, maxWidth, mPath5LineStartY, mPaintLine);
     }

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

@@ -2,7 +2,8 @@
 <ScrollView 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:layout_height="match_parent"
+    android:background="@color/crm_basic_bg">
 
     <RelativeLayout
         android:layout_width="match_parent"

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

@@ -1,12 +1,326 @@
 <?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"
     android:layout_height="match_parent"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    android:paddingBottom="@dimen/activity_vertical_margin"
     tools:context="com.xzjmyk.pm.activity.ui.erp.activity.crm.BusinessAddActivity">
 
-</RelativeLayout>
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        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">
+
+            <RelativeLayout
+                android:id="@+id/ry_leave_man"
+                style="@style/form_relative_customer"
+                android:background="@color/item_color1">
+
+
+                <TextView
+                    android:id="@+id/tv_leave_man"
+                    style="@style/form_relative_left_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_man"
+                    style="@style/form_relative_right_text"
+                    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"
+                    style="@style/form_relative_left_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_mankind"
+                    style="@style/form_relative_right_text"
+                    editTextFormExample:testType="nocheck" />
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:id="@+id/ry_leave_type"
+                style="@style/form_relative_customer"
+                android:visibility="gone">
+
+
+                <TextView
+                    android:id="@+id/tv_leave_type"
+                    style="@style/form_relative_left_text"
+                    android:text="请假类型：" />
+
+                <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+                    android:id="@+id/et_leave_type"
+                    style="@style/form_relative_right_text"
+                    android:focusableInTouchMode="false"
+                    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">
+
+
+                <TextView
+                    android:id="@+id/tv_leave_category"
+                    style="@style/form_relative_left_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_category"
+                    style="@style/form_relative_right_text"
+                    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"
+                    style="@style/form_relative_left_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_days"
+                    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" />
+            </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">
+
+
+                <TextView
+                    android:id="@+id/tv_leave_hours"
+                    style="@style/form_relative_left_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_hours"
+                    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" />
+            </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"
+                    style="@style/form_relative_left_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_reason"
+                    style="@style/form_relative_right_text"
+                    editTextFormExample:testType="nocheck" />
+            </RelativeLayout>
+
+
+            <RelativeLayout
+                android:id="@+id/ry_set_startTime"
+                style="@style/form_relative_customer"
+                android:background="@color/item_color1">
+
+
+                <TextView
+                    android:id="@+id/tv_set_"
+                    style="@style/form_relative_left_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_start_time"
+                    style="@style/form_relative_right_text"
+                    editTextFormExample:customFormat="yyyy-MM-dd HH:mm"
+                    editTextFormExample:testType="date" />
+            </RelativeLayout>
+
+
+            <RelativeLayout
+                android:id="@+id/ry_set_endTime"
+                style="@style/form_relative_customer"
+                android:background="@color/item_color2">
+
+                <TextView
+                    style="@style/form_relative_left_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"
+                    style="@style/form_relative_right_text"
+                    editTextFormExample:customFormat="yyyy-MM-dd HH:mm"
+                    editTextFormExample:testType="date" />
+            </RelativeLayout>
+
+            <RelativeLayout
+                style="@style/form_relative_customer"
+                android:background="@color/item_color1">
+
+
+                <TextView
+
+                    style="@style/form_relative_left_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"
+
+                    style="@style/form_relative_right_text"
+                    editTextFormExample:customFormat="yyyy-MM-dd HH:mm"
+                    editTextFormExample:testType="date" />
+            </RelativeLayout>
+
+            <RelativeLayout
+
+                style="@style/form_relative_customer"
+                android:background="@color/item_color2">
+
+                <TextView
+
+                    style="@style/form_relative_left_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"
+
+                    style="@style/form_relative_right_text"
+                    editTextFormExample:customFormat="yyyy-MM-dd HH:mm"
+                    editTextFormExample:testType="date" />
+            </RelativeLayout>
+
+            <RelativeLayout
+                style="@style/form_relative_customer"
+                android:background="@color/item_color1">
+
+
+                <TextView
+
+                    style="@style/form_relative_left_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"
+
+                    style="@style/form_relative_right_text"
+                    editTextFormExample:customFormat="yyyy-MM-dd HH:mm"
+                    editTextFormExample:testType="date" />
+            </RelativeLayout>
+
+
+            <RelativeLayout
+
+                style="@style/form_relative_customer"
+                android:background="@color/item_color2">
+
+                <TextView
+
+                    style="@style/form_relative_left_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"
+
+                    style="@style/form_relative_right_text"
+                    editTextFormExample:customFormat="yyyy-MM-dd HH:mm"
+                    editTextFormExample:testType="date" />
+            </RelativeLayout>
+
+            <RelativeLayout
+                style="@style/form_relative_customer"
+                android:background="@color/item_color1">
+
+
+                <TextView
+                    android:id="@+id/tv_note_"
+                    style="@style/form_relative_left_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_note_value"
+                    style="@style/form_relative_right_text"
+                    editTextFormExample:customFormat="yyyy-MM-dd HH:mm"
+                    editTextFormExample:testType="date" />
+            </RelativeLayout>
+
+
+            <RelativeLayout
+
+                style="@style/form_relative_customer"
+                android:background="@color/item_color2">
+
+                <TextView
+                    android:id="@+id/tv_date_gh"
+                    style="@style/form_relative_left_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_end_time"
+                    style="@style/form_relative_right_text"
+                    editTextFormExample:customFormat="yyyy-MM-dd HH:mm"
+                    editTextFormExample:testType="date" />
+            </RelativeLayout>
+
+        </LinearLayout>
+    </RelativeLayout>
+
+</ScrollView>

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

@@ -3,12 +3,13 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+
     android:fillViewport="true">
 
     <LinearLayout
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-        android:background="@color/light_gray"
+        android:background="@color/crm_basic_bg"
         android:orientation="vertical"
     tools:context="com.xzjmyk.pm.activity.ui.erp.activity.crm.BusinessDetailInfoActivity">
 

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

@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:background="@color/light_gray"
+    android:background="@color/crm_basic_bg"
     tools:context="com.xzjmyk.pm.activity.ui.erp.activity.crm.BusinessDetailActivty">
     <LinearLayout
         android:id="@+id/ll_top_state"
@@ -58,6 +58,29 @@
         style="@style/app_line_horizontal_05p"
         android:layout_width="match_parent"></View>
 
+    <RelativeLayout
+        android:background="@drawable/bg_bar"
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        android:orientation="horizontal"
+        android:paddingBottom="5dp"
+        android:paddingLeft="15dp"
+        android:paddingRight="15dp"
+        android:paddingTop="5dp">
+
+        <com.xzjmyk.pm.activity.view.ClearEditText
+            android:id="@+id/search_edit"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:layout_centerVertical="true"
+            android:background="@drawable/search_input"
+            android:drawableLeft="@drawable/search"
+            android:drawableRight="@drawable/search_clear"
+            android:hint="@string/search"
+            android:textColor="@color/dark_grey"
+            android:textColorHint="@color/grey"
+            android:textSize="15sp" />
+    </RelativeLayout>
     <com.handmark.pulltorefresh.library.PullToRefreshListView
         android:id="@+id/list_business"
         android:layout_marginLeft="10dp"

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

@@ -5,6 +5,29 @@
     android:layout_height="match_parent"
     tools:context="com.xzjmyk.pm.activity.ui.erp.activity.crm.BusinessSelectCustomerActivity">
 
+    <RelativeLayout
+        android:background="@drawable/bg_bar"
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        android:orientation="horizontal"
+        android:paddingBottom="5dp"
+        android:paddingLeft="15dp"
+        android:paddingRight="15dp"
+        android:paddingTop="5dp">
+
+        <com.xzjmyk.pm.activity.view.ClearEditText
+            android:id="@+id/search_edit"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:layout_centerVertical="true"
+            android:background="@drawable/search_input"
+            android:drawableLeft="@drawable/search"
+            android:drawableRight="@drawable/search_clear"
+            android:hint="@string/search"
+            android:textColor="@color/dark_grey"
+            android:textColorHint="@color/grey"
+            android:textSize="15sp" />
+    </RelativeLayout>
     <com.handmark.pulltorefresh.library.PullToRefreshListView
         android:id="@+id/list_business"
         android:dividerHeight="5dp"

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

@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/light_gray"
+    android:background="@color/crm_basic_bg"
     tools:context="com.xzjmyk.pm.activity.ui.erp.activity.crm.ClientActivity">
 
     <LinearLayout

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

@@ -49,8 +49,12 @@
         </LinearLayout>
 
         <TextView
+            android:id="@+id/tv_change"
             android:layout_alignParentRight="true"
             android:layout_margin="10dp"
+            android:clickable="true"
+            android:onClick="changeOnChange"
+            android:textColor="@color/white"
             android:layout_centerVertical="true"
             style="@style/TextView_Basic"
             android:text="切换" />

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

@@ -1,12 +1,223 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout 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:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    android:paddingBottom="@dimen/activity_vertical_margin"
     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">
+
+        <RelativeLayout
+            android:id="@+id/ry_leave_man"
+            style="@style/form_relative_customer"
+            android:background="@color/item_color1">
+
+
+            <TextView
+                android:id="@+id/tv_leave_man"
+                style="@style/form_relative_left_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_man"
+                style="@style/form_relative_right_text"
+                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"
+                style="@style/form_relative_left_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_mankind"
+                style="@style/form_relative_right_text"
+                editTextFormExample:testType="nocheck" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/ry_leave_type"
+            style="@style/form_relative_customer"
+            android:visibility="gone">
+
+
+            <TextView
+                android:id="@+id/tv_leave_type"
+                style="@style/form_relative_left_text"
+                android:text="请假类型：" />
+
+            <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+                android:id="@+id/et_leave_type"
+                style="@style/form_relative_right_text"
+                android:focusableInTouchMode="false"
+                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">
+
+
+            <TextView
+                android:id="@+id/tv_leave_category"
+                style="@style/form_relative_left_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_category"
+                style="@style/form_relative_right_text"
+                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"
+                style="@style/form_relative_left_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_days"
+                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" />
+        </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">
+
+
+            <TextView
+                android:id="@+id/tv_leave_hours"
+                style="@style/form_relative_left_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_hours"
+                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" />
+        </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"
+                style="@style/form_relative_left_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_reason"
+                style="@style/form_relative_right_text"
+                editTextFormExample:testType="nocheck" />
+        </RelativeLayout>
+
+
+        <RelativeLayout
+            android:id="@+id/ry_set_startTime"
+            style="@style/form_relative_customer"
+            android:background="@color/item_color1">
+
+
+            <TextView
+                android:id="@+id/tv_set_"
+                style="@style/form_relative_left_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_start_time"
+                style="@style/form_relative_right_text"
+                editTextFormExample:customFormat="yyyy-MM-dd HH:mm"
+                editTextFormExample:testType="date" />
+        </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"
+                style="@style/form_relative_left_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_end_time"
+                style="@style/form_relative_right_text"
+                editTextFormExample:customFormat="yyyy-MM-dd HH:mm"
+                editTextFormExample:testType="date" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            style="@style/form_relative_customer"
+            android:background="@color/item_color1">
+
+
+            <TextView
+                android:id="@+id/tv_note_"
+                style="@style/form_relative_left_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_note_value"
+                style="@style/form_relative_right_text"
+                editTextFormExample:customFormat="yyyy-MM-dd HH:mm"
+                editTextFormExample:testType="date" />
+        </RelativeLayout>
+    </LinearLayout>
 </RelativeLayout>

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/btn_save"
+        android:title="确定"
+        app:showAsAction="ifRoom" />
+</menu>

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

@@ -5,7 +5,7 @@
 
     <item
         android:id="@+id/add_item"
-        android:icon="@drawable/actionbar_add_icon"
+        android:icon="@drawable/fab_add"
         android:title="@string/add"
         app:showAsAction="ifRoom"/>
 

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

@@ -2,14 +2,14 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     tools:context="com.xzjmyk.pm.activity.MainActivity">
-    <item
+    <!--<item
         android:id="@+id/qrcode"
         android:icon="@drawable/icon_crm_qrcode"
         android:title="@string/search"
-        app:showAsAction="ifRoom" />
+        app:showAsAction="ifRoom" />-->
     <item
         android:id="@+id/crm_add"
-        android:icon="@drawable/icon_crm_add"
+        android:icon="@drawable/fab_add"
         android:title="@string/search"
         app:showAsAction="ifRoom" />