CNLive Android Team / OPenCNLive_BaseLib · Commits

Commit 8f4559b96ee46f927ee5d19e1994defb8cbd960e

Authored by 朱显松
1 parent 687b514c

Local libs

Inline Side-by-side
Showing 13 changed files with 51 additions and 46 deletions
.idea/gradle.xml
  View file @8f4559b
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 <set> 9 <set>
10 <option value="$PROJECT_DIR$" /> 10 <option value="$PROJECT_DIR$" />
11 <option value="$PROJECT_DIR$/app" /> 11 <option value="$PROJECT_DIR$/app" />
12 - <option value="$PROJECT_DIR$/cnlive_base" /> 12 + <option value="$PROJECT_DIR$/cnlive_libs_base" />
13 </set> 13 </set>
14 </option> 14 </option>
15 <option name="resolveModulePerSourceSet" value="false" /> 15 <option name="resolveModulePerSourceSet" value="false" />
.idea/modules.xml
  View file @8f4559b
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <modules> 4 <modules>
5 <module fileurl="file://$PROJECT_DIR$/CNLiveLibs.iml" filepath="$PROJECT_DIR$/CNLiveLibs.iml" /> 5 <module fileurl="file://$PROJECT_DIR$/CNLiveLibs.iml" filepath="$PROJECT_DIR$/CNLiveLibs.iml" />
6 <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" /> 6 <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
7 - <module fileurl="file://$PROJECT_DIR$/cnlive_base/cnlive_base.iml" filepath="$PROJECT_DIR$/cnlive_base/cnlive_base.iml" /> 7 + <module fileurl="file://$PROJECT_DIR$/cnlive_libs_base/cnlive_libs_base.iml" filepath="$PROJECT_DIR$/cnlive_libs_base/cnlive_libs_base.iml" />
8 </modules> 8 </modules>
9 </component> 9 </component>
10 </project> 10 </project>
11 \ No newline at end of file 11 \ No newline at end of file
.idea/vcs.xml 0 → 100644
  View file @8f4559b
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<project version="4">
  3 + <component name="VcsDirectoryMappings">
  4 + <mapping directory="$PROJECT_DIR$" vcs="Git" />
  5 + </component>
  6 +</project>
0 \ No newline at end of file 7 \ No newline at end of file
app/build.gradle
  View file @8f4559b
@@ -27,4 +27,6 @@ dependencies { @@ -27,4 +27,6 @@ dependencies {
27 compile 'com.android.support:appcompat-v7:26.+' 27 compile 'com.android.support:appcompat-v7:26.+'
28 compile 'com.android.support.constraint:constraint-layout:1.0.2' 28 compile 'com.android.support.constraint:constraint-layout:1.0.2'
29 testCompile 'junit:junit:4.12' 29 testCompile 'junit:junit:4.12'
  30 +
  31 + compile 'com.android.support.constraint:constraint-layout:1.0.2'
30 } 32 }
base.properties 0 → 100644
  View file @8f4559b
  1 +# 包信息
  2 +PROJ_GROUP=com.cnlive.libs
  3 +
  4 +# 项目的描述
  5 +PROJ_WEBSITEURL=http://www.cnlive.com
  6 +PROJ_ISSUETRACKERURL=http://bj.gitlab.cnlive.com/cnlive-team/CNVideoDemo
  7 +PROJ_VCSURL=http://bj.gitlab.cnlive.com/cnlive-team/CNVideoDemo
  8 +PROJ_DESCRIPTION=CNLive Video Demo
  9 +
  10 +# Licence信息
  11 +PROJ_LICENCE_NAME=The Apache Software License, Version 2.0
  12 +PROJ_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
  13 +PROJ_LICENCE_DEST=repo
  14 +
  15 +# Developer 信息
  16 +DEVELOPER_ID=CNLive
  17 +DEVELOPER_NAME=Granzon
  18 +DEVELOPER_EMAIL=zhuxiansong@cnlive.com
