Merge remote-tracking branch 'origin/develop/1.0'

Author: feelschaotic

app/build.gradle

@@ -9,7 +9,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 27
         versionCode 1
-        versionName "1.0"
+        versionName "1.0.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         ndk {
             abiFilters 'armeabi', 'armeabi-v7a', 'x86'
@@ -25,6 +25,7 @@ android {
     repositories {
         flatDir {
             dirs 'libs'
+            dirs project(':sdk').file('libs')
         }
     }
     useLibrary 'org.apache.http.legacy'
@@ -40,8 +41,6 @@ dependencies {
     compile "com.android.support:appcompat-v7:27.1.1"
     compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
     //依赖library
-    // debugCompile project(path: ':sdk', configuration: 'debug')
-    //releaseCompile project(path: ':sdk', configuration: 'release')
     compile project(path: ':sdk')
 }
 repositories {

app/src/main/java/com/feelschaotic/sdkhotfix/MainActivity.kt

@@ -19,15 +19,6 @@ class MainActivity : Activity() {
         fix_btn.setOnClickListener {
             initHotfix()
         }
-        call_bug_method_btn.setOnClickListener { callBug() }
-        rollback_btn.setOnClickListener { rollback() }
-    }
-
-    private fun callBug() {
-    }
-
-    private fun rollback() {
-
     }
 
     private fun initHotfix() {

app/src/main/res/layout/activity_main.xml

@@ -17,26 +17,5 @@
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <Button
-        android:id="@+id/call_bug_method_btn"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:text="调用有bug的方法"
-        app:layout_constraintHorizontal_bias="0.064"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/fix_btn" />
-
-    <Button
-        android:id="@+id/rollback_btn"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:text="回滚补丁"
-        app:layout_constraintHorizontal_bias="0.054"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/call_bug_method_btn" />
 
 </android.support.constraint.ConstraintLayout>

build.gradle

@@ -8,6 +8,7 @@ buildscript {
         jcenter()
         google()
         maven { url 'https://maven.google.com' }
+        maven { url "https://mvnrepository.com/" }
     }
     dependencies {
 
@@ -20,9 +21,10 @@ buildscript {
 
 allprojects {
     repositories {
-        // TODO:  maven { url "" }
         jcenter()
         maven { url 'https://maven.google.com' }
+        maven { url 'https://jitpack.io' }
+        maven { url "https://mvnrepository.com/" }
     }
 }
 

buildSrc/build.gradle

@@ -4,7 +4,6 @@ apply plugin: 'maven'
 
 repositories {
     jcenter()
-    maven { url "TODO" }
     maven() { url 'http://maven.aliyun.com/nexus/content/groups/public/' }
 }
 
@@ -20,7 +19,6 @@ dependencies {
     compile files('libs/httpcore-4.4.1.jar')
     compile files('libs/jdom-1.1.jar')
     compile files('libs/encrypt-1.0.jar')
-
     compile 'com.squareup.okhttp3:okhttp:3.14.0'
     compile 'com.alibaba:fastjson:1.2.46'
 }

business_sdk/.gitignore

@@ -1,7 +1,6 @@
 *.iml
 .gradle
 /local.properties
-/.idea/*
 /.idea/caches
 /.idea/libraries
 /.idea/modules.xml

business_sdk/app/build.gradle

@@ -20,9 +20,15 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+
+    lintOptions {
+        abortOnError false
+    }
+
 }
 
 dependencies {
+    // implementation fileTree(dir: 'libs', include: ['*.aar', '*.jar'], exclude: [])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'com.android.support:appcompat-v7:27.1.1'
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
@@ -36,11 +42,16 @@ dependencies {
         //  implementation 'com.feelschaotic.samplesdk:1.0.0'
         //因为我把maven的配置删掉了，所以以本地aar的方式引入插桩的sdk（插桩意味着支持了热更新）
         implementation fileTree(dir: 'libs', include: ['*.aar', '*.jar'], exclude: [])
+
+        //因为没有把samplesdk上传到maven，只是打个aar包放在lib下引用一下，所以需要导入SDKHotFix库（没有pom文件，下不了依赖）
+        //如果你的业务sdk已经上传了maven，那就可以删掉这条导包了
+        implementation 'com.github.feelschaotic:SDKHotFix:1.2-RELEASE'
     } else {
         // 默认用的是插桩的sdk1.0.0（有bug的sdk）
         // 不要再问为什么改了samplesdk module代码运行不生效了！因为这里压根就没有直接引用module
         // 为什么我不直接引用module（无插桩，不支持热更）？我怕有小伙伴拿着demo一跑就问我，为什么补丁没生效呀！？
         implementation fileTree(dir: 'libs', include: ['*.aar', '*.jar'], exclude: [])
+        implementation 'com.github.feelschaotic:SDKHotFix:1.2-RELEASE'
     }
 
 }

…siness_sdk/app/libs/sample-sdk-1.0.0.aar business_sdk/app/libs/library-release.aarbusiness_sdk/app/libs/sample-sdk-1.0.0.aar renamed to business_sdk/app/libs/library-release.aar business_sdk/app/libs/sample-sdk-1.0.0.aar renamed to business_sdk/app/libs/library-release.aar

@@ -7,8 +7,9 @@
             android:label="@string/app_name"
             android:roundIcon="@mipmap/ic_launcher_round"
             android:supportsRtl="true"
+            android:allowBackup="false"
             android:theme="@style/AppTheme"
-            tools:replace="android:label,android:icon,android:theme">
+            tools:replace="android:label,android:icon,android:theme,android:allowBackup">
         <activity android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>

business_sdk/app/src/main/AndroidManifest.xml

@@ -2,25 +2,34 @@ package com.feelschaotic.business_sdk
 
 import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
+import android.util.Log
+import com.feelschaotic.samplesdk.SdkManager
+import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
-       /* init_btn.setOnClickListener {
+        init_btn.setOnClickListener {
             Log.d("TAG", "初始化业务sdk")
             SdkManager.init(application)
         }
 
         fix_btn.setOnClickListener {
-            Log.d("TAG", "初始化hotfix sdk（延迟初始化，避免一进来就初始化会把补丁给打上，看不到效果）")
+            Log.d("TAG", "初始化hotfix sdk")
             SdkManager.fixBug()
         }
+
         call_bug_btn.setOnClickListener {
             Log.d("TAG", "调用业务sdk有bug的方法")
             SdkManager.callBug()
-        }*/
+        }
+
+        call_bug_again_btn.setOnClickListener {
+            Log.d("TAG", "调用业务sdk有bug的方法")
+            SdkManager.callBug()
+        }
     }
 }