小秘书开发过程中-ui界面完成

WeiChat/src/main/AndroidManifest.xml

@@ -951,7 +951,8 @@
             android:windowSoftInputMode="adjustPan" />
         <activity android:name=".ui.erp.activity.secretary.BookingDetailActivity" />
         <activity android:name=".ui.erp.activity.secretary.BookingListActivity" />
-        <activity android:name=".ui.erp.activity.secretary.BookingAddActivity"></activity>
+        <activity android:name=".ui.erp.activity.secretary.BookingAddActivity"
+            android:windowSoftInputMode="adjustPan"></activity>
     </application>
 
 </manifest>

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

@@ -1,15 +1,48 @@
 package com.xzjmyk.pm.activity.ui.erp.activity.secretary;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
 
 import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.erp.activity.oa.OABaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.presenter.imp.HttpImp;
 
-public class BookingAddActivity extends AppCompatActivity {
+/**
+  * @desc:小秘书新增界面
+  * @author：Arison on 2017/6/22
+  */
+public class BookingAddActivity extends OABaseActivity implements HttpImp,View.OnClickListener {
+    private TextView tvBookObject;
+    private RelativeLayout companyAddRl;
+    private TextView tvBookTimes;
+    private RelativeLayout remarkRl;
+    private TextView tvBookAddress;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_book_add);
+
+        tvBookObject = (TextView) findViewById(R.id.tv_book_object);
+        companyAddRl = (RelativeLayout) findViewById(R.id.company_add_rl);
+        tvBookTimes = (TextView) findViewById(R.id.tv_book_times);
+        remarkRl = (RelativeLayout) findViewById(R.id.remark_rl);
+        tvBookAddress = (TextView) findViewById(R.id.tv_book_address);
+        findViewById(R.id.submit_btn).setOnClickListener(this);
+    }
+
+    private EditText getEtBookContent(){
+        return (EditText) findViewById(R.id.et_book_content);
+    }
+    @Override
+    public void onClick(View view) {
+        switch (view.getId()) {
+            case R.id.submit_btn:
+                //TODO implement
+                break;
+        }
     }
 }

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

@@ -1,16 +1,84 @@
 package com.xzjmyk.pm.activity.ui.erp.activity.secretary;
 
 import android.os.Bundle;
+import android.view.View;
+import android.view.animation.Animation;
+import android.view.animation.AnimationUtils;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
 
+import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.OABaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.HttpImp;
 
-public class BookingDetailActivity extends OABaseActivity implements HttpImp {
+import de.hdodenhof.circleimageview.CircleImageView;
+
+
+/**
+  * @desc:预约详情
+  * @author：Arison on 2017/6/22
+  */
+public class BookingDetailActivity extends OABaseActivity implements HttpImp,View.OnClickListener {
+
+    private RelativeLayout rvTop;
+    private LinearLayout llLeft;
+    private CircleImageView ivMe;
+    private TextView tvMe;
+    private ImageView ivResultInfo;
+    private LinearLayout llRight;
+    private CircleImageView ivTarget;
+    private TextView tvTarget;
+    private TextView tvTime;
+    private TextView tvAddress;
+    private TextView tvContent;
+    private ImageView ivResult;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_booking_detail);
+
+        initView();
+    }
+
+    private void initView() {
+        getSupportActionBar().setTitle(getString(R.string.booking_title));
+        rvTop = (RelativeLayout) findViewById(R.id.rv_top);
+        llLeft = (LinearLayout) findViewById(R.id.ll_left);
+        ivMe = (CircleImageView) findViewById(R.id.iv_me);
+        tvMe = (TextView) findViewById(R.id.tv_me);
+        ivResultInfo = (ImageView) findViewById(R.id.iv_resultInfo);
+        llRight = (LinearLayout) findViewById(R.id.ll_right);
+        ivTarget = (CircleImageView) findViewById(R.id.iv_target);
+        tvTarget = (TextView) findViewById(R.id.tv_target);
+        tvTime = (TextView) findViewById(R.id.tv_time);
+        tvAddress = (TextView) findViewById(R.id.tv_address);
+        tvContent = (TextView) findViewById(R.id.tv_content);
+        ivResult = (ImageView) findViewById(R.id.iv_result);
+        findViewById(R.id.bt_change).setOnClickListener(this);
+        findViewById(R.id.bt_cancle).setOnClickListener(this);
+
+        Animation animation= AnimationUtils.loadAnimation(this, R.anim.anim_translate_bookingprogress);
+        ivResultInfo.startAnimation(animation);
+
+        String loginUserId = MyApplication.getInstance().mLoginUser.getUserId();
+        AvatarHelper.getInstance().display(loginUserId, ivMe, true, true);
+        AvatarHelper.getInstance().display(loginUserId, ivTarget, true, true);
+    }
+
+    @Override
+    public void onClick(View view) {
+        switch (view.getId()) {
+            case R.id.bt_change:
+            
+                break;
+            case R.id.bt_cancle:
+                //TODO implement
+                break;
+        }
     }
 }

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

@@ -1,16 +1,193 @@
 package com.xzjmyk.pm.activity.ui.erp.activity.secretary;
 
+import android.content.Intent;
 import android.os.Bundle;
+import android.support.v4.view.ViewPager;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
 
+import com.lidroid.xutils.ViewUtils;
+import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.OABaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.adapter.booking.BookAdapter;
+import com.xzjmyk.pm.activity.ui.erp.adapter.oa.OACalenderViewPagerAdapter;
+import com.xzjmyk.pm.activity.ui.erp.model.book.BookModel;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.HttpImp;
+import com.xzjmyk.pm.activity.ui.erp.view.CustomerScrollView;
+import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
+import com.xzjmyk.pm.activity.util.TimeUtils;
+import com.xzjmyk.pm.activity.view.MyListView;
+import com.xzjmyk.pm.activity.view.OACalendarView;
 
-public class BookingListActivity extends OABaseActivity implements HttpImp {
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+
+public class BookingListActivity extends OABaseActivity implements HttpImp,View.OnClickListener {
+    
+    @ViewInject(R.id.tv_book_me)
+    TextView tv_book_me;
+    @ViewInject(R.id.tv_book_shared)
+    TextView tv_book_shared;
+    @ViewInject(R.id.yeas_tv)
+    TextView yeas_tv;
+    @ViewInject(R.id.day_tv)
+    TextView day_tv;
+    @ViewInject(R.id.week_tv)
+    TextView week_tv;
+    @ViewInject(R.id.viewPager)
+    ViewPager viewPager;
+    @ViewInject(R.id.lv_book)
+    MyListView lv_book;
+    @ViewInject(R.id.sv_top)
+    CustomerScrollView sv_top;
+
+    private EmptyLayout emptyLayout;
+    private Date curDate;
+    private int posItem;
+   
+    private ArrayList<BookModel> datas;
+    private BookAdapter mAdapter;
+    private OACalendarView calendarView;
+    private OACalenderViewPagerAdapter pagerAdapter;//当前Viewpager适配器
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_booking_list);
+        getSupportActionBar().setTitle(getString(R.string.booking_menu));
+        ViewUtils.inject(this);
+        initView();
+        initEvent();
+      
+        initData();
+    }
+
+    private void initEvent() {
+       tv_book_me.setOnClickListener(this);
+       tv_book_shared.setOnClickListener(this);
+        viewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+            @Override
+            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+            }
+
+            @Override
+            public void onPageSelected(int position) {
+                Calendar c = Calendar.getInstance();
+                c.setTime(curDate);
+                int day = c.get(Calendar.DAY_OF_MONTH);
+                calendarView = pagerAdapter.getmViews().get(position);
+                setCalenderOnClicklistener();
+                posItem = position;
+                if (day <= 0) return;  // update:2017-4-21-11:06 这里day未获取到闪退了 已做判空处理
+                calendarView.setDownIndex(day);
+                curDate = calendarView.getDownDate();
+                setDateTag(curDate);
+//                if (CommonUtil.isNetWorkConnected(getApplication())) {
+//                    loadNetData(TimeUtils.ym_format.format(curDate));
+//                }
+
+            }
+
+            @Override
+            public void onPageScrollStateChanged(int state) {
+            }
+        });
+        
+        lv_book.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                startActivity(new Intent(mContext,BookingDetailActivity.class));
+            }
+        });
+
+
+  
+    }
+
+    private void initData() {
+        datas=new ArrayList<>();
+        for(int i=0;i<10;i++){
+            BookModel model=new BookModel();
+            model.setTime("18:00-18:50");
+            model.setContent("陳縂");
+            model.setShared(true);
+            model.setStatus("待確認");
+            datas.add(model);
+        }
+        mAdapter=new BookAdapter(this,datas);
+        lv_book.setAdapter(mAdapter);
+        setDateTag(new Date());
+    }
+
+    private void initView() {
+        tv_book_me.setSelected(true);
+        curDate = new Date(System.currentTimeMillis());
+        posItem = OACalenderViewPagerAdapter.MAX_NUM / 2;
+        //设置为空显示列表
+        emptyLayout = new EmptyLayout(ct, lv_book);
+        emptyLayout.setShowLoadingButton(false);
+        emptyLayout.setShowEmptyButton(false);
+        emptyLayout.setShowErrorButton(false);
+        emptyLayout.setEmptyViewRes(R.layout.oa_empty_list);
+        
+        LinearLayout.LayoutParams linearParams = (LinearLayout.LayoutParams) viewPager.getLayoutParams(); // 取控件mGrid当前的布局参数   搜索
+        linearParams.height = (getResources().getDisplayMetrics().heightPixels * 1 / 3);// 当控件的高强制设成50象素
+        viewPager.setLayoutParams(linearParams); // 使设置好的布局参数应用到控件myGrid
+        pagerAdapter = new OACalenderViewPagerAdapter(ct);
+        viewPager.setAdapter(pagerAdapter);
+        viewPager.setCurrentItem(OACalenderViewPagerAdapter.MAX_NUM / 2);
+        
+    }
+
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()){
+            case R.id.tv_book_me:
+                tv_book_shared.setSelected(false);
+                tv_book_me.setSelected(true);
+                break;
+            case R.id.tv_book_shared:
+                tv_book_shared.setSelected(true);
+                tv_book_me.setSelected(false);
+                break;
+        }
+    }
+
+    private void setDateTag(Date date) {
+        Calendar c = Calendar.getInstance();
+        c.setTime(date);
+        int yeas = c.get(Calendar.YEAR);
+        int month = c.get(Calendar.MONTH) + 1;
+        int day = c.get(Calendar.DAY_OF_MONTH);
+        yeas_tv.setText(yeas + "年" + month + "月");
+        day_tv.setText(day + "日");
+        week_tv.setText(TimeUtils.getWeek(TimeUtils.s_format.format(date)));
+    }
+
+    private void setCalenderOnClicklistener() {
+        if (calendarView == null && pagerAdapter != null && pagerAdapter.getmViews() != null) {
+            calendarView = pagerAdapter.getmViews().get(posItem);
+        }
+        if (calendarView != null)
+            calendarView.setDateListener(new OACalendarView.OnSelectDateListener() {
+                @Override
+                public void result(Date date) {
+                    curDate = date;
+                    setDateTag(date);
+                   // setAdapterBeans();
+                }
+            });
+    }
+
+
+   
+    @Override
+    public void onWindowFocusChanged(boolean hasFocus) {
+        super.onWindowFocusChanged(hasFocus);
+        setCalenderOnClicklistener();
     }
 }

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

@@ -0,0 +1,80 @@
+package com.xzjmyk.pm.activity.ui.erp.adapter.booking;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.erp.model.book.BookModel;
+
+import java.util.ArrayList;
+
+/**
+ * Created by Arison on 2017/6/23.
+ */
+
+public class BookAdapter extends BaseAdapter {
+    
+    private Context ct;
+    private ArrayList<BookModel> datas=new ArrayList<>();
+    
+    public BookAdapter(Context ct,ArrayList<BookModel> data){
+        this.ct=ct;
+        this.datas=data;
+    }
+
+    @Override
+    public int getCount() {
+        return datas!=null?datas.size():0;
+    }
+
+    @Override
+    public Object getItem(int position) {
+        return   datas.get(position);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return position;
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        ViewHolder holder = null;
+        if (convertView == null) {
+            holder = new ViewHolder();
+            convertView = LayoutInflater.from(ct).inflate(R.layout.item_booking_list, null);
+            holder.status_img = (ImageView) convertView.findViewById(R.id.status_img);
+            holder.share_img = (ImageView) convertView.findViewById(R.id.iv_share);
+            holder.title_tv = (TextView) convertView.findViewById(R.id.title_tv);
+            holder.status_tv = (TextView) convertView.findViewById(R.id.status_tv);
+            holder.address_tv = (TextView) convertView.findViewById(R.id.address_tv);
+            holder.handler_tv = (TextView) convertView.findViewById(R.id.handler_tv);
+            convertView.setTag(holder);
+        } else {
+            holder = (ViewHolder) convertView.getTag();
+        }
+        try {
+            BookModel model=datas.get(position);
+            holder.title_tv.setText(model.getTime());
+            holder.status_tv.setText(model.getStatus());
+            if(model.isShared()){
+                holder.share_img.setVisibility(View.VISIBLE);
+            }else{
+                holder.share_img.setVisibility(View.GONE);
+            }
+            holder.handler_tv.setText(model.getContent());
+        } catch (Exception e) {
+        }
+        return convertView;
+    }
+
+    class ViewHolder {
+        ImageView status_img,share_img;
+        TextView title_tv, status_tv, address_tv, handler_tv;
+    }
+}

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/model/book/BookModel.java