0 \ No newline at end of file 19 \ No newline at end of file
cnlive_base/src/androidTest/java/com/cnlive/libs/base/ExampleInstrumentedTest.java deleted 100644 → 0
  View file @687b514
1 -package com.cnlive.libs.base;  
2 -  
3 -import android.content.Context;  
4 -import android.support.test.InstrumentationRegistry;  
5 -import android.support.test.runner.AndroidJUnit4;  
6 -  
7 -import org.junit.Test;  
8 -import org.junit.runner.RunWith;  
9 -  
10 -import static org.junit.Assert.*;  
11 -  
12 -/**  
13 - * Instrumentation test, which will execute on an Android device.  
14 - *  
15 - * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>  
16 - */  
17 -@RunWith(AndroidJUnit4.class)  
18 -public class ExampleInstrumentedTest {  
19 - @Test  
20 - public void useAppContext() throws Exception {  
21 - // Context of the app under test.  
22 - Context appContext = InstrumentationRegistry.getTargetContext();  
23 -  
24 - assertEquals("com.cnlive.libs.base.test", appContext.getPackageName());  
25 - }  
26 -}  
cnlive_base/src/test/java/com/cnlive/libs/base/ExampleUnitTest.java deleted 100644 → 0
  View file @687b514
1 -package com.cnlive.libs.base;  
2 -  
3 -import org.junit.Test;  
4 -  
5 -import static org.junit.Assert.*;  
6 -  
7 -/**  
8 - * Example local unit test, which will execute on the development machine (host).  
9 - *  
10 - * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>  
11 - */  
12 -public class ExampleUnitTest {  
13 - @Test  
14 - public void addition_isCorrect() throws Exception {  
15 - assertEquals(4, 2 + 2);  
16 - }  
17 -}  
18 \ No newline at end of file 0 \ No newline at end of file
cnlive_base/.gitignore renamed to cnlive_libs_base/.gitignore
  View file @8f4559b
cnlive_base/build.gradle renamed to cnlive_libs_base/build.gradle
  View file @8f4559b
1 apply plugin: 'com.android.library' 1 apply plugin: 'com.android.library'
  2 +apply plugin: 'maven'
2 3
3 android { 4 android {
4 compileSdkVersion 26 5 compileSdkVersion 26
@@ -29,3 +30,24 @@ dependencies { @@ -29,3 +30,24 @@ dependencies {
29 compile 'com.android.support:appcompat-v7:26.+' 30 compile 'com.android.support:appcompat-v7:26.+'
30 testCompile 'junit:junit:4.12' 31 testCompile 'junit:junit:4.12'
31 } 32 }
  33 +
  34 +ext {
  35 + PROJ_NAME = 'cnlive-base'
  36 + PROJ_ARTIFACTID = 'base'
  37 + PROJ_POM_NAME = 'libs-base'
  38 + PROJ_VERSION = '1.0.0'
  39 +
  40 + LOCAL_REPO_URL = 'file:///E:/android-libs-ass/cnlive-base'
  41 +}
  42 +
  43 +uploadArchives {
  44 + Properties props = new Properties();
  45 + props.load(new FileInputStream(rootProject.file('base.properties')))
  46 +
  47 + repositories.mavenDeployer {
  48 + repository(url: LOCAL_REPO_URL)
  49 + pom.groupId = props['PROJ_GROUP']
  50 + pom.artifactId = PROJ_ARTIFACTID
  51 + pom.version = PROJ_VERSION
  52 + }
  53 +}
cnlive_base/proguard-rules.pro renamed to cnlive_libs_base/proguard-rules.pro
  View file @8f4559b
cnlive_base/src/main/AndroidManifest.xml renamed to cnlive_libs_base/src/main/AndroidManifest.xml
  View file @8f4559b
cnlive_base/src/main/res/values/strings.xml renamed to cnlive_libs_base/src/main/res/values/strings.xml
  View file @8f4559b
settings.gradle
  View file @8f4559b
1 -include ':app', ':cnlive_base' 1 +include ':app', ':cnlive_libs_base'