Commit 2f7ecc59 authored by linfeng's avatar linfeng

bug修复

parent 1f85bfed
...@@ -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"
......
...@@ -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;
......
...@@ -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", addrStr); map.put("location", address);
} }
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);
addrStr = data.getStringExtra("location"); address = data.getStringExtra("location");
tvPatAddress.setText(data.getStringExtra("location")); tvPatAddress.setText(data.getStringExtra("location"));
} }
} }
......
...@@ -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<>();
......
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
android:textSize="@dimen/text_10" /> android:textSize="@dimen/text_10" />
<TextView <TextView
android:id="@+id/tv_out_address" android:id="@+id/tv_get_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_get_address" android:id="@+id/tv_out_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"
......
...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment