优化

IptablesNat · May 26, 2018 · efb8776 · efb8776
1 parent 9154db3
commit efb8776
Show file tree

Hide file tree

Showing 24 changed files with 15 additions and 158 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -60,12 +60,9 @@ ext {
 }
 dependencies {
     api project(':basemvplib')
-    api project(':barlibrary')
     implementation 'com.android.support.constraint:constraint-layout:1.1.0'
     testImplementation 'junit:junit:4.12'
 
-    //implementation fileTree(include: ['*.jar'], dir: 'libs')
-
     //fireBase
     implementation 'com.google.firebase:firebase-core:15.0.2'
     implementation('com.crashlytics.sdk.android:crashlytics:2.7.1@aar') {

diff --git a/app/src/main/java/com/monke/monkeybook/base/MBaseActivity.java b/app/src/main/java/com/monke/monkeybook/base/MBaseActivity.java
@@ -13,10 +13,10 @@
 import android.view.Menu;
 import android.view.View;
 
-import com.gyf.barlibrary.ImmersionBar;
 import com.monke.basemvplib.BaseActivity;
 import com.monke.basemvplib.impl.IPresenter;
 import com.monke.monkeybook.R;
+import com.monke.monkeybook.utils.barUtil.ImmersionBar;
 
 import java.lang.reflect.Method;
 

diff --git a/...in/java/com/gyf/barlibrary/BarConfig.java → ...e/monkeybook/utils/barUtil/BarConfig.java b/...in/java/com/gyf/barlibrary/BarConfig.java → ...e/monkeybook/utils/barUtil/BarConfig.java
@@ -1,4 +1,4 @@
-package com.gyf.barlibrary;
+package com.monke.monkeybook.utils.barUtil;
 
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;

diff --git a/...main/java/com/gyf/barlibrary/BarHide.java → ...nke/monkeybook/utils/barUtil/BarHide.java b/...main/java/com/gyf/barlibrary/BarHide.java → ...nke/monkeybook/utils/barUtil/BarHide.java
@@ -1,4 +1,4 @@
-package com.gyf.barlibrary;
+package com.monke.monkeybook.utils.barUtil;
 
 /**
  * Created by geyifeng on 2017/4/25.

diff --git a/...in/java/com/gyf/barlibrary/BarParams.java → ...e/monkeybook/utils/barUtil/BarParams.java b/...in/java/com/gyf/barlibrary/BarParams.java → ...e/monkeybook/utils/barUtil/BarParams.java
@@ -1,4 +1,4 @@
-package com.gyf.barlibrary;
+package com.monke.monkeybook.utils.barUtil;
 
 import android.database.ContentObserver;
 import android.graphics.Color;

diff --git a/...barlibrary/FlymeOSStatusBarFontUtils.java → ...ls/barUtil/FlymeOSStatusBarFontUtils.java b/...barlibrary/FlymeOSStatusBarFontUtils.java → ...ls/barUtil/FlymeOSStatusBarFontUtils.java
@@ -1,4 +1,4 @@
-package com.gyf.barlibrary;
+package com.monke.monkeybook.utils.barUtil;
 
 import android.app.Activity;
 import android.os.Build;

diff --git a/...java/com/gyf/barlibrary/ImmersionBar.java → ...onkeybook/utils/barUtil/ImmersionBar.java b/...java/com/gyf/barlibrary/ImmersionBar.java → ...onkeybook/utils/barUtil/ImmersionBar.java
@@ -1,4 +1,4 @@
-package com.gyf.barlibrary;
+package com.monke.monkeybook.utils.barUtil;
 
 import android.annotation.TargetApi;
 import android.app.Activity;

diff --git a/...ava/com/gyf/barlibrary/KeyboardPatch.java → ...nkeybook/utils/barUtil/KeyboardPatch.java b/...ava/com/gyf/barlibrary/KeyboardPatch.java → ...nkeybook/utils/barUtil/KeyboardPatch.java
@@ -1,4 +1,4 @@
-package com.gyf.barlibrary;
+package com.monke.monkeybook.utils.barUtil;
 
 import android.app.Activity;
 import android.app.Dialog;

diff --git a/...main/java/com/gyf/barlibrary/OSUtils.java → ...nke/monkeybook/utils/barUtil/OSUtils.java b/...main/java/com/gyf/barlibrary/OSUtils.java → ...nke/monkeybook/utils/barUtil/OSUtils.java
@@ -1,4 +1,4 @@
-package com.gyf.barlibrary;
+package com.monke.monkeybook.utils.barUtil;
 
 import android.text.TextUtils;
 

diff --git a/...om/gyf/barlibrary/OnKeyboardListener.java → ...ook/utils/barUtil/OnKeyboardListener.java b/...om/gyf/barlibrary/OnKeyboardListener.java → ...ook/utils/barUtil/OnKeyboardListener.java
@@ -1,4 +1,4 @@
-package com.gyf.barlibrary;
+package com.monke.monkeybook.utils.barUtil;
 
 /**
  * 软键盘监听

diff --git a/app/src/main/java/com/monke/monkeybook/view/activity/ReadBookActivity.java b/app/src/main/java/com/monke/monkeybook/view/activity/ReadBookActivity.java
@@ -37,8 +37,6 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.gyf.barlibrary.BarHide;
-import com.gyf.barlibrary.ImmersionBar;
 import com.monke.basemvplib.AppActivityManager;
 import com.monke.monkeybook.R;
 import com.monke.monkeybook.base.MBaseActivity;
@@ -52,6 +50,8 @@
 import com.monke.monkeybook.utils.BatteryUtil;
 import com.monke.monkeybook.utils.FileUtil;
 import com.monke.monkeybook.utils.PremissionCheck;
+import com.monke.monkeybook.utils.barUtil.BarHide;
+import com.monke.monkeybook.utils.barUtil.ImmersionBar;
 import com.monke.monkeybook.view.impl.IReadBookView;
 import com.monke.monkeybook.view.popupwindow.CheckAddShelfPop;
 import com.monke.monkeybook.view.popupwindow.MoreSettingPop;
@@ -724,7 +724,6 @@ private void popMenuOut() {
      * 显示菜单
      */
     private void popMenuIn() {
-        mImmersionBar.hideBar(BarHide.FLAG_SHOW_BAR);
         flMenu.setVisibility(View.VISIBLE);
         llMenuTop.startAnimation(menuTopIn);
         llMenuBottom.startAnimation(menuBottomIn);

diff --git a/app/src/main/java/com/monke/monkeybook/view/activity/ReadStyleActivity.java b/app/src/main/java/com/monke/monkeybook/view/activity/ReadStyleActivity.java
@@ -14,21 +14,19 @@
 import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.view.View;
-import android.widget.CompoundButton;
 import android.widget.LinearLayout;
 import android.widget.Switch;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import com.flask.colorpicker.ColorPickerView;
 import com.flask.colorpicker.builder.ColorPickerDialogBuilder;
-import com.gyf.barlibrary.ImmersionBar;
 import com.monke.basemvplib.impl.IPresenter;
 import com.monke.monkeybook.R;
 import com.monke.monkeybook.base.MBaseActivity;
 import com.monke.monkeybook.help.ACache;
 import com.monke.monkeybook.help.ReadBookControl;
+import com.monke.monkeybook.utils.barUtil.ImmersionBar;
 import com.monke.monkeybook.widget.ContentTextView;
 
 import java.io.IOException;

diff --git a/app/src/main/java/com/monke/monkeybook/view/fragment/SettingsFragment.java b/app/src/main/java/com/monke/monkeybook/view/fragment/SettingsFragment.java
@@ -9,7 +9,6 @@
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceManager;
 
-import com.gyf.barlibrary.ImmersionBar;
 import com.monke.monkeybook.R;
 import com.monke.monkeybook.view.activity.SettingActivity;
 

diff --git a/app/src/main/java/com/monke/monkeybook/widget/ChapterListView.java b/app/src/main/java/com/monke/monkeybook/widget/ChapterListView.java
@@ -21,11 +21,11 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.gyf.barlibrary.ImmersionBar;
 import com.monke.monkeybook.MApplication;
 import com.monke.monkeybook.R;
 import com.monke.monkeybook.bean.BookShelfBean;
 import com.monke.monkeybook.bean.ChapterListBean;
+import com.monke.monkeybook.utils.barUtil.ImmersionBar;
 import com.monke.monkeybook.view.adapter.ChapterListAdapter;
 
 import butterknife.BindView;

diff --git a/app/src/main/java/com/monke/monkeybook/widget/contentswitchview/BookContentView.java b/app/src/main/java/com/monke/monkeybook/widget/contentswitchview/BookContentView.java
@@ -16,10 +16,10 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.gyf.barlibrary.ImmersionBar;
 import com.monke.monkeybook.R;
 import com.monke.monkeybook.help.ReadBookControl;
 import com.monke.monkeybook.utils.BatteryUtil;
+import com.monke.monkeybook.utils.barUtil.ImmersionBar;
 import com.monke.monkeybook.widget.BatteryView;
 import com.monke.monkeybook.widget.ContentTextView;
 

diff --git a/barlibrary/.gitignore b/barlibrary/.gitignore
diff --git a/barlibrary/build.gradle b/barlibrary/build.gradle
diff --git a/barlibrary/proguard-rules.pro b/barlibrary/proguard-rules.pro
diff --git a/barlibrary/src/androidTest/java/com/gyf/barlibrary/ExampleInstrumentedTest.java b/barlibrary/src/androidTest/java/com/gyf/barlibrary/ExampleInstrumentedTest.java
diff --git a/barlibrary/src/main/AndroidManifest.xml b/barlibrary/src/main/AndroidManifest.xml
diff --git a/barlibrary/src/main/java/com/gyf/barlibrary/ImmersionFragment.java b/barlibrary/src/main/java/com/gyf/barlibrary/ImmersionFragment.java
diff --git a/barlibrary/src/main/res/values/strings.xml b/barlibrary/src/main/res/values/strings.xml
diff --git a/barlibrary/src/test/java/com/gyf/barlibrary/ExampleUnitTest.java b/barlibrary/src/test/java/com/gyf/barlibrary/ExampleUnitTest.java
diff --git a/settings.gradle b/settings.gradle
@@ -1 +1 @@
-include ':app', ':basemvplib', ':barlibrary'
+include ':app', ':basemvplib'
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		include ':app', ':basemvplib', ':barlibrary'
		include ':app', ':basemvplib'