Browse Source

1.添加Bugly校验
2.我的-加入我们 修改了群号为作者自己的

hegj 5 years ago
parent
commit
a83b97c944

+ 2 - 9
app/build.gradle

@@ -50,7 +50,7 @@ android {
         debug {
             buildConfigField "boolean", "LOG_DEBUG",  "true"
             buildConfigField "boolean", "USE_CANARY", "false"
-            buildConfigField "String", "BUGLY_KE", '"xxxxxx"'
+            buildConfigField "String", "BUGLY_KEY", '"xxxxxx"'
             minifyEnabled false
             shrinkResources false
             zipAlignEnabled false
@@ -60,7 +60,7 @@ android {
         release {
             buildConfigField "boolean", "LOG_DEBUG",  "false"
             buildConfigField "boolean", "USE_CANARY", "false"
-            buildConfigField "String", "BUGLY_KE", '"xxxxx"'
+            buildConfigField "String", "BUGLY_KEY", '"5a5f6366fc"'//bugly key
             minifyEnabled true//开启混淆
             shrinkResources true
             zipAlignEnabled true//去除无用资源
@@ -86,16 +86,9 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    //androidX基础库
-    implementation "androidx.appcompat:appcompat:1.1.0"
-    implementation 'com.google.android.material:material:1.2.0-alpha01'
-    implementation "androidx.constraintlayout:constraintlayout:1.1.3"
-    implementation "androidx.preference:preference:1.1.0"
-    implementation "androidx.cardview:cardview:1.0.0"
     //dagger
     annotationProcessor rootProject.ext.dependencies["dagger2-compiler"]
     kapt rootProject.ext.dependencies["dagger2-compiler"]
-
     //黄油刀
     implementation "com.jakewharton:butterknife:10.1.0"
     kapt "com.jakewharton:butterknife-compiler:10.1.0"

+ 15 - 15
app/priguardMapping.txt

@@ -1,7 +1,7 @@
 # compiler: R8
 # compiler_version: 1.5.68
 # min_api: 21
-# pg_map_id: 92d2a40
+# pg_map_id: 8e2e2a2
 butterknife.-$$Lambda$Unbinder$aAZZEjRDCcxQlrGZAdKWmLXqruY -> butterknife.a:
     butterknife.-$$Lambda$Unbinder$aAZZEjRDCcxQlrGZAdKWmLXqruY INSTANCE -> a
 butterknife.Unbinder$-CC -> butterknife.b:
@@ -8446,15 +8446,15 @@ me.hegj.wandroid.mvp.ui.activity.main.me.MeFragment$Companion -> me.hegj.wandroi
 me.hegj.wandroid.mvp.ui.activity.main.me.MeFragment$initData$$inlined$run$lambda$1 -> me.hegj.wandroid.mvp.ui.activity.main.me.MeFragment$b:
     me.hegj.wandroid.mvp.ui.activity.main.me.MeFragment this$0 -> a
 me.hegj.wandroid.mvp.ui.activity.main.me.MeFragment_ViewBinding -> me.hegj.wandroid.mvp.ui.activity.main.me.MeFragment_ViewBinding:
-    android.view.View view7f090137 -> i
-    android.view.View view7f09013d -> h
+    android.view.View view7f09013a -> i
+    android.view.View view7f090140 -> h
     me.hegj.wandroid.mvp.ui.activity.main.me.MeFragment target -> a
-    android.view.View view7f090139 -> c
-    android.view.View view7f090140 -> b
-    android.view.View view7f090142 -> e
-    android.view.View view7f09013e -> d
-    android.view.View view7f090138 -> g
-    android.view.View view7f09013c -> f
+    android.view.View view7f09013c -> c
+    android.view.View view7f090143 -> b
+    android.view.View view7f090145 -> e
+    android.view.View view7f090141 -> d
+    android.view.View view7f09013b -> g
+    android.view.View view7f09013f -> f
 me.hegj.wandroid.mvp.ui.activity.main.me.MeFragment_ViewBinding$1 -> me.hegj.wandroid.mvp.ui.activity.main.me.MeFragment_ViewBinding$a:
     me.hegj.wandroid.mvp.ui.activity.main.me.MeFragment val$target -> a
 me.hegj.wandroid.mvp.ui.activity.main.me.MeFragment_ViewBinding$2 -> me.hegj.wandroid.mvp.ui.activity.main.me.MeFragment_ViewBinding$b:
@@ -8990,7 +8990,7 @@ me.hegj.wandroid.mvp.ui.activity.share.ShareAriticleActivity$onViewClicked$$inli
     void invoke(com.afollestad.materialdialogs.MaterialDialog) -> a
 me.hegj.wandroid.mvp.ui.activity.share.ShareAriticleActivity_ViewBinding -> me.hegj.wandroid.mvp.ui.activity.share.ShareAriticleActivity_ViewBinding:
     me.hegj.wandroid.mvp.ui.activity.share.ShareAriticleActivity target -> a
-    android.view.View view7f0901b8 -> b
+    android.view.View view7f0901ba -> b
 me.hegj.wandroid.mvp.ui.activity.share.ShareAriticleActivity_ViewBinding$1 -> me.hegj.wandroid.mvp.ui.activity.share.ShareAriticleActivity_ViewBinding$a:
     me.hegj.wandroid.mvp.ui.activity.share.ShareAriticleActivity val$target -> a
 me.hegj.wandroid.mvp.ui.activity.share.ShareByIdActivity -> me.hegj.wandroid.mvp.ui.activity.share.ShareByIdActivity:
@@ -9117,9 +9117,9 @@ me.hegj.wandroid.mvp.ui.activity.start.LoginActivity$initData$4 -> me.hegj.wandr
     me.hegj.wandroid.mvp.ui.activity.start.LoginActivity this$0 -> a
 me.hegj.wandroid.mvp.ui.activity.start.LoginActivity_ViewBinding -> me.hegj.wandroid.mvp.ui.activity.start.LoginActivity_ViewBinding:
     me.hegj.wandroid.mvp.ui.activity.start.LoginActivity target -> a
-    android.view.View view7f09011b -> c
-    android.view.View view7f090117 -> b
-    android.view.View view7f090118 -> d
+    android.view.View view7f09011e -> c
+    android.view.View view7f09011a -> b
+    android.view.View view7f09011b -> d
 me.hegj.wandroid.mvp.ui.activity.start.LoginActivity_ViewBinding$1 -> me.hegj.wandroid.mvp.ui.activity.start.LoginActivity_ViewBinding$a:
     me.hegj.wandroid.mvp.ui.activity.start.LoginActivity val$target -> a
 me.hegj.wandroid.mvp.ui.activity.start.LoginActivity_ViewBinding$2 -> me.hegj.wandroid.mvp.ui.activity.start.LoginActivity_ViewBinding$b:
@@ -9146,9 +9146,9 @@ me.hegj.wandroid.mvp.ui.activity.start.RegisterActivity$initData$5 -> me.hegj.wa
 me.hegj.wandroid.mvp.ui.activity.start.RegisterActivity$initData$6 -> me.hegj.wandroid.mvp.ui.activity.start.RegisterActivity$f:
     me.hegj.wandroid.mvp.ui.activity.start.RegisterActivity this$0 -> a
 me.hegj.wandroid.mvp.ui.activity.start.RegisterActivity_ViewBinding -> me.hegj.wandroid.mvp.ui.activity.start.RegisterActivity_ViewBinding:
-    android.view.View view7f09018b -> c
+    android.view.View view7f09018e -> c
     me.hegj.wandroid.mvp.ui.activity.start.RegisterActivity target -> a
-    android.view.View view7f090186 -> b
+    android.view.View view7f090189 -> b
 me.hegj.wandroid.mvp.ui.activity.start.RegisterActivity_ViewBinding$1 -> me.hegj.wandroid.mvp.ui.activity.start.RegisterActivity_ViewBinding$a:
     me.hegj.wandroid.mvp.ui.activity.start.RegisterActivity val$target -> a
 me.hegj.wandroid.mvp.ui.activity.start.RegisterActivity_ViewBinding$2 -> me.hegj.wandroid.mvp.ui.activity.start.RegisterActivity_ViewBinding$b:

+ 1 - 1
app/release/output.json

@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":8,"versionName":"1.0.7","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":9,"versionName":"1.0.8","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]

+ 1 - 1
app/src/main/java/me/hegj/wandroid/app/AppLifecyclesImpl.kt

@@ -81,7 +81,7 @@ class AppLifecyclesImpl : AppLifecycles {
         val strategy = UserStrategy(context)
         strategy.isUploadProcess = processName == null || processName == packageName
         // 初始化Bugly
-        Bugly.init(context, BuildConfig.BUGLY_KE, BuildConfig.DEBUG)
+        Bugly.init(context, BuildConfig.BUGLY_KEY, BuildConfig.DEBUG)
         //防止项目崩溃,崩溃后打开错误界面
         CaocConfig.Builder.create()
                 .backgroundMode(CaocConfig.BACKGROUND_MODE_SILENT) //default: CaocConfig.BACKGROUND_MODE_SHOW_CUSTOM

+ 8 - 0
app/src/main/java/me/hegj/wandroid/mvp/ui/activity/MainActivity.kt

@@ -4,6 +4,7 @@ import android.os.Bundle
 import com.jess.arms.di.component.AppComponent
 import com.jess.arms.mvp.IPresenter
 import com.tencent.bugly.beta.Beta
+import me.hegj.wandroid.BuildConfig
 import me.hegj.wandroid.R
 import me.hegj.wandroid.app.event.SettingChangeEvent
 import me.hegj.wandroid.app.utils.ShowUtils
@@ -31,6 +32,13 @@ class MainActivity : BaseActivity<IPresenter>() {
         }
         //进入首页检查更新
         Beta.checkUpgrade(false, true)
+
+        //如果你导入了该项目并打算以该项目为基础编写自己的项目,看到了这段代码,请记得更换 Bugly Key!
+        //Bugly网址:https://bugly.qq.com/v2/index ,具体修改请看 https://github.com/hegaojian/WanAndroid/issues/7
+        if(BuildConfig.APPLICATION_ID != "me.hegj.wandroid"&&BuildConfig.BUGLY_KEY =="5a5f6366fc"){
+            showMessage("请更换Bugly Key!防止产生的错误信息反馈到作者账号上,具体请查看app模块中的 build.gradle文件,修改BUGLY_KEY字段值为自己在Bugly官网申请的Key")
+        }
+
     }
 
     override fun onCreateFragmentAnimator(): FragmentAnimator {

+ 1 - 1
app/src/main/java/me/hegj/wandroid/mvp/ui/activity/main/me/MeFragment.kt

@@ -191,7 +191,7 @@ class MeFragment : BaseFragment<MePresenter>(), MeContract.View {
                 })
             }
             R.id.me_join -> {
-                joinQQGroup("arD6CZ5Bt8_ReDpb56-5n5cIY6sBqTtl")
+                joinQQGroup("9n4i5sHt4189d4DvbotKiCHy-5jZtD4D")
             }
             R.id.me_setting -> {
                 launchActivity(Intent(_mActivity, SettingActivity::class.java))

+ 2 - 2
build.gradle

@@ -1,13 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 apply from: "config.gradle"
 buildscript {
-    ext.kotlin_version = '1.3.41'
+    ext.kotlin_version = '1.3.50'
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.1'
+        classpath 'com.android.tools.build:gradle:3.5.2'
         //Gradle Android Maven plugin
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

+ 16 - 96
config.gradle

@@ -1,114 +1,35 @@
 ext {
-
     android = [
             compileSdkVersion: 29,
             buildToolsVersion: "29.0.2",
             minSdkVersion    : 21,
             targetSdkVersion : 29,
-            versionCode      : 8,
-            versionName      : "1.0.7"
+            versionCode      : 9,
+            versionName      : "1.0.8"
     ]
 
     version = [
-            androidSupportSdkVersion: "28.0.0",
-            retrofitSdkVersion      : "2.6.0",
-            dagger2SdkVersion       : "2.23.2",
-            glideSdkVersion         : "4.9.0",
-            butterknifeSdkVersion   : "9.0.0",
-            rxlifecycleSdkVersion   : "1.0",
-            rxlifecycle2SdkVersion  : "2.2.2",
-            espressoSdkVersion      : "3.0.1",
-            canarySdkVersion        : "1.6.3"
+            dagger2SdkVersion: "2.23.2",
+            canarySdkVersion : "1.6.3"
     ]
 
     dependencies = [
-            //support
-            "appcompat-v7"             : "com.android.support:appcompat-v7:${version["androidSupportSdkVersion"]}",
-            "design"                   : "com.android.support:design:${version["androidSupportSdkVersion"]}",
-            "support-v4"               : "com.android.support:support-v4:${version["androidSupportSdkVersion"]}",
-            "cardview-v7"              : "com.android.support:cardview-v7:${version["androidSupportSdkVersion"]}",
-            "annotations"              : "com.android.support:support-annotations:${version["androidSupportSdkVersion"]}",
-            "recyclerview-v7"          : "com.android.support:recyclerview-v7:${version["androidSupportSdkVersion"]}",
-
-            //network
-            "retrofit"                 : "com.squareup.retrofit2:retrofit:${version["retrofitSdkVersion"]}",
-            "retrofit-converter-gson"  : "com.squareup.retrofit2:converter-gson:${version["retrofitSdkVersion"]}",
-            "retrofit-adapter-rxjava"  : "com.squareup.retrofit2:adapter-rxjava:${version["retrofitSdkVersion"]}",
-            "retrofit-adapter-rxjava2" : "com.squareup.retrofit2:adapter-rxjava2:${version["retrofitSdkVersion"]}",
-            "okhttp3"                  : "com.squareup.okhttp3:okhttp:3.12.3",
-            "okhttp4"                  : "com.squareup.okhttp3:okhttp:4.0.0",
-            "okhttp-urlconnection"     : "com.squareup.okhttp:okhttp-urlconnection:2.0.0",
-            "glide"                    : "com.github.bumptech.glide:glide:${version["glideSdkVersion"]}",
-            "glide-compiler"           : "com.github.bumptech.glide:compiler:${version["glideSdkVersion"]}",
-            "glide-loader-okhttp3"     : "com.github.bumptech.glide:okhttp3-integration:${version["glideSdkVersion"]}",
-            "picasso"                  : "com.squareup.picasso:picasso:2.5.2",
-
-            //view
-            "autolayout"               : "com.zhy:autolayout:1.4.5",
-            "butterknife"              : "com.jakewharton:butterknife:${version["butterknifeSdkVersion"]}",
-            "butterknife-compiler"     : "com.jakewharton:butterknife-compiler:${version["butterknifeSdkVersion"]}",
-            "pickerview"               : "com.contrarywind:Android-PickerView:3.2.5",
-            "photoview"                : "com.github.chrisbanes.photoview:library:1.2.3",
-            "numberprogressbar"        : "com.daimajia.numberprogressbar:library:1.2@aar",
-            "nineoldandroids"          : "com.nineoldandroids:library:2.4.0",
-            "paginate"                 : "com.github.markomilos:paginate:0.5.1",
-            "vlayout"                  : "com.alibaba.android:vlayout:1.1.0@aar",
-            "autosize"                 : "me.jessyan:autosize:1.1.2",
-
-            //rx1
-            "rxandroid"                : "io.reactivex:rxandroid:1.2.1",
-            "rxjava"                   : "io.reactivex:rxjava:1.3.0",
-            "rxlifecycle"              : "com.trello:rxlifecycle:${version["rxlifecycleSdkVersion"]}",
-            "rxlifecycle-components"   : "com.trello:rxlifecycle-components:${version["rxlifecycleSdkVersion"]}",
-            "rxcache"                  : "com.github.VictorAlbertos.RxCache:runtime:1.7.0-1.x",
-            "rxcache-jolyglot-gson"    : "com.github.VictorAlbertos.Jolyglot:gson:0.0.4",
-            "rxbinding-recyclerview-v7": "com.jakewharton.rxbinding:rxbinding-recyclerview-v7:1.0.1",
-            "rxpermissions"            : "com.tbruyelle.rxpermissions:rxpermissions:0.9.4@aar",
-            "rxerrorhandler"           : "me.jessyan:rxerrorhandler:1.0.1",
-
-            //rx2
-            "rxandroid2"               : "io.reactivex.rxjava2:rxandroid:2.1.1",
-            "rxjava2"                  : "io.reactivex.rxjava2:rxjava:2.2.10",
-            "rxlifecycle2"             : "com.trello.rxlifecycle2:rxlifecycle:${version["rxlifecycle2SdkVersion"]}",
-            "rxlifecycle2-android"     : "com.trello.rxlifecycle2:rxlifecycle-android:${version["rxlifecycle2SdkVersion"]}",
-            "rxlifecycle2-components"  : "com.trello.rxlifecycle2:rxlifecycle-components:${version["rxlifecycle2SdkVersion"]}",
-            "rxcache2"                 : "com.github.VictorAlbertos.RxCache:runtime:1.8.3-2.x",
-            "rxpermissions2"           : "com.github.tbruyelle:rxpermissions:0.10.2",
-            "rxerrorhandler2"          : "me.jessyan:rxerrorhandler:2.1.1",
-
             //tools
-            "dagger2"                  : "com.google.dagger:dagger:${version["dagger2SdkVersion"]}",
-            "dagger2-android"          : "com.google.dagger:dagger-android:${version["dagger2SdkVersion"]}",
-            "dagger2-android-support"  : "com.google.dagger:dagger-android-support:${version["dagger2SdkVersion"]}",
-            "dagger2-compiler"         : "com.google.dagger:dagger-compiler:${version["dagger2SdkVersion"]}",
-            "dagger2-android-processor": "com.google.dagger:dagger-android-processor:${version["dagger2SdkVersion"]}",
-            "androideventbus"          : "org.simple:androideventbus:1.0.5.1",
-            "eventbus"                 : "org.greenrobot:eventbus:3.1.1",
-            "otto"                     : "com.squareup:otto:1.3.8",
-            "gson"                     : "com.google.code.gson:gson:2.8.5",
-            "multidex"                 : "com.android.support:multidex:1.0.3",
-            "javax.annotation"         : "javax.annotation:jsr250-api:1.0",
-            "arouter"                  : "com.alibaba:arouter-api:1.3.1",
-            "arouter-compiler"         : "com.alibaba:arouter-compiler:1.1.4",
-            "progressmanager"          : "me.jessyan:progressmanager:1.5.0",
-            "retrofit-url-manager"     : "me.jessyan:retrofit-url-manager:1.4.0",
-            "lifecyclemodel"           : "me.jessyan:lifecyclemodel:1.0.1",
-
+            "dagger2-compiler"  : "com.google.dagger:dagger-compiler:${version["dagger2SdkVersion"]}",
             //test
-            "junit"                    : "junit:junit:4.12",
-            "androidJUnitRunner"       : "android.support.test.runner.AndroidJUnitRunner",
-            "runner"                   : "com.android.support.test:runner:1.0.1",
-            "espresso-core"            : "com.android.support.test.espresso:espresso-core:${version["espressoSdkVersion"]}",
-            "espresso-contrib"         : "com.android.support.test.espresso:espresso-contrib:${version["espressoSdkVersion"]}",
-            "espresso-intents"         : "com.android.support.test.espresso:espresso-intents:${version["espressoSdkVersion"]}",
-            "mockito-core"             : "org.mockito:mockito-core:1.+",
-            "timber"                   : "com.jakewharton.timber:timber:4.7.1",
-            "logger"                   : "com.orhanobut:logger:2.2.0",
-            "canary-debug"             : "com.squareup.leakcanary:leakcanary-android:${version["canarySdkVersion"]}",
-            "canary-release"           : "com.squareup.leakcanary:leakcanary-android-no-op:${version["canarySdkVersion"]}",
-            "umeng-analytics"          : "com.umeng.analytics:analytics:6.0.1"
+            "junit"             : "junit:junit:4.12",
+            "androidJUnitRunner": "android.support.test.runner.AndroidJUnitRunner",
+            "canary-debug"      : "com.squareup.leakcanary:leakcanary-android:${version["canarySdkVersion"]}",
+            "canary-release"    : "com.squareup.leakcanary:leakcanary-android-no-op:${version["canarySdkVersion"]}",
     ]
     customDeps = [
+            //androidX基础库
+            "appcompat"             : "androidx.appcompat:appcompat:1.1.0",
+            "material"              : 'com.google.android.material:material:1.2.0-alpha01',
+            "constraintlayout"      : "androidx.constraintlayout:constraintlayout:1.1.3",
+            "preference"            : "androidx.preference:preference:1.1.0",
+            "cardview"              : "androidx.cardview:cardview:1.0.0",
+
             "eventbus"              : "org.greenrobot:eventbus:3.1.1",
             "multidex"              : "com.android.support:multidex:1.0.3",
             "lifecyclemodel"        : "me.jessyan:lifecyclemodel:1.0.1",
@@ -152,7 +73,6 @@ ext {
             "mmkv"                  : 'com.tencent:mmkv:1.0.22',
             //阻止app崩溃
             "customactivityoncrash" : 'cat.ereza:customactivityoncrash:2.2.0',
-
     ]
     customLibs = customDeps.values()
 }