独立版 新增人员 完成

WeiChat/src/main/AndroidManifest.xml

@@ -905,6 +905,9 @@
         <activity android:name=".ui.erp.activity.oa.NavigationActivity"
             android:label="导航"/>
         <activity android:name=".ui.platform.task.TaskAddErpActivity"/>
+        <activity android:name=".ui.erp.activity.oa.PlatContactAddPeopleActivity"
+            android:label="新增人员"
+            android:windowSoftInputMode="adjustPan"/>
     </application>
 
 </manifest>

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/contact/ContactFragment.java

@@ -12,6 +12,7 @@ import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.util.Log;
+import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -19,6 +20,8 @@ import android.view.MenuItem;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.PopupWindow;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
@@ -45,6 +48,7 @@ import com.xzjmyk.pm.activity.ui.base.EasyFragment;
 import com.xzjmyk.pm.activity.ui.circle.BasicInfoActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.CommonFragmentActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.CompanyContactsActivity;
+import com.xzjmyk.pm.activity.ui.erp.activity.oa.PlatContactAddPeopleActivity;
 import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
 import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
@@ -59,6 +63,7 @@ import com.xzjmyk.pm.activity.ui.erp.view.CustomProgressDialog;
 import com.xzjmyk.pm.activity.ui.message.ChatActivity;
 import com.xzjmyk.pm.activity.ui.message.NewFriendActivity;
 import com.xzjmyk.pm.activity.ui.tool.ThreadPool;
+import com.xzjmyk.pm.activity.util.DisplayUtil;
 import com.xzjmyk.pm.activity.view.ClearEditText;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
 import com.xzjmyk.pm.activity.view.crouton.Style;
@@ -111,6 +116,7 @@ public class ContactFragment extends EasyFragment implements View.OnClickListene
         }
     };
     private ImageView voice_search;
+    private boolean isB2b;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -120,6 +126,8 @@ public class ContactFragment extends EasyFragment implements View.OnClickListene
         inputFilter.addAction(AutoErpService.UPDATA_ERP_CHANGE);
         LocalBroadcastManager.getInstance(ct).registerReceiver(receiver, inputFilter);
         setHasOptionsMenu(true);
+
+        isB2b = ApiUtils.getApiModel() instanceof ApiPlatform;
     }
 
     @Override
@@ -143,12 +151,62 @@ public class ContactFragment extends EasyFragment implements View.OnClickListene
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == R.id.search) {
-            startActivity(new Intent(getActivity(), UserSearchActivity.class));
+            if (!isB2b){
+                startActivity(new Intent(getActivity(), UserSearchActivity.class));
+            }else {
+                showPopupWindow();
+            }
         }
         return super.onOptionsItemSelected(item);
 
     }
