更新代码

WeiChat/build.gradle

@@ -2,12 +2,12 @@ apply plugin: 'com.android.application'
 
 android {
     signingConfigs {
-        config {
-            keyPassword '13237658359'
-            storeFile file('C:/Users/Arisono/Desktop/applicationsignname[20150409]')
-            storePassword '13237658359'
-            keyAlias 'jie-20150409'
-        }
+//        config {
+//            keyPassword '13237658359'
+//            storeFile file('C:/Users/Arisono/Desktop/applicationsignname[20150409]')
+//            storePassword '13237658359'
+//            keyAlias 'jie-20150409'
+//        }
     }
     compileSdkVersion 22
     buildToolsVersion "22.0.1"
@@ -31,7 +31,6 @@ android {
         }
         debug {
 //            signingConfig signingConfigs.config
-            signingConfig signingConfigs.config
         }
     }
 }

WeiChat/src/main/AndroidManifest.xml

@@ -408,6 +408,16 @@
         <activity
             android:name=".ui.erp.activity.OA_AlarmaActivity"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
+        <activity
+            android:name=".ui.erp.activity.MeetingActivity"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
+        <activity
+            android:name=".ui.erp.activity.AddMeetingActivity"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
+        <activity
+            android:name=".ui.erp.activity.OAActivity"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
+
     </application>
 
 </manifest>

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

@@ -0,0 +1,15 @@
+package com.xzjmyk.pm.activity.ui.erp.activity;
+
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+
+import com.xzjmyk.pm.activity.R;
+
+public class AddMeetingActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_add_meeting);
+    }
+}

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

@@ -100,27 +100,54 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
 
     @Override
     public void onClick(View view) {
+        Intent it_scale = null;
         switch (view.getId()) {
             case R.id.ll_signin://打卡签到
                 startActivity(new Intent(activity, SigninActivity.class));
                 break;
-            case R.id.ll_outside:
+            case R.id.ll_outside:  //外勤签到
                 break;
-            case R.id.ll_meeting:
+            case R.id.ll_meeting://会议管理
+                startActivity(new Intent(activity, MeetingActivity.class));
                 break;
-            case R.id.ll_worklog:
+            case R.id.ll_worklog://工作日志
                 break;
-            case R.id.ll_subject:
+            case R.id.ll_subject://审批
+                //TODO 先不做
                 break;
-            case R.id.ll_leave:
+            case R.id.ll_leave://请假申请
+                it_scale = new Intent(activity,
+                        SaleSelectActivity.class);
+                it_scale.putExtra("caller", "Ask4Leave");
+                it_scale.putExtra("title", "请假单查询");
+                it_scale.putExtra("from", "SignMain");
+                startActivity(it_scale);
                 break;
-            case R.id.ll_overtime:
+            case R.id.ll_overtime://加班申请
+                it_scale = new Intent(activity,
+                        SaleSelectActivity.class);
+                it_scale.putExtra("caller", "Workovertime");
+                it_scale.putExtra("title", "加班申请查询");
+                it_scale.putExtra("from", "SignMain");
+                startActivity(it_scale);
                 break;
-            case R.id.ll_travel:
+            case R.id.ll_travel://出差申请
+                it_scale = new Intent(activity,
+                        SaleSelectActivity.class);
+                it_scale.putExtra("caller", "FeePlease!CCSQ");
+                it_scale.putExtra("title", "出差单查询");
+                it_scale.putExtra("from", "SignMain");
+                startActivity(it_scale);
                 break;
-            case R.id.ll_:
+            case R.id.ll_://特殊考勤
+                it_scale = new Intent(activity,
+                        SaleSelectActivity.class);
+                it_scale.putExtra("caller", "SpeAttendance");
+                it_scale.putExtra("title", "特殊考勤查询");
+                it_scale.putExtra("from", "SignMain");
+                startActivity(it_scale);
                 break;
-            case R.id.ll_attendance:
+            case R.id.ll_attendance://考勤统计
                 break;
 
 

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

@@ -0,0 +1,36 @@
+package com.xzjmyk.pm.activity.ui.erp.activity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+
+import com.xzjmyk.pm.activity.R;
+
+public class MeetingActivity extends AppCompatActivity {
+    private MeetingActivity activity = this;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_meeting);
+        findViewById(R.id.oa_back).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                endActivity();
+            }
+        });
+        findViewById(R.id.oa_rili_img).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                //调转到添加会议页面
+                activity.startActivity(new Intent(activity, AddMeetingActivity.class));
+            }
+        });
+    }
+
+    private void endActivity() {
+        finish();
+
+    }
+}

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

