Skip to content

Commit e52c1eb

Browse files
yipianfengyeyipianfengye
committed
更新代码与demo图片
1 parent 4ae804b commit e52c1eb

File tree

6 files changed

+47
-23
lines changed

6 files changed

+47
-23
lines changed

‎adlibrary/adlibrary.iml

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,6 @@
6767
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6868
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
6969
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
70-
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
75-
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
76-
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
77-
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
7870
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
7971
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
8072
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -83,6 +75,16 @@
8375
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
8476
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
8577
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
84+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
85+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
86+
<excludeFolder url="file://$MODULE_DIR$/build/.DS_Store" />
87+
<excludeFolder url="file://$MODULE_DIR$/build/docs" />
8688
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
8789
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8890
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
@@ -114,7 +116,14 @@
114116
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
115117
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
116118
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
119+
<excludeFolder url="file://$MODULE_DIR$/build/ivy.xml" />
120+
<excludeFolder url="file://$MODULE_DIR$/build/libs" />
117121
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
122+
<excludeFolder url="file://$MODULE_DIR$/build/poms" />
123+
<excludeFolder url="file://$MODULE_DIR$/build/release" />
124+
<excludeFolder url="file://$MODULE_DIR$/build/release-1.0.zip" />
125+
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
126+
<excludeFolder url="file://$MODULE_DIR$/build/test-results" />
118127
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
119128
</content>
120129
<orderEntry type="jdk" jdkName="Android API 23 Platform (1)" jdkType="Android SDK" />

‎adlibrary/build.gradle

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ android {
66

77
defaultConfig {
88
minSdkVersion 14
9-
targetSdkVersion 23
9+
targetSdkVersion 22
1010
versionCode 1
1111
versionName "1.0"
1212

@@ -35,3 +35,11 @@ dependencies {
3535
compile 'com.android.support:support-v4:23.0.0'
3636
testCompile 'junit:junit:4.12'
3737
}
38+
39+
ext {
40+
PUBLISH_GROUP_ID = 'cn.yipianfengye.android'
41+
PUBLISH_ARTIFACT_ID = 'ad-library'
42+
PUBLISH_VERSION = '1.0'
43+
}
44+
45+
apply from: 'https://raw.githubusercontent.com/blundell/release-android-library/master/android-release-aar.gradle'

‎app/app.iml

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,6 @@
6666
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6767
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
6868
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
69-
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
70-
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
75-
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
76-
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
7769
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
7870
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
7971
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -82,10 +74,19 @@
8274
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
8375
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
8476
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
84+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
8585
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8686
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8787
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
8888
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
89+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/cn.yipianfengye.android/ad-library/1.0/jars" />
8990
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support.constraint/constraint-layout/1.0.0-alpha4/jars" />
9091
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support.test.espresso/espresso-core/2.2.2/jars" />
9192
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support.test.espresso/espresso-idling-resource/2.2.2/jars" />
@@ -114,6 +115,8 @@
114115
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
115116
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
116117
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
118+
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
119+
<excludeFolder url="file://$MODULE_DIR$/build/test-results" />
117120
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
118121
</content>
119122
<orderEntry type="jdk" jdkName="Android API 23 Platform (1)" jdkType="Android SDK" />
@@ -122,8 +125,8 @@
122125
<orderEntry type="library" exported="" name="constraint-layout-solver-1.0.0-alpha4" level="project" />
123126
<orderEntry type="library" exported="" scope="TEST" name="runner-0.5" level="project" />
124127
<orderEntry type="library" exported="" scope="TEST" name="espresso-idling-resource-2.2.2" level="project" />
125-
<orderEntry type="library" exported="" name="drawee-0.12.0" level="project" />
126128
<orderEntry type="library" exported="" name="materialicons-1.0.2" level="project" />
129+
<orderEntry type="library" exported="" name="drawee-0.12.0" level="project" />
127130
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-library-1.3" level="project" />
128131
<orderEntry type="library" exported="" name="fresco-0.12.0" level="project" />
129132
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-integration-1.3" level="project" />
@@ -148,6 +151,6 @@
148151
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
149152
<orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
150153
<orderEntry type="library" exported="" name="FlycoPageIndicator_Lib-1.0.0" level="project" />
151-
<orderEntry type="module" module-name="adlibrary" exported="" />
154+
<orderEntry type="library" exported="" name="ad-library-1.0" level="project" />
152155
</component>
153156
</module>

‎app/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,6 @@ dependencies {
2727
compile 'com.android.support:appcompat-v7:23.4.0'
2828
compile 'com.android.support.constraint:constraint-layout:1.0.0-alpha4'
2929
testCompile 'junit:junit:4.12'
30-
compile project(':adlibrary')
30+
// compile project(':adlibrary')
31+
compile 'cn.yipianfengye.android:ad-library:1.0'
3132
}

‎app/src/main/java/com/uuch/android_addialog/MainActivity.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020
import java.util.ArrayList;
2121
import java.util.List;
2222

23+
/**
24+
* 测试广告活动弹窗demo
25+
*/
2326
public class MainActivity extends AppCompatActivity {
2427

2528
private List<AdInfo> advList = null;
@@ -49,12 +52,10 @@ private void initData() {
4952
advList = new ArrayList<>();
5053
AdInfo adInfo = new AdInfo();
5154
adInfo.setActivityImg("http://uu-image.oss-cn-hangzhou.aliyuncs.com/160616/8409037842A6BDA500B698A99F7FE5A10C106D23.png");
52-
adInfo.setAdId("1");
5355
advList.add(adInfo);
5456

5557
adInfo = new AdInfo();
5658
adInfo.setActivityImg("http://uu-image.oss-cn-hangzhou.aliyuncs.com/160714/443619810B576C3A0287756EF7B789EC9A11DC33.png");
57-
adInfo.setAdId("2");
5859
advList.add(adInfo);
5960
}
6061

@@ -75,7 +76,6 @@ private void initView() {
7576
mList.add(new DataBean(AdConstant.ANIM_DOWNRIGHT_TO_CENTER, "从右下弹出广告弹窗"));
7677
SpinnerAdapter spinnerAdapter = new SpinnerAdapter(mList, this);
7778
spinner.setAdapter(spinnerAdapter);
78-
spinner.setSelected(true);
7979

8080

8181
editText = (EditText) findViewById(R.id.edittext);

‎build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ buildscript {
1515
allprojects {
1616
repositories {
1717
jcenter()
18+
maven {
19+
url 'https://dl.bintray.com/yipianfengye/maven'
20+
}
1821
}
1922
}
2023

0 commit comments

Comments
 (0)