修改两个活动的海报页面

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

@@ -34,9 +34,9 @@ import butterknife.OnClick;
  */
 public class BillActivity extends BaseStatusActivity<BillPresenter> {
 
-    @BindView(R2.id.tv_back_title)
-    TextView tvBackTitle;
-    @BindView(R2.id.btn_share)
+    //    @BindView(R2.id.tv_back_title)
+//    TextView tvBackTitle;
+    @BindView(R2.id.btn_share_bill)
     Button btnShare;
     @BindView(R2.id.ll_webview)
     CardView llContent;
@@ -50,11 +50,11 @@ public class BillActivity extends BaseStatusActivity<BillPresenter> {
         return intent;
     }
 
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        StatusBarUtil.setRootViewFitsSystemWindows(mActivity, false);
-    }
+//    @Override
+//    protected void onCreate(Bundle savedInstanceState) {
+//        super.onCreate(savedInstanceState);
+//        StatusBarUtil.setRootViewFitsSystemWindows(mActivity, false);
+//    }
 
     @Override
     protected int setLayout() {
@@ -66,7 +66,8 @@ public class BillActivity extends BaseStatusActivity<BillPresenter> {
     protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
 
         url = intent.getStringExtra("billUrl");
-        titleView.setVisibility(View.GONE);
+        titleView.setVisibility(View.VISIBLE);
+        titleView.setTitle("生成海报");
 
         rvWebView = new RvWebView(getApplicationContext(), listener);
         llContent.addView(rvWebView);
@@ -113,13 +114,13 @@ public class BillActivity extends BaseStatusActivity<BillPresenter> {
         super.onDestroy();
     }
 
-    @OnClick({R2.id.tv_back_title, R2.id.btn_share})
+    @OnClick({R2.id.btn_share_bill, R2.id.btn_save_bill})
     public void onViewClicked(View view) {
         int id = view.getId();
-        if (id == R.id.tv_back_title) {
-            finish();
-        } else if (id == R.id.btn_share) {
+        if (id == R.id.btn_share_bill) {
             preShare();
+        } else if (id == R.id.btn_save_bill) {
+            mPresenter.saveBill(llContent);
         }
     }
 

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

@@ -146,11 +146,17 @@ public class WebViewActivity extends BaseStatusActivity<WebViewPresenter> {
                     ivTitleRight.setImageResource(R.drawable.tourism_rv_rentingcar_icon_share);
                 }
             });
-            final String billUrl = RvFrameConfig.HOST + "/h5/appHtml/view/newPeoplePoster.html";
+            String billUrl = null;
+            if (!TextUtils.isEmpty(url) && url.contains("invitationCourtesyShare.html")) {
+                billUrl = RvFrameConfig.HOST + "/h5/appHtml/view/poster.html";
+            } else if (!TextUtils.isEmpty(url) && url.contains("newPeopleH5.html")) {
+                billUrl = RvFrameConfig.HOST + "/h5/appHtml/view/newPeoplePoster.html";
+            }
+            final String finalBillUrl = billUrl;
             ivTitleRight.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    mPresenter.showShareDialog(url, imgUrl, title, circleTitle, desc, billUrl);
+                    mPresenter.showShareDialog(url, imgUrl, title, circleTitle, desc, finalBillUrl);
                 }
             });
         }

plugin_share/src/main/java/com/rv/share/presenter/BillPresenter.java

@@ -8,8 +8,10 @@ import android.support.v7.widget.CardView;
 import android.util.Log;
 import android.view.View;
 import android.webkit.WebView;
+import android.widget.Toast;
 
 import com.ruiwenliu.wrapper.base.presenter.CommonPresenter;
+import com.rv.component.utils.ShareUtils;
 import com.rv.component.utils.StorageUtils;
 import com.rv.share.view.ShareChoiceDialog;
 import com.umeng.socialize.ShareAction;
@@ -45,6 +47,22 @@ public class BillPresenter extends CommonPresenter {
         dialog.show();
     }
 