+    //弹出菜单
+    private PopupWindow setWindow = null;
+    private void showPopupWindow(){
+        initMenuwindow();
+        setWindow.showAtLocation(getActivity().getWindow().getDecorView().
+                findViewById(android.R.id.content), Gravity.CENTER, 0, 0);
+        DisplayUtil.backgroundAlpha(getActivity(), 0.4f);
 
+}
+
+    private  TextView add_friend_tv;
+    private TextView add_people_tv;
+    private void initMenuwindow() {
+        View viewContext = LayoutInflater.from(getActivity()).inflate(R.layout.contact_add_menu, null);
+        add_friend_tv = (TextView) viewContext.findViewById(R.id.add_friend_tv);
+        add_people_tv = (TextView) viewContext.findViewById(R.id.add_people_tv);
+        add_friend_tv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                startActivity(new Intent(getActivity(), UserSearchActivity.class));
+                closePopupWindow();
+            }
+        });
+        add_people_tv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                startActivity(new Intent(getActivity(),PlatContactAddPeopleActivity.class));
+                closePopupWindow();
+            }
+        });
+        setWindow = new PopupWindow(viewContext,
+                LinearLayout.LayoutParams.MATCH_PARENT,
+                LinearLayout.LayoutParams.WRAP_CONTENT, true);
+        setWindow.setAnimationStyle(R.style.MenuAnimationFade);
+        setWindow.setBackgroundDrawable(ct.getResources().getDrawable(R.drawable.bg_popuwin));
+        setWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
+            @Override
+            public void onDismiss() {
+                closePopupWindow();
+            }
+        });
+    }
+    private void closePopupWindow() {
+        if (setWindow != null)
+            setWindow.dismiss();
+        DisplayUtil.backgroundAlpha(getActivity(), 1f);
+    }
     @Override
     protected void onCreateView(Bundle savedInstanceState, boolean createView) {
         if (createView) {
@@ -437,7 +495,6 @@ public class ContactFragment extends EasyFragment implements View.OnClickListene
     public void loadFriendsByNet() {
         String master = CommonUtil.getMaster();
         if (StringUtils.isEmpty(master)) return;
-        boolean isB2b = ApiUtils.getApiModel() instanceof ApiPlatform;
         Map<String, Object> param = new HashMap<>();
         param.put("master", master);
         param.put("lastdate", "");

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

@@ -0,0 +1,264 @@
+package com.xzjmyk.pm.activity.ui.erp.activity.oa;
+
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.util.Log;
+import android.view.View;
+import android.widget.Button;
+import android.widget.Toast;
+
+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.MyApplication;
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.bean.oa.SelectBean;
+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.ui.erp.util.StringUtils;
+import com.xzjmyk.pm.activity.wxapi.ApiConfig;
+import com.xzjmyk.pm.activity.wxapi.ApiUtils;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * Created by FANGlh on 2017/4/12.
+ * function:
+ */
+public class PlatContactAddPeopleActivity  extends BaseActivity implements View.OnClickListener{
+    private static final int SAVE_REQUEST = 0x41301;
+    @ViewInject(R.id.user_name_tv)
+    private FormEditText user_name_tv;
+    @ViewInject(R.id.user_sex_tv)
+    private FormEditText user_sex_tv;
+    @ViewInject(R.id.user_department_tv)
+    private FormEditText user_department_tv;
+    @ViewInject(R.id.user_job_tv)
+    private FormEditText user_job_tv;
+    @ViewInject(R.id.user_tel_tv)
+    private FormEditText user_tel_tv;
+    @ViewInject(R.id.user_email_tv)
+    private FormEditText user_email_tv;
+    @ViewInject(R.id.btn_save)
+    private Button btn_save;
+    private int mSex = 1;
+    private String[] mDepartment = {"总经办", "采购部","销售部","财务部", "人事行政部", "研发部"};
+    private String [][] mJobs = {
+            {"总经理","副总经理","秘书"},
+            {"经理","采购员"},
+            {"经理","业务员"},
+            {"经理","会计","出纳"},
+            {"经理","人事专员","行政专员"},
+            {"经理","工程师"}
+    };
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.plat_add_people);
+        ViewUtils.inject(this);
+        initView();
+    }
+
+    private void initView() {
+        user_sex_tv.setKeyListener(null);
+        user_sex_tv.setFocusable(false);
+        user_sex_tv.setOnClickListener(this);
+
+        user_department_tv.setKeyListener(null);
+        user_department_tv.setFocusable(false);
+        user_department_tv.setOnClickListener(this);
+
+        user_job_tv.setKeyListener(null);
+        user_job_tv.setFocusable(false);
+        user_job_tv.setOnClickListener(this);
+        btn_save.setOnClickListener(this);
+
+    }
+
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()){
+            case R.id.user_sex_tv:
+                showSelectSexDialog();
+                break;
+            case R.id.btn_save:
+                saveJudge();
+                break;
+            case R.id.user_department_tv:
+                doSelectDepartment();
+                break;
+            case R.id.user_job_tv:
+                if (StringUtils.isEmpty(user_department_tv.getText().toString())){
+                    ToastMessage("请先选择部门");
+                }else {
+                    doSelectJob();
+                }
+                break;
+            default:
+        }
+    }
+
+    private void doSelectJob() {
+        ArrayList<SelectBean> formBeaan = new ArrayList<>();
+        SelectBean selectBean;
+        int item = -1;
+        switch (user_department_tv.getText().toString()){
+            case "总经办":
+                item = 0;
+                break;
+            case "采购部":
+                item = 1;
+                break;
+            case "销售部":
+                item = 2;
+                break;
+            case "财务部":
+                item = 3;
+                break;
+            case "人事行政部":
+                item = 4;
+                break;
+            case "研发部":
+                item = 5;
+                break;
+            default:
+        }
+        for (int i = 0; i < mJobs[item].length; i++) {
+            selectBean = new SelectBean();
+            selectBean.setName(mJobs[item][i]);
+            formBeaan.add(selectBean);
+        }
+
+        Intent intent = new Intent();
+        intent.setClass(this, SelectActivity.class);
+        intent.putExtra("type", 2);
+        intent.putExtra("title", "选择岗位");
+        intent.putParcelableArrayListExtra("data", formBeaan);
+        startActivityForResult(intent, 0x12);
+    }
+
+    private void doSelectDepartment() {
+        ArrayList<SelectBean> formBeaan = new ArrayList<>();
+        SelectBean selectBean;
+        for (int i = 0; i < mDepartment.length; i++) {
+            selectBean = new SelectBean();
+            selectBean.setName(mDepartment[i]);
+            formBeaan.add(selectBean);
+        }
+        Intent intent = new Intent();
+        intent.setClass(this, SelectActivity.class);
+        intent.putExtra("type", 2);
+        intent.putExtra("title", "选择部门");
+        intent.putParcelableArrayListExtra("data", formBeaan);
+        startActivityForResult(intent, 0x11);
+    }
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (data == null) return;
+        if (resultCode == 0x20){
+            SelectBean b = data.getParcelableExtra("data");
+            if (b != null){
+                switch (requestCode){
+                    case 0x11:
+                        user_department_tv.setText(b.getName());
+                        user_job_tv.setText("");
+                        break;
+                    case 0x12:
+                        user_job_tv.setText(b.getName());
+                        break;
+                    default:
+                }
+            }
+
+        }
+        super.onActivityResult(requestCode, resultCode, data);
+    }
+    private void saveJudge() {
+        if (user_name_tv.testValidity() && user_sex_tv.testValidity()
+                && user_department_tv.testValidity() && user_job_tv.testValidity()
+                && user_email_tv.testValidity() && user_tel_tv.testValidity()
+                ){
+            saveRequest();
+        }
+    }
+
+    private void saveRequest() {
+        progressDialog.show();
+        btn_save.setEnabled(false);
+        Map<String,Object> formStoreMap = new HashMap<>();
+        formStoreMap.put("userName",user_name_tv.getText().toString());
+        formStoreMap.put("userSex","男".equals(user_sex_tv.getText().toString()) ? "M" : "F");
+        formStoreMap.put("userTel",user_tel_tv.getText().toString());
+        formStoreMap.put("userEmail",user_email_tv.getText().toString());
+
+        String url = ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().add_people;
+        HashMap<String,Object> param = new HashMap<>();
+        String formStore = JSON.toJSONString(formStoreMap);
+        param.put("formStore",formStore);
+        param.put("dept",user_department_tv.getText().toString());
+        param.put("role",user_job_tv.getText().toString());
+        param.put("enuu",  CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "companyEnUu"));
+        param.put("emcode",CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "b2b_uu"));
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getCookie());
+        ViewUtil.httpSendRequest(this, url, param, handler, headers, SAVE_REQUEST, null, null, "post");
+    }
+    private Handler handler = new Handler(){
+        @Override
+        public void handleMessage(Message msg) {
+            super.handleMessage(msg);
+            switch (msg.what){
+                case SAVE_REQUEST:
+                    if (msg.getData() != null){
+                        String save_result = msg.getData().getString("result");
+                        Log.i("save_result",save_result);
+                        if (!StringUtils.isEmpty(save_result)){
+                            if (JSON.parseObject(save_result).containsKey("success") && JSON.parseObject(save_result).getBoolean("success")){
+                                Toast.makeText(getApplicationContext(), "新增成功", Toast.LENGTH_LONG);
+                                finish();
+                            }
+                        }
+                    }
+                    progressDialog.dismiss();
+                    btn_save.setEnabled(true);
+                    break;
+                default:
+                    if (msg.getData() != null) {
+                        if (!StringUtils.isEmpty(msg.getData().getString("result"))) {
+                            ToastMessage(msg.getData().getString("result"));
+                            progressDialog.dismiss();
+                            btn_save.setEnabled(true);
+                        }
+                    }
+                    break;
+            }
+        }
+    };
+    private void showSelectSexDialog() {
+        // 1是男，0是女，2是全部
+        String[] sexs = new String[]{ getString(R.string.sex_man), getString(R.string.sex_woman)};
+        int checkItem = 0;
+        new AlertDialog.Builder(this).setTitle(getString(R.string.select_sex))
+                .setSingleChoiceItems(sexs, checkItem, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        if (which == 0) {
+                            user_sex_tv.setText(R.string.sex_man);
+                        } else {
+                            user_sex_tv.setText(R.string.sex_woman);
+                        }
+                        dialog.dismiss();
+                    }
+                }).setCancelable(true).create().show();
+    }
+
+}

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

