合并代码提交 --》developer pulled

WeiChat/src/main/AndroidManifest.xml

@@ -3,12 +3,12 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.xzjmyk.pm.activity"
     android:versionCode="70"
-    android:versionName="5.5.5">
+    android:versionName="5.5.5" >
 
     <uses-sdk
         android:minSdkVersion="11"
         android:targetSdkVersion="23" />
-    <!--share umeng-->
+    <!-- share umeng -->
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
@@ -19,7 +19,6 @@
     <uses-permission android:name="android.permission.CALL_PHONE" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-
     <uses-permission android:name="android.permission.GET_TASKS" />
     <uses-permission android:name="android.permission.SET_DEBUG_APP" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
@@ -103,26 +102,26 @@
         android:icon="@drawable/uuu"
         android:label="@string/app_name"
         android:largeHeap="true"
-        android:theme="@style/AppTheme">
-
+        android:theme="@style/AppTheme" >
         <meta-data
             android:name="UMENG_CHANNEL"
             android:value="baidu" />
         <!-- 启动页面 -->
         <activity
             android:name=".ui.SplashActivity"
-            android:theme="@style/SplashTheme">
+            android:theme="@style/SplashTheme" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
-                <action android:name="cat.ereza.customactivityoncrash.RESTART"/>
+
+                <action android:name="cat.ereza.customactivityoncrash.RESTART" />
             </intent-filter>
         </activity>
-        <!--异常跳转页面-->
+        <!-- 异常跳转页面 -->
         <activity
             android:name=".CustomCrashActivity"
-            android:process=":error_activity">
+            android:process=":error_activity" >
             <intent-filter>
                 <action android:name="cat.ereza.customactivityoncrash.ERROR" />
             </intent-filter>
@@ -152,27 +151,29 @@
         <activity android:name=".ui.erp.activity.DbfindListActivity" />
         <activity android:name=".ui.erp.activity.DbfindList2Activity" />
         <activity android:name=".ui.circle.view.CardInfoActivity" />
-
-        <activity android:name=".ui.erp.activity.oa.AskForLeaveActivity"
+        <activity
+            android:name=".ui.erp.activity.oa.AskForLeaveActivity"
             android:configChanges="orientation|keyboardHidden"
-            android:windowSoftInputMode="adjustPan|stateHidden"/>
-        <activity android:name=".ui.erp.activity.oa.OvertimeApplyActivity"
+            android:windowSoftInputMode="adjustPan|stateHidden" />
+        <activity
+            android:name=".ui.erp.activity.oa.OvertimeApplyActivity"
             android:configChanges="orientation|keyboardHidden"
-            android:windowSoftInputMode="adjustPan|stateHidden"/>
-        <activity android:name=".ui.erp.activity.oa.SpecialAttendanceActivity"
+            android:windowSoftInputMode="adjustPan|stateHidden" />
+        <activity
+            android:name=".ui.erp.activity.oa.SpecialAttendanceActivity"
             android:configChanges="orientation|keyboardHidden"
-            android:windowSoftInputMode="adjustPan|stateHidden"/>
-        <activity android:name=".ui.erp.activity.oa.TravelRequestActivity"
+            android:windowSoftInputMode="adjustPan|stateHidden" />
+        <activity
+            android:name=".ui.erp.activity.oa.TravelRequestActivity"
             android:configChanges="orientation|keyboardHidden"
-            android:windowSoftInputMode="adjustPan|stateHidden"/>
-
+            android:windowSoftInputMode="adjustPan|stateHidden" />
         <activity
             android:name=".ui.erp.activity.AddTaskActivity"
             android:configChanges="orientation|keyboardHidden"
             android:windowSoftInputMode="adjustUnspecified|stateHidden" />
         <activity
