Skip to content

Y
YDL-Component-Medical
Commit 87b91092 by 刘鹏
Options

Merge branch '4.2.30_20210423_new_test' into 4.2.60 

# Conflicts:
#	app/src/main/java/com/ydl/component/base/DemoGlobalConfig.java
#	config.gradle
parents 478d71ea ba310efb
Showing with 81 additions and 132 deletions
app/src/main/java/com/ydl/component/base/DemoGlobalConfig.java
......@@ -21,7 +21,8 @@ public final class DemoGlobalConfig implements IConfigModule {
String APP_DOMAIN = "https://api.github.com/";
// public static String appEnv = YDLConstants.ENV_AUTO_TEST;
// public static String appEnv = YDLConstants.ENV_TEST;
public static String appEnv = YDLConstants.ENV_PROD;
public static String appEnv = YDLConstants.ENV_NEW_TEST;//配置未上传到maven库
// public static String appEnv = YDLConstants.ENV_PROD;
@Override
public void injectAppLifecycle(@NotNull Context context, @NotNull List<IAppLifecycles> lifecycles) {
......
config.gradle
......@@ -40,7 +40,7 @@ ext {
"ydl-media" : "0.0.21.9",
"ydl-pay" : "0.0.18.19",
"m-audioim" : "0.0.49.29.37",
"ydl-flutter-base": "0.0.14.25",
"ydl-flutter-base": "0.0.14.26",
//以下 几乎不会动
"router" : "0.0.1",
......@@ -100,6 +100,9 @@ ext {
"m-muse" : "0.0.20.7",
"m-tests" : "0.0.24.9",
"m-course" : "0.0.42.62",
"m-muse" : "0.0.28.23",
"m-tests" : "0.0.24.13",
"m-course" : "0.0.42.24",
//-------------- 业务模块 API 层 --------------
"m-audioim-api" : "0.0.6",
"m-confide-api" : "0.0.2.1",
......@@ -122,7 +125,7 @@ ext {
"ydl-media" : "0.0.21.9",
"ydl-pay" : "0.0.18.19",
"m-audioim" : "0.0.49.29.37",
"ydl-flutter-base": "0.0.14.25",
"ydl-flutter-base": "0.0.14.26",
//以下 几乎不会动
"router" : "0.0.1",
......
m-course/src/main/java/com/yidianling/course/flutterPlugin/CoursePlugin.kt
......@@ -16,6 +16,7 @@ import com.ydl.webview.H5Params
import com.ydl.webview.NewH5Activity
import com.ydl.ydl_router.manager.YDLRouterManager
import com.ydl.ydlcommon.base.BaseApp
import com.ydl.ydlcommon.base.config.YDLConstants
import com.ydl.ydlcommon.data.PlatformDataManager
import com.ydl.ydlcommon.modular.ModularServiceManager
import com.ydl.ydlcommon.modular.ModularServiceManager.provide
......@@ -71,10 +72,19 @@ class CoursePlugin : MethodChannel.MethodCallHandler {
override fun onMethodCall(methodCall: MethodCall, result: MethodChannel.Result) {
when (methodCall.method) {
GETPUBLICPARAMAS -> {
val appEnv = BaseApp.instance.getGlobalConfig().appEnv
var isDevelopment = 0
if (YDLConstants.ENV_TEST == appEnv) {
isDevelopment = 1
} else if (YDLConstants.ENV_NEW_TEST == appEnv) {
isDevelopment = 2
}
val loginBean = ModularServiceManager.getPlatformUserService()?.getUser()
val mMap = mutableMapOf<String, Any>()
var uid = loginBean?.userId ?: ""
mMap["isDevelopment"] = false
mMap["isDevelopment"] = isDevelopment
mMap["uid"] = if (TextUtils.isEmpty(uid)) "0" else uid
mMap["accessToken"] = loginBean?.token ?: ""
?: ""
......
ydl-flutter-base/src/main/java/com/channel/ydl_flutter_base/plugin/YDLCommonPlugin.kt
......@@ -44,7 +44,7 @@ class YDLCommonPlugin : MethodChannel.MethodCallHandler {
}
companion object {
var pluginDelegate:CommonPluginDelegate?=null
var pluginDelegate: CommonPluginDelegate? = null
const val CHANNEL: String = "lib/common/channel"
const val GETPUBLICPARAMAS: String = "getPublicParamas"
const val GET_PACKAGE_AND_FFROM: String = "get_package_and_ffrom" // 获取包名和渠道名，中间用，分割
......@@ -81,13 +81,24 @@ class YDLCommonPlugin : MethodChannel.MethodCallHandler {
val appEnv = BaseApp.instance.getGlobalConfig().appEnv
val cacheAppEnv = YDLCacheUtils.getCacheApi()
var isDevelopment: Boolean = false
var isDevelopment = 0
if (!TextUtils.isEmpty(cacheAppEnv)) {
isDevelopment = YDLConstants.ENV_TEST == cacheAppEnv
if (YDLConstants.ENV_TEST == cacheAppEnv || YDLConstants.ENV_AUTO_TEST == cacheAppEnv) {
isDevelopment = 1
} else if (YDLConstants.ENV_NEW_TEST == cacheAppEnv) {
isDevelopment = 2
}
} else {
isDevelopment = YDLConstants.ENV_TEST == appEnv || YDLConstants.ENV_AUTO_TEST == appEnv
if (YDLConstants.ENV_TEST == cacheAppEnv || YDLConstants.ENV_AUTO_TEST == appEnv) {
isDevelopment = 1
} else if (YDLConstants.ENV_NEW_TEST == cacheAppEnv) {
isDevelopment = 2
}
mMap["isDevelopment"] = if(isDevelopment) "1" else "0"
}
mMap["isDevelopment"] = isDevelopment
mMap["uid"] = if (TextUtils.isEmpty(uid)) "0" else uid
mMap["accessToken"] = loginBean?.token ?: ""
......@@ -114,8 +125,8 @@ class YDLCommonPlugin : MethodChannel.MethodCallHandler {
field.isAccessible = true
val property = field.get(ownerClass)
if (property is Boolean && property) {
var activity: Activity?= mActivity
if (mActivity==null&&mFragment!=null){
var activity: Activity? = mActivity
if (mActivity == null && mFragment != null) {
activity = mFragment?.activity!!
}
activity?.let {
......@@ -143,27 +154,27 @@ class YDLCommonPlugin : MethodChannel.MethodCallHandler {
}
ACTION_ORIGIN_THEME -> {
val mMap = mutableMapOf<String, String>()
if (pluginDelegate!=null){
if (pluginDelegate != null) {
val appTheme = pluginDelegate?.getAppTheme()
appTheme?.let { mMap.putAll(it) }
}
LogUtil.i("platform_origin_theme:"+GsonProvider.getGson().toJson(mMap))
LogUtil.i("platform_origin_theme:" + GsonProvider.getGson().toJson(mMap))
result.success(mMap)
}
ACTION_GET_SUB_CHANNEL_THEME -> {
val mMap = arrayListOf<Any>()
if (pluginDelegate!=null){
if (methodCall.hasArgument("channelName")){
if (pluginDelegate != null) {
if (methodCall.hasArgument("channelName")) {
val channelName = methodCall.argument<String>("channelName")
LogUtil.i("platform_sub_channel_theme channelName:$channelName")
if (!TextUtils.isEmpty(channelName)){
if (!TextUtils.isEmpty(channelName)) {
val appTheme = pluginDelegate?.getSubChannelTheme(channelName!!)
appTheme?.let { mMap.addAll(it) }
}
}
}
LogUtil.i("platform_sub_channel_theme:"+GsonProvider.getGson().toJson(mMap))
LogUtil.i("platform_sub_channel_theme:" + GsonProvider.getGson().toJson(mMap))
result.success(mMap)
}
REQUESTMAINSCROLLFOCUS -> {
......@@ -185,24 +196,24 @@ class YDLCommonPlugin : MethodChannel.MethodCallHandler {
val ffrom = PlatformDataManager.getRam().getChannelName()
result.success("$packageName,$ffrom")
}
ACTION_HTTP_BURIED_POINT ->{
ACTION_HTTP_BURIED_POINT -> {
val map = methodCall.arguments as HashMap<*, *>
val position = map["position"] as String
val partId = map["partId"] as String
val sign = map["sign"] as String
ActionCountUtils.count("$partId|$position",sign)
ActionCountUtils.count("$partId|$position", sign)
}
PAGE_GO_BACK ->{
PAGE_GO_BACK -> {
mActivity?.finish()
}
}
}
interface CommonPluginDelegate{
fun getAppTheme():HashMap<String,String>
interface CommonPluginDelegate {
fun getAppTheme(): HashMap<String, String>
fun getSubChannelTheme(channelName:String):ArrayList<Any>
fun getSubChannelTheme(channelName: String): ArrayList<Any>
}
}
\ No newline at end of file
ydl-pay/src/main/java/com/yidianling/ydl_pay/common/http/utils/HttpUrlUtils.java deleted 100644 → 0
package com.yidianling.ydl_pay.common.http.utils;
import com.yidianling.ydl_pay.BuildConfig;
/**
* @author jiucheng
* @描述:获取api的baseUrl
* @Copyright Copyright (c) 2018
* @Company 壹点灵
* @date 2019/4/23
*/
public class HttpUrlUtils {
private static final String JAVA_BASE_URL = "https://api.ydl.com/api/";
private static final String ACTION_BASE_URL = "https://api.ydl.com/api/data/bigdata/";
private static final String PHP_BASE_URL = "https://app2.yidianling.com/v3/";
private static final String DEBUG_JAVA_BASE_URL = "http://testapi.ydl.com/api/";
private static final String DEBUG_PHP_BASE_URL = "https://testapp2.yidianling.com/v3/";
private static final String DEBUG_ACTION_BASE_URL = "https://testapi.ydl.com/api/data/bigdata/";
/**
* 获取baseUrl
*
* @param isTestEnvironment 是否是测试环境
* @param isJava 是否是java url
* @return
*/
public static String getBaseUrl(boolean isTestEnvironment, boolean isJava) {
String baseUrl;
if (BuildConfig.DEBUG) {//debug包
if (isTestEnvironment) {//测试环境
if (isJava) {
baseUrl = DEBUG_JAVA_BASE_URL;
} else {
baseUrl = DEBUG_PHP_BASE_URL;
}
} else {
if (isJava) {
baseUrl = JAVA_BASE_URL;
} else {
baseUrl = PHP_BASE_URL;
}
}
} else {//release 包
if (isJava) {
baseUrl = JAVA_BASE_URL;
} else {
baseUrl = PHP_BASE_URL;
}
}
return baseUrl;
}
/**
* 获取埋点的baseurl
*
* @param isTestEnvironment 是否是测试环境
* @return
*/
public static String geActionUrl(boolean isTestEnvironment) {
String baseUrl;
if (BuildConfig.DEBUG) {//debug包
if (isTestEnvironment) {//测试环境
baseUrl = DEBUG_ACTION_BASE_URL;
} else {
baseUrl = ACTION_BASE_URL;
}
} else {//release 包
baseUrl = DEBUG_ACTION_BASE_URL;
}
return baseUrl;
}
}
ydl-platform/src/main/java/com/ydl/ydlcommon/base/config/HttpConfig.kt
......@@ -102,15 +102,6 @@ class HttpConfig {
*/
var JAVA_URL = ""
/**
* h5耗时统计 java服务器api地址
*/
var SERVER_TEMP_JAVA_URL = ""
/**
* Java 投放系统 地址
*/
var JAVA_CAST_URL = ""
/**
* 行为数据 地址
......@@ -470,8 +461,6 @@ class HttpConfig {
MH5_URL = properties.getProperty("mh5url.$appEnv")
YDL_H5 = properties.getProperty("ydlh5url.$appEnv")
WEB_URL = properties.getProperty("weburl.$appEnv")
SERVER_TEMP_JAVA_URL = properties.getProperty("javatempurl.$appEnv")
JAVA_CAST_URL = properties.getProperty("javacasturl.$appEnv")
JAVA_URL = properties.getProperty("javaurl.$appEnv")
}
......
ydl-platform/src/main/java/com/ydl/ydlcommon/base/config/YDLConstants.kt
......@@ -26,9 +26,10 @@ object YDLConstants {
const val ENV_TEST = "test"
const val ENV_AUTO_TEST = "auto_test"
const val ENV_NEW_TEST = "new_test"
const val ENV_PROD= "prod"
@StringDef(ENV_TEST, ENV_AUTO_TEST,ENV_PROD)
@StringDef(ENV_TEST, ENV_AUTO_TEST,ENV_PROD, ENV_NEW_TEST)
annotation class AppEnv
......
ydl-platform/src/main/java/com/ydl/ydlcommon/utils/AppUtils.kt
......@@ -2,14 +2,11 @@ package com.ydl.ydlcommon.utils
import android.app.ActivityManager
import android.content.Context
import com.ydl.ydlcommon.BuildConfig
import com.ydl.ydlcommon.base.BaseApp
import com.ydl.ydlcommon.base.config.YDLConstants
import com.ydl.ydlcommon.base.config.YDLConstants.ENV_NEW_TEST
import com.ydl.ydlcommon.base.config.YDLConstants.ENV_TEST
import com.ydl.ydlcommon.data.PlatformDataManager
import com.ydl.ydlcommon.data.http.YdlCommonApi
import com.ydl.ydlcommon.modular.ModularServiceManager
import com.ydl.ydlcommon.router.YdlCommonOut
import com.yidianling.common.tools.RxAppTool
import com.yidianling.common.tools.RxDeviceTool
......@@ -23,8 +20,10 @@ object AppUtils {
return false
}
var isRunning: Boolean = false
val activityManager: ActivityManager = context.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager
val serviceList: List<ActivityManager.RunningServiceInfo> = activityManager.getRunningServices(30)
val activityManager: ActivityManager =
context.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager
val serviceList: List<ActivityManager.RunningServiceInfo> =
activityManager.getRunningServices(30)
if (serviceList.isEmpty()) {
return false
}
......@@ -41,20 +40,28 @@ object AppUtils {
* 获取http请求公用参数
*
*/
fun getHttpCommonParams():Map<String,Any>{
fun getHttpCommonParams(): Map<String, Any> {
val mMap = mutableMapOf<String, Any>()
val appEnv = BaseApp.instance.getGlobalConfig().appEnv
val isTest = ENV_TEST == appEnv
var isDevelopment = 0
val osBuild = "${RxDeviceTool.getBuildBrandModel()},${RxDeviceTool.getSDKVersionName()},${RxAppTool.getAppVersionName(
if (ENV_TEST == appEnv) {
isDevelopment = 1
} else if (ENV_NEW_TEST == appEnv) {
isDevelopment = 2
}
val osBuild = "${RxDeviceTool.getBuildBrandModel()},${RxDeviceTool.getSDKVersionName()},${
RxAppTool.getAppVersionName(
BaseApp.getApp()
)}"
)
}"
val loginBean = ModularServiceManager.getPlatformUserService()?.getUser()
mMap["isDevelopment"] = isTest
mMap["uid"] = loginBean?.userId?:""
mMap["accessToken"] = loginBean?.token?:""
mMap["isDevelopment"] = isDevelopment
mMap["uid"] = loginBean?.userId ?: ""
mMap["accessToken"] = loginBean?.token ?: ""
mMap["isFromApp"] = "1"
mMap["version"] = RxAppTool.getAppVersionName(BaseApp.getApp())
mMap["osBuild"] = osBuild
......
ydl-platform/src/main/res/raw/api.properties
#server php服务器api域名
serverurl.new_test=https://ydltestapp2.ydl.com/v3/
serverurl.test=https://testapp2.yidianling.com/v3/
serverurl.auto_test=https://auto_testapp2.yidianling.com/v3/
serverurl.prod=https://app2.yidianling.com/v3/
serverurl.pre=https://preapp.yidianling.com/v3/
#行为数据埋点域名
actionurl.new_test=https://ydltestapi.ydl.com/api/data/bigdata/
actionurl.test=https://testapi.ydl.com/api/data/bigdata/
actionurl.auto_test=https://auto_testapi.ydl.com/api/data/bigdata/
actionurl.prod=https://api.ydl.com/api/data/bigdata/
#新h5
weburl.new_test=https://ydltestwebapp.ydl.com/
weburl.test=https://testwebapp.ydl.com/
weburl.auto_test=https://auto_testwebapp.ydl.com/
weburl.prod=https://webapp.ydl.com/
#ydlh5
ydlh5url.new_test=https://ydltesth5.ydl.com/
ydlh5url.test=https://testh5.ydl.com/
ydlh5url.auto_test=https://auto_testh5.ydl.com/
#ydlh5url.test=http://192.168.204.5:3006/
ydlh5url.prod=https://h5.ydl.com/
#h5
h5url.new_test=https://ydltesth2.ydl.com/
h5url.test=https://testh2.yidianling.com/
h5url.auto_test=https://auto_testh2.yidianling.com/
h5url.prod=https://h2.yidianling.com/
h5url.pre=https://preh.yidianling.com/
#java服务器api域名（投放系统）
javacasturl.test = http://testdelivery.yidianling.com/
javacasturl.auto_test = http://auto_testdelivery.yidianling.com/
javacasturl.prod = https://delivery.yidianling.com/
#m站H5地址
mh5url.new_test = https://ydltestm.ydl.com/
mh5url.test = https://testnewm.ydl.com/
mh5url.auto_test = https://auto_testnewm.ydl.com/
mh5url.prod = https://m.ydl.com/
#java服务器域名
javaurl.new_test = https://ydltestapi.ydl.com/
javaurl.test = https://testapi.ydl.com/
javaurl.auto_test = https://auto_testapi.ydl.com/
javaurl.prod = https://api.ydl.com/
#java服务器api域名（h5耗时统计,域名问题后续服务端会统一）
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/
#java服务器api统一域名
javaapi.new_test = https://ydltestapi.ydl.com/api/
javaapi.test = https://testapi.ydl.com/api/
javaapi.auto_test = https://auto_testapi.ydl.com/api/
javaapi.prod = https://api.ydl.com/api/
# 网关加密的appKey和appSecret
appKey.new_test = 20BB42485BD448DE888DD745899C457D
appSecret.new_test = ABA88F2FF7E64A688D2213B20A9B3A3E
appKey.test = 20BB42485BD448DE888DD745899C457D
appSecret.test = ABA88F2FF7E64A688D2213B20A9B3A3E
appKey.prod = 49A4A1BBFBC74CA2B0B5C6B77FF13A80
......
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