@@ -33,34 +33,24 @@ public class NewSchedultAdapter extends BaseAdapter {
     public void setSearch_content(String search_content) {
         this.search_content = search_content;
     }
-
-
     public List<AllProcess> getReal_List() {
         return real_List;
     }
-
     public void setReal_List(List<AllProcess> real_List) {
         this.real_List = real_List;
     }
-
     private Context context;
-
     public NewSchedultAdapter() {
-
     }
-
     public NewSchedultAdapter(Context context, List<AllProcess> fArrayList) {
         this.context = context;
         this.fList = fArrayList;
     }
-
-    public NewSchedultAdapter(Context context, List<AllProcess> fArrayList,
-                              List<AllProcess> flistNew) {
+    public NewSchedultAdapter(Context context, List<AllProcess> fArrayList, List<AllProcess> flistNew) {
         this.context = context;
         this.fList = fArrayList;
         this.flistNew = flistNew;
     }
-
     @Override
     public int getCount() {
         if (fList == null || fList.isEmpty()) {
@@ -68,17 +58,14 @@ public class NewSchedultAdapter extends BaseAdapter {
         }
         return fList.size();
     }
-
     @Override
     public Object getItem(int position) {
         return fList.get(position);
     }
-
     @Override
     public long getItemId(int position) {
         return position;
     }
-
     @Override
     public View getView(int position, View view, ViewGroup parent) {
         AllProcess fields_object = fList.get(position);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/SettingActivity.java

@@ -79,6 +79,8 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
     private RelativeLayout close_push_rl;
     @ViewInject(R.id.speech_recognition_rl)
     private RelativeLayout speech_recognition_rl;
+    @ViewInject(R.id.new_step_rl)
+    private RelativeLayout new_step_rl;
     private ProgressDialog dialog;
     private RelativeLayout share_rl;
     private String uustep_service_name = "com.xzjmyk.pm.basepedo.service.StepService";
@@ -94,6 +96,9 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
     }
 
     private void initView() {
+        new_step_rl.setOnClickListener(this);
+        new_step_rl.setVisibility(View.GONE);
+
         dialog = new ProgressDialog(this);
         dialog.setIndeterminate(true);
         share_rl = (RelativeLayout) findViewById(R.id.share_rl);
@@ -180,6 +185,12 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
                 }
             }
         });
