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
2f7ecc59
Commit
2f7ecc59
authored
Aug 08, 2019
by
linfeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug修复
parent
1f85bfed
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
11 additions
and
11 deletions
+11
-11
start_back_icon.xml
RvClient/src/main/res/drawable/start_back_icon.xml
+1
-3
ShareManager.java
...main/java/com/ruiwenliu/wrapper/util/um/ShareManager.java
+1
-0
bottom_backgroud.png
..._resource/src/main/res/drawable-hdpi/bottom_backgroud.png
+0
-0
bottom_backgroud2.png
...resource/src/main/res/drawable-hdpi/bottom_backgroud2.png
+0
-0
bottom_backgroud2.png
...esource/src/main/res/drawable-xhdpi/bottom_backgroud2.png
+0
-0
bottom_backgroud2.png
...source/src/main/res/drawable-xxhdpi/bottom_backgroud2.png
+0
-0
bottom_backgroud2.png
...ource/src/main/res/drawable-xxxhdpi/bottom_backgroud2.png
+0
-0
PostPatActivity.java
...c/main/java/com/xxfc/discovery/other/PostPatActivity.java
+5
-3
GetOnTheCarQRCodeActivity.java
.../module/ui/main/home/order/GetOnTheCarQRCodeActivity.java
+1
-2
activity_get_on_the_car_qrcode.xml
...me/src/main/res/layout/activity_get_on_the_car_qrcode.xml
+2
-2
TravelDetailsActivity.java
...main/java/com/rv/tourism/other/TravelDetailsActivity.java
+1
-1
No files found.
RvClient/src/main/res/drawable/start_back_icon.xml
View file @
2f7ecc59
...
@@ -5,9 +5,7 @@
...
@@ -5,9 +5,7 @@
<solid
android:color=
"@color/colorWrite"
/>
<solid
android:color=
"@color/colorWrite"
/>
</shape>
</shape>
</item>
</item>
<item
<item>
android:bottom=
"@dimen/size_50"
>
<bitmap
<bitmap
android:gravity=
"bottom"
android:gravity=
"bottom"
android:src=
"@drawable/bottom_backgroud2"
android:src=
"@drawable/bottom_backgroud2"
...
...
RvWrapper/src/main/java/com/ruiwenliu/wrapper/util/um/ShareManager.java
View file @
2f7ecc59
...
@@ -2,6 +2,7 @@ package com.ruiwenliu.wrapper.util.um;
...
@@ -2,6 +2,7 @@ package com.ruiwenliu.wrapper.util.um;
import
android.app.Activity
;
import
android.app.Activity
;
import
android.graphics.Bitmap
;
import
android.graphics.Bitmap
;
import
android.text.TextUtils
;
import
com.umeng.socialize.ShareAction
;
import
com.umeng.socialize.ShareAction
;
import
com.umeng.socialize.UMShareListener
;
import
com.umeng.socialize.UMShareListener
;
...
...
component_resource/src/main/res/drawable-hdpi/bottom_backgroud.png
deleted
100644 → 0
View file @
1f85bfed
31.4 KB
component_resource/src/main/res/drawable-hdpi/bottom_backgroud2.png
0 → 100644
View file @
2f7ecc59
6.13 KB
component_resource/src/main/res/drawable-xhdpi/bottom_backgroud2.png
View replaced file @
1f85bfed
View file @
2f7ecc59
16.6 KB
|
W:
|
H:
13 KB
|
W:
|
H:
2-up
Swipe
Onion skin
component_resource/src/main/res/drawable-xxhdpi/bottom_backgroud2.png
0 → 100644
View file @
2f7ecc59
20 KB
component_resource/src/main/res/drawable-xxxhdpi/bottom_backgroud2.png
0 → 100644
View file @
2f7ecc59
33.1 KB
module_discovery/src/main/java/com/xxfc/discovery/other/PostPatActivity.java
View file @
2f7ecc59
...
@@ -101,6 +101,7 @@ public class PostPatActivity extends BaseStatusActivity<DiscoveryPresenter> {
...
@@ -101,6 +101,7 @@ public class PostPatActivity extends BaseStatusActivity<DiscoveryPresenter> {
private
double
lonLongitude
;
private
double
lonLongitude
;
private
LatLng
mLatLng
;
//当前城市经纬度
private
LatLng
mLatLng
;
//当前城市经纬度
private
String
addrStr
;
private
String
addrStr
;
private
String
address
;
private
LocationManager
locationManager
;
private
LocationManager
locationManager
;
private
ArrayList
<
ImageSources
>
sourcesList
;
private
ArrayList
<
ImageSources
>
sourcesList
;
...
@@ -163,13 +164,14 @@ public class PostPatActivity extends BaseStatusActivity<DiscoveryPresenter> {
...
@@ -163,13 +164,14 @@ public class PostPatActivity extends BaseStatusActivity<DiscoveryPresenter> {
map
.
put
(
"text"
,
etContent
.
getText
().
toString
());
map
.
put
(
"text"
,
etContent
.
getText
().
toString
());
map
.
put
(
"images"
,
JSON
.
toJSONString
(
sourcesList
));
map
.
put
(
"images"
,
JSON
.
toJSONString
(
sourcesList
));
if
(!
TextUtils
.
isEmpty
(
addrStr
))
{
if
(!
TextUtils
.
isEmpty
(
address
))
{
addrStr
=
address
;
// 纬度
// 纬度
map
.
put
(
"latitude"
,
String
.
valueOf
(
latLatitude
));
map
.
put
(
"latitude"
,
String
.
valueOf
(
latLatitude
));
// 经度
// 经度
map
.
put
(
"longitude"
,
String
.
valueOf
(
lonLongitude
));
map
.
put
(
"longitude"
,
String
.
valueOf
(
lonLongitude
));
// 位置
// 位置
map
.
put
(
"location"
,
addr
Str
);
map
.
put
(
"location"
,
addr
ess
);
}
}
map
.
put
(
"cityId"
,
"0"
);
map
.
put
(
"cityId"
,
"0"
);
map
.
put
(
"time"
,
DateUtils
.
getCurTimeMillis
());
map
.
put
(
"time"
,
DateUtils
.
getCurTimeMillis
());
...
@@ -346,7 +348,7 @@ public class PostPatActivity extends BaseStatusActivity<DiscoveryPresenter> {
...
@@ -346,7 +348,7 @@ public class PostPatActivity extends BaseStatusActivity<DiscoveryPresenter> {
}
else
if
(
requestCode
==
210
&&
resultCode
==
Activity
.
RESULT_OK
){
}
else
if
(
requestCode
==
210
&&
resultCode
==
Activity
.
RESULT_OK
){
latLatitude
=
data
.
getDoubleExtra
(
"latitude"
,
0
);
latLatitude
=
data
.
getDoubleExtra
(
"latitude"
,
0
);
lonLongitude
=
data
.
getDoubleExtra
(
"longitude"
,
0
);
lonLongitude
=
data
.
getDoubleExtra
(
"longitude"
,
0
);
addr
Str
=
data
.
getStringExtra
(
"location"
);
addr
ess
=
data
.
getStringExtra
(
"location"
);
tvPatAddress
.
setText
(
data
.
getStringExtra
(
"location"
));
tvPatAddress
.
setText
(
data
.
getStringExtra
(
"location"
));
}
}
}
}
...
...
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/GetOnTheCarQRCodeActivity.java
View file @
2f7ecc59
...
@@ -110,8 +110,7 @@ public class GetOnTheCarQRCodeActivity extends BaseStatusActivity<PickerPresente
...
@@ -110,8 +110,7 @@ public class GetOnTheCarQRCodeActivity extends BaseStatusActivity<PickerPresente
}
}
public
static
Bitmap
createQRImage
(
String
content
,
int
widthPix
,
int
heightPix
,
public
static
Bitmap
createQRImage
(
String
content
,
int
widthPix
,
int
heightPix
,
Bitmap
logoBm
)
{
Bitmap
logoBm
)
{
try
{
try
{
//配置参数
//配置参数
Map
<
EncodeHintType
,
Object
>
hints
=
new
HashMap
<>();
Map
<
EncodeHintType
,
Object
>
hints
=
new
HashMap
<>();
...
...
module_home/src/main/res/layout/activity_get_on_the_car_qrcode.xml
View file @
2f7ecc59
...
@@ -125,7 +125,7 @@
...
@@ -125,7 +125,7 @@
android:textSize=
"@dimen/text_10"
/>
android:textSize=
"@dimen/text_10"
/>
<TextView
<TextView
android:id=
"@+id/tv_
ou
t_address"
android:id=
"@+id/tv_
ge
t_address"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/size_2"
android:layout_marginLeft=
"@dimen/size_2"
...
@@ -150,7 +150,7 @@
...
@@ -150,7 +150,7 @@
android:textSize=
"@dimen/text_10"
/>
android:textSize=
"@dimen/text_10"
/>
<TextView
<TextView
android:id=
"@+id/tv_
ge
t_address"
android:id=
"@+id/tv_
ou
t_address"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/size_2"
android:layout_marginLeft=
"@dimen/size_2"
...
...
module_tourism/src/main/java/com/rv/tourism/other/TravelDetailsActivity.java
View file @
2f7ecc59
...
@@ -128,7 +128,7 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
...
@@ -128,7 +128,7 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
initWeb
();
initWeb
();
initRxbus
();
initRxbus
();
if
(!
TextUtils
.
isEmpty
(
name
)
&&
!
TextUtils
.
isEmpty
(
url
))
{
if
(!
TextUtils
.
isEmpty
(
name
)
&&
!
TextUtils
.
isEmpty
(
url
))
{
initShare
(
webUrl
+
"&shareType=app"
,
name
,
""
,
url
);
initShare
(
webUrl
+
"&shareType=app"
,
name
,
"
"
,
url
);
}
}
mWebView
.
loadUrl
(
"JavaScript:getTourStock()"
);
// Android调用h5
mWebView
.
loadUrl
(
"JavaScript:getTourStock()"
);
// Android调用h5
...
...
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