切换导航条
此项目
正在载入...
登录
张涛
/
huahang_project
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
liming
5 years ago
提交
d3ea35eefc918e2d2d46d9388b8f850556eb70de
1 个父辈
d5dc0680
master
...
zhangtao
修改ui
显示空白字符变更
内嵌
并排对比
正在显示
5 个修改的文件
包含
62 行增加
和
22 行删除
app/src/main/java/com/hh/xuetubao/activity/personal/InfromationActivity.java
app/src/main/java/com/hh/xuetubao/activity/personal/MessageActivity.java
app/src/main/java/com/hh/xuetubao/activity/personal/ResumeActivity.java
app/src/main/java/com/hh/xuetubao/fragment/IntroduceFragment.java
app/src/main/java/com/hh/xuetubao/fragment/MineFragment.java
app/src/main/java/com/hh/xuetubao/activity/personal/InfromationActivity.java
查看文件 @
d3ea35e
...
...
@@ -167,16 +167,19 @@ public class InfromationActivity extends BaseMvpActivity<CommonPresenter, Person
public
void
getData
(
Object
o
,
int
api
,
int
intent
)
{
if
(
api
==
3
&&
intent
==
1
)
{
UserBean
bean
=
(
UserBean
)
o
;
if
(
bean
.
getUserName
()
!=
null
)
if
(
bean
.
getUserName
()
!=
null
)
{
level
+=
1
;
tvName
.
setText
(
bean
.
getUserName
());
tvUser
.
setText
(
bean
.
getUserName
());
if
(
bean
.
getCompany
()
!=
null
)
}
if
(!
TextUtils
.
isEmpty
(
bean
.
getCompany
()))
{
level
+=
1
;
tvCompany
.
setText
(
bean
.
getCompany
());
if
(
bean
.
getWebSite
()
!=
null
&&
bean
.
getWebSite
()
!=
""
)
}
if
(
bean
.
getWebSite
()
!=
null
&&
bean
.
getWebSite
()
!=
""
)
{
level
+=
1
;
tvWeb
.
setText
(
bean
.
getWebSite
());
}
if
(
bean
.
getSex
()
==
0
)
{
tvSex
.
setText
(
"男"
);
level
+=
1
;
...
...
@@ -199,7 +202,7 @@ public class InfromationActivity extends BaseMvpActivity<CommonPresenter, Person
@Override
public
void
onError
(
Throwable
e
,
int
api
)
{
Log
.
e
(
"Throwableaa"
,
e
.
getMessage
());
Log
.
e
(
"Throwableaa"
,
e
.
getMessage
());
}
@Override
...
...
app/src/main/java/com/hh/xuetubao/activity/personal/MessageActivity.java
查看文件 @
d3ea35e
...
...
@@ -100,14 +100,26 @@ public class MessageActivity extends BaseMvpActivity<CommonPresenter, PersonalMo
tvUser
.
setText
(
bean
.
getUserName
());
}
Log
.
e
(
"zhangtao:name"
,
bean
.
getLoginName
());
if
(!
TextUtils
.
isEmpty
(
bean
.
getHeadPic
()))
{
String
headPic
=
SharedPrefrenceUtils
.
getString
(
this
,
"HeadPic"
);
if
(!
TextUtils
.
isEmpty
(
headPic
))
Glide
.
with
(
this
).
load
(
headPic
).
into
(
imgUser
);
}
else
{
Glide
.
with
(
this
).
load
(
bean
.
getHeadPic
()).
into
(
imgUser
);
}
String
reallHeader
=
SharedPrefrenceUtils
.
getString
(
MessageActivity
.
this
,
"ReallHeader"
);
String
headPic
=
SharedPrefrenceUtils
.
getString
(
MessageActivity
.
this
,
"HeadPic"
);
if
(!
TextUtils
.
isEmpty
(
headPic
))
{
Glide
.
with
(
this
).
load
(
headPic
).
into
(
imgUser
);
}
else
if
(!
TextUtils
.
isEmpty
(
reallHeader
))
{
Glide
.
with
(
this
).
load
(
reallHeader
).
into
(
imgUser
);
}
else
if
(
bean
.
getHeadPic
()
!=
null
&&
!
bean
.
getHeadPic
().
equals
(
""
)){
Glide
.
with
(
MessageActivity
.
this
).
load
(
bean
.
getHeadPic
()).
into
(
imgUser
);
}
// if (!TextUtils.isEmpty(bean.getHeadPic())) {
// String headPic = SharedPrefrenceUtils.getString(this, "HeadPic");
// if (!TextUtils.isEmpty(headPic))
// Glide.with(this).load(headPic).into(imgUser);
//
// } else {
// Glide.with(this).load(bean.getHeadPic()).into(imgUser);
// }
}
if
(
api
==
5
&&
intent
==
1
)
{
MsgListBean
bean
=
(
MsgListBean
)
o
;
...
...
app/src/main/java/com/hh/xuetubao/activity/personal/ResumeActivity.java
查看文件 @
d3ea35e
package
com
.
hh
.
xuetubao
.
activity
.
personal
;
import
android.os.Bundle
;
import
android.text.TextUtils
;
import
android.util.Log
;
import
android.view.View
;
import
android.widget.ImageView
;
...
...
@@ -133,15 +134,27 @@ public class ResumeActivity extends BaseMvpActivity<CommonPresenter, PersonalMod
if
(
api
==
7
&&
intent
==
1
)
{
ResumeDetailBean
bean
=
(
ResumeDetailBean
)
o
;
Log
.
e
(
"ResumeDetailBean"
,
bean
.
toString
());
String
reallHeader
=
SharedPrefrenceUtils
.
getString
(
this
,
"ReallHeader"
);
String
headPic
=
SharedPrefrenceUtils
.
getString
(
this
,
"HeadPic"
);
if
(
bean
.
getHeadPicUrl
()
!=
null
)
{
if
(!
TextUtils
.
isEmpty
(
headPic
))
{
Glide
.
with
(
this
).
load
(
headPic
).
into
(
imgUser
);
}
else
if
(!
TextUtils
.
isEmpty
(
reallHeader
))
{
Glide
.
with
(
this
).
load
(
reallHeader
).
into
(
imgUser
);
}
else
if
(
bean
.
getHeadPicUrl
()
!=
null
)
{
Log
.
e
(
"getHeadPicUrl"
,
bean
.
getHeadPicUrl
());
Glide
.
with
(
this
).
load
(
bean
.
getHeadPicUrl
()).
into
(
imgUser
);
}
else
{
Log
.
e
(
"headPic"
,
headPic
);
if
(
headPic
!=
null
)
Glide
.
with
(
this
).
load
(
headPic
).
into
(
imgUser
);
}
// if (bean.getHeadPicUrl() != null) {
// Log.e("getHeadPicUrl", bean.getHeadPicUrl());
// Glide.with(this).load(bean.getHeadPicUrl()).into(imgUser);
// } else {
// Log.e("headPic", headPic);
// if (headPic != null)
// Glide.with(this).load(headPic).into(imgUser);
// }
if
(
bean
.
getName
()
!=
null
&&
!
bean
.
getName
().
equals
(
""
))
tvName
.
setText
(
bean
.
getName
());
else
tvName
.
setText
(
"暂无"
);
...
...
app/src/main/java/com/hh/xuetubao/fragment/IntroduceFragment.java
查看文件 @
d3ea35e
...
...
@@ -102,7 +102,6 @@ public class IntroduceFragment extends BaseMvpFragment<CommonPresenter, LearnMod
Event
event
=
new
Event
(
2
,
null
,
null
,
null
,
null
,
bean
.
getLessonCoverUrl
());
EventBus
.
getDefault
().
postSticky
(
event
);
}
}
}
...
...
app/src/main/java/com/hh/xuetubao/fragment/MineFragment.java
查看文件 @
d3ea35e
...
...
@@ -5,6 +5,7 @@ import android.content.Intent;
import
android.os.Bundle
;
import
android.support.annotation.Nullable
;
import
android.support.v4.app.FragmentTransaction
;
import
android.text.TextUtils
;
import
android.util.Log
;
import
android.view.LayoutInflater
;
import
android.view.View
;
...
...
@@ -133,14 +134,26 @@ public class MineFragment extends BaseMvpFragment<CommonPresenter, PersonalModel
Log
.
e
(
"getUserName"
,
bean
.
getUserName
().
trim
());
if
(
bean
.
getLoginName
()
!=
null
)
SharedPrefrenceUtils
.
saveString
(
getActivity
(),
"LoginName"
,
bean
.
getLoginName
());
if
(
bean
.
getHeadPic
()
!=
null
&&
!
bean
.
getHeadPic
().
equals
(
""
))
{
String
headPic
=
SharedPrefrenceUtils
.
getString
(
getActivity
(),
"HeadPic"
);
Glide
.
with
(
getActivity
()).
load
(
headPic
).
into
(
imgUser
);
}
else
{
SharedPrefrenceUtils
.
saveString
(
getActivity
(),
"ReallHeader"
,
bean
.
getHeadPic
());
String
reallHeader
=
SharedPrefrenceUtils
.
getString
(
getContext
(),
"ReallHeader"
);
String
headPic
=
SharedPrefrenceUtils
.
getString
(
getContext
(),
"HeadPic"
);
if
(!
TextUtils
.
isEmpty
(
headPic
))
{
Glide
.
with
(
this
).
load
(
headPic
).
into
(
imgUser
);
}
else
if
(!
TextUtils
.
isEmpty
(
reallHeader
))
{
Glide
.
with
(
this
).
load
(
reallHeader
).
into
(
imgUser
);
}
else
if
(
bean
.
getHeadPic
()
!=
null
&&
!
bean
.
getHeadPic
().
equals
(
""
)){
Glide
.
with
(
getActivity
()).
load
(
bean
.
getHeadPic
()).
into
(
imgUser
);
}
// if (bean.getHeadPic() != null && !bean.getHeadPic().equals("")) {
// String headPic = SharedPrefrenceUtils.getString(getActivity(), "HeadPic");
// Glide.with(getActivity()).load(headPic).into(imgUser);
// } else {
// SharedPrefrenceUtils.saveString(getActivity(), "ReallHeader", bean.getHeadPic());
// Glide.with(getActivity()).load(bean.getHeadPic()).into(imgUser);
// }
}
}
...
...
请
注册
或
登录
后发表评论