+    /*****
+     * 保存海报
+     * @param view
+     */
+    public void saveBill(View view) {
+        if (view != null) {
+            Bitmap bitmap = ShareUtils.viewConversionBitmap(view);
+            File file = null;
+            if (bitmap != null) {
+                file = ShareUtils.saveBitmapFile(getPresenterContext(), bitmap);
+            }
+            if (file != null) {
+                Toast.makeText(getPresenterContext(), "海报保存在" + file.getAbsolutePath(), Toast.LENGTH_LONG).show();
+            }
+        }
+    }
     /******
      * 分享地址
      * @param var1

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" />
+    <corners android:radius="@dimen/size_30" />
     <solid android:color="@color/white" />
 </shape>
\ No newline at end of file

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

@@ -4,54 +4,41 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#FE6E2F"
+    android:background="#FBE4B3"
     tools:context=".BillActivity">
 
-    <com.ruiwenliu.wrapper.statusbar.StatusBarHeightView
-        android:id="@+id/ll_item_title"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        app:use_type="use_padding_top">
-
-        <TextView
-            android:id="@+id/tv_back_title"
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/size_40"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentTop="true"
-            android:layout_marginLeft="@dimen/dp_10"
-            android:drawableLeft="@drawable/rv_common_icon_back_white"
-            android:drawablePadding="@dimen/size_5"
-            android:gravity="center_vertical"
-            android:text="生成海报"
-            android:textColor="@color/white"
-            android:textSize="@dimen/text_18" />
-    </com.ruiwenliu.wrapper.statusbar.StatusBarHeightView>
-
     <LinearLayout
         android:id="@+id/ll_bottom"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
         android:layout_alignParentBottom="true"
-        android:layout_marginBottom="@dimen/dp_10"
         android:gravity="center"
-        android:orientation="vertical">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="分享海报，可以让好友一起参加啦~"
-            android:textColor="@color/gray_f5f5f5"
-            android:textSize="@dimen/sp_12" />
+        android:orientation="horizontal"
+        android:paddingBottom="@dimen/size_15">
 
         <Button
-            android:id="@+id/btn_share"
-            android:layout_width="match_parent"
+            android:id="@+id/btn_save_bill"
+            android:layout_width="0dp"
             android:layout_height="@dimen/size_48"
-            android:layout_marginLeft="@dimen/dp_10"
+            android:layout_marginLeft="@dimen/size_15"
             android:layout_marginTop="@dimen/size_5"
             android:layout_marginRight="@dimen/dp_10"
+            android:layout_weight="1"
+            android:background="@drawable/bg_btn_bill_save"
+            android:gravity="center"
+            android:text="保存海报"
+            android:textColor="#FE9C36"
+            android:textSize="@dimen/sp_16" />
+
+        <Button
+            android:id="@+id/btn_share_bill"
+            android:layout_width="0dp"
+            android:layout_height="@dimen/size_48"
+            android:layout_marginLeft="@dimen/size_15"
+            android:layout_marginTop="@dimen/size_5"
+            android:layout_marginRight="@dimen/size_15"
+            android:layout_weight="1"
             android:background="@drawable/shape_rv_bg_dark_yellow"
             android:gravity="center"
             android:text="立即分享"
@@ -65,10 +52,10 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/ll_item_title"
-        android:layout_marginBottom="@dimen/size_100"
-        android:layout_marginLeft="@dimen/dp_10"
-        android:layout_marginTop="@dimen/size_30"
-        android:layout_marginRight="@dimen/dp_10"
+        android:layout_marginLeft="@dimen/size_15"
+        android:layout_marginTop="@dimen/size_15"
+        android:layout_marginRight="@dimen/size_15"
+        android:layout_marginBottom="@dimen/size_80"
         android:background="@drawable/shape_rv_bg_bill"
         android:orientation="vertical"
         app:cardCornerRadius="5dp" />