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

WeiChat/build.gradle

@@ -85,6 +85,7 @@ dependencies {
     compile 'com.android.support:support-v4:22.2.0'
     compile 'com.android.support:appcompat-v7:22.2.0'
     compile 'com.android.support:cardview-v7:22.2.0'
+    compile 'com.android.support:design:22+'
     compile 'com.android.support:design:22.2.0'
     compile 'com.commit451:PhotoView:1.2.5'
     compile 'me.gujun.android.taggroup:library:1.4@aar'

WeiChat/src/main/AndroidManifest.xml

@@ -400,23 +400,17 @@
         <activity android:name=".ui.message.SubscriptionActivity" />
         <activity android:name=".ui.circle.PhoneSelectActivity" />
         <activity android:name=".ui.erp.activity.ClientActivity" />
+        <activity android:name=".ui.erp.activity.oa.SigninActivity" />
+        <activity android:name=".ui.erp.activity.oa.OA_AlarmaActivity" />
+        <activity android:name=".ui.erp.activity.oa.MeetingActivity" />
         <activity
-            android:name=".ui.erp.activity.SigninActivity"
+            android:name=".ui.erp.activity.oa.AddMeetingActivity"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
         <activity
-            android:name=".ui.erp.activity.OA_AlarmaActivity"
+            android:name=".ui.erp.activity.oa.OAActivity"
             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" />
-        <activity
-            android:name=".ui.erp.activity.StatisticsActivity"
+            android:name=".ui.erp.activity.oa.StatisticsActivity"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
         <activity android:name=".ui.erp.activity.TextErpActivity" />
         <activity android:name=".ui.erp.activity.crm.BusinessActivity" />
@@ -428,6 +422,13 @@
         <activity
             android:name=".ui.message.uas.B2bMsgActivity"
             android:launchMode="singleTask" />
+        <activity android:name=".ui.erp.activity.oa.OutofficeActivity" >
+        </activity>
+        <activity android:name=".ui.erp.activity.oa.MeetDetailsActivity" >
+        </activity>
+        <activity android:name=".ui.erp.activity.oa.OARegisterActivity" >
+        </activity>
+            android:launchMode="singleTask" />
         <activity android:name=".ui.erp.activity.crm.CustomerAddActivity"></activity>
         <activity android:name=".ui.erp.activity.crm.CustomerDetailActivity"></activity>
         <activity android:name=".ui.erp.activity.crm.CustomerListActivity"></activity>
@@ -435,7 +436,7 @@
         <activity
             android:name=".ui.erp.activity.crm.SalesRankingActivity"
             android:label="@string/title_activity_sales_ranking"
-            android:theme="@style/AppTheme.NoActionBar"></activity>
+            android:theme="@style/AppTheme.NoActionBar"/>
         <activity android:name=".ui.erp.activity.crm.VisitReportAddActivity"></activity>
         <activity android:name=".ui.erp.activity.crm.VisitReportPlanActivity"></activity>
         <activity android:name=".ui.erp.activity.crm.AddressSelectActivity"></activity>

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/account/LoginActivity.java

@@ -2,7 +2,6 @@ package com.xzjmyk.pm.activity.ui.account;
 
 import android.app.ProgressDialog;
 import android.content.DialogInterface;
-import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
@@ -14,17 +13,17 @@ import android.widget.EditText;
 import com.alibaba.fastjson.JSON;
 import com.android.volley.Response.ErrorListener;
 import com.android.volley.VolleyError;
-import com.xzjmyk.pm.activity.helper.LoginHelper;
-import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
-import com.xzjmyk.pm.activity.util.DeviceInfoUtil;
-import com.xzjmyk.pm.activity.util.PreferenceUtils;
-import com.xzjmyk.pm.activity.util.ProgressDialogUtil;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.LoginRegisterResult;
+import com.xzjmyk.pm.activity.helper.LoginHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
+import com.xzjmyk.pm.activity.util.DeviceInfoUtil;
 import com.xzjmyk.pm.activity.util.Md5Util;
+import com.xzjmyk.pm.activity.util.PreferenceUtils;
+import com.xzjmyk.pm.activity.util.ProgressDialogUtil;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.volley.ObjectResult;
 import com.xzjmyk.pm.activity.volley.Result;
@@ -83,10 +82,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
         if (PreferenceUtils.getString(this, PASS_WORDS) != null && PreferenceUtils.getString(this, PASS_WORDS).length() > 0) {
             mPasswordEdit.setText(PreferenceUtils.getString(this, PASS_WORDS));
         }
-        //忘记密码按钮点击事件
-        findViewById(R.id.forget_password_btn).setOnClickListener(this);
-        //注册账号
-        findViewById(R.id.register_account_btn).setOnClickListener(this);
+
         //登陆账号
         findViewById(R.id.login_btn).setOnClickListener(this);
     }
@@ -94,14 +90,6 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
     @Override
     public void onClick(View v) {
         switch (v.getId()) {
-            case R.id.register_account_btn:// 注册
-                startActivity(new Intent(mContext, RegisterActivity.class));
-                break;
-            case R.id.forget_password_btn:// 忘记密码
-//			 Intent intent = new Intent(mContext, FindPwdActivity.class);
-//			 intent.putExtra(FindPwdActivity.EXTRA_FROM_LOGIN, this.getClass().getName());
-//			 startActivity(intent);
-                break;
             case R.id.login_btn:// 登陆
                 login();
                 break;

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

@@ -1,36 +0,0 @@
-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/AddMeetingActivity.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/AddMeetingActivity.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.activity;
+package com.xzjmyk.pm.activity.ui.erp.activity.oa;
 
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;

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

@@ -0,0 +1,38 @@
+package com.xzjmyk.pm.activity.ui.erp.activity.oa;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.view.CustomerListView;
+
+public class MeetDetailsActivity extends BaseActivity implements View.OnClickListener {
+    private CustomerListView meet_listview;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_meet_details);
+        getSupportActionBar().setTitle("会议详情");
+
+        initView();
+    }
+
+    private void initView() {
+        meet_listview = (CustomerListView) findViewById(R.id.meet_listview);
+
+        findViewById(R.id.click_find).setOnClickListener(this);
+    }
+
+
+    @Override
+    public void onClick(View view) {
+        switch (view.getId()) {
+            case R.id.click_find:
+                startActivity(new Intent(MeetDetailsActivity.this,OARegisterActivity.class));
+                break;
+        }
+    }
+}

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

