Skip to content

Commit 1f19ae3

Browse files
author
chengwangyong
committed
update REDAME
1 parent 725515d commit 1f19ae3

File tree

12 files changed

+152
-76
lines changed

12 files changed

+152
-76
lines changed

.idea/gradle.xml

Lines changed: 0 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/appcompat_v7_23_1_1.xml

Lines changed: 15 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/support_annotations_23_1_1.xml

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/support_v4_23_1_1.xml

Lines changed: 16 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 6 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424

2525
对于如何导入,也是相当的简单,android studio的用户,直接:
2626

27+
compile 'com.mrwang.Fragmenttack:stacklibrary:1.0.0'
28+
2729
然后,在你的项目中,MainActivity继承RootActivity
2830

2931

simple/simple.iml

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@
1212
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
1313
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1414
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
15+
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
16+
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
1517
<afterSyncTasks>
18+
<task>generateDebugAndroidTestSources</task>
1619
<task>generateDebugSources</task>
1720
</afterSyncTasks>
1821
<option name="ALLOW_USER_CONFIGURATION" value="false" />
@@ -25,7 +28,7 @@
2528
</component>
2629
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
2730
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
28-
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
31+
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
2932
<exclude-output />
3033
<content url="file://$MODULE_DIR$">
3134
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
@@ -47,13 +50,6 @@
4750
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
4851
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
4952
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
50-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
51-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
52-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
53-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
54-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
55-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
56-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
5753
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
5854
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
5955
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
@@ -68,35 +64,23 @@
6864
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
6965
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
7066
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
75-
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
76-
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
77-
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
7867
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
7968
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8069
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
8170
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
8271
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.1/jars" />
8372
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/jars" />
8473
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
85-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
8674
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
87-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
8875
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
8976
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
9077
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
91-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
9278
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
9379
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
9480
</content>
95-
<orderEntry type="jdk" jdkName="Android API 23 Platform (1)" jdkType="Android SDK" />
81+
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
9682
<orderEntry type="sourceFolder" forTests="false" />
9783
<orderEntry type="library" exported="" name="support-v4-23.1.1" level="project" />
98-
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
99-
<orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
10084
<orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
10185
<orderEntry type="library" exported="" name="appcompat-v7-23.1.1" level="project" />
10286
<orderEntry type="module" module-name="stacklibrary" exported="" />

stacklibrary/build.gradle

Lines changed: 52 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
apply plugin: 'com.android.library'
22
apply plugin: 'com.github.dcendents.android-maven'
33
apply plugin: 'com.jfrog.bintray'
4+
apply plugin: 'com.github.dcendents.android-maven'
5+
46

57
android {
68
compileSdkVersion 23
@@ -24,12 +26,12 @@ dependencies {
2426
compile fileTree(dir: 'libs', include: ['*.jar'])
2527
testCompile 'junit:junit:4.12'
2628
compile 'com.android.support:appcompat-v7:23.1.1'
27-
compile 'com.android.support:support-annotations:20.0.0'
29+
2830
}
2931

3032
def siteUrl = 'https://github.com/Mr-wangyong/FragmentStack' // 项目的主页
3133
def gitUrl = 'https://github.com/Mr-wangyong/FragmentStack.git' // Git仓库的url
32-
group = "com.mrwang.stacklibrary" // Maven Group ID for the artifact,一般填你唯一的包名
34+
group = "com.mrwang.Fragmenttack" // Maven Group ID for the artifact,一般填你唯一的包名
3335
install {
3436
repositories.mavenInstaller {
3537
// This generates POM.xml with proper parameters
@@ -58,6 +60,7 @@ install {
5860
developerConnection gitUrl
5961
url siteUrl
6062
}
63+
6164
}
6265
}
6366
}
@@ -68,18 +71,54 @@ task sourcesJar(type: Jar) {
6871
}
6972
task javadoc(type: Javadoc) {
7073
source = android.sourceSets.main.java.srcDirs
74+
options.encoding = "utf-8"
7175
classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
76+
//classpath += project.files(android.getBootClasspath().join(File.pathSeparator,configurations.compile.files))
7277
}
7378
task javadocJar(type: Jar, dependsOn: javadoc) {
7479
classifier = 'javadoc'
7580
from javadoc.destinationDir
7681
}
82+
83+
afterEvaluate {
84+
javadoc.classpath += files(android.libraryVariants.collect { variant ->
85+
variant.javaCompile.classpath.files
86+
})
87+
}
88+
7789
artifacts {
7890
archives javadocJar
7991
archives sourcesJar
8092
}
8193
Properties properties = new Properties()
8294
properties.load(project.rootProject.file('local.properties').newDataInputStream())
95+
96+
android.libraryVariants.all { variant ->
97+
println variant.javaCompile.classpath.files
98+
if(variant.name == 'release') { //我们只需 release 的 javadoc
99+
task("generate${variant.name.capitalize()}Javadoc", type: Javadoc) {
100+
// title = ''
101+
// description = ''
102+
source = variant.javaCompile.source
103+
classpath = files(variant.javaCompile.classpath.files, project.android.getBootClasspath())
104+
options {
105+
encoding "utf-8"
106+
links "http://docs.oracle.com/javase/7/docs/api/"
107+
linksOffline "http://d.android.com/reference", "${android.sdkDirectory}/docs/reference"
108+
}
109+
exclude '**/BuildConfig.java'
110+
exclude '**/R.java'
111+
}
112+
task("javadoc${variant.name.capitalize()}Jar", type: Jar, dependsOn: "generate${variant.name.capitalize()}Javadoc") {
113+
classifier = 'javadoc'
114+
from tasks.getByName("generate${variant.name.capitalize()}Javadoc").destinationDir
115+
}
116+
artifacts {
117+
archives tasks.getByName("javadoc${variant.name.capitalize()}Jar")
118+
}
119+
}
120+
}
121+
83122
bintray {
84123
user = properties.getProperty("bintray.user")
85124
key = properties.getProperty("bintray.apikey")
@@ -90,7 +129,18 @@ bintray {
90129
websiteUrl = siteUrl
91130
vcsUrl = gitUrl
92131
licenses = ["Apache-2.0"]
132+
project.version = "1.0.0"
93133
publish = true
134+
version {
135+
// the 2 functions here, are building the version number
136+
name = "1.0.0" // i.e. 1.0.0-SomeName
137+
vcsTag = "1.0.0" // 1.0.0
138+
gpg {
139+
// keys are uploaded
140+
sign = true
141+
}
142+
}
94143
}
95144
}
96145

