Skip to content

Y
YDL-Component-Medical
Commit ed9dcef9 by 刘鹏
Options

feat : 万恶的登录组件优化成医疗可用的了

parent 98fac852
Showing with 359 additions and 464 deletions
app/src/main/java/com/ydl/component/base/DemoAppLifecycles.kt
......@@ -151,7 +151,7 @@ class DemoAppLifecycles : IAppLifecycles {
UMConfigure.setLogEnabled(BuildConfig.DEBUG)
HttpConfig.getInstance().initSocketConfig(Action {
//数据埋点初始化 (一定要放在主进程中/因为用到了umeng统计，需要放在umeng初始化后)
YdlBuryPointUtil.init(application, true)
// YdlBuryPointUtil.init(application, true)
})
//安全检测
//YDLAppProtector.init();
......
config.gradle
......@@ -8,7 +8,7 @@ ext {
"m-confide" : "0.0.49.10",
"m-consultant" : "0.0.59.91",
"m-fm" : "0.0.30.03",
"m-user" : "0.0.61.42",
"m-user" : "0.0.61.53",
"m-home" : "0.0.22.70",
"m-im" : "0.0.19.75",
"m-dynamic" : "0.0.7.28",
......@@ -33,7 +33,7 @@ ext {
//-------------- 功能组件 --------------
//第一步
"ydl-platform" : "0.0.40.21",
"ydl-platform" : "0.0.40.33",
//第二步 若干
"ydl-webview" : "0.0.38.47",
......@@ -91,7 +91,7 @@ ext {
"m-confide" : "0.0.49.10",
"m-consultant" : "0.0.59.91",
"m-fm" : "0.0.30.01",
"m-user" : "0.0.61.42",
"m-user" : "0.0.61.53",
"m-home" : "0.0.22.70",
"m-im" : "0.0.19.75",
"m-dynamic" : "0.0.7.28",
......@@ -115,7 +115,7 @@ ext {
//-------------- 功能组件 --------------
//第一步
"ydl-platform" : "0.0.40.21",
"ydl-platform" : "0.0.40.33",
//第二步 若干
"ydl-webview" : "0.0.38.47",
......
m-user/src/main/AndroidManifest.xml
......@@ -6,14 +6,7 @@
<activity android:name=".mine.AccountUnRegisterActivity"
android:screenOrientation="portrait"
android:theme="@style/platform_NoTitleTheme"/>
<activity android:name=".ui.login.BindPhoneActivity"
android:screenOrientation="portrait"
android:theme="@style/platform_NoTitleTheme"
/>
<activity
android:name=".ui.LoginActivity"
android:screenOrientation="portrait"
android:theme="@style/platform_NoTitleTheme" />
<activity
android:name=".ui.CountryListActivity"
android:screenOrientation="portrait"
......@@ -31,10 +24,7 @@
android:name=".ui.GetIdentifyingCodeActivity"
android:screenOrientation="portrait"
android:theme="@style/platform_NoTitleTheme" />
<activity
android:name=".ui.FillInfoActivity"
android:screenOrientation="portrait"
android:theme="@style/platform_NoTitleTheme" />
<activity
android:name=".safePrivate.CheckPasswordActivity"
android:screenOrientation="portrait"
......
m-user/src/main/java/com/yidianling/user/LoginUtils.kt
......@@ -8,9 +8,6 @@ import com.ydl.ydlcommon.utils.ActivityManager
import com.ydl.ydlcommon.utils.BuryPointUtils
import com.ydl.ydlcommon.utils.log.AliYunLogConfig
import com.ydl.ydlcommon.utils.log.AliYunRichLogsHelper
import com.yidianling.common.tools.LogUtil
import com.yidianling.im.api.bean.IMLoginInfo
import com.yidianling.im.api.bean.IMRequestCallback
import com.yidianling.user.api.bean.UserResponseBean
import com.yidianling.user.api.event.UserLoginEvent
import com.yidianling.user.api.event.UserLogoutEvent
......@@ -22,7 +19,6 @@ import com.yidianling.user.safePrivate.FingerPrintUtil
import com.yidianling.user.safePrivate.HandUnlockCheckActivity
import com.yidianling.user.ui.collect.CollectSexAndBirthActivity
import com.yidianling.user.ui.login.InputPassWordActivity
import com.yidianling.user.ui.login.OneKeyLoginHelp
import com.yidianling.user.ui.login.RegisterAndLoginActivity
import com.yidianling.user.ui.login.VerificationCodeActivity
import de.greenrobot.event.EventBus
......@@ -43,45 +39,12 @@ object LoginUtils {
@JvmStatic
fun onLogin(userInfo: UserResponseBean?) {
//设置异常用户ID
CrashReport.setUserId(userInfo?.uid)
//登录IM聊天
loginIm(userInfo)
//设置极光注册id
LoginHelper.setChannelId()
val loginEvent = UserLoginEvent("login", userInfo?.uid!!)
EventBus.getDefault().post(loginEvent)
BuryPointUtils.bindUid(userInfo?.uid ?: "")
}
private fun loginIm(userInfo: UserResponseBean?) {
val info = IMLoginInfo(userInfo?.uid ?: "", userInfo?.hxpwd ?: "")
val callback = object : IMRequestCallback<IMLoginInfo> {
override fun onSuccess(t: IMLoginInfo?) {
LogUtil.e("IM登录成功：" + "info.account:" + info.account + "info.passWord" + info.passWord)
UserIn.imSetAccount(userInfo?.uid ?: "")
AliYunRichLogsHelper.getInstance().sendRichLog(AliYunLogConfig.LOGIN, "IM登录成功")
}
override fun onFailed(i: Int) {
LogUtil.e("IM登录失败：$i" + "info.account:" + info.account + "info.passWord" + info.passWord)
AliYunRichLogsHelper.getInstance().sendRichLog(AliYunLogConfig.LOGIN, "IM登录失败")
}
override fun onException(throwable: Throwable?) {
LogUtil.e("IM登录onException：${throwable?.message}")
AliYunRichLogsHelper.getInstance()
.sendRichLog(AliYunLogConfig.LOGIN, "IM登录onException：${throwable?.message}")
}
}
UserIn.imSetAccount(info.account)
UserIn.imLogin(info, callback)
}
@JvmStatic
fun logout() {
......@@ -108,7 +71,6 @@ object LoginUtils {
@JvmStatic
fun loginSuccessOperate(activity: Activity) {
// 登录成功后，如果一键登录界面没有关闭，则关闭掉
OneKeyLoginHelp.quitLoginPage()
val size = ActivityManager.getActivitySize()
if (size <= 2) {//当前stack只有两个页面，必然没有MainActivity
ActivityManager.finishAll()
......
m-user/src/main/java/com/yidianling/user/UserHelper.kt
......@@ -4,7 +4,6 @@ import android.text.TextUtils
import com.google.gson.Gson
import com.ydl.ydlcommon.utils.SharedPreferencesEditor
import com.ydl.ydlcommon.utils.UserInfoCache
import com.ydl.ydlcommon.utils.YdlBuryPointUtil
import com.yidianling.user.api.bean.UserResponseBean
import com.yidianling.user.api.bean.UserSettingBean
......@@ -39,7 +38,6 @@ object UserHelper {
UserInfoCache.getInstance().saveYDLUser("\"" + userInfo?.uid + "\"",
userInfo?.userInfo?.nick_name, userInfo?.userInfo?.head)
YdlBuryPointUtil.reLogin()
} catch (e: Exception) {
e.printStackTrace()
}
......
m-user/src/main/java/com/yidianling/user/http/UserApi.kt
......@@ -22,41 +22,41 @@ interface UserApi {
//登录
@FormUrlEncoded
@POST("user/user")
@POST("api/user/user")
fun login(@FieldMap params: Map<String, String>): Observable<BaseResponse<UserResponseBean>>
//国家列表
@FormUrlEncoded
@POST("user/country-list")
@POST("api/user/country-list")
fun countryList(@Field(YDLConstants.HOLDER_PARAM ) params: String): Observable<BaseResponse<CountryResponse>>
//判断手机号是否存在
@FormUrlEncoded
@POST("user/phone-exist")
@POST("api/user/phone-exist")
fun phoneExists(@FieldMap params: Map<String, String>): Observable<BaseResponse<ExistResponse>>
//获取验证码
@FormUrlEncoded
@POST("user/chk-code")
@POST("api/user/chk-code")
fun getCode(@FieldMap params: Map<String, String>): Observable<BaseResponse<Any>>
//绑定手机号
@FormUrlEncoded
@POST("user/bind-phone")
@POST("api/user/bind-phone")
fun bindPhone(@FieldMap params: Map<String, String>): Observable<BaseResponse<UserResponseBean>>
//忘记密码
@FormUrlEncoded
@POST("user/forget")
@POST("api/user/forget")
fun forget(@FieldMap params: Map<String, String>): Observable<BaseResponse<Any>>
//注册
@FormUrlEncoded
@POST("user/reg")
@POST("api/user/reg")
fun register(@FieldMap params: Map<String, String>): Observable<BaseResponse<Any>>
//设置推送的channelId
@POST("user/device/modify")
@POST("api/user/device/modify")
@Headers( YDL_DOMAIN + YDL_DOMAIN_JAVA)
fun setChannelId(@Body body: RequestBody): Observable<BaseResponse<LinkedTreeMap<String, String>>>
......@@ -64,58 +64,58 @@ interface UserApi {
//设置用户信息
@FormUrlEncoded
@POST("user/set-info")
@POST("api/user/set-info")
fun setUserInfo(@FieldMap params: Map<String, String>): Observable<BaseResponse<Any>>
//上传头像
@Multipart
@POST("user/set-info")
@POST("api/user/set-info")
fun uploadHeadImg(@PartMap params: MutableMap<String, RequestBody>): Observable<BaseResponse<Any>>
//上传头像
@Multipart
@POST("user/set-info")
@POST("api/user/set-info")
fun uploadHeadImg(@Part("type") param: RequestBody): Observable<BaseResponse<Any>>
//验证账号密码
@FormUrlEncoded
@POST("user/chkin-pass")
@POST("api/user/chkin-pass")
fun checkPhonePass(@FieldMap params: Map<String, String>): Observable<BaseResponse<CheckPassword>>
//绑定QQ
@FormUrlEncoded
@POST("user/bind-qq")
@POST("api/user/bind-qq")
fun bindQQ(@FieldMap params: Map<String, String>): Observable<BaseResponse<Any>>
//绑定微信
@FormUrlEncoded
@POST("user/bind-wx")
@POST("api/user/bind-wx")
fun bindWx(@FieldMap params: Map<String, String>): Observable<BaseResponse<Any>>
//登出
@FormUrlEncoded
@POST("user/logout")
@POST("api/user/logout")
fun logout(@FieldMap params: Map<String, String>): Observable<BaseResponse<Any>>
//更换手机时密码验证
@FormUrlEncoded
@POST("user/confirm-pwd")
@POST("api/user/confirm-pwd")
fun checkPwd(@FieldMap params: Map<String, String>): Observable<BaseResponse<Any>>
//更换手机时最后校验验证码和手机
@FormUrlEncoded
@POST("user/replace-mob")
@POST("api/user/replace-mob")
fun changePhone(@FieldMap params: Map<String, String>): Observable<BaseResponse<Any>>
//同意隐私政策接口
@GET("user/agreePrivacyAgreement")
@GET("api/user/agreePrivacyAgreement")
@Headers( YDL_DOMAIN+ YDL_DOMAIN_JAVA)
fun privacyAgree(@Query("uid") uid: String): Observable<BaseResponse<Any>>
//服务端校验阿里一键认证
@POST("phone/verification/init")
@POST("api/phone/verification/init")
fun checkAliAuth(@Body body: RequestBody): Observable<BaseResponse<PhoneAuthResponseBean>>
//获取隐私政策数据
......@@ -124,42 +124,42 @@ interface UserApi {
//获取红包单号
@FormUrlEncoded
@POST("uc/ready-bonus")
@POST("api/uc/ready-bonus")
fun getRedPacketId(@FieldMap params: Map<String, String>): Observable<BaseResponse<RedPacketId>>
//上传用户信息数据接口
@POST("user/collect/submit")
@POST("api/user/collect/submit")
@Headers( YDL_DOMAIN+ YDL_DOMAIN_JAVA)
fun uploadUserInfo(@Body body: RequestBody): Observable<BaseAPIResponse<Any>>
//获取关注问题数据接口
@GET("cate/list-parentId")
@GET("api/cate/list-parentId")
@Headers( YDL_DOMAIN+ YDL_DOMAIN_JAVA)
fun getFocusData(@Query("parentId") parentId: String = "0"): Observable<BaseAPIResponse<List<CollectFocusItemBean>>>
//获取新用户引导页面url
@FormUrlEncoded
@POST("user/getNewUserJumpUrl")
@POST("api/user/getNewUserJumpUrl")
@Headers( YDL_DOMAIN+ YDL_DOMAIN_JAVA)
fun getNewUserJumpUrl(@FieldMap params: Map<String, String>): Observable<BaseAPIResponse<String>> //获取新用户引导页面url
//第三方登录获取用户信息
@POST("login/v2/login_wechat_qq")
@POST("api/login/v2/login_wechat_qq")
@Headers( YDL_DOMAIN+ YDL_DOMAIN_LOGIN_BASE_URL,LOGIN_USER_PORT)
fun thirdPartJavaLogin(@Body body: RequestBody): Observable<BaseResponse<UserResponseBean>>
/**
* 绑定手机号
*/
@POST("login/v2/bind_phone")
@POST("api/login/v2/bind_phone")
@Headers(YDL_DOMAIN+ YDL_DOMAIN_LOGIN_BASE_URL, LOGIN_USER_PORT)
fun bindPhone(@Body body: RequestBody): Observable<BaseResponse<Any>>
/**
* 一键登录和本机号码校验
*/
@POST("login/v2/login_direct")
@POST("api/login/v2/login_direct")
@Headers( YDL_DOMAIN+ YDL_DOMAIN_LOGIN_BASE_URL, LOGIN_USER_PORT)
fun autoLogin(@Body body: RequestBody): Observable<BaseResponse<UserResponseBean>>
......@@ -167,63 +167,63 @@ interface UserApi {
/**
* 密码登录
*/
@POST("login/v2/login_pwd")
@POST("api/login/v2/login_pwd")
@Headers( YDL_DOMAIN+ YDL_DOMAIN_LOGIN_BASE_URL,LOGIN_USER_PORT)
fun loginByPassword(@Body body: RequestBody): Observable<BaseResponse<UserResponseBean>>
/**
* 验证码登录
*/
@POST("login/v2/login_sms")
@POST("api/login/v2/login_sms")
@Headers( YDL_DOMAIN+ YDL_DOMAIN_LOGIN_BASE_URL,LOGIN_USER_PORT)
fun loginByMsgCode(@Body body: RequestBody): Observable<BaseResponse<UserResponseBean>>
/**
* 第三方登录
*/
@POST("login/v2/login_wechat_qq")
@POST("api/login/v2/login_wechat_qq")
@Headers( YDL_DOMAIN+ YDL_DOMAIN_LOGIN_BASE_URL,LOGIN_USER_PORT)
fun thirdPartyLogin(@Body body: RequestBody): Observable<BaseAPIResponse<UserResponseBean>>
/**
* 检查手机号来源
*/
@GET("login/v2/phone_detection")
@GET("api/login/v2/phone_detection")
@Headers(YDL_DOMAIN+ YDL_DOMAIN_LOGIN_BASE_URL,LOGIN_USER_PORT)
fun checkPhoneStatus(@Query("phone") phone: String, @Query("countryCode") countryCode: String): Observable<BaseResponse<ChcekPhoneResponeBean>>
/**
* 验证重置密码的短信验证码
*/
@GET("login/v2/pre_check_reset_sms")
@GET("api/login/v2/pre_check_reset_sms")
@Headers( YDL_DOMAIN+ YDL_DOMAIN_LOGIN_BASE_URL,LOGIN_USER_PORT)
fun checkResetCode(@Query("phone") phone: String, @Query("countryCode") countryCode: String, @Query("code") code: String): Observable<BaseResponse<Any>>
/**
* 重置密码
*/
@POST("login/v2/reset_pwd")
@POST("api/login/v2/reset_pwd")
@Headers( YDL_DOMAIN+ YDL_DOMAIN_LOGIN_BASE_URL, LOGIN_USER_PORT)
fun resetPwd(@Body body: RequestBody): Observable<BaseResponse<UserResponseBean>>
/**
* 发送登录验证码
*/
@GET("login/v2/send_login_sms")
@GET("api/login/v2/send_login_sms")
@Headers( YDL_DOMAIN+ YDL_DOMAIN_LOGIN_BASE_URL, LOGIN_USER_PORT)
fun sendLoginMsgCode(@Query("phone") phone: String, @Query("countryCode") countryCode: String): Observable<BaseResponse<Any>>
/**
* 发送忘记密码重置密码的验证码
*/
@GET("login/v2/send_reset_sms")
@GET("api/login/v2/send_reset_sms")
@Headers( YDL_DOMAIN+ YDL_DOMAIN_LOGIN_BASE_URL,LOGIN_USER_PORT)
fun sendResetCode(@Query("phone") phone: String, @Query("countryCode") countryCode: String): Observable<BaseResponse<Any>>
/**
* 第三方登录解绑
*/
@POST("login/v2/unbind_wechat_qq")
@POST("api/login/v2/unbind_wechat_qq")
@Headers( YDL_DOMAIN+ YDL_DOMAIN_LOGIN_BASE_URL,LOGIN_USER_PORT)
fun unBindThirdLogin(@Body body: RequestBody): Observable<BaseResponse<Any>>
......@@ -231,14 +231,14 @@ interface UserApi {
* 用户注销账号
*/
@FormUrlEncoded
@POST("user/forbid_login")
@POST("api/user/forbid_login")
@Headers( YDL_DOMAIN+ YDL_DOMAIN_JAVA)
fun userForbidLogin(@FieldMap params: Map<String, String>): Observable<BaseAPIResponse<Boolean>>
/**
* 是否需要强绑定手机号
*/
@POST("login/v2/is_need_strong_bind")
@POST("api/login/v2/is_need_strong_bind")
@Headers( YDL_DOMAIN+ YDL_DOMAIN_LOGIN_BASE_URL, LOGIN_USER_PORT)
fun isNeedForceBindPhone(@Body map: Map<String,String>): Observable<BaseAPIResponse<Boolean>>
}
\ No newline at end of file
m-user/src/main/java/com/yidianling/user/mine/MineFragment.java
......@@ -26,7 +26,6 @@ import com.ydl.ydlcommon.data.http.ThrowableConsumer;
import com.ydl.ydlcommon.modular.ModularServiceManager;
import com.ydl.ydlcommon.utils.BuryPointUtils;
import com.ydl.ydlcommon.utils.Utils;
import com.ydl.ydlcommon.utils.YdlBuryPointUtil;
import com.ydl.ydlcommon.view.JumpTextView;
import com.ydl.ydlcommon.view.dialog.YDLShareDialog;
import com.ydl.ydlcommon.view.widgets.BorderCircleImageView;
......@@ -497,13 +496,11 @@ public class MineFragment extends BaseFragment implements SwipeRefreshLayout.OnR
jtv_test.postDelayed(new Runnable() {
@Override
public void run() {
YdlBuryPointUtil.sendPv("PvEvent");
}
}, 300);
jtv_test.postDelayed(new Runnable() {
@Override
public void run() {
YdlBuryPointUtil.sendClick("ClickEvent");
}
}, 500);
}
......
m-user/src/main/java/com/yidianling/user/modular_service/UserServiceImp.kt
......@@ -4,8 +4,8 @@ import android.annotation.SuppressLint
import android.app.Activity
import android.content.Context
import android.content.Intent
import androidx.fragment.app.Fragment
import android.text.TextUtils
import androidx.fragment.app.Fragment
import com.alibaba.android.arouter.facade.annotation.Route
import com.ydl.ydlcommon.base.BaseApp
import com.ydl.ydlcommon.bean.VersionData
......@@ -34,7 +34,6 @@ import com.yidianling.user.safePrivate.FingerPrintUtil
import com.yidianling.user.safePrivate.HandUnlockCheckActivity
import com.yidianling.user.safePrivate.PrivacyActivity
import com.yidianling.user.ui.InputPhoneActivity
import com.yidianling.user.ui.LoginActivity
import com.yidianling.user.ui.login.OneKeyLoginHelp
import com.yidianling.user.ui.login.RegisterAndLoginActivity
import com.yidianling.user.ui.login.SecretActivity
......@@ -258,8 +257,7 @@ public class UserServiceImp : IUserService {
override fun shouldShowFingerPage(activity: Activity) {
if(!(activity is HandUnlockCheckActivity
|| activity is FingerPrintCheckActivity
|| activity is LoginActivity)
|| activity is FingerPrintCheckActivity)
&& FingerPrintUtil.instance().isShowActivity()) {
//跳转解锁页面
val intent = Intent(
......
m-user/src/main/java/com/yidianling/user/ui/GetIdentifyingCodeActivity.java
......@@ -426,7 +426,6 @@ public class GetIdentifyingCodeActivity extends BaseActivity implements View.OnC
EventBus.getDefault().post(new RefreshWebEvent());
UserIn.INSTANCE.mainIntent(this);
ActivityManager.Companion.finishActivity(InputPhoneActivity.class);
ActivityManager.Companion.finishActivity(LoginActivity.class);
finish();
}
} catch (Exception e) {
......
m-user/src/main/java/com/yidianling/user/ui/SmsLoginActivity.kt
......@@ -5,7 +5,6 @@ import android.content.Intent
import android.text.TextUtils
import android.util.Log
import android.view.View
import com.fm.openinstall.OpenInstall
import com.ydl.ydlcommon.base.BaseActivity
import com.ydl.ydlcommon.bean.StatusBarOptions
import com.ydl.ydlcommon.data.http.RxUtils
......@@ -13,7 +12,6 @@ import com.ydl.ydlcommon.data.http.ThrowableConsumer
import com.ydl.ydlcommon.router.YdlCommonOut
import com.ydl.ydlcommon.utils.ActivityManager
import com.ydl.ydlcommon.utils.UserInfoCache
import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
import com.ydl.ydlcommon.utils.log.AliYunLogConfig
import com.ydl.ydlcommon.utils.log.AliYunRichLogsHelper
import com.ydl.ydlcommon.utils.remind.ToastHelper
......@@ -23,7 +21,6 @@ import com.yidianling.user.LoginUtils
import com.yidianling.user.StatusUtils
import com.yidianling.user.UserConstants
import com.yidianling.user.api.bean.UserResponseBean
import com.yidianling.user.constants.UserBIConstants
import com.yidianling.user.http.UserHttp
import com.yidianling.user.http.UserHttpImpl
import com.yidianling.user.http.request.CodeParam
......@@ -32,7 +29,6 @@ import com.yidianling.user.route.UserIn
import com.yidianling.user.safePrivate.FingerPrintCheckActivity
import com.yidianling.user.safePrivate.FingerPrintUtil
import com.yidianling.user.safePrivate.HandUnlockCheckActivity
import com.yidianling.user.ui.login.OneKeyLoginHelp
import io.reactivex.Observable
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.disposables.Disposable
......@@ -138,10 +134,7 @@ class SmsLoginActivity : BaseActivity() {
return
}
ActionCountUtils.count(
UserBIConstants.POSITION_LOGIN_CLICK,
UserBIConstants.ACTION_TYPE_CODE_LOGIN
)
Log.e("短信验证码：", code + " - " + phoneNum + " - " + et_code.text.toString());
loginSub = userHttp.login(LoginParam(code, phoneNum, null, 2, et_code.text.toString()))
......@@ -158,11 +151,7 @@ class SmsLoginActivity : BaseActivity() {
StatusUtils.isFirstLogin = true
baiduActionBury()
} else {
ActionCountUtils.countUid(
UserBIConstants.POSITION_LOGIN_SUCCESS_CLICK,
it.uid!!,
UserBIConstants.ACTION_TYPE_CODE_LOGIN
)
}
// ActivityManager.finishActivity(LoginActivity::class.java)
// if (ActivityManager.getActivitySize() <= 1) {
......@@ -187,22 +176,7 @@ class SmsLoginActivity : BaseActivity() {
* 注册流程成功之后，进行百度监测 注册埋点
*/
fun baiduActionBury() {
if (OneKeyLoginHelp.openInstallKey.isNotEmpty() && StatusUtils.isUseOpenInstall) {
ActionCountUtils.baiduCount(
UserBIConstants.APP_REGISTER_PAGE,
UserBIConstants.POSITION_CODE_REGISTER_CLICK,
25,
OneKeyLoginHelp.openInstallKey
)
// 用户注册成功后调用
OpenInstall.reportRegister();
} else {
ActionCountUtils.baiduCount(
UserBIConstants.APP_REGISTER_PAGE,
UserBIConstants.POSITION_CODE_REGISTER_CLICK,
25
)
}
}
//关闭手势解锁页面与指纹解锁页面
......
m-user/src/main/java/com/yidianling/user/ui/collect/CollectFocusActivity.kt
......@@ -11,7 +11,6 @@ import com.ydl.webview.NewH5Activity
import com.ydl.ydlcommon.base.BaseActivity
import com.ydl.ydlcommon.data.http.RxUtils
import com.ydl.ydlcommon.utils.StatusBarUtils
import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
import com.ydl.ydlcommon.view.dialog.YDLCommonDialog
import com.yidianling.common.tools.RxImageTool
import com.yidianling.common.tools.ToastUtil
......@@ -55,7 +54,6 @@ class CollectFocusActivity : BaseActivity() {
isYfd = intent.getBooleanExtra(IS_YFD, false)
ActionCountUtils.count(UserBIConstants.COLLECT_TOPIC_PAGE + "|" + UserBIConstants.COLLECT_TOPIC_PAGE_VISIT)
// 获取关注数据
getFocusData()
......@@ -64,12 +62,10 @@ class CollectFocusActivity : BaseActivity() {
upload_focus_info_btn.setOnClickListener {
uploadFocusData()
ActionCountUtils.count(UserBIConstants.COLLECT_TOPIC_PAGE + "|" + UserBIConstants.COLLECT_TOPIC_SUBMIT_CLICK)
}
// 退出
collect_focus_out_btn.setOnClickListener {
ActionCountUtils.count(UserBIConstants.COLLECT_TOPIC_PAGE + "|" + UserBIConstants.COLLECT_TOPIC_INFO_EXIT_CLICK)
if (null == collectOutDialog) {
collectOutDialog =
YDLCommonDialog(this, object : YDLCommonDialog.OnYDLCommonDialogListener {
......@@ -162,10 +158,7 @@ class CollectFocusActivity : BaseActivity() {
item.isFocus = !item.isFocus
leftItem.setFocus(item.isFocus)
calculateSelectedNumber(item.isFocus)
ActionCountUtils.count(
UserBIConstants.COLLECT_TOPIC_PAGE + "|" + UserBIConstants.COLLECT_TOPIC_CLICK,
item.cateName
)
}
ll.addView(leftItem)
if (mList.lastIndex >= index + 1) {
......@@ -176,10 +169,7 @@ class CollectFocusActivity : BaseActivity() {
mList[index + 1].isFocus = !mList[index + 1].isFocus
rightItem.setFocus(mList[index + 1].isFocus)
calculateSelectedNumber(mList[index + 1].isFocus)
ActionCountUtils.count(
UserBIConstants.COLLECT_TOPIC_PAGE + "|" + UserBIConstants.COLLECT_TOPIC_CLICK,
mList[index + 1].cateName
)
}
ll.addView(rightItem)
}
......
m-user/src/main/java/com/yidianling/user/ui/collect/CollectSexAndBirthActivity.kt
......@@ -16,7 +16,6 @@ import com.ydl.ydlcommon.base.BaseActivity
import com.ydl.ydlcommon.data.http.RxUtils
import com.ydl.ydlcommon.router.IYDLRouterConstant
import com.ydl.ydlcommon.utils.StatusBarUtils
import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
import com.ydl.ydlcommon.view.dialog.YDLCommonDialog
import com.yidianling.common.tools.RxImageTool
import com.yidianling.common.tools.ToastUtil
......@@ -46,7 +45,6 @@ class CollectSexAndBirthActivity : BaseActivity() {
override fun initDataAndEvent() {
ActionCountUtils.count(UserBIConstants.COLLECT_USER_INFO_PAGE + "|" + UserBIConstants.COLLECT_USER_INFO_PAGE_VISIT)
sex_and_birth_upload_btn.setOnClickListener {
// 只需要选择了性别即可点击上传数据，因为年份默认就是有选择的
......@@ -61,40 +59,27 @@ class CollectSexAndBirthActivity : BaseActivity() {
if (selectedSex != 1) {
selectedSex = 1
checkUpSelect()
ActionCountUtils.count(
UserBIConstants.COLLECT_USER_INFO_PAGE + "|" + UserBIConstants.COLLECT_USER_INFO_SEX_MAN_CLICK,
"1"
)
} else {
selectedSex = -1
checkUpSelect()
ActionCountUtils.count(
UserBIConstants.COLLECT_USER_INFO_PAGE + "|" + UserBIConstants.COLLECT_USER_INFO_SEX_MAN_CLICK,
"2"
)
}
}
female_rl.setOnClickListener {
if (selectedSex != 2) {
selectedSex = 2
checkUpSelect()
ActionCountUtils.count(
UserBIConstants.COLLECT_USER_INFO_PAGE + "|" + UserBIConstants.COLLECT_USER_INFO_SEX_FEMALE_CLICK,
"1"
)
} else {
selectedSex = -1
checkUpSelect()
ActionCountUtils.count(
UserBIConstants.COLLECT_USER_INFO_PAGE + "|" + UserBIConstants.COLLECT_USER_INFO_SEX_FEMALE_CLICK,
"2"
)
}
}
sex_and_birth_out.setOnClickListener {
ActionCountUtils.count(UserBIConstants.COLLECT_USER_INFO_PAGE + "|" + UserBIConstants.COLLECT_USER_INFO_EXIT_CLICK)
if (null == collectOutDialog) {
collectOutDialog =
YDLCommonDialog(this, object : YDLCommonDialog.OnYDLCommonDialogListener {
......@@ -156,10 +141,6 @@ class CollectSexAndBirthActivity : BaseActivity() {
@SuppressLint("CheckResult")
private fun uploadSexAndBirth() {
ActionCountUtils.count(
UserBIConstants.COLLECT_USER_INFO_PAGE + "|" + UserBIConstants.COLLECT_USER_INFO_NEXT_CLICK,
"$selectedYear"
)
val userInfoBean = UserInfoCollectUploadParam()
userInfoBean.userInfoList = ArrayList()
userInfoBean.userInfoList.add(
......
m-user/src/main/java/com/yidianling/user/ui/login/H5Activity.java
......@@ -63,7 +63,7 @@ public class H5Activity extends BaseActivity {
//无网络 读取本地文件
web_view.loadUrl("file:///android_asset/html/yinsi.html");
}else {
web_view.loadUrl("https://m.ydl.com/Protol/yinsi");//加载url
web_view.loadUrl("https://m.ydl.com/help/393?id=393");//加载url
}
} else {
//用户协议0
......@@ -71,7 +71,7 @@ public class H5Activity extends BaseActivity {
//无网络 读取本地文件
web_view.loadUrl("file:///android_asset/html/sdkuserprotol.html");
}else {
web_view.loadUrl("https://h5.ydl.com/SDUserProtol");//加载url
web_view.loadUrl("https://m.ydl.com/help/394?id=394");//加载url
}
}
}
......
m-user/src/main/java/com/yidianling/user/ui/login/InputPassWordActivity.kt
......@@ -3,7 +3,6 @@ package com.yidianling.user.ui.login
import android.app.Activity
import android.content.Intent
import android.graphics.Color
import androidx.core.content.ContextCompat
import android.text.Editable
import android.text.TextUtils
import android.text.TextWatcher
......@@ -11,18 +10,15 @@ import android.text.method.HideReturnsTransformationMethod
import android.text.method.PasswordTransformationMethod
import android.view.View
import android.view.animation.AnimationUtils
import com.fm.openinstall.OpenInstall
import androidx.core.content.ContextCompat
import com.ydl.ydlcommon.base.BaseMvpActivity
import com.ydl.ydlcommon.utils.ActivityManager
import com.ydl.ydlcommon.utils.StatusBarUtils
import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
import com.ydl.ydlcommon.view.dialog.CommonDialog
import com.yidianling.common.tools.RxKeyboardTool
import com.yidianling.common.tools.ToastUtil
import com.yidianling.user.LoginUtils
import com.yidianling.user.R
import com.yidianling.user.StatusUtils
import com.yidianling.user.constants.UserBIConstants
import com.yidianling.user.ui.login.contract.IInputPassWordContract
import com.yidianling.user.ui.login.presenter.InputPassWordPresenterImpl
import kotlinx.android.synthetic.main.user_activity_input_password_new.*
......@@ -147,21 +143,6 @@ class InputPassWordActivity : BaseMvpActivity<IInputPassWordContract.View,IInput
* 注册流程成功之后，进行百度埋点
*/
override fun baiduActionBury() {
ActionCountUtils.baiduCount(
UserBIConstants.APP_REGISTER_PAGE,
UserBIConstants.POSITION_PHONE_REGISTER_CLICK,
25
)
if (OneKeyLoginHelp.openInstallKey.isNotEmpty() && StatusUtils.isUseOpenInstall) {
ActionCountUtils.baiduCount(
UserBIConstants.APP_REGISTER_PAGE,
UserBIConstants.POSITION_PHONE_REGISTER_CLICK,
25,
OneKeyLoginHelp.openInstallKey
)
// 用户注册成功后调用
OpenInstall.reportRegister();
}
}
......@@ -175,7 +156,7 @@ class InputPassWordActivity : BaseMvpActivity<IInputPassWordContract.View,IInput
login_password.isEnabled = true
login_password.background = ContextCompat.getDrawable(
this@InputPassWordActivity,
R.drawable.bg_one_click_login
R.drawable.bg_one_click_medical_login
)
}
} else {
......@@ -183,13 +164,13 @@ class InputPassWordActivity : BaseMvpActivity<IInputPassWordContract.View,IInput
login_password.isEnabled = true
login_password.background = ContextCompat.getDrawable(
this@InputPassWordActivity,
R.drawable.bg_one_click_login
R.drawable.bg_one_click_medical_login
)
} else {
login_password.isEnabled = false
login_password.background = ContextCompat.getDrawable(
this@InputPassWordActivity,
R.drawable.login_password_unable_bg_24dp
R.drawable.login_password_medical_unable_bg_24dp
)
}
......@@ -364,7 +345,7 @@ class InputPassWordActivity : BaseMvpActivity<IInputPassWordContract.View,IInput
login_password.isEnabled = false
login_password.background = ContextCompat.getDrawable(
this@InputPassWordActivity,
R.drawable.login_password_unable_bg_24dp
R.drawable.login_password_medical_unable_bg_24dp
)
}
......
m-user/src/main/java/com/yidianling/user/ui/login/OneKeyLoginHelp.kt
package com.yidianling.user.ui.login
import android.Manifest
import android.annotation.SuppressLint
import android.app.Activity
import android.content.Context
......@@ -19,13 +18,11 @@ import com.fm.openinstall.model.AppData
import com.meituan.android.walle.WalleChannelReader
import com.mobile.auth.gatewayauth.*
import com.mobile.auth.gatewayauth.model.TokenRet
import com.tbruyelle.rxpermissions2.RxPermissions
import com.ydl.ydlcommon.base.BaseActivity
import com.ydl.ydlcommon.base.BaseApp
import com.ydl.ydlcommon.utils.JPushUtils
import com.ydl.ydlcommon.utils.LogUtil
import com.ydl.ydlcommon.utils.YDLCacheUtils
import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
import com.ydl.ydlcommon.utils.log.AliYunLogConfig
import com.ydl.ydlcommon.utils.log.AliYunRichLogsHelper
import com.ydl.ydlcommon.utils.log.LogHelper
......@@ -37,7 +34,6 @@ import com.yidianling.user.LoginUtils
import com.yidianling.user.StatusUtils
import com.yidianling.user.UserHelper
import com.yidianling.user.api.bean.UserResponseBean
import com.yidianling.user.constants.UserBIConstants
import com.yidianling.user.http.LoginApiRequestUtil
import com.yidianling.user.http.request.PhoneLoginAutoParam
import io.reactivex.android.schedulers.AndroidSchedulers
......@@ -93,10 +89,7 @@ object OneKeyLoginHelp {
// 控件点击事件
it.setUIClickListener { code, context, json ->
if (code == "700002") { // 表示一键登录按钮点击事件
ActionCountUtils.countUid(
UserBIConstants.PART_ID_LOGIN_MAIN,
UserBIConstants.ACTION_TYPE_ONE_KEY_CLICK
)
}
}
}
......@@ -138,11 +131,8 @@ object OneKeyLoginHelp {
*
*/
private fun toLoginActivity() {
if (mOpenPageIsSuccess) {
RegisterAndLoginActivity.start(mActivity, isFromOneKey = true, isFromGuide = false)
} else {
RegisterAndLoginActivity.start(mActivity, false, mIsFromGuide)
}
RegisterAndLoginActivity.start(mActivity, false, mIsFromGuide)
}
/**
......@@ -151,16 +141,8 @@ object OneKeyLoginHelp {
*/
@Deprecated("mActivity有销毁的可能")
fun toLoginActivity(isOpenDialog: Boolean) {
if (mIsOpenOneKeyLogin) {
getLoginToken(isOpenDialog)
} else {
// 一键登录页面打开成功
if (mOpenPageIsSuccess) {
RegisterAndLoginActivity.start(mActivity)
} else {
RegisterAndLoginActivity.start(mActivity, isFromOneKey = false, isFromGuide = true)
}
}
RegisterAndLoginActivity.start(mActivity, isFromOneKey = false, isFromGuide = true)
}
/**
......@@ -444,25 +426,13 @@ object OneKeyLoginHelp {
if (it.data.firstLogin == 1) {//第一次登录：是注册
StatusUtils.isFirstLogin = true
// 埋点
ActionCountUtils.baiduCount(
it.data.uid,
UserBIConstants.APP_REGISTER_PAGE,
UserBIConstants.POSITION_ALIYUN_REGISTER_CLICK,
"",
"",
25,
openInstallKey
)
if (OneKeyLoginHelp.openInstallKey.isNotEmpty() && StatusUtils.isUseOpenInstall) {
// 用户注册成功后调用
OpenInstall.reportRegister()
}
} else {
ActionCountUtils.countUid(
UserBIConstants.POSITION_LOGIN_SUCCESS_CLICK,
it.data.uid!!,
UserBIConstants.ACTION_TYPE_ONE_KEY_CLICK
)
}
mPhoneNumberAuthHelper?.let { helper ->
helper.hideLoginLoading()
......@@ -583,13 +553,9 @@ object OneKeyLoginHelp {
* */
fun startLoginByStatus(context: Context, isOpenDialog: Boolean): Boolean {
if (!UserHelper.isLogin()) {
if (this::mActivity.isInitialized) {
//如果mActivity有初始化，代表项目使用了一键登录
startLogin(context as Activity, isOpenDialog)
} else {
//如果mActivity未初始化，使用正常登录
RegisterAndLoginActivity.start(context)
}
//如果mActivity未初始化，使用正常登录
RegisterAndLoginActivity.start(context)
}
return UserHelper.isLogin()
}
......@@ -599,29 +565,12 @@ object OneKeyLoginHelp {
* */
@SuppressLint("CheckResult")
fun startLogin(context: Activity, isOpenDialog: Boolean) {
try {
RxPermissions(context)
.request(Manifest.permission.READ_PHONE_STATE)
.subscribe { hasPermission: Boolean? ->
if (hasPermission == true && mIsOpenOneKeyLogin) {
getLoginToken(isOpenDialog)
} else {
// 一键登录页面打开成功
if (mOpenPageIsSuccess) {
RegisterAndLoginActivity.start(context)
} else {
RegisterAndLoginActivity.start(
context,
isFromOneKey = false,
isFromGuide = true
)
}
}
}
} catch (e: Exception) {
RegisterAndLoginActivity.start(context)
e.printStackTrace()
}
RegisterAndLoginActivity.start(
context,
isFromOneKey = false,
isFromGuide = true
)
}
}
m-user/src/main/java/com/yidianling/user/ui/login/VerificationCodeActivity.kt
......@@ -6,25 +6,21 @@ import android.content.Context
import android.content.Intent
import android.net.Uri
import android.os.Build
import androidx.core.content.ContextCompat
import android.text.TextUtils
import android.view.View
import android.view.animation.AnimationUtils
import android.view.inputmethod.InputMethodManager
import android.widget.EditText
import com.fm.openinstall.OpenInstall
import androidx.core.content.ContextCompat
import com.ydl.ydlcommon.base.BaseMvpActivity
import com.ydl.ydlcommon.utils.ActivityManager
import com.ydl.ydlcommon.utils.StatusBarUtils
import com.ydl.ydlcommon.utils.YDLCacheUtils
import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
import com.yidianling.common.tools.RxKeyboardTool
import com.yidianling.common.tools.ToastUtil
import com.yidianling.user.LoginUtils
import com.yidianling.user.R
import com.yidianling.user.StatusUtils
import com.yidianling.user.UserHelper
import com.yidianling.user.constants.UserBIConstants
import com.yidianling.user.http.request.BindPhoneJavaParam
import com.yidianling.user.ui.login.contract.IVerificationCodeContract
import com.yidianling.user.ui.login.presenter.VerificationCodePresenterImpl
......@@ -271,22 +267,7 @@ class VerificationCodeActivity :
override fun baiduActionBury() {
if (StatusUtils.isUseOpenInstall) {
ActionCountUtils.baiduCount(
UserBIConstants.APP_REGISTER_PAGE,
UserBIConstants.POSITION_CODE_REGISTER_CLICK,
25,
OneKeyLoginHelp.openInstallKey
)
// 用户注册成功后调用
OpenInstall.reportRegister();
} else {
ActionCountUtils.baiduCount(
UserBIConstants.APP_REGISTER_PAGE,
UserBIConstants.POSITION_CODE_REGISTER_CLICK,
25
)
}
}
override fun verificationErrorCode() {
......@@ -396,13 +377,7 @@ class VerificationCodeActivity :
*菊花框
*/
override fun showLoading(state: Boolean) {
/*if (state) {
ver_iv_next.visibility = View.GONE
pb_load.visibility = View.VISIBLE
} else {
ver_iv_next.visibility = View.VISIBLE
pb_load.visibility = View.GONE
}*/
if (state){
showProgressDialog()
}else{
......@@ -421,10 +396,6 @@ class VerificationCodeActivity :
* 动画
*/
override fun startAnim() {
// val shake = AnimationUtils.loadAnimation(this, R.anim.user_shake_input)//加载动画资源文件 
// pc_1.startAnimation(shake)
//设置红色边框
// verify_code.setErrorColor()
}
private fun closeAnim(hasAnim: Boolean) {
......
m-user/src/main/java/com/yidianling/user/ui/login/contract/ILoginContract.kt
package com.yidianling.user.ui.login.contract
import android.app.Activity
import com.mobile.auth.gatewayauth.model.VendorConfig
import com.umeng.socialize.bean.SHARE_MEDIA
import com.ydl.ydlcommon.data.http.BaseResponse
import com.ydl.ydlcommon.mvp.base.IModel
import com.ydl.ydlcommon.mvp.base.IPresenter
import com.ydl.ydlcommon.mvp.base.IView
import com.yidianling.user.api.bean.UserResponseBean
import com.yidianling.user.http.request.BindPhoneJavaParam
import com.yidianling.user.http.request.CheckAliAuthParam
import com.yidianling.user.http.request.PhoneLoginAutoParam
import com.yidianling.user.http.request.ThirdLoginParam
import com.yidianling.user.http.response.ChcekPhoneResponeBean
import com.yidianling.user.http.response.PhoneAuthResponseBean
import io.reactivex.Observable
/**
......@@ -41,35 +33,19 @@ interface ILoginContract {
*/
fun dismissProgressView()
/**
* 三方登录成功
*/
fun thirdLoginSuccess(userInfo: UserResponseBean.UserInfo,thirdLoginPlatform:String)
/**
* 弹窗
*/
fun showNormalDialog()
/**
* 已经绑定过弹窗
*/
fun showHasBindedDialog()
/**
* 校验手机号(是否是用户版号码、是否有设置密码、是否被绑定)成功
*/
fun checkPhoneStatusSuccess(bean: ChcekPhoneResponeBean?, phone: String)
/**
* 服务端阿里认证失败
*/
fun aliAuthFailed()
/**
* 手机号绑定成功
*/
fun bindSuccess()
/**
* sdk
......@@ -77,66 +53,24 @@ interface ILoginContract {
*/
fun autoLoginSuccess()
/**
* 三方登录成功后如果判断是第一次登录，则未注册，进行百度埋点
*/
fun baiduActionBury(uid: String? = "", type: String)
}
interface Presenter : IPresenter< View> {
/**
* 三方登录
*/
fun loginByThird(activity: Activity, media: SHARE_MEDIA)
/**
* 服务端校验阿里一键认证
*/
fun checkAliAuth(param: CheckAliAuthParam)
/**
* 校验手机号：是否是用户版号码、是否有设置密码、是否被绑定
*/
fun checkPhoneStatus(phone: String, countryCode: String, isBind: Boolean)
/**
* 通过一键认证服务登陆
*/
fun autoLogin(bean: PhoneLoginAutoParam)
/**
*
绑定手机号
*/
fun bindPhone(param: BindPhoneJavaParam)
}
interface Model : IModel {
/**
* 三方登录
*/
fun loginByThird(activity: Activity, media: SHARE_MEDIA): Observable<ThirdLoginParam>
/**
* 校验手机号：是否是用户版号码、是否有设置密码、是否被绑定
*/
fun checkPhoneStatus(phone: String, countryCode: String): Observable<BaseResponse<ChcekPhoneResponeBean>>
/**
* 服务端校验阿里一键认证
*/
fun checkAliAuth(param: CheckAliAuthParam): Observable<BaseResponse<PhoneAuthResponseBean>>
/**
* 通过一键认证服务登陆
*/
fun autoLogin(bean: PhoneLoginAutoParam): Observable<BaseResponse<UserResponseBean>>
/**
*
绑定手机号
*/
fun bindPhone(param: BindPhoneJavaParam): Observable<BaseResponse<Any>>
}
}
m-user/src/main/java/com/yidianling/user/ui/login/model/LoginModelImpl.kt
......@@ -23,27 +23,7 @@ import io.reactivex.Observable
* @date 2018/11/29
*/
class LoginModelImpl : ILoginContract.Model {
/**
*
绑定手机号
*/
override fun bindPhone(param: BindPhoneJavaParam): Observable<BaseResponse<Any>> {
return LoginApiRequestUtil.bindPhone(param)
}
/**
* 通过一键认证服务登陆
*/
override fun autoLogin(bean: PhoneLoginAutoParam): Observable<BaseResponse<UserResponseBean>> {
return LoginApiRequestUtil.autoLogin(bean)
}
/**
* 服务端校验阿里一键认证
*/
override fun checkAliAuth(param: CheckAliAuthParam): Observable<BaseResponse<PhoneAuthResponseBean>> {
return LoginApiRequestUtil.checkAliAuth(param)
}
/**
* 校验手机号：是否是用户版号码、是否有设置密码、是否被绑定
......@@ -52,11 +32,4 @@ class LoginModelImpl : ILoginContract.Model {
return LoginApiRequestUtil.checkPhoneStatus(phone, countryCode)
}
/**
* 三方登录
*/
override fun loginByThird(activity: Activity, media: SHARE_MEDIA): Observable<ThirdLoginParam> {
return LoginObservable(activity, media)
}
}
\ No newline at end of file
m-user/src/main/java/com/yidianling/user/ui/login/presenter/InputPassWordPresenterImpl.kt
......@@ -6,7 +6,6 @@ import com.ydl.ydlcommon.mvp.base.BasePresenter
import com.ydl.ydlcommon.router.YdlCommonOut
import com.ydl.ydlcommon.utils.StringUtils
import com.ydl.ydlcommon.utils.YDLCacheUtils
import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
import com.ydl.ydlcommon.utils.log.AliYunLogConfig
import com.ydl.ydlcommon.utils.log.AliYunRichLogsHelper
import com.ydl.ydlcommon.utils.log.LogHelper
......@@ -14,7 +13,6 @@ import com.yidianling.common.tools.ToastUtil
import com.yidianling.user.LoginUtils
import com.yidianling.user.StatusUtils
import com.yidianling.user.api.bean.UserResponseBean
import com.yidianling.user.constants.UserBIConstants
import com.yidianling.user.http.request.PhoneLoginPwdParam
import com.yidianling.user.http.request.PhoneResetPwdParam
import com.yidianling.user.ui.login.contract.IInputPassWordContract
......@@ -41,6 +39,7 @@ class InputPassWordPresenterImpl :
/**
* 重新设置密码
*/
@SuppressLint("CheckResult")
override fun resetPwd(
newPassword: String,
phone: String,
......@@ -48,11 +47,6 @@ class InputPassWordPresenterImpl :
phoneCountryCode: String
) {
ActionCountUtils.count(
UserBIConstants.POSITION_LOGIN_CLICK,
UserBIConstants.ACTION_TYPE_RESET_PWD
)
var param =
PhoneResetPwdParam(StringUtils.md5(newPassword), phoneCountryCode, msgCode, phone)
mModel.resetPwd(param)
......@@ -69,11 +63,7 @@ class InputPassWordPresenterImpl :
} else {
ToastUtil.toastShort("修改密码成功")
saveUserData(it.data)
ActionCountUtils.countUid(
UserBIConstants.POSITION_LOGIN_SUCCESS_CLICK,
it.data.uid!!,
UserBIConstants.ACTION_TYPE_RESET_PWD
)
if (it.data.firstLogin == 1) {//第一次登录：是注册
StatusUtils.isFirstLogin = true
// 重设密码登录已经不可能是首次登录，所以不进行百度埋点
......@@ -98,10 +88,6 @@ class InputPassWordPresenterImpl :
phone: String,
phoneCountryCode: String
) {
ActionCountUtils.count(
UserBIConstants.POSITION_LOGIN_CLICK,
UserBIConstants.ACTION_TYPE_PWD_LOGIN
)
var param = PhoneLoginPwdParam(StringUtils.md5(inputPassword), phoneCountryCode, phone)
mModel.userLoginByPassword(param)
......@@ -123,12 +109,6 @@ class InputPassWordPresenterImpl :
if (it.data.firstLogin == 1) {//第一次登录：是注册
StatusUtils.isFirstLogin = true
mView.baiduActionBury()
} else {
ActionCountUtils.countUid(
UserBIConstants.POSITION_LOGIN_SUCCESS_CLICK,
it.data.uid!!,
UserBIConstants.ACTION_TYPE_PWD_LOGIN
)
}
mView.closeActivity()
}
......
m-user/src/main/java/com/yidianling/user/ui/login/presenter/VerificationCodePresenterImpl.kt
......@@ -5,7 +5,6 @@ import android.text.TextUtils
import com.ydl.ydlcommon.modular.ModularServiceManager
import com.ydl.ydlcommon.mvp.base.BasePresenter
import com.ydl.ydlcommon.utils.YDLCacheUtils
import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
import com.ydl.ydlcommon.utils.log.LogHelper
import com.yidianling.common.tools.ToastUtil
import com.yidianling.user.LoginUtils
......@@ -163,7 +162,6 @@ class VerificationCodePresenterImpl(view: IVerificationCodeContract.View) : Base
*/
@SuppressLint("CheckResult")
override fun loginByMsgCode(phone: String, phoneCountryCode: String, msgCode: String) {
ActionCountUtils.count(UserBIConstants.POSITION_LOGIN_CLICK,UserBIConstants.ACTION_TYPE_CODE_LOGIN)
var param = PhoneLoginCodeParam(msgCode, phoneCountryCode, phone)
mModel.loginByMsgCode(param)
.subscribeOn(Schedulers.io())
......@@ -183,7 +181,6 @@ class VerificationCodePresenterImpl(view: IVerificationCodeContract.View) : Base
StatusUtils.isFirstLogin = true
mView.baiduActionBury()
} else {
ActionCountUtils.countUid(UserBIConstants.POSITION_LOGIN_SUCCESS_CLICK,it.data.uid!!,UserBIConstants.ACTION_TYPE_CODE_LOGIN)
}
mView.closeActivity()
} else {
......
m-user/src/main/res/layout/user_activity_input_password_new.xml
......@@ -103,7 +103,7 @@
android:layout_marginStart="@dimen/platform_dp_28"
android:layout_marginTop="@dimen/platform_dp_25"
android:layout_marginEnd="@dimen/platform_dp_28"
android:background="@drawable/login_password_unable_bg_24dp"
android:background="@drawable/login_password_medical_unable_bg_24dp"
android:enabled="false"
android:gravity="center"
android:paddingTop="@dimen/platform_dp_14"
......
m-user/src/main/res/layout/user_activity_register_and_login_medical.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white">
<ImageView
android:id="@+id/img_reg_back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/platform_dp_16"
android:layout_marginTop="54dp"
android:src="@drawable/user_ic_back_black"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<LinearLayout
android:id="@+id/ll_success"
android:layout_width="match_parent"
android:layout_height="64dp"
android:background="#fff"
android:gravity="center"
android:orientation="vertical"
android:visibility="gone"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp">
<ImageView
android:layout_width="16dp"
android:layout_height="16dp"
android:src="@drawable/user_ic_log_succee" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="6dp"
android:text="登录成功!"
android:textColor="#32D296"
android:textSize="13dp"
android:textStyle="bold" />
</LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="35dp"
android:text="您已通过阿里云号码认证服务，一键登录更安全。"
android:textColor="#666666"
android:textSize="13dp" />
</LinearLayout>
<TextView
android:id="@+id/tv_login_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/platform_dp_40"
android:text="手机号登录/注册"
android:textColor="@color/pay_color_242424"
android:textSize="22sp"
app:layout_constraintLeft_toRightOf="@id/img_reg_back"
app:layout_constraintTop_toBottomOf="@id/img_reg_back" />
<TextView
android:id="@+id/bind_phone_hint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/platform_dp_5"
android:text="请输入您的常用手机号"
android:textColor="@color/platform_color_242424"
android:textSize="13sp"
android:visibility="gone"
app:layout_constraintStart_toStartOf="@id/tv_login_title"
app:layout_constraintTop_toBottomOf="@id/tv_login_title"></TextView>
<TextView
android:id="@+id/skip_bind"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/platform_dp_16"
android:text="跳过"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/img_reg_back"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/img_reg_back"></TextView>
<TextView
android:id="@+id/country_code"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="90dp"
android:drawableRight="@drawable/user_triangle_down"
android:drawablePadding="@dimen/platform_dp_4"
android:text="+86"
android:textColor="@color/pay_color_666666"
android:textSize="17sp"
app:layout_constraintStart_toStartOf="@id/tv_login_title"
app:layout_constraintTop_toBottomOf="@id/tv_login_title" />
<com.ydl.ydlcommon.view.PhoneEditText
android:id="@+id/et_phone_number"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginLeft="@dimen/platform_dp_16"
android:layout_weight="1"
android:background="@null"
android:gravity="center_vertical|left"
android:hint="输入手机号"
android:inputType="number"
android:lines="1"
android:maxLength="13"
android:textColor="@color/platform_color_242424"
android:textColorHint="@color/platform_color_EBEBEB"
android:textCursorDrawable="@null"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="@id/country_code"
app:layout_constraintEnd_toStartOf="@id/iv_del"
app:layout_constraintStart_toEndOf="@id/country_code"
app:layout_constraintTop_toTopOf="@id/country_code" />
<View
android:id="@+id/view_lin"
android:layout_width="0dp"
android:layout_height="1dp"
android:layout_marginStart="@dimen/platform_dp_40"
android:layout_marginTop="@dimen/platform_dp_10"
android:layout_marginEnd="@dimen/platform_dp_40"
android:background="@color/platform_color_EBEBEB"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/country_code" />
<ImageView
android:id="@+id/iv_del"
android:layout_width="23dp"
android:layout_height="23dp"
android:layout_gravity="center_vertical"
android:paddingLeft="@dimen/platform_dp_5"
android:paddingTop="@dimen/platform_dp_5"
android:paddingBottom="@dimen/platform_dp_5"
android:src="@drawable/user_ic_del_new"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/et_phone_number"
app:layout_constraintEnd_toEndOf="@id/view_lin"
app:layout_constraintTop_toTopOf="@id/et_phone_number"
/>
<TextView
android:id="@+id/ll_next"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/platform_dp_28"
android:layout_marginTop="@dimen/platform_dp_25"
android:layout_marginEnd="@dimen/platform_dp_28"
android:background="@drawable/login_password_medical_unable_bg_24dp"
android:gravity="center"
android:paddingTop="@dimen/platform_dp_13"
android:paddingBottom="@dimen/platform_dp_13"
android:text="下一步"
android:textColor="@color/white"
android:textSize="17sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/view_lin" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="50dp"
android:gravity="center"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
<ImageView
android:id="@+id/iv_select_protocol"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/user_login_protocol_unselected_new" />
<TextView
android:id="@+id/tv_protocol"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/platform_dp_4"
android:includeFontPadding="false"
android:text="同意壹点灵用户注册协议"
android:textColor="@color/platform_color_BFBFBF"
android:textSize="12sp" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
ydl-platform/build.gradle
......@@ -96,12 +96,7 @@ dependencies {
api rootProject.ext.dependencies["ydl-net"]
api rootProject.ext.dependencies["ydl-js"]
api rootProject.ext.dependencies["ptr-lib-release"]
api(rootProject.ext.dependencies["ydl-device"]) {
transitive = true
exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib'
exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk7'
exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-common'
}
api(rootProject.ext.dependencies["ydl-router"]) {
transitive = true
}
......
ydl-platform/src/main/java/com/ydl/ydlcommon/app/YdlRepository.kt
......@@ -2,13 +2,9 @@ package com.ydl.ydlcommon.app
import android.annotation.SuppressLint
import android.app.Application
import android.os.Build
import com.alibaba.android.arouter.launcher.ARouter
import com.bun.miitmdid.core.JLibrary
import com.ydl.devicesidlib.DeviceIDHelper
import com.ydl.ydlcommon.base.BaseApp
import com.ydl.ydlcommon.data.http.UpLoadLogUtils
import com.ydl.ydlcommon.utils.AppProgressUtils
import com.ydl.ydlcommon.utils.BuryPointUtils
import com.ydl.ydlcommon.utils.LogUtil
import com.ydl.ydlcommon.utils.log.LogHelper
......@@ -28,9 +24,9 @@ object YdlRepository {
// 需要在主 module 的 application 的 onCreate 方法中调用此方法
fun initApp(app: Application,isDebug:Boolean) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
JLibrary.InitEntry(app)
}
// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
// JLibrary.InitEntry(app)
// }
LogHelper.getInstance().deleteExpireLogSync()
LogUtil.debug = BaseApp.instance.getGlobalConfig().appDebug
com.yidianling.common.tools.LogUtil.debug = BaseApp.instance.getGlobalConfig().appDebug
......
ydl-platform/src/main/java/com/ydl/ydlcommon/base/config/HttpConfig.kt
......@@ -16,7 +16,6 @@ import com.ydl.ydlcommon.data.http.RxUtils
import com.ydl.ydlcommon.data.http.api.ApiRequestUtil
import com.ydl.ydlcommon.modular.ModularServiceManager
import com.ydl.ydlcommon.utils.YDLCacheUtils
import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
import com.ydl.ydlcommon.utils.log.AliYunLogConfig
import com.ydl.ydlcommon.utils.log.AliYunRichLogsHelper
import com.ydl.ydlnet.builder.config.OkHttpConfig
......@@ -202,7 +201,7 @@ class HttpConfig {
}
val message = originalResponse.message()
val api = request.url().encodedPath()
ActionCountUtils.baiDuCount("ydl_user_error_business","error_log",api,params,message)
// ActionCountUtils.baiDuCount("ydl_user_error_business","error_log",api,params,message)
//阿里云忽略埋点接口
if (!api.contains("maidian/writeMaiDianData")){
AliYunRichLogsHelper.getInstance().sendRichLog(AliYunLogConfig.API, "error_log---api:$api---params:$params ---- message:$message")
......
ydl-platform/src/main/java/com/ydl/ydlcommon/utils/YdlBuryPointUtil.java
/*
package com.ydl.ydlcommon.utils;
import android.content.Context;
......@@ -5,8 +6,6 @@ import android.util.Log;
import com.umeng.analytics.MobclickAgent;
import com.ydl.burypointlib.BuryPointHelper;
//import com.ydl.devicesidlib.DemoHelper;
import com.ydl.devicesidlib.DeviceIDHelper;
import com.ydl.pushserver.pushagent.YdlPushAgent;
import com.ydl.pushserver.pushagent.common.listener.IYDLPushListener;
import com.ydl.pushserver.pushagent.network.pack.RegisterEventBean;
......@@ -123,3 +122,4 @@ public class YdlBuryPointUtil {
YdlPushAgent.sendClickEvent(eventId,strings);
}
}
*/
ydl-platform/src/main/java/com/ydl/ydlcommon/utils/actionutil/ActionCountUtils.kt
/*
package com.ydl.ydlcommon.utils.actionutil
import android.annotation.SuppressLint
......@@ -32,10 +33,12 @@ import java.net.SocketException
import java.util.*
*/
/**
* 行为数据埋点工具类
* Created by xj on 2019/6/22.
*/
*//*
class ActionCountUtils {
companion object {
......@@ -44,22 +47,26 @@ class ActionCountUtils {
var appName: String = ""
var packageName: String = ""
/**
*/
/**
* appId:消息端来源 - ydl:ydl-app-android-user、xlzx:ydl-app-android-xlzx
* appName:应用名称 - "心理咨询" else "壹点灵心理咨询"
*/
*//*
fun init(id: String, name: String) {
packageName = BaseApp.instance.packageName
appId = id
appName = name
}
/**
*/
/**
* BI埋点封装方法
* 传入埋点事件名称 格式：xxx|xxx
*
* 除非特殊说明 url 和 api 默认传空
*/
*//*
fun count(eventName: String, vararg sign1: String) {
count(eventName, *sign1, urlStr = "", apiStr = "")
}
......@@ -92,9 +99,11 @@ class ActionCountUtils {
count(userId, partId, position, url = urlStr, api = apiStr, signs = *sign1)
}
/**
*/
/**
* 行为数据埋点调用的方法
*/
*//*
fun count(
uid: String?,
partId: String,
......@@ -106,10 +115,12 @@ class ActionCountUtils {
count(uid, partId, position, url, api, signs = *arrayOf(sign1))
}
/*
*/
/*
*
* 测试用埋点，现在服务端统一用百度埋点
* */
* *//*
fun count(
uid: String?,
partId: String,
......@@ -140,12 +151,14 @@ class ActionCountUtils {
actionDataParams.osVersion(Build.VERSION.RELEASE)
actionDataParams.wifi(if (isWifi()) 0 else 1)
var deviceId = ""
/*
*/
/*
* 因为DeviceIDHelper.getInstance().deviceId对于imei
* 序列号对于小米手机Utils.getIMEI(context)
* 第一次安装获取失败，第二次打开就能成功
* 所以Utils.getIMEI(topTaskActivity)传入activity解决这个问题
* */
* *//*
deviceId = if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.P) {
val topTaskActivity = ActivityManager.getInstance().getTopTaskActivity()
//获取imei
......@@ -190,25 +203,31 @@ class ActionCountUtils {
}
}
/**
*/
/**
* 百度检测数据埋点调用的方法
*/
*//*
fun baiduCount(partId: String, position: String, convertType: Int) {
val userId = ModularServiceManager.getPlatformUserService()?.getUser()?.userId ?: ""
baiduCount(userId, partId, position, "", "", convertType, "")
}
/**
*/
/**
* 百度检测数据埋点调用的方法
*/
*//*
fun baiduCount(partId: String, position: String, convertType: Int, openInstallKey: String) {
val userId = ModularServiceManager.getPlatformUserService()?.getUser()?.userId ?: ""
baiduCount(userId, partId, position, "", "", convertType, openInstallKey)
}
/**
*/
/**
* 百度检测数据埋点调用的方法
*/
*//*
fun baiduCount(
uid: String?,
partId: String,
......@@ -221,9 +240,11 @@ class ActionCountUtils {
baiduCount(userId, partId, position, url, api, convertType, "")
}
/**
*/
/**
* @param openInstallKey openInstall统计渠道的key和Value值
* */
* *//*
fun baiduCount(
uid: String?,
partId: String,
......@@ -255,12 +276,14 @@ class ActionCountUtils {
baiduActionDataParams.pkname = packageName
baiduActionDataParams.deviceType = 2
var deviceId = ""
/*
*/
/*
* 因为DeviceIDHelper.getInstance().deviceId对于imei
* 序列号对于小米手机Utils.getIMEI(context)
* 第一次安装获取失败，第二次打开就能成功
* 所以Utils.getIMEI(topTaskActivity)传入activity解决这个问题
* */
* *//*
deviceId = if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.P) {
val topTaskActivity = ActivityManager.getInstance().getTopTaskActivity()
//获取imei
......@@ -316,13 +339,15 @@ class ActionCountUtils {
}
}
/**
*/
/**
* 接口返回错误埋点调用该方法
* @param partId pardId-ydl_user_error_business
* @param position error_log
* @param sign1 访问接口对应的参数
* @param sign2 接口返回的错误信息
*/
*//*
fun baiDuCount(
partId: String,
position: String,
......@@ -359,9 +384,11 @@ class ActionCountUtils {
request(actionDataParams.build())
}
/**
*/
/**
* 传入ActionDataParams参数，访问接口
*/
*//*
@SuppressLint("CheckResult")
fun request(actionDataBean: ActionDataBean) {
try {
......@@ -378,10 +405,12 @@ class ActionCountUtils {
}
}
/**
*/
/**
* 获取当前ipv4地址
* @return
*/
*//*
fun getIpAddress(context: Context): String {
// 获取WiFi服务
val wifiManager = context.getSystemService(Context.WIFI_SERVICE) as WifiManager
......@@ -444,9 +473,11 @@ class ActionCountUtils {
return "null"
}
/**
*/
/**
* 判断是否是wifi
*/
*//*
private fun isWifi(): Boolean {
try {
var connectivityManager: ConnectivityManager =
......@@ -463,4 +494,4 @@ class ActionCountUtils {
}
}
}
\ No newline at end of file
}*/
ydl-platform/src/main/res/raw/api.properties
......@@ -46,10 +46,10 @@ javaurl.auto_test = https://auto_testapi.ydl.com/
javaurl.prod = https://api.ydl.com/
#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/
javaapi.new_test = https://ydltestapi.ydl.com/
javaapi.test = https://testapi.ydl.com/
javaapi.auto_test = https://auto_testapi.ydl.com/
javaapi.prod = https://api.ydl.com/
# 网关加密的appKey和appSecret
appKey.new_test = 20BB42485BD448DE888DD745899C457D
......
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