Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
YDL-Component-Medical
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
杨凯
YDL-Component-Medical
Commits
ffa3295a
Commit
ffa3295a
authored
Jun 07, 2022
by
刘鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 1. opensl去掉,采用系统音频采集。2.倒计时增加1分钟,保证通话不被提前终止。3.登录页授权按钮加入动效
parent
50cd0d65
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
14 additions
and
37 deletions
+14
-37
DemoGlobalConfig.java
app/src/main/java/com/ydl/component/base/DemoGlobalConfig.java
+1
-1
build.gradle
m-audioim/build.gradle
+1
-1
AudioHomeActivity.kt
m-audioim/src/main/java/com/ydl/audioim/AudioHomeActivity.kt
+1
-1
RegisterAndLoginActivity.kt
m-user/src/main/java/com/yidianling/user/ui/login/RegisterAndLoginActivity.kt
+9
-33
user_shake_input.xml
m-user/src/main/res/anim/user_shake_input.xml
+1
-1
user_activity_register_and_login_new.xml
m-user/src/main/res/layout/user_activity_register_and_login_new.xml
+1
-0
No files found.
app/src/main/java/com/ydl/component/base/DemoGlobalConfig.java
View file @
ffa3295a
...
@@ -21,8 +21,8 @@ import java.util.List;
...
@@ -21,8 +21,8 @@ import java.util.List;
public
final
class
DemoGlobalConfig
implements
IConfigModule
{
public
final
class
DemoGlobalConfig
implements
IConfigModule
{
String
APP_DOMAIN
=
"https://api.github.com/"
;
String
APP_DOMAIN
=
"https://api.github.com/"
;
// public static String appEnv = YDLConstants.ENV_AUTO_TEST;
// public static String appEnv = YDLConstants.ENV_AUTO_TEST;
// public static String appEnv = YDLConstants.ENV_NEW_TEST;//配置未上传到maven库
// public static String appEnv = YDLConstants.ENV_TEST;
// public static String appEnv = YDLConstants.ENV_TEST;
// public static String appEnv = YDLConstants.ENV_NEW_TEST;//配置未上传到maven库
public
static
String
appEnv
=
YDLConstants
.
ENV_PROD
;
public
static
String
appEnv
=
YDLConstants
.
ENV_PROD
;
@Override
@Override
public
void
injectAppLifecycle
(
@NotNull
Context
context
,
@NotNull
List
<
IAppLifecycles
>
lifecycles
)
{
public
void
injectAppLifecycle
(
@NotNull
Context
context
,
@NotNull
List
<
IAppLifecycles
>
lifecycles
)
{
...
...
m-audioim/build.gradle
View file @
ffa3295a
...
@@ -75,7 +75,7 @@ dependencies {
...
@@ -75,7 +75,7 @@ dependencies {
kapt
"com.alibaba:arouter-compiler:$arouter_compiler"
kapt
"com.alibaba:arouter-compiler:$arouter_compiler"
api
"com.alibaba:arouter-api:$arouter_api"
api
"com.alibaba:arouter-api:$arouter_api"
implementation
"com.ydl:ydl-av:1.4.
2
"
implementation
"com.ydl:ydl-av:1.4.
4
"
implementation
'com.volcengine:apm_insight:1.4.6.cn'
implementation
'com.volcengine:apm_insight:1.4.6.cn'
if
(
rootProject
.
ext
.
dev_mode
){
if
(
rootProject
.
ext
.
dev_mode
){
...
...
m-audioim/src/main/java/com/ydl/audioim/AudioHomeActivity.kt
View file @
ffa3295a
...
@@ -1259,7 +1259,7 @@ class AudioHomeActivity :
...
@@ -1259,7 +1259,7 @@ class AudioHomeActivity :
totalDisposable
=
totalDisposable
=
Observable
.
interval
(
0
,
1
,
TimeUnit
.
SECONDS
)
Observable
.
interval
(
0
,
1
,
TimeUnit
.
SECONDS
)
.
subscribeOn
(
Schedulers
.
computation
())
.
subscribeOn
(
Schedulers
.
computation
())
.
take
(
remainTime
!!
.
toLong
()
+
1
)
.
take
(
remainTime
!!
.
toLong
()
+
60
)
.
observeOn
(
AndroidSchedulers
.
mainThread
())
.
observeOn
(
AndroidSchedulers
.
mainThread
())
.
subscribe
({
.
subscribe
({
localRemainTime
=
localRemainTime
=
...
...
m-user/src/main/java/com/yidianling/user/ui/login/RegisterAndLoginActivity.kt
View file @
ffa3295a
package
com.yidianling.user.ui.login
package
com.yidianling.user.ui.login
import
android.Manifest
import
android.annotation.SuppressLint
import
android.annotation.SuppressLint
import
android.content.Context
import
android.content.Context
import
android.content.Intent
import
android.content.Intent
import
android.graphics.Color
import
android.graphics.Color
import
android.net.Uri
import
android.os.Handler
import
android.os.Handler
import
android.provider.Settings
import
androidx.core.content.ContextCompat
import
android.text.*
import
android.text.*
import
android.text.method.LinkMovementMethod
import
android.text.method.LinkMovementMethod
import
android.text.style.AbsoluteSizeSpan
import
android.text.style.AbsoluteSizeSpan
import
android.text.style.ClickableSpan
import
android.text.style.ClickableSpan
import
android.view.View
import
android.view.View
import
android.view.animation.AnimationUtils
import
android.view.animation.AnimationUtils
import
androidx.core.content.ContextCompat
import
com.alibaba.android.arouter.facade.annotation.Route
import
com.alibaba.android.arouter.facade.annotation.Route
import
com.fm.openinstall.OpenInstall
import
com.fm.openinstall.OpenInstall
import
com.meituan.android.walle.WalleChannelReader
import
com.meituan.android.walle.WalleChannelReader
import
com.mobile.auth.gatewayauth.PhoneNumberAuthHelper
import
com.mobile.auth.gatewayauth.PhoneNumberAuthHelper
import
com.mobile.auth.gatewayauth.ResultCode
import
com.mobile.auth.gatewayauth.ResultCode
import
com.mobile.auth.gatewayauth.model.TokenRet
import
com.mobile.auth.gatewayauth.model.TokenRet
import
com.tbruyelle.rxpermissions2.RxPermissions
import
com.umeng.socialize.UMShareAPI
import
com.umeng.socialize.UMShareAPI
import
com.umeng.socialize.UMShareConfig
import
com.umeng.socialize.UMShareConfig
import
com.umeng.socialize.bean.SHARE_MEDIA
import
com.umeng.socialize.bean.SHARE_MEDIA
...
@@ -60,6 +56,8 @@ import io.reactivex.android.schedulers.AndroidSchedulers
...
@@ -60,6 +56,8 @@ import io.reactivex.android.schedulers.AndroidSchedulers
import
io.reactivex.schedulers.Schedulers
import
io.reactivex.schedulers.Schedulers
import
kotlinx.android.synthetic.main.user_activity_register_and_login_bottom.*
import
kotlinx.android.synthetic.main.user_activity_register_and_login_bottom.*
import
kotlinx.android.synthetic.main.user_activity_register_and_login_new.*
import
kotlinx.android.synthetic.main.user_activity_register_and_login_new.*
import
kotlinx.android.synthetic.main.user_activity_register_and_login_new.img_reg_back
import
kotlinx.android.synthetic.main.user_activity_register_and_login_new.view_lin
/**
/**
* @author jiucheng
* @author jiucheng
...
@@ -151,32 +149,6 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
...
@@ -151,32 +149,6 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
StatusBarUtils
.
Companion
.
setWindowStatusBarColor
(
this
,
R
.
color
.
white
)
StatusBarUtils
.
Companion
.
setWindowStatusBarColor
(
this
,
R
.
color
.
white
)
StatusBarUtils
.
Companion
.
setStatusBarLightMode
(
this
,
true
)
StatusBarUtils
.
Companion
.
setStatusBarLightMode
(
this
,
true
)
}
}
/*取消READ_PHONE_STATE权限申请,已经在启动页弹过一次
* */
@SuppressLint
(
"CheckResult"
)
private
fun
requestPermission
()
{
val
rxPermissions
=
RxPermissions
(
this
)
rxPermissions
.
requestEach
(
Manifest
.
permission
.
READ_PHONE_STATE
)
.
subscribe
{
permission
->
when
{
permission
.
granted
->
{
}
permission
.
shouldShowRequestPermissionRationale
->
{
// 用户拒绝了该权限,没有选中『不再询问』(Never ask again),那么下次再次启动时。还会提示请求权限的对话框
}
else
->
{
// 用户拒绝了该权限,而且选中『不再询问』
/*ToastUtil.toastLong(this, "App正常工作需要使用设备信息权限,请开启")
val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
val uri = Uri.fromParts("package", packageName, null)
intent.data = uri
startActivity(intent)
finish()*/
}
}
}
}
/**
/**
* 注册流程成功之后,进行百度埋点
* 注册流程成功之后,进行百度埋点
*/
*/
...
@@ -198,8 +170,6 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
...
@@ -198,8 +170,6 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
private
fun
initAuthHelper
()
{
private
fun
initAuthHelper
()
{
// requestPermission()
OneKeyLoginHelp
.
checkEnvAvailable
(
PhoneNumberAuthHelper
.
SERVICE_TYPE_AUTH
)
OneKeyLoginHelp
.
checkEnvAvailable
(
PhoneNumberAuthHelper
.
SERVICE_TYPE_AUTH
)
OneKeyLoginHelp
.
setVerifyTokenResultListener
(
object
:
OneKeyLoginHelp
.
setVerifyTokenResultListener
(
object
:
OneKeyLoginHelp
.
VerifyTokenResultListener
{
OneKeyLoginHelp
.
VerifyTokenResultListener
{
...
@@ -397,6 +367,8 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
...
@@ -397,6 +367,8 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
//微信登录
//微信登录
login_wechat
.
setOnClickListener
{
login_wechat
.
setOnClickListener
{
if
(
iv_select_protocol
.
visibility
==
View
.
VISIBLE
&&
!
isAgreeProtocol
)
{
if
(
iv_select_protocol
.
visibility
==
View
.
VISIBLE
&&
!
isAgreeProtocol
)
{
val
shake
=
AnimationUtils
.
loadAnimation
(
this
,
R
.
anim
.
user_shake_input
)
//加载动画资源文件
check_protocol
.
startAnimation
(
shake
)
ToastUtil
.
toastShort
(
"请您先同意壹点灵《用户使用协议》、《隐私保护政策》,才能登录使用"
)
ToastUtil
.
toastShort
(
"请您先同意壹点灵《用户使用协议》、《隐私保护政策》,才能登录使用"
)
return
@setOnClickListener
return
@setOnClickListener
}
}
...
@@ -405,6 +377,8 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
...
@@ -405,6 +377,8 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
//QQ 登录
//QQ 登录
login_qq
.
setOnClickListener
{
login_qq
.
setOnClickListener
{
if
(
iv_select_protocol
.
visibility
==
View
.
VISIBLE
&&
!
isAgreeProtocol
)
{
if
(
iv_select_protocol
.
visibility
==
View
.
VISIBLE
&&
!
isAgreeProtocol
)
{
val
shake
=
AnimationUtils
.
loadAnimation
(
this
,
R
.
anim
.
user_shake_input
)
//加载动画资源文件
check_protocol
.
startAnimation
(
shake
)
ToastUtil
.
toastShort
(
"请您先同意壹点灵《用户使用协议》、《隐私保护政策》,才能登录使用"
)
ToastUtil
.
toastShort
(
"请您先同意壹点灵《用户使用协议》、《隐私保护政策》,才能登录使用"
)
return
@setOnClickListener
return
@setOnClickListener
}
}
...
@@ -422,6 +396,8 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
...
@@ -422,6 +396,8 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
//下一步
//下一步
ll_next
.
setOnClickListener
{
ll_next
.
setOnClickListener
{
if
(
iv_select_protocol
.
visibility
==
View
.
VISIBLE
&&
!
isAgreeProtocol
)
{
if
(
iv_select_protocol
.
visibility
==
View
.
VISIBLE
&&
!
isAgreeProtocol
)
{
val
shake
=
AnimationUtils
.
loadAnimation
(
this
,
R
.
anim
.
user_shake_input
)
//加载动画资源文件
check_protocol
.
startAnimation
(
shake
)
ToastUtil
.
toastShort
(
"请您先同意壹点灵《用户使用协议》、《隐私保护政策》,才能登录使用"
)
ToastUtil
.
toastShort
(
"请您先同意壹点灵《用户使用协议》、《隐私保护政策》,才能登录使用"
)
return
@setOnClickListener
return
@setOnClickListener
}
}
...
...
m-user/src/main/res/anim/user_shake_input.xml
View file @
ffa3295a
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<translate
xmlns:android=
"http://schemas.android.com/apk/res/android"
<translate
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:duration=
"
4
00"
android:duration=
"
3
00"
android:fromXDelta=
"0"
android:fromXDelta=
"0"
android:interpolator=
"@anim/user_cycle_input"
android:interpolator=
"@anim/user_cycle_input"
android:toXDelta=
"20"
/>
android:toXDelta=
"20"
/>
...
...
m-user/src/main/res/layout/user_activity_register_and_login_new.xml
View file @
ffa3295a
...
@@ -172,6 +172,7 @@
...
@@ -172,6 +172,7 @@
/>
/>
<LinearLayout
<LinearLayout
android:id=
"@+id/check_protocol"
android:layout_marginTop=
"8dp"
android:layout_marginTop=
"8dp"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment