17:46

app_core/common/src/main/res/layout/bsetting_activity.xml

@@ -118,6 +118,7 @@
 
     </RelativeLayout>
     <RelativeLayout
+        android:id="@+id/batchplace_rl"
         style="@style/IMTbleLine"
         android:background="@drawable/selector_me_menu_item_bg">
         <View
@@ -143,4 +144,58 @@
 
     </RelativeLayout>
 
+    <RelativeLayout
+        android:id="@+id/employeerest_rl"
+        style="@style/IMTbleLine"
+        android:background="@drawable/selector_me_menu_item_bg">
+        <View
+            android:layout_alignParentBottom="true"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/line"
+            android:background="@color/item_line" />
+        <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>
+
+    <RelativeLayout
+        android:id="@+id/companyrest_rl"
+        style="@style/IMTbleLine"
+        android:background="@drawable/selector_me_menu_item_bg">
+        <View
+            android:layout_alignParentBottom="true"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/line"
+            android:background="@color/item_line" />
+        <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>
+
 </LinearLayout>

app_modular/appme/src/main/AndroidManifest.xml

@@ -50,9 +50,11 @@
         <activity android:name=".settings.activity.ImageSettingActivity"
             android:label="形象照片"/>
         <activity android:name=".settings.activity.PersonSettingActivity"
-            android:label="人员设置"
+            android:label="新增人员"
             android:windowSoftInputMode="adjustPan"/>
         <activity android:name=".settings.activity.PersonSettingListActivity"
             android:label="@string/more"/>
+        <activity android:name=".settings.activity.BComSetRestActivity"
+            android:label="批量设置员工休息日"/>
     </application>
 </manifest>

app_modular/appme/src/main/java/com/uas/appme/settings/activity/BComSetRestActivity.java

@@ -0,0 +1,148 @@
+package com.uas.appme.settings.activity;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.TextView;
+
+import com.alibaba.fastjson.JSON;
+import com.common.LogUtil;
+import com.common.data.JSONUtil;
+import com.common.data.ListUtils;
+import com.core.app.MyApplication;
+import com.core.base.BaseActivity;
+import com.core.widget.MyListView;
+import com.me.network.app.http.HttpClient;
+import com.me.network.app.http.Method;
+import com.me.network.app.http.rx.ResultListener;
+import com.me.network.app.http.rx.ResultSubscriber;
+import com.uas.appme.R;
+import com.uas.appme.settings.Constant.Constant;
+import com.uas.appme.settings.model.ComRestBean;
+import com.uas.appme.settings.model.PersonSetingBean;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by FANGlh on 2017/10/12.
+ * function:
+ */
+
+public class BComSetRestActivity extends BaseActivity implements View.OnClickListener{
+    private MyListView mComList;
+    private List<ComRestBean> mList;  //进行保存的员工休息数据列表
+    private PersonSetingBean mServicePersonList;  //获取商家服务人员
+    private int mList_size = 0;
+    private ComRestAdapter myAdapter;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.service_bcom_setting_activity);
+        initView();
+        initData();
+    }
+
+    private void initData() {
+
+        //获取商家服务人员
+        HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
+        httpClient.Api().send(new HttpClient.Builder()
+                .url("user/appStoreman")
+                .add("companyid", 201)
+                .add("serviceid", MyApplication.getInstance().mLoginUser.getUserId())
+                .add("token",MyApplication.getInstance().mAccessToken)
+                .method(Method.GET)
+                .build(),new ResultSubscriber<>(new ResultListener<Object>() {
+            @Override
+            public void onResponse(Object o) {
+                if (!JSONUtil.validate(o.toString()) || o == null) return;
+                LogUtil.prinlnLongMsg("appStoreman", o.toString()+"");
+                try {
+                    mServicePersonList = JSON.parseObject(o.toString(),PersonSetingBean.class);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        }));
+
+    }
+
+
+    private void initView() {
+        mList = new ArrayList<>();
+        mServicePersonList = new PersonSetingBean();
+        mComList = (MyListView) findViewById(R.id.com_list);
+        findViewById(R.id.add_new_rl).setOnClickListener(this);
+        myAdapter = new ComRestAdapter(this);
+        myAdapter.setModelList(mList);
+        mComList.setAdapter(myAdapter);
+    }
+
+    @Override
+    public void onClick(View v) {
+        if (v.getId() == R.id.add_new_rl){
+            mList_size++ ;
+            myAdapter.notifyDataSetChanged();
+        }else if (v.getId() == R.id.save_bt){
+
+        }
+    }
+
+    private class ComRestAdapter extends BaseAdapter{
+        private Context mContext;
+        private List<ComRestBean> modelList;
+
+        public List<ComRestBean> getModelList() {
+            return modelList;
+        }
+
+        public void setModelList(List<ComRestBean> modelList) {
+            this.modelList = modelList;
+        }
+
+        public ComRestAdapter(Context mContext){
+            this.mContext = mContext;
+        }
+        @Override
+        public int getCount() { return mList_size;
+        }
+
+        @Override
+        public Object getItem(int position) {
+            return mList.get(position);
+        }
+
+        @Override
+        public long getItemId(int position) {
+            return position;
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            ViewHolder viewHolder = null;
+            if (convertView == null){
+                viewHolder = new ViewHolder();
+                convertView =  View.inflate(mContext, R.layout.com_rest_item,null);
+                viewHolder.name_tv = (TextView) convertView.findViewById(R.id.name_tv);
+                viewHolder.date_tv = (TextView) convertView.findViewById(R.id.date_tv);
+                convertView.setTag(viewHolder);
+            }else {
+                viewHolder = (ViewHolder) convertView.getTag();
+            }
+            if (!ListUtils.isEmpty(mList)){
+                viewHolder.name_tv.setText(mList.get(position).getSf_username()+"");
+                viewHolder.date_tv.setText(mList.get(position).getSf_date()+"");
+            }
+            return convertView;
+        }
+
+        class ViewHolder{
+            TextView name_tv;
+            TextView date_tv;
+        }
+    }
+}

app_modular/appme/src/main/java/com/uas/appme/settings/activity/BSettingActivity.java

@@ -29,6 +29,10 @@ public class BSettingActivity extends BaseActivity implements View.OnClickListen
             
         }else if (v.getId() == R.id.people_setting_rl){
             startActivity(new Intent(this,PersonSettingListActivity.class));
+        }else if (v.getId() == R.id.employeerest_rl){
+            startActivity(new Intent(ct,BComSetRestActivity.class));
+        }else if (v.getId() == R.id.companyrest_rl){
+
         }
     }
 
@@ -36,5 +40,7 @@ public class BSettingActivity extends BaseActivity implements View.OnClickListen
         findViewById(R.id.image_setting_rl).setOnClickListener(this);
         findViewById(R.id.keshi_setting_rl).setOnClickListener(this);
         findViewById(R.id.people_setting_rl).setOnClickListener(this);
+        findViewById(R.id.employeerest_rl).setOnClickListener(this);
+        findViewById(R.id.companyrest_rl).setOnClickListener(this);
     }
 }

app_modular/appme/src/main/java/com/uas/appme/settings/activity/PersonSettingActivity.java

@@ -15,6 +15,7 @@ import com.common.data.JSONUtil;
 import com.common.data.StringUtil;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
+import com.core.utils.CommonUtil;
 import com.me.network.app.http.HttpClient;
 import com.me.network.app.http.Method;
 import com.me.network.app.http.rx.ResultListener;
@@ -49,8 +50,10 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
         setContentView(R.layout.person_setting_activity);
 
         initView();
+        initData();
     }
 
+
     private void initView() {
 
         mUserNameTv = (FormEditText) findViewById(R.id.user_name_tv);
@@ -71,22 +74,29 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
 
         mBtnSave.setOnClickListener(this);
 
+    }
+    private void initData() {
 
         //更新时的数据获取
-        PersonSetingBean.ResultBean model = new PersonSetingBean.ResultBean();
-        model = getIntent().getParcelableExtra("model");
-        if (model != null)
-            showUpdatedata(model);
+        String result = getIntent().getStringExtra("mdoel");
+        int position = getIntent().getIntExtra("position",-1);
+        if (!StringUtil.isEmpty(result) && position != -1)
+            showUpdatedata(result,position);
     }
 
