Skip to content

Y
YDL-Component-Medical
Commit 58361b9f by konghaorui
Options

修改路由调用方式，发布版本

parent 6018d79e
Showing with 99 additions and 165 deletions
app/build.gradle
......@@ -168,7 +168,7 @@ dependencies {
// }
api project(':m-user')
implementation project(':ydl-platform')
// implementation project(':ydl-webview')
implementation project(':ydl-webview')
implementation rootProject.ext.dependencies["retrofit-url-manager"]
kapt 'com.alibaba:arouter-compiler:1.2.2'
}
......
m-consultant/build.gradle
......@@ -63,8 +63,8 @@ dependencies {
// api project(":ydl-platform")
compileOnly 'com.ydl:m-user-api:0.0.4'
api 'com.ydl:ydl-webview:0.0.5@aar'
api('com.ydl:ydl-platform:0.0.7@aar') {
api 'com.ydl:ydl-webview:0.0.7@aar'
api('com.ydl:ydl-platform:0.0.8@aar') {
transitive = true
}
}
m-consultant/modular.gradle
......@@ -8,7 +8,7 @@ modular {
groupId = "com.ydl"
artifactId = "m-consultant-module-xlzx"
// 上报的业务模块 aar 包的版本号
version = "0.0.1"
version = "0.0.3"
}
ydl{
......@@ -16,7 +16,7 @@ modular {
groupId = "com.ydl"
artifactId = "m-consultant-module-ydl"
// 上报的业务模块 aar 包的版本号
version = "0.0.1"
version = "0.0.3"
}
}
......
m-consultant/src/main/java/com/ydl/other/MainActivity.java deleted 100644 → 0
package com.ydl.other;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.alibaba.android.arouter.launcher.ARouter;
//import com.yidianling.user.UserService;
/**
* Created by haorui on 2019-09-01 .
* Des:
*/
@Route(path = "/other/MainActivity")
public class MainActivity extends AppCompatActivity {
// @Autowired//(name = "/user/UserService")
// UserService mUserService;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
ARouter.getInstance().inject(this);
// setContentView(R.layout.other_activity_main);
//mUserService=ARouter.getInstance().navigation(UserService.class);
// findViewById(R.id.btHello).setOnClickListener(new View.OnClickListener() {
// @Override
// public void onClick(View v) {
// Toast.makeText(MainActivity.this, "Hello：" + mUserService.getUser().getName(), Toast.LENGTH_SHORT).show();
// }
// });
}
}
m-consultant/src/main/java/com/ydl/other/Other.api deleted 100644 → 0
package com.ydl.other;
/**
* Created by haorui on 2019-09-01 .
* Des:
*/
public class Other {
String name;
int id;
}
m-consultant/src/main/java/com/yidianling/consultant/HotSearchActivity.kt
......@@ -32,7 +32,7 @@ import com.yidianling.consultant.bean.HotSearchPopularDoctorBean
import com.yidianling.consultant.contract.IHotSearchContract
import com.yidianling.consultant.presenter.HotSearchPresenterImpl
import kotlinx.android.synthetic.main.activity_hot_search.*
import kotlinx.android.synthetic.main.item_hot_search.view.*
import kotlinx.android.synthetic.main.item_expert_hot_search.view.*
@Route(path = "/consult/hot_search")
class HotSearchActivity : BaseMvpActivity<IHotSearchContract.View,IHotSearchContract.Presenter>(), IHotSearchContract.View {
......@@ -155,7 +155,7 @@ class HotSearchActivity : BaseMvpActivity<IHotSearchContract.View,IHotSearchCont
llHotSearch.visibility = View.VISIBLE
flHotSearch.removeAllViews()
for (index in keywordData.indices) {
val view = LayoutInflater.from(this).inflate(R.layout.item_hot_search, flHotSearch, false)
val view = LayoutInflater.from(this).inflate(R.layout.item_expert_hot_search, flHotSearch, false)
view.tvHotSearch.text = keywordData[index].keyword
view.setOnClickListener {
etSearch.setText(keywordData[index].keyword)
......@@ -175,7 +175,7 @@ class HotSearchActivity : BaseMvpActivity<IHotSearchContract.View,IHotSearchCont
expertWidth = 0
flHotExpert.removeAllViews()
for (index in hotSearchExpert.indices) {
val view = LayoutInflater.from(this).inflate(R.layout.item_hot_search, flHotSearch, false)
val view = LayoutInflater.from(this).inflate(R.layout.item_expert_hot_search, flHotSearch, false)
view.tvHotSearch.text = hotSearchExpert[index].name
if (!TextUtils.isEmpty(hotSearchExpert[index].name)) {
expertWidth += getTextContentWidth(view.findViewById(R.id.tvHotSearch), if (hotSearchExpert[index].name!!.length > 7) hotSearchExpert[index].name!!.substring(0, 8) else hotSearchExpert[index].name!!) + dp42
......@@ -231,7 +231,7 @@ class HotSearchActivity : BaseMvpActivity<IHotSearchContract.View,IHotSearchCont
if (historyList.size > 0) {
for (historyStr in historyList.reversed()) {
val view = LayoutInflater.from(this).inflate(R.layout.item_hot_search, flHotSearch, false)
val view = LayoutInflater.from(this).inflate(R.layout.item_expert_hot_search, flHotSearch, false)
view.tvHotSearch.text = historyStr
historyCurrentWidth += getTextContentWidth(view.findViewById(R.id.tvHotSearch),
if (historyStr.length > 7) historyStr.substring(0, 8) else historyStr) + RxImageTool.dp2px(50f)
......
m-consultant/src/main/java/com/yidianling/consultant/adapter/ExpertSearchAdapter.kt
......@@ -14,8 +14,8 @@ import com.ydl.webview.NewH5Activity
import com.ydl.ydl_image.config.SimpleImageOpConfiger
import com.ydl.ydl_router.manager.YDLRouterManager
import com.ydl.ydlcommon.base.config.HttpConfig
import com.ydl.ydlcommon.modular.ModularServiceManager
import com.ydl.ydlcommon.router.IYDLRouterConstant
import com.ydl.ydlcommon.router.YdlCommonRouterManager
import com.ydl.ydlcommon.utils.BuryPointUtils
import com.ydl.ydlcommon.utils.URLUtils
import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
......@@ -27,7 +27,6 @@ import com.yidianling.consultant.R
import com.yidianling.consultant.constants.ConsultBIConstants
import com.yidianling.consultant.model.bean.DoctorServiceItem
import com.yidianling.consultant.router.ConsultantIn
import com.yidianling.user.api.service.IUserService
import kotlinx.android.synthetic.main.expert_search_feedbackrate.view.*
import kotlinx.android.synthetic.main.expert_search_item_view.view.*
import kotlinx.android.synthetic.main.expert_search_products_item.view.*
......@@ -330,7 +329,7 @@ class ExpertSearchAdapter(private val context: Context, private val expertSearch
itemView.tvChat.setOnClickListener {
if (adapterPosition != RecyclerView.NO_POSITION) {
//判断是否已登录
if(!ModularServiceManager.provide(IUserService::class.java).isLogin()){
if(!YdlCommonRouterManager.getYdlCommonRoute().isLogin()){
YDLRouterManager.router(IYDLRouterConstant.ROUTER_MINE_LOGIN)
return@setOnClickListener
}
......
m-consultant/src/main/res/layout/item_hot_search.xml → m-consultant/src/main/res/layout/item_expert_hot_search.xml
......@@ -6,7 +6,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginBottom="6dp"
android:background="@drawable/hot_search_bg"
android:background="@drawable/expert_hot_search_bg"
android:ellipsize="end"
android:gravity="center"
android:maxEms="9"
......
m-user/build.gradle
......@@ -70,8 +70,8 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-script-runtime:1.3.41"
compileOnly 'com.ydl:m-user-api:0.0.4'
api'com.ydl:router:1.0.0-SNAPSHOT@aar'
api 'com.ydl:ydl-webview:0.0.5@aar'
api('com.ydl:ydl-platform:0.0.7@aar') {
api 'com.ydl:ydl-webview:0.0.7@aar'
api('com.ydl:ydl-platform:0.0.8@aar') {
transitive = true
}
// api project(':ydl-webview')
......
m-user/modular.gradle
......@@ -8,7 +8,7 @@ modular {
groupId = "com.ydl"
artifactId = "m-user-module-xlzx"
// 上报的业务模块 aar 包的版本号
version = "0.0.8"
version = "0.0.12"
}
ydl{
......@@ -16,7 +16,7 @@ modular {
groupId = "com.ydl"
artifactId = "m-user-module-ydl"
// 上报的业务模块 aar 包的版本号
version = "0.0.8"
version = "0.0.12"
}
}
......
m-user/src/main/AndroidManifest.xml
......@@ -8,37 +8,48 @@
android:screenOrientation="portrait" />
<activity
android:name=".ui.CountryListActivity"
android:theme="@style/platform_NoTitleTheme"
android:screenOrientation="portrait" />
<activity
android:name=".ui.InputPhoneActivity"
android:theme="@style/platform_NoTitleTheme"
android:screenOrientation="portrait" />
<activity
android:name=".ui.SmsLoginActivity"
android:label="验证码"
android:theme="@style/platform_NoTitleTheme"
android:screenOrientation="portrait" />
<activity
android:name=".ui.GetIdentifyingCodeActivity"
android:theme="@style/platform_NoTitleTheme"
android:screenOrientation="portrait" />
<activity
android:name=".ui.FillInfoActivity"
android:theme="@style/platform_NoTitleTheme"
android:screenOrientation="portrait" />
<activity
android:name=".safePrivate.CheckPasswordActivity"
android:theme="@style/platform_NoTitleTheme"
android:screenOrientation="portrait" />
<activity
android:name=".safePrivate.FingerPrintCheckActivity"
android:theme="@style/platform_NoTitleTheme"
android:screenOrientation="portrait" />
<activity
android:name=".safePrivate.HandUnlockCheckActivity"
android:theme="@style/platform_NoTitleTheme"
android:screenOrientation="portrait" />
<activity
android:name=".safePrivate.PrivacyActivity"
android:theme="@style/platform_NoTitleTheme"
android:screenOrientation="portrait" />
<activity
android:name=".safePrivate.SetFingerPrintActivity"
android:theme="@style/platform_NoTitleTheme"
android:screenOrientation="portrait" />
<activity
android:name=".safePrivate.SetHandUnLockActivity"
android:theme="@style/platform_NoTitleTheme"
android:screenOrientation="portrait" />
<activity
......@@ -52,6 +63,7 @@
android:screenOrientation="portrait" />
<activity
android:name=".ui.login.H5Activity"
android:theme="@style/platform_NoTitleTheme"
android:screenOrientation="portrait" />
<activity
android:name=".ui.AliAuthDemoActivity"
......@@ -67,9 +79,9 @@
android:configChanges="orientation|keyboardHidden|screenSize"
android:launchMode="singleTask"
android:screenOrientation="portrait" />
<meta-data
android:name="com.yidianling.user.base.UserGlobalConfig"
android:value="ModuleConfig"/>
<!--<meta-data-->
<!--android:name="com.yidianling.user.base.UserGlobalConfig"-->
<!--android:value="ModuleConfig"/>-->
<activity
android:name=".wxapi.WXEntryActivity"
android:exported="true"
......
m-user/src/main/java/com/yidianling/user/modular_service/IUserInfoService.kt deleted 100644 → 0
package com.yidianling.user.modular_service
import android.app.Activity
import android.content.Context
import android.content.Intent
import com.alibaba.android.arouter.facade.template.IProvider
import com.yidianling.user.api.bean.UserResponseBean
import com.yidianling.user.api.bean.UserSettingBean
/**
* author : Zhangwenchao
* e-mail : zhangwch@yidianling.com
* time : 2018/04/13
*/
interface IUserInfoService : IProvider {
// 是否已登录
fun isLogin(): Boolean
fun isFirstLogin(): Boolean
fun setFirstLogin(first: Boolean)
fun isSafePrivacyClicked(): Boolean
fun putSafePrivacyClicked(clicked: Boolean)
fun setUserResponse(userInfo: UserResponseBean?)
fun getUserInfo(): UserResponseBean.UserInfo?
fun getUserResponse() : UserResponseBean?
fun getUserSetting(): UserSettingBean?
fun isBindPhone(): Boolean
fun putUnlockCheckSuccessTime(time: Long)
fun getChatTeamHisShow(): Boolean
fun setChatTeamHisShowed(showed : Boolean)
// 跳转到隐私界面的 Activity
fun privacyIntent(activity: Activity): Intent
fun loginWayIntent(context: Context): Intent
fun inputPhoneIntent(activity: Activity, smsAction: String): Intent
fun safeTipViewGone(): Boolean
fun setTrendsSafeTip(status: Boolean)
fun errorAgainTime(): Long
fun isFirstStart(): Boolean
fun updateUserInfoSp(userInfo: UserResponseBean.UserInfo?)
fun updateUserSetingSp(userSetting: UserSettingBean?)
fun clearUserInfo()
}
\ No newline at end of file
m-user/src/main/java/com/yidianling/user/modular_service/UserServiceImp.kt
......@@ -9,6 +9,7 @@ import com.ydl.ydlcommon.base.BaseApp
import com.yidianling.common.tools.RxAppTool
import com.yidianling.user.api.bean.UserResponseBean
import com.yidianling.user.api.bean.UserSettingBean
import com.yidianling.user.api.service.IUserService
import com.yidianling.user.modular_service.utils.UserServiceHelper
import com.yidianling.user.route.UserIn
import com.yidianling.user.safePrivate.FingerPrintUtil
......@@ -22,7 +23,7 @@ import com.yidianling.user.ui.login.RegisterAndLoginActivity
* time : 2018/04/13
*/
@Route(path = "/user/UserService")
public class UserServiceImp : IUserInfoService {
public class UserServiceImp : IUserService {
constructor()
......
m-user/src/main/java/com/yidianling/user/route/UserRouterImp.kt
......@@ -10,6 +10,7 @@ import com.yidianling.router.user.IUserRouter
import com.yidianling.router.user.UserResponse
import com.yidianling.router.user.UserSetting
import com.yidianling.user.UserHelper
import com.yidianling.user.modular_service.utils.UserServiceHelper
import com.yidianling.user.safePrivate.FingerPrintUtil
import com.yidianling.user.safePrivate.PrivacyActivity
import com.yidianling.user.ui.InputPhoneActivity
......
m-user/src/main/java/com/yidianling/user/safePrivate/FingerPrintCheckActivity.kt
......@@ -13,15 +13,12 @@ import com.yidianling.user.R
import com.yidianling.user.UserHelper
import com.yidianling.user.route.UserIn
import com.yidianling.user.ui.login.RegisterAndLoginActivity
import de.greenrobot.event.EventBus
/**
* 登录验证指纹
*/
class FingerPrintCheckActivity : BaseActivity(), View.OnClickListener {
override fun initDataAndEvent() {
EventBus.getDefault().register(this)
isFromBackground = intent.getBooleanExtra("isFromBackground", false)
init()
......@@ -48,7 +45,6 @@ class FingerPrintCheckActivity : BaseActivity(), View.OnClickListener {
override fun onDestroy() {
super.onDestroy()
EventBus.getDefault().unregister(this)
}
fun init() {
......
m-user/src/main/java/com/yidianling/user/safePrivate/HandUnlockCheckActivity.kt
......@@ -15,7 +15,6 @@ import com.yidianling.user.R
import com.yidianling.user.UserHelper
import com.yidianling.user.route.UserIn
import com.yidianling.user.ui.login.RegisterAndLoginActivity
import de.greenrobot.event.EventBus
/**
* 手势解锁验证界面(也可验证指纹)
......@@ -30,8 +29,6 @@ class HandUnlockCheckActivity : BaseActivity(), android.view.View.OnClickListene
}
override fun initDataAndEvent() {
EventBus.getDefault().register(this)
isFromBackground = intent.getBooleanExtra("isFromBackground", false)
tipTxt = findViewById<TextView>(R.id.text_tip)
......@@ -86,7 +83,6 @@ class HandUnlockCheckActivity : BaseActivity(), android.view.View.OnClickListene
override fun onDestroy() {
super.onDestroy()
EventBus.getDefault().unregister(this)
}
//检查是否开启指纹或手势密码
......
m-user/src/main/java/com/yidianling/user/ui/CountryListActivity.java
......@@ -11,6 +11,7 @@ import android.widget.ImageView;
import android.widget.ListView;
import android.widget.TextView;
import com.ydl.ydlcommon.base.BaseActivity;
import com.ydl.ydlcommon.bean.StatusBarOptions;
import com.ydl.ydlcommon.data.http.RxUtils;
import com.ydl.ydlcommon.data.http.ThrowableConsumer;
import com.ydl.ydlcommon.utils.StatusBarUtils;
......@@ -43,6 +44,12 @@ public class CountryListActivity extends BaseActivity {
protected int layoutResId() {
return R.layout.activity_country_list;
}
@NotNull
@Override
public StatusBarOptions getStatusViewOptions() {
return new StatusBarOptions(true,true);
}
@Override
protected void initDataAndEvent() {
......
m-user/src/main/java/com/yidianling/user/ui/FillInfoActivity.java
......@@ -23,6 +23,7 @@ import com.tbruyelle.rxpermissions2.RxPermissions;
import com.ydl.webview.RefreshWebEvent;
import com.ydl.ydl_image.module.GlideApp;
import com.ydl.ydlcommon.base.BaseActivity;
import com.ydl.ydlcommon.bean.StatusBarOptions;
import com.ydl.ydlcommon.data.http.RxUtils;
import com.ydl.ydlcommon.data.http.ThrowableConsumer;
import com.ydl.ydlcommon.utils.ActivityManager;
......@@ -96,6 +97,12 @@ public class FillInfoActivity extends BaseActivity implements View.OnClickListen
return R.layout.activity_fill_info;
}
@NotNull
@Override
public StatusBarOptions getStatusViewOptions() {
return new StatusBarOptions(true,true);
}
@Override
protected void initDataAndEvent() {
tb_title = findViewById(R.id.tb_title);
......
m-user/src/main/java/com/yidianling/user/ui/GetIdentifyingCodeActivity.java
......@@ -9,6 +9,7 @@ import android.widget.LinearLayout;
import android.widget.TextView;
import com.ydl.webview.RefreshWebEvent;
import com.ydl.ydlcommon.base.BaseActivity;
import com.ydl.ydlcommon.bean.StatusBarOptions;
import com.ydl.ydlcommon.data.http.EncryptUtils;
import com.ydl.ydlcommon.data.http.RxUtils;
import com.ydl.ydlcommon.data.http.ThrowableConsumer;
......@@ -81,6 +82,12 @@ public class GetIdentifyingCodeActivity extends BaseActivity implements View.OnC
return R.layout.activity_get_identifying_code;
}
@NotNull
@Override
public StatusBarOptions getStatusViewOptions() {
return new StatusBarOptions(true,true);
}
@Override
protected void initDataAndEvent() {
tb_title = findViewById(R.id.tb_title);
......
m-user/src/main/java/com/yidianling/user/ui/InputPhoneActivity.java
......@@ -13,6 +13,7 @@ import com.ydl.webview.H5Params;
import com.ydl.webview.NewH5Activity;
import com.ydl.ydlcommon.base.BaseActivity;
import com.ydl.ydlcommon.base.config.YDLConstants;
import com.ydl.ydlcommon.bean.StatusBarOptions;
import com.ydl.ydlcommon.data.http.RxUtils;
import com.ydl.ydlcommon.data.http.ThrowableConsumer;
import com.ydl.ydlcommon.router.YdlCommonOut;
......@@ -94,6 +95,12 @@ public class InputPhoneActivity extends BaseActivity implements View.OnClickList
activity.startActivity(intent);
}
@NotNull
@Override
public StatusBarOptions getStatusViewOptions() {
return new StatusBarOptions(true,true);
}
@Override
protected int layoutResId() {
return R.layout.activity_input_phone;
......
m-user/src/main/java/com/yidianling/user/ui/SmsLoginActivity.kt
......@@ -6,6 +6,7 @@ import android.text.TextUtils
import android.util.Log
import android.view.View
import com.ydl.ydlcommon.base.BaseActivity
import com.ydl.ydlcommon.bean.StatusBarOptions
import com.ydl.ydlcommon.data.http.RxUtils
import com.ydl.ydlcommon.data.http.ThrowableConsumer
import com.ydl.ydlcommon.router.YdlCommonOut
......@@ -18,7 +19,6 @@ import com.yidianling.router.im.IMLoginInfo
import com.yidianling.router.im.IMRequestCallback
import com.yidianling.router.user.UserResponse
import com.yidianling.user.LoginUtils
import com.yidianling.user.R
import com.yidianling.user.UserConstants
import com.yidianling.user.constants.UserBIConstants
import com.yidianling.user.http.UserHttp
......@@ -37,6 +37,8 @@ import io.reactivex.schedulers.Schedulers
import kotlinx.android.synthetic.main.activity_get_identifying_code.*
import java.util.concurrent.TimeUnit
/**
* 短信快捷登录界面
* author : Zhangwenchao
......@@ -67,7 +69,7 @@ class SmsLoginActivity : BaseActivity() {
override fun layoutResId(): Int {
return R.layout.activity_get_identifying_code
return com.yidianling.user.R.layout.activity_get_identifying_code
}
override fun initDataAndEvent() {
......@@ -78,6 +80,10 @@ class SmsLoginActivity : BaseActivity() {
requestVCode()
}
override fun getStatusViewOptions(): StatusBarOptions {
return StatusBarOptions(isAddStatusView = true, statusBarDarkMode = true)
}
override fun onDestroy() {
super.onDestroy()
unsubscribe(timerSub)
......
m-user/src/main/java/com/yidianling/user/widget/PrivacyDialog.kt
......@@ -14,7 +14,7 @@ import android.text.method.LinkMovementMethod
import android.text.style.ClickableSpan
import android.view.View
import com.ydl.ydlcommon.base.BaseActivity
import com.ydl.ydlcommon.modular.ModularServiceManager
import com.ydl.ydlcommon.router.YdlCommonRouterManager
import com.yidianling.common.tools.LogUtil
import com.yidianling.user.LoginUtils
import com.yidianling.user.R
......@@ -111,7 +111,7 @@ class PrivacyDialog : Dialog {
if (UserHelper.getUserInfo() != null && !TextUtils.isEmpty(UserHelper.getUserInfo()!!.uid)) {
uid = UserHelper.getUserInfo()!!.uid!!
} else {
val loginBean = ModularServiceManager.getPlatformUserService()?.getUser()
val loginBean = YdlCommonRouterManager.getYdlCommonRoute().getUserInfo()
if (loginBean != null) {
uid = loginBean.userId
}
......
ydl-platform/src/main/java/com/ydl/ydlcommon/utils/UMEventUtils.java
......@@ -2,8 +2,6 @@ package com.ydl.ydlcommon.utils;
import android.content.Context;
import android.util.Log;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.umeng.analytics.MobclickAgent;
import com.umeng.analytics.dplus.UMADplus;
import com.ydl.ydl_router.provider.YDLRouterBurryPointProvider;
......@@ -14,7 +12,7 @@ import java.util.HashMap;
/**
* Created by Wi1ls on 2016/11/11;
*/
@Route(path = "/burry/point")
//@Route(path = "/burry/point")
public class UMEventUtils implements YDLRouterBurryPointProvider{
public static final String test = "aaa";
//登录注册首页_登录注册确认点击
......
ydl-webview/build.gradle
......@@ -52,9 +52,10 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
kapt 'com.alibaba:arouter-compiler:1.2.2'
api 'com.ydl:m-user-api:0.0.4'
api('com.ydl:ydl-platform:0.0.7@aar') {
api('com.ydl:ydl-platform:0.0.8@aar') {
transitive = true
}
api'com.ydl:router:1.0.0-SNAPSHOT@aar'
// api project(':ydl-platform')
}
ydl-webview/gradle.properties
IS_PUBLISH=true
VERSION_NAME=0.0.5
\ No newline at end of file
VERSION_NAME=0.0.7
\ No newline at end of file
ydl-webview/src/main/java/com/ydl/webview/NewH5Activity.java
......@@ -538,7 +538,7 @@ public class NewH5Activity extends BaseActivity implements PtrHandler {
wv_content.setScrollBarStyle(View.SCROLLBARS_INSIDE_OVERLAY);//滚动条风格，为0指滚动条不占用空间，直接覆盖在网页上
tb_title.setImageListener(v -> {
if (h5Params.isSplash()) {
WebModularServiceUtils.Companion.startMain();
WebModularServiceUtils.Companion.startMain(NewH5Activity.this);
finish();
} else {
......@@ -738,7 +738,7 @@ public class NewH5Activity extends BaseActivity implements PtrHandler {
tb_title.setmLeftText("");
tb_title.setImageListener(v -> {
if (h5Params.getShowUrlTitle()) {
WebModularServiceUtils.Companion.startMain();
WebModularServiceUtils.Companion.startMain(NewH5Activity.this);
finish();
} else {
finish();
......@@ -1021,7 +1021,7 @@ public class NewH5Activity extends BaseActivity implements PtrHandler {
setTitle(wv_content.getTitle());
tb_title.setImageListener(v -> {
if (h5Params.isSplash()) {
WebModularServiceUtils.Companion.startMain();
WebModularServiceUtils.Companion.startMain(NewH5Activity.this);
finish();
} else {
finish();
......@@ -1029,7 +1029,7 @@ public class NewH5Activity extends BaseActivity implements PtrHandler {
});
} else {
if (h5Params.isSplash()) {
WebModularServiceUtils.Companion.startMain();
WebModularServiceUtils.Companion.startMain(NewH5Activity.this);
finish();
} else {
if (startType == 1) {
......@@ -1094,7 +1094,7 @@ public class NewH5Activity extends BaseActivity implements PtrHandler {
NewH5Activity.start(this, new H5Params(successPage, ""));
}
if (h5Params.isSplash()) {
WebModularServiceUtils.Companion.startMain();
WebModularServiceUtils.Companion.startMain(NewH5Activity.this);
finish();
} else {
finish();
......@@ -1206,7 +1206,7 @@ public class NewH5Activity extends BaseActivity implements PtrHandler {
dialog.setCallBack(type -> {
if (1 == type) {
if (!WebModularServiceUtils.Companion.getUserService().isLogin()) {
if (!WebModularServiceUtils.Companion.getUserRouter().isLogin()) {
isToTrend = true;
ARouter.getInstance().build("/user/login").navigation();
} else {
......
ydl-webview/src/main/java/com/ydl/webview/SafeTipView.kt
......@@ -44,7 +44,7 @@ class SafeTipView : LinearLayout {
.duration(400)
.onEnd { visibility = View.GONE }
.playOn(this@SafeTipView)
WebModularServiceUtils.getUserService().setTrendsSafeTip(true)
WebModularServiceUtils.getUserRouter().setTrendsSafeTip(true)
when (location) {
"msgList" -> {
UMEventUtils.msgListPrivacyClose(context)
......@@ -58,7 +58,7 @@ class SafeTipView : LinearLayout {
}
}
tvTip.setOnClickListener {
WebModularServiceUtils.getUserService().privacyIntent(context as Activity)
WebModularServiceUtils.getUserRouter().privacyIntent(context as Activity)
when (location) {
"msgList" -> {
UMEventUtils.msgListPrivacyAlert(context)
......@@ -74,7 +74,7 @@ class SafeTipView : LinearLayout {
}
fun updateVisibility() {
if (WebModularServiceUtils.getUserService().safeTipViewGone()) {
if (WebModularServiceUtils.getUserRouter().safeTipViewGone()) {
this.visibility = View.GONE
} else {
this.visibility = View.VISIBLE
......
ydl-webview/src/main/java/com/ydl/webview/WebModularServiceUtils.kt
package com.ydl.webview
import android.content.Intent
import com.alibaba.android.arouter.launcher.ARouter
import android.app.Activity
import com.ydl.ydlcommon.modular.ModularServiceManager
import com.ydl.ydlcommon.router.YdlCommonRouterManager
import com.yidianling.router.RouterManager
import com.yidianling.router.user.IUserRouter
import com.yidianling.user.api.service.IUserService
/**
......@@ -11,6 +13,10 @@ import com.yidianling.user.api.service.IUserService
*/
class WebModularServiceUtils {
companion object {
fun getUserRouter(): IUserRouter {
return RouterManager.getUserRouter()!!
}
fun getUserService(): IUserService {
return ModularServiceManager.provide(IUserService::class.java)
}
......@@ -19,10 +25,11 @@ class WebModularServiceUtils {
return ModularServiceManager.provide(IWebService::class.java)
}
fun startMain(){
ARouter.getInstance().build("/main/main")
.withFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
.navigation()
fun startMain(activity: Activity){
YdlCommonRouterManager.getYdlCommonRoute().startMain(activity,false)
// ARouter.getInstance().build("/main/main")
// .withFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
// .navigation()
}
}
}
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