-            android:hardwareAccelerated="false"
-            android:name=".ui.erp.activity.WebViewCommActivity" />
+            android:name=".ui.erp.activity.WebViewCommActivity"
+            android:hardwareAccelerated="false" />
         <activity
             android:name=".ui.erp.activity.DetailTaskActivity"
             android:windowSoftInputMode="adjustUnspecified|stateHidden" />
@@ -213,7 +214,7 @@
         <activity
             android:name=".ui.erp.activity.SubcribeManageActivity"
             android:theme="@style/StyledIndicators" />
-        <activity android:name=".ui.erp.activity.ManageAllSubscriptionActivity"/>
+        <activity android:name=".ui.erp.activity.ManageAllSubscriptionActivity" />
         <!-- 群聊 -->
         <activity android:name=".ui.groupchat.SelectContactsActivity" />
 
@@ -307,7 +308,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" />
 
@@ -324,13 +325,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" />
@@ -357,7 +358,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" />
@@ -375,7 +376,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" />
@@ -394,7 +395,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>
@@ -408,7 +409,7 @@
 
 
         <!-- 此处Receiver名字修改为当前包名路径 -->
-        <receiver android:name=".ui.PushNetMessageReceiver">
+        <receiver android:name=".ui.PushNetMessageReceiver" >
             <intent-filter>
 
                 <!-- 接收push消息 -->
@@ -429,7 +430,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>
@@ -458,7 +459,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" />
@@ -627,26 +628,26 @@
             android:theme="@style/OAThemeOutOffice" />
         <activity android:name=".ui.erp.activity.oa.OptionActivity" />
         <activity android:name=".ui.erp.activity.crm.SubsActivity" />
-        <activity android:name=".ui.erp.activity.me.UpdateSingleTextActivity"/>
-        <activity android:name=".ui.erp.activity.me.UpdateSexActivity"/>
+        <activity android:name=".ui.erp.activity.me.UpdateSingleTextActivity" />
+        <activity android:name=".ui.erp.activity.me.UpdateSexActivity" />
         <activity
             android:name=".ui.erp.activity.me.FeedbackActivity"
-            android:windowSoftInputMode="stateHidden|stateAlwaysHidden"/>
+            android:windowSoftInputMode="stateHidden|stateAlwaysHidden" />
         <activity android:name=".ui.erp.activity.oa.OAActivity" />
 
-        <!--umeng api key-->
+        <!-- umeng api key -->
         <meta-data
             android:name="UMENG_APPKEY"
             android:value="57ea27bb67e58e088c003bbf" >
         </meta-data>
-        <!--weixin-->
+        <!-- weixin -->
         <activity
             android:name=".wxapi.WXEntryActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:exported="true"
             android:screenOrientation="portrait"
             android:theme="@android:style/Theme.Translucent.NoTitleBar" />
-       <!--qq-->
+        <!-- qq -->
         <activity
             android:name="com.tencent.tauth.AuthActivity"
             android:launchMode="singleTask"
@@ -662,34 +663,37 @@
         </activity>
         <activity
             android:name="com.tencent.connect.common.AssistActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"
-            android:theme="@android:style/Theme.Translucent.NoTitleBar"
-            android:configChanges="orientation|keyboardHidden|screenSize"/>
-
+            android:theme="@android:style/Theme.Translucent.NoTitleBar" />
         <activity
             android:name=".WBShareActivity"
             android:configChanges="keyboardHidden|orientation"
             android:screenOrientation="portrait" >
             <intent-filter>
                 <action android:name="com.sina.weibo.sdk.action.ACTION_SDK_REQ_ACTIVITY" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
         <activity
             android:name="com.sina.weibo.sdk.component.WeiboSdkBrowser"
             android:configChanges="keyboardHidden|orientation"
-            android:windowSoftInputMode="adjustResize"
-            android:exported="false" >
+            android:exported="false"
+            android:windowSoftInputMode="adjustResize" >
         </activity>
