diff --git a/app/src/main/java/com/yizhuan/erban/MainActivity.java b/app/src/main/java/com/yizhuan/erban/MainActivity.java index 09936d579..81691c4e8 100644 --- a/app/src/main/java/com/yizhuan/erban/MainActivity.java +++ b/app/src/main/java/com/yizhuan/erban/MainActivity.java @@ -231,20 +231,9 @@ public class MainActivity extends BaseMvpActivity private LivingIconView userLivingView; private View viewClose; - private FloatingLiveMiniView floatingLiveMiniView; private MainTabLayout mMainTabLayout; private int mCurrentMainPosition = MainTabLayout.MAIN_TAB_POS_HOME; - /** - * 是否需要预加载home,by lvzebiao v3.1.2 - * 因为首页标签添加帧动画,防止,第一次点击标签过于卡顿 - */ - private final static boolean PRELOAD_HOME = false; - - /** - * 保存登录的次数 - */ - private LongSparseArray loginCountMap = new LongSparseArray<>(1); /** * 房间最小化动画,换成属性动画,原先的补间动画影响了activity的生命周期 @@ -255,8 +244,6 @@ public class MainActivity extends BaseMvpActivity */ private LimitEnterRoomHelper limitEnterRoomHelper; - GestureDetector detector; - public static void start(Context context) { start(context, null); diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/AppBarLayoutBehavior.java b/app/src/main/java/com/yizhuan/erban/ui/widget/AppBarLayoutBehavior.java index 0cfb114cc..eea8a7a37 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/AppBarLayoutBehavior.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/AppBarLayoutBehavior.java @@ -129,9 +129,7 @@ public class AppBarLayoutBehavior extends AppBarLayout.Behavior { if (overScroller != null && !overScroller.isFinished()) { overScroller.abortAnimation(); } - } catch (NoSuchFieldException e) { - e.printStackTrace(); - } catch (IllegalAccessException e) { + } catch (Exception e) { e.printStackTrace(); } } diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/linked/LinkedModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/linked/LinkedModel.java index f54d200f0..c33b0ceeb 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/linked/LinkedModel.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/linked/LinkedModel.java @@ -3,8 +3,6 @@ package com.yizhuan.xchat_android_core.linked; import com.yizhuan.xchat_android_core.base.BaseModel; import com.yizhuan.xchat_android_core.linked.bean.LinkedInfo; -import org.greenrobot.eventbus.EventBus; - public class LinkedModel extends BaseModel implements ILinkedModel{ private LinkedInfo linkedInfo; @@ -23,7 +21,6 @@ public class LinkedModel extends BaseModel implements ILinkedModel{ } private LinkedModel() { - EventBus.getDefault().register(this); }