-    private void showUpdatedata(PersonSetingBean.ResultBean model) {
-        mUserNameTv.setText(model.getSm_username());
-        mUserDepartmentTv.setText(model.getSm_stname());
-        mUserJobTv.setText(model.getSm_level());
-        mUserTelTv.setText(model.getSm_telephone());
-        mUserEmailTv.setText("");
-
-        sm_id = model.getSm_id();
+    private void showUpdatedata(String result,int position) {
+            PersonSetingBean model = new PersonSetingBean();
+        try {
+            model = JSON.parseObject(result,PersonSetingBean.class);
+            mUserNameTv.setText(model.getResult().get(position).getSm_username());
+            mUserDepartmentTv.setText(model.getResult().get(position).getSm_stname());
+            mUserJobTv.setText(model.getResult().get(position).getSm_level());
+            mUserTelTv.setText(model.getResult().get(position).getSm_telephone());
+            mUserEmailTv.setText("");
+            sm_id = model.getResult().get(position).getSm_id();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
 
@@ -105,7 +115,6 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
                 && mUserDepartmentTv.testValidity() && mUserJobTv.testValidity() &&
                 mUserTelTv.testValidity()&& mUserEmailTv.testValidity()
                 ){
-
             if (mUserEmailTv.getText().toString().contains("@")){
                 saveRequest();
             }else {
@@ -124,8 +133,10 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
         params.put("sm_stid",111);
         params.put("sm_userid",MyApplication.getInstance().mLoginUser.getUserId());
         params.put("sm_username",mUserNameTv.getText().toString());
+//        params.put("sm_companyid",CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_uu"));
         params.put("sm_companyid",201);
-        params.put("sm_companyname",mUserDepartmentTv.getText().toString());
+        params.put("sm_stname",mUserDepartmentTv.getText().toString());
+        params.put("sm_companyname", CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_commpany"));
         params.put("sm_level",mUserJobTv.getText().toString());
         params.put("sm_telephone",mUserTelTv.getText().toString());
         params.put("sm_email",mUserEmailTv.getText().toString());

app_modular/appme/src/main/java/com/uas/appme/settings/activity/PersonSettingListActivity.java

@@ -10,8 +10,10 @@ import android.widget.AdapterView;
 import com.alibaba.fastjson.JSON;
 import com.common.LogUtil;
 import com.common.data.JSONUtil;
+import com.common.data.ListUtils;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
+import com.core.widget.EmptyLayout;
 import com.core.widget.MyListView;
 import com.me.network.app.http.HttpClient;
 import com.me.network.app.http.Method;
@@ -32,7 +34,7 @@ public class PersonSettingListActivity extends BaseActivity {
     private PersonSetingBean mList;
     private MyListView psetting_list;
     private PSettingListAdapter myAdapter;
-
+    private EmptyLayout mEmptyLayout;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -49,13 +51,19 @@ public class PersonSettingListActivity extends BaseActivity {
         myAdapter = new PSettingListAdapter(this);
         psetting_list.setAdapter(myAdapter);
 
+
+
+        mEmptyLayout = new EmptyLayout(this,psetting_list);
+        mEmptyLayout.setShowEmptyButton(false);
+        mEmptyLayout.setShowErrorButton(false);
+        mEmptyLayout.setShowLoadingButton(false);
     }
     private void initData() {
         HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appStoreman")
                 .add("companyid", 201)
-                .add("serviceid",10001)
+                .add("serviceid",MyApplication.getInstance().mLoginUser.getUserId())
                 .add("token",MyApplication.getInstance().mAccessToken)
                 .method(Method.GET)
                 .build(),new ResultSubscriber<>(new ResultListener<Object>() {
@@ -67,6 +75,10 @@ public class PersonSettingListActivity extends BaseActivity {
                     mList = JSON.parseObject(o.toString(),PersonSetingBean.class);
                     myAdapter.setModel(mList);
                     myAdapter.notifyDataSetChanged();
+
+                    if (mList == null || ListUtils.isEmpty(mList.getResult()))
+                        mEmptyLayout.showEmpty();
+
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -80,7 +92,8 @@ public class PersonSettingListActivity extends BaseActivity {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                 Intent intent = new Intent(ct,PersonSettingActivity.class);
-                intent.putExtra("mdoel",mList.getResult().get(position));
+                intent.putExtra("mdoel",JSON.toJSONString(mList));
+                intent.putExtra("position",position);
                 LogUtil.prinlnLongMsg("intentmodel",JSON.toJSONString(mList.getResult().get(position)));
                 startActivity(intent);
             }

app_modular/appme/src/main/java/com/uas/appme/settings/activity/SettingActivity.java

@@ -94,6 +94,7 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
     private String newStep_service_name = "com.uas.appme.pedometer.service.StepService";
 
     private PopupWindow setWindow = null;//
+    private RelativeLayout businessmen_setting_rl;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -125,7 +126,11 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
         speech_recognition_rl = (RelativeLayout) findViewById(R.id.speech_recognition_rl);
         new_step_rl = (RelativeLayout) findViewById(R.id.new_step_rl);
         booking_set_rl = (RelativeLayout) findViewById(R.id.booking_set_rl);
-        findViewById(R.id.businessmen_setting_rl).setOnClickListener(this);
+        businessmen_setting_rl = (RelativeLayout) findViewById(R.id.businessmen_setting_rl);
+        businessmen_setting_rl.setOnClickListener(this);
+
+        if (CommonUtil.isReleaseVersion())
+            businessmen_setting_rl.setVisibility(View.GONE);
 
         new_step_rl.setOnClickListener(this);
 //        new_step_rl.setVisibility(View.GONE);

app_modular/appme/src/main/java/com/uas/appme/settings/model/ComRestBean.java

@@ -0,0 +1,56 @@
+package com.uas.appme.settings.model;
+
+/**
+ * Created by FANGlh on 2017/10/12.
+ * function:
+ *
+ * map包括sf_userid 人员ID,sf_username 姓名,sf_date 休息日,sf_companyid 公司UU,sf_companyname 公司名称
+ */
+
+public class ComRestBean {
+    private String sf_userid;
+    private String sf_username;
+    private String sf_date;
+    private String sf_companyid;
+    private String sf_companyname;
+
+    public String getSf_userid() {
+        return sf_userid;
+    }
+
+    public void setSf_userid(String sf_userid) {
+        this.sf_userid = sf_userid;
+    }
+
+    public String getSf_username() {
+        return sf_username;
+    }
+
+    public void setSf_username(String sf_username) {
+        this.sf_username = sf_username;
+    }
+
+    public String getSf_date() {
+        return sf_date;
+    }
+
+    public void setSf_date(String sf_date) {
+        this.sf_date = sf_date;
+    }
+
+    public String getSf_companyid() {
+        return sf_companyid;
+    }
+
+    public void setSf_companyid(String sf_companyid) {
+        this.sf_companyid = sf_companyid;
+    }
+
+    public String getSf_companyname() {
+        return sf_companyname;
+    }
+
+    public void setSf_companyname(String sf_companyname) {
+        this.sf_companyname = sf_companyname;
+    }
+}

app_modular/appme/src/main/java/com/uas/appme/settings/model/PersonSetingBean.java

@@ -1,8 +1,5 @@
 package com.uas.appme.settings.model;
 
-import android.os.Parcel;
-import android.os.Parcelable;
-
 import java.util.List;
 
 /**
@@ -22,7 +19,7 @@ public class PersonSetingBean   {
         this.result = result;
     }
 
-    public static class ResultBean implements Parcelable {
+    public static class ResultBean {
         /**
          * sm_companyid : 201
          * sm_companyname : 北大医院
@@ -44,6 +41,24 @@ public class PersonSetingBean   {
         private String sm_telephone;
         private String sm_userid;
         private String sm_username;
+        private String sm_sex;
+        private String sm_email;
+
+        public String getSm_sex() {
+            return sm_sex;
+        }
+
+        public void setSm_sex(String sm_sex) {
+            this.sm_sex = sm_sex;
+        }
+
+        public String getSm_email() {
+            return sm_email;
+        }
+
+        public void setSm_email(String sm_email) {
+            this.sm_email = sm_email;
+        }
 
         public String getSm_companyid() {
             return sm_companyid;
@@ -116,54 +131,5 @@ public class PersonSetingBean   {
         public void setSm_username(String sm_username) {
             this.sm_username = sm_username;
         }
-
-
-        @Override
-        public int describeContents() {
-            return 0;
-        }
-
-        @Override
-        public void writeToParcel(Parcel dest, int flags) {
-            dest.writeString(this.sm_companyid);
-            dest.writeString(this.sm_companyname);
-            dest.writeString(this.sm_id);
-            dest.writeString(this.sm_level);
-            dest.writeString(this.sm_stid);
-            dest.writeString(this.sm_stname);
-            dest.writeString(this.sm_telephone);
-            dest.writeString(this.sm_userid);
-            dest.writeString(this.sm_username);
-        }
-
-        public ResultBean() {
-        }
-
-        protected ResultBean(Parcel in) {
-            this.sm_companyid = in.readString();
-            this.sm_companyname = in.readString();
-            this.sm_id = in.readString();
-            this.sm_level = in.readString();
-            this.sm_stid = in.readString();
-            this.sm_stname = in.readString();
-            this.sm_telephone = in.readString();
-            this.sm_userid = in.readString();
-            this.sm_username = in.readString();
-        }
-
-        public static final Parcelable.Creator<ResultBean> CREATOR = new Parcelable.Creator<ResultBean>() {
-            @Override
-            public ResultBean createFromParcel(Parcel source) {
-                return new ResultBean(source);
-            }
-
-            @Override
-            public ResultBean[] newArray(int size) {
-                return new ResultBean[size];
-            }
-        };
     }
-
-
-
 }

app_modular/appme/src/main/res/layout/com_rest_item.xml

@@ -0,0 +1,101 @@
+<?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:layout_marginLeft="25dp"
+    android:layout_marginRight="25dp"
+    android:orientation="vertical"
+    >
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginBottom="10dp"
+        android:layout_marginTop="15dp"
+        android:background="@drawable/text_hint_bg"
+        android:textColor="@color/green"
+        android:textSize="16sp"
+        android:visibility="invisible"
+        />
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:background="@drawable/rl_circular_bg">
+
+        <RelativeLayout
+            style="@style/IMTbleLine2"
+            android:layout_height="50dp"
+            android:background="@color/white"
+            >
+
+            <TextView
+                android:id="@+id/of_add_set_range_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:text="@string/name"
+                android:textSize="14sp"
+                />
+
+            <TextView
+                android:id="@+id/name_tv"
+                style="@style/IMTbleLine_TextValue"
+                android:layout_toLeftOf="@+id/of_add_set_range_img"
+                android:layout_toRightOf="@+id/of_add_set_range_text"
+                android:textColor="@color/dark_dark_grey"
+                android:padding="10dp"
+                />
+            <ImageView
+                android:id="@+id/of_add_set_range_img"
+                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="2px"
+            android:background="@color/item_line"
+            android:layout_below="@+id/position_tv"
+            android:layout_marginLeft="20dp"
+            android:layout_marginRight="20dp"
+            />
+        <RelativeLayout
+            style="@style/IMTbleLine2"
+            android:layout_height="50dp"
+            android:background="@color/white"
+            >
+
+            <TextView
+                android:id="@+id/of_add_set_range_text2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:text="休息时间"
+                android:textSize="14sp"
+                />
+
+            <TextView
+                android:id="@+id/date_tv"
+                style="@style/IMTbleLine_TextValue"
+                android:layout_toLeftOf="@+id/of_add_set_range_img2"
+                android:layout_toRightOf="@+id/of_add_set_range_text2"
+                android:textColor="@color/dark_dark_grey"
+                android:padding="10dp"
+                />
+            <ImageView
+                android:id="@+id/of_add_set_range_img2"
+                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>
+    </LinearLayout>
+</LinearLayout>

app_modular/appme/src/main/res/layout/service_bcom_setting_activity.xml

@@ -0,0 +1,59 @@
+<?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="match_parent"
+    android:orientation="vertical"
+    android:background="@color/base_bg">
+
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+            <com.core.widget.MyListView
+                android:id="@+id/com_list"
+                android:layout_marginLeft="25dp"
+                android:layout_marginRight="25dp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:scrollbars="none"
+                android:paddingBottom="20dp">
+            </com.core.widget.MyListView>
+
+
+            <RelativeLayout
+                android:id="@+id/add_new_rl"
+                android:layout_width="match_parent"
+                style="@style/IMTbleLine2"
+                android:layout_height="50dp"
+                android:background="@color/white"
+                >
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:text="+新增"
+                    android:textColor="#2F95DD"
+                    android:layout_height="wrap_content"
+                    android:layout_centerInParent="true"
+                    />
+
+            </RelativeLayout>
+            <Button
+                android:id="@+id/save_bt"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="30dp"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:layout_marginTop="50dp"
+                android:background="@drawable/bg_bule_btn"
+                android:padding="10dp"
+                android:text="@string/common_save_button"
+                android:textColor="@color/white"
+                android:textSize="@dimen/text_main" />
+        </LinearLayout>
+    </ScrollView>
+
+</LinearLayout>