146+

stacklibrary/src/main/java/com/mrwang/stacklibrary/OnNewIntent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
/**
44
* In the SingleTop mode, if the current task stack has, then call the callback fragment
5-
* <p/>
5+
* <p>
66
* User: chengwangyong(cwy545177162@163.com)
77
* Date: 2015-12-28
88
* Time: 23:41

stacklibrary/src/main/java/com/mrwang/stacklibrary/RootFragment.java

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ public abstract class RootFragment extends Fragment implements OnNewIntent {
1616

1717
/**
1818
* open a new Fragment
19-
* </p>
2019
*
2120
* @param fragment fragment
2221
*/
@@ -26,18 +25,15 @@ public void open(@NonNull RootFragment fragment) {
2625

2726
/**
2827
* open a new Fragment,And transfer parameters with bundle
29-
* <br/>
28+
* <p>
3029
* Like this
31-
* <br/><p>
32-
* Bundle bundle=new Bundle();<br/>
30+
* <pre> {@code
31+
* Bundle bundle=new Bundle();
3332
* bundle.put(key,value);
34-
* </p>
3533
* In the new fragment, you can accept parameters like this
36-
* <br/>
37-
* <p/>
38-
* Bundle bundle = fragment.getArguments();<br/>
39-
* bundle.get(key);<br/>
40-
* <p/>
34+
* Bundle bundle = fragment.getArguments();
35+
* bundle.get(key);
36+
* }</pre>
4137
*
4238
* @param fragment fragment
4339
* @param bundle bundle
@@ -48,22 +44,21 @@ public void open(@NonNull RootFragment fragment, Bundle bundle) {
4844

4945
/**
5046
* open a new Fragment,And transfer parameters with bundle andr set StackMode
51-
* <br/>
5247
* Like this
53-
* <br/><p>
54-
* Bundle bundle=new Bundle();<br/>
48+
* <pre> {@code
49+
* Bundle bundle=new Bundle();
5550
* bundle.put(key,value);
56-
* </p>
51+
*
52+
* }</pre>
5753
* In the new fragment, you can accept parameters like this
58-
* <br/>
59-
* <p/>
60-
* Bundle bundle = fragment.getArguments();<br/>
54+
* <pre> {@code
55+
* Bundle bundle = fragment.getArguments();
6156
* bundle.get(key);<br/>
62-
* <p/>
57+
* }</pre>
6358
*
6459
* @param fragment fragment
6560
* @param bundle bundle
66-
* @param stackMode stackMode,{@link FragmentStack#STANDARD} or more
61+
* @param stackMode stackMode,{@link StackManager#STANDARD} or more
6762
*/
6863

6964
public void open(@NonNull RootFragment fragment, Bundle bundle, int stackMode) {
@@ -98,9 +93,10 @@ public void close() {
9893

9994
/**
10095
* Closes the specified fragment
96+
*
10197
* @param fragment the specified fragment
10298
*/
103-
public void close(RootFragment fragment){
99+
public void close(RootFragment fragment) {
104100
getRoot().manager.close(fragment);
105101
}
106102

0 commit comments

Comments
 (0)