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

# Conflicts:
#	WeiChat/build.gradle
#	WeiChat/src/main/res/layout/fragment_message.xml

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java

@@ -667,10 +667,12 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
     private void updateMessageTitle() {
         if (mImStatus == AuthStateListener.AUTH_STATE_NOT) {
             getSupportActionBar().setTitle(R.string.msg_offline);
+            mMessageFragment.setNetNoticeVisiable(true);
         } else if (mImStatus == AuthStateListener.AUTH_STATE_ING) {
             getSupportActionBar().setTitle(R.string.msg_connect);
         } else if (mImStatus == AuthStateListener.AUTH_STATE_SUCCESS) {
             getSupportActionBar().setTitle(R.string.msg_online);
+            mMessageFragment.setNetNoticeVisiable(false);
         }
     }
 

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

@@ -8,6 +8,7 @@ import android.graphics.Color;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+import android.provider.Settings;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
@@ -71,6 +72,7 @@ import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.util.ViewHolder;
 import com.xzjmyk.pm.activity.view.ClearEditText;
+import com.xzjmyk.pm.activity.view.DrawableCenterTextView;
 import com.xzjmyk.pm.activity.view.PullToRefreshSlideListView;
 import com.xzjmyk.pm.activity.volley.ArrayResult;
 import com.xzjmyk.pm.activity.volley.Result;
@@ -96,6 +98,10 @@ public class MessageFragment extends EasyFragment {
     private Handler mHandler = new Handler();
     private boolean isRefeshed;
     private MainActivity mActivity;
+
+    private DrawableCenterTextView mNetTextView;
+    private String mNoticeMsg = null;
+
     public static final int REQUESTCODE = 0xa1;
     //界面更新广播
     private BroadcastReceiver mUpdateReceiver = new BroadcastReceiver() {
@@ -180,6 +186,7 @@ public class MessageFragment extends EasyFragment {
     }
 
     private void initView() {
+        mNetTextView = (DrawableCenterTextView) findViewById(R.id.message_net_set);
         mClearEditText = (ClearEditText) findViewById(R.id.search_edit);
         mClearEditText.addTextChangedListener(new TextWatcher() {
             @Override
@@ -221,6 +228,7 @@ public class MessageFragment extends EasyFragment {
         mPullToRefreshListView.setOnRefreshListener(new OnRefreshListener<SlideListView>() {
             @Override
             public void onRefresh(PullToRefreshBase<SlideListView> refreshView) {
+                mNoticeMsg = null;
                 refreshUI();
             }
         });
@@ -253,8 +261,23 @@ public class MessageFragment extends EasyFragment {
             }
         });
 
+        mNetTextView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                startActivity(new Intent(Settings.ACTION_SETTINGS));
+            }
+        });
     }
 