@@ -0,0 +1,116 @@
+package com.xzjmyk.pm.activity.ui.erp.activity.oa;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.BaseAdapter;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+
+public class MeetingActivity extends BaseActivity {
+    private MeetingActivity activity = this;
+    private ListView listView;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_meeting);
+        getSupportActionBar().setTitle("会议助手");
+        initView();
+    }
+
+    private void initView() {
+        listView = (ListView) findViewById(R.id.listview);
+        listView.setAdapter(new MesstingAdapter());
+        listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
+                startActivity(new Intent(MeetingActivity.this, MeetDetailsActivity.class));
+            }
+        });
+    }
+
+
+    @Override
+    public void onBackPressed() {
+        super.onBackPressed();
+        endActivity();
+    }
+
+    private void endActivity() {
+        finish();
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == R.id.add)
+            activity.startActivity(new Intent(activity, AddMeetingActivity.class));
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_oa_meeting, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+
+    class MesstingAdapter extends BaseAdapter {
+        @Override
+        public int getCount() {
+            return 10;
+        }
+
+        @Override
+        public Object getItem(int i) {
+            return null;
+        }
+
+        @Override
+        public long getItemId(int i) {
+            return i;
+        }
+
+        @Override
+        public View getView(int i, View view, ViewGroup viewGroup) {
+
+            ViewHolder viewholder = null;
+            if (view == null) {
+                view = LayoutInflater.from(MeetingActivity.this).inflate(R.layout.oa_meeting_item, null);
+                viewholder = new ViewHolder();
+                viewholder.oa_meeting_name_tv = (TextView) view.findViewById(R.id.oa_meeting_name_tv);
+                viewholder.oa_meeting_status_tv = (TextView) view.findViewById(R.id.oa_meeting_status_tv);
+                viewholder.oa_meeting_start = (TextView) view.findViewById(R.id.oa_meeting_start);
+                viewholder.oa_meeting_end = (TextView) view.findViewById(R.id.oa_meeting_end);
+                viewholder.oa_meeting_start_date = (TextView) view.findViewById(R.id.oa_meeting_start_date);
+                viewholder.oa_meeting_end_date = (TextView) view.findViewById(R.id.oa_meeting_end_date);
+                viewholder.oa_meeting_addr_tv = (TextView) view.findViewById(R.id.oa_meeting_addr_tv);
+                viewholder.oa_meeting_user_tv = (TextView) view.findViewById(R.id.oa_meeting_user_tv);
+                viewholder.oa_meeting_tag_tv = (TextView) view.findViewById(R.id.oa_meeting_tag_tv);
+                view.setTag(viewholder);
+            } else {
+                viewholder = (ViewHolder) view.getTag();
+            }
+
+
+            return view;
+        }
+
+        class ViewHolder {
+            TextView oa_meeting_name_tv, oa_meeting_status_tv, oa_meeting_start, oa_meeting_end, oa_meeting_start_date, oa_meeting_end_date,
+                    oa_meeting_addr_tv, oa_meeting_user_tv, oa_meeting_tag_tv;
+
+        }
+
+    }
+
+
+}

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

@@ -1,16 +1,27 @@
-package com.xzjmyk.pm.activity.ui.erp.activity;
+package com.xzjmyk.pm.activity.ui.erp.activity.oa;
 
+import android.annotation.TargetApi;
 import android.content.Intent;
+import android.os.Build;
 import android.os.Bundle;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.MenuItem;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
+import android.widget.BaseAdapter;
+import android.widget.PopupMenu;
+import android.widget.ScrollView;
 import android.widget.Spinner;
+import android.widget.TextView;
 
 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.ui.erp.activity.SaleSelectActivity;
 import com.xzjmyk.pm.activity.util.CalendarUtils;
 import com.xzjmyk.pm.activity.view.MyListView;
 
@@ -18,10 +29,12 @@ 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 String[] stateItems = {"状态", "确认中", "进行中", "已完成"};
+    private String[] typeItems = {"类型", "任务", "日程", "拜访"};
+    private String[] show_typeItems = {"展示方式", "日程", "列表"};
     private DatePicker picker;
+    private PopupMenu poAddMenu;
+    private ScrollView rootScrollView;
 
 
     @Override
@@ -33,11 +46,13 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
     }
 
     private void init() {
-        ;
+
     }
 
     private void initView() {
+
         findViewById(R.id.ll_signin).setOnClickListener(this);
+        findViewById(R.id.oa_img_add).setOnClickListener(this);
         findViewById(R.id.ll_outside).setOnClickListener(this);
         findViewById(R.id.ll_meeting).setOnClickListener(this);
         findViewById(R.id.ll_worklog).setOnClickListener(this);
@@ -53,9 +68,13 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
         type = (Spinner) findViewById(R.id.type);
         show_type = (Spinner) findViewById(R.id.show_type);
         picker = (DatePicker) findViewById(R.id.oa_picker);
+        listview = (MyListView) findViewById(R.id.oa_listview);
+        rootScrollView = (ScrollView) findViewById(R.id.oa_rootview);
         picker.setDate(CalendarUtils.getCurrentYear(), CalendarUtils.getCurrentMonth());
         picker.setMode(DPMode.SINGLE);
         bindAdapterForSpinner();
+        listview.setAdapter(new MyListViewAdapter());
+        rootScrollView.fullScroll(ScrollView.FOCUS_UP);
 
     }
 
@@ -106,6 +125,10 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
                 startActivity(new Intent(activity, SigninActivity.class));
                 break;
             case R.id.ll_outside:  //外勤签到
