Skip to content

Commit

Permalink
调整了项目结构,上传到代码仓库
Browse files Browse the repository at this point in the history
  • Loading branch information
ladingwu committed Feb 27, 2018
1 parent 0d05103 commit 395e54c
Show file tree
Hide file tree
Showing 53 changed files with 305 additions and 275 deletions.
9 changes: 5 additions & 4 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 20 additions & 1 deletion app/build.gradle
Expand Up @@ -17,6 +17,14 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
testOptions {
unitTests {
includeAndroidResources = true
}
}
dataBinding {
enabled = true
}
}

dependencies {
Expand All @@ -32,5 +40,16 @@ dependencies {
// compile 'com.github.bumptech.glide:glide:3.7.0'
// compile 'com.squareup.okhttp3:okhttp:3.8.1'
testCompile 'junit:junit:4.12'
compile project(':imageloader')
// compile project(':imageloader-framework')
// implementation 'com.ladingwu.library:imageloader-framework:0.0.1'
testImplementation "org.robolectric:robolectric:3.6.1"

// implementation project(':glide')
// implementation project(':fresco')
// compile 'com.ladingwu.library:fresco:0.0.3'
compile 'com.ladingwu.library:glide:0.0.3'
compile "com.ladingwu.library:imageloader-framework:0.0.3"
// compile 'com.ladingwu.library:imageloader-framework:0.0.2'
// compile 'com.squareup.retrofit2:retrofit:2.3.0'
// compile 'com.squareup.retrofit2:converter-gson:2.3.0'
}
@@ -0,0 +1,9 @@
package com.ladingwu.imageloaderframework;

/**
* Created by wuzhao on 2018/2/25.
*/

public class JavaBean {
public String name="haha";
}
@@ -1,12 +1,14 @@
package com.ladingwu.imageloaderframework;

import android.databinding.DataBindingUtil;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.view.View;
import android.widget.Button;
import android.widget.ImageView;

import com.ladingwu.imageloader.ImageLoaderManager;
import com.ladingwu.imageloaderframework.databinding.ActivityMainBinding;
import com.lasingwu.baselibrary.ImageLoaderManager;
import com.lasingwu.baselibrary.ImageLoaderOptions;
import com.lasingwu.baselibrary.LoaderEnum;

Expand All @@ -24,8 +26,10 @@ protected void onCreate(Bundle savedInstanceState) {
img2= (ImageView) findViewById(R.id.img_2);
final Button btn1= (Button) findViewById(R.id.btn1);
final Button btn2= (Button) findViewById(R.id.btn2);


ActivityMainBinding binding = DataBindingUtil.setContentView(this, R.layout.activity_main);
binding.setUser(new JavaBean());
img1=binding.img1;
img2=binding.img2;
ImageLoaderOptions op=new ImageLoaderOptions.Builder(img1,url).imageRadiusDp(12).build();
ImageLoaderManager.getInstance().showImage(op);

Expand All @@ -35,7 +39,7 @@ protected void onCreate(Bundle savedInstanceState) {
.blurValue(35)
.isCircle()
.placeholder(R.mipmap.ic_launcher).build();
ImageLoaderManager.getInstance().showImage(options, LoaderEnum.FRESCO);
ImageLoaderManager.getInstance().showImage(options, LoaderEnum.GLIDE);

btn1.setOnClickListener(new View.OnClickListener() {
@Override
Expand Down
Expand Up @@ -2,7 +2,11 @@

import android.app.Application;

import com.ladingwu.imageloader.ImageLoaderManager;
import com.ladingwu.glidelibrary.GlideImageLocader;
import com.lasingwu.baselibrary.ImageLoaderConfig;
import com.lasingwu.baselibrary.ImageLoaderManager;
import com.lasingwu.baselibrary.LoaderEnum;


/**
* Created by 拉丁吴 on 2017/6/25.
Expand All @@ -12,6 +16,13 @@ public class MainApplication extends Application {
@Override
public void onCreate() {
super.onCreate();
ImageLoaderManager.getInstance().init(this);
ImageLoaderManager.getInstance().init(this
,new ImageLoaderConfig.Builder(LoaderEnum.GLIDE,new GlideImageLocader())
// .addImageLodaer(LoaderEnum.GLIDE,new GlideImageLocader())
.build());
// Retrofit retrofit = new Retrofit.Builder()
// .baseUrl("https://api.github.com")
// .addConverterFactory(GsonConverterFactory.create())
// .build();
}
}
80 changes: 49 additions & 31 deletions app/src/main/res/layout/activity_main.xml
@@ -1,33 +1,51 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/activity_main"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:orientation="vertical"
tools:context="com.ladingwu.imageloaderframework.MainActivity">


<ImageView
android:id="@+id/img_1"
android:layout_width="200dp"
android:layout_height="200dp" />
<Button
android:id="@+id/btn1"
android:text="隐藏上图"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<ImageView
android:id="@+id/img_2"
android:layout_width="200dp"
android:layout_height="200dp" />
<Button
android:id="@+id/btn2"
android:text="隐藏上图"
<layout xmlns:android="http://schemas.android.com/apk/res/android">

<data>

<variable
name="user"
type="com.ladingwu.imageloaderframework.JavaBean" />
</data>

<LinearLayout xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/activity_main"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin">

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{user.name}"
android:textColor="@color/colorAccent"
android:textSize="20dp" />

<ImageView
android:id="@+id/img_1"
android:layout_width="200dp"
android:layout_height="200dp" />

<Button
android:id="@+id/btn1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="隐藏上图" />

<ImageView
android:id="@+id/img_2"
android:layout_width="200dp"
android:layout_height="200dp" />

<Button
android:id="@+id/btn2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="隐藏上图" />
</LinearLayout>

</layout>
20 changes: 20 additions & 0 deletions app/src/test/java/com/ladingwu/imageloaderframework/RTest.java
@@ -0,0 +1,20 @@
package com.ladingwu.imageloaderframework;

import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;

/**
* Created by wuzhao on 2018/2/8.
*/

@RunWith(RobolectricTestRunner.class)
public class RTest {

@Test
public void test() {
MainActivity mainActivity= Robolectric.setupActivity(MainActivity.class);
mainActivity.findViewById(R.id.btn1).performClick();
}
}
11 changes: 10 additions & 1 deletion build.gradle
@@ -1,12 +1,14 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.library_version = '0.0.3'
repositories {
jcenter()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.0'

classpath 'com.novoda:bintray-release:0.5.0'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
Expand All @@ -17,6 +19,13 @@ allprojects {
jcenter()
google()
}
tasks.withType(Javadoc) {
options{
encoding "UTF-8"
charSet 'UTF-8'
links "https://docs.oracle.com/javase/7/docs/api"
}
}
}

task clean(type: Delete) {
Expand Down
File renamed without changes.
54 changes: 54 additions & 0 deletions fresco/build.gradle
@@ -0,0 +1,54 @@
apply plugin: 'com.android.library'
apply plugin: 'com.novoda.bintray-release'
android {
compileSdkVersion 26



defaultConfig {
minSdkVersion 17
targetSdkVersion 26
versionCode 1
versionName "1.0"

testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

}

buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
lintOptions {
abortOnError false
}
}
//新添加
publish {
userOrg = 'ladingwu' //在https://bintray.com上注册的用户名
repoName='Maven'
groupId = 'com.ladingwu.library' //jCenter上的路径
artifactId = 'fresco' //要上传的library名称
publishVersion = "$library_version" //library的版本号
desc = '' //library的简单描述
website = 'https://github.com/ladingwu/ImageLoaderFramework' //library的开源地址,例如在github上的地址
}

dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
// implementation 'com.android.support:appcompat-v7:26.1.0'
provided "com.android.support:support-annotations:26.1.0"
testImplementation 'junit:junit:4.12'
// androidTestImplementation 'com.android.support.test:runner:1.0.1'
// androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
compile 'com.facebook.fresco:fresco:1.3.0'
compile 'com.facebook.fresco:webpsupport:1.3.0'
compile 'com.facebook.fresco:animated-base-support:1.3.0'
compile 'com.facebook.fresco:animated-webp:1.3.0'
compile 'com.facebook.fresco:animated-gif:1.3.0'
// compile project(':imageloader-framework')
// compile 'com.ladingwu.library:imageloader-framework:0.0.1'
provided "com.ladingwu.library:imageloader-framework:$library_version"
}
File renamed without changes.
File renamed without changes.
Expand Up @@ -30,6 +30,7 @@
import com.lasingwu.baselibrary.ImageLoaderOptions;
import com.lasingwu.baselibrary.LoaderResultCallBack;

import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;


Expand Down Expand Up @@ -83,10 +84,10 @@ private void showImgae(final ImageLoaderOptions options) {
}

if (params.width==WRAP_CONTENT){
params.width=200;
params.width=MATCH_PARENT;
}
if (params.height==WRAP_CONTENT){
params.height=200;
params.height=MATCH_PARENT;
}
imageView.setLayoutParams(params);

Expand Down
File renamed without changes.
File renamed without changes.
39 changes: 0 additions & 39 deletions frescolibrary/build.gradle

This file was deleted.

File renamed without changes.

0 comments on commit 395e54c

Please sign in to comment.