no message

.gitignore

@@ -6,3 +6,10 @@
 /build
 /captures
 .externalNativeBuild
+<<<<<<< HEAD
+.gradle/4.4/fileHashes/fileHashes.bin
+.gradle/4.4/fileHashes/fileHashes.lock
+=======
+.gradle
+.idea
+>>>>>>> c9df07eda6e810c75f1abe78d37ee0c421bfcd04

.idea/modules.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
-      <module fileurl="file://$PROJECT_DIR$/common/common.iml" filepath="$PROJECT_DIR$/common/common.iml" />
-      <module fileurl="file://$PROJECT_DIR$/extra/extra.iml" filepath="$PROJECT_DIR$/extra/extra.iml" />
-      <module fileurl="file://$PROJECT_DIR$/hello/hello.iml" filepath="$PROJECT_DIR$/hello/hello.iml" />
-      <module fileurl="file://$PROJECT_DIR$/home/home.iml" filepath="$PROJECT_DIR$/home/home.iml" />
-      <module fileurl="file://$PROJECT_DIR$/middleware/middleware.iml" filepath="$PROJECT_DIR$/middleware/middleware.iml" />
-      <module fileurl="file://$PROJECT_DIR$/ncs_android_frame.iml" filepath="$PROJECT_DIR$/ncs_android_frame.iml" />
-      <module fileurl="file://$PROJECT_DIR$/resource/resource.iml" filepath="$PROJECT_DIR$/resource/resource.iml" />
-      <module fileurl="file://$PROJECT_DIR$/setting/setting.iml" filepath="$PROJECT_DIR$/setting/setting.iml" />
-      <module fileurl="file://$PROJECT_DIR$/shop/shop.iml" filepath="$PROJECT_DIR$/shop/shop.iml" />
-      <module fileurl="file://$PROJECT_DIR$/starRTC/starRTC.iml" filepath="$PROJECT_DIR$/starRTC/starRTC.iml" />
-      <module fileurl="file://$PROJECT_DIR$/welcome/welcome.iml" filepath="$PROJECT_DIR$/welcome/welcome.iml" />
-    </modules>
-  </component>
-</project>

build.gradle