+                startActivity(new Intent(activity, OutofficeActivity.class));
+                break;
+            case R.id.oa_img_add:  //添加按钮
+                popAdd(view);
                 break;
             case R.id.ll_meeting://会议管理
                 startActivity(new Intent(activity, MeetingActivity.class));
@@ -154,4 +177,84 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
         }
     }
 
+    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
+    private void popAdd(View view) {
+        //点击添加按钮
+        if (poAddMenu == null) {
+            poAddMenu = new PopupMenu(this, view);
+            poAddMenu.getMenuInflater().inflate(R.menu.oa_pop_add, poAddMenu.getMenu());
+            poAddMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
+                @Override
+                public boolean onMenuItemClick(MenuItem menuItem) {
+                    switch (menuItem.getItemId()) {
+                        case R.id.add_task:
+                            Log.i("gongpengming", "点击了add_task");
+                            break;
+                        case R.id.add_date:
+                            Log.i("gongpengming", "add_date");
+                            break;
+                        case R.id.add_visit:
+                            Log.i("gongpengming", "add_visit");
+                            break;
+                        case R.id.add_visit_item:
+                            Log.i("gongpengming", "add_visit_item");
+                            break;
+                    }
+
+                    poAddMenu.dismiss();
+                    return false;
+                }
+            });
+        }
+        poAddMenu.show();
+    }
+
+
+    class MyListViewAdapter extends BaseAdapter {
+
+        @Override
+        public int getCount() {
+            return 10;
+        }
+
+        @Override
+        public Object getItem(int i) {
+            return null;
+        }
+
+        @Override
+        public long getItemId(int i) {
+            return i;
+        }
+
+        @Override
+        public View getView(int i, View view, ViewGroup viewGroup) {
+            Viewholder viewholder = null;
+            if (view == null) {
+                viewholder = new Viewholder();
+                view = LayoutInflater.from(activity).inflate(R.layout.oa_mylistview_item, null);
+                viewholder.item_name_tv = (TextView) view.findViewById(R.id.item_name_tv);
+                viewholder.item_addr_tv = (TextView) view.findViewById(R.id.item_addr_tv);
+                viewholder.item_object_tv = (TextView) view.findViewById(R.id.item_object_tv);
+                viewholder.item_doit_tv = (TextView) view.findViewById(R.id.item_doit_tv);
+                viewholder.item_status_tv = (TextView) view.findViewById(R.id.item_status_tv);
+                view.setTag(viewholder);
+            } else {
+                viewholder = (Viewholder) view.getTag();
+            }
+
+            bindItemData(viewholder);
+            return view;
+        }
+
+        private void bindItemData(Viewholder viewholder) {
+            //TODO 绑定数据
+
+        }
+
+
+        class Viewholder {
+            TextView item_name_tv, item_addr_tv, item_object_tv, item_doit_tv, item_status_tv;
+        }
+    }
 }

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

@@ -0,0 +1,60 @@
+package com.xzjmyk.pm.activity.ui.erp.activity.oa;
+
+import android.os.Bundle;
+import android.support.design.widget.TabLayout;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentPagerAdapter;
+import android.support.v4.view.ViewPager;
+
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.fragment.OaRegisterFragment;
+
+
+public class OARegisterActivity extends BaseActivity {
+
+    private TabLayout tabLayout;
+    private ViewPager viewPager;
+    private String[] title = {"已签到", "未签到"};
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_oaregister);
+
+        initView();
+
+    }
+
+    private void initView() {
+        tabLayout = (TabLayout) findViewById(R.id.tabLayout);
+        viewPager = (ViewPager) findViewById(R.id.view_pager);
+        tabLayout.setupWithViewPager(viewPager);
+        ViewPagerAdapter adapter = new ViewPagerAdapter(getSupportFragmentManager());
+        viewPager.setAdapter(adapter);
+    }
+
+
+    class ViewPagerAdapter extends FragmentPagerAdapter {
+
+        @Override
+        public CharSequence getPageTitle(int position) {
+            return title[position];
+        }
+
+        public ViewPagerAdapter(FragmentManager fm) {
+            super(fm);
+        }
+
+        @Override
+        public Fragment getItem(int position) {
+            return OaRegisterFragment.getInstance(title[position]);
+        }
+
+        @Override
+        public int getCount() {
+            return title.length;
+        }
+    }
+}

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

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.activity;
+package com.xzjmyk.pm.activity.ui.erp.activity.oa;
 
 import android.os.Bundle;
 import android.view.View;
@@ -12,21 +12,24 @@ public class OA_AlarmaActivity extends BaseActivity implements View.OnClickListe
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_oa__alarma);
-        findViewById(R.id.oa_back).setOnClickListener(this);
+        getSupportActionBar().setTitle("签到提醒");
     }
 
     @Override
     public void onClick(View view) {
         switch (view.getId()) {
-            case R.id.oa_back://点击闹钟事件
-                endOfActivity();
-                break;
+
         }
     }
 
+    @Override
+    public void onBackPressed() {
+        super.onBackPressed();
+        endOfActivity();
+    }
+
     private void endOfActivity() {
         //TODO 退出时候操作
-
         finish();
 
     }

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

@@ -0,0 +1,17 @@
+package com.xzjmyk.pm.activity.ui.erp.activity.oa;
+
+import android.os.Bundle;
+
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+
+public class OutofficeActivity extends BaseActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_outoffice);
+        getSupportActionBar().setTitle("外勤签到");
+
+    }
+}

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

@@ -1,9 +1,11 @@
-package com.xzjmyk.pm.activity.ui.erp.activity;
+package com.xzjmyk.pm.activity.ui.erp.activity.oa;
 
 import android.app.AlertDialog;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.Gravity;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
@@ -23,29 +25,26 @@ public class SigninActivity extends BaseActivity implements View.OnClickListener
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_signin);
+        long date = System.currentTimeMillis();
+        getSupportActionBar().setTitle(TimeUtils.day_long_2_str(date) + "   " + TimeUtils.getWeek(date));
         initView();
     }
 
     private void initView() {
-        findViewById(R.id.oa_alarma_img).setOnClickListener(this);
-        findViewById(R.id.oa_back).setOnClickListener(this);
-        findViewById(R.id.oa_rili_img).setOnClickListener(this);
         titleTime = (TextView) findViewById(R.id.oa_date_tv);
 
     }
 
