Commit 1eab8524 authored by linfeng's avatar linfeng

bug修复

parent 7f290bda
......@@ -10,6 +10,7 @@ import android.view.View;
import com.ruiwenliu.wrapper.SPConstance;
import com.ruiwenliu.wrapper.base.BaseActivity;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.statusbar.StatusBarUtil;
import com.ruiwenliu.wrapper.util.UtilsManager;
import com.ruiwenliu.wrapper.weight.TitleView;
import com.rv.component.utils.Cookie;
......@@ -108,6 +109,7 @@ public class WelcomeActivity extends BaseActivity<CommonPresenter> {
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// this.getWindow().getDecorView().setBackground(null);
getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_FULLSCREEN);
}
}
......@@ -8,7 +8,8 @@
<item>
<bitmap
android:gravity="bottom"
android:scaleType="centerCrop"
android:src="@drawable/bottom_backgroud2"
/>
android:tileMode="disabled" />
</item>
</layer-list>
\ No newline at end of file
......@@ -155,9 +155,6 @@ public class GlideManager {
// .apply(RequestOptions.bitmapTransform(new CenterCrop(),new RoundedCorners(round)))
.apply(RequestOptions.bitmapTransform(new GlideRoundTransform(mContext, round)))
.into(image);
}
......
......@@ -21,9 +21,10 @@ import com.umeng.socialize.utils.ShareBoardlistener;
public class ShareManager extends ShareAction {
private Activity mActivity;
public ShareManager(Activity activity, ShareBoardlistener boardListener) {
super(activity);
mActivity=activity;
mActivity = activity;
this.setDisplayList(
SHARE_MEDIA.WEIXIN, SHARE_MEDIA.WEIXIN_CIRCLE, SHARE_MEDIA.WEIXIN_FAVORITE,
SHARE_MEDIA.QQ, SHARE_MEDIA.QZONE)
......@@ -32,15 +33,14 @@ public class ShareManager extends ShareAction {
/**
*
* @param activity
* @param boardListener
* @param bill
* @param copy
*/
public ShareManager(Activity activity, ShareBoardlistener boardListener,String bill,String copy) {
public ShareManager(Activity activity, ShareBoardlistener boardListener, String bill, String copy) {
super(activity);
mActivity=activity;
mActivity = activity;
this.setDisplayList(
SHARE_MEDIA.WEIXIN, SHARE_MEDIA.WEIXIN_CIRCLE, SHARE_MEDIA.WEIXIN_FAVORITE,
SHARE_MEDIA.QQ, SHARE_MEDIA.QZONE)
......@@ -51,14 +51,13 @@ public class ShareManager extends ShareAction {
/**
*
* @param activity
* @param boardListener
* @param copy
*/
public ShareManager(Activity activity, ShareBoardlistener boardListener,String copy) {
public ShareManager(Activity activity, ShareBoardlistener boardListener, String copy) {
super(activity);
mActivity=activity;
mActivity = activity;
this.setDisplayList(
SHARE_MEDIA.WEIXIN, SHARE_MEDIA.WEIXIN_CIRCLE, SHARE_MEDIA.WEIXIN_FAVORITE,
SHARE_MEDIA.QQ, SHARE_MEDIA.QZONE)
......@@ -67,68 +66,73 @@ public class ShareManager extends ShareAction {
}
/**
*
* 分享链接
* @param share_media 分享的类型微信、QQ
* @param url 分享的链接地址
* @param title 分享的标题
* @param content 分享的内容
* @param drawable 分享的drawable图片
*
* @param share_media 分享的类型微信、QQ
* @param url 分享的链接地址
* @param title 分享的标题
* @param content 分享的内容
* @param drawable 分享的drawable图片
* @param umShareListener 分享流程监听
* @param <T>
*/
public <T extends UMShareListener>void showShare(SHARE_MEDIA share_media, String url, String title, String content, int drawable, T umShareListener){
public <T extends UMShareListener> void showShare(SHARE_MEDIA share_media, String url, String title, String content, int drawable, T umShareListener) {
UMWeb web = new UMWeb(url);
web.setTitle(title);
web.setDescription(content);
web.setThumb(new UMImage(mActivity,drawable));
shareWebContent(share_media,web,umShareListener);
web.setThumb(new UMImage(mActivity, drawable));
shareWebContent(share_media, web, umShareListener);
}
/**
*
* 分享链接
* @param share_media 分享的类型微信、QQ
* @param url 分享的链接地址
* @param title 分享的标题
* @param content 分享的内容
* @param imgUrl 分享的网络图片地址
*
* @param share_media 分享的类型微信、QQ
* @param url 分享的链接地址
* @param title 分享的标题
* @param content 分享的内容
* @param imgUrl 分享的网络图片地址
* @param umShareListener 分享流程监听
* @param <T>
*/
public <T extends UMShareListener>void showShare(SHARE_MEDIA share_media, String url, String title, String content, String imgUrl, T umShareListener){
public <T extends UMShareListener> void showShare(SHARE_MEDIA share_media, String url, String title, String content, String imgUrl, T umShareListener) {
UMWeb web = new UMWeb(url);
web.setTitle(title);
web.setDescription(content);
web.setThumb(new UMImage(mActivity,imgUrl));
shareWebContent(share_media,web,umShareListener);
web.setThumb(new UMImage(mActivity, imgUrl));
shareWebContent(share_media, web, umShareListener);
}
/**
*
* 分享图片
* @param share_media 分享的类型微信、QQ
*
* @param share_media 分享的类型微信、QQ
* @param umShareListener 分享流程监听
* @param <T>
*/
public <T extends UMShareListener>void showShareImage(SHARE_MEDIA share_media, Bitmap bitmap, T umShareListener){
UMImage umImage=new UMImage(mActivity,bitmap);
shareWebContent(share_media,umImage,umShareListener);
public <T extends UMShareListener> void showShareImage(SHARE_MEDIA share_media, Bitmap bitmap, T umShareListener) {
UMImage umImage = new UMImage(mActivity, bitmap);
UMImage thumb = new UMImage(mActivity, bitmap);
umImage.setThumb(thumb);
umImage.compressStyle = UMImage.CompressStyle.SCALE;//大小压缩,默认为大小压缩,适合普通很大的图
umImage.compressStyle = UMImage.CompressStyle.QUALITY;//质量压缩,适合长图的分享
umImage.compressFormat = Bitmap.CompressFormat.PNG;
shareWebContent(share_media, umImage, umShareListener);
}
public <T extends UMShareListener>void showShareImage2(SHARE_MEDIA share_media, UMImage umImage, T umShareListener){
shareWebContent(share_media,umImage,umShareListener);
public <T extends UMShareListener> void showShareImage2(SHARE_MEDIA share_media, UMImage umImage, T umShareListener) {
shareWebContent(share_media, umImage, umShareListener);
}
public void shareWebContent(SHARE_MEDIA share_media, UMWeb umWeb, UMShareListener umShareListener){
public void shareWebContent(SHARE_MEDIA share_media, UMWeb umWeb, UMShareListener umShareListener) {
new ShareAction(mActivity).withMedia(umWeb)
.setPlatform(share_media)
.setCallback(umShareListener)
.share();
}
public void shareWebContent(SHARE_MEDIA share_media, UMImage image, UMShareListener umShareListener){
public void shareWebContent(SHARE_MEDIA share_media, UMImage image, UMShareListener umShareListener) {
new ShareAction(mActivity).withMedia(image)
.setPlatform(share_media)
.setCallback(umShareListener)
......
......@@ -121,7 +121,11 @@ public class PatGeneratePosterActivity extends BaseStatusActivity<PickerPresente
// GlideManager.getInstance(mActivity).loadRoundImage(, imgBillTop, 8);
tvContent.setText(content);
GlideManager.getInstance(mActivity).loadCircleImage(userUrl, ringHeader);
if (!TextUtils.isEmpty(userUrl)) {
GlideManager.getInstance(mActivity).loadCircleImage(userUrl, ringHeader);
}else {
ringHeader.setImageResource(R.drawable.icon_bill_defult);
}
tvUsername.setText(userName);
}
......
......@@ -23,7 +23,8 @@
android:id="@+id/rl_goods"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_15"
android:background="@color/colorWrite"
android:paddingTop="@dimen/size_15"
android:padding="@dimen/size_15">
<ImageView
......
......@@ -207,6 +207,8 @@ public class CarPosterActivity extends BaseStatusActivity<CommonPresenter> {
}
if (file != null) {
image = new UMImage(mActivity, file);//bitmap文件
UMImage thumb = new UMImage(this, file);
image.setThumb(thumb);
image.compressStyle = UMImage.CompressStyle.SCALE;//大小压缩,默认为大小压缩,适合普通很大的图
image.compressStyle = UMImage.CompressStyle.QUALITY;//质量压缩,适合长图的分享
image.compressFormat = Bitmap.CompressFormat.PNG;
......
......@@ -110,7 +110,9 @@ public class PosterActivity extends BaseStatusActivity<CommonPresenter> {
String name = userInfoBean.getData().getNickname();
String url = userInfoBean.getData().getHeadimgurl();
if (!TextUtils.isEmpty(url)) {
GlideManager.getInstance(getApplicationContext()).loadImage(url, ringHeader, R.drawable.icon_bill_defult);
GlideManager.getInstance(mActivity).loadCircleImage(url, ringHeader);
} else {
ringHeader.setImageResource(R.drawable.icon_bill_defult);
}
if (!TextUtils.isEmpty(name)) {
tvName.setText(name);
......@@ -207,6 +209,8 @@ public class PosterActivity extends BaseStatusActivity<CommonPresenter> {
}
if (file != null) {
image = new UMImage(mActivity, file);//bitmap文件
UMImage thumb = new UMImage(this, file);
image.setThumb(thumb);
image.compressStyle = UMImage.CompressStyle.SCALE;//大小压缩,默认为大小压缩,适合普通很大的图
image.compressStyle = UMImage.CompressStyle.QUALITY;//质量压缩,适合长图的分享
image.compressFormat = Bitmap.CompressFormat.PNG;
......
......@@ -26,9 +26,9 @@
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_10"
android:layout_marginTop="@dimen/size_10"
android:layout_marginRight="@dimen/size_10"
android:layout_marginLeft="@dimen/size_5"
android:layout_marginTop="@dimen/size_5"
android:layout_marginRight="@dimen/size_5"
android:layout_marginBottom="@dimen/size_5"
android:scrollbars="none">
......@@ -48,6 +48,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginBottom="@dimen/size_10"
android:gravity="center_vertical"
android:orientation="horizontal">
......@@ -105,6 +106,7 @@
android:id="@+id/img_qrcode"
android:layout_width="@dimen/size_60"
android:layout_height="@dimen/size_60"
android:layout_marginRight="@dimen/size_5"
android:layout_marginLeft="@dimen/size_10" />
</LinearLayout>
</LinearLayout>
......
......@@ -26,9 +26,9 @@
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_10"
android:layout_marginTop="@dimen/size_10"
android:layout_marginRight="@dimen/size_10"
android:layout_marginLeft="@dimen/size_5"
android:layout_marginTop="@dimen/size_5"
android:layout_marginRight="@dimen/size_5"
android:layout_marginBottom="@dimen/size_5"
android:scrollbars="none">
......@@ -48,6 +48,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_10"
android:layout_marginBottom="@dimen/size_10"
android:gravity="center_vertical"
android:orientation="horizontal">
......@@ -91,7 +92,8 @@
android:layout_width="@dimen/size_60"
android:layout_height="@dimen/size_60"
android:layout_gravity="center_vertical"
android:layout_marginLeft="@dimen/size_10" />
android:layout_marginLeft="@dimen/size_10"
android:layout_marginRight="@dimen/size_5" />
</LinearLayout>
</LinearLayout>
......
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