+        new_step_rl.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                startActivity(new Intent(mContext, MyPedometerActivity.class));
+            }
+        });
         //长按UU运动栏会显示语音识别界面
        /* uu_step_rl.setOnLongClickListener(new View.OnLongClickListener() {
             @Override
@@ -258,6 +269,9 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
     @Override
     public void onClick(View v) {
         switch (v.getId()) {
+            case R.id.new_step_rl:
+
+                break;
             case R.id.speech_recognition_rl:
                 startActivity(new Intent(mContext,SpeechrecognitionActivity.class));
                 break;

WeiChat/src/main/java/com/xzjmyk/pm/activity/wxapi/ApiBase.java

@@ -97,7 +97,7 @@ public abstract class ApiBase {
     public String countBack;//阅读消息红点
     public String second_msg_detaily; // 消息第二层红点
     public String back_ids;
-
+    public String add_people;
     public String getCommon_delete_approval_flow_url() {
         return common_delete_approval_flow_url;
     }

WeiChat/src/main/java/com/xzjmyk/pm/activity/wxapi/ApiPlatform.java

@@ -95,6 +95,7 @@ public class ApiPlatform extends ApiBase implements ApiModel {
         super.saveVisitRecord = mBaseUrl + "mobile/workSchedule/saveVisitRecord";
         super.releaseCount = mBaseUrl + "mobile/release/count";
         super.countBack = mBaseUrl + "mobile/release/count/back";
+        super.add_people = mBaseUrl + "mobile/adduser/user";
 
 
         /*strat by Bitliker*/ //外勤