+    @Override
+    public void onBackPressed() {
+        super.onBackPressed();
+        endOfActivity();
+    }
+
     @Override
     public void onClick(View view) {
         switch (view.getId()) {
-            case R.id.oa_alarma_img://点击闹钟事件
-                startActivity(new Intent(SigninActivity.this, OA_AlarmaActivity.class));
-                break;
-            case R.id.oa_back://
-                endOfActivity();
-                break;
-            case R.id.oa_rili_img://
-                showDateDalog();
-                break;
+
         }
     }
 
@@ -62,7 +61,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)) + "   " + TimeUtils.getWeek(date));
+                getSupportActionBar().setTitle(TimeUtils.day_long_2_str(TimeUtils.s_str_2_long(date)) + "   " + TimeUtils.getWeek(date));
                 dateDialog.dismiss();
             }
         });
@@ -77,4 +76,20 @@ public class SigninActivity extends BaseActivity implements View.OnClickListener
         finish();
 
     }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_oa_signin, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == R.id.oa_alarma) {
+            startActivity(new Intent(SigninActivity.this, OA_AlarmaActivity.class));
+        } else if (item.getItemId() == R.id.oa_rili) {
+            showDateDalog();
+        }
+        return super.onOptionsItemSelected(item);
+    }
 }

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

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.activity;
+package com.xzjmyk.pm.activity.ui.erp.activity.oa;
 
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;

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

@@ -0,0 +1,51 @@
+package com.xzjmyk.pm.activity.ui.erp.fragment;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.ListView;
+
+import com.xzjmyk.pm.activity.R;
+
+import java.util.ArrayList;
+
+/**
+ * Created by gongpm on 2016/7/1.
+ */
+public class OaRegisterFragment extends Fragment {
+
+    private ListView listView;
+    private ArrayList<String> str = new ArrayList<>();
+
+    private OaRegisterFragment(String title) {
+        for (int i = 0; i < 30; i++) {
+            str.add(title + i);
+        }
+    }
+
+    public static OaRegisterFragment getInstance(String title) {
+        return new OaRegisterFragment(title);
+    }
+    //TODO 以上为测试、待优
+
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragment_register_oa, container, false);
+        initView(view);
+        return view;
+    }
+
+    private void initView(View view) {
+        listView = (ListView) view.findViewById(R.id.listview);
+        ArrayAdapter<String> adapter = new ArrayAdapter<String>(getActivity(), android.R.layout.simple_list_item_1, str);
+        listView.setAdapter(adapter);
+    }
+
+
+}

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

@@ -17,8 +17,7 @@ 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.activity.oa.OAActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.util.PreferenceUtils;
@@ -95,8 +94,8 @@ public class WorksFragment extends XutilsFragment implements View.OnClickListene
                 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));
+//                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));

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/groupchat/GroupChatFragment.java

@@ -6,7 +6,6 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.os.Environment;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -20,14 +19,10 @@ import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
 
-import com.alibaba.fastjson.JSON;
 import com.android.volley.Response.ErrorListener;
 import com.android.volley.VolleyError;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
-import com.loopj.android.http.AsyncHttpClient;
-import com.loopj.android.http.AsyncHttpResponseHandler;
-import com.loopj.android.http.RequestParams;
 import com.xzjmyk.pm.activity.AppConfig;
 import com.xzjmyk.pm.activity.AppConstant;
 import com.xzjmyk.pm.activity.MyApplication;
@@ -49,10 +44,6 @@ import com.xzjmyk.pm.activity.volley.ArrayResult;
 import com.xzjmyk.pm.activity.volley.Result;
 import com.xzjmyk.pm.activity.volley.StringJsonArrayRequest;
 
