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

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/BasicInfoActivity.java

@@ -447,42 +447,6 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
     }
 
     private void initView() {
-        phone_img.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (!StringUtils.isEmpty(phone_tv.getText().toString())) {
-                    String check = "^((13[0-9])|(15[^4,\\D])|(18[0,5-9]))\\d{8}$";
-                    Pattern regex = Pattern.compile(check);
-                    Matcher matcher = regex.matcher(phone_tv.getText().toString());
-                    boolean isMatched = matcher.matches();
-                    if (isMatched) {
-                        phoneAction(phone_tv.getText().toString());
-                    } else {
-                        ViewUtil.ShowMessageTitle(BasicInfoActivity.this, "手机格式不正确！");
-                    }
-                }
-            }
-        });
-        mDataLoadView.setLoadingEvent(new DataLoadView.LoadingEvent() {
-            @Override
-            public void load() {
-                loadOthersInfoFromNet();
-            }
-        });
-        if (getIntent() != null) {
-            Friend friend = (Friend) getIntent().getSerializableExtra("friend");
-            if (friend == null) {
-                return;
-            }
-            String depart = friend.getDepart();
-            String position = friend.getPosition();
-            email_tv.setText(StringUtils.isEmpty(friend.getPrivacy()) ? "" : friend.getPrivacy());
-            if (!StringUtils.isEmpty(depart) && !StringUtils.isEmpty(position)) {
-                sub_tv.setText(depart + " > " + position);
-            } else {
-                sub_tv.setText(StringUtils.isEmpty(depart) ? "" : depart + (StringUtils.isEmpty(position) ? "" : position));
-            }
-        }
         mMoreMenuView = View.inflate(getApplicationContext(), R.layout.layout_menu_person_info, null);
         mRemarkNameTv = (TextView) mMoreMenuView.findViewById(R.id.basic_info_set_remark_name);
         mRemoveBlackTv = (TextView) mMoreMenuView.findViewById(R.id.basic_info_remove_blacklist);
@@ -534,6 +498,42 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
                 closeMorePopupWindow();
             }
         });
+        phone_img.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (!StringUtils.isEmpty(phone_tv.getText().toString())) {
+                    String check = "^((13[0-9])|(15[^4,\\D])|(18[0,5-9]))\\d{8}$";
+                    Pattern regex = Pattern.compile(check);
+                    Matcher matcher = regex.matcher(phone_tv.getText().toString());
+                    boolean isMatched = matcher.matches();
+                    if (isMatched) {
+                        phoneAction(phone_tv.getText().toString());
+                    } else {
+                        ViewUtil.ShowMessageTitle(BasicInfoActivity.this, "手机格式不正确！");
+                    }
+                }
+            }
+        });
+        mDataLoadView.setLoadingEvent(new DataLoadView.LoadingEvent() {
+            @Override
+            public void load() {
+                loadOthersInfoFromNet();
+            }
+        });
+        if (getIntent() != null) {
+            Friend friend = (Friend) getIntent().getSerializableExtra("friend");
+            if (friend == null) {
+                return;
+            }
+            String depart = friend.getDepart();
+            String position = friend.getPosition();
+            email_tv.setText(StringUtils.isEmpty(friend.getPrivacy()) ? "" : friend.getPrivacy());
+            if (!StringUtils.isEmpty(depart) && !StringUtils.isEmpty(position)) {
+                sub_tv.setText(depart + " > " + position);
+            } else {
+                sub_tv.setText(StringUtils.isEmpty(depart) ? "" : depart + (StringUtils.isEmpty(position) ? "" : position));
+            }
+        }
 
     }
 

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

@@ -16,6 +16,7 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
+import android.view.ViewConfiguration;
 import android.view.ViewGroup;
 import android.view.WindowManager;
 import android.view.animation.Animation;
