Merge branch 'master' of http://bj.gitlab.cnlive.com/cnlive-team/newModuleStrike

YangShuai
2 parents 0de61b3c 4c6c7c72
Showing 7 changed files with 41 additions and 2 deletions
.idea/gradle.xml
core/dentity_verfication/.gitignore
core/dentity_verfication/build.gradle
core/dentity_verfication/consumer-rules.pro
core/dentity_verfication/proguard-rules.pro
core/dentity_verfication/src/main/AndroidManifest.xml
settings.gradle
@@ -4,7 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="delegatedBuild" value="true" />
+        <option name="delegatedBuild" value="false" />
         <option name="testRunner" value="PLATFORM" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
@@ -24,6 +24,7 @@
             <option value="$PROJECT_DIR$/core/app_qr" />
             <option value="$PROJECT_DIR$/core/base" />
             <option value="$PROJECT_DIR$/core/database" />
+            <option value="$PROJECT_DIR$/core/dentity_verfication" />
             <option value="$PROJECT_DIR$/core/imageload" />
             <option value="$PROJECT_DIR$/core/network" />
             <option value="$PROJECT_DIR$/library_baidumap" />
+/build
+apply plugin: 'com.android.library'
+
+android {
+
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+}
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.cnlive.core.people_verfication" />
 include ':app:strike'
 //基础库
-include ':core:base',':core:network',':core:imageload' ,':core:app_qr',':core:database'
+include ':core:base',':core:network',':core:imageload' ,':core:app_qr',':core:database',':core:dentity_verfication'
 include ':cloud:user',':cloud:pay',':cloud:third_tool',':cloud:video',':cloud:app_pay',':cloud:wjj_lib'
 include ':module:xiaojiasoundbox',':module:pedometer',':module:shanghaishop',':module:shopcity'
 include ':library_baidumap'