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
61657794
Commit
61657794
authored
Nov 25, 2019
by
linfeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
海报修改
parent
5da3d590
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
123 additions
and
8 deletions
+123
-8
CarPosterActivity.java
...src/main/java/com/rv/poster/plugin/CarPosterActivity.java
+10
-0
PosterActivity.java
...er/src/main/java/com/rv/poster/plugin/PosterActivity.java
+10
-0
activity_carposter.xml
plugin_poster/src/main/res/layout/activity_carposter.xml
+27
-1
activity_poster.xml
plugin_poster/src/main/res/layout/activity_poster.xml
+25
-1
ReativeBillActivity.java
...share/src/main/java/com/rv/share/ReativeBillActivity.java
+16
-0
activity_reative_bill.xml
plugin_share/src/main/res/layout/activity_reative_bill.xml
+35
-6
No files found.
plugin_poster/src/main/java/com/rv/poster/plugin/CarPosterActivity.java
View file @
61657794
...
...
@@ -23,6 +23,7 @@ import com.bumptech.glide.Glide;
import
com.bumptech.glide.load.resource.bitmap.RoundedCorners
;
import
com.bumptech.glide.request.RequestOptions
;
import
com.frame.base.url.Constance
;
import
com.ruiwenliu.wrapper.SPConstance
;
import
com.ruiwenliu.wrapper.base.BaseBean
;
import
com.ruiwenliu.wrapper.base.BaseStatusActivity
;
import
com.ruiwenliu.wrapper.base.presenter.CommonPresenter
;
...
...
@@ -31,6 +32,7 @@ import com.ruiwenliu.wrapper.util.glide.GlideOptions;
import
com.ruiwenliu.wrapper.util.um.CustomShareListener
;
import
com.ruiwenliu.wrapper.util.um.ShareManager
;
import
com.ruiwenliu.wrapper.weight.TitleView
;
import
com.rv.component.utils.Cookie
;
import
com.rv.component.utils.DisplayUtil
;
import
com.rv.component.utils.IsAppInstall
;
import
com.rv.component.utils.ShareUtils
;
...
...
@@ -82,6 +84,9 @@ public class CarPosterActivity extends BaseStatusActivity<CommonPresenter> {
@BindView
(
R2
.
id
.
scrollView
)
ScrollView
scrollView
;
@BindView
(
R2
.
id
.
tv_invitation_code
)
TextView
tvInvitationCode
;
private
ShareManager
shareManager
;
private
Bitmap
bitmap
=
null
;
...
...
@@ -118,6 +123,11 @@ public class CarPosterActivity extends BaseStatusActivity<CommonPresenter> {
tvContent
.
setText
(
content
);
tvPrice
.
setText
(
"¥"
+
price
+
"/天"
);
String
userCode
=
Cookie
.
getStringValue
(
this
,
SPConstance
.
USER_JSON_CODE
);
if
(!
TextUtils
.
isEmpty
(
userCode
))
{
tvInvitationCode
.
setText
(
"邀请码"
+
userCode
);
}
}
@Override
...
...
plugin_poster/src/main/java/com/rv/poster/plugin/PosterActivity.java
View file @
61657794
...
...
@@ -23,6 +23,7 @@ import com.bumptech.glide.Glide;
import
com.bumptech.glide.load.resource.bitmap.RoundedCorners
;
import
com.bumptech.glide.request.RequestOptions
;
import
com.frame.base.url.Constance
;
import
com.ruiwenliu.wrapper.SPConstance
;
import
com.ruiwenliu.wrapper.base.BaseBean
;
import
com.ruiwenliu.wrapper.base.BaseStatusActivity
;
import
com.ruiwenliu.wrapper.base.presenter.CommonPresenter
;
...
...
@@ -34,6 +35,7 @@ import com.ruiwenliu.wrapper.util.um.CustomShareListener;
import
com.ruiwenliu.wrapper.util.um.ShareManager
;
import
com.ruiwenliu.wrapper.weight.TitleView
;
import
com.rv.component.utils.CacheEnum
;
import
com.rv.component.utils.Cookie
;
import
com.rv.component.utils.DisplayUtil
;
import
com.rv.component.utils.IsAppInstall
;
import
com.rv.component.utils.RvCache
;
...
...
@@ -76,6 +78,9 @@ public class PosterActivity extends BaseStatusActivity<CommonPresenter> {
@BindView
(
R2
.
id
.
scrollView
)
ScrollView
scrollView
;
@BindView
(
R2
.
id
.
tv_invitation_code
)
TextView
tvInvitationCode
;
private
ShareManager
shareManager
;
private
Bitmap
bitmap
=
null
;
...
...
@@ -124,6 +129,11 @@ public class PosterActivity extends BaseStatusActivity<CommonPresenter> {
GlideManager
.
getInstance
(
mActivity
).
loadCircleImage
(
"https://mgmt.dfangche.com/image/app/default_avatar.png"
,
ringHeader
);
tvName
.
setText
(
"滴房车"
);
}
String
userCode
=
Cookie
.
getStringValue
(
this
,
SPConstance
.
USER_JSON_CODE
);
if
(!
TextUtils
.
isEmpty
(
userCode
))
{
tvInvitationCode
.
setText
(
"邀请码"
+
userCode
);
}
}
...
...
plugin_poster/src/main/res/layout/activity_carposter.xml
View file @
61657794
...
...
@@ -66,6 +66,7 @@
android:layout_height=
"wrap_content"
android:maxLines=
"1"
android:singleLine=
"true"
android:text=
"2222222222222222222"
android:textColor=
"@color/colorMain"
android:textSize=
"@dimen/text_16"
/>
...
...
@@ -76,6 +77,7 @@
android:layout_marginTop=
"@dimen/size_3"
android:maxLines=
"1"
android:singleLine=
"true"
android:text=
"2222222222222222222"
android:textColor=
"@color/textGray"
android:textSize=
"@dimen/text_10"
/>
...
...
@@ -85,15 +87,39 @@
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/size_3"
android:singleLine=
"true"
android:text=
"2222222222222222222"
android:textColor=
"@color/colorAuxiliaryRed"
android:textSize=
"@dimen/text_14"
/>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/size_5"
android:orientation=
"horizontal"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"邀请你一起租房车"
android:textColor=
"@color/text_Gray"
android:textSize=
"@dimen/text_10"
/>
<TextView
android:id=
"@+id/tv_invitation_code"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/size_5"
android:text=
""
android:textColor=
"@color/text_Gray"
android:textSize=
"@dimen/text_10"
/>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"right"
android:layout_gravity=
"right
|center_vertical
"
android:layout_marginLeft=
"@dimen/size_10"
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
>
...
...
plugin_poster/src/main/res/layout/activity_poster.xml
View file @
61657794
...
...
@@ -76,12 +76,36 @@
android:textColor=
"@color/textGray"
android:textSize=
"@dimen/text_15"
/>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/size_5"
android:orientation=
"horizontal"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"邀请你一起参加"
android:textColor=
"@color/text_Gray"
android:textSize=
"@dimen/text_10"
/>
<TextView
android:id=
"@+id/tv_invitation_code"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/size_5"
android:text=
""
android:textColor=
"@color/text_Gray"
android:textSize=
"@dimen/text_10"
/>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"right"
android:layout_gravity=
"right
|center_vertical
"
android:layout_marginLeft=
"@dimen/size_10"
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
>
...
...
plugin_share/src/main/java/com/rv/share/ReativeBillActivity.java
View file @
61657794
...
...
@@ -25,6 +25,7 @@ import com.bumptech.glide.Glide;
import
com.bumptech.glide.load.resource.bitmap.RoundedCorners
;
import
com.bumptech.glide.request.RequestOptions
;
import
com.frame.base.url.ImageUrl
;
import
com.ruiwenliu.wrapper.SPConstance
;
import
com.ruiwenliu.wrapper.base.BaseBean
;
import
com.ruiwenliu.wrapper.base.BaseStatusActivity
;
import
com.ruiwenliu.wrapper.bean.UserInfoBean
;
...
...
@@ -32,6 +33,7 @@ import com.ruiwenliu.wrapper.util.glide.GlideManager;
import
com.ruiwenliu.wrapper.util.glide.GlideOptions
;
import
com.ruiwenliu.wrapper.weight.TitleView
;
import
com.rv.component.utils.CacheEnum
;
import
com.rv.component.utils.Cookie
;
import
com.rv.component.utils.DisplayUtil
;
import
com.rv.component.utils.RvCache
;
import
com.rv.component.utils.ZxingUtils
;
...
...
@@ -39,6 +41,7 @@ import com.rv.share.presenter.ReativeBillPresenter;
import
com.rv.share.utils.TransformationUtils
;
import
butterknife.BindView
;
import
butterknife.ButterKnife
;
import
butterknife.OnClick
;
/*******
...
...
@@ -46,6 +49,8 @@ import butterknife.OnClick;
*/
public
class
ReativeBillActivity
extends
BaseStatusActivity
<
ReativeBillPresenter
>
{
@BindView
(
R2
.
id
.
tv_invitation_code
)
TextView
tvInvitationCode
;
private
String
url
;
@BindView
(
R2
.
id
.
ring_header
)
RoundImageView
roundImageView
;
...
...
@@ -109,6 +114,11 @@ public class ReativeBillActivity extends BaseStatusActivity<ReativeBillPresenter
tvPhone
.
setText
(
name
);
}
}
String
userCode
=
Cookie
.
getStringValue
(
this
,
SPConstance
.
USER_JSON_CODE
);
if
(!
TextUtils
.
isEmpty
(
userCode
))
{
tvInvitationCode
.
setText
(
"邀请码"
+
userCode
);
}
}
@Override
...
...
@@ -175,4 +185,10 @@ public class ReativeBillActivity extends BaseStatusActivity<ReativeBillPresenter
}
@Override
protected
void
onCreate
(
Bundle
savedInstanceState
)
{
super
.
onCreate
(
savedInstanceState
);
// TODO: add setContentView(...) invocation
ButterKnife
.
bind
(
this
);
}
}
plugin_share/src/main/res/layout/activity_reative_bill.xml
View file @
61657794
...
...
@@ -46,7 +46,7 @@
android:layout_marginLeft=
"@dimen/size_10"
android:layout_marginTop=
"@dimen/size_10"
android:layout_marginRight=
"@dimen/size_10"
android:layout_marginBottom=
"@dimen/size_
10
"
android:layout_marginBottom=
"@dimen/size_
5
"
android:scrollbars=
"none"
>
<LinearLayout
...
...
@@ -89,13 +89,30 @@
android:textColor=
"@color/textGray"
android:textSize=
"@dimen/text_15"
/>
<TextView
android:layout_width=
"wrap_content"
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/size_5"
android:text=
"邀请你一起参加"
android:textColor=
"@color/text_Gray"
android:textSize=
"@dimen/text_10"
/>
android:orientation=
"horizontal"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"邀请你一起参加"
android:textColor=
"@color/text_Gray"
android:textSize=
"@dimen/text_10"
/>
<TextView
android:id=
"@+id/tv_invitation_code"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/size_5"
android:text=
""
android:textColor=
"@color/text_Gray"
android:textSize=
"@dimen/text_10"
/>
</LinearLayout>
</LinearLayout>
<LinearLayout
...
...
@@ -120,6 +137,18 @@
android:src=
"@drawable/icon_share_wx"
/>
</LinearLayout>
</LinearLayout>
<include
layout=
"@layout/common_line"
/>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/size_5"
android:drawableLeft=
"@drawable/common_icon_logo_small"
android:drawablePadding=
"@dimen/size_3"
android:text=
"房车·让生活更美好"
android:textColor=
"@color/gray_B4B4B4"
android:textSize=
"@dimen/text_8"
/>
</LinearLayout>
</ScrollView>
</android.support.v7.widget.CardView>
...
...
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