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
2492bb69
Commit
2492bb69
authored
Jul 15, 2021
by
霍志良
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:eventbus注册位置改变
parent
0a0ea982
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
19 deletions
+15
-19
DemoGlobalConfig.java
app/src/main/java/com/ydl/component/base/DemoGlobalConfig.java
+2
-2
config.gradle
config.gradle
+4
-4
MultipleSelectedEvent.kt
m-im/src/main/java/com/yidianling/im/event/MultipleSelectedEvent.kt
+5
-4
YDLMessageFragment.java
m-im/src/main/java/com/yidianling/uikit/business/session/fragment/YDLMessageFragment.java
+2
-7
RegisterAndLoginActivity.kt
m-user/src/main/java/com/yidianling/user/ui/login/RegisterAndLoginActivity.kt
+2
-2
No files found.
app/src/main/java/com/ydl/component/base/DemoGlobalConfig.java
View file @
2492bb69
...
...
@@ -20,9 +20,9 @@ import java.util.List;
public
final
class
DemoGlobalConfig
implements
IConfigModule
{
String
APP_DOMAIN
=
"https://api.github.com/"
;
// public static String appEnv = YDLConstants.ENV_AUTO_TEST;
//
public static String appEnv = YDLConstants.ENV_TEST;
public
static
String
appEnv
=
YDLConstants
.
ENV_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
public
void
injectAppLifecycle
(
@NotNull
Context
context
,
@NotNull
List
<
IAppLifecycles
>
lifecycles
)
{
...
...
config.gradle
View file @
2492bb69
...
...
@@ -8,9 +8,9 @@ ext {
"m-confide"
:
"0.0.49.09"
,
"m-consultant"
:
"0.0.59.90"
,
"m-fm"
:
"0.0.30.03"
,
"m-user"
:
"0.0.61.3
7
"
,
"m-user"
:
"0.0.61.3
8
"
,
"m-home"
:
"0.0.22.68"
,
"m-im"
:
"0.0.19.
56
"
,
"m-im"
:
"0.0.19.
67
"
,
"m-dynamic"
:
"0.0.7.26"
,
"m-article"
:
"0.0.0.10"
,
...
...
@@ -91,9 +91,9 @@ ext {
"m-confide"
:
"0.0.49.09"
,
"m-consultant"
:
"0.0.59.90"
,
"m-fm"
:
"0.0.30.01"
,
"m-user"
:
"0.0.61.3
7
"
,
"m-user"
:
"0.0.61.3
8
"
,
"m-home"
:
"0.0.22.68"
,
"m-im"
:
"0.0.19.
56
"
,
"m-im"
:
"0.0.19.
67
"
,
"m-dynamic"
:
"0.0.7.26"
,
"m-article"
:
"0.0.0.8"
,
...
...
m-im/src/main/java/com/yidianling/im/event/MultipleSelectedEvent.kt
View file @
2492bb69
package
com.yidianling.im.event
import
com.yidianling.im.session.viewholder.bean.AnswersItem
import
java.io.Serializable
public
class
MultipleSelectedEvent
(
val
strSelected
:
String
?,
...
...
@@ -8,11 +9,11 @@ public class MultipleSelectedEvent (
var
multipleAnswerBean
:
MultipleAnswerBean
?,
var
isFromInputPanel
:
Boolean
,
var
recoverInput
:
Boolean
)
)
:
Serializable
data class
OthersState
(
var
isOthers
:
Boolean
,
var
othersSelect
:
Boolean
)
)
:
Serializable
data class
MultipleAnswerBean
(
var
examId
:
String
,
var
questionPaperId
:
String
,
...
...
@@ -20,4 +21,4 @@ data class MultipleAnswerBean(
var
questionId
:
String
,
var
answersItems
:
ArrayList
<
AnswersItem
>,
var
fromUid
:
String
)
\ No newline at end of file
):
Serializable
\ No newline at end of file
m-im/src/main/java/com/yidianling/uikit/business/session/fragment/YDLMessageFragment.java
View file @
2492bb69
...
...
@@ -305,12 +305,6 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
}
}
@Override
public
void
onCreate
(
@Nullable
Bundle
savedInstanceState
)
{
super
.
onCreate
(
savedInstanceState
);
EventBus
.
getDefault
().
register
(
this
);
}
private
void
initView
()
{
if
(
ActionHandlerStorage
.
getL
(
sessionId
)
!=
null
&&
ActionHandlerStorage
.
getL
(
sessionId
).
getUserType
()
==
3
)
{
//助理
...
...
@@ -514,7 +508,7 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
},
throwable
->
{
Log
.
i
(
"user/getNewUserMes"
,
throwable
.
toString
());
});
EventBus
.
getDefault
().
register
(
this
);
}
@SuppressLint
(
"CheckResult"
)
...
...
@@ -1008,6 +1002,7 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
}
/**
* ***************************** life cycle *******************************
*/
...
...
m-user/src/main/java/com/yidianling/user/ui/login/RegisterAndLoginActivity.kt
View file @
2492bb69
...
...
@@ -165,12 +165,12 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
}
else
->
{
// 用户拒绝了该权限,而且选中『不再询问』
ToastUtil
.
toastLong
(
this
,
"App正常工作需要使用设备信息权限,请开启"
)
/*
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
()
finish()
*/
}
}
}
...
...
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