Merge branch 'dev' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into dev

app/src/main/java/com/ydl/component/base/DemoAppLifecycles.java

@@ -11,6 +11,8 @@ import com.ydl.ydlcommon.utils.YdlBuryPointUtil;
 
 import org.jetbrains.annotations.NotNull;
 
+import io.flutter.view.FlutterMain;
+
 /**
  * Created by haorui on 2019-09-02.
  * Des:
@@ -25,6 +27,10 @@ public class DemoAppLifecycles implements IAppLifecycles {
     public void onCreate(@NotNull Application application) {
         //数据埋点初始化--一定要放在主进程中
         YdlBuryPointUtil.init(application);
+
+        //Flutter 初始化需要在主线程中执行
+        FlutterMain.startInitialization(application);
+
         Intent intent = new Intent(application, PlayService.class);
         application.startService(intent);
     }

config.gradle

@@ -171,21 +171,26 @@ ext {
             "ydl-net"                      : 'com.ydl:ydl-net:0.0.1',
             "ydl-user-router"              : 'com.ydl:router:1.0.0-SNAPSHOT@aar',
             "ydl-device"                   : 'com.ydl:device-id:0.0.7@aar',
-            "ydl-flutter"                  : 'com.ydl:ydl-flutter:0.0.2@aar',
+
+            //flutter功能组件升级===>发布ydl-flutter-base组件===>引用flutter相关的业务模块
+            "ydl-flutter"                  : 'com.ydl:ydl-flutter:0.0.6@aar',
+            "ydl-flutter-base"             : 'com.ydl:ydl-flutter-base:0.0.2@aar',
 
             //基础组件 <<--- 先发这个，发完改这里的版本号
-            "ydl-platform"                 : 'com.ydl:ydl-platform:0.0.16@aar',
+            "ydl-platform"                 : 'com.ydl:ydl-platform:0.0.18@aar',
 
             //功能组件 <<--- 再发这些，发完改这里的版本号
-            "ydl-webview"                  : 'com.ydl:ydl-webview:0.0.16@aar',
-            "ydl-media"                    : 'com.ydl:ydl-media:0.0.5@aar',
-            "ydl-audioim"                  : 'com.ydl:m-audioim:0.0.4@aar',
+            "ydl-webview"                  : 'com.ydl:ydl-webview:0.0.18@aar',
+            "ydl-media"                    : 'com.ydl:ydl-media:0.0.7@aar',
+            "ydl-audioim"                  : 'com.ydl:m-audioim:0.0.6@aar',
+            "ydl-pay"                      : 'com.ydl:ydl-pay:0.0.2@aar',
 
             //业务组件 <<--- 最后发这些(只发改过的)
             "ydl-m-user-api"               : 'com.ydl:m-user-api:0.0.5',
             "ydl-m-muse-api"               : 'com.ydl:m-muse-api:0.0.1',
             "ydl-m-fm-api"                 : 'com.ydl:m-fm-api:0.0.2',
             "ydl-m-fm-module-ydl"          : 'com.ydl:m-fm-module-ydl:0.0.6@aar',
+            "ydl-m-course-module-ydl"      : 'com.ydl:m-course-module-ydl:0.0.1@aar',
             "ydl-m-tests-api"              : 'com.ydl:m-tests-api:0.0.1',
     ]
 

m-audioim/gradle.properties

 IS_PUBLISH=true
-VERSION_NAME=0.0.4
+VERSION_NAME=0.0.6
\ No newline at end of file

m-course/build.gradle

@@ -46,6 +46,9 @@ android {
     sourceSets {
         main {
             manifest.srcFile 'src/main/AndroidManifest.xml'
+            res.srcDirs = [
+                    'src/main/res'
+            ]
         }
     }
 
@@ -76,10 +79,18 @@ dependencies {
         api project(":ydl-platform")
         api project(":ydl-media")
         api project(":ydl-pay")
+        api project(":ydl-flutter-base")
     } else {
         //发布时使用
         compileOnly rootProject.ext.dependencies["ydl-m-user-api"]
         api rootProject.ext.dependencies["ydl-webview"]
+        api (rootProject.ext.dependencies["ydl-media"]){
+            transitive = true
+        }
+        api rootProject.ext.dependencies["ydl-pay"]
+        api (rootProject.ext.dependencies["ydl-flutter-base"]){
+            transitive = true
+        }
         api(rootProject.ext.dependencies["ydl-platform"]) {
             transitive = true
         }

m-course/gradle.properties

+isApplicaiton = false

m-course/modular.gradle

 modular {
     //模块包名
-    packageName "com.yidianling.course"
+    packageName "com.ydl.course"
     // 模块发布需要的参数
     publish {
         modules {
@@ -8,14 +8,14 @@ modular {
                 groupId = "com.ydl"
                 artifactId = "m-course-module-xlzx"
                 // 上报的 心理咨询 业务模块 aar 包的版本号
-                version = "0.0.11"
+                version = "0.0.1"
             }
 
             ydl{
                 groupId = "com.ydl"
                 artifactId = "m-course-module-ydl"
                 // 上报的 壹点灵 业务模块 aar 包的版本号
-                version = "0.0.11"
+                version = "0.0.1"
             }
         }
 
@@ -24,7 +24,7 @@ modular {
             groupId = "com.ydl"
             artifactId = "m-course-api"
             //开发时注释掉版本号，发布api时打开
-            //version = "0.0.1"
+            version = "0.0.1"
             // API 层打包时需要引入的依赖
             apiDependencies {
                 implementation "com.google.code.gson:gson:2.8.2"

m-course/src/main/java/com/yidianling/course/FlutterCourseHomeFragment.kt

@@ -6,8 +6,8 @@ import android.os.Handler
 import android.text.TextUtils
 import com.alibaba.android.arouter.launcher.ARouter
 import com.google.gson.Gson
+import com.ydl.ydl_flutter.flutter.base.BaseFlutterFragment
 import com.ydl.ydl_router.manager.YDLRouterManager
-import com.ydl.ydlcommon.base.flutter.base.BaseFlutterFragment
 import com.ydl.ydlcommon.data.http.BaseResponse
 import com.ydl.ydlcommon.data.http.RxUtils
 import com.ydl.ydlcommon.data.http.ThrowableConsumer

m-course/src/main/java/com/yidianling/course/flutterPlugin/CoursePlugin.kt

@@ -9,9 +9,9 @@ import com.ydl.media.view.PlayerFloatHelper
 import com.ydl.media.view.PlayerFloatView
 import com.ydl.webview.H5Params
 import com.ydl.webview.NewH5Activity
+import com.ydl.ydl_flutter.flutter.base.BaseFlutterFragment
 import com.ydl.ydl_router.manager.YDLRouterManager
 import com.ydl.ydlcommon.base.BaseApp
-import com.ydl.ydlcommon.base.flutter.base.BaseFlutterFragment
 import com.ydl.ydlcommon.data.PlatformDataManager
 import com.ydl.ydlcommon.modular.ModularServiceManager
 import com.yidianling.common.tools.LogUtil

m-course/src/main/java/com/yidianling/course/flutterPlugin/CourseSendPlugin.kt

 package com.yidianling.course.flutterPlugin
 
-import com.ydl.ydlcommon.base.flutter.io.flutter.facade.FlutterFragment
+import com.ydl.ydl_flutter.flutter.io.flutter.facade.FlutterFragment
 import io.flutter.plugin.common.EventChannel
 import io.flutter.view.FlutterView
 

m-muse/build.gradle

@@ -66,9 +66,13 @@ dependencies {
         //开发时使用
         api project(":ydl-platform")
         implementation project(':ydl-media')
+        api project(":ydl-flutter-base")
     } else {
         //发布时使用
         api rootProject.ext.dependencies["ydl-media"]
+        api (rootProject.ext.dependencies["ydl-flutter-base"]){
+            transitive = true
+        }
         api (rootProject.ext.dependencies["ydl-platform"]) {
             transitive = true
         }

m-muse/src/main/java/com/yidianling/muse/activity/MuseActivity.kt

@@ -2,7 +2,7 @@ package com.yidianling.muse.activity
 
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.ydl.media.audio.AudioPlayer
-import com.ydl.ydlcommon.base.flutter.base.BaseFlutterActivity
+import com.ydl.ydl_flutter.flutter.base.BaseFlutterActivity
 import com.ydl.ydlcommon.router.IYDLRouterConstant
 import com.yidianling.muse.handler.MusePlugin
 import org.json.JSONObject

settings.gradle

-include ':app',":router", ':ydl-net', ':ydl-utils', ':ydl-platform', ':ydl-webview',
+include ':app', ':ydl-flutter-base',":router", ':ydl-net', ':ydl-utils', ':ydl-platform', ':ydl-webview',
         ':m-confide', ':m-audioim',':ydl-media',":m-user", ':m-consultant', ':m-muse',
         ':m-fm', ':m-tests',":m-course", ':ydl-pay'
 

ydl-flutter-base/.gitignore

+/build

ydl-flutter-base/build.gradle

+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-kapt'
+apply from: "../maven_push.gradle"
+
+android {
+    compileSdkVersion 28
+
+
+    defaultConfig {
+        minSdkVersion 17
+        targetSdkVersion 28
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles 'consumer-rules.pro'
+
+        flavorDimensions "versionCode"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+
+    api rootProject.ext.dependencies["ydl-flutter"]
+}

ydl-flutter-base/gradle.properties

+IS_PUBLISH=true
+VERSION_NAME=0.0.2
\ No newline at end of file

ydl-flutter-base/proguard-rules.pro

+# 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

ydl-flutter-base/src/main/AndroidManifest.xml

+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        package="com.ydl.ydl_flutter" />

ydl-platform/src/main/java/com/ydl/ydlcommon/base/flutter/base/BaseFlutterActivity.kt → ydl-flutter-base/src/main/java/com/ydl/ydl_flutter/flutter/base/BaseFlutterActivity.kt

-package com.ydl.ydlcommon.base.flutter.base
+package com.ydl.ydl_flutter.flutter.base
 
 import android.content.Context
 import android.content.Intent

ydl-platform/src/main/java/com/ydl/ydlcommon/base/flutter/base/BaseFlutterFragment.kt → ydl-flutter-base/src/main/java/com/ydl/ydl_flutter/flutter/base/BaseFlutterFragment.kt

-package com.ydl.ydlcommon.base.flutter.base
+package com.ydl.ydl_flutter.flutter.base
 
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.ViewGroup
-import com.ydl.ydlcommon.base.flutter.io.flutter.facade.Flutter
-import com.ydl.ydlcommon.base.flutter.io.flutter.facade.FlutterFragment
+import com.ydl.ydl_flutter.flutter.io.flutter.facade.Flutter
+import com.ydl.ydl_flutter.flutter.io.flutter.facade.FlutterFragment
 import io.flutter.view.FlutterView
 
 /**
@@ -16,7 +16,7 @@ abstract class BaseFlutterFragment : FlutterFragment() {
     private var mFlutterView: FlutterView? = null
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): FlutterView {
-        mFlutterView=Flutter.createView(
+        mFlutterView= Flutter.createView(
             activity!!,
             lifecycle,
             initialRoute())

ydl-platform/src/main/java/com/ydl/ydlcommon/base/flutter/io/flutter/facade/Flutter.java → ydl-flutter-base/src/main/java/com/ydl/ydl_flutter/flutter/io/flutter/facade/Flutter.java

-package com.ydl.ydlcommon.base.flutter.io.flutter.facade;
+package com.ydl.ydl_flutter.flutter.io.flutter.facade;
 
 import android.app.Activity;
 import android.arch.lifecycle.Lifecycle;

ydl-platform/src/main/java/com/ydl/ydlcommon/base/flutter/io/flutter/facade/FlutterFragment.java → ydl-flutter-base/src/main/java/com/ydl/ydl_flutter/flutter/io/flutter/facade/FlutterFragment.java

-package com.ydl.ydlcommon.base.flutter.io.flutter.facade;
+package com.ydl.ydl_flutter.flutter.io.flutter.facade;
 
 import android.content.Context;
 import android.os.Bundle;

ydl-flutter-base/src/main/res/values/strings.xml

+<resources>
+    <string name="app_name">ydl_flutter</string>
+</resources>

ydl-media/gradle.properties

 IS_PUBLISH=true
-VERSION_NAME=0.0.5
+VERSION_NAME=0.0.7
\ No newline at end of file

ydl-pay/build.gradle

@@ -2,6 +2,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'kotlin-android-extensions'
+apply from: "../maven_push.gradle"
 
 android {
     compileSdkVersion 28
@@ -56,7 +57,6 @@ dependencies {
 
     api 'com.umeng.sdk:share-wechat:6.9.1'
 
-    api rootProject.ext.dependencies["ydl-hnet"]
     if (rootProject.ext.dev_mode){
         //开发时使用
         api project(':ydl-platform')

ydl-pay/gradle.properties

+IS_PUBLISH=true
+VERSION_NAME=0.0.2
\ No newline at end of file

ydl-platform/build.gradle

@@ -78,7 +78,6 @@ dependencies {
     api rootProject.ext.dependencies["imagepicker"]
     api rootProject.ext.dependencies["ydl-utils"]
     api rootProject.ext.dependencies["ydl-js"]
-    api rootProject.ext.dependencies["ydl-flutter"]
     api rootProject.ext.dependencies["ydl-net"]
     api rootProject.ext.dependencies["ydl-js"]
     api(rootProject.ext.dependencies["ydl-device"]) {

ydl-platform/gradle.properties

 IS_PUBLISH=true
-VERSION_NAME=0.0.16
+VERSION_NAME=0.0.18
\ No newline at end of file

ydl-platform/src/main/java/com/ydl/ydlcommon/base/BaseApp.kt

-package com.ydl.ydlcommon.base
-
-import android.app.Application
-import android.content.Context
-import android.support.multidex.MultiDex
-import com.ydl.ydlcommon.base.config.GlobalConfig
-import com.ydl.ydlcommon.base.config.IApp
-import com.ydl.ydlcommon.base.delegate.AppDelegate
-import com.ydl.ydlcommon.base.delegate.IAppLifecycles
-import com.ydl.ydlcommon.utils.YDLPreconditions
-import io.flutter.view.FlutterMain
-
-/**
- * Created by haorui on 2019-08-21 .
- * Des: 基础Application
- */
-open class BaseApp : Application(), IApp {
-
-    private var mAppDelegate: IAppLifecycles? = null
-
-    companion object {
-
-        lateinit var instance: BaseApp
-
-        fun getApp(): Application {
-            return instance
-        }
-    }
-
-    /**
-     * 这里会在 [BaseApp.onCreate] 之前被调用,可以做一些较早的初始化
-     * 常用于 MultiDex 以及插件化框架的初始化
-     *
-     * @param base
-     */
-    override fun attachBaseContext(base: Context) {
-        super.attachBaseContext(base)
-        instance = this;
-        MultiDex.install(this)
-        if (mAppDelegate == null)
-            this.mAppDelegate = AppDelegate(base)
-        this.mAppDelegate!!.attachBaseContext(base)
-    }
-
-    override fun onCreate() {
-        super.onCreate()
-        if (mAppDelegate != null)
-            this.mAppDelegate!!.onCreate(this)
-
-
-        //Flutter 初始化需要在主线程中执行
-        FlutterMain.startInitialization(this)
-    }
-
-    /**
-     * 在模拟环境中程序终止时会被调用
-     */
-    override fun onTerminate() {
-        super.onTerminate()
-        if (mAppDelegate != null)
-            this.mAppDelegate!!.onTerminate(this)
-    }
-
-    override fun getGlobalConfig(): GlobalConfig {
-        YDLPreconditions.checkNotNull(mAppDelegate, "%s cannot be null", AppDelegate::class.java.name)
-        YDLPreconditions.checkState(
-            mAppDelegate is IApp,
-            "%s must be implements %s",
-            mAppDelegate!!::class.java.name,
-            IApp::class.java.name
-        )
-
-        return (mAppDelegate as IApp).getGlobalConfig()
-    }
-}
+package com.ydl.ydlcommon.base
+
+import android.app.Application
+import android.content.Context
+import android.support.multidex.MultiDex
+import com.ydl.ydlcommon.base.config.GlobalConfig
+import com.ydl.ydlcommon.base.config.IApp
+import com.ydl.ydlcommon.base.delegate.AppDelegate
+import com.ydl.ydlcommon.base.delegate.IAppLifecycles
+import com.ydl.ydlcommon.utils.YDLPreconditions
+
+/**
+ * Created by haorui on 2019-08-21 .
+ * Des: 基础Application
+ */
+open class BaseApp : Application(), IApp {
+
+    private var mAppDelegate: IAppLifecycles? = null
+
+    companion object {
+
+        lateinit var instance: BaseApp
+
+        fun getApp(): Application {
+            return instance
+        }
+    }
+
+    /**
+     * 这里会在 [BaseApp.onCreate] 之前被调用,可以做一些较早的初始化
+     * 常用于 MultiDex 以及插件化框架的初始化
+     *
+     * @param base
+     */
+    override fun attachBaseContext(base: Context) {
+        super.attachBaseContext(base)
+        instance = this;
+        MultiDex.install(this)
+        if (mAppDelegate == null)
+            this.mAppDelegate = AppDelegate(base)
+        this.mAppDelegate!!.attachBaseContext(base)
+    }
+
+    override fun onCreate() {
+        super.onCreate()
+        if (mAppDelegate != null)
+            this.mAppDelegate!!.onCreate(this)
+
+    }
+
+    /**
+     * 在模拟环境中程序终止时会被调用
+     */
+    override fun onTerminate() {
+        super.onTerminate()
+        if (mAppDelegate != null)
+            this.mAppDelegate!!.onTerminate(this)
+    }
+
+    override fun getGlobalConfig(): GlobalConfig {
+        YDLPreconditions.checkNotNull(
+            mAppDelegate,
+            "%s cannot be null",
+            AppDelegate::class.java.name
+        )
+        YDLPreconditions.checkState(
+            mAppDelegate is IApp,
+            "%s must be implements %s",
+            mAppDelegate!!::class.java.name,
+            IApp::class.java.name
+        )
+
+        return (mAppDelegate as IApp).getGlobalConfig()
+    }
+}

ydl-webview/gradle.properties

 IS_PUBLISH=true
-VERSION_NAME=0.0.16
+VERSION_NAME=0.0.18
\ No newline at end of file