@@ -0,0 +1,155 @@
+package com.xzjmyk.pm.activity.ui.erp.activity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.Spinner;
+
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.calendar.cons.DPMode;
+import com.xzjmyk.pm.activity.ui.calendar.views.DatePicker;
+import com.xzjmyk.pm.activity.util.CalendarUtils;
+import com.xzjmyk.pm.activity.view.MyListView;
+
+public class OAActivity extends BaseActivity implements View.OnClickListener{
+    private OAActivity activity = this;
+    private MyListView listview;
+    private Spinner state, show_type, type;
+    private String[] stateItems = {"状态1", "状态2", "状态3", "状态4", "状态5"};
+    private String[] typeItems = {"类型1", "类型2", "类型3", "类型4", "类型5"};
+    private String[] show_typeItems = {"展示方式1", "展示方式2", "展示方式3", "展示方式4", "展示方式5"};
+    private DatePicker picker;
+
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_oa);
+        init();
+        initView();
+    }
+
+    private void init() {
+        ;
+    }
+
+    private void initView() {
+        findViewById(R.id.ll_signin).setOnClickListener(this);
+        findViewById(R.id.ll_outside).setOnClickListener(this);
+        findViewById(R.id.ll_meeting).setOnClickListener(this);
+        findViewById(R.id.ll_worklog).setOnClickListener(this);
+        findViewById(R.id.ll_subject).setOnClickListener(this);
+
+        findViewById(R.id.ll_leave).setOnClickListener(this);
+        findViewById(R.id.ll_overtime).setOnClickListener(this);
+        findViewById(R.id.ll_travel).setOnClickListener(this);
+        findViewById(R.id.ll_).setOnClickListener(this);
+        findViewById(R.id.ll_attendance).setOnClickListener(this);
+
+        state = (Spinner) findViewById(R.id.state);
+        type = (Spinner) findViewById(R.id.type);
+        show_type = (Spinner) findViewById(R.id.show_type);
+        picker = (DatePicker) findViewById(R.id.oa_picker);
+        picker.setDate(CalendarUtils.getCurrentYear(), CalendarUtils.getCurrentMonth());
+        picker.setMode(DPMode.SINGLE);
+        bindAdapterForSpinner();
+
+    }
+
+    private void bindAdapterForSpinner() {
+        state.setAdapter(new ArrayAdapter<String>(this, android.R.layout.simple_spinner_item, stateItems));
+        type.setAdapter(new ArrayAdapter<String>(this, android.R.layout.simple_spinner_item, typeItems));
+        show_type.setAdapter(new ArrayAdapter<String>(this, android.R.layout.simple_spinner_item, show_typeItems));
+
+        state.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
+                ToastMessage(stateItems[i]);
+            }
+
+            @Override
+            public void onNothingSelected(AdapterView<?> adapterView) {
+
+            }
+        });
+        type.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
+                ToastMessage(typeItems[i]);
+            }
+
+            @Override
+            public void onNothingSelected(AdapterView<?> adapterView) {
+
+            }
+        });
+        show_type.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
+                ToastMessage(show_typeItems[i]);
+            }
+
+            @Override
+            public void onNothingSelected(AdapterView<?> adapterView) {
+            }
+        });
+    }
+
+    @Override
+    public void onClick(View view) {
+        Intent it_scale = null;
+        switch (view.getId()) {
+            case R.id.ll_signin://打卡签到
+                startActivity(new Intent(activity, SigninActivity.class));
+                break;
+            case R.id.ll_outside:  //外勤签到
+                break;
+            case R.id.ll_meeting://会议管理
+                startActivity(new Intent(activity, MeetingActivity.class));
+                break;
+            case R.id.ll_worklog://工作日志
+                break;
+            case R.id.ll_subject://审批
+                //TODO 审批先不做
+                break;
+            case R.id.ll_leave://请假申请
+                it_scale = new Intent(activity,
+                        SaleSelectActivity.class);
+                it_scale.putExtra("caller", "Ask4Leave");
+                it_scale.putExtra("title", "请假单查询");
+                it_scale.putExtra("from", "SignMain");
+                startActivity(it_scale);
+                break;
+            case R.id.ll_overtime://加班申请
+                it_scale = new Intent(activity,
+                        SaleSelectActivity.class);
+                it_scale.putExtra("caller", "Workovertime");
+                it_scale.putExtra("title", "加班申请查询");
+                it_scale.putExtra("from", "SignMain");
+                startActivity(it_scale);
+                break;
+            case R.id.ll_travel://出差申请
+                it_scale = new Intent(activity,
+                        SaleSelectActivity.class);
+                it_scale.putExtra("caller", "FeePlease!CCSQ");
+                it_scale.putExtra("title", "出差单查询");
+                it_scale.putExtra("from", "SignMain");
+                startActivity(it_scale);
+                break;
+            case R.id.ll_://特殊考勤
+                it_scale = new Intent(activity,
+                        SaleSelectActivity.class);
+                it_scale.putExtra("caller", "SpeAttendance");
+                it_scale.putExtra("title", "特殊考勤查询");
+                it_scale.putExtra("from", "SignMain");
+                startActivity(it_scale);
+                break;
+            case R.id.ll_attendance://考勤统计
+                break;
+        }
+    }
+
+}

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

