Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
R
RvApp
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
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
lify
RvApp
Commits
1240f936
Commit
1240f936
authored
Sep 25, 2019
by
jianglx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加跳转详情页面
parent
cb64c9c5
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
49 additions
and
14 deletions
+49
-14
build.gradle
RvClient/build.gradle
+2
-2
MainActivity.java
RvClient/src/main/java/com/xxfc/rv/MainActivity.java
+36
-8
WakeUpActivity.java
RvClient/src/main/java/com/xxfc/rv/WakeUpActivity.java
+9
-2
MineFragment.java
module_mine/src/main/java/com/rv/rvmine/MineFragment.java
+1
-1
MemberCenterActivity.java
...ber/src/main/java/com/rv.member/MemberCenterActivity.java
+1
-1
No files found.
RvClient/build.gradle
View file @
1240f936
...
@@ -8,8 +8,8 @@ android {
...
@@ -8,8 +8,8 @@ android {
minSdkVersion
rootProject
.
ext
.
minSdkVersion
minSdkVersion
rootProject
.
ext
.
minSdkVersion
targetSdkVersion
rootProject
.
ext
.
targetSdkVersion
targetSdkVersion
rootProject
.
ext
.
targetSdkVersion
flavorDimensions
"default"
flavorDimensions
"default"
versionCode
15
1
versionCode
15
2
versionName
"1.5.
1
"
versionName
"1.5.
2
"
multiDexEnabled
true
multiDexEnabled
true
ndk
{
ndk
{
...
...
RvClient/src/main/java/com/xxfc/rv/MainActivity.java
View file @
1240f936
...
@@ -562,16 +562,44 @@ public class MainActivity extends BaseActivity<CommonPresenter> implements EasyP
...
@@ -562,16 +562,44 @@ public class MainActivity extends BaseActivity<CommonPresenter> implements EasyP
header
.
put
(
"Authorization"
,
OkGoUtil
.
getToken
());
header
.
put
(
"Authorization"
,
OkGoUtil
.
getToken
());
Map
<
String
,
Object
>
body
=
new
HashMap
<>();
Map
<
String
,
Object
>
body
=
new
HashMap
<>();
body
.
put
(
"code"
,
Cookie
.
getStringValue
(
getApplicationContext
(),
"code"
));
body
.
put
(
"code"
,
App
Cookie
.
getStringValue
(
getApplicationContext
(),
"code"
));
mPresenter
.
postData
(
RvFrameConfig
.
HOST
,
10000
,
ApiConfig
.
HTTP_URL_RELATION_BIND
,
null
,
body
,
header
,
false
);
mPresenter
.
postData
(
RvFrameConfig
.
HOST
,
10000
,
ApiConfig
.
HTTP_URL_RELATION_BIND
,
null
,
body
,
header
,
false
);
}
}
ComponentName
componentName
=
new
ComponentName
(
this
,
"com.rv.share.WebViewActivity"
);
Intent
in
=
new
Intent
();
Log
.
d
(
"type ="
,
""
+
intent
.
getIntExtra
(
"type"
,
0
))
;
in
.
setComponent
(
componentName
);
switch
(
intent
.
getIntExtra
(
"type"
,
0
))
{
in
.
putExtra
(
"url"
,
intent
.
getStringExtra
(
"url"
));
case
0
:
in
.
putExtra
(
"title"
,
intent
.
getStringExtra
(
"title"
));
case
4
:
startActivity
(
in
);
ComponentName
componentName
=
new
ComponentName
(
this
,
"com.rv.share.WebViewActivity"
);
Intent
in
=
new
Intent
();
in
.
setComponent
(
componentName
);
in
.
putExtra
(
"url"
,
intent
.
getStringExtra
(
"url"
));
in
.
putExtra
(
"title"
,
intent
.
getStringExtra
(
"title"
));
startActivity
(
in
);
break
;
case
1
:
setCurrent
(
TYPE_HOME_PAGE
);
break
;
case
2
:
ARouter
.
getInstance
()
.
build
(
Constance
.
ACTIVITY_URL_TRAVELDETAILS
)
.
withString
(
"id"
,
intent
.
getStringExtra
(
"id"
))
.
navigation
();
break
;
case
3
:
ARouter
.
getInstance
()
.
build
(
Constance
.
ACTIVITY_URL_CAMPDETAIL
)
.
withString
(
"id"
,
intent
.
getStringExtra
(
"id"
))
.
navigation
();
break
;
case
5
:
ARouter
.
getInstance
()
.
build
(
Constance
.
ACTIVITY_URL_DETAILPAT
)
.
withString
(
"id"
,
intent
.
getStringExtra
(
"id"
))
.
navigation
();
break
;
}
}
}
}
}
...
@@ -665,7 +693,7 @@ public class MainActivity extends BaseActivity<CommonPresenter> implements EasyP
...
@@ -665,7 +693,7 @@ public class MainActivity extends BaseActivity<CommonPresenter> implements EasyP
}
}
private
void
showLogoutDialog
()
{
private
void
showLogoutDialog
()
{
new
android
.
support
.
v7
.
app
.
AlertDialog
.
Builder
(
mActivity
)
new
android
.
support
.
v7
.
app
.
AlertDialog
.
Builder
(
mActivity
)
.
setTitle
(
"提示"
)
.
setTitle
(
"提示"
)
.
setMessage
(
"该账号在其他移动端登录,程序即将退出"
)
.
setMessage
(
"该账号在其他移动端登录,程序即将退出"
)
.
setCancelable
(
false
)
.
setCancelable
(
false
)
...
...
RvClient/src/main/java/com/xxfc/rv/WakeUpActivity.java
View file @
1240f936
...
@@ -47,11 +47,18 @@ public class WakeUpActivity extends AppCompatActivity {
...
@@ -47,11 +47,18 @@ public class WakeUpActivity extends AppCompatActivity {
LogUtil
.
d
(
"唤醒传过来的url="
+
url
);
LogUtil
.
d
(
"唤醒传过来的url="
+
url
);
String
title
=
URLDecoder
.
decode
(
object
.
optString
(
"title"
),
"UTF-8"
);
String
title
=
URLDecoder
.
decode
(
object
.
optString
(
"title"
),
"UTF-8"
);
LogUtil
.
d
(
"唤醒传过来的tile="
+
title
);
LogUtil
.
d
(
"唤醒传过来的tile="
+
title
);
if
(!
TextUtils
.
isEmpty
(
url
)
&&
!
TextUtils
.
isEmpty
(
title
))
{
String
id
=
object
.
optString
(
"id"
);
LogUtil
.
d
(
"唤醒传过来的id="
+
id
);
int
type
=
object
.
optInt
(
"t"
,
0
);
LogUtil
.
d
(
"唤醒传过来的type="
+
type
);
// if (!TextUtils.isEmpty(url) && !TextUtils.isEmpty(title)) {
intent
.
putExtra
(
"to"
,
"webView"
);
intent
.
putExtra
(
"to"
,
"webView"
);
intent
.
putExtra
(
"url"
,
url
);
intent
.
putExtra
(
"url"
,
url
);
intent
.
putExtra
(
"title"
,
title
);
intent
.
putExtra
(
"title"
,
title
);
}
intent
.
putExtra
(
"id"
,
id
);
intent
.
putExtra
(
"type"
,
type
);
// }
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
e
.
printStackTrace
();
}
}
...
...
module_mine/src/main/java/com/rv/rvmine/MineFragment.java
View file @
1240f936
...
@@ -152,7 +152,7 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
...
@@ -152,7 +152,7 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
((
View
)
ivMember
.
getParent
()).
setVisibility
(
View
.
GONE
);
((
View
)
ivMember
.
getParent
()).
setVisibility
(
View
.
GONE
);
tvLogin
.
setVisibility
(
View
.
VISIBLE
);
tvLogin
.
setVisibility
(
View
.
VISIBLE
);
tvVerified
.
setVisibility
(
View
.
GONE
);
tvVerified
.
setVisibility
(
View
.
GONE
);
tvViewPrivileges
.
setText
(
"
会员中心
"
);
tvViewPrivileges
.
setText
(
"
查看会员特权
"
);
mSimpleRefreshLayout
.
setPullDownEnable
(
false
);
mSimpleRefreshLayout
.
setPullDownEnable
(
false
);
}
else
{
}
else
{
tvNickname
.
setVisibility
(
View
.
VISIBLE
);
tvNickname
.
setVisibility
(
View
.
VISIBLE
);
...
...
plugin_member/src/main/java/com/rv.member/MemberCenterActivity.java
View file @
1240f936
...
@@ -296,7 +296,7 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
...
@@ -296,7 +296,7 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
info
=
infoBean
.
getData
();
info
=
infoBean
.
getData
();
if
(
info
!=
null
)
{
if
(
info
!=
null
)
{
GlideManager
.
getInstance
(
this
).
loadImage
(
info
.
getHeadimgurl
(),
ivAvatar
);
GlideManager
.
getInstance
(
this
).
loadImage
(
info
.
getHeadimgurl
(),
ivAvatar
);
tvNickname
.
setText
(
info
.
getUsername
());
tvNickname
.
setText
(
!
TextUtils
.
isEmpty
(
info
.
getNickname
())
?
info
.
getNickname
()
:
info
.
getUsername
());
if
(
info
.
getCertificationStatus
()
==
0
)
{
//实名认证状态:0-未认证,1-已认证
if
(
info
.
getCertificationStatus
()
==
0
)
{
//实名认证状态:0-未认证,1-已认证
verified
=
false
;
verified
=
false
;
tvVerified
.
setText
(
"未实名认证"
);
tvVerified
.
setText
(
"未实名认证"
);
...
...
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