@@ -150,6 +151,7 @@ public class ApiPlatform extends ApiBase implements ApiModel {
         setCommon_doc_detaily_url(COMMON_DOC_DETAILY_URL); //获取单据详情
         setCommon_doc_examine_and_approve_url(COMMON_DOC_EXAMINE_AND_APPROVE_URL);//单据的领导审批操作 同意/不同意/变更处理人
         setCommon_delete_approval_flow_url(COMMON_DELETE_APPROVAL_FLOW_URL); //删除审批流
+
     }
 
 

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

@@ -76,6 +76,30 @@
                     android:background="@drawable/oa_next"
                     android:contentDescription="@string/app_name" />
             </RelativeLayout>
+            <RelativeLayout
+                android:id="@+id/new_step_rl"
+                style="@style/IMTbleLine"
+                android:background="@drawable/selector_me_menu_item_bg"
+                android:visibility="visible">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:gravity="center"
+                    android:text="计步助手"
+                    android:textColor="@color/black"
+                    android:textSize="14sp" />
+
+                <ImageView
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+
+                    android:background="@drawable/oa_next"
+                    android:contentDescription="@string/app_name" />
+            </RelativeLayout>
             <View
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/line"

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

@@ -0,0 +1,61 @@
+<?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"
+    android:background="@drawable/bg_popuwin"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="150dp"
+        android:layout_height="match_parent"
+        android:layout_gravity="center_horizontal"
+        android:background="@color/white"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/add_friend_tv"
+            android:layout_width="150dp"
+            android:layout_height="45dp"
+            android:background="@drawable/selector_me_menu_item_bg"
+            android:gravity="center"
+            android:text="添加好友"
+            android:textColor="@color/black"
+            android:textSize="15sp" />
+
+
+        <View
+            android:layout_width="200dp"
+            android:layout_height="1dp"
+            android:background="@color/gray_light"
+            android:visibility="visible" />
+
+        <TextView
+            android:id="@+id/add_people_tv"
+            android:layout_width="150dp"
+            android:layout_height="45dp"
+            android:background="@drawable/selector_me_menu_item_bg"
+            android:gravity="center"
+            android:text="新增人员"
+            android:textColor="@color/black"
+            android:textSize="15sp"
+            android:visibility="visible" />
+        <View
+            android:layout_width="200dp"
+            android:layout_height="1dp"
+            android:background="@color/gray_light"
+            android:visibility="gone" />
+
+        <TextView
+            android:id="@+id/msg_detail_tv"
+            android:layout_width="150dp"
+            android:layout_height="45dp"
+            android:background="@drawable/selector_me_menu_item_bg"
+            android:gravity="center"
+            android:text="查看消息"
+            android:textColor="@color/black"
+            android:textSize="15sp"
+            android:visibility="gone" />
+    </LinearLayout>
+
+
+</LinearLayout>

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

@@ -11,7 +11,8 @@
         android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
         android:layout_marginRight="10dp"
-        android:src="@drawable/oa_next" />
+        android:src="@drawable/oa_next"
+        android:visibility="invisible"/>
 
 <LinearLayout
     android:layout_width="match_parent"

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

