16/7/05 am

WeiChat/src/main/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.xzjmyk.pm.activity"
     android:versionCode="44"
-    android:versionName="4.4">
+    android:versionName="4.4" >
 
     <uses-sdk
         android:minSdkVersion="11"
@@ -69,7 +69,7 @@
         android:allowBackup="true"
         android:icon="@drawable/uuu"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme" >
         <meta-data
             android:name="UMENG_APPKEY"
             android:value="574504a167e58eec520017df" />
@@ -80,7 +80,7 @@
         <!-- 启动页面 -->
         <activity
             android:name=".ui.SplashActivity"
-            android:theme="@style/SplashTheme">
+            android:theme="@style/SplashTheme" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -240,7 +240,7 @@
             android:exported="true"
             android:icon="@drawable/ic_chooser"
             android:label="@string/choose_file"
-            android:theme="@style/ChooserTheme">
+            android:theme="@style/ChooserTheme" >
             <intent-filter>
                 <action android:name="android.intent.action.GET_CONTENT" />
 
@@ -257,13 +257,13 @@
             android:enabled="@bool/use_provider"
             android:exported="true"
             android:grantUriPermissions="true"
-            android:permission="android.permission.MANAGE_DOCUMENTS">
+            android:permission="android.permission.MANAGE_DOCUMENTS" >
             <intent-filter>
                 <action android:name="android.content.action.DOCUMENTS_PROVIDER" />
             </intent-filter>
         </provider>
 
-        <receiver android:name=".broadcast.ScrenLockedBroadCastReceiver">
+        <receiver android:name=".broadcast.ScrenLockedBroadCastReceiver" >
             <intent-filter>
                 <action android:name="android.intent.action.SCREEN_OFF" />
                 <action android:name="android.intent.action.SCREEN_ON" />
@@ -290,7 +290,7 @@
         <!-- 用于接收系统消息以保证PushService正常运行 -->
         <receiver
             android:name="com.baidu.android.pushservice.PushServiceReceiver"
-            android:process=":bdservice_v1">
+            android:process=":bdservice_v1" >
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
@@ -306,7 +306,7 @@
         <!-- Push服务接收客户端发送的各种请求 -->
         <receiver
             android:name="com.baidu.android.pushservice.RegistrationReceiver"
-            android:process=":bdservice_v1">
+            android:process=":bdservice_v1" >
             <intent-filter>
                 <action android:name="com.baidu.android.pushservice.action.METHOD" />
                 <action android:name="com.baidu.android.pushservice.action.BIND_SYNC" />
@@ -325,7 +325,7 @@
             android:name="com.baidu.android.pushservice.PushService"
             android:exported="true"
             android:persistent="true"
-            android:process=":bdservice_v1">
+            android:process=":bdservice_v1" >
             <intent-filter>
                 <action android:name="com.baidu.android.pushservice.action.PUSH_SERVICE" />
             </intent-filter>
@@ -339,7 +339,7 @@
 
 
         <!-- 此处Receiver名字修改为当前包名路径 -->
-        <receiver android:name=".ui.PushNetMessageReceiver">
+        <receiver android:name=".ui.PushNetMessageReceiver" >
             <intent-filter>
 
                 <!-- 接收push消息 -->
@@ -360,7 +360,7 @@
             </intent-filter>
         </activity>
         -->
-        <activity android:name=".ui.message.SelectCardActivity">
+        <activity android:name=".ui.message.SelectCardActivity" >
             <intent-filter>
                 <action android:name="com.xzjmyk.pm.activity.ui.message.SelectCardActivity" />
             </intent-filter>
@@ -384,7 +384,7 @@
 
         <receiver
             android:name="com.baidu.autoupdatesdk.receiver.BDBroadcastReceiver"
-            android:exported="false">
+            android:exported="false" >
             <intent-filter>
                 <action android:name="com.baidu.autoupdatesdk.ACTION_NEW_UPDATE" />
                 <action android:name="com.baidu.autoupdatesdk.ACTION_DOWNLOAD_COMPLETE" />
@@ -403,9 +403,7 @@
         <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.oa.AddMeetingActivity"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
+        <activity android:name=".ui.erp.activity.oa.AddMeetingActivity" />
         <activity
             android:name=".ui.erp.activity.oa.OAActivity"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
@@ -429,19 +427,23 @@
         <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>
