修改推广有礼

RvWrapper/src/main/java/com/ruiwenliu/wrapper/util/glide/GlideManager.java

@@ -69,6 +69,23 @@ public class GlideManager {
                 .into(image);
     }
 
+    /**
+     * 加载普通图片
+     *
+     * @param url
+     * @param image
+     */
+    public void loadImage(String url, ImageView image,int defaultImg) {
+        GlideApp.with(mContext)
+                .load(url)
+                .placeholder(defaultImg)
+                .error(R.drawable.glide_icon_error)
+                .apply(new RequestOptions()
+                        .skipMemoryCache(false)
+                        .diskCacheStrategy(DiskCacheStrategy.ALL))
+                .into(image);
+    }
+
 
     /**
      * 加载普通图片

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/SelectShopActivity.java

@@ -245,10 +245,9 @@ public class SelectShopActivity extends BaseStatusActivity<CommonPresenter> impl
         map.put("page", page);
         map.put("limit", 10);
         if (mCityId == 0) {
-            map.put("addrCity", 441900);
-        } else {
-            map.put("addrCity", mCityId);
+            mCityId = 441900;
         }
+        map.put("addrCity", mCityId);
 //        if (mLat > 0) {
 //            map.put("lat", mLat);
 //            map.put("lon", mLon);

module_mine/src/main/res/layout/activity_mine.xml

@@ -268,7 +268,7 @@
                                 android:clickable="false"
                                 android:gravity="center"
                                 android:orientation="vertical"
-                                android:visibility="invisible">
+                                android:visibility="visible">
 
                                 <ImageView
                                     android:layout_width="@dimen/size_25"

plugin_share/src/main/java/com/rv/share/ReativeBillActivity.java

@@ -21,11 +21,15 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import com.base.utils.ui.image.round.RoundImageView;
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
+import com.bumptech.glide.request.RequestOptions;
 import com.ruiwenliu.wrapper.SPConstance;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.bean.UserInfoBean;
 import com.ruiwenliu.wrapper.util.UtilsManager;
 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.DisplayUtil;
@@ -33,6 +37,7 @@ import com.rv.component.utils.RvCache;
 import com.rv.component.utils.ZxingUtils;
 import com.rv.home.rv.module.basic.BaseStatusActivity;
 import com.rv.share.presenter.ReativeBillPresenter;
+import com.rv.share.utils.TransformationUtils;
 import com.yuyife.okgo.OkGoUtil;
 
 import butterknife.BindView;
@@ -53,6 +58,8 @@ public class ReativeBillActivity extends BaseStatusActivity<ReativeBillPresenter
     Button btnShare;
     @BindView(R2.id.ll_bill_content)
     CardView llBillContent;
+    @BindView(R2.id.img_bill_top)
+    ImageView imgBillTop ;
 //    @BindView(R2.id.ll_content)
 //    LinearLayout llContent;
 
@@ -73,16 +80,25 @@ public class ReativeBillActivity extends BaseStatusActivity<ReativeBillPresenter
         url = intent.getStringExtra("url");
         if (!TextUtils.isEmpty(url)) {
             Bitmap bitmap = ZxingUtils.createQRImage(url, DisplayUtil.dip2px(this, 150), DisplayUtil.dip2px(this, 150), BitmapFactory.decodeResource(getResources(),R.mipmap.logo));
-
             imgQrcode.setImageBitmap(bitmap);
         }
 
+        GlideOptions options = GlideOptions.placeholderOf(com.ruiwenliu.wrapper.R.drawable.glide_icon_placeholder).
+                error(com.ruiwenliu.wrapper.R.drawable.glide_icon_error);
+        TransformationUtils utils = new TransformationUtils(imgBillTop);
+        Glide.with(this)
+                .asBitmap()
+                .load(R.drawable.bg_bill)
+                .apply(options)
+                .apply(RequestOptions.bitmapTransform(new RoundedCorners(12)).override(imgBillTop.getWidth(), imgBillTop.getHeight()))
+                .into(utils);
+
         UserInfoBean userInfoBean = (UserInfoBean) RvCache.getInstance(getApplicationContext()).get(CacheEnum.USER);
 
-        String name = userInfoBean.getData().getNickname();
+        String name = userInfoBean.getData().getRealname();
         String url = userInfoBean.getData().getHeadimgurl();
         if (!TextUtils.isEmpty(url)) {
-            GlideManager.getInstance(getApplicationContext()).loadImage3(url, roundImageView);
+            GlideManager.getInstance(getApplicationContext()).loadImage(url, roundImageView,R.drawable.icon_bill_defult);
         }
         if (!TextUtils.isEmpty(name)) {
             tvPhone.setText(name);

plugin_share/src/main/res/drawable/bg_btn_bill_save.xml

 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <!--空心框 圆角 少量红-->
     <corners android:radius="@dimen/size_20" />
-    <stroke
-        android:width="@dimen/ui_dimen_stroke"
-        android:color="@color/colorYellow" />
-    <solid android:color="@color/uiColorTransparency" />
+    <solid android:color="@color/white" />
 </shape>
\ No newline at end of file

plugin_share/src/main/res/layout/activity_reative_bill.xml

@@ -26,7 +26,7 @@
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="#55eeeeee">
+        android:background="#F9D993">
 
         <ScrollView
             android:layout_width="match_parent"
@@ -37,38 +37,32 @@
             android:layout_marginBottom="@dimen/size_70"
             android:scrollbars="none">
 
-            <!--<LinearLayout-->
-            <!--android:background="#55eeeeee"-->
-            <!--android:id="@+id/ll_content"-->
-            <!--android:layout_width="match_parent"-->
-            <!--android:layout_height="match_parent"-->
-            <!--android:gravity="center">-->
-
             <android.support.v7.widget.CardView
                 android:id="@+id/ll_bill_content"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
+                android:background="@color/white"
                 app:cardCornerRadius="5dp">
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_margin="@dimen/size_10"
                     android:gravity="center_horizontal"
                     android:orientation="vertical">
 
                     <ImageView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:src="@drawable/bg_bill" />
+                        android:id="@+id/img_bill_top"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
 
                     <LinearLayout
-                        android:layout_marginRight="@dimen/size_20"
-                        android:layout_marginLeft="@dimen/size_20"
-
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/size_10"
                         android:layout_marginTop="@dimen/size_20"
+                        android:layout_marginRight="@dimen/size_10"
                         android:layout_marginBottom="@dimen/size_15"
                         android:gravity="center_vertical"
                         android:orientation="horizontal">
@@ -77,71 +71,57 @@
                         <com.base.utils.ui.image.round.RoundImageView
                             android:id="@+id/ring_header"
                             android:layout_width="@dimen/size_50"
-                            android:layout_height="@dimen/size_50"
-                            android:layout_marginLeft="@dimen/size_10" />
+                            android:layout_height="@dimen/size_50" />
 
                         <LinearLayout
-                            android:layout_width="wrap_content"
+                            android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="@dimen/size_5"
+                            android:layout_weight="1"
                             android:orientation="vertical">
 
                             <TextView
                                 android:id="@+id/tv_phone"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:text="155****5918"
+                                android:singleLine="false"
+                                android:text="155****59180000000000000000000000"
                                 android:textColor="@color/colorMain"
                                 android:textSize="@dimen/text_18" />
 
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_marginTop="3dp"
+                                android:layout_marginTop="@dimen/size_5"
                                 android:text="邀请你一起参加"
                                 android:textColor="@color/text_Gray"
-                                android:textSize="@dimen/sp_12" />
+                                android:textSize="@dimen/text_10" />
                         </LinearLayout>
 
-
                         <LinearLayout
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent"
                             android:layout_gravity="right"
-                            android:layout_marginRight="17dp"
-                            android:layout_weight="1"
-                            android:gravity="right|center_vertical"
-                            android:orientation="vertical">
+                            android:layout_marginLeft="@dimen/text_10"
+                            android:gravity="center_vertical"
+                            android:orientation="horizontal">
+
+                            <View
+
+                                android:layout_width="1px"
+                                android:layout_height="@dimen/size_60"
+                                android:background="#E1E1E1" />
 
                             <ImageView
                                 android:id="@+id/img_qrcode"
-                                android:layout_width="@dimen/size_80"
-                                android:layout_height="@dimen/size_80"
+                                android:layout_width="@dimen/size_60"
+                                android:layout_height="@dimen/size_60"
+                                android:layout_marginLeft="@dimen/size_20"
                                 android:src="@drawable/icon_share_wx" />
-
-                            <TextView
-                                android:layout_width="@dimen/size_80"
-                                android:layout_height="wrap_content"
-                                android:layout_marginTop="@dimen/size_8"
-                                android:gravity="center"
-                                android:text="长按领奖励"
-                                android:textColor="@color/colorMain"
-                                android:textSize="@dimen/sp_12" />
-
                         </LinearLayout>
 
                     </LinearLayout>
 
-                    <include layout="@layout/common_line" />
-
-                    <ImageView
-                        android:layout_width="wrap_content"
-                        android:layout_height="match_parent"
-                        android:layout_marginLeft="@dimen/size_10"
-                        android:layout_marginTop="5dp"
-                        android:layout_marginBottom="5dp"
-                        android:src="@drawable/icon_reative_bill" />
-
                 </LinearLayout>
 
             </android.support.v7.widget.CardView>
@@ -167,7 +147,7 @@
                 android:background="@drawable/bg_btn_bill_save"
                 android:gravity="center"
                 android:text="保存海报"
-                android:textColor="@color/colorYellow"
+                android:textColor="#FE9C36"
                 android:textSize="@dimen/sp_16" />
 
             <Button