@@ -0,0 +1,208 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:whatever="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/bg_main"
+    android:orientation="vertical">
+
+    <com.xzjmyk.pm.activity.ui.erp.view.CustomerScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="true">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+            <RelativeLayout
+                style="@style/IMTbleLine2"
+                android:layout_height="50dp"
+                android:background="@color/white">
+                <TextView
+                    style="@style/form_relative_left_text"
+                    android:text="姓     名"
+                    android:layout_marginLeft="0dp"
+                    android:textColor="@color/text_main"
+                    android:textSize="15sp"/>
+
+                <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+                    android:id="@+id/user_name_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/dark_dark_grey"
+                    android:padding="10dp"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:background="@null"
+                    android:hint="请输入(必填)"
+                    android:textSize="15sp"
+                    android:gravity="center_vertical|right"/>
+            </RelativeLayout>
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="2px"
+                android:background="@color/item_line" />
+            <RelativeLayout
+                style="@style/IMTbleLine2"
+                android:layout_height="50dp"
+                android:background="@color/white"
+                >
+                <TextView
+                    style="@style/form_relative_left_text"
+                    android:text="性     别"
+                    android:layout_marginLeft="0dp"
+                    android:textColor="@color/text_main"
+                    android:textSize="15sp" />
+
+                <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+                    android:id="@+id/user_sex_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/dark_dark_grey"
+                    android:padding="10dp"
+                    android:hint="请选择(必选)"
+                    android:layout_alignParentRight="true"
+                    android:gravity="center_vertical|right"
+                    android:background="@null"
+                    android:textSize="15sp"
+                    />
+            </RelativeLayout>
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="2px"
+                android:background="@color/item_line" />
+            <RelativeLayout
+                android:id="@+id/ry_set_startTime"
+                style="@style/IMTbleLine2"
+                android:layout_height="50dp"
+                android:background="@color/white">
+
+
+                <TextView
+                    style="@style/form_relative_left_text"
+                    android:text="部     门"
+                    android:layout_marginLeft="0dp"
+                    android:textColor="@color/text_main"
+                    android:textSize="15sp"/>
+
+                <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+                    android:id="@+id/user_department_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/dark_dark_grey"
+                    android:padding="10dp"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:background="@null"
+                    android:hint="请选择(必选)"
+                    android:textSize="15sp"
+                    android:gravity="center_vertical|right"/>
+            </RelativeLayout>
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="2px"
+                android:background="@color/item_line" />
+            <RelativeLayout
+                style="@style/IMTbleLine2"
+                android:layout_height="50dp"
+                android:background="@color/white">
+
+                <TextView
+                    style="@style/form_relative_left_text"
+                    android:text="岗     位"
+                    android:layout_marginLeft="0dp"
+                    android:textColor="@color/text_main"
+                    android:textSize="15sp" />
+
+                <com.andreabaccega.widget.FormEditText
+                    xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+                    android:id="@+id/user_job_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/dark_dark_grey"
+                    android:padding="10dp"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:background="@null"
+                    android:hint="请选择(必选)"
+                    android:textSize="15sp"
+                    android:gravity="center_vertical|right"/>
+            </RelativeLayout>
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="2px"
+                android:background="@color/item_line" />
+            <RelativeLayout
+                style="@style/IMTbleLine2"
+                android:layout_height="50dp"
+                android:background="@color/white">
+                <TextView
+                    style="@style/form_relative_left_text"
+                    android:text="电话号码"
+                    android:layout_marginLeft="0dp"
+                    android:textColor="@color/text_main"
+                    android:textSize="15sp"/>
+
+                <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+                    android:id="@+id/user_tel_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/dark_dark_grey"
+                    android:padding="10dp"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:background="@null"
+                    android:hint="请输入(必填)"
+                    android:textSize="15sp"
+                    android:inputType="number"
+                    android:gravity="center_vertical|right"/>
+            </RelativeLayout>
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="2px"
+                android:background="@color/item_line" />
+            <RelativeLayout
+                style="@style/IMTbleLine2"
+                android:layout_height="50dp"
+                android:background="@color/white">
+                <TextView
+                    style="@style/form_relative_left_text"
+                    android:text="邮箱地址"
+                    android:layout_marginLeft="0dp"
+                    android:textColor="@color/text_main"
+                    android:textSize="15sp"/>
+
+                <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+                   android:id="@+id/user_email_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/dark_dark_grey"
+                    android:padding="10dp"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:background="@null"
+                    android:hint="请输入(必填)"
+                    android:textSize="15sp"
+                    android:gravity="center_vertical|right"/>
+            </RelativeLayout>
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="2px"
+                android:background="@color/item_line" />
+            <Button
+                android:id="@+id/btn_save"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:layout_marginTop="30dp"
+                android:background="@drawable/bg_bule_btn"
+                android:padding="10dp"
+                android:text="提交"
+                android:textColor="@color/white"
+                android:textSize="@dimen/text_main" />
+        </LinearLayout>
+
+    </com.xzjmyk.pm.activity.ui.erp.view.CustomerScrollView>
+</LinearLayout>

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

@@ -6,7 +6,7 @@
     <item
         android:id="@+id/search"
         android:icon="@drawable/more"
-        android:title="添加好友"
+        android:title="添加"
         app:showAsAction="ifRoom"/>
 
 </menu>