-
-        <activity android:name=".ui.erp.activity.oa.SelectActivity"/>
-        <activity android:name=".ui.erp.activity.oa.ChangeMobileActivity"
-            android:label="@string/change_mobile"/>
-
+        <activity android:name=".ui.erp.activity.oa.SelectActivity" />
+        <activity
+            android:name=".ui.erp.activity.oa.ChangeMobileActivity"
+            android:label="@string/change_mobile" />
         <activity
             android:name="com.umeng.socialize.editorpage.ShareActivity"
             android:excludeFromRecents="true"
             android:theme="@style/Theme.UMDefault" />
+        <activity
+            android:name=".ui.erp.activity.message.ProcessMsgActivity"
+            android:label="@string/title_activity_process_msg">
+        </activity>
     </application>
 
 </manifest>

WeiChat/src/main/java/com/xzjmyk/pm/activity/CustomCrashActivity.java

@@ -8,6 +8,8 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.ImageView;
 
+import com.afollestad.materialdialogs.MaterialDialog;
+
 import cat.ereza.customactivityoncrash.CustomActivityOnCrash;
 
 /**
@@ -31,9 +33,11 @@ public class CustomCrashActivity extends Activity {
         intent = getIntent();
 //        stackTraceString = CustomActivityOnCrash.getStackTraceFromIntent(intent);
         stackTraceString = CustomActivityOnCrash.getAllErrorDetailsFromIntent(this,intent);
-        /*if (stackTraceString != null){
-            Toast.makeText(this,stackTraceString,Toast.LENGTH_LONG).show();
-        }*/
+        if (stackTraceString != null){
+            //Toast.makeText(this, stackTraceString, Toast.LENGTH_LONG).show();
+            new MaterialDialog.Builder(this).content(stackTraceString)
+                    .build().show();
+        }
         final Class<? extends Activity> activityClassFromIntent = CustomActivityOnCrash.getRestartActivityClassFromIntent(intent);
         final CustomActivityOnCrash.EventListener listenerFromIntent = CustomActivityOnCrash.getEventListenerFromIntent(intent);
 

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

@@ -1,31 +1,78 @@
 package com.xzjmyk.pm.activity.ui.erp.activity.message;
 
 import android.os.Bundle;
-import android.support.design.widget.FloatingActionButton;
-import android.support.design.widget.Snackbar;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import android.support.v7.app.ActionBar;
+import android.view.LayoutInflater;
 import android.view.View;
+import android.widget.TextView;
 
+import com.handmark.pulltorefresh.library.PullToRefreshListView;
+import com.lidroid.xutils.ViewUtils;
+import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.view.ClearEditText;
 
-public class ProcessMsgActivity extends AppCompatActivity {
+/**
+  * @desc:
+  * @author：Arison on 2016/11/1
+  */
+public class ProcessMsgActivity extends BaseActivity implements View.OnClickListener {
 
+    @ViewInject(R.id.edt_search)
+    ClearEditText mEditText;
+    @ViewInject(R.id.lv_process)
+    PullToRefreshListView mList;
+
+    @ViewInject(R.id.tv_process_me)
+    private TextView tv_process_me;
+    @ViewInject(R.id.tv_process_already)
+    private TextView tv_process_already;
+    @ViewInject(R.id.tv_process_un)
+    private TextView tv_process_un;
+    
+    
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_process_msg);
-        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
-        setSupportActionBar(toolbar);
-
-        FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
-        fab.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
-                        .setAction("Action", null).show();
-            }
-        });
+        ViewUtils.inject(this);
+        initView();
+    }
+
+    private void initView() {
+        View view = LayoutInflater.from(ct).inflate(R.layout.process_header, null);
+        ActionBar bar = this.getSupportActionBar();
+        bar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
+        tv_process_already= (TextView) view.findViewById(R.id.tv_process_already);
+        tv_process_un= (TextView) view.findViewById(R.id.tv_process_un);
+        tv_process_me= (TextView) view.findViewById(R.id.tv_process_me);
+        bar.setCustomView(view);
+        tv_process_already.setOnClickListener(this);
+        tv_process_me.setOnClickListener(this);
+        tv_process_un.setOnClickListener(this);
+        tv_process_un.setSelected(true);
     }
 
