发布版本5.5.6

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

@@ -104,9 +104,9 @@ public class NoticeMenuActivity extends BaseActivity {
                 } else if (setData == type) {
                     bean.unReNun = NES_count;
                     if (bean.unReNun > 0) {
-                        bean.subTitle = "您有" + bean.unReNun + "条新闻未阅读";
+                        bean.subTitle = "您有新的新闻未阅读!";
                     } else {
-                        bean.subTitle = "您暂无未阅读新闻消息";
+                        bean.subTitle = "您暂无未阅读的新闻消息!";
                     }
                     bean.time = "刚刚";
                     bean.title = "新闻";
@@ -119,9 +119,9 @@ public class NoticeMenuActivity extends BaseActivity {
                 else if (setData == type) {
                     bean.unReNun = NOTICE_count;
                     if (bean.unReNun > 0) {
-                        bean.subTitle = "您有" + bean.unReNun + "条通知未阅读";
+                        bean.subTitle = "您有新的通知未阅读!";
                     } else {
-                        bean.subTitle = "您无未阅读通知内容";
+                        bean.subTitle = "您暂无未阅读的通知!";
                     }
                     bean.time = "刚刚";
                     bean.title = "通知";
@@ -133,9 +133,9 @@ public class NoticeMenuActivity extends BaseActivity {
                 else if (setData == type) {
                     bean.unReNun = GONGGAO_count;
                     if (bean.unReNun > 0) {
-                        bean.subTitle = "您有" + bean.unReNun + "条公告未阅读";
+                        bean.subTitle = "您有新的公告未阅读!";
                     } else {
-                        bean.subTitle = "您暂无未阅读公告消息";
+                        bean.subTitle = "您暂无未阅读的公告!";
                     }
                     bean.time = "刚刚";
                     bean.title = "公告";

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

@@ -752,11 +752,11 @@ public class MessageFragment extends EasyFragment {
                     if (num > 0) {
                         num_tv.setText(num + "");
                         num_tv.setVisibility(View.VISIBLE);
-                        content_tv.setText("您有" + num + "条订阅消息");
+                        content_tv.setText("您有新的订阅消息!");
                         time_tv.setText("刚刚");
                     } else {
                         num_tv.setVisibility(View.GONE);
-                        content_tv.setText("您暂无订阅消息");
+                        content_tv.setText("您暂无新的订阅消息!");
                     }
                     break;
                 case Constants.SUCCESS_LOGIN://公告
@@ -786,11 +786,11 @@ 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_count + "条任务");
+                        task_content_tv.setText("您有新的任务!");
                         task_time_tv.setText("刚刚");
                     } else {
                         task_num_tv.setVisibility(View.GONE);
-                        task_content_tv.setText("您暂无任务");
+                        task_content_tv.setText("您暂无新的任务!");
                     }
                     break;
                 case DAIBAN_MSG:
@@ -798,11 +798,11 @@ public class MessageFragment extends EasyFragment {
                     if (DAIBAN_count > 0) {
                         schedule_num_tv.setText(DAIBAN_count + "");
                         schedule_num_tv.setVisibility(View.VISIBLE);
-                        schedule_content_tv.setText("您有" + DAIBAN_count + "条待审批流程");
+                        schedule_content_tv.setText("您有新的待审批流程!");
                         schedule_time_tv.setText("刚刚");
                     } else {
                         schedule_num_tv.setVisibility(View.GONE);
-                        schedule_content_tv.setText("您暂无审批流程");
+                        schedule_content_tv.setText("您暂无新的审批流程!");
                     }
                     break;
             }
@@ -815,11 +815,11 @@ public class MessageFragment extends EasyFragment {
         if (count > 0) {
             notice_num_tv.setText(count + "");
             notice_num_tv.setVisibility(View.VISIBLE);
-            notice_content_tv.setText("您有" + count + "条通知");
+            notice_content_tv.setText("您有新的通知公告!");
             notice_time_tv.setText("刚刚");
         } else {
             notice_num_tv.setVisibility(View.GONE);
-            notice_content_tv.setText("您暂无通知");
+            notice_content_tv.setText("您暂无新的通知公告!");
         }
     }
 

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

@@ -485,6 +485,7 @@
 
             <LinearLayout
                 android:id="@+id/ll_data_one"
+                android:visibility="gone"
                 style="@style/LinearLayout_horizontal"
                 android:padding="8dp">
 
@@ -515,6 +516,7 @@
 
             <LinearLayout
                 android:id="@+id/ll_data_two"
+                android:visibility="gone"
                 style="@style/LinearLayout_horizontal"
                 android:padding="8dp">
 
@@ -545,6 +547,7 @@
 
             <LinearLayout
                 android:id="@+id/ll_data_three"
+                android:visibility="gone"
                 style="@style/LinearLayout_horizontal"
                 android:padding="8dp">
 
@@ -889,6 +892,7 @@
 
             <LinearLayout
                 android:id="@+id/ll_customer_lost"
+                android:visibility="gone"
                 style="@style/LinearLayout_vertical">
 
                 <TextView

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

@@ -59,7 +59,7 @@
                 android:layout_toLeftOf="@+id/schedule_time_tv"
                 android:ellipsize="end"
                 android:singleLine="true"
-                android:text="待审批流"
+                android:text="待审批流程"
                 android:textColor="@color/text_main"
                 android:textSize="16sp" />
 
@@ -311,7 +311,7 @@
                 android:layout_toLeftOf="@+id/time_tv"
                 android:ellipsize="end"
                 android:singleLine="true"
-                android:text="订阅号"
+                android:text="我的订阅"
                 android:textColor="@color/text_main"
                 android:textSize="16sp" />
 

pullToRefershLibraryMy/src/main/java/com/handmark/pulltorefresh/library/PullToRefreshBase.java

@@ -54,7 +54,7 @@ public abstract class PullToRefreshBase<T extends View> extends LinearLayout imp
 
 	static final String LOG_TAG = "PullToRefresh";
 
-	static final float FRICTION = 4.0f;
+	static final float FRICTION = 5.0f;
 
 	public static final int SMOOTH_SCROLL_DURATION_MS = 200;
 	public static final int SMOOTH_SCROLL_LONG_DURATION_MS = 325;