@@ -1,8 +1,253 @@
+//buildscript {
+//    /**
+//     * Kotlin统一版本
+//     */
+//    ext.kotlin_version = '1.3.21'
+//
+//    /**
+//     * Aop编制版本
+//     */
+//    ext.aspectj_version = '1.8.9'
+//
+//    /**
+//     * 是否开启单独Module编译
+//     */
+//    ext.componentTag = false
+//
+//    /**
+//     * 路由注解处理器版本
+//     */
+//    ext.router_version = '1.0.2'
+//
+//    /**
+//     * kawo组件化框架版本
+//     */
+//    ext.kawo_version = '1.0.9'
+//
+//    /**
+//     * SDK最小支持版本
+//     */
+//    ext.min_sdk_version = 26
+//
+//    /**
+//     * SDK目标支持版本
+//     */
+//    ext.target_sdk_version = 28
+//
+//    /**
+//     * SDK编译版本
+//     */
+//    ext.build_tools_version = "26.0.2"
+//
+//    /**
+//     * 支持库版本
+//     */
+//    ext.support_library_version = "26.0.1"
+//
+//    /**
+//     * APP版本码
+//     */
+//    ext.app_version_code = 1
+//
+//    /**
+//     * APP版本号
+//     */
+//    ext.app_version = "1.0"
+//
+//    /**
+//     * 项目依赖库
+//     */
+//    dependencies {
+//        repositories {
+//            /**
+//             * 依赖仓储
+//             */
+//            maven { url 'https://maven.aliyun.com/repository/public' }
+//            maven { url 'https://maven.aliyun.com/repository/google'}
+//            maven { url 'https://jitpack.io' }
+//        }
+//        /**
+//         * Gradle插件
+//         */
+//        classpath 'com.android.tools.build:gradle:3.0.1'
+//
+//        /**
+//         * Kawo组件化插件
+//         */
+//        classpath "com.enation.geamtear.gradle:kawo:$kawo_version"
+//
+//        /**
+//         * KotlinGradle插件
+//         */
+//        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+//
+//        /**
+//         * Kotlin辅助工具
+//         */
+//        classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version"
+//
+//        /**
+//         * Aop埋点相关
+//         */
+//        classpath "org.aspectj:aspectjtools:$aspectj_version"
+//    }
+//    repositories {
+//        mavenCentral()
+//    }
+//}
+///**
+// * 统一依赖仓储
+// */
+//allprojects {
+//    repositories {
+//        maven { url 'https://maven.aliyun.com/repository/public' }
+//        maven { url 'https://maven.aliyun.com/repository/google'}
+//        maven { url 'https://jitpack.io' }
+//    }
+//    tasks.withType(Javadoc) { // 新增
+//        options.addStringOption('Xdoclint:none', '-quiet')
+//        options.addStringOption('encoding', 'UTF-8')
+//    }
+//}
+//
+///**
+// *  清除Build配置时 删除根目录Build文件夹
+// */
+//task clean(type: Delete) {
+//    delete rootProject.buildDir
+//}
+
+//buildscript {
+//    /**
+//     * Kotlin统一版本
+//     */
+//    ext.kotlin_version = '1.3.21'
+//
+//    /**
+//     * Aop编制版本
+//     */
+//    ext.aspectj_version = '1.8.9'
+//
+//    /**
+//     * 是否开启单独Module编译
+//     */
+//    ext.componentTag = false
+//
+//    /**
+//     * 路由注解处理器版本
+//     */
+//    ext.router_version = '1.0.2'
+//
+//    /**
+//     * kawo组件化框架版本
+//     */
+//    ext.kawo_version = '1.0.9'
+//
+//    /**
+//     * SDK最小支持版本
+//     */
+//    ext.min_sdk_version = 17
+//
+//    /**
+//     * SDK目标支持版本
+//     */
+//    ext.target_sdk_version = 28
+//
+//    /**
+//     * SDK编译版本
+//     */
+//    ext.build_tools_version = "26.0.2"
+//
+//    /**
+//     * 支持库版本
+//     */
+//    ext.support_library_version = "26.0.1"
+//
+//    /**
+//     * APP版本码
+//     */
+//    ext.app_version_code = 1
+//
+//    /**
+//     * APP版本号
+//     */
+//    ext.app_version = "1.0"
+//
+//    /**
+//     * 项目依赖库
+//     */
+//    dependencies {
+//        repositories {
+//            jcenter()
+//            mavenCentral()
+//            google()
+//            /**
+//             * 依赖仓储
+//             */
+//            maven { url 'http://maven.aliyun.com/nexus/content/repositories/google' }
+//            maven { url 'http://maven.aliyun.com/nexus/content/repositories/jcenter'}
+//            maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' }
+//            maven { url 'https://jitpack.io' }
+//        }
+//        /**
+//         * Gradle插件
+//         */
+//        classpath 'com.android.tools.build:gradle:3.0.1'
+//
+//        /**
+//         * Kawo组件化插件
+//         */
+//        classpath "com.enation.geamtear.gradle:kawo:$kawo_version"
+//
+//        /**
+//         * KotlinGradle插件
+//         */
+//        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+//
+//        /**
+//         * Kotlin辅助工具
+//         */
+//        classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version"
+//
+//        /**
+//         * Aop埋点相关
+//         */
+//        classpath "org.aspectj:aspectjtools:$aspectj_version"
+//    }
+//}
+///**
+// * 统一依赖仓储
+// */
+//allprojects {
+//    repositories {
+//        jcenter()
+//        mavenCentral()
+//        google()
+//
+//        maven { url 'http://maven.aliyun.com/nexus/content/repositories/google' }
+//        maven { url 'http://maven.aliyun.com/nexus/content/repositories/jcenter'}
+//        maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' }
+//        maven { url 'https://jitpack.io' }
+//    }
+//    tasks.withType(Javadoc) { // 新增
+//        options.addStringOption('Xdoclint:none', '-quiet')
+//        options.addStringOption('encoding', 'UTF-8')
+//    }
+//}
+//
+///**
+// *  清除Build配置时 删除根目录Build文件夹
+// */
+//task clean(type: Delete) {
+//    delete rootProject.buildDir
+//}
+
+
 buildscript {
     /**
      * Kotlin统一版本
      */
-    ext.kotlin_version = '1.3.21'
+    ext.kotlin_version = '1.2.40'
 
     /**
      * Aop编制版本
@@ -27,7 +272,7 @@ buildscript {
     /**
      * SDK最小支持版本
      */
-    ext.min_sdk_version = 26
+    ext.min_sdk_version = 17
 
     /**
      * SDK目标支持版本
@@ -62,9 +307,9 @@ buildscript {
             /**
              * 依赖仓储
              */
-            maven { url 'https://maven.aliyun.com/repository/public' }
-            maven { url 'https://maven.aliyun.com/repository/google'}
-            maven { url 'https://jitpack.io' }
+            jcenter()
+            mavenCentral()
+            google()
         }
         /**
          * Gradle插件
@@ -92,7 +337,7 @@ buildscript {
         classpath "org.aspectj:aspectjtools:$aspectj_version"
     }
     repositories {
-        mavenCentral()
+        google()
     }
 }
 /**
@@ -100,9 +345,13 @@ buildscript {
  */
 allprojects {
     repositories {
-        maven { url 'https://maven.aliyun.com/repository/public' }
-        maven { url 'https://maven.aliyun.com/repository/google'}
-        maven { url 'https://jitpack.io' }
+        jcenter()
+        mavenCentral()
+        google()
+
+        maven { url 'https://dl.bintray.com/geamtear/maven' }
+        maven { url "https://jitpack.io" }
+
     }
     tasks.withType(Javadoc) { // 新增
         options.addStringOption('Xdoclint:none', '-quiet')

home/src/main/AndroidManifest.xml

@@ -15,7 +15,6 @@
         <activity android:name="com.wdkl.ncs.android.component.home.activity.RTCVoipAudioRingingActivity" />
         <activity android:name="com.wdkl.ncs.android.component.home.activity.RTCVoipAudioActivity" />
         <activity android:name=".activity.EventActivity" />
-
         <service android:name="com.starrtc.demo.demo.service.KeepLiveService">
             <intent-filter>
                 <action android:name="com.starrtc.demo.service.KeepLiveService" />

starRTC/build.gradle

@@ -57,5 +57,5 @@ dependencies {
     testCompile 'junit:junit:4.12'
     compile 'com.android.support:recyclerview-v7:24.2.0'
     compile files('libs/star_rtc_sdk.jar')
-    implementation files('libs\\star_rtc_sdk.jar')
+    implementation files('libs/star_rtc_sdk.jar')
 }