修改部分配置，禁用部分menu菜单

zxkang · Mar 20, 2019 · bb9070d · bb9070d
1 parent 56e6a51
commit bb9070d
Show file tree

Hide file tree

Showing 6 changed files with 154 additions and 55 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -13,10 +13,99 @@ android {
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
     }
+    signingConfigs {
+        debug {
+            storeFile file("/Users/vivo/WorkSpace/Envs/android-key/dmc.keystore")
+            storePassword "young123"
+            keyAlias "dmc.keystore"
+            keyPassword "young123"
+        }
+
+        release {
+            storeFile file("/Users/vivo/WorkSpace/Envs/android-key/dmc.keystore")
+            storePassword "young123"
+            keyAlias "dmc.keystore"
+            keyPassword "young123"
+        }
+    }
+
+    flavorDimensions "version"
+
+    productFlavors {
+
+        OPPO {
+            dimension "version"
+//            applicationId "com.avalon.oppo"
+        }
+        vivo {
+            dimension "version"
+//            applicationId "com.avalon.vivo"
+        }
+        HUAWEI {
+            dimension "version"
+//            applicationId "com.avalon.huawei"
+        }
+        xiaomi {
+            dimension "version"
+//            applicationId "com.avalon.xiaomi"
+        }
+
+        productFlavors.all { flavor ->
+            flavor.manifestPlaceholders = [CHANNEL_VALUE: name]
+        }
+
+    }
+
+//    productFlavors {
+//        OPPO {
+//            manifestPlaceholders = [CHANNEL_VALUE: "OPPO"]
+//            dimension "version"
+//            applicationId "com.avalon.oppo"
+//        }
+//        vivo {
+//            manifestPlaceholders = [CHANNEL_VALUE: "vivo"]
+//            dimension "version"
+//            applicationId "com.avalon.vivo"
+//        }
+//        HUAWEI {
+//            manifestPlaceholders = [CHANNEL_VALUE: "HUAWEI"]
+//            dimension "version"
+//            applicationId "com.avalon.huawei"
+//        }
+//        xiaomi {
+//            manifestPlaceholders = [CHANNEL_VALUE: "xiaomi"]
+//            dimension "version"
+//            applicationId "com.avalon.xiaomi"
+//        }
+//    }
+
     buildTypes {
+        debug {
+            // 显示Log
+            buildConfigField "boolean", "LOG_DEBUG", "true"
+
+            versionNameSuffix "-debug"
+            minifyEnabled false
+            zipAlignEnabled false
+            shrinkResources false
+            signingConfig signingConfigs.debug
+        }
+//        release {
+//            minifyEnabled false
+//            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+//        }
         release {
+            // 不显示Log
+            buildConfigField "boolean", "LOG_DEBUG", "true"
+            //Zipalign优化
+            zipAlignEnabled true
+            // 移除无用的resource文件
+            shrinkResources false
+            //混淆
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            //签名
+            signingConfig signingConfigs.release
         }
     }
     compileOptions {
@@ -73,4 +162,6 @@ dependencies {
     // Android Leak Analysis
     releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4'
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.5.4'
+
+    implementation "org.apache.commons:commons-collections4:$rootProject.commonCollections4Version"
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.example.newbiechen.ireader">
+
+    <meta-data
+        android:name="CHANNEL"
+        android:value="${CHANNEL_VALUE}" />
 
     <application
         android:allowBackup="true"

diff --git a/app/src/main/java/com/example/newbiechen/ireader/event/SelectorEvent.java b/app/src/main/java/com/example/newbiechen/ireader/event/SelectorEvent.java
@@ -3,7 +3,6 @@
 import com.example.newbiechen.ireader.model.flag.BookDistillate;
 import com.example.newbiechen.ireader.model.flag.BookSort;
 import com.example.newbiechen.ireader.model.flag.BookType;
-import com.example.newbiechen.ireader.utils.Constant;
 
 /**
  * Created by newbiechen on 17-4-21.

diff --git a/app/src/main/java/com/example/newbiechen/ireader/ui/activity/MainActivity.java b/app/src/main/java/com/example/newbiechen/ireader/ui/activity/MainActivity.java
@@ -8,7 +8,6 @@
 import android.support.annotation.NonNull;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.app.Fragment;
-import android.support.v4.content.ContextCompat;
 import android.support.v7.view.menu.MenuBuilder;
 import android.support.v7.widget.Toolbar;
 import android.view.Menu;
@@ -19,22 +18,20 @@
 
 import com.example.newbiechen.ireader.R;
 import com.example.newbiechen.ireader.ui.base.BaseTabActivity;
+import com.example.newbiechen.ireader.ui.dialog.SexChooseDialog;
 import com.example.newbiechen.ireader.ui.fragment.BookShelfFragment;
 import com.example.newbiechen.ireader.ui.fragment.CommunityFragment;
 import com.example.newbiechen.ireader.ui.fragment.FindFragment;
 import com.example.newbiechen.ireader.utils.Constant;
 import com.example.newbiechen.ireader.utils.PermissionsChecker;
 import com.example.newbiechen.ireader.utils.SharedPreUtils;
-import com.example.newbiechen.ireader.ui.dialog.SexChooseDialog;
 import com.example.newbiechen.ireader.utils.ToastUtils;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import okhttp3.OkHttpClient;
-
 public class MainActivity extends BaseTabActivity{
     /*************Constant**********/
     private static final int WAIT_INTERVAL = 2000;
@@ -118,15 +115,15 @@ public boolean onOptionsItemSelected(MenuItem item) {
             case R.id.action_search:
                 activityCls = SearchActivity.class;
                 break;
-            case R.id.action_login:
-                break;
-            case R.id.action_my_message:
-                break;
+//            case R.id.action_login:
+//                break;
+//            case R.id.action_my_message:
+//                break;
             case R.id.action_download:
                 activityCls = DownloadActivity.class;
                 break;
-            case R.id.action_sync_bookshelf:
-                break;
+//            case R.id.action_sync_bookshelf:
+//                break;
             case R.id.action_scan_local_book:
 
                 if (Build.VERSION.SDK_INT > Build.VERSION_CODES.M){
@@ -145,14 +142,22 @@ public boolean onOptionsItemSelected(MenuItem item) {
 
                 activityCls = FileSystemActivity.class;
                 break;
-            case R.id.action_wifi_book:
-                break;
-            case R.id.action_feedback:
-                break;
-            case R.id.action_night_mode:
-                break;
-            case R.id.action_settings:
-                break;
+//            case R.id.action_wifi_book:
+//                break;
+//            case R.id.action_feedback:
+//                break;
+//            case R.id.action_night_mode:
+//                if (SharedPreUtils.getInstance().getBoolean(Constant.ISNIGHT, false)) {
+//                    SharedPreUtils.getInstance().putBoolean(Constant.ISNIGHT, false);
+//                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
+//                } else {
+//                    SharedPreUtils.getInstance().putBoolean(Constant.ISNIGHT, true);
+//                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+//                }
+//                recreate();
+//                break;
+//            case R.id.action_settings:
+//                break;
             default:
                 break;
         }

diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
@@ -10,56 +10,56 @@
         android:icon="@drawable/ic_menu_search"
         app:showAsAction="ifRoom"/>
 
-    <item
-        android:id="@+id/action_login"
-        android:title="@string/nb.menu.action.login"
-        android:icon="@drawable/ic_menu_login"
-        app:showAsAction="never" />
+    <!--<item-->
+        <!--android:id="@+id/action_login"-->
+        <!--android:title="@string/nb.menu.action.login"-->
+        <!--android:icon="@drawable/ic_menu_login"-->
+        <!--app:showAsAction="never" />-->
 
-    <item
-        android:id="@+id/action_my_message"
-        android:title="@string/nb.menu.action.message"
-        android:icon="@drawable/ic_menu_tip"
-        app:showAsAction="never" />
+    <!--<item-->
+        <!--android:id="@+id/action_my_message"-->
+        <!--android:title="@string/nb.menu.action.message"-->
+        <!--android:icon="@drawable/ic_menu_tip"-->
+        <!--app:showAsAction="never" />-->
     <item
         android:id="@+id/action_download"
         android:title="@string/nb.menu.action.download"
         android:icon="@drawable/ic_menu_download"
         app:showAsAction="never" />
 
-    <item
-        android:id="@+id/action_sync_bookshelf"
-        android:title="@string/nb.menu.action.sync"
-        android:icon="@drawable/ic_menu_syn"
-        app:showAsAction="never" />
+    <!--<item-->
+        <!--android:id="@+id/action_sync_bookshelf"-->
+        <!--android:title="@string/nb.menu.action.sync"-->
+        <!--android:icon="@drawable/ic_menu_syn"-->
+        <!--app:showAsAction="never" />-->
 
     <item
         android:id="@+id/action_scan_local_book"
         android:title="@string/nb.menu.action.scan"
         android:icon="@drawable/ic_menu_scan"
         app:showAsAction="never" />
 
-    <item
-        android:id="@+id/action_wifi_book"
-        android:title="@string/nb.menu.action.transfer"
-        android:icon="@drawable/ic_menu_transfer"
-        app:showAsAction="never" />
+    <!--<item-->
+        <!--android:id="@+id/action_wifi_book"-->
+        <!--android:title="@string/nb.menu.action.transfer"-->
+        <!--android:icon="@drawable/ic_menu_transfer"-->
+        <!--app:showAsAction="never" />-->
 
-    <item
-        android:id="@+id/action_feedback"
-        android:title="@string/nb.menu.action.feedback"
-        android:icon="@drawable/ic_menu_feedback"
-        app:showAsAction="never" />
+    <!--<item-->
+        <!--android:id="@+id/action_feedback"-->
+        <!--android:title="@string/nb.menu.action.feedback"-->
+        <!--android:icon="@drawable/ic_menu_feedback"-->
+        <!--app:showAsAction="never" />-->
 
-    <item
-        android:id="@+id/action_night_mode"
-        android:title="@string/nb.menu.action.night_mode"
-        android:icon="@drawable/ic_read_menu_night"
-        app:showAsAction="never" />
+    <!--<item-->
+        <!--android:id="@+id/action_night_mode"-->
+        <!--android:title="@string/nb.menu.action.night_mode"-->
+        <!--android:icon="@drawable/ic_read_menu_night"-->
+        <!--app:showAsAction="never" />-->
 
-    <item
-        android:id="@+id/action_settings"
-        android:title="@string/nb.menu.action.setting"
-        android:icon="@drawable/ic_menu_setting"
-        app:showAsAction="never" />
+    <!--<item-->
+        <!--android:id="@+id/action_settings"-->
+        <!--android:title="@string/nb.menu.action.setting"-->
+        <!--android:icon="@drawable/ic_menu_setting"-->
+        <!--app:showAsAction="never" />-->
 </menu>
diff --git a/gradle.properties b/gradle.properties
@@ -28,4 +28,4 @@ org.gradle.jvmargs=-Xmx1536m
 supportLibraryVersion=25.3.1
 okhttpVersion=3.6.0
 minSdkVersion=21
-
+commonCollections4Version=4.3