@@ -0,0 +1,44 @@
+package com.xzjmyk.pm.activity.ui.erp.model.book;
+
+/**
+ * Created by Arison on 2017/6/23.
+ */
+
+public class BookModel {
+    String time;
+    String status;
+    String content;
+    boolean isShared;
+
+    public String getTime() {
+        return time;
+    }
+
+    public void setTime(String time) {
+        this.time = time;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public boolean isShared() {
+        return isShared;
+    }
+
+    public void setShared(boolean shared) {
+        isShared = shared;
+    }
+}

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

@@ -1,6 +1,7 @@
 package com.xzjmyk.pm.activity.ui.erp.view;
 
 import android.content.Context;
+import android.graphics.Rect;
 import android.os.Handler;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
@@ -19,8 +20,8 @@ public class CustomerScrollView extends ScrollView {
     private boolean handleStop = false;
     private int eachStep = 0;
 
-    private static final int MAX_SCROLL_HEIGHT = 600;// 最大滑动距离
-    private static final float SCROLL_RATIO = 0.4f;// 阻尼系数,越小阻力就越大
+    private static final int MAX_SCROLL_HEIGHT = 300;// 最大滑动距离
+    private static final float SCROLL_RATIO = 0.25f;// 阻尼系数,越小阻力就越大
 
     public CustomerScrollView(Context context) {
         super(context);
@@ -125,4 +126,10 @@ public class CustomerScrollView extends ScrollView {
 
         ;
     };
+
+    //重写ScrollView  
+    @Override
+    protected int computeScrollDeltaToGetChildRectOnScreen(Rect rect) {
+        return 0;
+    }
 }

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

@@ -345,7 +345,7 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
                intent = new Intent(this, SelectPContactsActivity.class);
                 SelectCollisionTurnBean bean = new SelectCollisionTurnBean()
                         .setTitle(getString(R.string.app_local_contacts))
-                        .setSingleAble(false)
+                        .setSingleAble(true)
                         .setSelectCode(null);
                 intent.putExtra(OAConfig.MODEL_DATA, bean);
                 startActivityForResult(intent, 0x01);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/MessageFragment.java

@@ -27,6 +27,7 @@ import com.xzjmyk.pm.activity.ui.base.EasyFragment;
 import com.xzjmyk.pm.activity.ui.erp.activity.TaskActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.message.ProcessB2BActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.message.ProcessMsgActivity;
+import com.xzjmyk.pm.activity.ui.erp.activity.secretary.BookingListActivity;
 import com.xzjmyk.pm.activity.ui.erp.adapter.MessageAdapter;
 import com.xzjmyk.pm.activity.ui.erp.entity.EditChangeListener;
 import com.xzjmyk.pm.activity.ui.erp.presenter.MessagePresenter;
@@ -190,6 +191,7 @@ public class MessageFragment extends EasyFragment implements IMessageView,   Vie
         view.findViewById(R.id.schedule_rl).setOnClickListener(this);//审批流
         view.findViewById(R.id.waitting_work_rl).setOnClickListener(this);//待办工作
         view.findViewById(R.id.subscribe_rl).setOnClickListener(this);//我的订阅
+        view.findViewById(R.id.booking_rl).setOnClickListener(this);//我的订阅
 
 
 //        view.findViewById(R.id.notice_rl).setOnClickListener(this); //新闻通知
@@ -251,7 +253,9 @@ public class MessageFragment extends EasyFragment implements IMessageView,   Vie
     @Override
     public void onClick(View v) {
         switch (v.getId()) {
-
+            case R.id.booking_rl:
+                startActivity(new Intent(mContext,BookingListActivity.class));
+                break;
             case R.id.message_net_set://点击无网络情况
                 startActivity(new Intent(Settings.ACTION_SETTINGS));
                 break;

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

@@ -22,6 +22,5 @@ public class MyListView extends ListView {
 	public void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
 		int expandSpec = MeasureSpec.makeMeasureSpec(Integer.MAX_VALUE >> 2, MeasureSpec.AT_MOST);
 		super.onMeasure(widthMeasureSpec, expandSpec);
-//		super.onMeasure(widthMeasureSpec,heightMeasureSpec);
 	}
 }

WeiChat/src/main/res/anim/anim_translate_bookingprogress.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:fromXDelta="0"
+    android:toXDelta="40%p"
+    android:fromYDelta="0"
+    android:toYDelta="0"
+    android:duration="2000"
+    android:repeatCount="infinite"
+    android:fillBefore="true">
+</translate>  

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

@@ -1,9 +1,125 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<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"
-    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.secretary.BookingAddActivity">
+    android:background="@color/hine_bg"
+    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.crm.AddBusinessActivity">
 
-</RelativeLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/hine_bg"
+        android:orientation="vertical">
+
+        <RelativeLayout
+            style="@style/item_menu">
+
+            <TextView
+                style="@style/item_menu_tag"
+                android:gravity="center_vertical"
+                android:text="@string/booking_object" />
+
+            <TextView
+                android:id="@+id/tv_book_object"
+                style="@style/item_menu_input"
+                android:layout_toRightOf="@id/company_tag"
+                android:drawablePadding="6dp"
+                android:drawableRight="@drawable/oa_next"
+                android:hint="@string/common_select" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/company_add_rl"
+            style="@style/item_menu">
+
+            <TextView
+
+                style="@style/item_menu_tag"
+                android:gravity="center_vertical"
+                android:text="@string/times"
+                android:textColor="@color/hintColor" />
+
+            <TextView
+                android:id="@+id/tv_book_times"
+                style="@style/item_menu_input"
+                android:layout_toRightOf="@id/company_add_tag"
+                android:drawableRight="@drawable/oa_next"
+                android:textColor="@color/hintColor" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/remark_rl"
+            style="@style/item_menu">
+
+            <TextView
+                style="@style/item_menu_tag"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentTop="true"
+                android:gravity="center_vertical"
+                android:text="@string/address" />
+
+            <TextView
+                android:id="@+id/tv_book_address"
+                style="@style/item_menu_input"
+                android:layout_toRightOf="@id/remark_tag"
+                android:drawablePadding="6dp"
+                android:drawableRight="@drawable/oa_next"
+                android:hint="@string/common_select_not_must" />
+        </RelativeLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="30dp" />
+
+
+        <RelativeLayout
+            style="@style/form_relative_customer"
+            android:layout_height="30dp"
+            android:background="@color/white">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="10dp"
+                android:gravity="center_vertical"
+                android:text="@string/booking_content" />
+        </RelativeLayout>
+
+        <EditText
+            android:id="@+id/et_book_content"
+            android:layout_width="match_parent"
+            android:layout_height="100dp"
+            android:layout_marginBottom="10dp"
+            android:background="@color/white"
+            android:gravity="top"
+            android:hint="@string/common_input"
+            android:paddingLeft="10dp"
+            android:textSize="15sp" />
+
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginBottom="30dp"
+            android:layout_marginTop="60dp">
+
+            <Button
+                android:id="@+id/submit_btn"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentBottom="true"
+                android:layout_marginBottom="10dp"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:background="@drawable/bg_bule_btn"
+                android:padding="10dp"
+                android:text="@string/app_button_commit"
+                android:textColor="@color/white"
+                android:textSize="@dimen/text_main" />
+        </RelativeLayout>
+    </LinearLayout>
+
+
+</ScrollView>

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

@@ -1,151 +1,196 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<RelativeLayout  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"
-    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.secretary.BookingDetailActivity">
-   <RelativeLayout
-       android:id="@+id/rv_top"
-       android:layout_width="match_parent"
-       android:layout_height="wrap_content"
-       android:layout_alignParentTop="true">
-       <LinearLayout
-           android:id="@+id/ll_left"
-           android:layout_width="wrap_content"
-           android:layout_height="wrap_content"
-           android:padding="15dp"
-           android:orientation="vertical">
-
-           <ImageView
-               android:layout_width="70dp"
-               android:layout_height="70dp"
-               android:src="@drawable/defaultpic" />
-           <TextView
-               android:layout_width="match_parent"
-               android:layout_height="wrap_content" 
-               android:padding="5dp"
-               android:gravity="center"
-               android:text="@string/me"/>
-       </LinearLayout>
-
-       <ImageView
-          android:layout_toRightOf="@+id/ll_left"
-           android:layout_toLeftOf="@+id/ll_right"
-           android:layout_width="match_parent"
-           android:layout_height="wrap_content"
-           android:layout_centerInParent="true"
-           android:background="@drawable/icon_jujue" />
-       <LinearLayout
-           android:id="@+id/ll_right"
-           android:layout_width="wrap_content"
-           android:layout_height="wrap_content"
-           android:layout_alignParentRight="true"
-           android:padding="15dp"
-           android:orientation="vertical"
-          >
-           <ImageView
-               android:id="@+id/imageView4"
-               android:layout_width="70dp"
-               android:layout_height="70dp"
-               android:layout_alignParentTop="true"
-               android:src="@drawable/defaultpic" />
-           <TextView
-               android:layout_width="match_parent"
-               android:layout_height="wrap_content"
-               android:padding="5dp"
-               android:gravity="center"
-               android:text="@string/me"/>
-       </LinearLayout>
-       
-   </RelativeLayout>
-    
-    
-<LinearLayout
-    android:layout_below="@+id/rv_top"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@color/white"
-    android:layout_margin="15dp"
-    android:orientation="vertical">
-    <LinearLayout
+    android:layout_height="match_parent">
+    <com.xzjmyk.pm.activity.ui.erp.view.CustomerScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="7dp"
-        android:orientation="horizontal">
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" 
-            android:layout_marginLeft="20dp"
-            android:text="时间："/>
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp"
-            android:textColor="@color/black"
-            android:text="19:10"/>
-    </LinearLayout>
+        android:layout_height="match_parent"
+        android:fillViewport="true"
+        tools:context="com.xzjmyk.pm.activity.ui.erp.activity.secretary.BookingDetailActivity">
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="7dp"
-        android:orientation="horizontal">
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="20dp"
-            android:text="时间："/>
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp"
-            android:textColor="@color/black"
-            android:text="19:10"/>
-    </LinearLayout>
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <RelativeLayout
+                android:id="@+id/rv_top"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true">
+
+                <LinearLayout
+                    android:id="@+id/ll_left"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:padding="15dp">
+
+                    <de.hdodenhof.circleimageview.CircleImageView
+                        android:id="@+id/iv_me"
+                        android:layout_width="70dp"
+                        android:layout_height="70dp"
+                        android:src="@drawable/defaultpic" />
+
+                    <TextView
+                        android:id="@+id/tv_me"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="center"
+                        android:padding="5dp"
+                        android:text="@string/me" />
+                </LinearLayout>
+                <!--
+       android:layout_toLeftOf="@+id/ll_right"
+                android:layout_toRightOf="@+id/ll_left"-->
+                <ImageView
+                    android:id="@+id/iv_resultInfo"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerInParent="true"
+                    android:layout_toRightOf="@+id/ll_left"
+                    android:background="@drawable/icon_send" />
+
+                <LinearLayout
+                    android:id="@+id/ll_right"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:orientation="vertical"
+                    android:padding="15dp">
+
+                    <de.hdodenhof.circleimageview.CircleImageView
+                        android:id="@+id/iv_target"
+                        android:layout_width="70dp"
+                        android:layout_height="70dp"
+                        android:layout_alignParentTop="true"
+                        android:src="@drawable/defaultpic" />
+
+                    <TextView
+                        android:id="@+id/tv_target"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="center"
+                        android:padding="5dp"
+                        android:text="@string/me" />
+                </LinearLayout>
+
+            </RelativeLayout>
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="7dp"
-        android:orientation="horizontal">
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="20dp"
-            android:text="内容："/>
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp"
-            android:textColor="@color/black"
-            android:text="###########################################"/>
-    </LinearLayout>
 
-    <ImageView
-        android:layout_width="70dp"
-        android:layout_height="70dp"
-        android:layout_gravity="right"
-        android:src="@drawable/icon_jujue1" />
-</LinearLayout>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/rv_top"
+                android:layout_margin="15dp"
+                android:background="@drawable/icon_bg_booking_detail1"
+                android:orientation="vertical">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:padding="7dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="20dp"
+                        android:text="@string/booking_time" />
+
+                    <TextView
+                        android:id="@+id/tv_time"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="10dp"
+                        android:text="***************"
+                        android:textColor="@color/black" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:padding="7dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="20dp"
+                        android:text="@string/booking_address" />
+
+                    <TextView
+                        android:id="@+id/tv_address"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="10dp"
+                        android:text="*****************"
+                        android:textColor="@color/black" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:padding="7dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="20dp"
+                        android:text="@string/booking_content" />
+
+                    <TextView
+                        android:id="@+id/tv_content"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="10dp"
+                        android:text="###########################################
+###########################################################################"
+                        android:textColor="@color/black" />
+                </LinearLayout>
+
+                <ImageView
+                    android:id="@+id/iv_result"
+                    android:layout_width="70dp"
+                    android:layout_height="70dp"
+                    android:layout_margin="10dp"
+                    android:layout_gravity="right"
+                    android:src="@drawable/icon_jujue1" />
+            </LinearLayout>
+
+     
+
+
+        </RelativeLayout>
+    </com.xzjmyk.pm.activity.ui.erp.view.CustomerScrollView>
     <LinearLayout
+        android:id="@+id/linearLayout"
         android:layout_width="match_parent"
         android:layout_height="50dp"
-        android:weightSum="2"
-        android:layout_alignParentBottom="true">
+        android:layout_alignParentBottom="true"
+        android:orientation="horizontal"
+        android:weightSum="2">
+
         <Button
+            android:id="@+id/bt_change"
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:text="@string/me"
+            android:layout_weight="1"
             android:background="@drawable/select_weixin_list_item"
-            android:layout_weight="1"/>
-        <view
-          style="@style/app_line_v_1dp"></view>
+            android:text="@string/booking_change" />
+
+        <View style="@style/app_line_v_1dp"></View>
+
         <Button
+            android:id="@+id/bt_cancle"
             android:layout_width="0dp"
             android:layout_height="match_parent"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:layout_alignTop="@+id/linearLayout"
+            android:layout_weight="1"
             android:background="@drawable/select_weixin_list_item"
-            android:text="@string/me"
-            android:layout_weight="1"/>
+            android:text="@string/cancel" />
     </LinearLayout>
 </RelativeLayout>

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

@@ -1,10 +1,89 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<com.xzjmyk.pm.activity.ui.erp.view.CustomerScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/sv_top"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.secretary.BookingAddActivity">
+    android:fillViewport="true">
+<LinearLayout 
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.secretary.BookingListActivity">
+    <!--top layout-->
+    <LinearLayout
+        style="@style/crm_ll_card"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:weightSum="2">
+
+        <TextView
+            android:id="@+id/tv_book_me"
+            style="@style/TextView_Basic"
+            android:layout_weight="1"
+            android:background="@drawable/shape_brounds_bottom"
+            android:gravity="center"
+            android:padding="10dp"
+            android:text="@string/booking_me" />
+
+        <View style="@style/app_line_v_1dp" />
+
+        <TextView
+            android:id="@+id/tv_book_shared"
+            style="@style/TextView_Basic"
+            android:layout_weight="1"
+            android:background="@drawable/shape_brounds_bottom"
+            android:gravity="center"
+            android:padding="10dp"
+            android:text="@string/booking_shared" />
+    </LinearLayout>
+    <!--年月日布局-->
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="35dp"
+        android:layout_gravity="center_horizontal"
+        android:gravity="center">
+
+        <TextView
+            android:id="@+id/yeas_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/text_main"
+            android:textSize="@dimen/text_main" />
+
+        <TextView
+            android:id="@+id/day_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/text_main"
+            android:textSize="@dimen/text_main" />
+
+        <TextView
+            android:id="@+id/week_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp"
+            android:textColor="@color/text_main"
+            android:textSize="@dimen/text_main" />
+    </LinearLayout>
+
+    <android.support.v4.view.ViewPager
+        android:id="@+id/viewPager"
+        android:layout_width="match_parent"
+        android:layout_height="230dp" />
 
-</RelativeLayout>
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="2px"
+        android:background="@color/item_line" />
 
+    <com.xzjmyk.pm.activity.view.MyListView
+        android:id="@+id/lv_book"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="30dp"
+        android:divider="@color/item_line"
+        android:dividerHeight="2px"
+        android:focusableInTouchMode="false" />
+</LinearLayout>
+</com.xzjmyk.pm.activity.ui.erp.view.CustomerScrollView>

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

@@ -77,6 +77,7 @@
             android:text="@string/un_deal"
             android:gravity="center"
             android:padding="10dp"
+      
             android:background="@drawable/shape_brounds_bottom"
             style="@style/TextView_Basic"
             android:id="@+id/tv_count_unend" />

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

@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/selector_oa_itembg"
+    android:descendantFocusability="blocksDescendants"
+    android:padding="10dp">
+
+    <ImageView
+        android:id="@+id/status_img"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:visibility="gone"
+        android:layout_alignParentRight="true"
+        android:layout_centerVertical="true"
+        android:src="@drawable/oa_doit" />
+
+    <LinearLayout
+        android:id="@+id/title_ll"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/title_tv"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:ellipsize="end"
+            android:lines="1"
+            android:text="*****"
+            android:textColor="@color/text_main"
+            android:textSize="@dimen/text_main" />
+       <ImageView
+           android:id="@+id/iv_share"
+           android:layout_width="wrap_content"
+           android:layout_height="wrap_content" 
+           android:background="@drawable/icon_share_nor"/> 
+        
+        <TextView
+            android:id="@+id/status_tv"
+            android:layout_width="70dp"
+            android:layout_height="match_parent"
+            android:layout_toRightOf="@+id/title_tv"
+            android:textColor="@color/green"
+            android:ellipsize="end"
+            android:text="*****"
+            android:gravity="right"
+            android:lines="1" />
+
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/address_tv"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/title_ll"
+        android:layout_marginRight="70dp"
+        android:visibility="gone"
+        android:layout_marginTop="10dp"
+        android:ellipsize="end"
+        android:text="*****"
+        android:lines="1" />
+
+    <TextView
+        android:id="@+id/handler_tv"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/address_tv"
+        android:layout_marginRight="70dp"
+        android:text="*****"
+        android:layout_marginTop="10dp"
+        android:ellipsize="end"
+        android:lines="1" />
+</RelativeLayout>

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:background="@drawable/selector_oa_itembg"
     android:descendantFocusability="blocksDescendants"
     android:padding="10dp">
@@ -27,15 +27,22 @@
             android:layout_weight="1"
             android:ellipsize="end"
             android:lines="1"
+            android:text="*****"
             android:textColor="@color/text_main"
             android:textSize="@dimen/text_main" />
-
+       <ImageView
+           android:id="@+id/iv_share"
+           android:layout_width="wrap_content"
+           android:layout_height="wrap_content" 
+           android:background="@drawable/icon_share_nor"/> 
+        
         <TextView
             android:id="@+id/status_tv"
             android:layout_width="70dp"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:layout_toRightOf="@+id/title_tv"
             android:ellipsize="end"
+            android:text="*****"
             android:gravity="right"
             android:lines="1" />
 
@@ -49,6 +56,7 @@
         android:layout_marginRight="70dp"
         android:layout_marginTop="10dp"
         android:ellipsize="end"
+        android:text="*****"
         android:lines="1" />
 
     <TextView
@@ -57,6 +65,7 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/address_tv"
         android:layout_marginRight="70dp"
+        android:text="*****"
         android:layout_marginTop="10dp"
         android:ellipsize="end"
         android:lines="1" />

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

@@ -281,6 +281,109 @@
 
     </RelativeLayout>
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/line"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:background="@color/item_line" />
+    <RelativeLayout
+        android:id="@+id/booking_rl"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/item_height"
+        android:background="@drawable/selector_me_menu_item_bg"
+        android:descendantFocusability="blocksDescendants"
+        android:minHeight="@dimen/item_height"
+        android:paddingLeft="15dp"
+        android:paddingRight="15dp">
+
+        <FrameLayout
+            android:id="@+id/head_area"
+            android:layout_width="57dp"
+            android:layout_height="64dp"
+            android:layout_centerVertical="true">
+
+            <ImageView
+                android:layout_width="@dimen/item_img_height"
+                android:layout_height="@dimen/item_img_width"
+                android:layout_gravity="center_vertical"
+                android:background="@color/transparent"
+                android:contentDescription="@string/app_name"
+                android:padding="1dp"
+                android:src="@drawable/icon_yuyue3" />
+
+            <TextView
+                android:id="@+id/subscribe_num_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="top|right"
+                android:background="@drawable/tab_unread_bg"
+                android:gravity="center"
+                android:textColor="@android:color/white"
+                android:textSize="10.0dip"
+                android:visibility="gone" />
+        </FrameLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="3dp"
+            android:layout_toRightOf="@id/head_area"
+            android:gravity="center_vertical">
+
+            <TextView
+                android:id="@+id/book_name_tv"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_toLeftOf="@+id/time_tv"
+                android:ellipsize="end"
+                android:text="@string/booking_menu"
+                android:textColor="@color/text_main"
+                android:textSize="16sp" />
+            <TextView
+                android:id="@+id/tv_book_desc"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/msg_subscribe_data"
+                android:layout_below="@+id/subscribe_time_tv"
+                android:layout_toLeftOf="@+id/tv_book_num"
+                android:layout_toStartOf="@+id/tv_book_num" />
+            <TextView
+                android:id="@+id/tv_book_num"
+                android:layout_width="10dp"
+                android:layout_height="10dp"
+                android:layout_gravity="top|right"
+                android:layout_alignParentRight="true"
+                android:background="@drawable/hongdian"
+                android:gravity="center"
+                android:text=""
+                android:textColor="@android:color/white"
+                android:textSize="10.0dip"
+                />
+            <TextView
+                android:id="@+id/book_time_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:ellipsize="end"
+                android:visibility="gone"
+                android:textColor="@color/text_hine"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/book_content_tv"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/book_name_tv"
+                android:layout_marginTop="8dp"
+                android:ellipsize="end"
+                android:lines="1"
+                android:textColor="@color/text_hine"
+                android:textSize="14sp" />
+        </RelativeLayout>
+
+    </RelativeLayout>
     <!--<RelativeLayout-->
         <!--android:id="@+id/notice_rl"-->
         <!--android:layout_width="match_parent"-->

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

@@ -22,7 +22,7 @@
     <dimen name="oa_statistics_date_minheight">30dp</dimen>
     <!-- end oa 考勤统计页面-->
     <dimen name="next_width">10.0dip</dimen>
-    <dimen name="line">2px</dimen>
+    <dimen name="line">1px</dimen>
     <dimen name="line_big">7.0dip</dimen>
     <dimen name="line_min">2.0dip</dimen>
     <dimen name="next_height">15.0dip</dimen>

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

@@ -1797,4 +1797,16 @@
 
     <!--本地通讯录-->
     <string name="app_local_contacts">手机通讯录</string>
+    <!--UU小秘书-->
+    <string name="booking_menu">预约小秘书</string>
+    <string name="booking_title">预约详情</string>
+    <string name="booking_time">时间</string>
+    <string name="booking_address">地址</string>
+    <string name="booking_content">内容</string>
+    <string name="booking_change">变更</string>
+    <string name="booking_object">对象</string>
+
+    <string name="booking_me">我的预约</string>
+    <string name="booking_shared">共享预约</string>
+    
 </resources>

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

@@ -946,7 +946,7 @@
         <item name="android:layout_height">match_parent</item>
         <item name="android:layout_marginTop">10dp</item>
         <item name="android:layout_marginBottom">10dp</item>
-        <item name="android:background">@color/black</item>
+        <item name="android:background">@color/gray_light</item>
     </style>
 
     <!--横线-->