Skip to content

Y
YDL-Component-Medical
Commit dd070370 by konghaorui
Options

修改文案、升级flutter版本、升级业务组件版本

parent b9f2201e
Showing with 36 additions and 16 deletions
app/src/main/java/com/ydl/component/MainActivity.kt
......@@ -163,7 +163,7 @@ class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(
}
bt_to_privacy.setOnClickListener {
val dialog = SecretDescriptionDialog(this@MainActivity, "感谢您信任并使用壹点灵APP，\\n\n" +
val dialog = SecretDescriptionDialog(this@MainActivity, "感谢您信任并使用壹点灵旗下的APP，\\n\n" +
"我们深知个人隐私的重要性，为了您更好的使用本APP，希望您着重关注：\\n\\n1. 为向您提供交易相关基本功能，我们会收集、使用必要的信息;\\n\n" +
"2. 基于您的明示授权，我们可能会获取您的位置(为您提供附近的咨询师等)、设备号信息(以保障您账号与交易安全)等信息，您有权拒绝或取消授权;\\n\n" +
"3. 我们会采业界先进的安全措施保护您的信息安全;\\n\n" +
......
app/src/main/java/com/ydl/component/base/DemoGlobalConfig.java
......@@ -20,8 +20,8 @@ import java.util.List;
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_TEST;
public static String appEnv = YDLConstants.ENV_PROD;
@Override
public void injectAppLifecycle(@NotNull Context context, @NotNull List<IAppLifecycles> lifecycles) {
......
config.gradle
......@@ -45,9 +45,9 @@ ext {
"m-confide" : "0.0.48.8",
"m-consultant" : "0.0.58.3",
"m-fm" : "0.0.29.2",
"m-user" : "0.0.59.17",
"m-user" : "0.0.59.21",
"m-home" : "0.0.20.3",
"m-im" : "0.0.16.5",
"m-im" : "0.0.16.7",
"m-dynamic" : "0.0.7.4",
"m-muse" : "0.0.28.8",
......@@ -69,14 +69,14 @@ ext {
//-------------- 功能组件 --------------
//第一步
"ydl-platform" : "0.0.39.10",
"ydl-platform" : "0.0.39.11",
//第二步 若干
"ydl-webview" : "0.0.38.13",
"ydl-media" : "0.0.21.3",
"ydl-pay" : "0.0.18.5",
"ydl-pay" : "0.0.18.6",
"m-audioim" : "0.0.48.0",
"ydl-flutter-base": "0.0.14.2",
"ydl-flutter-base": "0.0.14.4",
//以下 几乎不会动
"router" : "0.0.1",
......@@ -120,7 +120,7 @@ ext {
"ydl-webview" : "0.0.38.12",
"ydl-media" : "0.0.21.3",
"ydl-pay" : "0.0.18.4",
"ydl-pay" : "0.0.18.6",
"m-audioim" : "0.0.48.0",
"ydl-flutter-base": "0.0.10.8",
......@@ -270,7 +270,7 @@ ext {
//flutter功能组件升级===>发布ydl-flutter组件===>引用flutter相关的业务模块
"ydl-flutter-base" : "com.ydl:ydl-flutter-base:${ydlCompileVersion["ydl-flutter-base"]}", //组件化项目中的flutter base模块
"ydl-flutter" : "com.ydl:ydl-flutter:0.0.17.10@aar", //flutter aar
"ydl-flutter" : "com.ydl:ydl-flutter:0.0.18.1@aar", //flutter aar
"ydl-flutter-sp" : "com.ydl:ydl-flutter-sp:0.0.2@aar", //flutter 缓存 aar
//基础组件 <<--- 先发这个，发完改这里的版本号
......
m-user/src/main/res/layout/user_activity_secret.xml
......@@ -60,7 +60,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="30dp"
android:lineHeight="20dp"
tools:text="感谢您信任并使用壹点灵APP，\n
tools:text="感谢您信任并使用壹点灵旗下的APP，\n
我们深知个人隐私的重要性，为了您更好的使用本APP，希望您着重关注：\n\n1. 为向您提供交易相关基本功能，我们会收集、使用必要的信息;\n
2. 基于您的明示授权，我们可能会获取您的位置(为您提供附近的咨询师等)、设备号信息(以保障您账号与交易安全)等信息，您有权拒绝或取消授权;\n
3. 我们会采业界先进的安全措施保护您的信息安全;\n
......
m-user/src/main/res/layout/user_dialog_secret.xml
......@@ -71,7 +71,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="30dp"
android:lineHeight="20dp"
tools:text="感谢您信任并使用壹点灵APP，\n
tools:text="感谢您信任并使用壹点灵旗下的APP，\n
我们深知个人隐私的重要性，为了您更好的使用本APP，希望您着重关注：\n\n1. 为向您提供交易相关基本功能，我们会收集、使用必要的信息;\n
2. 基于您的明示授权，我们可能会获取您的位置(为您提供附近的咨询师等)、设备号信息(以保障您账号与交易安全)等信息，您有权拒绝或取消授权;\n
3. 我们会采业界先进的安全措施保护您的信息安全;\n
......
ydl-flutter-base/src/main/java/com/channel/ydl_flutter_base/plugin/YDLCommonPlugin.kt
package com.channel.ydl_flutter_base.plugin
import android.app.Activity
import android.text.TextUtils
import com.channel.ydl_flutter_base.base.BaseFlutterFragment
import com.channel.ydl_flutter_base.event.MainScrollEnableEvent
......@@ -98,6 +99,7 @@ class YDLCommonPlugin : MethodChannel.MethodCallHandler {
}
ACTION_PUSH_EVENT_TRACKING_TAP -> {
val map = methodCall.arguments as HashMap<*, *>
LogUtil.i("flutter click:"+GsonProvider.getGson().toJson(map))
val clickPath = map["path"] as String
if (!TextUtils.isEmpty(clickPath)) {
......@@ -107,10 +109,14 @@ class YDLCommonPlugin : MethodChannel.MethodCallHandler {
field.isAccessible = true
val property = field.get(ownerClass)
if (property is Boolean && property) {
BuryPointHelper.showEditDialog(mActivity, MD5Util.md5(clickPath), null)
var activity:Activity ?= mActivity
if (mActivity==null&&mFragment!=null){
activity = mFragment?.activity!!
}
BuryPointHelper.showEditDialog(activity, MD5Util.md5(clickPath), null)
}
} catch (e: Exception) {
LogUtil.e("flutter click exception:$e")
}
YdlBuryPointUtil.sendClick(MD5Util.md5(clickPath))
......
ydl-pay/src/main/java/com/yidianling/ydl_pay/pay/bean/WXRechargeIdParam.java
package com.yidianling.ydl_pay.pay.bean;
import android.text.TextUtils;
import com.ydl.ydlcommon.base.BaseApp;
import com.ydl.ydlcommon.base.config.YDLConstants;
import com.ydl.ydlcommon.data.http.BaseCommand;
/**
......@@ -11,8 +15,18 @@ import com.ydl.ydlcommon.data.http.BaseCommand;
*/
public class WXRechargeIdParam extends BaseCommand {
public String rechargeId;
public String type;
public WXRechargeIdParam(String rechargeId) {
this.rechargeId = rechargeId;
if(!TextUtils.isEmpty(BaseApp.instance.getGlobalConfig().getAppWxPayType())) {
type =BaseApp.instance.getGlobalConfig().getAppWxPayType();
}else {
if (YDLConstants.FROM_XLZX.equals(BaseApp.instance.getGlobalConfig().getAppFrom())) {
type = "wxapp_consult";
} else if(YDLConstants.FROM_YDL.equals(BaseApp.instance.getGlobalConfig().getAppFrom())) {
type = "wxapp_hz";
}
}
}
}
ydl-platform/src/main/res/drawable/platform_ydl_common_dialog_sure_btn_ydl_bg.xml
......@@ -3,8 +3,8 @@
android:shape="rectangle">
<gradient
android:endColor="#1DA1F2"
android:startColor="#23B2FA"/>
android:endColor="@color/platform_main_gradient_end_color"
android:startColor="@color/platform_main_gradient_start_color"/>
<corners android:bottomRightRadius="8dp" />
......
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