@@ -50,7 +51,6 @@ import com.xzjmyk.pm.activity.ui.erp.fragment.CalendarFragmet;
 import com.xzjmyk.pm.activity.ui.erp.model.Employees;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
-import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.util.JsonValidator;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
@@ -211,6 +211,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
     };
     private boolean scrollable = true;
     private float downY;
+    private float upY;
     private float moveY;
 
     private Set<Integer> getDay(JSONArray array) {
@@ -546,9 +547,12 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
         if (chche.size() <= 0) {
             emptyLayout.showEmpty();
         }
-        all_task_num.setText("工作日历 " + size);
-        ok_task_num.setText("已完成 " + ok);
-        uok_task_num.setText("未完成 " + (size - ok));
+        CommonUtil.textSpanForStyle(all_task_num, "工作日历 " + size, size + "", getResources().getColor(R.color.orange_text));
+        CommonUtil.textSpanForStyle(ok_task_num, "已完成 " + ok, ok + "", getResources().getColor(R.color.orange_text));
+        CommonUtil.textSpanForStyle(uok_task_num, "未完成 " + (size - ok), (size - ok) + "", getResources().getColor(R.color.orange_text));
+//        all_task_num.setText("工作日历 " + size);
+//        ok_task_num.setText("已完成 " + ok);
+//        uok_task_num.setText("未完成 " + (size - ok));
         adapter.setArray(chche, isMe);
         adapter.notifyDataSetChanged();
 
@@ -648,13 +652,17 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
             }
             setDateToListener(meInt);
             ok_scale.setVisibility(View.GONE);
+            my_log.setTextColor(getResources().getColor(R.color.darkorange));
+            subord_log.setTextColor(getResources().getColor(R.color.dimgrey));
             my_log_tag.setBackgroundResource(R.color.darkorange);
-            subord_log_tag.setBackgroundDrawable(null);
+            subord_log_tag.setBackgroundResource(R.color.item_line);
         } else {
             setDateToListener(otherInt);
             ok_scale.setVisibility(View.VISIBLE);
+            my_log.setTextColor(getResources().getColor(R.color.dimgrey));
+            subord_log.setTextColor(getResources().getColor(R.color.darkorange));
             subord_log_tag.setBackgroundResource(R.color.darkorange);
-            my_log_tag.setBackgroundDrawable(null);
+            my_log_tag.setBackgroundResource(R.color.item_line);
         }
         setAdapterBeans();
     }
@@ -812,25 +820,27 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
         listenerMap.put(key, listener);
     }
 