-import org.apache.http.Header;
-
-import java.io.File;
-import java.io.FileNotFoundException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -138,50 +129,6 @@ public class GroupChatFragment extends EasyFragment {
 
 
 
-    private void uploadAvatar() {
-        File file = new File(Environment.getExternalStorageDirectory() + "/head1.jpg");
-        if (!file.exists()) {// 文件不存在
-            return;
-        }
-        // 显示正在上传的ProgressDialog
-        RequestParams params = new RequestParams();
-        params.put("userId", 200403010);
-        try {
-            params.put("file1", file);
-        } catch (FileNotFoundException e) {
-            e.printStackTrace();
-        }
-        AsyncHttpClient client = new AsyncHttpClient();
-        client.post(mConfig.AVATAR_UPLOAD_URL, params, new AsyncHttpResponseHandler() {
-            @Override
-            public void onSuccess(int arg0, Header[] arg1, byte[] arg2) {
-                boolean success = false;
-                Log.i("gongpengming", "上传成功");
-                if (arg0 == 200) {
-                    Result result = null;
-                    try {
-                        result = JSON.parseObject(new String(arg2), Result.class);
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                    if (result != null && result.getResultCode() == Result.CODE_SUCCESS) {
-                        success = true;
-                    }
-                }
-                if (success) {
-
-
-                } else {
-                }
-
-            }
-
-            @Override
-            public void onFailure(int arg0, Header[] arg1, byte[] arg2, Throwable arg3) {
-            }
-        });
-    }
-
     @SuppressLint("InflateParams")
     private void initView() {
         mPullToRefreshListView = (PullToRefreshListView) findViewById(R.id.pull_refresh_list);

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

@@ -110,6 +110,8 @@ public class SubscriptionActivity extends BaseActivity {
         listView = (PullToRefreshListView) findViewById(R.id.listview);
         listView.setMode(PullToRefreshBase.Mode.BOTH);
         View aa=LayoutInflater.from(this).inflate(R.layout.subscrip_emptyview,null);
+        getSupportActionBar().setCustomView(aa);
+
         listView.setEmptyView(aa);
         listView.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener2<ListView>() {
             @Override
@@ -123,7 +125,6 @@ public class SubscriptionActivity extends BaseActivity {
                 newlong = calendar.getTimeInMillis();
                 loadNetData(newlong);//获取当天的网络数据
             }
-
             @Override
             public void onPullUpToRefresh(PullToRefreshBase<ListView> refreshView) {
                 isRef = false;
@@ -191,7 +192,6 @@ public class SubscriptionActivity extends BaseActivity {
                     }
                 }
                 handler.sendEmptyMessage(RESULT_OK);
-
             }
         });
 

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

@@ -30,6 +30,37 @@ public class TimeUtils {
         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 String getWeek(long date) { //yyyy-MM-dd
+        Calendar c = Calendar.getInstance();
+        c.setTimeInMillis(date);
+        String src = "";
+
         int week = c.get(Calendar.DAY_OF_WEEK);
         switch (week) {
             case 1:

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

@@ -1,74 +1,50 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/login_bg"
-    android:orientation="vertical">
+    android:background="@drawable/login_bg">
 
-    <ImageView
-        android:id="@+id/img_h"
-        android:layout_width="match_parent"
-        android:layout_height="180dp"
-        android:src="@drawable/loginh" />
-
-    <com.xzjmyk.pm.activity.view.ClearEditText
-        android:id="@+id/phone_numer_edit"
-        style="@style/IMLineEditText"
-        android:layout_marginLeft="9dp"
-        android:layout_marginRight="9dp"
-        android:layout_marginTop="9dp"
-        android:background="@color/wirtehine"
-        android:drawableLeft="@drawable/login_user_name"
-        android:hint="@string/please_input_phone_number"
-        android:inputType="phone" />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp" />
-
-    <com.xzjmyk.pm.activity.view.ClearEditText
-        android:id="@+id/password_edit"
-        style="@style/IMLineEditPass"
-        android:layout_marginLeft="9dp"
-        android:layout_marginRight="9dp"
-        android:background="@color/wirtehine"
-        android:drawableLeft="@drawable/loginpw"
-        android:hint="@string/please_input_password" />
-
-    <Button
-        android:id="@+id/login_btn"
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:layout_marginLeft="40dp"
-        android:layout_marginRight="40dp"
-        android:layout_marginTop="10dp"
-        android:background="@drawable/bg_btn"
-        android:text="登  录"
-        android:textColor="@color/white" />
-
-    <RelativeLayout
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="10dp">
+        android:layout_alignParentBottom="true"
+        android:layout_marginBottom="70dp"
+        android:orientation="vertical">
+
+        <com.xzjmyk.pm.activity.view.ClearEditText
+            android:id="@+id/phone_numer_edit"
+            style="@style/IMLineEditText"
+            android:layout_marginLeft="9dp"
+            android:layout_marginRight="9dp"
+            android:layout_marginTop="9dp"
+            android:background="@color/wirtehine"
+            android:drawableLeft="@drawable/login_user_name"
+            android:hint="@string/please_input_phone_number"
+            android:inputType="phone" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp" />
+
+        <com.xzjmyk.pm.activity.view.ClearEditText
+            android:id="@+id/password_edit"
+            style="@style/IMLineEditPass"
+            android:layout_marginLeft="9dp"
+            android:layout_marginRight="9dp"
+            android:background="@color/wirtehine"
+            android:drawableLeft="@drawable/loginpw"
+            android:hint="@string/please_input_password" />
 
         <Button
-            android:id="@+id/register_account_btn"
-            style="@style/IMHyperText"
-            android:layout_alignParentLeft="true"
-            android:paddingBottom="9dp"
-            android:paddingLeft="9dp"
-            android:paddingRight="9dp"
-            android:text="@string/register_account"
-            android:visibility="gone" />
-
-        <Button
-            android:id="@+id/forget_password_btn"
-            style="@style/IMHyperText"
-            android:layout_alignParentRight="true"
-            android:paddingBottom="9dp"
-            android:paddingLeft="9dp"
-            android:paddingRight="9dp"
-            android:text="@string/forget_password"
-            android:visibility="gone" />
-    </RelativeLayout>
-
-</LinearLayout>
+            android:id="@+id/login_btn"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:layout_marginLeft="40dp"
+            android:layout_marginRight="40dp"
+            android:layout_marginTop="10dp"
+            android:background="@drawable/bg_btn"
+            android:text="登  录"
+            android:textColor="@color/white" />
+    </LinearLayout>
+
+
+</RelativeLayout>

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

@@ -0,0 +1,318 @@
+<?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.oa.MeetDetailsActivity">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <LinearLayout
+            android:id="@+id/top"
+            android:layout_width="match_parent"
+            android:layout_height="70dp"
+            android:background="@color/item_color1"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <LinearLayout
+                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="会议纪要" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_centerHorizontal="true"
+                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="打卡签到" />
+            </LinearLayout>
+        </LinearLayout>
+
+        <RelativeLayout
+            android:id="@+id/basic"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/top">
+
+            <TextView
+                android:id="@+id/basic_tv"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/item_color1"
+                android:padding="10dp"
+                android:text="基本信息" />
+
+            <TextView
+                android:id="@+id/status_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/basic_tv"
+                android:layout_marginTop="10dp"
+                android:text="会议未开始"
+                android:textColor="@color/hintColor" />
+
+            <TextView
+                android:id="@+id/name_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/status_tv"
+                android:layout_marginTop="10dp"
+                android:text="crm、OA导论"
+                android:textColor="@color/text_main" />
+
+            <TextView
+                android:id="@+id/oa_meeting_start"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/name_tv"
+                android:layout_marginTop="20dp"
+                android:text="06月13日"
+                android:textSize="@dimen/text_hine" />
+
+            <TextView
+                android:id="@+id/oa_meeting_start_date"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/oa_meeting_start"
+                android:layout_marginTop="5dp"
+                android:text="16:00"
+                android:textColor="@color/powderblue"
+                android:textSize="30sp" />
+
+            <TextView
+                android:id="@+id/oa_meeting_line"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignTop="@+id/oa_meeting_start_date"
+                android:layout_marginLeft="5dp"
+                android:layout_marginRight="5dp"
+                android:layout_toRightOf="@+id/oa_meeting_start_date"
+                android:text="—"
+                android:textSize="30sp" />
+
+            <TextView
+                android:id="@+id/oa_meeting_end_date"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignTop="@+id/oa_meeting_start_date"
+                android:layout_toRightOf="@+id/oa_meeting_line"
+                android:text="18:00"
+                android:textColor="@color/powderblue"
+                android:textSize="30sp" />
+
+            <TextView
+                android:id="@+id/oa_meeting_end"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_above="@id/oa_meeting_end_date"
+                android:layout_alignLeft="@+id/oa_meeting_end_date"
+                android:layout_marginBottom="5dp"
+                android:text="06月13日"
+                android:textSize="@dimen/text_hine" />
+
+            <TextView
+                android:id="@+id/addr"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/oa_meeting_start_date"
+                android:layout_marginTop="10dp"
+                android:text="会议地点"
+                android:textColor="@color/hintColor" />
+
+            <TextView
+                android:id="@+id/addr_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/addr"
+                android:layout_marginTop="5dp"
+                android:text="三楼会议室"
+                android:textColor="@color/text_hine" />
+
+            <TextView
+                android:id="@+id/sub"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/addr_tv"
+                android:layout_marginTop="10dp"
+                android:text="会议介绍"
+                android:textColor="@color/hintColor" />
+
+            <TextView
+                android:id="@+id/sub_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/sub"
+                android:layout_marginTop="5dp"
+                android:text="产品部、技术部门一起讨论crm、oa的研发"
+                android:textColor="@color/text_hine" />
+
+
+            <TextView
+                android:id="@+id/user"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/sub_tv"
+                android:layout_marginTop="10dp"
+                android:text="发起人"
+                android:textColor="@color/hintColor" />
+
+            <TextView
+                android:id="@+id/user_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/user"
+                android:layout_marginTop="5dp"
+                android:text="张建国"
+                android:textColor="@color/text_hine" />
+
+            <TextView
+                android:id="@+id/tag"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/user_tv"
+                android:layout_marginTop="10dp"
+                android:text="会议标签"
+                android:textColor="@color/hintColor" />
+
+            <TextView
+                android:id="@+id/tag_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/tag"
+                android:layout_marginTop="5dp"
+                android:text="培训会议"
+                android:textColor="@color/text_hine" />
+
+            <Button
+                android:id="@+id/click_btn"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/tag_tv"
+                android:layout_margin="10dp"
+                android:background="@drawable/bg_btn"
+                android:padding="10dp"
+                android:text="立即签到"
+                android:textColor="@color/white"
+                android:textSize="@dimen/text_main" />
+
+            <LinearLayout
+                android:id="@+id/baidu_ll"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/click_btn"
+                android:layout_centerHorizontal="true"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="广东深圳南山区英唐大厦" />
+
+                <View
+                    android:layout_width="6dp"
+                    android:layout_height="1dp" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/agare"
+                    android:textColor="@color/blue" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/click_ll"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/baidu_ll"
+                android:layout_centerHorizontal="true"
+                android:layout_marginTop="10dp"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/num"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="当前签到人数 0/52" />
+
+                <View
+                    android:layout_width="6dp"
+                    android:layout_height="1dp" />
+
+                <TextView
+                    android:id="@+id/click_find"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/click_finds"
+                    android:textColor="@color/blue" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/meet_about"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/click_ll"
+                android:layout_marginTop="13dp"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@color/item_color1"
+                    android:padding="10dp"
+                    android:text="会议议程"
+                    android:textColor="@color/text_hine" />
+
+                <com.xzjmyk.pm.activity.ui.erp.view.CustomerListView
+                    android:id="@+id/meet_listview"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1px"
+                android:layout_below="@+id/meet_about"
+                android:background="@color/item_line" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/meet_about"
+                android:clickable="true"
+                android:gravity="center"
+                android:padding="20dp"
+                android:text="结束会议" />
+        </RelativeLayout>
+    </RelativeLayout>
+
+</ScrollView>

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

@@ -3,45 +3,11 @@
     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">
+    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.oa.MeetingActivity">
 
-    <RelativeLayout
-        android:id="@+id/top"
+    <ListView
+        android:id="@+id/listview"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="@color/text_black">
+        android:layout_height="match_parent" />
 
-        <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

@@ -2,6 +2,7 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
+    android:id="@+id/oa_rootview"
     android:layout_height="match_parent"
     tools:context="com.xzjmyk.pm.activity.ui.erp.activity.ClientActivity">
 
@@ -16,9 +17,9 @@
             android:layout_height="wrap_content"
             android:background="@color/text_black"
             android:gravity="center_horizontal"
-            android:text="OA"
+            android:text="O A"
             android:textColor="@color/white"
-            android:textSize="30dp" />
+            android:textSize="35dp" />
 
 
         <LinearLayout
@@ -410,8 +411,8 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="2"
                 android:gravity="center"
-                android:text="aaa"
-                android:textSize="16sp" />
+                android:text="我的任务日程：20"
+                android:textSize="12sp" />
 
             <View
                 android:layout_width="1px"
@@ -423,8 +424,8 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="aaa"
-                android:textSize="16sp" />
+                android:text="已完成：2"
+                android:textSize="12sp"/>
 
             <View
                 android:layout_width="1px"
@@ -436,8 +437,8 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="aaa"
-                android:textSize="16sp" />
+                android:text="未完成：2"
+                android:textSize="12sp" />
 
             <View
                 android:layout_width="1px"
@@ -449,9 +450,8 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="aaa"
-
-                android:textSize="16sp" />
+                android:text="达成率：10%"
+                android:textSize="12sp"/>
         </LinearLayout>
 
         <View

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

@@ -4,38 +4,9 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.OA_AlarmaActivity">
+    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.oa.OA_AlarmaActivity">
 
-    <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_date_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" />
-
-
-    </RelativeLayout>
 
 
     <RelativeLayout

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

@@ -0,0 +1,23 @@
+<?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"
+    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.oa.OARegisterActivity">
+
+    <android.support.design.widget.TabLayout
+        android:id="@+id/tabLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:tabGravity="fill"
+        app:tabMode="fixed"
+        app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
+
+    <android.support.v4.view.ViewPager
+        android:id="@+id/viewPager"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+
+</RelativeLayout>

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

@@ -0,0 +1,147 @@
+<?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:padding="20dp"
+    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.oa.OutofficeActivity">
+
+    <TextView
+        android:id="@+id/oa_out_name_tv"
+        android:layout_width="80dp"
+        android:layout_height="80dp"
+
+        android:background="@drawable/text_button_stye2"
+        android:gravity="center"
+        android:padding="10dp"
+        android:text="晨阳"
+        android:textSize="25dp" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@+id/oa_out_name_tv"
+        android:layout_marginTop="10dp"
+        android:layout_toRightOf="@+id/oa_out_name_tv"
+        android:text="熊晨阳"
+        android:textSize="20dp" />
+
+    <TextView
+        android:id="@+id/tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBottom="@+id/oa_out_name_tv"
+        android:layout_marginBottom="10dp"
+        android:layout_toRightOf="@+id/oa_out_name_tv"
+        android:text="你今天完成签到"
+        android:textSize="20dp" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBottom="@+id/oa_out_name_tv"
+        android:layout_marginBottom="10dp"
+        android:layout_marginLeft="2dp"
+        android:layout_toRightOf="@+id/tv"
+        android:text="0 次"
+        android:textSize="20dp" />
+
+    <View
+        android:id="@+id/line1"
+        android:layout_width="match_parent"
+        android:layout_height="2px"
+        android:layout_below="@+id/oa_out_name_tv"
+        android:layout_marginBottom="10dp"
+        android:layout_marginTop="10dp"
+        android:background="@color/item_line" />
+
+    <TextView
+        android:id="@+id/out_date_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/line1"
+        android:layout_marginTop="10dp"
+        android:drawableLeft="@drawable/alarm"
+        android:text="星期一：2016.06.13"
+        android:textSize="@dimen/text_hine" />
+
+    <TextView
+        android:id="@+id/out_time_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_alignTop="@+id/out_date_tv"
+        android:drawableLeft="@drawable/alarm"
+        android:text="当前时间：20:24"
+        android:textSize="@dimen/text_hine" />
+
+    <View
+        android:id="@+id/line2"
+        android:layout_width="match_parent"
+        android:layout_height="2px"
+        android:layout_below="@+id/out_date_tv"
+        android:layout_marginBottom="10dp"
+        android:layout_marginTop="10dp"
+        android:background="@color/item_line" />
+
+    <ImageView
+        android:id="@+id/out_addr_img"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/line2"
+        android:src="@drawable/img_head_card" />
+
+    <TextView
+        android:id="@+id/out_add_name_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@+id/out_addr_img"
+        android:layout_marginLeft="10dp"
+        android:layout_toRightOf="@+id/out_addr_img"
+        android:text="英唐大厦"
+        android:textColor="@color/text_main"
+        android:textSize="@dimen/text_main" />
+
+    <TextView
+        android:id="@+id/out_add_t_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/out_add_name_tv"
+        android:layout_marginLeft="10dp"
+        android:layout_marginTop="5dp"
+        android:layout_toRightOf="@+id/out_addr_img"
+        android:maxLines="2"
+        android:text="广东深圳南山区高新技术产业园。。。。"
+        android:textColor="@color/text_hine"
+        android:textSize="@dimen/text_hine" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/out_add_t_tv"
+        android:layout_marginLeft="10dp"
+        android:layout_marginTop="5dp"
+        android:layout_toRightOf="@+id/out_addr_img"
+        android:maxLines="1"
+        android:text="地点微调"
+        android:textColor="@color/green"
+        android:textSize="@dimen/text_hine" />
+
+    <View
+        android:id="@+id/line3"
+        android:layout_width="match_parent"
+        android:layout_height="2px"
+        android:layout_below="@+id/out_addr_img"
+        android:layout_marginBottom="10dp"
+        android:layout_marginTop="10dp"
+        android:background="@color/item_line" />
+
+    <TextView
+        android:layout_width="100dp"
+        android:layout_height="100dp"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:background="@drawable/text_button_stye4"
+        android:gravity="center"
+        android:text="签到" />
+</RelativeLayout>

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

@@ -3,56 +3,8 @@
     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.SigninActivity">
+    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.oa.SigninActivity">
 
-    <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_date_tv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:clickable="true"
-            android:text="2016年6月13号 星期一"
-            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="5dp"
-            android:clickable="true"
-            android:src="@drawable/oa_rili" />
-
-        <ImageView
-            android:id="@+id/oa_alarma_img"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginRight="5dp"
-            android:layout_toLeftOf="@+id/oa_rili_img"
-            android:clickable="true"
-            android:src="@drawable/alarm" />
-    </RelativeLayout>
 
     <ScrollView
         android:id="@+id/oa_sll"

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

@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
+
     android:layout_height="match_parent">
 
-    <FrameLayout
-        android:id="@+id/welcome_ly"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+
 
         <ImageView
             android:id="@+id/welcome_iv"
@@ -14,8 +12,7 @@
             android:layout_height="match_parent"
             android:contentDescription="@string/app_name"
             android:scaleType="centerCrop"
-            android:src="@drawable/index_u" />
-    </FrameLayout>
+            android:src="@drawable/index" />
 
     <RelativeLayout
         android:id="@+id/select_lv"

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

@@ -3,7 +3,7 @@
     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.StatisticsActivity">
+    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.oa.StatisticsActivity">
 
     <RelativeLayout
         android:id="@+id/top"

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

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <ListView
+        android:id="@+id/listview"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</LinearLayout>

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

@@ -0,0 +1,125 @@
+<?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_margin="10dp">
+
+    <TextView
+        android:id="@+id/oa_meeting_name_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="OA,CRM 导论"
+        android:textColor="@color/text_main"
+        android:textSize="@dimen/text_main" />
+
+    <TextView
+        android:id="@+id/oa_meeting_status_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:text="未开始"
+        android:textColor="@color/hintColor"
+        android:textSize="@dimen/text_hine" />
+
+    <TextView
+        android:id="@+id/oa_meeting_start"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/oa_meeting_name_tv"
+        android:layout_marginTop="20dp"
+        android:text="06月13日"
+        android:textSize="@dimen/text_hine" />
+
+    <TextView
+        android:id="@+id/oa_meeting_start_date"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/oa_meeting_start"
+        android:layout_marginTop="5dp"
+        android:text="16:00"
+        android:textSize="30sp" />
+
+    <TextView
+        android:id="@+id/oa_meeting_line"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@+id/oa_meeting_start_date"
+        android:layout_marginLeft="5dp"
+        android:layout_marginRight="5dp"
+        android:layout_toRightOf="@+id/oa_meeting_start_date"
+        android:text="—"
+        android:textSize="30sp" />
+
+    <TextView
+        android:id="@+id/oa_meeting_end_date"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@+id/oa_meeting_start_date"
+        android:layout_toRightOf="@+id/oa_meeting_line"
+        android:text="18:00"
+        android:textSize="30sp" />
+
+    <TextView
+        android:id="@+id/oa_meeting_end"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_above="@id/oa_meeting_end_date"
+        android:layout_alignLeft="@+id/oa_meeting_end_date"
+        android:layout_marginBottom="5dp"
+        android:text="06月13日"
+        android:textSize="@dimen/text_hine" />
+
+    <TextView
+        android:id="@+id/oa_meeting_addr"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/oa_meeting_start_date"
+        android:layout_marginTop="10dp"
+        android:text="会议地点"
+        android:textColor="@color/hintColor" />
+
+    <TextView
+        android:id="@+id/oa_meeting_addr_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@+id/oa_meeting_addr"
+        android:layout_marginLeft="10dp"
+        android:layout_toRightOf="@+id/oa_meeting_addr"
+        android:text="三楼会议室" />
+
+    <TextView
+        android:id="@+id/oa_meeting_user"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/oa_meeting_addr"
+        android:layout_marginTop="10dp"
+        android:text="发  起  人"
+        android:textColor="@color/hintColor" />
+
+    <TextView
+        android:id="@+id/oa_meeting_user_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@+id/oa_meeting_user"
+        android:layout_marginLeft="10dp"
+        android:layout_toRightOf="@+id/oa_meeting_user"
+        android:text="张建国" />
+
+    <TextView
+        android:id="@+id/oa_meeting_tag"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/oa_meeting_user"
+        android:layout_marginTop="10dp"
+        android:text="会议标签"
+        android:textColor="@color/hintColor" />
+
+    <TextView
+        android:id="@+id/oa_meeting_tag_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@+id/oa_meeting_tag"
+        android:layout_marginLeft="10dp"
+        android:layout_toRightOf="@+id/oa_meeting_tag"
+        android:text="培训会议" />
+</RelativeLayout>

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

@@ -0,0 +1,59 @@
+<?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:padding="10dp">
+
+    <TextView
+        android:id="@+id/item_name_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="万宁超市（星游城）"
+        android:textColor="@color/text_main"
+        android:textSize="@dimen/text_main" />
+
+    <TextView
+        android:id="@+id/item_status_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_alignTop="@id/item_name_tv"
+        android:layout_marginTop="5dp"
+        android:text="待拜访"
+        android:textColor="@color/text_hine"
+        android:textSize="@dimen/text_hine" />
+
+    <TextView
+        android:id="@+id/item_addr_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/item_name_tv"
+        android:layout_marginTop="3dp"
+        android:clickable="true"
+        android:drawableLeft="@drawable/oa_signin"
+        android:text="深圳宝安中心，宝安路，268号宿舍"
+        android:textColor="@color/text_hine"
+        android:textSize="@dimen/text_hine" />
+
+    <TextView
+        android:id="@+id/item_object_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/item_addr_tv"
+        android:layout_marginTop="5dp"
+        android:text="销售部》顺降龙"
+        android:textColor="@color/text_hine"
+        android:textSize="@dimen/text_hine" />
+
+    <TextView
+        android:id="@+id/item_doit_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_below="@+id/item_status_tv"
+        android:layout_marginTop="10dp"
+        android:background="@drawable/oa_signin_tv_bg"
+        android:paddingLeft="10dp"
+        android:paddingRight="10dp"
+        android:text="去拜访" />
+</RelativeLayout>

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

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/add"
+        android:icon="@drawable/oa_add_meet"
+        android:showAsAction="always"
+        android:title="添加"
+        android:visible="true" />
+</menu>

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

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    >
+    <item
+        android:id="@+id/oa_alarma"
+        android:icon="@drawable/alarm"
+        android:showAsAction="ifRoom"
+        android:title="提醒" />
+    <item
+        android:id="@+id/oa_rili"
+        android:icon="@drawable/oa_rili"
+        android:showAsAction="ifRoom"
+        android:title="日历" />
+</menu>

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

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+    <item
+        android:id="@+id/add_task"
+        android:showAsAction="always"
+        android:title="创建任务"
+        tools:ignore="AppCompatResource" />
+    <item
+        android:id="@+id/add_date"
+        android:showAsAction="always"
+        android:title="新增日程"
+        tools:ignore="AppCompatResource" />
+    <item
+        android:id="@+id/add_visit"
+        android:showAsAction="always"
+        android:title="新增拜访计划"
+        tools:ignore="AppCompatResource" />
+    <item
+        android:id="@+id/add_visit_item"
+        android:showAsAction="always"
+        android:title="新增拜访报告"
+        tools:ignore="AppCompatResource" />
+</menu>

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

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="delete_item">确定要删除吗</string>
-
+    <string name="agare"><d>重新定位</d></string>
+    <string name="click_finds"><d>点击查看</d></string>
     <!--listView 中对于 contentView的settag方法参数定义 -->
     <item name="position" type="id"></item>