Skip to content

Commit ff85ade

Browse files
author
yangchengdong
committed
test and prepare a Release..
1 parent 4a93a6c commit ff85ade

File tree

32 files changed

+255
-75
lines changed

32 files changed

+255
-75
lines changed

‎.idea/modules.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/vcs.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎application/build.gradle

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ android {
66
compileSdkVersion 27
77

88
defaultConfig {
9-
applicationId "com.eastwood.demo.application"
9+
applicationId "com.eastwood.demo"
1010
minSdkVersion 14
1111
targetSdkVersion 27
1212
versionCode 1
@@ -16,39 +16,39 @@ android {
1616

1717
}
1818

19-
flavorDimensions "api", "mode"
20-
21-
productFlavors {
22-
23-
minApi24 {
24-
dimension "api"
25-
minSdkVersion 24
26-
versionCode 30000 + android.defaultConfig.versionCode
27-
versionNameSuffix "-minApi24"
28-
}
29-
30-
minApi23 {
31-
dimension "api"
32-
minSdkVersion 23
33-
versionCode 20000 + android.defaultConfig.versionCode
34-
versionNameSuffix "-minApi23"
35-
}
36-
37-
minApi21 {
38-
dimension "api"
39-
minSdkVersion 21
40-
versionCode 10001 + android.defaultConfig.versionCode
41-
versionNameSuffix "-minApi21"
42-
}
43-
44-
demo {
45-
dimension "mode"
46-
}
47-
48-
full {
49-
dimension "mode"
50-
}
51-
}
19+
// flavorDimensions "api", "mode"
20+
//
21+
// productFlavors {
22+
//
23+
// minApi24 {
24+
// dimension "api"
25+
// minSdkVersion 24
26+
// versionCode 30000 + android.defaultConfig.versionCode
27+
// versionNameSuffix "-minApi24"
28+
// }
29+
//
30+
// minApi23 {
31+
// dimension "api"
32+
// minSdkVersion 23
33+
// versionCode 20000 + android.defaultConfig.versionCode
34+
// versionNameSuffix "-minApi23"
35+
// }
36+
//
37+
// minApi21 {
38+
// dimension "api"
39+
// minSdkVersion 21
40+
// versionCode 10001 + android.defaultConfig.versionCode
41+
// versionNameSuffix "-minApi21"
42+
// }
43+
//
44+
// demo {
45+
// dimension "mode"
46+
// }
47+
//
48+
// full {
49+
// dimension "mode"
50+
// }
51+
// }
5252

5353
buildTypes {
5454
release {

‎application/main/src/demo/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<manifest package="com.eastwood.demo.application" />

‎application/main/src/demo/java/com/eastwood/demo/application/TestDemo.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package com.eastwood.demo.application;
2+
3+
import android.content.Context;
4+
5+
/**
6+
* @author eastwood
7+
* createDate: 2018-10-15
8+
*/
9+
public class TestDemo {
10+
11+
void test(Context context) {
12+
// context.getResources().getString(R.string.home);
13+
}
14+
}

‎application/main/src/demo/res/layout/activity_demo.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/tools"
4+
android:layout_width="match_parent"
5+
android:layout_height="match_parent"
6+
tools:context=".MainActivity">
7+
8+
<!--<TextView-->
9+
<!--android:layout_width="wrap_content"-->
10+
<!--android:layout_height="wrap_content"-->
11+
<!--android:text="@string/home"-->
12+
<!--app:layout_constraintBottom_toBottomOf="parent"-->
13+
<!--app:layout_constraintLeft_toLeftOf="parent"-->
14+
<!--app:layout_constraintRight_toRightOf="parent"-->
15+
<!--app:layout_constraintTop_toTopOf="parent" />-->
16+
17+
18+
</android.support.constraint.ConstraintLayout>

‎application/main/src/full/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<manifest package="com.eastwood.demo.application" />

‎application/main/src/full/java/com/eastwood/demo/application/TestFull.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package com.eastwood.demo.application;
2+
3+
import android.content.Context;
4+
5+
/**
6+
* @author eastwood
7+
* createDate: 2018-10-15
8+
*/
9+
public class TestFull {
10+
11+
void test(Context context) {
12+
// context.getResources().getString(R.string.home);
13+
}
14+
}

‎application/main/src/full/res/layout/activity_full.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/tools"
4+
android:layout_width="match_parent"
5+
android:layout_height="match_parent"
6+
tools:context=".MainActivity">
7+
8+
<!--<TextView-->
9+
<!--android:layout_width="wrap_content"-->
10+
<!--android:layout_height="wrap_content"-->
11+
<!--android:text="@string/home"-->
12+
<!--app:layout_constraintBottom_toBottomOf="parent"-->
13+
<!--app:layout_constraintLeft_toLeftOf="parent"-->
14+
<!--app:layout_constraintRight_toRightOf="parent"-->
15+
<!--app:layout_constraintTop_toTopOf="parent" />-->
16+
17+
</android.support.constraint.ConstraintLayout>

‎application/main/src/main/java/com/eastwood/demo/application/MainActivity.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.eastwood.demo.application;
22

3-
import android.support.v7.app.AppCompatActivity;
43
import android.os.Bundle;
4+
import android.support.v7.app.AppCompatActivity;
55

66
public class MainActivity extends AppCompatActivity {
77

@@ -10,8 +10,8 @@ protected void onCreate(Bundle savedInstanceState) {
1010
super.onCreate(savedInstanceState);
1111
setContentView(R.layout.activity_main);
1212

13-
// can't use [R.string.base] which from microModule ':p_base'.
14-
// getString(R.string.base);
13+
// can't use [R.string.home] which from microModule ':p_home'.
14+
// getString(R.string.home);
1515

1616
}
1717
}

‎application/main/src/minApi21/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<manifest package="com.eastwood.demo.application" />

‎application/main/src/minApi21/java/com/eastwood/demo/application/TestMinApi21.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package com.eastwood.demo.application;
2+
3+
import android.content.Context;
4+
5+
/**
6+
* @author eastwood
7+
* createDate: 2018-10-15
8+
*/
9+
public class TestMinApi21 {
10+
11+
void test(Context context) {
12+
// context.getResources().getString(R.string.home);
13+
}
14+
}

‎application/main/src/minApi21/res/layout/activity_minapi21.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/tools"
4+
android:layout_width="match_parent"
5+
android:layout_height="match_parent"
6+
tools:context=".MainActivity">
7+
8+
<!--<TextView-->
9+
<!--android:layout_width="wrap_content"-->
10+
<!--android:layout_height="wrap_content"-->
11+
<!--android:text="@string/home"-->
12+
<!--app:layout_constraintBottom_toBottomOf="parent"-->
13+
<!--app:layout_constraintLeft_toLeftOf="parent"-->
14+
<!--app:layout_constraintRight_toRightOf="parent"-->
15+
<!--app:layout_constraintTop_toTopOf="parent" />-->
16+
17+
</android.support.constraint.ConstraintLayout>

‎application/main/src/minApi23/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<manifest package="com.eastwood.demo.application" />

‎application/main/src/minApi23/java/com/eastwood/demo/application/TestMinApi23.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package com.eastwood.demo.application;
2+
3+
import android.content.Context;
4+
5+
/**
6+
* @author eastwood
7+
* createDate: 2018-10-15
8+
*/
9+
public class TestMinApi23 {
10+
11+
void test(Context context) {
12+
// context.getResources().getString(R.string.home);
13+
}
14+
}

‎application/main/src/minApi23/res/layout/activity_minapi23.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/tools"
4+
android:layout_width="match_parent"
5+
android:layout_height="match_parent"
6+
tools:context=".MainActivity">
7+
8+
<!--<TextView-->
9+
<!--android:layout_width="wrap_content"-->
10+
<!--android:layout_height="wrap_content"-->
11+
<!--android:text="@string/home"-->
12+
<!--app:layout_constraintBottom_toBottomOf="parent"-->
13+
<!--app:layout_constraintLeft_toLeftOf="parent"-->
14+
<!--app:layout_constraintRight_toRightOf="parent"-->
15+
<!--app:layout_constraintTop_toTopOf="parent" />-->
16+
17+
</android.support.constraint.ConstraintLayout>

‎application/main/src/minApi24/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<manifest package="com.eastwood.demo.application" />

‎application/main/src/minApi24/java/com/eastwood/demo/application/TestMinApi24.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package com.eastwood.demo.application;
2+
3+
import android.content.Context;
4+
5+
/**
6+
* @author eastwood
7+
* createDate: 2018-10-15
8+
*/
9+
public class TestMinApi24 {
10+
11+
void test(Context context) {
12+
// context.getResources().getString(R.string.home);
13+
}
14+
}

‎application/main/src/minApi24/res/layout/activity_minapi24.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/tools"
4+
android:layout_width="match_parent"
5+
android:layout_height="match_parent"
6+
tools:context=".MainActivity">
7+
8+
<!--<TextView-->
9+
<!--android:layout_width="wrap_content"-->
10+
<!--android:layout_height="wrap_content"-->
11+
<!--android:text="@string/home"-->
12+
<!--app:layout_constraintBottom_toBottomOf="parent"-->
13+
<!--app:layout_constraintLeft_toLeftOf="parent"-->
14+
<!--app:layout_constraintRight_toRightOf="parent"-->
15+
<!--app:layout_constraintTop_toTopOf="parent" />-->
16+
17+
</android.support.constraint.ConstraintLayout>

‎application/p_base/src/main/java/com/eastwood/demo/application/base/Base.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,5 @@ public class Base extends Activity {
1414
protected void onCreate(@Nullable Bundle savedInstanceState) {
1515
super.onCreate(savedInstanceState);
1616

17-
getString(R.string.base);
18-
1917
}
2018
}

‎application/p_home/src/main/res/values/strings.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
4+
<string name="home">home</string>
5+
6+
</resources>

‎library/build.gradle

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -22,40 +22,40 @@ android {
2222
}
2323
}
2424

25-
flavorDimensions "api", "mode"
26-
27-
productFlavors {
28-
29-
minApi24 {
30-
dimension "api"
31-
minSdkVersion 24
32-
versionCode 30000 + android.defaultConfig.versionCode
33-
versionNameSuffix "-minApi24"
34-
}
35-
36-
minApi23 {
37-
dimension "api"
38-
minSdkVersion 23
39-
versionCode 20000 + android.defaultConfig.versionCode
40-
versionNameSuffix "-minApi23"
41-
}
42-
43-
minApi21 {
44-
dimension "api"
45-
minSdkVersion 21
46-
versionCode 10000 + android.defaultConfig.versionCode
47-
versionNameSuffix "-minApi21"
48-
}
49-
50-
demo {
51-
dimension "mode"
52-
}
53-
54-
full {
55-
dimension "mode"
56-
}
57-
58-
}
25+
// flavorDimensions "api", "mode"
26+
//
27+
// productFlavors {
28+
//
29+
// minApi24 {
30+
// dimension "api"
31+
// minSdkVersion 24
32+
// versionCode 30000 + android.defaultConfig.versionCode
33+
// versionNameSuffix "-minApi24"
34+
// }
35+
//
36+
// minApi23 {
37+
// dimension "api"
38+
// minSdkVersion 23
39+
// versionCode 20000 + android.defaultConfig.versionCode
40+
// versionNameSuffix "-minApi23"
41+
// }
42+
//
43+
// minApi21 {
44+
// dimension "api"
45+
// minSdkVersion 21
46+
// versionCode 10000 + android.defaultConfig.versionCode
47+
// versionNameSuffix "-minApi21"
48+
// }
49+
//
50+
// demo {
51+
// dimension "mode"
52+
// }
53+
//
54+
// full {
55+
// dimension "mode"
56+
// }
57+
//
58+
// }
5959

6060
}
6161

‎library/main/src/demo/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<manifest package="com.eastwood.demo.library" />

‎library/main/src/full/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<manifest package="com.eastwood.demo.library" />

0 commit comments

Comments
 (0)