Skip to content

Y
YDL-Component-Medical
Commit 1d28f16f by konghaorui
Options

Merge branch 'feature/im_update' of… 

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

# Conflicts:
#	app/src/main/java/com/ydl/component/music/FragmentContainerActivity.kt
parents 430841c1 0fbc538c
Showing with 173 additions and 85 deletions
app/src/main/AndroidManifest.xml
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.ydl.component">
xmlns:tools="http://schemas.android.com/tools"
package="com.ydl.component">
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
......@@ -12,24 +12,25 @@
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
<application
android:name="com.ydl.ydlcommon.base.BaseApp"
android:allowBackup="false"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:networkSecurityConfig="@xml/network_config"
android:theme="@style/platform_CommonTheme"
tools:ignore="GoogleAppIndexingWarning"
tools:replace="android:allowBackup, android:icon, android:label">
<activity android:name=".music.FragmentContainerActivity"
android:theme="@style/platform_NoTitleTheme" />
android:name="com.ydl.ydlcommon.base.BaseApp"
android:allowBackup="false"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:networkSecurityConfig="@xml/network_config"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/platform_CommonTheme"
tools:ignore="GoogleAppIndexingWarning"
tools:replace="android:allowBackup, android:icon, android:label">
<activity
android:name=".music.FragmentContainerActivity"
android:theme="@style/platform_NoTitleTheme" />
<!-- <activity android:name="com.yidianling.user.ui.login.RegisterAndLoginActivity" -->
<!-- <activity android:name=".MainActivity"/> -->
<activity
android:name=".MainActivity"
android:launchMode="singleTask"
android:theme="@style/platform_NoTitleTheme">
android:name=".MainActivity"
android:launchMode="singleTask"
android:theme="@style/platform_NoTitleTheme">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
......@@ -37,18 +38,18 @@
<intent-filter>
<action android:name="com.ydl.media.ACTION_MUSIC_CLICK" />
<category android:name="android.intent.category.DEFAULT"/>
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<meta-data
android:name="com.ydl.component.base.DemoGlobalConfig"
android:value="ModuleConfig" />
android:name="com.ydl.component.base.DemoGlobalConfig"
android:value="ModuleConfig" />
<activity
android:name="com.tencent.tauth.AuthActivity"
android:launchMode="singleTask"
android:noHistory="true">
android:name="com.tencent.tauth.AuthActivity"
android:launchMode="singleTask"
android:noHistory="true">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
......@@ -59,11 +60,11 @@
</intent-filter>
</activity>
<activity android:name=".TestAppActivity" />
<activity
android:name=".home.HomeActivity"
android:launchMode="singleTask"
android:noHistory="true">
</activity>
android:noHistory="true"></activity>
</application>
</manifest>
\ No newline at end of file
app/src/main/java/com/ydl/component/MainActivity.kt
......@@ -84,7 +84,7 @@ class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(
.navigation()
}
bt_to_consultant.setOnClickListener {
// ARouter.getInstance()
// ARouter.getInstance()
// .build("/consult/hot_search")
// .withString(
// HOT_SEARCH_DOCTOR_NAME,
......@@ -96,10 +96,10 @@ class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(
FragmentContainerActivity.start(this)
}
bt_to_im.setOnClickListener {
FragmentContainerActivity.start(this,"NewMultiMessageFragment")
FragmentContainerActivity.start(this, "NewMultiMessageFragment")
}
bt_to_dynamic.setOnClickListener {
FragmentContainerActivity.start(this,"TrendsHomeFragment")
FragmentContainerActivity.start(this, "TrendsHomeFragment")
}
bt_to_tests.setOnClickListener {
startActivity(Intent(this, NewTestHomeActivity::class.java))
......@@ -109,25 +109,32 @@ class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(
// startActivity(Intent(this, ConfideHomeActivity::class.java))
// }
bt_to_muse.setOnClickListener {
YDLRouterManager.router(IYDLRouterConstant.ROUTER_MUSE,
YDLRouterParams().putExtra(IYDLRouterConstant.MUSIC_URL, "http://video.yidianling.com/2019/05/30/e6d4a71e8c895f2156a2ff37d93ca3a9.mp3")
.putExtra(IYDLRouterConstant.DATA_JSON, "{\n" +
" \"muses\": [{\n" +
" \"id\": 6,\n" +
" \"name\": \"冥想基础介绍-1-什么是冥想？\",\n" +
" \"audioUrl\":\n" +
" \"http://video.yidianling.com/2019/05/30/e6d4a71e8c895f2156a2ff37d93ca3a9.mp3\",\n" +
" \"backgroundUrl\":\n" +
" \"https://img.yidianling.com/file/2019/06/10/i4qdax82ok2aizq3.png\",\n" +
" \"effectCode\": 1,\n" +
" \"category\": 2,\n" +
" \"playCount\": 929,\n" +
" \"sort\": 255,\n" +
" \"isDelete\": 1,\n" +
" \"createTime\": \"May 30, 2019 4:45:17 PM\",\n" +
" \"updateTime\": \"Jun 10, 2019 7:14:23 PM\"\n" +
" }]\n" +
" }"))
YDLRouterManager.router(
IYDLRouterConstant.ROUTER_MUSE,
YDLRouterParams().putExtra(
IYDLRouterConstant.MUSIC_URL,
"http://video.yidianling.com/2019/05/30/e6d4a71e8c895f2156a2ff37d93ca3a9.mp3"
)
.putExtra(
IYDLRouterConstant.DATA_JSON, "{\n" +
" \"muses\": [{\n" +
" \"id\": 6,\n" +
" \"name\": \"冥想基础介绍-1-什么是冥想？\",\n" +
" \"audioUrl\":\n" +
" \"http://video.yidianling.com/2019/05/30/e6d4a71e8c895f2156a2ff37d93ca3a9.mp3\",\n" +
" \"backgroundUrl\":\n" +
" \"https://img.yidianling.com/file/2019/06/10/i4qdax82ok2aizq3.png\",\n" +
" \"effectCode\": 1,\n" +
" \"category\": 2,\n" +
" \"playCount\": 929,\n" +
" \"sort\": 255,\n" +
" \"isDelete\": 1,\n" +
" \"createTime\": \"May 30, 2019 4:45:17 PM\",\n" +
" \"updateTime\": \"Jun 10, 2019 7:14:23 PM\"\n" +
" }]\n" +
" }"
)
)
}
bt_to_fm.setOnClickListener {
......@@ -135,12 +142,13 @@ class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(
// YDLRouterManager.router(IYDLRouterConstant.ROUTER_FM_LIST)
}
bt_to_course.setOnClickListener{
bt_to_course.setOnClickListener {
ARouter.getInstance().build("/course/home")
.navigation()
}
bt_to_home.setOnClickListener {
FragmentContainerActivity.start(this,"YdlHomeFragment")
// FragmentContainerActivity.start(this, "YdlHomeFragment")
startActivity(Intent(this, TestAppActivity::class.java))
}
}
......@@ -186,7 +194,8 @@ class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(
super.onResume()
MobclickAgent.onResume(this)
ModularServiceManager.provide(IConsultantService::class.java).showConsultAssistantDialog(this)
ModularServiceManager.provide(IConsultantService::class.java)
.showConsultAssistantDialog(this)
}
override fun onPause() {
......
app/src/main/java/com/ydl/component/TestAppActivity.kt 0 → 100644
package com.ydl.component
import android.os.Bundle
import android.support.v4.app.Fragment
import android.support.v4.app.FragmentPagerAdapter
import android.support.v7.app.AppCompatActivity
import com.yidianling.dynamic.trendsHome.TrendsHomeFragment
import com.yidianling.home.ui.fragment.YdlHomeFragment
import kotlinx.android.synthetic.main.activity_test_app.*
import java.util.*
/**
* @author jiucheng
* @描述:
* @Copyright Copyright (c) 2018
* @Company 壹点灵
* @date 2020/1/14
*/
class TestAppActivity : AppCompatActivity() {
private var fragments: ArrayList<Fragment> =
ArrayList()
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_test_app)
fragments.add(YdlHomeFragment())
fragments.add(TrendsHomeFragment().setTab("trend_tap"))
val adapter: FragmentPagerAdapter =
object : FragmentPagerAdapter(supportFragmentManager) {
override fun getItem(position: Int): Fragment {
return fragments.get(position)
}
override fun getCount(): Int {
return fragments.size
}
}
view_page.adapter = adapter
view_page.offscreenPageLimit = 2
}
}
\ No newline at end of file
app/src/main/java/com/ydl/component/base/DemoAppLifecycles.java
......@@ -121,7 +121,6 @@ public class DemoAppLifecycles implements IAppLifecycles {
PlatformConfig.setQQZone("1107931541", "8dCvxUpi525uPGTJ");
}
// MobclickAgent.setScenarioType(application, MobclickAgent.EScenarioType.E_DUM_NORMAL);
// 选用AUTO页面采集模式
MobclickAgent.setPageCollectionMode(MobclickAgent.PageMode.AUTO);
MobclickAgent.setCatchUncaughtExceptions(!BuildConfig.DEBUG);
......
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) {
......
app/src/main/java/com/ydl/component/music/FragmentContainerActivity.kt
......@@ -8,7 +8,6 @@ import com.ydl.component.mvp.DemoPresenter
import com.ydl.ydlcommon.bean.StatusBarOptions
import com.ydl.ydlcommon.mvp.lce.BaseLceActivity
import com.yidianling.dynamic.trendsHome.TrendsHomeFragment
import com.yidianling.home.ui.fragment.YdlHomeFragment
//import com.yidianling.dynamic.trendsHome.TrendsHomeFragment
//import com.yidianling.home.ui.fragment.YdlHomeFragment
import com.yidianling.im.ui.page.NewMultiMessageFragment
......@@ -66,9 +65,9 @@ class FragmentContainerActivity : BaseLceActivity<DemoContract.View, DemoContra
if ("TrendsHomeFragment" == fragmentName) {
return TrendsHomeFragment()
}
if ("YdlHomeFragment" == fragmentName) {
return YdlHomeFragment()
}
// if ("YdlHomeFragment" == fragmentName) {
// return YdlHomeFragment()
// }
return PlayFragment()
}
}
app/src/main/res/layout/activity_test_app.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<android.support.v4.view.ViewPager
android:id="@+id/view_page"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1" />
</LinearLayout>
\ No newline at end of file
config.gradle
......@@ -42,17 +42,17 @@ ext {
ydlPublishVersion = [
// -------------- 业务模块 --------------
//第三步 若干
"m-confide" : "0.0.43",
"m-consultant" : "0.0.53",
"m-fm" : "0.0.25",
"m-user" : "0.0.44.7",
"m-home" : "0.0.16",
"m-im" : "0.0.9",
"m-dynamic" : "0.0.3",
"m-confide" : "0.0.47",
"m-consultant" : "0.0.56",
"m-fm" : "0.0.28",
"m-user" : "0.0.47",
"m-home" : "0.0.18",
"m-im" : "0.0.11",
"m-dynamic" : "0.0.5.1",
"m-muse" : "0.0.24",
"m-tests" : "0.0.19",
"m-course" : "0.0.38",
"m-muse" : "0.0.26",
"m-tests" : "0.0.21",
"m-course" : "0.0.40",
//-------------- 业务模块 API 层 --------------
"m-audioim-api" : "0.0.5",
......@@ -69,19 +69,19 @@ ext {
//-------------- 功能组件 --------------
//第一步
"ydl-platform" : "0.0.33.4",
"ydl-platform" : "0.0.37",
//第二步 若干
"ydl-webview" : "0.0.33.2",
"ydl-media" : "0.0.16",
"ydl-pay" : "0.0.13",
"m-audioim" : "0.0.42",
"ydl-webview" : "0.0.37",
"ydl-media" : "0.0.20",
"ydl-pay" : "0.0.17",
"m-audioim" : "0.0.46",
"ydl-flutter-base": "0.0.10",
//以下 几乎不会动
"router" : "0.0.1",
"ydl-net" : "0.0.3.1",
"ydl-utils" : "0.0.3.1",
"ydl-flutter-base": "0.0.6.1",
]
......@@ -115,19 +115,19 @@ ext {
//-------------- 功能组件 --------------
//第一步
"ydl-platform" : "0.0.33.4",
"ydl-platform" : "0.0.37",
//第二步 若干
"ydl-webview" : "0.0.32.3",
"ydl-media" : "0.0.15.1",
"ydl-pay" : "0.0.12.1",
"m-audioim" : "0.0.41.1",
"ydl-webview" : "0.0.36",
"ydl-media" : "0.0.20",
"ydl-pay" : "0.0.17",
"m-audioim" : "0.0.46",
"ydl-flutter-base": "0.0.10",
//以下 几乎不会动
"router" : "0.0.1",
"ydl-net" : "0.0.3.1",
"ydl-utils" : "0.0.3.1",
"ydl-flutter-base": "0.0.5.41",
]
dependencies = [
......
m-course/src/main/java/com/yidianling/course/courseNew/courseList/CourseListContainerActivity.kt
......@@ -18,6 +18,8 @@ import android.widget.AdapterView
import android.widget.LinearLayout
import android.widget.TextView
import com.alibaba.android.arouter.facade.annotation.Route
import com.ydl.media.audio.AudioPlayer
import com.ydl.media.view.PlayerFloatHelper
import com.ydl.webview.H5Params
import com.ydl.webview.NewH5Activity
import com.ydl.ydlcommon.base.BaseActivity
......@@ -730,6 +732,15 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
getData(false)
}
override fun onDestroy() {
super.onDestroy()
if (!PlayerFloatHelper.isCanClick) {
PlayerFloatHelper.hide()
PlayerFloatHelper.removeView(this)
AudioPlayer.get().stopPlayer()
}
}
override fun onResume() {
super.onResume()
......
m-dynamic/src/main/java/com/yidianling/dynamic/trendsHome/TrendsHomeFragment.java
......@@ -141,7 +141,7 @@ public class TrendsHomeFragment extends BaseFragment implements ITrendHomeView,
@Override
public void initDataAndEventLazy() {
initDatas();
// initDatas();
}
private void initViews() {
......
m-dynamic/src/main/java/com/yidianling/dynamic/trendsHome/content/TrendsContentListFragment.java
......@@ -101,11 +101,12 @@ public class TrendsContentListFragment extends BaseFragment implements ITrendsLi
public void initDataAndEvent() {
initDatas();
initViews();
onRefresh();
}
@Override
public void initDataAndEventLazy() {
onRefresh();
}
private void initViews() {
......
m-user/src/main/java/com/yidianling/user/ui/login/InputPassWordActivity.kt
......@@ -193,7 +193,8 @@ class InputPassWordActivity : BaseMvpActivity<IInputPassWordContract.View,IInput
private fun showSoftKeyBord() {
RxKeyboardTool.showKeyboard(this, true)
RxKeyboardTool.toggleSoftInput(this, et_input_password)
}
/**
......
m-user/src/main/java/com/yidianling/user/ui/login/RegisterAndLoginActivity.kt
......@@ -333,6 +333,7 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
setHint()
requestFocus()
if (isUmengLoginState) {
tv_skip.visibility = View.VISIBLE
......@@ -374,6 +375,14 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
}
}
private fun requestFocus(){
et_phone_number.post {
et_phone_number.requestFocus()
et_phone_number.isFocusable = true
et_phone_number.isFocusableInTouchMode = true
}
}
private fun setHint() {
val hintStr = SpannableString(resources.getString(R.string.user_edittext_hint))// 定义hint的值
val ass = AbsoluteSizeSpan(16, true)// 设置字体大小 true表示单位是SP
......
m-user/src/main/res/layout/user_phone_code.xml
......@@ -31,7 +31,7 @@
android:layout_height="2dp"
android:layout_marginLeft="4dp"
android:layout_marginRight="4dp"
android:background="@color/user_main_theme_light" />
android:background="#2EB0FF" />
</LinearLayout>
<LinearLayout
......
m-user/src/main/res/layout/user_secret_dialog_layout.xml
......@@ -18,8 +18,7 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="您需要同意本隐私保护协议
才能继续使用壹点灵"
android:text="您需要同意本隐私保护协议\n才能继续使用壹点灵"
android:textSize="18dp"
android:textStyle="bold"
android:textColor="#242424"
......
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