+
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()){
+            case R.id.tv_process_un:
+                tv_process_un.setSelected(true);
+                tv_process_already.setSelected(false);
+                tv_process_me.setSelected(false);
+                break;
+            case R.id.tv_process_already:
+                tv_process_un.setSelected(false);
+                tv_process_already.setSelected(true);
+                tv_process_me.setSelected(false);
+                break;
+            case R.id.tv_process_me:
+                tv_process_un.setSelected(false);
+                tv_process_already.setSelected(false);
+                tv_process_me.setSelected(true);
+                break;
+        }
+    }
 }

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

@@ -460,20 +460,17 @@ public class ViewUtil {
 
     private static void loginERPItemDialog(final String phone,
                                            final String password) {
-        String company = CommonUtil.getSharedPreferences(ct,"erp_commpany");
         String[] items = new String[erpEntities.size()];
         int select=0;
         for (int j = 0; j < erpEntities.size(); j++) {
             items[j] = erpEntities.get(j).getName();
-            if (!StringUtils.isEmpty(company)){
-               if (company.equals(erpEntities.get(j).getName())){
-                   select=j;
-               }
-            }
         }
         if (CommonUtil.isDialogShowing(loginERPDialog)) {
             return;
         } else {
+            if (loginERPDialog!=null) {
+             select= loginERPDialog.getSelectedIndex();
+            }
          
             loginERPDialog = new MaterialDialog.Builder(ct)
                     .title("选择登录的UAS账套")
@@ -483,13 +480,14 @@ public class ViewUtil {
                                 @Override
                                 public boolean onSelection(MaterialDialog dialog,
                                                            View view, int which, CharSequence text) {
+                                    LogUtil.d("onSelection:"+which);
                                     if (!StringUtils.isEmpty(text.toString())) {
-                                        // 拿到公司名字，取它对应的账套信息
-                                        for (int j2 = 0; j2 < erpEntities.size(); j2++) {
-                                            if (text.toString().equals(
-                                                    erpEntities.get(j2).getName())) {
+//                                        for (int j2 = 0; j2 < erpEntities.size(); j2++) {
+//                                            if (text.toString().equals(
+//                                                    erpEntities.get(j2).getName())) {
+                                             
                                                 LoginEntity entity = erpEntities
-                                                        .get(j2);
+                                                        .get(which);
                                                 erp_phone = phone;
                                                 erp_password = password;
                                                 erp_username = entity.getAccount();
@@ -503,8 +501,9 @@ public class ViewUtil {
                                                         entity.getMaster(), phone, password);
                                                 //清除账套列表缓存
                                                 CommonUtil.clearSharedPreferences(ct, "erp_masterlist");
-                                            }
-                                        }
+                                                
+//                                            }
+//                                        }
                                     }
                                     return true;
                                 }

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

@@ -46,8 +46,8 @@ import com.xzjmyk.pm.activity.sortlist.PingYinUtil;
 import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.base.EasyFragment;
 import com.xzjmyk.pm.activity.ui.erp.activity.NoticeMenuActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.ScheduleActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.TaskActivity;
+import com.xzjmyk.pm.activity.ui.erp.activity.message.ProcessMsgActivity;
 import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
 import com.xzjmyk.pm.activity.ui.erp.entity.B2BMsg;
 import com.xzjmyk.pm.activity.ui.erp.model.AllProcess;
@@ -294,7 +294,8 @@ public class MessageFragment extends EasyFragment {
         public void onClick(View view) {
             switch (view.getId()) {
                 case R.id.schedule_rl:
-                    startActivity(new Intent(mActivity, ScheduleActivity.class));
+                   // startActivity(new Intent(mActivity, ScheduleActivity.class));
+                    startActivity(new Intent(mActivity, ProcessMsgActivity.class));
                     break;
                 case R.id.task_rl:
                     startActivity(new Intent(mActivity, TaskActivity.class));

WeiChat/src/main/res/drawable/shape_process_item.xml

@@ -1,4 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-</selector>
+    <item android:state_selected="true">
+        <shape  android:shape="rectangle">
+            <corners
+                android:topLeftRadius="100dp"
+                android:topRightRadius="100dp"
+                android:bottomRightRadius="100dp"
+                android:bottomLeftRadius="100dp">
+            </corners>
+            <stroke
+                android:width="1dp"
+                android:color="#fbfbfb">
+            </stroke>
+            <solid
+                android:color="#ffffff">
+            </solid>
+        </shape>
+        </item>
+    <item>
+        <shape  android:shape="rectangle">
+            <corners
+                android:topLeftRadius="100dp"
+                android:topRightRadius="100dp"
+                android:bottomRightRadius="100dp"
+                android:bottomLeftRadius="100dp">
+            </corners>
+            <solid
+                android:color="@color/antionbarcolor">
+            </solid>
+        </shape>
+        </item>
+</selector>

WeiChat/src/main/res/drawable/shape_process_linear.xml

@@ -1,4 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-</selector>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <corners
+        android:topLeftRadius="100dp"
+        android:topRightRadius="100dp"
+        android:bottomRightRadius="100dp"
+        android:bottomLeftRadius="100dp">
+    </corners>
+    <stroke
+        android:width="1dp"
+        android:color="#fbfbfb">
+    </stroke>
+    <solid
+        android:color="@color/antionbarcolor">
+    </solid>
+</shape>

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

@@ -118,8 +118,6 @@
                     <TextView
                         android:id="@+id/tv_set_t"
                         style="@style/form_relative_left_text"
-                        android:layout_toEndOf="@+id/iv_set_i"
-                        android:layout_toRightOf="@+id/iv_set_i"
                         android:text="是否全天:" />
 
                     <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"

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

@@ -1,25 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<LinearLayout
     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" android:fitsSystemWindows="true"
-    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.message.ProcessMsgActivity">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
-    <android.support.design.widget.AppBarLayout android:layout_height="wrap_content"
-        android:layout_width="match_parent" android:theme="@style/AppTheme.AppBarOverlay">
+    <RelativeLayout
+        android:background="@drawable/bg_bar"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:orientation="horizontal"
+        android:paddingBottom="5dp"
+        android:paddingLeft="15dp"
+        android:paddingRight="15dp"
+        android:paddingTop="5dp">
 
-        <android.support.v7.widget.Toolbar android:id="@+id/toolbar"
-            android:layout_width="match_parent" android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary" app:popupTheme="@style/AppTheme.PopupOverlay" />
+        <com.xzjmyk.pm.activity.view.ClearEditText
+            android:id="@+id/edt_search"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:layout_centerHorizontal="true"
+            android:background="@drawable/search_input"
+            android:drawableLeft="@drawable/search"
+            android:drawableRight="@drawable/search_clear"
+            android:hint="@string/search"
+            android:textColor="@color/dark_grey"
+            android:textColorHint="@color/grey"
+            android:textSize="15sp" />
 
-    </android.support.design.widget.AppBarLayout>
-
-    <include layout="@layout/content_process_msg" />
-
-    <android.support.design.widget.FloatingActionButton android:id="@+id/fab"
-        android:layout_width="wrap_content" android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end" android:layout_margin="@dimen/fab_margin"
-        android:src="@android:drawable/ic_dialog_email" />
-
-</android.support.design.widget.CoordinatorLayout>
+    </RelativeLayout>
+    <com.handmark.pulltorefresh.library.PullToRefreshListView
+        android:id="@+id/lv_process"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:divider="@null"
+        android:listSelector="#00000000"
+        android:scrollingCache="false"
+        android:scrollbars="none" >
+    </com.handmark.pulltorefresh.library.PullToRefreshListView>
+</LinearLayout>

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

@@ -1,6 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+<RelativeLayout
+    android:layout_width="match_parent"
     android:layout_height="match_parent">
+    <TextView
+        android:id="@+id/tv_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="10dp"
+        android:text="采购单-2013212"/>
 
+    <TextView
+        android:id="@+id/tv_date"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="10dp"
+        android:layout_alignParentRight="true"
+        android:text="2016-10-09 09:11"/>
+</RelativeLayout>
+    
+    <TextView
+        android:id="@+id/tv_status"
+        android:layout_marginLeft="10dp"
+       android:layout_marginBottom="10dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" 
+        android:text="状态"
+        android:autoText="false"
+        android:textColor="#64268509" />
 </LinearLayout>

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

@@ -2,6 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/top"
     android:layout_width="match_parent"
+    android:background="@color/antionbarcolor"
     android:layout_height="?attr/actionBarSize">
     <ImageView
         android:id="@+id/back"
@@ -9,21 +10,70 @@
         android:layout_height="match_parent"
         android:padding="10dp"
         android:src="@drawable/back" />
-
-    <TextView
-        android:id="@+id/title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+    <LinearLayout
+        android:id="@+id/ll_top_state"
+        android:layout_width="match_parent"
         android:layout_centerInParent="true"
-        android:drawableRight="@drawable/down"
-        android:textColor="@color/white"
-        android:textSize="@dimen/text_main" />
+        android:layout_marginLeft="60dp"
+        android:layout_marginRight="60dp"
+        android:layout_marginBottom="13dp"
+        android:layout_marginTop="13dp"
+        android:layout_height="40dp"
+        android:padding="1dp"
+        android:background="@drawable/shape_process_linear"
+        android:orientation="horizontal"
+        android:weightSum="3">
 
-    <ImageView
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="center_vertical"
+            android:gravity="center"
+            android:background="@drawable/shape_process_item"
+            android:layout_weight="1"
+            android:text="待审批"
+            android:id="@+id/tv_process_un" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="center_vertical"
+            android:layout_weight="1"
+            android:background="@drawable/shape_process_item"
+            
+           
+            android:gravity="center"
+            android:text="已审批"
+            android:id="@+id/tv_process_already" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="center_vertical"
+            android:layout_weight="1"
+            android:background="@drawable/shape_process_item"
+         
+            android:gravity="center"
+            android:text="我发起的"
+            android:id="@+id/tv_process_me" />
+
+    </LinearLayout>
+    
+
+    <!--<TextView-->
+        <!--android:id="@+id/title"-->
+        <!--android:layout_width="wrap_content"-->
+        <!--android:layout_height="wrap_content"-->
+        <!--android:layout_centerInParent="true"-->
+        <!--android:drawableRight="@drawable/down"-->
+        <!--android:textColor="@color/white"-->
+        <!--android:textSize="@dimen/text_main" />-->
+
+  <!--  <ImageView
         android:id="@+id/seting"
         android:layout_width="40dp"
         android:layout_height="match_parent"
         android:layout_alignParentRight="true"
         android:padding="8dp"
-        android:src="@drawable/setting" />
+        android:src="@drawable/setting" />-->
 </RelativeLayout>

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

@@ -32,4 +32,5 @@
     <!-- Default screen margins, per the Android Design guidelines. -->
     <dimen name="activity_horizontal_margin">16dp</dimen>
     <dimen name="activity_vertical_margin">16dp</dimen>
+    <dimen name="fab_margin">16dp</dimen>
 </resources>

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

@@ -485,4 +485,5 @@
     <string name="umeng_socialize_text_kakao_key">Kakao Talk</string>
     <string name="umeng_socialize_text_googleplus_key">GooglePlus</string>
     <string name="umeng_socialize_text_more_key">更多</string>
+    <string name="title_activity_process_msg">ProcessMsgActivity</string>
 </resources>