Commit f81c445c by 严久程

咨询加声网

parent 2326a717
...@@ -69,10 +69,11 @@ class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>( ...@@ -69,10 +69,11 @@ class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(
override fun initDataAndEvent() { override fun initDataAndEvent() {
// YDLavManager.instances.init(this, "3387e9b251f3491e9221a9877e8f7830") YDLavManager.instances.login("13081706")
bindService() bindService()
reLoadData() // reLoadData()
requestPermission() requestPermission()
tv_user.setOnClickListener { tv_user.setOnClickListener {
reLoadData() reLoadData()
...@@ -111,7 +112,6 @@ class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>( ...@@ -111,7 +112,6 @@ class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(
startActivity(Intent(this, NewTestHomeActivity::class.java)) startActivity(Intent(this, NewTestHomeActivity::class.java))
} }
bt_to_confide.setOnClickListener { bt_to_confide.setOnClickListener {
YDLavManager.instances.login("1193016")
startActivity(Intent(this, ConfideHomeActivity::class.java)) startActivity(Intent(this, ConfideHomeActivity::class.java))
} }
bt_to_muse.setOnClickListener { bt_to_muse.setOnClickListener {
......
...@@ -17,6 +17,7 @@ import com.umeng.analytics.MobclickAgent; ...@@ -17,6 +17,7 @@ import com.umeng.analytics.MobclickAgent;
import com.umeng.commonsdk.UMConfigure; import com.umeng.commonsdk.UMConfigure;
import com.umeng.socialize.PlatformConfig; import com.umeng.socialize.PlatformConfig;
import com.umeng.socialize.UMShareAPI; import com.umeng.socialize.UMShareAPI;
import com.ydl.audioim.YDLavManager;
import com.ydl.component.BuildConfig; import com.ydl.component.BuildConfig;
import com.ydl.component.MainActivity; import com.ydl.component.MainActivity;
import com.ydl.media.audio.PlayService; import com.ydl.media.audio.PlayService;
...@@ -49,6 +50,9 @@ public class DemoAppLifecycles implements IAppLifecycles { ...@@ -49,6 +50,9 @@ public class DemoAppLifecycles implements IAppLifecycles {
//模块初始化 //模块初始化
moduleInit(application); moduleInit(application);
if (NIMUtil.isMainProcess(application)) { if (NIMUtil.isMainProcess(application)) {
YDLavManager.Companion.getInstances().init(application, "13b1536698f64905a1e7e5bb978ba821");
//第三方SDK初始化 //第三方SDK初始化
initThirdServiceSDK(application); initThirdServiceSDK(application);
//Flutter 初始化需要在主线程中执行 //Flutter 初始化需要在主线程中执行
...@@ -88,9 +92,9 @@ public class DemoAppLifecycles implements IAppLifecycles { ...@@ -88,9 +92,9 @@ public class DemoAppLifecycles implements IAppLifecycles {
//子线程中初始化X5内核,防止ANR问题 //子线程中初始化X5内核,防止ANR问题
initX5(application); initX5(application);
if (DemoGlobalConfig.appEnv.equals(YDLConstants.ENV_PROD)){ if (DemoGlobalConfig.appEnv.equals(YDLConstants.ENV_PROD)) {
// YDLavManager.Companion.getInstances().init(application, "3387e9b251f3491e9221a9877e8f7830"); // YDLavManager.Companion.getInstances().init(application, "3387e9b251f3491e9221a9877e8f7830");
}else { } else {
// YDLavManager.Companion.getInstances().init(application, "13b1536698f64905a1e7e5bb978ba821"); // YDLavManager.Companion.getInstances().init(application, "13b1536698f64905a1e7e5bb978ba821");
} }
...@@ -110,13 +114,13 @@ public class DemoAppLifecycles implements IAppLifecycles { ...@@ -110,13 +114,13 @@ public class DemoAppLifecycles implements IAppLifecycles {
if (BuildConfig.FLAVOR.endsWith("ydl")) { if (BuildConfig.FLAVOR.endsWith("ydl")) {
umAppkey = "56970affe0f55a9cda001e24"; umAppkey = "56970affe0f55a9cda001e24";
channel = "android_" + channel; channel = "android_" + channel;
initUM(umAppkey, channel,application); initUM(umAppkey, channel, application);
PlatformConfig.setWeixin("wx57a9d930270498c7", "17c031f02500ded3457a80e69d8e5e45"); PlatformConfig.setWeixin("wx57a9d930270498c7", "17c031f02500ded3457a80e69d8e5e45");
PlatformConfig.setQQZone("1105070461", "6BvkUnk6wXJekcgR"); PlatformConfig.setQQZone("1105070461", "6BvkUnk6wXJekcgR");
}else if (BuildConfig.FLAVOR.endsWith("xlzx")) { } else if (BuildConfig.FLAVOR.endsWith("xlzx")) {
umAppkey = "5859e1656e27a42fa400021f"; umAppkey = "5859e1656e27a42fa400021f";
channel = "ATK_7_android_" + channel; channel = "ATK_7_android_" + channel;
initUM(umAppkey, channel,application); initUM(umAppkey, channel, application);
PlatformConfig.setWeixin("wx1c6af5a11b5f531f", "1ddb93abbb2d81e604657d38e94a5720"); PlatformConfig.setWeixin("wx1c6af5a11b5f531f", "1ddb93abbb2d81e604657d38e94a5720");
PlatformConfig.setQQZone("1107931541", "8dCvxUpi525uPGTJ"); PlatformConfig.setQQZone("1107931541", "8dCvxUpi525uPGTJ");
} }
...@@ -139,7 +143,6 @@ public class DemoAppLifecycles implements IAppLifecycles { ...@@ -139,7 +143,6 @@ public class DemoAppLifecycles implements IAppLifecycles {
} }
private void initUM(String umAppKey, String channel, Application application) { private void initUM(String umAppKey, String channel, Application application) {
/** /**
* 初始化common库 * 初始化common库
...@@ -156,6 +159,7 @@ public class DemoAppLifecycles implements IAppLifecycles { ...@@ -156,6 +159,7 @@ public class DemoAppLifecycles implements IAppLifecycles {
/** /**
* 初始化X5内核 * 初始化X5内核
*
* @param application * @param application
*/ */
private void initX5(Application application) { private void initX5(Application application) {
...@@ -173,7 +177,7 @@ public class DemoAppLifecycles implements IAppLifecycles { ...@@ -173,7 +177,7 @@ public class DemoAppLifecycles implements IAppLifecycles {
@Override @Override
public void onViewInitFinished(boolean arg0) { public void onViewInitFinished(boolean arg0) {
//初始化完成回调 //初始化完成回调
LogUtil.i("QbSdk onViewInitFinished:"+arg0); LogUtil.i("QbSdk onViewInitFinished:" + arg0);
} }
@Override @Override
......
...@@ -5,8 +5,8 @@ ext { ...@@ -5,8 +5,8 @@ ext {
ydl_app = [ ydl_app = [
appName : "心理咨询壹点灵", appName : "心理咨询壹点灵",
applicationId: "com.cxzapp.yidianling", applicationId: "com.cxzapp.yidianling",
versionName : "4.0.31", versionName : "4.0.99",
versionCode : 4031, versionCode : 4099,
] ]
xlzx_app = [ xlzx_app = [
...@@ -42,7 +42,7 @@ ext { ...@@ -42,7 +42,7 @@ ext {
ydlPublishVersion = [ ydlPublishVersion = [
// -------------- 业务模块 -------------- // -------------- 业务模块 --------------
//第三步 若干 //第三步 若干
"m-confide" : "0.0.48.7.5", "m-confide" : "0.0.48.7.6",
"m-consultant" : "0.0.57.4", "m-consultant" : "0.0.57.4",
"m-fm" : "0.0.29.3", "m-fm" : "0.0.29.3",
"m-user" : "0.0.58.2", "m-user" : "0.0.58.2",
...@@ -75,7 +75,7 @@ ext { ...@@ -75,7 +75,7 @@ ext {
"ydl-webview" : "0.0.37.1", "ydl-webview" : "0.0.37.1",
"ydl-media" : "0.0.20", "ydl-media" : "0.0.20",
"ydl-pay" : "0.0.17", "ydl-pay" : "0.0.17",
"m-audioim" : "0.0.48.2.5", "m-audioim" : "0.0.48.2.6",
"ydl-flutter-base": "0.0.10.9", "ydl-flutter-base": "0.0.10.9",
//以下 几乎不会动 //以下 几乎不会动
...@@ -121,7 +121,7 @@ ext { ...@@ -121,7 +121,7 @@ ext {
"ydl-webview" : "0.0.37.1", "ydl-webview" : "0.0.37.1",
"ydl-media" : "0.0.20", "ydl-media" : "0.0.20",
"ydl-pay" : "0.0.17", "ydl-pay" : "0.0.17",
"m-audioim" : "0.0.48.2.5", "m-audioim" : "0.0.48.2.6",
"ydl-flutter-base": "0.0.10.9", "ydl-flutter-base": "0.0.10.9",
//以下 几乎不会动 //以下 几乎不会动
......
...@@ -47,6 +47,21 @@ ...@@ -47,6 +47,21 @@
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="26sp" android:textSize="26sp"
tools:text="用户" /> tools:text="用户" />
<TextView
android:id="@+id/tv_tips"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_name"
android:layout_centerHorizontal="true"
android:layout_marginLeft="25dp"
android:layout_marginTop="6dp"
android:layout_marginRight="25dp"
android:ellipsize="end"
android:gravity="center"
android:maxLines="2"
android:textColor="@color/white"
android:textSize="15sp"
android:text="向您发起语音通话请求" />
<!--自定义弹窗--> <!--自定义弹窗-->
...@@ -54,7 +69,7 @@ ...@@ -54,7 +69,7 @@
android:id="@+id/tv_toast" android:id="@+id/tv_toast"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/tv_name" android:layout_below="@+id/tv_tips"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="34dp" android:layout_marginTop="34dp"
android:background="@drawable/audioim_toast_view_background" android:background="@drawable/audioim_toast_view_background"
...@@ -83,7 +98,7 @@ ...@@ -83,7 +98,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:text="本次倾诉时间还有" android:text="通话时长"
android:textColor="@color/platform_color_30FFFFFF" android:textColor="@color/platform_color_30FFFFFF"
android:textSize="12sp" /> android:textSize="12sp" />
...@@ -93,7 +108,7 @@ ...@@ -93,7 +108,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/tv_notes" android:layout_below="@+id/tv_notes"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:text="23:23" android:text="00:00"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="20sp" /> android:textSize="20sp" />
</RelativeLayout> </RelativeLayout>
......
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