+    public void setNetNoticeVisiable(boolean visiable){
+        if (mNetTextView != null){
+            if (visiable){
+                mNetTextView.setVisibility(View.VISIBLE);
+            }else {
+                mNetTextView.setVisibility(View.GONE);
+            }
+        }
+    }
 
     /**
      * 头视图相关
@@ -301,7 +324,7 @@ 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:
@@ -713,9 +736,9 @@ public class MessageFragment extends EasyFragment {
     }
 
     /**
-      * @desc:审批流接口
-      * @author：Arison on 2016/11/15
-      */
+     * @desc:审批流接口
+     * @author：Arison on 2016/11/15
+     */
     private void loadProcessToDo(int page) {
         String url = Constants.getAppBaseUrl(ct) + "common/desktop/process/toDo.action";
         Map<String, Object> params = new HashMap<>();
@@ -764,9 +787,10 @@ public class MessageFragment extends EasyFragment {
             switch (msg.what) {
                 case 0x16:
                     String message = (String) msg.getData().get("result");
+                    List<SubscriptionMessage> messages = null;
                     int num = 0;
                     if (JSON.parseObject(message).containsKey("data")) {
-                        List<SubscriptionMessage> messages = JSON.parseArray(JSON.parseObject(message).getJSONArray("data").toJSONString(), SubscriptionMessage.class);
+                        messages = JSON.parseArray(JSON.parseObject(message).getJSONArray("data").toJSONString(), SubscriptionMessage.class);
                         for (SubscriptionMessage e : messages) {
                             if (e.getSTATUS_() == 0)
                                 num += 1;
@@ -777,26 +801,35 @@ public class MessageFragment extends EasyFragment {
                     if (num > 0) {
                         num_tv.setText(num + "");
                         num_tv.setVisibility(View.VISIBLE);
-                        content_tv.setText("您有新的订阅消息!");
+//                        content_tv.setText("您有新的订阅消息!");
+                        content_tv.setText(messages.get(0).getTITLE_());
                         time_tv.setText("刚刚");
                     } else {
                         num_tv.setVisibility(View.GONE);
-                        content_tv.setText("暂无新的订阅消息!");
+//                        content_tv.setText("暂无新的订阅消息!");
+                        content_tv.setText("");
                     }
                     break;
                 case 0x17:
-                    JSONArray itemArray = JSON.parseObject( msg.getData().getString("result")).getJSONArray("data");
-                     itemArray=CommonUtil.sortJsonArray(itemArray);
-                    LogUtil.d("item:"+itemArray.size());
-                    if (!ListUtils.isEmpty(itemArray)){
-                        DAIBAN_count= itemArray.size();
-                        handler.sendEmptyMessage(DAIBAN_MSG);
-                    }else{
-                        DAIBAN_count=0;
+                    JSONArray itemArray = JSON.parseObject(msg.getData().getString("result")).getJSONArray("data");
+                    itemArray = CommonUtil.sortJsonArray(itemArray);
+                    LogUtil.d("item:" + itemArray.size());
+                    if (!ListUtils.isEmpty(itemArray)) {
+                        DAIBAN_count = itemArray.size();
+                        Message DaibanMsg = Message.obtain();
+                        DaibanMsg.what = DAIBAN_MSG;
+                        if (itemArray.size() != 0){
+                            DaibanMsg.obj = itemArray.getJSONObject(0).getString("JP_LAUNCHERNAME") + "的"
+                                    + itemArray.getJSONObject(0).getString("JP_NAME");
+                        }
+                        handler.sendMessage(DaibanMsg);
+//                        handler.sendEmptyMessage(DAIBAN_MSG);
+                    } else {
+                        DAIBAN_count = 0;
                         handler.sendEmptyMessage(DAIBAN_MSG);
                     }
-                 
-                break;
+
+                    break;
                 case Constants.SUCCESS_LOGIN://公告
                     updateGongGao(msg);
                     break;
@@ -824,23 +857,30 @@ public class MessageFragment extends EasyFragment {
                     if (TASK_count > 0) {
                         task_num_tv.setText(TASK_count + "");
                         task_num_tv.setVisibility(View.VISIBLE);
-                        task_content_tv.setText("您有新的任务!");
+//                        task_content_tv.setText("您有新的任务!");
+                        if (msg.obj != null){
+                            task_content_tv.setText((String) msg.obj);
+                        }
                         task_time_tv.setText("刚刚");
                     } else {
                         task_num_tv.setVisibility(View.GONE);
-                        task_content_tv.setText("暂无新的任务!");
+                        task_content_tv.setText("");
                     }
                     break;
                 case DAIBAN_MSG:
                     setListener();
                     if (DAIBAN_count > 0) {
+                        String daiban = (String) msg.obj;
                         schedule_num_tv.setText(DAIBAN_count + "");
                         schedule_num_tv.setVisibility(View.VISIBLE);
-                        schedule_content_tv.setText("您有新的待审批流程!");
+//                        schedule_content_tv.setText("您有新的待审批流程!");
+                        if (daiban != null){
+                            schedule_content_tv.setText(daiban);
+                        }
                         schedule_time_tv.setText("刚刚");
                     } else {
                         schedule_num_tv.setVisibility(View.GONE);
-                        schedule_content_tv.setText("暂无新的审批流程!");
+                        schedule_content_tv.setText("");
                     }
                     break;
             }
@@ -853,11 +893,14 @@ public class MessageFragment extends EasyFragment {
         if (count > 0) {
             notice_num_tv.setText(count + "");
             notice_num_tv.setVisibility(View.VISIBLE);
-            notice_content_tv.setText("您有新的通知公告!");
+            if (mNoticeMsg != null){
+                notice_content_tv.setText(mNoticeMsg);
+            }
+//            notice_content_tv.setText("您有新的通知公告!");
             notice_time_tv.setText("刚刚");
         } else {
             notice_num_tv.setVisibility(View.GONE);
-            notice_content_tv.setText("暂无新的通知公告!");
+            notice_content_tv.setText("");
         }
     }
 
@@ -882,6 +925,9 @@ public class MessageFragment extends EasyFragment {
                         if (((int) newsEntity.getData().get(i).getSTATUS()) != -1) {
                             if ((!StringUtils.isEmpty(em_id) && newsEntity.getData().get(i).getNO_RECIPIENTID() != null)) {
                                 if (newsEntity.getData().get(i).getNO_RECIPIENTID().toString().contains(em_id)) {
+                                    if (mNoticeMsg == null){
+                                        mNoticeMsg = newsEntity.getData().get(0).getNO_TITLE().replace("&nbsp;", "");
+                                    }
                                     count++;
                                 }
                             }
@@ -889,9 +935,15 @@ public class MessageFragment extends EasyFragment {
                     } else {
                         if ((!StringUtils.isEmpty(em_id) && newsEntity.getData().get(i).getNO_RECIPIENTID() != null)) {
                             if (newsEntity.getData().get(i).getNO_RECIPIENTID().toString().contains(em_id)) {
+                                if (mNoticeMsg == null){
+                                    mNoticeMsg = newsEntity.getData().get(0).getNO_TITLE().replace("&nbsp;", "");
+                                }
                                 count++;
                             }
                         } else {
+                            if (mNoticeMsg == null){
+                                mNoticeMsg = newsEntity.getData().get(0).getNO_TITLE().replace("&nbsp;", "");
+                            }
                             count++;
                         }
                     }
@@ -923,6 +975,9 @@ public class MessageFragment extends EasyFragment {
                         if (((int) newsEntity.getData().get(i).getSTATUS()) != -1) {
                             if ((!StringUtils.isEmpty(em_id) && newsEntity.getData().get(i).getNO_RECIPIENTID() != null)) {
                                 if (newsEntity.getData().get(i).getNO_RECIPIENTID().toString().contains(em_id)) {
+                                    if (mNoticeMsg == null){
+                                        mNoticeMsg = newsEntity.getData().get(0).getNO_TITLE().replace("&nbsp;", "");
+                                    }
                                     count++;
                                 }
                             }
@@ -930,9 +985,15 @@ public class MessageFragment extends EasyFragment {
                     } else {
                         if ((!StringUtils.isEmpty(em_id) && newsEntity.getData().get(i).getNO_RECIPIENTID() != null)) {
                             if (newsEntity.getData().get(i).getNO_RECIPIENTID().toString().contains(em_id)) {
+                                if (mNoticeMsg == null){
+                                    mNoticeMsg = newsEntity.getData().get(0).getNO_TITLE().replace("&nbsp;", "");
+                                }
                                 count++;
                             }
                         } else {
+                            if (mNoticeMsg == null){
+                                mNoticeMsg = newsEntity.getData().get(0).getNO_TITLE().replace("&nbsp;", "");
+                            }
                             count++;
                         }
                     }
@@ -959,9 +1020,15 @@ public class MessageFragment extends EasyFragment {
                 for (int i = 0; i < size; i++) {
                     if (!ObjectUtils.isEquals(news.getData().get(i).getSTATUS(), null)) {
                         if (((int) news.getData().get(i).getSTATUS()) != -1) {
+                            if (mNoticeMsg == null){
+                                mNoticeMsg = news.getData().get(0).getNE_THEME().replace("&nbsp;", "");
+                            }
                             count++;
                         }
                     } else {
+                        if (mNoticeMsg == null){
+                            mNoticeMsg = news.getData().get(0).getNE_THEME().replace("&nbsp;","")   ;
+                        }
                         count++;//数据为空,算是未读
                     }
                 }
@@ -998,7 +1065,13 @@ public class MessageFragment extends EasyFragment {
                     }
                 }
                 TASK_count = task_num;
-                handler.sendEmptyMessage(TASK_MSG);
+                Message TaskMsg = Message.obtain();
+                TaskMsg.what = TASK_MSG;
+                if (allProcesses.size() != 0){
+                    TaskMsg.obj = allProcesses.get(0).getTaskname();
+                }
+                handler.sendMessage(TaskMsg);
+//                handler.sendEmptyMessage(TASK_MSG);
 //                DAIBAN_count = daiban_num;
 //                handler.sendEmptyMessage(DAIBAN_MSG);
             }

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

@@ -14,6 +14,7 @@ import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
@@ -36,6 +37,7 @@ import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
+import com.xzjmyk.pm.activity.view.RecycleViewDivider;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
 import com.xzjmyk.pm.activity.view.crouton.Style;
 
@@ -140,6 +142,8 @@ public class Subscription2Activity extends BaseActivity {
         });
         layoutManager = new LinearLayoutManager(ct);
         recycler.setLayoutManager(layoutManager);
+        recycler.addItemDecoration(new RecycleViewDivider(this, LinearLayout.HORIZONTAL,
+                1,getResources().getColor(R.color.gray_light)));
         adapter = new SubscriptionAdapter();
         DefaultItemAnimator itemAnimator = new DefaultItemAnimator();
         recycler.setItemAnimator(itemAnimator);

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

@@ -0,0 +1,44 @@
+package com.xzjmyk.pm.activity.view;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.drawable.Drawable;
+import android.util.AttributeSet;
+import android.widget.TextView;
+
+/**
+ * drawableLeft与文本一起居中显示
+ * Created by RaoMeng on 2016/2/23.
+ */
+public class DrawableCenterTextView extends TextView {
+
+    public DrawableCenterTextView(Context context, AttributeSet attrs,
+            int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    public DrawableCenterTextView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public DrawableCenterTextView(Context context) {
+        super(context);
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        Drawable[] drawables = getCompoundDrawables();
+        if (drawables != null) {
+            Drawable drawableLeft = drawables[0];
+            if (drawableLeft != null) {
+                float textWidth = getPaint().measureText(getText().toString());
+                int drawablePadding = getCompoundDrawablePadding();
+                int drawableWidth = 0;
+                drawableWidth = drawableLeft.getIntrinsicWidth();
+                float bodyWidth = textWidth + drawableWidth + drawablePadding;
+                canvas.translate((getWidth() - bodyWidth) / 2, 0);
+            }
+        }
+        super.onDraw(canvas);
+    }
+}

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

@@ -0,0 +1,126 @@
+package com.xzjmyk.pm.activity.view;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
+import android.support.v4.content.ContextCompat;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+
+public class RecycleViewDivider extends RecyclerView.ItemDecoration {
+
+    private Paint mPaint;
+    private Drawable mDivider;
+    private int mDividerHeight = 2;//分割线高度，默认为1px
+    private int mOrientation;//列表的方向：LinearLayoutManager.VERTICAL或LinearLayoutManager.HORIZONTAL
+    private static final int[] ATTRS = new int[]{android.R.attr.listDivider};
+
+    /**
+     * 默认分割线：高度为2px，颜色为灰色
+     *
+     * @param context
+     * @param orientation 列表方向
+     */
+    public RecycleViewDivider(Context context, int orientation) {
+        if (orientation != LinearLayoutManager.VERTICAL && orientation != LinearLayoutManager.HORIZONTAL) {
+            throw new IllegalArgumentException("请输入正确的参数！");
+        }
+        mOrientation = orientation;
+
+        final TypedArray a = context.obtainStyledAttributes(ATTRS);
+        mDivider = a.getDrawable(0);
+        a.recycle();
+    }
+
+    /**
+     * 自定义分割线
+     *
+     * @param context
+     * @param orientation 列表方向
+     * @param drawableId  分割线图片
+     */
+    public RecycleViewDivider(Context context, int orientation, int drawableId) {
+        this(context, orientation);
+        mDivider = ContextCompat.getDrawable(context, drawableId);
+        mDividerHeight = mDivider.getIntrinsicHeight();
+    }
+
+    /**
+     * 自定义分割线
+     *
+     * @param context
+     * @param orientation   列表方向
+     * @param dividerHeight 分割线高度
+     * @param dividerColor  分割线颜色
+     */
+    public RecycleViewDivider(Context context, int orientation, int dividerHeight, int dividerColor) {
+        this(context, orientation);
+        mDividerHeight = dividerHeight;
+        mPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+        mPaint.setColor(dividerColor);
+        mPaint.setStyle(Paint.Style.FILL);
+    }
+
+
+    //获取分割线尺寸
+    @Override
+    public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
+        super.getItemOffsets(outRect, view, parent, state);
+        outRect.set(0, 0, 0, mDividerHeight);
+    }
+
+    //绘制分割线
+    @Override
+    public void onDraw(Canvas c, RecyclerView parent, RecyclerView.State state) {
+        super.onDraw(c, parent, state);
+        if (mOrientation == LinearLayoutManager.VERTICAL) {
+            drawVertical(c, parent);
+        } else {
+            drawHorizontal(c, parent);
+        }
+    }
+
+    //绘制横向 item 分割线
+    private void drawHorizontal(Canvas canvas, RecyclerView parent) {
+        final int left = parent.getPaddingLeft();
+        final int right = parent.getMeasuredWidth() - parent.getPaddingRight();
+        final int childSize = parent.getChildCount();
+        for (int i = 0; i < childSize; i++) {
+            final View child = parent.getChildAt(i);
+            RecyclerView.LayoutParams layoutParams = (RecyclerView.LayoutParams) child.getLayoutParams();
+            final int top = child.getBottom() + layoutParams.bottomMargin;
+            final int bottom = top + mDividerHeight;
+            if (mDivider != null) {
+                mDivider.setBounds(left, top, right, bottom);
+                mDivider.draw(canvas);
+            }
+            if (mPaint != null) {
+                canvas.drawRect(left, top, right, bottom, mPaint);
+            }
+        }
+    }
+
+    //绘制纵向 item 分割线
+    private void drawVertical(Canvas canvas, RecyclerView parent) {
+        final int top = parent.getPaddingTop();
+        final int bottom = parent.getMeasuredHeight() - parent.getPaddingBottom();
+        final int childSize = parent.getChildCount();
+        for (int i = 0; i < childSize; i++) {
+            final View child = parent.getChildAt(i);
+            RecyclerView.LayoutParams layoutParams = (RecyclerView.LayoutParams) child.getLayoutParams();
+            final int left = child.getRight() + layoutParams.rightMargin;
+            final int right = left + mDividerHeight;
+            if (mDivider != null) {
+                mDivider.setBounds(left, top, right, bottom);
+                mDivider.draw(canvas);
+            }
+            if (mPaint != null) {
+                canvas.drawRect(left, top, right, bottom, mPaint);
+            }
+        }
+    }
+}

WeiChat/src/main/res/color/selector_schedule_text.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/black" android:state_selected="true"/>
+    <item android:color="@color/black" android:state_pressed="true"/>
+    <item android:color="@color/black" android:state_checked="true"/>
+    <item android:color="@color/white" />
+</selector>

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

@@ -14,7 +14,8 @@
         android:id="@+id/list_news"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:divider="@null"
+        android:divider="@color/gray_light"
+        android:dividerPadding="1px"
         android:fadingEdge="none"
         android:listSelector="#00000000"
         android:scrollingCache="false"

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

@@ -33,7 +33,8 @@
         android:id="@+id/lv_process"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:divider="@null"
+        android:divider="@color/gray_light"
+        android:dividerPadding="1px"
         android:listSelector="#00000000"
         android:scrollingCache="false"
         android:scrollbars="none" >

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

@@ -26,7 +26,8 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:paddingLeft="@dimen/sub_padding"
-            android:paddingRight="@dimen/sub_padding" />
+            android:paddingRight="@dimen/sub_padding"
+            />
     </android.support.v4.widget.SwipeRefreshLayout>
 
 </RelativeLayout>

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

@@ -29,7 +29,19 @@
             android:textColorHint="@color/grey"
             android:textSize="15sp" />
     </RelativeLayout>
-<!--  android:layerType="software"-->
+
+    <com.xzjmyk.pm.activity.view.DrawableCenterTextView
+        android:id="@+id/message_net_set"
+        android:layout_width="match_parent"
+        android:layout_height="35dp"
+        android:background="#fcd8d8"
+        android:text="当前网络不可用，请检查您的网络设置"
+        android:gravity="center_vertical"
+        android:textColor="@color/black"
+        android:drawableLeft="@drawable/ic_net_noticce"
+        android:drawablePadding="10dp"
+        android:visibility="gone"/>
+
     <com.xzjmyk.pm.activity.view.PullToRefreshSlideListView
         xmlns:slide="http://schemas.android.com/apk/res-auto"
         android:id="@+id/pull_refresh_list"

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

@@ -31,5 +31,5 @@
         android:layout_height="wrap_content" 
         android:text="状态"
         android:autoText="false"
-        android:textColor="#64268509" />
+        android:textColor="#268509" />
 </LinearLayout>

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

@@ -20,6 +20,7 @@
         android:layout_marginTop="10dp"
         android:layout_toLeftOf="@id/item_image"
         android:text="aaaa"
+        android:layout_marginRight="10dp"
         android:textSize="@dimen/text_hine" />
 
     <TextView

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

@@ -83,7 +83,6 @@
                 android:layout_marginTop="8dp"
                 android:ellipsize="end"
                 android:singleLine="true"
-                android:text="暂无未阅读审批流程"
                 android:textColor="@color/text_hine"
                 android:textSize="14sp" />
         </RelativeLayout>
@@ -174,7 +173,6 @@
                 android:layout_marginTop="8dp"
                 android:ellipsize="end"
                 android:singleLine="true"
-                android:text="暂无未阅读任务"
                 android:textColor="@color/text_hine"
                 android:textSize="14sp" />
         </RelativeLayout>
@@ -264,7 +262,6 @@
                 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" />
@@ -356,7 +353,6 @@
                 android:layout_marginTop="8dp"
                 android:ellipsize="end"
                 android:singleLine="true"
-                android:text="暂无未阅读订阅消息"
                 android:textColor="@color/text_hine"
                 android:textSize="14sp" />
         </RelativeLayout>
@@ -446,7 +442,6 @@
                 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/p_msg_item_main_body.xml

@@ -98,7 +98,7 @@
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
-                android:background="@drawable/operation_more_bg"
+                android:background="@drawable/ic_msg_friend"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
 
@@ -112,7 +112,7 @@
             android:ellipsize="end"
             android:layout_marginTop="5dp"
             android:lines="1"
-            android:drawableLeft="@drawable/oa_signin" />
+            android:drawableLeft="@drawable/ic_positon_friend" />
 
         <FrameLayout
             android:layout_width="match_parent"
@@ -136,7 +136,7 @@
                     android:id="@+id/multi_praise_tv"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
-                    android:drawableLeft="@drawable/likes"
+                    android:drawableLeft="@drawable/ic_zan_friend"
                     android:paddingBottom="2dp"
                     android:paddingTop="10dp"
                     android:textSize="@dimen/text_min" />

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

@@ -8,26 +8,29 @@
 
     <TextView
         android:id="@+id/praise_tv"
-        android:layout_width="60dp"
-        android:layout_height="35dp"
+        android:layout_width="80dp"
+        android:layout_height="30dp"
         android:gravity="center"
         android:drawableLeft="@drawable/like"
         android:text="@string/praise"
+        android:paddingLeft="5dp"
         android:textColor="@color/white"
         android:textSize="@dimen/text_hine" />
 
     <View
         android:layout_width="1px"
-        android:layout_height="35dp"
+        android:layout_height="30dp"
         android:background="@color/white" />
 
     <TextView
         android:id="@+id/comment_tv"
-        android:layout_width="60dp"
-        android:layout_height="35dp"
+        android:layout_width="80dp"
+        android:layout_height="30dp"
         android:gravity="center"
         android:drawableLeft="@drawable/sead"
         android:text="@string/comment"
+        android:paddingRight="5dp"
+        android:paddingLeft="5dp"
         android:textColor="@color/white"
         android:textSize="@dimen/text_hine" />
 

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

@@ -32,6 +32,7 @@
             android:background="@drawable/shape_process_item"
             android:layout_weight="1"
             android:text="待审批"
+            android:textColor="@color/selector_schedule_text"
             android:id="@+id/tv_process_un" />
 
         <TextView
@@ -40,8 +41,8 @@
             android:layout_gravity="center_vertical"
             android:layout_weight="1"
             android:background="@drawable/shape_process_item"
-            
-           
+
+            android:textColor="@color/selector_schedule_text"
             android:gravity="center"
             android:text="已审批"
             android:id="@+id/tv_process_already" />
@@ -52,7 +53,8 @@
             android:layout_gravity="center_vertical"
             android:layout_weight="1"
             android:background="@drawable/shape_process_item"
-         
+            android:textColor="@color/selector_schedule_text"
+
             android:gravity="center"
             android:text="我发起的"
             android:id="@+id/tv_process_me" />

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

@@ -190,7 +190,7 @@
     <string name="msg_animation">[动画]</string>
     <string name="msg_video">[视频]</string>
     <string name="msg_file">[文件]</string>
-    <string name="msg_online">消息(在线)</string>
+    <string name="msg_online">消息</string>
     <string name="msg_offline">消息(离线)</string>
     <string name="msg_connect">消息(连接中)</string>
     <string name="msg_be_add_attention">有人关注了你</string>