@@ -12,7 +12,6 @@ public class OA_AlarmaActivity extends BaseActivity implements View.OnClickListe
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_oa__alarma);
-//        DateUtils.
         findViewById(R.id.oa_back).setOnClickListener(this);
     }
 

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

@@ -62,7 +62,7 @@ public class SigninActivity extends BaseActivity implements View.OnClickListener
         picker.setOnDatePickedListener(new DatePicker.OnDatePickedListener() {
             @Override
             public void onDatePicked(String date) {
-                titleTime.setText(TimeUtils.day_long_2_str(TimeUtils.s_str_2_long(date)));
+                titleTime.setText(TimeUtils.day_long_2_str(TimeUtils.s_str_2_long(date)) + "   " + TimeUtils.getWeek(date));
                 dateDialog.dismiss();
             }
         });
@@ -74,7 +74,6 @@ public class SigninActivity extends BaseActivity implements View.OnClickListener
 
     private void endOfActivity() {
         //TODO 退出时候操作
-
         finish();
 
     }

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

@@ -17,10 +17,9 @@ import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.base.XutilsFragment;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.ClientActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.ErpMenActivity;
+import com.xzjmyk.pm.activity.ui.erp.activity.OAActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
-import com.xzjmyk.pm.activity.ui.message.SubscriptionActivity;
 import com.xzjmyk.pm.activity.util.PreferenceUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.volley.FastVolley;
@@ -92,10 +91,10 @@ public class WorksFragment extends XutilsFragment implements View.OnClickListene
                 String phone = CommonUtil.getSharedPreferences(getActivity(), "user_phone");
                 String password = CommonUtil.getSharedPreferences(getActivity(), "user_password");
                 String url = "http://www.ubtob.com/signin#/redirect/" + phone + "/" + password;
-                    ViewUtil.WebLinks(ct, url, "我的商务");
+                ViewUtil.WebLinks(ct, url, "我的商务");
                 break;
             case R.id.rl_uas_sys:
-                ct.startActivity(new Intent(ct, ErpMenActivity.class));
+                ct.startActivity(new Intent(ct, OAActivity.class));
                 break;
             case R.id.my_client_rl:
                 ct.startActivity(new Intent(ct, ClientActivity.class));
@@ -107,7 +106,6 @@ public class WorksFragment extends XutilsFragment implements View.OnClickListene
                 intent.putExtra(AppConstant.EXTRA_CIRCLE_TYPE, AppConstant.CIRCLE_TYPE_MY_BUSINESS);
                 if (MainActivity.timeMin != -1 && MainActivity.timeMin != PreferenceUtils.getLong(getActivity(), MainActivity.TIME_MAIN)) {
                     PreferenceUtils.putLong(getActivity(), MainActivity.TIME_MAIN, MainActivity.timeMin); //获取以前时间
-
                 } else {
                 }
                 startActivity(intent);

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

@@ -8,6 +8,7 @@ import com.xzjmyk.pm.activity.R;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.Calendar;
 import java.util.Date;
 
 @SuppressWarnings("deprecation")
@@ -23,6 +24,39 @@ public class TimeUtils {
     public static final SimpleDateFormat int_format = new SimpleDateFormat("yyyyMMdd");
 
 
+    public static String getWeek(String date) { //yyyy-MM-dd
+        Calendar c = Calendar.getInstance();
+        c.setTimeInMillis(TimeUtils.s_str_2_long(date));
+        String src = "";
+
+        int week = c.get(Calendar.DAY_OF_WEEK);
+        switch (week) {
+            case 1:
+                src = "星期天";
+                break;
+            case 2:
+                src = "星期一";
+                break;
+            case 3:
+                src = "星期二";
+                break;
+            case 4:
+                src = "星期三";
+                break;
+            case 5:
+                src = "星期四";
+                break;
+            case 6:
+                src = "星期五";
+                break;
+            case 7:
+                src = "星期六";
+                break;
+
+        }
+        return src;
+    }
+
     public static long s_str_2_long(String dateString) {
         try {
             Date d = s_format.parse(dateString);

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

@@ -0,0 +1,426 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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"
+    android:background="@drawable/bg_main"
+    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.AddMeetingActivity">
+
+    <RelativeLayout
+        android:id="@+id/top"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:background="@color/text_black">
+
+        <TextView
+            android:id="@+id/oa_back"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="10dp"
+            android:clickable="true"
+            android:drawableLeft="@drawable/back"
+            android:text="取消"
+            android:textColor="@color/white"
+            android:textSize="20sp" />
+
+        <TextView
+            android:id="@+id/oa_title_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:clickable="true"
+            android:text="新建会议"
+            android:textColor="@color/white"
+            android:textSize="20sp" />
+
+        <TextView
+            android:id="@+id/oa_rili_img"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:layout_marginRight="8dp"
+            android:text="保存"
+            android:textColor="@color/white"
+            android:textSize="20sp" />
+
+    </RelativeLayout>
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/top">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <RelativeLayout
+                android:id="@+id/oa_meet"
+                style="@style/IMTbleLine_UP">
+
+                <TextView
+                    android:id="@+id/oa_meet_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:drawablePadding="10dp"
+                    android:gravity="center"
+                    android:text="会议名称"
+                    android:textColor="@color/text_main"
+                    android:textSize="@dimen/text_main" />
+
+                <TextView
+                    android:id="@+id/oa_meet_name_tv"
+                    style="@style/IMTbleLine_TextValue"
+                    android:layout_toLeftOf="@+id/next_img1"
+                    android:layout_toRightOf="@+id/oa_meet_name"
+                    android:textColor="@color/text_hine"
+                    android:textSize="@dimen/text_hine" />
+
+                <ImageView
+                    android:id="@+id/next_img1"
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:alpha="0.26"
+                    android:background="@drawable/set_list_next"
+                    android:contentDescription="@string/app_name" />
+            </RelativeLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1px"
+                android:background="@color/item_line" />
+
+            <RelativeLayout
+                android:id="@+id/oa_start_time"
+                style="@style/IMTbleLine_UP">
+
+                <TextView
+                    android:id="@+id/oa_start_time_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:drawablePadding="10dp"
+                    android:gravity="center"
+                    android:text="开始时间"
+                    android:textColor="@color/text_main"
+                    android:textSize="@dimen/text_main" />
+
+                <TextView
+                    android:id="@+id/oa_start_time_name_tv"
+                    style="@style/IMTbleLine_TextValue"
+                    android:layout_toLeftOf="@+id/next_img2"
+                    android:layout_toRightOf="@+id/oa_start_time_name"
+                    android:textColor="@color/text_hine"
+                    android:textSize="@dimen/text_hine" />
+
+                <ImageView
+                    android:id="@+id/next_img2"
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:alpha="0.26"
+                    android:background="@drawable/set_list_next"
+                    android:contentDescription="@string/app_name" />
+            </RelativeLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1px"
+                android:background="@color/item_line" />
+
+            <RelativeLayout
+                android:id="@+id/oa_end_time"
+                style="@style/IMTbleLine_UP">
+
+                <TextView
+                    android:id="@+id/oa_end_time_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:drawablePadding="10dp"
+                    android:gravity="center"
+                    android:text="结束时间"
+                    android:textColor="@color/text_main"
+                    android:textSize="@dimen/text_main" />
+
+                <TextView
+                    android:id="@+id/oa_end_time_name_tv"
+                    style="@style/IMTbleLine_TextValue"
+                    android:layout_toLeftOf="@+id/oa_next_img3"
+                    android:layout_toRightOf="@+id/oa_end_time_name"
+                    android:textColor="@color/text_hine"
+                    android:textSize="@dimen/text_hine" />
+
+                <ImageView
+                    android:id="@+id/oa_next_img3"
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:alpha="0.26"
+                    android:background="@drawable/set_list_next"
+                    android:contentDescription="@string/app_name" />
+            </RelativeLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1px"
+                android:background="@color/item_line" />
+
+            <RelativeLayout
+                android:id="@+id/oa_meet_addr"
+                style="@style/IMTbleLine_UP">
+
+                <TextView
+                    android:id="@+id/oa_meet_addr_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:drawablePadding="10dp"
+                    android:gravity="center"
+                    android:text="会议地点"
+                    android:textColor="@color/text_main"
+                    android:textSize="@dimen/text_main" />
+
+                <TextView
+                    android:id="@+id/oa_meet_addr_name_tv"
+                    style="@style/IMTbleLine_TextValue"
+                    android:layout_toLeftOf="@+id/oa_next_img4"
+                    android:layout_toRightOf="@+id/oa_meet_addr_name"
+                    android:textColor="@color/text_hine"
+                    android:textSize="@dimen/text_hine" />
+
+                <ImageView
+                    android:id="@+id/oa_next_img4"
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:alpha="0.26"
+                    android:background="@drawable/set_list_next"
+                    android:contentDescription="@string/app_name" />
+            </RelativeLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1px"
+                android:background="@color/item_line" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="10dp" />
+
+            <RelativeLayout
+                android:id="@+id/oa_meet_num"
+                style="@style/IMTbleLine_UP">
+
+                <TextView
+                    android:id="@+id/oa_meet_num_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_marginTop="10dp"
+                    android:drawablePadding="10dp"
+                    android:gravity="center"
+                    android:text="参会人员"
+                    android:textColor="@color/text_main"
+                    android:textSize="@dimen/text_main" />
+
+                <TextView
+                    android:id="@+id/oa_meet_num_name_tv"
+                    style="@style/IMTbleLine_TextValue"
+                    android:layout_toLeftOf="@+id/oa_next_img5"
+                    android:layout_toRightOf="@+id/oa_meet_num_name"
+                    android:textColor="@color/text_hine"
+                    android:textSize="@dimen/text_hine" />
+
+                <ImageView
+                    android:id="@+id/oa_next_img5"
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:alpha="0.26"
+                    android:background="@drawable/set_list_next"
+                    android:contentDescription="@string/app_name" />
+            </RelativeLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1px"
+                android:background="@color/item_line" />
+
+            <RelativeLayout
+                android:id="@+id/oa_meet_meam"
+                style="@style/IMTbleLine_UP">
+
+                <TextView
+                    android:id="@+id/oa_meet_meam_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_marginTop="10dp"
+                    android:drawablePadding="10dp"
+                    android:gravity="center"
+                    android:text="管理员"
+                    android:textColor="@color/text_main"
+                    android:textSize="@dimen/text_main" />
+
+                <TextView
+                    android:id="@+id/oa_meet_meam_name_tv"
+                    style="@style/IMTbleLine_TextValue"
+                    android:layout_toLeftOf="@+id/oa_next_img6"
+                    android:layout_toRightOf="@+id/oa_meet_meam_name"
+                    android:textColor="@color/text_hine"
+                    android:textSize="@dimen/text_hine" />
+
+                <ImageView
+                    android:id="@+id/oa_next_img6"
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:alpha="0.26"
+                    android:background="@drawable/set_list_next"
+                    android:contentDescription="@string/app_name" />
+            </RelativeLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1px"
+                android:background="@color/item_line" />
+
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="10dp" />
+
+            <RelativeLayout
+                android:id="@+id/oa_meet_note"
+                style="@style/IMTbleLine_UP">
+
+                <TextView
+                    android:id="@+id/oa_meet_note_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_marginTop="10dp"
+                    android:drawablePadding="10dp"
+                    android:gravity="center"
+                    android:text="会议标签"
+                    android:textColor="@color/text_main"
+                    android:textSize="@dimen/text_main" />
+
+                <TextView
+                    android:id="@+id/oa_meet_note_name_tv"
+                    style="@style/IMTbleLine_TextValue"
+                    android:layout_toLeftOf="@+id/oa_next_img7"
+                    android:layout_toRightOf="@+id/oa_meet_note_name"
+                    android:textColor="@color/text_hine"
+                    android:textSize="@dimen/text_hine" />
+
+                <ImageView
+                    android:id="@+id/oa_next_img7"
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:alpha="0.26"
+                    android:background="@drawable/set_list_next"
+                    android:contentDescription="@string/app_name" />
+            </RelativeLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1px"
+                android:background="@color/item_line" />
+
+            <RelativeLayout
+                android:id="@+id/oa_meet_sub"
+                style="@style/IMTbleLine_UP">
+
+                <TextView
+                    android:id="@+id/oa_meet_sub_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_marginTop="10dp"
+                    android:drawablePadding="10dp"
+                    android:gravity="center"
+                    android:text="管理员"
+                    android:textColor="@color/text_main"
+                    android:textSize="@dimen/text_main" />
+
+                <TextView
+                    android:id="@+id/oa_meet_sub_name_tv"
+                    style="@style/IMTbleLine_TextValue"
+                    android:layout_toLeftOf="@+id/oa_next_img9"
+                    android:layout_toRightOf="@+id/oa_meet_sub_name"
+                    android:textColor="@color/text_hine"
+                    android:textSize="@dimen/text_hine" />
+
+                <ImageView
+                    android:id="@+id/oa_next_img9"
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:alpha="0.26"
+                    android:background="@drawable/set_list_next"
+                    android:contentDescription="@string/app_name" />
+            </RelativeLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1px"
+                android:background="@color/item_line" />
+
+            <RelativeLayout
+                android:id="@+id/oa_meet_about"
+                style="@style/IMTbleLine_UP">
+
+                <TextView
+                    android:id="@+id/oa_meet_about_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_marginTop="10dp"
+                    android:drawablePadding="10dp"
+                    android:gravity="center"
+                    android:text="管理员"
+                    android:textColor="@color/text_main"
+                    android:textSize="@dimen/text_main" />
+
+                <TextView
+                    android:id="@+id/oa_meet_about_name_tv"
+                    style="@style/IMTbleLine_TextValue"
+                    android:layout_toLeftOf="@+id/oa_next_img8"
+                    android:layout_toRightOf="@+id/oa_meet_about_name"
+                    android:textColor="@color/text_hine"
+                    android:textSize="@dimen/text_hine" />
+
+                <ImageView
+                    android:id="@+id/oa_next_img8"
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:alpha="0.26"
+                    android:background="@drawable/set_list_next"
+                    android:contentDescription="@string/app_name" />
+            </RelativeLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1px"
+                android:background="@color/item_line" />
+        </LinearLayout>
+    </ScrollView>
+</RelativeLayout>

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

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"

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

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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.MeetingActivity">
+
+    <RelativeLayout
+        android:id="@+id/top"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:background="@color/text_black">
+
+        <TextView
+            android:id="@+id/oa_back"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="10dp"
+            android:clickable="true"
+            android:drawableLeft="@drawable/back"
+            android:text="返回"
+            android:textColor="@color/white"
+            android:textSize="20sp" />
+
+        <TextView
+            android:id="@+id/oa_title_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:clickable="true"
+            android:text="会议助手"
+            android:textColor="@color/white"
+            android:textSize="16sp" />
+
+        <ImageView
+            android:id="@+id/oa_rili_img"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:layout_marginRight="8dp"
+            android:clickable="true"
+            android:src="@drawable/oa_add_meet" />
+
+    </RelativeLayout>
+</RelativeLayout>

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

@@ -0,0 +1,469 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.ClientActivity">
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/text_black"
+            android:gravity="center_horizontal"
+            android:text="OA"
+            android:textColor="@color/white"
+            android:textSize="30dp" />
+
+
+        <LinearLayout
+            android:id="@+id/oa_rl_choose"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/toobar"
+            android:background="@color/text_black"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <LinearLayout
+                    android:id="@+id/ll_signin"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:clickable="true"
+                    android:gravity="center"
+                    android:orientation="vertical">
+
+                    <Button
+                        style="@style/oa_btn_style"
+                        android:background="@drawable/text_button_stye" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+
+                        android:layout_marginTop="2dp"
+                        android:text="打卡签到"
+                        android:textColor="@color/white" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/ll_outside"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:clickable="true"
+                    android:gravity="center"
+                    android:orientation="vertical">
+
+                    <Button
+                        style="@style/oa_btn_style"
+
+                        android:background="@drawable/text_button_stye1" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="2dp"
+                        android:text="外勤签到"
+                        android:textColor="@color/white" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/ll_meeting"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:clickable="true"
+                    android:gravity="center"
+                    android:orientation="vertical">
+
+                    <Button
+                        style="@style/oa_btn_style"
+
+                        android:background="@drawable/text_button_stye2" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="2dp"
+
+                        android:text="会议管理"
+                        android:textColor="@color/white" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/ll_worklog"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:clickable="true"
+                    android:gravity="center"
+                    android:orientation="vertical">
+
+                    <Button
+                        style="@style/oa_btn_style"
+
+                        android:background="@drawable/text_button_stye3" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="2dp"
+                        android:text="工作日志"
+                        android:textColor="@color/white" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/ll_subject"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:clickable="true"
+                    android:gravity="center"
+                    android:orientation="vertical">
+
+                    4
+
+                    <Button
+                        style="@style/oa_btn_style"
+
+                        android:background="@drawable/text_button_stye4" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+
+                        android:layout_marginTop="2dp"
+                        android:text="审批"
+                        android:textColor="@color/white" />
+                </LinearLayout>
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="3dp" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <LinearLayout
+                    android:id="@+id/ll_leave"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:clickable="true"
+                    android:gravity="center"
+                    android:orientation="vertical">
+
+                    <Button
+                        style="@style/oa_btn_style"
+
+                        android:background="@drawable/text_button_stye" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="2dp"
+
+                        android:text="请假申请"
+                        android:textColor="@color/white" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/ll_overtime"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:clickable="true"
+                    android:gravity="center"
+                    android:orientation="vertical">
+
+                    <Button
+                        style="@style/oa_btn_style"
+                        android:background="@drawable/text_button_stye1" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="2dp"
+                        android:text="加班申请"
+                        android:textColor="@color/white" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/ll_travel"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:clickable="true"
+                    android:gravity="center"
+                    android:orientation="vertical">
+
+                    <Button
+                        style="@style/oa_btn_style"
+                        android:background="@drawable/text_button_stye2" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="2dp"
+                        android:text="出差申请"
+                        android:textColor="@color/white" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/ll_"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:clickable="true"
+                    android:gravity="center"
+                    android:orientation="vertical">
+
+                    <Button
+                        style="@style/oa_btn_style"
+                        android:background="@drawable/text_button_stye3" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="2dp"
+
+                        android:text="特殊考勤"
+                        android:textColor="@color/white" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/ll_attendance"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:clickable="true"
+                    android:gravity="center"
+                    android:orientation="vertical">
+
+                    <Button
+                        style="@style/oa_btn_style"
+                        android:background="@drawable/text_button_stye4" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="2dp"
+                        android:text="考勤统计"
+                        android:textColor="@color/white" />
+                </LinearLayout>
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="8dp" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/oa_function_ll"
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:layout_below="@+id/oa_rl_choose"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:id="@+id/oa_img_people"
+                android:clickable="true"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:padding="10dp"
+                android:src="@drawable/oa_head" />
+
+            <View
+                android:layout_width="1px"
+                android:layout_height="match_parent"
+                android:background="@color/item_line" />
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="日程任务"
+                android:textColor="@color/text_black" />
+
+            <View
+                android:layout_width="1px"
+                android:layout_height="match_parent"
+                android:background="@color/item_line" />
+
+            <ImageView
+                android:id="@+id/oa_img_add"
+                android:clickable="true"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:padding="10dp"
+                android:src="@drawable/oa_add" />
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1px"
+            android:background="@color/item_line" />
+
+        <LinearLayout
+            android:id="@+id/oa_choose_ll"
+            android:layout_width="match_parent"
+            android:layout_height="30dp"
+            android:layout_alignParentBottom="true"
+            android:layout_below="@id/oa_function_ll"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="2"
+                android:gravity="center"
+                android:text="人员" />
+
+            <View
+                android:layout_width="1px"
+                android:layout_height="match_parent"
+                android:background="@color/item_line" />
+
+            <Spinner
+                android:id="@+id/state"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="2" />
+
+            <View
+                android:layout_width="1px"
+                android:layout_height="match_parent"
+                android:background="@color/item_line" />
+
+            <Spinner
+                android:id="@+id/type"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="2" />
+
+            <View
+                android:layout_width="1px"
+                android:layout_height="match_parent"
+                android:background="@color/item_line" />
+
+            <Spinner
+                android:id="@+id/show_type"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="2" />
+
+            <View
+                android:layout_width="1px"
+                android:layout_height="match_parent"
+                android:background="@color/item_line" />
+
+            <ImageView
+                android:id="@+id/oa_img_infile"
+                android:clickable="true"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:padding="5dp"
+                android:src="@drawable/filter" />
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1px"
+            android:background="@color/item_line" />
+
+        <com.xzjmyk.pm.activity.ui.calendar.views.DatePicker
+            android:id="@+id/oa_picker"
+            android:layout_width="match_parent"
+            android:layout_height="300dp" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1px"
+            android:background="@color/item_line" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/oa_all_task_num"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="2"
+                android:gravity="center"
+                android:text="aaa"
+                android:textSize="16sp" />
+
+            <View
+                android:layout_width="1px"
+                android:layout_height="match_parent"
+                android:background="@color/item_line" />
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="aaa"
+                android:textSize="16sp" />
+
+            <View
+                android:layout_width="1px"
+                android:layout_height="match_parent"
+                android:background="@color/item_line" />
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="aaa"
+                android:textSize="16sp" />
+
+            <View
+                android:layout_width="1px"
+                android:layout_height="match_parent"
+                android:background="@color/item_line" />
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="aaa"
+
+                android:textSize="16sp" />
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1px"
+            android:background="@color/item_line" />
+
+        <com.xzjmyk.pm.activity.view.MyListView
+            android:id="@+id/oa_listview"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+        />
+
+    </LinearLayout>
+</ScrollView>