Skip to content

Y
YDL-Component-Medical
Commit 924321bc by 徐健
Options

Merge branch 'dev'

parents b8b881c2 d29aba3d
Showing with 40 additions and 32 deletions
config.gradle
...@@ -41,14 +41,14 @@ ext { ...@@ -41,14 +41,14 @@ ext {
ydlPublishVersion = [ ydlPublishVersion = [
// -------------- 业务模块 -------------- // -------------- 业务模块 --------------
"m-audioim" : "0.0.11", //第三步 若干
"m-confide" : "0.0.14", "m-confide" : "0.0.16",
"m-consultant" : "0.0.21", "m-consultant" : "0.0.23",
"m-course" : "0.0.7", "m-course" : "0.0.9",
"m-fm" : "0.0.10", "m-fm" : "0.0.12",
"m-muse" : "0.0.6", "m-muse" : "0.0.8",
"m-tests" : "0.0.3", "m-tests" : "0.0.5",
"m-user" : "0.0.24", "m-user" : "0.0.26",
//-------------- 业务模块 API 层 -------------- //-------------- 业务模块 API 层 --------------
"m-audioim-api" : "0.0.1", "m-audioim-api" : "0.0.1",
"m-confide-api" : "0.0.1", "m-confide-api" : "0.0.1",
...@@ -59,26 +59,30 @@ ext { ...@@ -59,26 +59,30 @@ ext {
"m-tests-api" : "0.0.1", "m-tests-api" : "0.0.1",
"m-user-api" : "0.0.5", "m-user-api" : "0.0.5",
//-------------- 功能组件 -------------- //-------------- 功能组件 --------------
"ydl-flutter-base": "0.0.3", //第一步
"ydl-media" : "0.0.8", "ydl-platform" : "0.0.21",
//第二步 若干
"ydl-webview" : "0.0.21",
"ydl-media" : "0.0.10",
"ydl-pay" : "0.0.7",
"m-audioim" : "0.0.13",
//以下 几乎不会动
"router" : "0.0.1",
"ydl-net" : "0.0.1", "ydl-net" : "0.0.1",
"ydl-pay" : "0.0.5",
"ydl-platform" : "0.0.19",
"ydl-utils" : "0.0.2", "ydl-utils" : "0.0.2",
"ydl-webview" : "0.0.19", "ydl-flutter-base": "0.0.3",
"router" : "0.0.1",
] ]
ydlCompileVersion = [ ydlCompileVersion = [
// -------------- 业务模块 -------------- // -------------- 业务模块 --------------
"m-audioim" : "0.0.11", //第三步 若干
"m-confide" : "0.0.14", "m-confide" : "0.0.15",
"m-consultant" : "0.0.21", "m-consultant" : "0.0.22",
"m-course" : "0.0.5", "m-course" : "0.0.8",
"m-fm" : "0.0.10", "m-fm" : "0.0.11",
"m-muse" : "0.0.6", "m-muse" : "0.0.7",
"m-tests" : "0.0.3", "m-tests" : "0.0.4",
"m-user" : "0.0.24", "m-user" : "0.0.25",
//-------------- 业务模块 API 层 -------------- //-------------- 业务模块 API 层 --------------
"m-audioim-api" : "0.0.1", "m-audioim-api" : "0.0.1",
"m-confide-api" : "0.0.1", "m-confide-api" : "0.0.1",
...@@ -89,14 +93,18 @@ ext { ...@@ -89,14 +93,18 @@ ext {
"m-tests-api" : "0.0.1", "m-tests-api" : "0.0.1",
"m-user-api" : "0.0.5", "m-user-api" : "0.0.5",
//-------------- 功能组件 -------------- //-------------- 功能组件 --------------
"ydl-flutter-base": "0.0.3", //第一步
"ydl-media" : "0.0.8", "ydl-platform" : "0.0.21",
//第二步 若干
"ydl-webview" : "0.0.21",
"ydl-media" : "0.0.10",
"ydl-pay" : "0.0.7",
"m-audioim" : "0.0.13",
//以下 几乎不会动
"router" : "0.0.1",
"ydl-net" : "0.0.1", "ydl-net" : "0.0.1",
"ydl-pay" : "0.0.5",
"ydl-platform" : "0.0.19",
"ydl-utils" : "0.0.2", "ydl-utils" : "0.0.2",
"ydl-webview" : "0.0.19", "ydl-flutter-base": "0.0.3",
"router" : "0.0.1",
] ]
dependencies = [ dependencies = [
......
ydl-platform/src/main/java/com/ydl/ydlcommon/base/BaseMvpFragment.kt
package com.ydl.ydlcommon.base package com.ydl.ydlcommon.base
import android.os.Bundle import android.os.Bundle
import android.support.v4.app.Fragment
import android.view.View import android.view.View
import com.ydl.ydlcommon.mvp.base.IPresenter import com.ydl.ydlcommon.mvp.base.IPresenter
import com.ydl.ydlcommon.mvp.base.IView import com.ydl.ydlcommon.mvp.base.IView
...@@ -12,7 +11,7 @@ import com.ydl.ydlcommon.mvp.delegate.MvpFragmentDelegateImpl ...@@ -12,7 +11,7 @@ import com.ydl.ydlcommon.mvp.delegate.MvpFragmentDelegateImpl
* Created by haorui on 2019-08-14. * Created by haorui on 2019-08-14.
* Des:基础 MVP Fragment * Des:基础 MVP Fragment
*/ */
abstract class BaseMvpFragment<V : IView, P : IPresenter<V>> : Fragment(), MvpDelegateCallback<V, P>, abstract class BaseMvpFragment<V : IView, P : IPresenter<V>> : BaseFragment(), MvpDelegateCallback<V, P>,
IView { IView {
protected var mPresenter: P ?= null protected var mPresenter: P ?= null
...@@ -27,8 +26,8 @@ abstract class BaseMvpFragment<V : IView, P : IPresenter<V>> : Fragment(), MvpDe ...@@ -27,8 +26,8 @@ abstract class BaseMvpFragment<V : IView, P : IPresenter<V>> : Fragment(), MvpDe
abstract override fun createPresenter(): P abstract override fun createPresenter(): P
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
mvpDelegate?.onViewCreated(view, savedInstanceState) mvpDelegate?.onViewCreated(view, savedInstanceState)
super.onViewCreated(view, savedInstanceState)
} }
override fun onDestroyView() { override fun onDestroyView() {
...@@ -37,8 +36,8 @@ abstract class BaseMvpFragment<V : IView, P : IPresenter<V>> : Fragment(), MvpDe ...@@ -37,8 +36,8 @@ abstract class BaseMvpFragment<V : IView, P : IPresenter<V>> : Fragment(), MvpDe
} }
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
mvpDelegate?.onCreate(savedInstanceState) mvpDelegate?.onCreate(savedInstanceState)
super.onCreate(savedInstanceState)
} }
override fun onDestroy() { override fun onDestroy() {
......
ydl-platform/src/main/res/raw/api.properties
...@@ -44,6 +44,7 @@ javacouponurl.prod = https://api.ydl.com/ ...@@ -44,6 +44,7 @@ javacouponurl.prod = https://api.ydl.com/
#java服务器api域名（h5耗时统计,域名问题后续服务端会统一） #java服务器api域名（h5耗时统计,域名问题后续服务端会统一）
javatempurl.test = https://47.97.49.44:8082/api/ javatempurl.test = https://47.97.49.44:8082/api/
javatempurl.auto_test = https://auto_testdc.ydl.com/api/
javatempurl.prod = https://dc.ydl.com/api/ javatempurl.prod = https://dc.ydl.com/api/
#java服务器api统一域名 #java服务器api统一域名
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment