include all local changes

chinalwb · Dec 14, 2018 · 39b0290 · 39b0290
1 parent 343fafa
commit 39b0290
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 5 deletions.
diff --git a/ARE/app/build.gradle b/ARE/app/build.gradle
@@ -19,8 +19,8 @@ android {
 dependencies {
     implementation 'com.android.support.constraint:constraint-layout:1.0.2'
     implementation 'com.android.support:design:27.1.0'
-    compile 'com.android.support:appcompat-v7:27.1.0'
+    implementation 'com.android.support:appcompat-v7:27.1.0'
     implementation project(':are')
-    // implementation 'com.github.bumptech.glide:glide:4.3.1'
-    // implementation 'com.github.chinalwb:are:0.1.2'
+     implementation 'com.github.bumptech.glide:glide:4.3.0'
+//     implementation 'com.github.chinalwb:are:0.1.3'
 }
diff --git a/ARE/app/release/app-release.apk b/ARE/app/release/app-release.apk
diff --git a/ARE/app/src/main/java/com/chinalwb/are/demo/IndexActivity.java b/ARE/app/src/main/java/com/chinalwb/are/demo/IndexActivity.java
@@ -5,6 +5,9 @@
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
+import android.widget.ImageView;
+
+import com.chinalwb.are.glidesupport.GlideApp;
 
 public class IndexActivity extends AppCompatActivity {
 
@@ -14,6 +17,10 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_index);
 
         initViews();
+
+        ImageView imageView = (ImageView) findViewById(R.id.image);
+
+        GlideApp.with(this).load("http://a.hiphotos.baidu.com/image/h%3D300/sign=b18b23079522720e64cee4fa4bca0a3a/4a36acaf2edda3ccc4a53e450ce93901213f9216.jpg").into(imageView);
     }
 
     private void initViews() {

diff --git a/ARE/app/src/main/res/layout/activity_index.xml b/ARE/app/src/main/res/layout/activity_index.xml
@@ -50,5 +50,11 @@
         android:textAllCaps="false"
         android:text="AREditor Min Hide"/>
 
+    <ImageView
+        android:id="@+id/image"
+        android:layout_width="300dp"
+        android:layout_height="300dp"
+        android:background="@color/colorAccent"/>
+
 
 </LinearLayout>
diff --git a/ARE/are/build.gradle b/ARE/are/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'com.android.library'
 ext {
     PUBLISH_GROUP_ID = 'com.github.chinalwb'
     PUBLISH_ARTIFACT_ID = 'are'
-    PUBLISH_VERSION = '0.1.3'
+    PUBLISH_VERSION = '0.1.4'
 }
 
 
@@ -54,5 +54,5 @@ dependencies {
     annotationProcessor 'com.github.bumptech.glide:compiler:4.3.1'
 }
 
-// apply from: 'https://raw.githubusercontent.com/blundell/release-android-library/master/android-release-aar.gradle'
+ apply from: 'https://raw.githubusercontent.com/blundell/release-android-library/master/android-release-aar.gradle'
 // ./gradlew clean build generateRelease