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
f4996342
Commit
f4996342
authored
Dec 30, 2019
by
konghaorui
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复线上bug
parent
21900601
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
55 additions
and
9 deletions
+55
-9
config.gradle
config.gradle
+4
-4
TrendsListFragment.kt
m-dynamic/src/main/java/com/yidianling/dynamic/trendList/TrendsListFragment.kt
+0
-1
YDLMessageFragment.java
m-im/src/main/java/com/yidianling/uikit/business/session/fragment/YDLMessageFragment.java
+2
-2
ImageOriginPager.java
m-im/src/main/java/com/yidianling/uikit/business/session/view/ImageOriginPager.java
+47
-0
audio_end_tip.wav
m-im/src/main/res_uikit/raw/audio_end_tip.wav
+0
-0
LogoLoadingView.kt
ydl-platform/src/main/java/com/ydl/ydlcommon/ui/LogoLoadingView.kt
+2
-2
No files found.
config.gradle
View file @
f4996342
...
...
@@ -47,8 +47,8 @@ ext {
"m-fm"
:
"0.0.24"
,
"m-user"
:
"0.0.42"
,
"m-home"
:
"0.0.8.2"
,
"m-im"
:
"0.0.4.
1
"
,
"m-dynamic"
:
"0.0.2"
,
"m-im"
:
"0.0.4.
3
"
,
"m-dynamic"
:
"0.0.2
.1
"
,
"m-muse"
:
"0.0.21"
,
"m-tests"
:
"0.0.16"
,
...
...
@@ -69,7 +69,7 @@ ext {
//-------------- 功能组件 --------------
//第一步
"ydl-platform"
:
"0.0.30"
,
"ydl-platform"
:
"0.0.30
.1
"
,
//第二步 若干
"ydl-webview"
:
"0.0.29"
,
...
...
@@ -115,7 +115,7 @@ ext {
//-------------- 功能组件 --------------
//第一步
"ydl-platform"
:
"0.0.30"
,
"ydl-platform"
:
"0.0.30
.1
"
,
//第二步 若干
"ydl-webview"
:
"0.0.29"
,
...
...
m-dynamic/src/main/java/com/yidianling/dynamic/trendList/TrendsListFragment.kt
View file @
f4996342
...
...
@@ -455,7 +455,6 @@ class TrendsListFragment : BaseLazyFragment(), ITrendsListView,
return
}
SharedPreferencesEditor
.
putString
(
"trend_state"
,
""
)
LogUtil
.
d
(
"trendType "
+
trendType
!!
)
if
(!
TextUtils
.
isEmpty
(
trendType
)
&&
(
trendType
==
TREND_TYPE_DEFAULT
||
trendType
==
TREND_TYPE_TOPIC_TREND
))
{
if
(
page
==
1
&&
trendType
==
TREND_TYPE_DEFAULT
)
{
fetchRecommendTopicList
()
...
...
m-im/src/main/java/com/yidianling/uikit/business/session/fragment/YDLMessageFragment.java
View file @
f4996342
...
...
@@ -196,7 +196,7 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
getCommonQuestionListData
();
try
{
YdlBuryPointUtil
.
send
Pv
(
"快捷短语弹起"
);
YdlBuryPointUtil
.
send
Click
(
"快捷短语弹起"
);
}
catch
(
Exception
e
){
}
...
...
@@ -226,7 +226,7 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
}
try
{
YdlBuryPointUtil
.
send
Pv
(
"用户信息收集页面"
);
YdlBuryPointUtil
.
send
Click
(
"用户信息收集页面"
);
}
catch
(
Exception
e
){
}
...
...
m-im/src/main/java/com/yidianling/uikit/business/session/view/ImageOriginPager.java
0 → 100644
View file @
f4996342
package
com
.
yidianling
.
uikit
.
business
.
session
.
view
;
import
android.content.Context
;
import
android.support.v4.view.ViewPager
;
import
android.util.AttributeSet
;
import
android.util.Log
;
import
android.view.MotionEvent
;
/**
* Created by haorui on 2019-12-27.
* Des:修复Android 系统级别bug
*
* Android 处理图片放大缩小时报错java.lang.IllegalArgumentException: pointerIndex out of range pointerIndex=-1
*/
public
class
ImageOriginPager
extends
ViewPager
{
public
ImageOriginPager
(
Context
context
)
{
super
(
context
);
}
public
ImageOriginPager
(
Context
context
,
AttributeSet
attrs
)
{
super
(
context
,
attrs
);
}
@Override
public
boolean
onTouchEvent
(
MotionEvent
event
)
{
try
{
super
.
onTouchEvent
(
event
);
}
catch
(
IllegalArgumentException
e
)
{
Log
.
e
(
"ImageOriginPager-error"
,
"IllegalArgumentException 错误被活捉了!"
);
e
.
printStackTrace
();
}
return
false
;
}
@Override
public
boolean
onInterceptTouchEvent
(
MotionEvent
event
)
{
try
{
super
.
onInterceptTouchEvent
(
event
);
}
catch
(
IllegalArgumentException
e
)
{
Log
.
e
(
"ImageOriginPager-error"
,
"IllegalArgumentException 错误被活捉了!"
);
e
.
printStackTrace
();
}
return
false
;
}
}
m-im/src/main/res_uikit/raw/
im_
audio_end_tip.wav
→
m-im/src/main/res_uikit/raw/audio_end_tip.wav
View file @
f4996342
File moved
ydl-platform/src/main/java/com/ydl/ydlcommon/ui/LogoLoadingView.kt
View file @
f4996342
...
...
@@ -4,7 +4,7 @@ import android.content.Context
import
android.util.AttributeSet
import
android.view.View
import
android.widget.RelativeLayout
import
com.
ydl.ydl_image.module.GlideApp
import
com.
bumptech.glide.Glide
import
com.ydl.ydlcommon.R
import
kotlinx.android.synthetic.main.platform_logo_loading_view.view.*
...
...
@@ -29,7 +29,7 @@ class LogoLoadingView(context: Context?, attrs: AttributeSet?): RelativeLayout(c
private
fun
initView
()
{
View
.
inflate
(
context
,
R
.
layout
.
platform_logo_loading_view
,
this
)
Glide
App
.
with
(
this
).
load
(
R
.
drawable
.
platform_loading_logo
).
into
(
logo_loading_gif
)
Glide
.
with
(
context
).
load
(
R
.
drawable
.
platform_loading_logo
).
into
(
logo_loading_gif
)
reset_btn
.
setOnClickListener
{
mListener
?.
onDataResetClick
()
...
...
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