Commit a3fa7278 authored by jianglx's avatar jianglx

修改海报圆角问题

parent e9a2b800
......@@ -53,8 +53,8 @@ public class ReativeBillActivity extends BaseStatusActivity<ReativeBillPresenter
Button btnShare;
@BindView(R2.id.ll_bill_content)
CardView llBillContent;
@BindView(R2.id.ll_content)
LinearLayout llContent;
// @BindView(R2.id.ll_content)
// LinearLayout llContent;
public static Intent getIntent(Context context, String url) {
Intent intent = new Intent(context, ReativeBillActivity.class);
......@@ -112,17 +112,17 @@ public class ReativeBillActivity extends BaseStatusActivity<ReativeBillPresenter
private void preShare(int type, int requestCode) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
if (type == 0) {
mPresenter.saveBill(llContent);
mPresenter.saveBill(llBillContent);
} else {
mPresenter.share(llContent);
mPresenter.share(llBillContent);
}
} else {
if (ContextCompat.checkSelfPermission(this,
Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) {
if (type == 0) {
mPresenter.saveBill(llContent);
mPresenter.saveBill(llBillContent);
} else {
mPresenter.share(llContent);
mPresenter.share(llBillContent);
}
} else {//申请权限
ActivityCompat.requestPermissions(this,
......@@ -137,14 +137,14 @@ public class ReativeBillActivity extends BaseStatusActivity<ReativeBillPresenter
switch (requestCode) {
case 1001:
if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
mPresenter.saveBill(llContent);
mPresenter.saveBill(llBillContent);
} else {
Toast.makeText(getApplicationContext(), "授权失败,无法分享海报", Toast.LENGTH_SHORT).show();
}
break;
case 1002:
if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
mPresenter.share(llContent);
mPresenter.share(llBillContent);
} else {
Toast.makeText(getApplicationContext(), "授权失败,无法分享海报", Toast.LENGTH_SHORT).show();
}
......
......@@ -30,6 +30,7 @@
android:background="#55eeeeee">
<ScrollView
android:scrollbars="none"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="13dp"
......@@ -37,11 +38,12 @@
android:layout_marginRight="13dp"
android:layout_marginBottom="@dimen/size_70">
<LinearLayout
android:id="@+id/ll_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center">
<!--<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"
......@@ -58,7 +60,6 @@
<ImageView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scaleType="fitXY"
android:src="@drawable/bg_bill" />
<LinearLayout
......@@ -142,7 +143,7 @@
</LinearLayout>
</android.support.v7.widget.CardView>
</LinearLayout>
<!--</LinearLayout>-->
</ScrollView>
<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