补充提交文件2

app/build.gradle

@@ -1,6 +1,8 @@
 apply plugin: 'com.android.application'
 
-
+def releaseTime() {
+    return new Date().format("yyyyMMdd", TimeZone.getTimeZone("UTC"))
+}
 android {
     compileSdkVersion rootProject.ext.android["compileSdkVersion"]
     
@@ -14,12 +16,38 @@ android {
     defaultConfig {
         applicationId "com.xwkj.jcjcgz"
         minSdkVersion rootProject.ext.android["minSdkVersion"]
-        targetSdkVersion rootProject.ext.android["targetSdkVersion"]
-        versionCode rootProject.ext.android["versionCode"]
-        versionName rootProject.ext.android["versionName"]
+        targetSdkVersion 29
+        versionCode 100
+        versionName "1.0.0"
         testInstrumentationRunner rootProject.ext.dependencies["androidJUnitRunner"]
+        flavorDimensions "1"
+        ndk {
+            abiFilters "armeabi", "armeabi-v7a", "arm64-v8a", "x86"
+        }
+    }
+
+    sourceSets {
+        main {
+            jniLibs.srcDirs = ['libs']
+        }
     }
+    signingConfigs {
+        debug {
+            keyAlias 'zkjc_police'
+            keyPassword 'jlszkjc777888'
+            storeFile file("../sign/keystore.jks")
+            storePassword 'jlszkjc777888'
+//            v2SigningEnabled false
+        }
+        release {
+            keyAlias 'zkjc_police'
+            keyPassword 'jlszkjc777888'
+            storeFile file("../sign/keystore.jks")
+            storePassword 'jlszkjc777888'
+//            v2SigningEnabled false
+        }
 
+    }
     buildTypes {
         debug {
             buildConfigField "boolean", "LOG_DEBUG", "true"
@@ -31,46 +59,107 @@ android {
         release {
             buildConfigField "boolean", "LOG_DEBUG", "false"
             buildConfigField "boolean", "USE_CANARY", "false"
-            minifyEnabled true
+            /*minifyEnabled false
             shrinkResources true
-            zipAlignEnabled true
+            zipAlignEnabled true*/
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    productFlavors {
+        //应用商店版本
+        appstore {
+            resValue "string", "app_name", "照片合成"
+            signingConfig signingConfigs.release
+            manifestPlaceholders = [UMENG_CHANNEL: "appstore", CATEGORY: "android.intent.category.DEFAULT", APP_ICON: "@mipmap/ic_launcher"]
+        }
+        //非应用商店版本
+        unappstore {
+
+            resValue "string", "app_name", "照片合成"
+            signingConfig signingConfigs.release
+            manifestPlaceholders = [UMENG_CHANNEL: "unappstore", CATEGORY: "android.intent.category.LAUNCHER", APP_ICON: "@mipmap/ic_launcher"]
+        }
+
+
+    }
+    productFlavors.all { flavor ->
+        flavor.manifestPlaceholders = [UMENG_CHANNEL_VALUE: name, CATEGORY_VALUE: flavor.manifestPlaceholders.CATEGORY, APP_ICON: flavor.manifestPlaceholders.APP_ICON]
+//        flavor.manifestPlaceholders = [UMENG_CHANNEL_VALUE: name]
+    }
 
+    applicationVariants.all { variant ->
+        variant.outputs.all {
+            if (variant.buildType.name == 'release') {
+                // release：输出文件名必须命名为 outputFileName
+                outputFileName = "${variant.productFlavors[0].name}_${variant.productFlavors[0].applicationId}_${buildType.name}_v${variant.versionName}_${releaseTime()}.apk"
+//                        output.outputFile = new File(output.outputFile.parent, apkName)
+            } else {
+                // debug 输出文件名必须命名为 outputFileName
+                outputFileName = "${variant.productFlavors[0].name}_${project.getName()}_${buildType.name}.apk"
+//                        output.outputFile = new File(output.outputFile.parent, apkName)
+            }
+        }
+    }
+
+    configurations.all {
+        resolutionStrategy {
+            force 'androidx.core:core-ktx:1.6.0'
+        }
+    }
     lintOptions {
         disable 'InvalidPackage'
         disable "ResourceType"
         abortOnError false
     }
 }
-
+repositories {
+    flatDir {
+        dirs 'libs', '../common/libs'
+    }
+}
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'me.jessyan:arms:2.5.2'
-    implementation 'me.jessyan:arms-imageloader-glide:2.5.2'
-
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    /*   implementation 'me.jessyan:arms:2.5.2'
+            implementation 'me.jessyan:arms-imageloader-glide:2.5.2'*/
     //view
     implementation rootProject.ext.dependencies["autosize"]
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     annotationProcessor(rootProject.ext.dependencies["butterknife-compiler"]) {
         exclude module: 'support-annotations'
     }
-    
     //tools
     annotationProcessor rootProject.ext.dependencies["dagger2-compiler"]
-
+    implementation rootProject.ext.dependencies["picasso"]
     //注意 Arms 核心库现在并不会依赖某个 EventBus, 要想使用 EventBus, 还请在项目中自行依赖对应的 EventBus
     //现在支持两种 EventBus, greenrobot 的 EventBus 和畅销书 《Android源码设计模式解析与实战》的作者 何红辉 所作的 AndroidEventBus
     //依赖后 Arms 会自动检测您依赖的 EventBus 并自动注册
     //建议使用 AndroidEventBus, 特别是组件化项目, 原因请看 https://github.com/hehonghui/AndroidEventBus/issues/49
     //这种做法可以让使用者有自行选择三方库的权利, 并且还可以减轻 Arms 的体积
-    implementation rootProject.ext.dependencies["androideventbus"]
-//    implementation rootProject.ext.dependencies["eventbus"]
-
+    //   implementation rootProject.ext.dependencies["androideventbus"]
+    //    implementation rootProject.ext.dependencies["eventbus"]
     //test
     debugImplementation rootProject.ext.dependencies["canary-debug"]
     releaseImplementation rootProject.ext.dependencies["canary-release"]
     testImplementation rootProject.ext.dependencies["canary-release"]
     testImplementation rootProject.ext.dependencies["junit"]
+    implementation rootProject.ext.dependencies["eventbus"]
+    //  implementation rootProject.ext.dependencies["design"]
+    implementation project(':thirdparty')
+    implementation project(':common')
+
+    // implementation 'me.jessyan:progressmanager:1.5.0'
+    //页面引导
+    // implementation 'com.binioter:guideview:1.0.0'
+
+    implementation 'com.google.android.material:material:1.1.0'
+
+    implementation 'com.xm.permissions:XmPermissions:1.0.1'
+
+
+
+
+
+
 
 }

app/src/main/AndroidManifest.xml

@@ -13,7 +13,7 @@
     <application
         android:name="com.jess.arms.base.BaseApplication"
         android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="${APP_ICON}"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">

app/src/main/res/values/strings.xml

@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">Jcjcgz</string>
+<!--    <string name="app_name">Jcjcgz</string>-->
 </resources>

app/src/main/res/values/styles.xml

@@ -14,4 +14,5 @@
         <item name="android:activityCloseEnterAnimation">@anim/translate_left_to_center</item>
         <item name="android:activityCloseExitAnimation">@anim/translate_center_to_right</item>
     </style>
+
 </resources>

config.gradle

@@ -1,111 +1,121 @@
 ext {
 
     android = [
-               compileSdkVersion       : 28,
-               buildToolsVersion       : "28.0.3",
-               minSdkVersion           : 14,
-               targetSdkVersion        : 28,
-               versionCode             : 186,
-               versionName             : "2.5.2"
+            compileSdkVersion: 28,
+            buildToolsVersion: "28.0.3",
+            minSdkVersion    : 21,
+            targetSdkVersion : 28,
+            versionCode      : 186,
+            versionName      : "2.5.2"
     ]
 
-     version = [
-                   androidSupportSdkVersion: "28.0.0",
-                   retrofitSdkVersion      : "2.6.0",
-                   dagger2SdkVersion       : "2.23.2",
-                   glideSdkVersion         : "4.9.0",
-                   butterknifeSdkVersion   : "9.0.0",
-                   rxlifecycleSdkVersion   : "1.0",
-                   rxlifecycle2SdkVersion  : "2.2.2",
-                   espressoSdkVersion      : "3.0.1",
-                   canarySdkVersion        : "1.6.3"
-        ]
+    version = [
+            androidSupportSdkVersion: "28.0.0",
+            retrofitSdkVersion      : "2.6.0",
+            dagger2SdkVersion       : "2.23.2",
+            glideSdkVersion         : "4.9.0",
+            butterknifeSdkVersion   : "10.0.0",
+            rxlifecycleSdkVersion   : "1.0",
+            rxlifecycle2SdkVersion  : "2.2.2",
+            espressoSdkVersion      : "3.0.1",
+            canarySdkVersion        : "1.6.3"
+    ]
 
     dependencies = [
-                //support
-                "appcompat-v7"             : "com.android.support:appcompat-v7:${version["androidSupportSdkVersion"]}",
-                "design"                   : "com.android.support:design:${version["androidSupportSdkVersion"]}",
-                "support-v4"               : "com.android.support:support-v4:${version["androidSupportSdkVersion"]}",
-                "cardview-v7"              : "com.android.support:cardview-v7:${version["androidSupportSdkVersion"]}",
-                "annotations"              : "com.android.support:support-annotations:${version["androidSupportSdkVersion"]}",
-                "recyclerview-v7"          : "com.android.support:recyclerview-v7:${version["androidSupportSdkVersion"]}",
-
-                //network
-                "retrofit"                 : "com.squareup.retrofit2:retrofit:${version["retrofitSdkVersion"]}",
-                "retrofit-converter-gson"  : "com.squareup.retrofit2:converter-gson:${version["retrofitSdkVersion"]}",
-                "retrofit-adapter-rxjava"  : "com.squareup.retrofit2:adapter-rxjava:${version["retrofitSdkVersion"]}",
-                "retrofit-adapter-rxjava2" : "com.squareup.retrofit2:adapter-rxjava2:${version["retrofitSdkVersion"]}",
-                "okhttp3"                  : "com.squareup.okhttp3:okhttp:3.12.3",
-                "okhttp4"                  : "com.squareup.okhttp3:okhttp:4.0.0",
-                "okhttp-urlconnection"     : "com.squareup.okhttp:okhttp-urlconnection:2.0.0",
-                "glide"                    : "com.github.bumptech.glide:glide:${version["glideSdkVersion"]}",
-                "glide-compiler"           : "com.github.bumptech.glide:compiler:${version["glideSdkVersion"]}",
-                "glide-loader-okhttp3"     : "com.github.bumptech.glide:okhttp3-integration:${version["glideSdkVersion"]}",
-                "picasso"                  : "com.squareup.picasso:picasso:2.5.2",
+            //support
+            "appcompat-v7"             : 'androidx.appcompat:appcompat:1.3.0',
+            "design"                   : 'com.google.android.material:material:1.0.0',
+            "support-v4"               : 'androidx.legacy:legacy-support-v4:1.0.0',
+            "cardview-v7"              : 'androidx.cardview:cardview:1.0.0',
+            "annotations"              : 'androidx.annotation:annotation:1.0.0',
+            "recyclerview-v7"          : 'androidx.recyclerview:recyclerview:1.0.0',
+            "progressmanager"          : "me.jessyan:progressmanager:1.5.0",
+            //network
+            "retrofit"                 : "com.squareup.retrofit2:retrofit:${version["retrofitSdkVersion"]}",
+            "retrofit-converter-gson"  : "com.squareup.retrofit2:converter-gson:${version["retrofitSdkVersion"]}",
+            "retrofit-adapter-rxjava"  : "com.squareup.retrofit2:adapter-rxjava:${version["retrofitSdkVersion"]}",
+            "retrofit-adapter-rxjava2" : "com.squareup.retrofit2:adapter-rxjava2:${version["retrofitSdkVersion"]}",
+            "okhttp3"                  : "com.squareup.okhttp3:okhttp:3.12.3",
+            "okhttp4"                  : "com.squareup.okhttp3:okhttp:4.0.0",
+            "okhttp-urlconnection"     : "com.squareup.okhttp:okhttp-urlconnection:2.0.0",
+            "glide"                    : "com.github.bumptech.glide:glide:${version["glideSdkVersion"]}",
+            "glide-compiler"           : "com.github.bumptech.glide:compiler:${version["glideSdkVersion"]}",
+            "glide-loader-okhttp3"     : "com.github.bumptech.glide:okhttp3-integration:${version["glideSdkVersion"]}",
+            "picasso"                  : "com.squareup.picasso:picasso:2.5.2",
 
-                //view
-                "autolayout"               : "com.zhy:autolayout:1.4.5",
-                "butterknife"              : "com.jakewharton:butterknife:${version["butterknifeSdkVersion"]}",
-                "butterknife-compiler"     : "com.jakewharton:butterknife-compiler:${version["butterknifeSdkVersion"]}",
-                "pickerview"               : "com.contrarywind:Android-PickerView:3.2.5",
-                "photoview"                : "com.github.chrisbanes.photoview:library:1.2.3",
-                "numberprogressbar"        : "com.daimajia.numberprogressbar:library:1.2@aar",
-                "nineoldandroids"          : "com.nineoldandroids:library:2.4.0",
-                "paginate"                 : "com.github.markomilos:paginate:0.5.1",
-                "vlayout"                  : "com.alibaba.android:vlayout:1.1.0@aar",
-                "autosize"                 : "me.jessyan:autosize:1.1.2",
+            //view
+            "autolayout"               : "com.zhy:autolayout:1.4.5",
+            "butterknife"              : "com.jakewharton:butterknife:${version["butterknifeSdkVersion"]}",
+            "butterknife-compiler"     : "com.jakewharton:butterknife-compiler:${version["butterknifeSdkVersion"]}",
+            "pickerview"               : "com.contrarywind:Android-PickerView:3.2.5",
+            "photoview"                : "com.github.chrisbanes.photoview:library:1.2.3",
+            "numberprogressbar"        : "com.daimajia.numberprogressbar:library:1.2@aar",
+            "nineoldandroids"          : "com.nineoldandroids:library:2.4.0",
+            "paginate"                 : "com.github.markomilos:paginate:0.5.1",
+            "vlayout"                  : "com.alibaba.android:vlayout:1.1.0@aar",
+            "autosize"                 : "me.jessyan:autosize:1.1.2",
 
-                //rx1
-                "rxandroid"                : "io.reactivex:rxandroid:1.2.1",
-                "rxjava"                   : "io.reactivex:rxjava:1.3.0",
-                "rxlifecycle"              : "com.trello:rxlifecycle:${version["rxlifecycleSdkVersion"]}",
-                "rxlifecycle-components"   : "com.trello:rxlifecycle-components:${version["rxlifecycleSdkVersion"]}",
-                "rxcache"                  : "com.github.VictorAlbertos.RxCache:runtime:1.7.0-1.x",
-                "rxcache-jolyglot-gson"    : "com.github.VictorAlbertos.Jolyglot:gson:0.0.4",
-                "rxbinding-recyclerview-v7": "com.jakewharton.rxbinding:rxbinding-recyclerview-v7:1.0.1",
-                "rxpermissions"            : "com.tbruyelle.rxpermissions:rxpermissions:0.9.4@aar",
-                "rxerrorhandler"           : "me.jessyan:rxerrorhandler:1.0.1",
+            //rx1
+            "rxandroid"                : "io.reactivex:rxandroid:1.2.1",
+            "rxjava"                   : "io.reactivex:rxjava:1.3.0",
+            "rxlifecycle"              : "com.trello:rxlifecycle:${version["rxlifecycleSdkVersion"]}",
+            "rxlifecycle-components"   : "com.trello:rxlifecycle-components:${version["rxlifecycleSdkVersion"]}",
+            "rxcache"                  : "com.github.VictorAlbertos.RxCache:runtime:1.7.0-1.x",
+            "rxcache-jolyglot-gson"    : "com.github.VictorAlbertos.Jolyglot:gson:0.0.4",
+            "rxbinding-recyclerview-v7": "com.jakewharton.rxbinding:rxbinding-recyclerview-v7:1.0.1",
+            "rxpermissions"            : "com.tbruyelle.rxpermissions:rxpermissions:0.9.4@aar",
+            "rxerrorhandler"           : "me.jessyan:rxerrorhandler:1.0.1",
 
-                //rx2
-                "rxandroid2"               : "io.reactivex.rxjava2:rxandroid:2.1.1",
-                "rxjava2"                  : "io.reactivex.rxjava2:rxjava:2.2.10",
-                "rxlifecycle2"             : "com.trello.rxlifecycle2:rxlifecycle:${version["rxlifecycle2SdkVersion"]}",
-                "rxlifecycle2-android"     : "com.trello.rxlifecycle2:rxlifecycle-android:${version["rxlifecycle2SdkVersion"]}",
-                "rxlifecycle2-components"  : "com.trello.rxlifecycle2:rxlifecycle-components:${version["rxlifecycle2SdkVersion"]}",
-                "rxcache2"                 : "com.github.VictorAlbertos.RxCache:runtime:1.8.3-2.x",
-                "rxpermissions2"           : "com.github.tbruyelle:rxpermissions:0.10.2",
-                "rxerrorhandler2"          : "me.jessyan:rxerrorhandler:2.1.1",
+            //rx2
+            "rxandroid2"               : "io.reactivex.rxjava2:rxandroid:2.1.1",
+            "rxjava2"                  : "io.reactivex.rxjava2:rxjava:2.2.10",
+            "rxlifecycle2"             : "com.trello.rxlifecycle2:rxlifecycle:${version["rxlifecycle2SdkVersion"]}",
+            "rxlifecycle2-android"     : "com.trello.rxlifecycle2:rxlifecycle-android:${version["rxlifecycle2SdkVersion"]}",
+            "rxlifecycle2-components"  : "com.trello.rxlifecycle2:rxlifecycle-components:${version["rxlifecycle2SdkVersion"]}",
+            "rxcache2"                 : "com.github.VictorAlbertos.RxCache:runtime:1.8.3-2.x",
+            "rxpermissions2"           : "com.github.tbruyelle:rxpermissions:0.10.2",
+            "rxerrorhandler2"          : "me.jessyan:rxerrorhandler:2.1.1",
 
-                //tools
-                "dagger2"                  : "com.google.dagger:dagger:${version["dagger2SdkVersion"]}",
-                "dagger2-android"          : "com.google.dagger:dagger-android:${version["dagger2SdkVersion"]}",
-                "dagger2-android-support"  : "com.google.dagger:dagger-android-support:${version["dagger2SdkVersion"]}",
-                "dagger2-compiler"         : "com.google.dagger:dagger-compiler:${version["dagger2SdkVersion"]}",
-                "dagger2-android-processor": "com.google.dagger:dagger-android-processor:${version["dagger2SdkVersion"]}",
-                "androideventbus"          : "org.simple:androideventbus:1.0.5.1",
-                "eventbus"                 : "org.greenrobot:eventbus:3.1.1",
-                "otto"                     : "com.squareup:otto:1.3.8",
-                "gson"                     : "com.google.code.gson:gson:2.8.5",
-                "multidex"                 : "com.android.support:multidex:1.0.3",
-                "javax.annotation"         : "javax.annotation:jsr250-api:1.0",
-                "arouter"                  : "com.alibaba:arouter-api:1.3.1",
-                "arouter-compiler"         : "com.alibaba:arouter-compiler:1.1.4",
-                "progressmanager"          : "me.jessyan:progressmanager:1.5.0",
-                "retrofit-url-manager"     : "me.jessyan:retrofit-url-manager:1.4.0",
-                "lifecyclemodel"           : "me.jessyan:lifecyclemodel:1.0.1",
+            //tools
+            "dagger2"                  : "com.google.dagger:dagger:${version["dagger2SdkVersion"]}",
+            "dagger2-android"          : "com.google.dagger:dagger-android:${version["dagger2SdkVersion"]}",
+            "dagger2-android-support"  : "com.google.dagger:dagger-android-support:${version["dagger2SdkVersion"]}",
+            "dagger2-compiler"         : "com.google.dagger:dagger-compiler:${version["dagger2SdkVersion"]}",
+            "dagger2-android-processor": "com.google.dagger:dagger-android-processor:${version["dagger2SdkVersion"]}",
+            "androideventbus"          : "org.simple:androideventbus:1.0.5.1",
+            "eventbus"                 : "org.greenrobot:eventbus:3.1.1",
+            "otto"                     : "com.squareup:otto:1.3.8",
+            "gson"                     : "com.google.code.gson:gson:2.8.5",
+            "multidex"                 : "com.android.support:multidex:1.0.3",
+            "javax.annotation"         : "javax.annotation:jsr250-api:1.0",
+            "arouter"                  : "com.alibaba:arouter-api:1.3.1",
+            "arouter-compiler"         : "com.alibaba:arouter-compiler:1.1.4",
+            "progressmanager"          : "me.jessyan:progressmanager:1.5.0",
+            "retrofit-url-manager"     : "me.jessyan:retrofit-url-manager:1.4.0",
+            "lifecyclemodel"           : "me.jessyan:lifecyclemodel:1.0.1",
 
-                //test
-                "junit"                    : "junit:junit:4.12",
-                "androidJUnitRunner"       : "android.support.test.runner.AndroidJUnitRunner",
-                "runner"                   : "com.android.support.test:runner:1.0.1",
-                "espresso-core"            : "com.android.support.test.espresso:espresso-core:${version["espressoSdkVersion"]}",
-                "espresso-contrib"         : "com.android.support.test.espresso:espresso-contrib:${version["espressoSdkVersion"]}",
-                "espresso-intents"         : "com.android.support.test.espresso:espresso-intents:${version["espressoSdkVersion"]}",
-                "mockito-core"             : "org.mockito:mockito-core:1.+",
-                "timber"                   : "com.jakewharton.timber:timber:4.7.1",
-                "logger"                   : "com.orhanobut:logger:2.2.0",
-                "canary-debug"             : "com.squareup.leakcanary:leakcanary-android:${version["canarySdkVersion"]}",
-                "canary-release"           : "com.squareup.leakcanary:leakcanary-android-no-op:${version["canarySdkVersion"]}",
-                "umeng-analytics"          : "com.umeng.analytics:analytics:6.0.1"
-        ]
+            //test
+            "junit"                    : "junit:junit:4.12",
+            "androidJUnitRunner"       : "androidx.test.runner.AndroidJUnitRunner",
+            "runner"                   : "com.android.support.test:runner:1.0.1",
+            "espresso-core"            : "com.android.support.test.espresso:espresso-core:${version["espressoSdkVersion"]}",
+            "espresso-contrib"         : "com.android.support.test.espresso:espresso-contrib:${version["espressoSdkVersion"]}",
+            "espresso-intents"         : "com.android.support.test.espresso:espresso-intents:${version["espressoSdkVersion"]}",
+            "mockito-core"             : "org.mockito:mockito-core:1.+",
+            "timber"                   : "com.jakewharton.timber:timber:4.7.1",
+            "logger"                   : "com.orhanobut:logger:2.2.0",
+            "canary-debug"             : "com.squareup.leakcanary:leakcanary-android:${version["canarySdkVersion"]}",
+            "canary-release"           : "com.squareup.leakcanary:leakcanary-android-no-op:${version["canarySdkVersion"]}",
+            "umeng-analytics"          : "com.umeng.analytics:analytics:6.0.1",
+            "toast"                    : "com.hjq:toast:8.0",
+            "xutils"                   : "org.xutils:xutils:3.5.0",
+            "fastjson"                 : "com.alibaba:fastjson:1.2.24",
+            //"SmartRefreshLayout"       : "com.scwang.smartrefresh:SmartRefreshLayout:1.1.0-alpha-6",
+            "SmartRefreshLayout"       : "com.scwang.smart:refresh-layout-kernel:2.0.3",
+            "SmartRefreshHeader"       : "com.scwang.smart:refresh-header-classics:2.0.3",
+            "SmartRefreshFooter"       : "com.scwang.smart:refresh-footer-classics:2.0.3",
+            "imagepicker"              : "com.lzy.widget:imagepicker:0.6.1",
+            "constraint"               : 'androidx.constraintlayout:constraintlayout:1.1.3',
+            "material"                 :'com.google.android.material:material:1.0.0'
+    ]
 }

settings.gradle

@@ -1,2 +1,4 @@
 rootProject.name='jcjcgz'
 include ':app'
+include ":common"
+include ":thirdparty"