-        <activity android:name=".ui.erp.activity.crm.CustomerMutilSelectActivity"></activity>
+        <activity android:name=".ui.erp.activity.crm.CustomerAddActivity" />
+        <activity android:name=".ui.erp.activity.crm.CustomerDetailActivity" />
+        <activity android:name=".ui.erp.activity.crm.CustomerListActivity" />
+        <activity android:name=".ui.erp.activity.crm.CustomerMutilSelectActivity" />
         <activity
             android:name=".ui.erp.activity.crm.SalesRankingActivity"
             android:label="@string/title_activity_sales_ranking"
-            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>
-        <activity android:name=".ui.erp.activity.crm.BusinessAddActivity"></activity>
-        <activity android:name=".ui.erp.activity.crm.CustomerListSelectActivity"></activity>
+            android:theme="@style/AppTheme.NoActionBar" />
+        <activity android:name=".ui.erp.activity.crm.VisitReportAddActivity" />
+        <activity android:name=".ui.erp.activity.crm.VisitReportPlanActivity" />
+        <activity android:name=".ui.erp.activity.crm.AddressSelectActivity" />
+        <activity android:name=".ui.erp.activity.crm.BusinessAddActivity" />
+        <activity android:name=".ui.erp.activity.crm.CustomerListSelectActivity" />
+        <activity android:name=".ui.erp.activity.oa.AddMeetMainActivity" >
+        </activity>
+        <activity android:name=".ui.erp.activity.oa.WorkLogsActivity" >
+        </activity>
     </application>
 
 </manifest>

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

@@ -0,0 +1,136 @@
+package com.xzjmyk.pm.activity.ui.erp.activity.oa;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.ListView;
+import android.widget.RelativeLayout;
+
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.entity.OAAgendaEntity;
+
+import java.util.ArrayList;
+
+public class AddMeetMainActivity extends BaseActivity implements View.OnClickListener {
+    private ArrayList<OAAgendaEntity> entities;
+    private AddMeetMainActivity ct;
+    private ListView listView;
+    private AgendaAdapter adapter;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_add_meet_main);
+        ct = this;
+        init();
+        initView();
+    }
+
+    private void initView() {
+        adapter = new AgendaAdapter();
+        listView = (ListView) findViewById(R.id.listview);
+        listView.setAdapter(adapter);
+    }
+
+    private void init() {
+        entities = new ArrayList();
+
+    }
+
+    private void setListViewPos(int pos) {
+        if (android.os.Build.VERSION.SDK_INT >= 8) {
+            listView.smoothScrollToPosition(pos);
+        } else {
+            listView.setSelection(pos);
+        }
+    }
+
+    @Override
+    public void onClick(View view) {
+        switch (view.getId()) {
+
+        }
+    }
+
+
+    class AgendaAdapter extends BaseAdapter {
+        @Override
+        public int getCount() {
+            return entities.size() + 1;
+        }
+
+        @Override
+        public Object getItem(int i) {
+            return entities.size() == 0 ? i : entities.get(i);
+        }
+
+        @Override
+        public long getItemId(int i) {
+            return i;
+        }
+
+        @Override
+        public View getView(int i, View view, ViewGroup viewGroup) {
+            AgendaViewHolder holder = null;
+            if (view == null) {
+                holder = new AgendaViewHolder();
+                view = LayoutInflater.from(ct).inflate(R.layout.item_add_meet_main, null);
+                holder.end_et = (EditText) view.findViewById(R.id.end_et);
+                holder.main_et = (EditText) view.findViewById(R.id.main_et);
+                holder.start_et = (EditText) view.findViewById(R.id.start_et);
+                holder.remove_img = (ImageView) view.findViewById(R.id.remove_img);
+                holder.rl = (RelativeLayout) view.findViewById(R.id.rl);
+                holder.ll = (LinearLayout) view.findViewById(R.id.ll);
+                view.setTag(holder);
+
+            } else {
+                holder = (AgendaViewHolder) view.getTag();
+            }
+            if (i == entities.size()) {
+                holder.rl.setVisibility(View.VISIBLE);
+                holder.ll.setVisibility(View.GONE);
+                holder.rl.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        entities.add(new OAAgendaEntity());
+                        adapter.notifyDataSetChanged();
+                        setListViewPos(entities.size());
+                    }
+                });
+
+            } else {
+                holder.rl.setVisibility(View.GONE);
+                holder.ll.setVisibility(View.VISIBLE);
+                addlistener(holder, i);
+            }
+            return view;
+        }
+
+        private void addlistener(AgendaViewHolder holder, final int i) {
+            if (holder == null) return;
+            holder.remove_img.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    if (entities.size() > i) {
+                        entities.remove(i);
+                        notifyDataSetChanged();
+                        setListViewPos(entities.size());
+                    }
+                }
+            });
+        }
+
+        class AgendaViewHolder {
+            EditText main_et, start_et, end_et;
+            ImageView remove_img;
+            LinearLayout ll;
+            RelativeLayout rl;
+        }
+    }
+}

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

@@ -1,15 +1,35 @@
 package com.xzjmyk.pm.activity.ui.erp.activity.oa;
 
+import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import android.view.View;
 
 import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 
-public class AddMeetingActivity extends AppCompatActivity {
+public class AddMeetingActivity extends BaseActivity implements View.OnClickListener {
+
+    private AddMeetingActivity ct;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_add_meeting);
+        ct = this;
+        initView();
+    }
+
+    private void initView() {
+        findViewById(R.id.meet_main_rl).setOnClickListener(this);
+    }
+
+
+    @Override
+    public void onClick(View view) {
+        switch (view.getId()) {
+            case R.id.meet_main_rl:
+                startActivity(new Intent(ct, AddMeetMainActivity.class));
+                break;
+        }
     }
 }

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

@@ -74,7 +74,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
         picker.setMode(DPMode.SINGLE);
         bindAdapterForSpinner();
         listview.setAdapter(new MyListViewAdapter());
-        rootScrollView.fullScroll(ScrollView.FOCUS_UP);
+//        rootScrollView.fullScroll(ScrollView.FOCUS_UP);
 
     }
 
@@ -134,7 +134,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
                 startActivity(new Intent(activity, MeetingActivity.class));
                 break;
             case R.id.ll_worklog://工作日志
-
+                startActivity(new Intent(activity, WorkLogsActivity.class));
                 break;
             case R.id.ll_subject://审批
                 //TODO 审批先不做

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

@@ -13,7 +13,6 @@ import com.xzjmyk.pm.activity.ui.erp.fragment.OaRegisterFragment;
 
 
 public class OARegisterActivity extends BaseActivity {
-
     private TabLayout tabLayout;
     private ViewPager viewPager;
     private String[] title = {"已签到", "未签到"};
@@ -22,22 +21,18 @@ public class OARegisterActivity extends BaseActivity {
     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);
+        viewPager = (ViewPager) findViewById(R.id.viewPager);
         ViewPagerAdapter adapter = new ViewPagerAdapter(getSupportFragmentManager());
         viewPager.setAdapter(adapter);
+        tabLayout.setupWithViewPager(viewPager);
+        tabLayout.setTabsFromPagerAdapter(adapter);//给Tabs设置适配器
     }
-
-
     class ViewPagerAdapter extends FragmentPagerAdapter {
-
         @Override
         public CharSequence getPageTitle(int position) {
             return title[position];

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

@@ -0,0 +1,44 @@
+package com.xzjmyk.pm.activity.ui.erp.activity.oa;
+
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+
+public class WorkLogsActivity extends BaseActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_work_logs);
+
+        init();
+        initView();
+    }
+
+    private void initView() {
+
+    }
+
+    private void init() {
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_oa_logs, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.sreach:
+                break;
+            case R.id.add:
+                break;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+}

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

@@ -0,0 +1,14 @@
+package com.xzjmyk.pm.activity.ui.erp.entity;
+
+/**
+ * 会议议程实体
+ * Created by gongpm on 2016/7/4.
+ */
+public class OAAgendaEntity {
+    private int id;
+    private String issue;//议题
+    private String startTime;
+    private String endTime;
+    private String additional;   //附加内容的uri（包含网络及本地）
+
+}

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

@@ -1,7 +1,6 @@
 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;
@@ -17,35 +16,34 @@ 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);
+    public synchronized static OaRegisterFragment getInstance(String title) {
+        OaRegisterFragment fragment = new OaRegisterFragment();
+        Bundle bundle = new Bundle();
+        bundle.putString("KEY", title);
+        fragment.setArguments(bundle);
+        return fragment;
     }
-    //TODO 以上为测试、待优
 
 
-    @Nullable
+    //TODO 以上为测试、待优
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fragment_register_oa, container, false);
+        Bundle bundle = getArguments();
+        String title = bundle.getString("KEY");
+        for (int i = 0; i < 30; i++)
+            str.add(title + i);
         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);
+        ArrayAdapter<String> adapter = new ArrayAdapter<>(getActivity(), android.R.layout.simple_list_item_1, str);
         listView.setAdapter(adapter);
     }
-
-
 }

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

@@ -514,11 +514,20 @@ public class MessageFragment extends EasyFragment {
             if (convertView == null) {
                 convertView = createConvertView(position);
             }
-            if (position % 2 == 0) {
-                convertView.setBackgroundColor(mActivity.getResources().getColor(R.color.item_color2));
+            if (rl_b2b != null && rl_b2b.getVisibility() == View.VISIBLE) {//商务显示
+                if (position % 2 == 0) {
+                    convertView.setBackgroundColor(mActivity.getResources().getColor(R.color.item_color2));
+                } else {
+                    convertView.setBackgroundColor(mActivity.getResources().getColor(R.color.item_color1));
+                }
             } else {
-                convertView.setBackgroundColor(mActivity.getResources().getColor(R.color.item_color1));
+                if (position % 2 == 0) {
+                    convertView.setBackgroundColor(mActivity.getResources().getColor(R.color.item_color1));
+                } else {
+                    convertView.setBackgroundColor(mActivity.getResources().getColor(R.color.item_color2));
+                }
             }
+
             ImageView avatar_img = ViewHolder.get(convertView, R.id.avatar_img);
             TextView num_tv = ViewHolder.get(convertView, R.id.num_tv);
             TextView nick_name_tv = ViewHolder.get(convertView, R.id.nick_name_tv);
@@ -741,11 +750,11 @@ public class MessageFragment extends EasyFragment {
                     if (DAIBAN_count > 0) {
                         schedule_num_tv.setText(DAIBAN_count + "");
                         schedule_num_tv.setVisibility(View.VISIBLE);
-                        schedule_content_tv.setText("您有" + DAIBAN_count + "条待审批流程为未阅读");
+                        schedule_content_tv.setText("您有" + DAIBAN_count + "条待审批流程未阅读");
                         schedule_time_tv.setText("刚刚");
                     } else {
                         schedule_num_tv.setVisibility(View.GONE);
-                        schedule_content_tv.setText("您暂无未阅读待审批流程");
+                        schedule_content_tv.setText("您暂无未阅读审批流程");
                     }
                     break;
                 case SUBRICE_MSG:
@@ -903,12 +912,14 @@ public class MessageFragment extends EasyFragment {
                 }
                 int task_num = 0, pagin_num = 0, daiban_num = 0;
                 for (int i = 0; i < allProcesses.size(); i++) {
-                    if (allProcesses.get(i).getTypecode().contains("task")) {
+                    if (allProcesses.get(i).getTypecode().contains("task")) {//我的任务
                         task_num++;
                     } else if (allProcesses.get(i).getTypecode()
                             .contains("dingyue")) {
-                        if (allProcesses.get(i).getStatus() == "0")
+                        if (allProcesses.get(i).getStatus() == "0"){
+
                             pagin_num++;
+                        }
                     } else {
                         daiban_num++;
                     }

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

@@ -0,0 +1,19 @@
+<?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.oa.AddMeetMainActivity">
+
+
+    <ListView
+        android:id="@+id/listview"
+        android:layout_alignParentTop="true"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:divider="@color/item_line"
+        android:dividerHeight="2px" />
+
+
+
+</RelativeLayout>

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:editTextFormExample="http://schemas.android.com/tools"
     xmlns:whatever="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -24,7 +25,7 @@
 
                 <RelativeLayout
                     android:id="@+id/ry_leave_man"
-                    style="@style/form_relative_customer"
+                    style="@style/add_meeting"
                     android:background="@color/item_color1">
 
 
@@ -35,18 +36,18 @@
                         android:textColor="@color/text_main"
                         android:textSize="@dimen/text_main" />
 
-                    <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
-                        android:id="@+id/et_leave_man"
-                        style="@style/form_relative_right_text"
-                        editTextFormExample:testType="nocheck" />
+                    <EditText
+                        android:id="@+id/meet_name_et"
+                        style="@style/add_meet_tv"
+                        android:inputType="text" />
                 </RelativeLayout>
 
                 <!--<ImageView style="@style/app_comm_list_line_gray" />-->
 
                 <RelativeLayout
                     android:id="@+id/ry_set_startTime"
-                    style="@style/form_relative_customer"
-                    android:background="@color/item_color1">
+                    style="@style/add_meeting"
+                    android:background="@color/item_color2">
 
 
                     <TextView
@@ -56,18 +57,16 @@
                         android:textColor="@color/text_main"
                         android:textSize="@dimen/text_main" />
 
-                    <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
-                        android:id="@+id/tv_start_time"
-                        style="@style/form_relative_right_text"
-                        editTextFormExample:customFormat="yyyy-MM-dd HH:mm"
-                        editTextFormExample:testType="date" />
+                    <EditText
+                        android:id="@+id/meet_start_time_et"
+                        style="@style/add_meet_tv" />
                 </RelativeLayout>
 
 
                 <RelativeLayout
                     android:id="@+id/ry_set_endTime"
-                    style="@style/form_relative_customer"
-                    android:background="@color/item_color2">
+                    style="@style/add_meeting"
+                    android:background="@color/item_color1">
 
                     <TextView
                         android:id="@+id/tv_date_gh"
@@ -76,34 +75,31 @@
                         android:textColor="@color/text_main"
                         android:textSize="@dimen/text_main" />
 
-                    <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
-                        android:id="@+id/tv_end_time"
-                        style="@style/form_relative_right_text"
-                        editTextFormExample:customFormat="yyyy-MM-dd HH:mm"
-                        editTextFormExample:testType="date" />
+                    <EditText
+                        android:id="@+id/meet_end_time_et"
+                        style="@style/add_meet_tv" />
                 </RelativeLayout>
 
                 <RelativeLayout
                     android:id="@+id/ry_leave_mankind"
-                    style="@style/form_relative_customer"
+                    style="@style/add_meeting"
                     android:background="@color/item_color2">
 
-                <TextView
+                    <TextView
                         android:id="@+id/tv_leave_mankind"
                         style="@style/form_relative_left_text"
                         android:text="会议地点："
                         android:textColor="@color/text_main"
                         android:textSize="@dimen/text_main" />
 
-                    <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
-                        android:id="@+id/et_leave_mankind"
-                        style="@style/form_relative_right_text"
-                        editTextFormExample:testType="nocheck" />
+                    <EditText
+                        android:id="@+id/meet_addr_tv"
+                        style="@style/add_meet_tv" />
                 </RelativeLayout>
 
                 <RelativeLayout
                     android:id="@+id/ry_leave_type"
-                    style="@style/form_relative_customer"
+                    style="@style/add_meeting"
                     android:visibility="gone">
 
 
@@ -122,91 +118,123 @@
 
                 <RelativeLayout
                     android:id="@+id/ry_leave_category"
-                    style="@style/form_relative_customer"
+                    style="@style/add_meeting"
                     android:background="@color/item_color1">
 
                     <TextView
                         android:id="@+id/tv_leave_category"
                         style="@style/form_relative_left_text"
-                        android:text="假期类别："
+                        android:text="参会人员："
                         android:textColor="@color/text_main"
                         android:textSize="@dimen/text_main" />
 
-                    <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
-                        android:id="@+id/et_leave_category"
-                        style="@style/form_relative_right_text"
-                        editTextFormExample:testType="nocheck" />
+                    <EditText
+                        android:id="@+id/meet_user_num_et"
+                        style="@style/add_meet_tv" />
                 </RelativeLayout>
 
                 <!--<ImageView style="@style/app_comm_list_line_gray" />-->
 
                 <RelativeLayout
                     android:id="@+id/ry_set_website"
-                    style="@style/form_relative_customer"
+                    style="@style/add_meeting"
                     android:background="@color/item_color2">
 
 
                     <TextView
                         android:id="@+id/tv_iv_leave_days"
                         style="@style/form_relative_left_text"
-                        android:text="请假天数："
+                        android:text="管  理  员："
                         android:textColor="@color/text_main"
                         android:textSize="@dimen/text_main" />
 
-                    <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
-                        android:id="@+id/et_leave_days"
-                        style="@style/form_relative_right_text"
-                        whatever:customRegexp="^(([0-9])|([0-9]+\\.?[0-9]+))$"
-                        whatever:testErrorString="@string/error_only_numeric_digits_allowed"
-                        whatever:testType="regexp" />
+                    <EditText
+                        android:id="@+id/meet_user_et"
+                        style="@style/add_meet_tv" />
                 </RelativeLayout>
 
                 <!--<ImageView style="@style/app_comm_list_line_gray" />-->
 
                 <RelativeLayout
                     android:id="@+id/ry_leave_hours"
-                    style="@style/form_relative_customer"
+                    style="@style/add_meeting"
                     android:background="@color/item_color1">
 
 
                     <TextView
                         android:id="@+id/tv_leave_hours"
                         style="@style/form_relative_left_text"
-
-                        android:text="请假时数："
+                        android:text="会议标签："
                         android:textColor="@color/text_main"
                         android:textSize="@dimen/text_main" />
 
-                    <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
-                        android:id="@+id/et_leave_hours"
-                        style="@style/form_relative_right_text"
-
-                        whatever:customRegexp="^(([0-9])|([0-9]+\\.?[0-9]+))$"
-                        whatever:testErrorString="@string/error_only_numeric_digits_allowed"
-                        whatever:testType="regexp" />
+                    <EditText
+                        android:id="@+id/meet_tag_et"
+                        style="@style/add_meet_tv" />
                 </RelativeLayout>
 
                 <!--<ImageView style="@style/app_comm_list_line_gray" />-->
 
                 <RelativeLayout
-                    android:id="@+id/ry_leave_reason"
-                    style="@style/form_relative_customer"
-                    android:background="@color/item_color2">
+                    android:id="@+id/meet_main_rl"
+                    style="@style/add_meeting"
+                    android:background="@color/item_color2"
+                    android:clickable="true">
 
 
                     <TextView
                         android:id="@+id/tv_leave_reason"
                         style="@style/form_relative_left_text"
-                        android:text="请假原因："
+                        android:text="会议议程："
                         android:textColor="@color/text_main"
                         android:textSize="@dimen/text_main" />
 
-                    <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
-                        android:id="@+id/et_leave_reason"
-                        style="@style/form_relative_right_text"
+                    <com.andreabaccega.widget.FormEditText
+                        android:id="@+id/meet_main_et"
+                        style="@style/add_meet_tv"
+                        android:focusable="false"
                         editTextFormExample:testType="nocheck" />
                 </RelativeLayout>
 
+                <RelativeLayout
+                    android:id="@+id/meet_about"
+                    style="@style/add_meeting"
+                    android:background="@color/item_color1">
+
+
+                    <TextView
+                        android:id="@+id/meet_about_tv"
+                        style="@style/form_relative_left_text"
+                        android:text="会议介绍："
+                        android:textColor="@color/text_main"
+                        android:textSize="@dimen/text_main" />
+
+                    <EditText
+                        android:id="@+id/meet_about_et"
+                        style="@style/add_meet_tv" />
+                </RelativeLayout>
+
+                <RelativeLayout
+                    style="@style/add_meeting"
+                    android:background="@color/item_color2">
+
+
+                    <TextView
+                        style="@style/form_relative_left_text"
+                        android:text="为参会人员创建日程："
+                        android:textColor="@color/text_main"
+                        android:textSize="@dimen/text_main" />
+
+                    <com.xzjmyk.pm.activity.ui.erp.view.SwitchView
+                        android:id="@+id/cb_task_reply"
+                        android:layout_width="50dp"
+                        android:layout_height="35dp"
+                        android:layout_alignParentRight="true"
+                        android:layout_centerVertical="true"
+                        android:layout_marginRight="20dp" />
+
+                </RelativeLayout>
+
 
             </LinearLayout>
 

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

@@ -3,48 +3,49 @@
     android:layout_height="match_parent"
     android:background="@drawable/login_bg">
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        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/login_btn"
+
+
+        <LinearLayout
             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>
+            android:layout_height="wrap_content"
+            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="20dp"
+                android:layout_marginRight="20dp"
+                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="20dp"
+                android:layout_marginRight="20dp"
+                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" />
+        </LinearLayout>
 
 
 </RelativeLayout>

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

@@ -7,6 +7,8 @@
 
     <ListView
         android:id="@+id/listview"
+        android:dividerHeight="2px"
+        android:divider="@color/item_line"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 

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

@@ -3,6 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:id="@+id/oa_rootview"
+    android:focusableInTouchMode="true"
+    android:focusable="true"
     android:layout_height="match_parent"
     tools:context="com.xzjmyk.pm.activity.ui.erp.activity.ClientActivity">
 

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

@@ -10,14 +10,15 @@
         android:id="@+id/tabLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:background="@color/item_color1"
         app:tabGravity="fill"
-        app:tabMode="fixed"
-        app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
+        app:tabMode="fixed" />
 
     <android.support.v4.view.ViewPager
         android:id="@+id/viewPager"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"
+        android:layout_below="@+id/tabLayout" />
 
 
 </RelativeLayout>

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

@@ -0,0 +1,19 @@
+<?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.oa.WorkLogsActivity">
+
+    <com.xzjmyk.pm.activity.view.SuperSwipeRefreshLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/recycler"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+    </com.xzjmyk.pm.activity.view.SuperSwipeRefreshLayout>
+
+</RelativeLayout>

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

@@ -0,0 +1,135 @@
+<?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"
+    android:orientation="vertical"
+    android:padding="5dp">
+
+    <LinearLayout
+        android:id="@+id/ll"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:visibility="gone">
+
+        <RelativeLayout
+            style="@style/add_meeting"
+            android:background="@color/item_color2">
+
+            <TextView
+                style="@style/form_relative_left_text"
+                android:text="异程1"
+                android:textColor="@color/text_main"
+                android:textSize="@dimen/text_main" />
+
+            <ImageView
+                android:id="@+id/remove_img"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_marginRight="20dp"
+                android:src="@drawable/close_agenda" />
+        </RelativeLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1px"
+            android:background="@color/item_line" />
+
+        <RelativeLayout
+            style="@style/add_meeting"
+            android:background="@color/item_color2">
+
+            <TextView
+                style="@style/form_relative_left_text"
+                android:text="议题："
+                android:textColor="@color/text_main"
+                android:textSize="@dimen/text_main" />
+
+            <EditText
+                android:id="@+id/main_et"
+                style="@style/add_meet_tv" />
+        </RelativeLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1px"
+            android:background="@color/item_line" />
+
+        <RelativeLayout
+            style="@style/add_meeting"
+            android:background="@color/item_color2">
+
+
+            <TextView
+                style="@style/form_relative_left_text"
+                android:text="开始时间："
+                android:textColor="@color/text_main"
+                android:textSize="@dimen/text_main" />
+
+            <EditText
+                android:id="@+id/start_et"
+                style="@style/add_meet_tv" />
+        </RelativeLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1px"
+            android:background="@color/item_line" />
+
+        <RelativeLayout
+            style="@style/add_meeting"
+            android:background="@color/item_color2">
+
+
+            <TextView
+                style="@style/form_relative_left_text"
+                android:text="结束时间："
+                android:textColor="@color/text_main"
+                android:textSize="@dimen/text_main" />
+
+            <EditText
+                android:id="@+id/end_et"
+                style="@style/add_meet_tv" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            style="@style/add_meeting"
+            android:background="@color/item_color2">
+
+
+            <TextView
+                style="@style/form_relative_left_text"
+                android:text="附件："
+                android:textColor="@color/text_main"
+                android:textSize="@dimen/text_main" />
+
+            <TextView
+                style="@style/add_meet_tv"
+                android:text="点击添加" />
+        </RelativeLayout>
+    </LinearLayout>
+
+    <RelativeLayout
+        android:id="@+id/rl"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:layout_alignParentBottom="true"
+        android:background="@color/item_color2"
+        android:clickable="true"
+        android:visibility="gone">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:drawableLeft="@drawable/add_agenda"
+            android:gravity="center"
+            android:minHeight="40dp"
+            android:text="新增议程"
+            android:textColor="#56abe4"
+            android:textSize="20sp" />
+    </RelativeLayout>
+
+</FrameLayout>

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

@@ -70,6 +70,7 @@
                 android:layout_alignParentRight="true"
                 android:ellipsize="end"
                 android:singleLine="true"
+                android:text="刚刚"
                 android:textColor="@color/text_hine"
                 android:textSize="14sp" />
 
@@ -81,6 +82,7 @@
                 android:layout_marginTop="8dp"
                 android:ellipsize="end"
                 android:singleLine="true"
+                android:text="您暂无未阅读审批流程"
                 android:textColor="@color/text_hine"
                 android:textSize="14sp" />
         </RelativeLayout>
@@ -152,6 +154,7 @@
                 android:layout_alignParentRight="true"
                 android:ellipsize="end"
                 android:singleLine="true"
+                android:text="刚刚"
                 android:textColor="@color/text_hine"
                 android:textSize="14sp" />
 
@@ -163,6 +166,7 @@
                 android:layout_marginTop="8dp"
                 android:ellipsize="end"
                 android:singleLine="true"
+                android:text="您暂无未阅读任务"
                 android:textColor="@color/text_hine"
                 android:textSize="14sp" />
         </RelativeLayout>
@@ -234,6 +238,7 @@
                 android:layout_alignParentRight="true"
                 android:ellipsize="end"
                 android:singleLine="true"
+                android:text="刚刚"
                 android:textColor="@color/text_hine"
                 android:textSize="14sp" />
 
@@ -244,6 +249,7 @@
                 android:layout_below="@id/notice_name_tv"
                 android:layout_marginTop="8dp"
                 android:ellipsize="end"
+                android:text="您暂无未阅读通知公告"
                 android:singleLine="true"
                 android:textColor="@color/text_hine"
                 android:textSize="14sp" />
@@ -316,6 +322,7 @@
                 android:layout_alignParentRight="true"
                 android:ellipsize="end"
                 android:singleLine="true"
+                android:text="刚刚"
                 android:textColor="@color/text_hine"
                 android:textSize="14sp" />
 
@@ -327,6 +334,7 @@
                 android:layout_marginTop="8dp"
                 android:ellipsize="end"
                 android:singleLine="true"
+                android:text="您暂无未阅读订阅消息"
                 android:textColor="@color/text_hine"
                 android:textSize="14sp" />
         </RelativeLayout>
@@ -399,6 +407,7 @@
                 android:layout_alignParentRight="true"
                 android:ellipsize="end"
                 android:singleLine="true"
+                android:text="刚刚"
                 android:textColor="@color/text_hine"
                 android:textSize="14sp" />
 
@@ -409,6 +418,7 @@
                 android:layout_below="@id/b2b_nick_name_tv"
                 android:layout_marginTop="8dp"
                 android:ellipsize="end"
+                android:text="您暂无未阅读商务消息"
                 android:singleLine="true"
                 android:textColor="@color/text_hine"
                 android:textSize="14sp" />

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

@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_margin="10dp">
+    android:padding="10dp">
 
     <TextView
         android:id="@+id/oa_meeting_name_tv"

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

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/sreach"
+        android:icon="@drawable/abc_ic_search_api_mtrl_alpha"
+        android:title="@string/search"
+        app:showAsAction="always" />
+    <item
+        android:id="@+id/add"
+        android:icon="@drawable/oa_add_meet"
+        android:title="添加"
+        app:showAsAction="always" />
+</menu>

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

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

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

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

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

@@ -29,4 +29,29 @@
     <style name="statistics_style">
         <item name="android:layout_height">20dp</item>
     </style>
+
+    <!-- 会议-->
+    <style name="add_meeting">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:minHeight">50dp</item>
+        <item name="android:clickable">true</item>
+    </style>
+    <style name="add_meet_tv">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_centerVertical">true</item>
+        <item name="android:layout_alignParentRight">true</item>
+        <item name="android:layout_marginRight">20dp</item>
+        <item name="android:layout_marginLeft">150dp</item>
+        <item name="android:background">@drawable/shape_from_edit</item>
+        <item name="android:gravity">left</item>
+        <item name="android:maxWidth">290dp</item>
+        <item name="android:padding">5dp</item>
+        <item name="android:width">160dp</item>
+        <item name="android:layout_marginTop">8dp</item>
+        <item name="android:layout_marginBottom">8dp</item>
+        <item name="android:textColorHint">@color/gray</item>
+        <item name="android:textSize">15sp</item>
+    </style>
 </resources>

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

@@ -357,6 +357,7 @@
         <item name="android:clickable">true</item>
     </style>
 
+
     <style name="Smile">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>