-
     @Override
     public boolean dispatchTouchEvent(MotionEvent ev) {
-        if (scrollable){
+        if (scrollable) {
             return super.dispatchTouchEvent(ev);
-        }else {
+        } else {
             int action = ev.getAction();
-            switch (action){
+            switch (action) {
                 case MotionEvent.ACTION_DOWN:
                     downY = ev.getRawY();
                     break;
                 case MotionEvent.ACTION_UP:
-                    if (Math.abs(moveY - downY) > 0){
+                    upY = ev.getRawY();
+                    Log.d("dispatchTouchup",upY+"");
+                    if (Math.abs(upY - downY) > ViewConfiguration.get(OAActivity.this).getScaledTouchSlop()) {
                         return true;
                     }
                     break;
                 case MotionEvent.ACTION_MOVE:
                     moveY = ev.getRawY();
-                    if (Math.abs(moveY - downY) > 0){
+                    Log.d("dispatchTouchmove",moveY+"");
+                    if (Math.abs(moveY - downY) > ViewConfiguration.get(OAActivity.this).getScaledTouchSlop()) {
                         return true;
                     }
                     break;

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

@@ -95,10 +95,10 @@ public class OutSigninOKActivity extends BaseActivity {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == R.id.push) {
-            /*if (StringUtils.isEmpty(text_edit.getText().toString())) {
+            if (StringUtils.isEmpty(text_edit.getText().toString())) {
                 Crouton.makeText(ct, "请填写备注");
                 return true;
-            }*/
+            }
             if (!StringUtils.isEmpty(path) && new File(path).isFile())
                 uploadFile(path);
             else

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

@@ -99,7 +99,7 @@ public class HListViewOneAdapter extends BaseAdapter {
         LinearLayout.LayoutParams tp = new LinearLayout.LayoutParams(
                 CommonUtil.dip2px(ct, 72),
                 LayoutParams.MATCH_PARENT,1.0f);
-        tView.setMinHeight(CommonUtil.dip2px(ct, 40));
+        tView.setMinHeight(CommonUtil.dip2px(ct, 30));
         tView.setLayoutParams(tp);
         tView.setGravity(Gravity.CENTER);
         tView.setBackground(ct.getResources().getDrawable(R.drawable.shape_btn_nomargin));

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

@@ -113,6 +113,7 @@ public class SubscriptionAllFragment extends BaseFragment {
             @Override
             public void onPullDownToRefresh(PullToRefreshBase<ListView> refreshView) {
                 if (CommonUtil.isNetWorkConnected(getActivity().getApplicationContext())){
+                    progressDialog.setCancelable(false);
                     mAllSubscriptonKindMessages.clear();
 //                    rbPos = 0;
                     sendAllSubscriptionRequest();
@@ -177,6 +178,7 @@ public class SubscriptionAllFragment extends BaseFragment {
                                 mAllSubscriptionAdapter.notifyDataSetChanged();
                             } else {
                                 rbPos = 0;
+                                mBufferKey = keyStrings.get(0);
                                 mTypeListView.setVisibility(View.VISIBLE);
                                 mSubsTypeAdapter.notifyDataSetChanged();
                                 mAllSubscriptionAdapter.getmSubscriptionNumbers().clear();
@@ -245,6 +247,7 @@ public class SubscriptionAllFragment extends BaseFragment {
                             mAllSubscriptionAdapter.notifyDataSetChanged();
                         } else {
                             rbPos = 0;
+                            mBufferKey = keyStrings.get(0);
                             mTypeListView.setVisibility(View.VISIBLE);
                             mSubsTypeAdapter.notifyDataSetChanged();
 
@@ -408,8 +411,6 @@ public class SubscriptionAllFragment extends BaseFragment {
                         JSONArray datasArray = resultObject.getJSONArray("datas");
                         JSONObject datasObject = datasArray.getJSONObject(0);
                         Iterator<String> iterator = datasObject.keys();
-                        keyStrings.clear();
-                        mAllKeyStrings.clear();
                         if (!iterator.hasNext()) {
                             SharedUtil.putString(currentMaster + currentUser + "subs", null);
                             SharedUtil.putString(currentMaster + currentUser + "allsubs", null);
@@ -420,12 +421,16 @@ public class SubscriptionAllFragment extends BaseFragment {
                                 mPullToRefreshListView.onRefreshComplete();
                                 Crouton.makeText(getActivity(), "没有未订阅数据", 0xff99cc00, 1500).show();
                             }
+                            keyStrings.clear();
+                            mAllKeyStrings.clear();
                             progressDialog.dismiss();
                             mSubsTypeAdapter.notifyDataSetChanged();
                             mTypeListView.setVisibility(View.GONE);
                             return;
                         }
 
+                        keyStrings.clear();
+                        mAllKeyStrings.clear();
                         while (iterator.hasNext()) {
                             String key = iterator.next().toString();
                             Log.d("allsubskeys: ", key);
@@ -523,6 +528,7 @@ public class SubscriptionAllFragment extends BaseFragment {
                         mAllSubscriptionAdapter.notifyDataSetChanged();
                     }
                     initKeyStrings();
+                    progressDialog.setCancelable(true);
                     progressDialog.dismiss();
 
                     if (mPullToRefreshListView.isRefreshing()) {

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

@@ -48,13 +48,13 @@ public class FunnelView extends View implements ValueAnimator.AnimatorUpdateList
     private ArrayList<Float> mPathAngleWidths = new ArrayList<>();
     
     private float mTotalHeight = 
-            TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 250, getResources().getDisplayMetrics());
+            TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 200, getResources().getDisplayMetrics());
     private float maxWidth = 
             TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,
                    355,
                     getResources().getDisplayMetrics());
     private float maxLineH = 
-            TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 250, getResources().getDisplayMetrics());
+            TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 200, getResources().getDisplayMetrics());
     private float minLineH = 
             TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 0, getResources().getDisplayMetrics());
 

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

@@ -197,13 +197,18 @@ public class OACalendarView extends View implements View.OnTouchListener {
 
     //画日期
     private void drawDay(Canvas canvas) {
-        float dayTextY = surface.weekHeight +(surface.cellHeight +surface.dateTaxtSize) / 2;
         String chche = "";
         //画上个月日期
         calendar.setTime(curDate);
         calendar.add(Calendar.MONTH, -1);
         int startItem = calendar.getActualMaximum(Calendar.DATE) - startIndex + 1;//获取当月有多少天
         calendar.set(Calendar.DAY_OF_MONTH, startItem);
+        //使文字垂直居中
+        Paint.FontMetrics fontMetrics = surface.hineDatePaint.getFontMetrics();
+        float fontHeight = fontMetrics.bottom - fontMetrics.top;
+//        float dayTextY = surface.weekHeight +(surface.cellHeight +surface.dateTaxtSize) / 2;
+        float dayTextY = surface.weekHeight + (surface.cellHeight + fontHeight) / 2 - fontMetrics.bottom;
+
         for (int i = 0; i < startIndex; i++) {
             float dayTextX = i * surface.cellWidth + (surface.cellWidth - surface.hineDatePaint.measureText("今")) / 2f;
             canvas.drawText(calendar.get(Calendar.DAY_OF_MONTH) + "", dayTextX, dayTextY, surface.hineDatePaint);

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

@@ -61,13 +61,14 @@
                     <RelativeLayout
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
+                        android:layout_marginLeft="10dp"
                         android:layout_gravity="top">
 
                         <RadioGroup
                             android:id="@+id/rg_nav_content"
                             android:layout_width="match_parent"
                             android:layout_height="40dip"
-                            android:background="#F2F2F2"
+                            android:background="#FfFfFf"
                             android:orientation="horizontal" />
                     </RelativeLayout>
                 </HorizontalScrollView>
@@ -97,7 +98,8 @@
                     <View
                         android:layout_width="1dp"
                         android:layout_height="match_parent"
-                        android:background="#DEDEDE" />
+                        android:background="#DEDEDE"
+                        android:visibility="gone"/>
 
                     <com.xzjmyk.pm.activity.ui.erp.view.CustomerListView
                         android:id="@+id/lv_left_list"

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

@@ -79,7 +79,7 @@
                         android:layout_below="@id/avatar_img"
                         android:layout_centerHorizontal="true"
                         android:layout_marginTop="10dp"
-                        android:textColor="@color/white"
+                        android:textColor="@color/black"
                         android:textSize="@dimen/text_hine" />
 
                     <TextView
@@ -89,7 +89,7 @@
                         android:layout_below="@id/name_tv"
                         android:layout_centerHorizontal="true"
                         android:layout_marginTop="10dp"
-                        android:textColor="@color/white"
+                        android:textColor="@color/black"
                         android:textSize="@dimen/text_hine" />
 
 
@@ -104,7 +104,7 @@
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="45dp"
-                android:paddingLeft="20dp"
+                android:paddingLeft="10dp"
                 android:paddingRight="20dp">
 
                 <TextView
@@ -144,7 +144,7 @@
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="45dp"
-                android:paddingLeft="20dp"
+                android:paddingLeft="10dp"
                 android:paddingRight="20dp">
 
                 <TextView
@@ -152,7 +152,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
-                    android:text="Email"
+                    android:text="邮箱"
                     android:textColor="@color/text_main"
                     android:textSize="@dimen/text_main" />
 

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

@@ -34,46 +34,53 @@
 
             <RelativeLayout
                 android:layout_width="match_parent"
-                android:layout_height="80dp"
+                android:layout_height="60dp"
                 android:layout_alignParentBottom="true"
                 android:background="#60000000">
                 <ImageView
                     android:id="@+id/head_img"
-                    android:layout_width="60dp"
-                    android:layout_height="60dp"
-                    android:layout_margin="10dp"
+                    android:layout_width="50dp"
+                    android:layout_height="50dp"
+                    android:layout_margin="5dp"
                     android:scaleType="fitXY" />
-
-                <TextView
-                    android:id="@+id/name_tv"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignTop="@id/head_img"
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
                     android:layout_toRightOf="@id/head_img"
-                    android:textSize="12dp"
-                    android:textColor="@color/white" />
+                    android:orientation="vertical"
+                    android:gravity="center_vertical">
+                    <TextView
+                        android:id="@+id/name_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignTop="@id/head_img"
+                        android:layout_toRightOf="@id/head_img"
+                        android:textSize="12dp"
+                        android:textColor="@color/white" />
+
+                    <TextView
+                        android:id="@+id/num_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignLeft="@id/name_tv"
+                        android:layout_below="@id/name_tv"
+                        android:layout_marginTop="5dp"
+                        android:textSize="12dp"
+                        android:textColor="@color/white"
+                        android:visibility="gone" />
 
-                <TextView
-                    android:id="@+id/num_tv"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignLeft="@id/name_tv"
-                    android:layout_below="@id/name_tv"
-                    android:layout_marginTop="5dp"
-                    android:textSize="12dp"
-                    android:textColor="@color/white"
-                    android:visibility="gone" />
+                    <TextView
+                        android:id="@+id/prot_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignLeft="@id/num_tv"
+                        android:layout_below="@id/num_tv"
+                        android:layout_marginTop="5dp"
+                        android:textSize="12dp"
+                        android:text="name"
+                        android:textColor="@color/white" />
+                </LinearLayout>
 
-                <TextView
-                    android:id="@+id/prot_tv"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignLeft="@id/num_tv"
-                    android:layout_below="@id/num_tv"
-                    android:layout_marginTop="5dp"
-                    android:textSize="12dp"
-                    android:text="name"
-                    android:textColor="@color/white" />
             </RelativeLayout>
 
         </RelativeLayout>

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

@@ -220,7 +220,7 @@
                         android:layout_height="4px"
                         android:layout_marginLeft="20dp"
                         android:layout_weight="1"
-                        android:background="@null" />
+                        android:background="@color/item_line" />
                 </LinearLayout>
                 <!--end 标签布局-->
 
@@ -257,7 +257,8 @@
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="2px"
-                    android:background="@color/item_line" />
+                    android:background="@color/item_line"
+                    android:visibility="gone"/>
 
                 <android.support.v4.view.ViewPager
                     android:id="@+id/viewPager"
@@ -287,7 +288,7 @@
                     <View
                         android:layout_width="1px"
                         android:layout_height="match_parent"
-                        android:background="#f17e21" />
+                        android:background="@color/item_line" />
 
                     <TextView
                         android:id="@+id/ok_task_num"
@@ -301,7 +302,7 @@
                     <View
                         android:layout_width="1px"
                         android:layout_height="match_parent"
-                        android:background="#f17e21" />
+                        android:background="@color/item_line" />
 
                     <TextView
                         android:id="@+id/uok_task_num"

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

@@ -11,18 +11,20 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
+
         <RelativeLayout
+            android:id="@+id/top_tag"
             android:layout_width="match_parent"
-            android:layout_height="40dp"
-            android:paddingLeft="10dp"
-            android:paddingRight="10dp">
+            android:layout_height="wrap_content"
+            android:background="@color/white"
+            android:padding="10dp">
+
 
             <TextView
                 android:id="@+id/com_tag"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginRight="10dp"
-                android:layout_marginTop="10dp"
                 android:drawableLeft="@drawable/outffice_com"
                 android:drawablePadding="6dp"
                 android:text="当前企业:"
@@ -37,14 +39,6 @@
                 android:ellipsize="end"
                 android:lines="1"
                 android:textSize="@dimen/text_hine" />
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:id="@+id/top_tag"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/white"
-            android:padding="10dp">
 
             <TextView
                 android:id="@+id/time_tag"
@@ -52,6 +46,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginRight="10dp"
                 android:drawableLeft="@drawable/outoffice_time"
+                android:layout_below="@id/com_tag"
+                android:layout_marginTop="5dp"
                 android:drawablePadding="6dp"
                 android:text="签到时间:"
                 android:textSize="@dimen/text_hine" />
@@ -90,7 +86,7 @@
 
         <View
             android:layout_width="match_parent"
-            android:layout_height="20dp" />
+            android:layout_height="10dp" />
 
         <LinearLayout
             android:layout_width="match_parent"

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

@@ -4,20 +4,20 @@
     android:background="@drawable/bg_main">
 
     <com.handmark.pulltorefresh.library.PullToRefreshListView xmlns:ptr="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/pull_refresh_list"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:divider="#00000000"
-    android:dividerHeight="0dip"
-    android:listSelector="@android:color/transparent"
-    ptr:ptrAnimationStyle="flip"
-    ptr:ptrDrawableEnd="@drawable/default_ptr_rotate"
-    ptr:ptrDrawableStart="@drawable/default_ptr_flip"
-    ptr:ptrHeaderTextColor="@color/refresh"
-    ptr:ptrMode="both"
-    ptr:ptrOverScroll="false"
-    ptr:ptrScrollingWhileRefreshingEnabled="true"
-    ptr:ptrShowIndicator="false" />
+        android:id="@+id/pull_refresh_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:divider="#00000000"
+        android:dividerHeight="0dip"
+        android:listSelector="@android:color/transparent"
+        ptr:ptrAnimationStyle="flip"
+        ptr:ptrDrawableEnd="@drawable/default_ptr_rotate"
+        ptr:ptrDrawableStart="@drawable/default_ptr_flip"
+        ptr:ptrHeaderTextColor="@color/refresh"
+        ptr:ptrMode="both"
+        ptr:ptrOverScroll="false"
+        ptr:ptrScrollingWhileRefreshingEnabled="true"
+        ptr:ptrShowIndicator="false" />
 
 
     <TextView
@@ -32,7 +32,7 @@
         android:textSize="30.0dip"
         android:visibility="invisible" />
 
-    <com.xzjmyk.pm.activity.sortlist.SideBar
+     <com.xzjmyk.pm.activity.sortlist.SideBar
         android:id="@+id/sidebar"
         android:layout_width="30.0dip"
         android:layout_height="match_parent"

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

@@ -453,10 +453,4 @@
         </RelativeLayout>
 
     </RelativeLayout>
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/line"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
-        android:background="@color/item_line" />
 </LinearLayout>

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

@@ -2,7 +2,7 @@
 <RadioButton xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="fill_parent"
-    android:background="#F2F2F2"
+    android:background="#FfFfFf"
     android:button="@null"
     android:checked="true"
     android:drawablePadding="5dp"

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

@@ -299,4 +299,5 @@
     <color name="me_menu_item_normal">#FAF9F9</color>
     <color name="me_menu_item_press">#DFDEDE</color>
     <color name="bg_underlying">#ebe9e9</color>
+    <color name="orange_text">#f17e21</color>
 </resources>