Просмотр исходного кода

尝试修改成toolbar前备份

Bitliker 8 лет назад
Родитель
Сommit
25acc5d0c9

+ 7 - 4
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/MessageFragment.java

@@ -87,6 +87,8 @@ public class MessageFragment extends EasyFragment implements IMessageView, View.
     private MyListView headerLV;
     @ViewInject(R.id.contentLV)
     private MyListView contentLV;
+    @ViewInject(R.id.handerAndContentLine)
+    private View handerAndContentLine;
 
     private View signView;
     private ImageButton itemSignImage;
@@ -352,7 +354,7 @@ public class MessageFragment extends EasyFragment implements IMessageView, View.
     @Override
     public void showModel(List<BaseSortModel<Friend>> models) {
         sortModels(models);
-        if (mSignRefreshLayout.isRefreshing()) {
+        if (mSignRefreshLayout.isEnablePullDown() && mSignRefreshLayout.isRefreshing()) {
             mSignRefreshLayout.stopRefresh();
         }
         if (mAdapter == null) {
@@ -363,6 +365,7 @@ public class MessageFragment extends EasyFragment implements IMessageView, View.
             mAdapter.notifyDataSetChanged();
         }
         headerLV.setSelection(0);
+        handerAndContentLine.setVisibility(ListUtils.isEmpty(models) ? View.GONE : View.VISIBLE);
     }
 
     private void sortModels(List<BaseSortModel<Friend>> models) {
@@ -386,10 +389,8 @@ public class MessageFragment extends EasyFragment implements IMessageView, View.
 
     @Override
     public void updateHeaderView(int type, int num, String subTitle, String time) {
-
         if (headAdapter != null && !ListUtils.isEmpty(headAdapter.getModels())) {
             boolean isUpdated = false;
-
             if (type != MessagePresenter.REAL_TIME_FORM && type != MessagePresenter.BUSINESS_STATISTICS) {
                 for (MessageHeader e : headAdapter.getModels()) {
                     if (e.getType() == type) {
@@ -410,7 +411,9 @@ public class MessageFragment extends EasyFragment implements IMessageView, View.
             }
 
         }
-        mSignRefreshLayout.stopRefresh();
+        if (mSignRefreshLayout.isEnablePullDown() && mSignRefreshLayout.isRefreshing()) {
+            mSignRefreshLayout.stopRefresh();
+        }
     }
 
     private boolean updateHideOrDisplay(int num, boolean isUpdated, int type) {

+ 1 - 3
WeiChat/src/main/res/layout/fragment_new_message.xml

@@ -61,19 +61,17 @@
                     android:id="@+id/headerLV"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:divider="@color/item_line"
                     android:dividerHeight="5dp" />
 
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="5dp"
-                    android:background="@color/item_line" />
+                    android:id="@+id/handerAndContentLine" />
 
                 <com.core.widget.MyListView
                     android:id="@+id/contentLV"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:divider="@color/item_line"
                     android:dividerHeight="5dp" />
 
 

+ 3 - 3
WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Thu May 03 11:39:26 CST 2018
-debugName=184
+#Thu May 03 14:51:56 CST 2018
+debugName=192
 versionName=614
-debugCode=184
+debugCode=192
 versionCode=153

+ 5 - 0
app_modular/appmessages/src/main/java/com/modular/appmessages/widget/SignRefreshLayout.java

@@ -179,6 +179,7 @@ public class SignRefreshLayout extends ViewGroup {
         }
         mLastYIntercept = y;
         Log.i("gong", "intercept=" + intercept);
+        Log.i("gong", "status=" + status);
         return intercept;
     }
     private boolean svPullDownIntercept(View child) {
@@ -297,6 +298,7 @@ public class SignRefreshLayout extends ViewGroup {
         if (headerView != null) {
             upStatus(status);
         }
+        LogUtil.i("gong","updateStatus="+status);
         if (status != NORMAL) {
             this.status = status;
         }
@@ -309,6 +311,7 @@ public class SignRefreshLayout extends ViewGroup {
     private void upWithStatusTryRefresh() {
         // 取消本次的滑动
         mLayoutScroller.startScroll(0, getScrollY(), 0, -getScrollY(), SCROLL_SPEED);
+        LogUtil.i("gong","upWithStatusTryRefresh="+status);
         status = NORMAL;
         if (headerView != null) {
             stopAnim();
@@ -344,6 +347,7 @@ public class SignRefreshLayout extends ViewGroup {
         public void handleMessage(Message msg) {
             switch (msg.what) {
                 case STOP_REFRESH: {
+                    LogUtil.i("gong","handleMessage="+status);
                     mLayoutScroller.startScroll(0, getScrollY(), 0, -getScrollY(), SCROLL_SPEED);
                     status = NORMAL;
                     if (headerView != null) {
@@ -366,6 +370,7 @@ public class SignRefreshLayout extends ViewGroup {
         if (status == REFRESH) {
             stopTryRefresh();
         }
+        LogUtil.i("gong","stopRefresh="+status);
         status = NORMAL;
     }