Skip to content

R
RvApp
Commit e377abd8 authored by jianglx's avatar jianglx
Browse files
Options

修改权限代码

parent 9a38f571
Hide whitespace changes
Inline Side-by-side
Showing with 129 additions and 1284 deletions
RvClient/build.gradle
View file @ e377abd8
......@@ -8,8 +8,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
flavorDimensions "default"
versionCode 150
versionName "1.5.0"
versionCode 154
versionName "1.5.4"
multiDexEnabled true
......
RvWrapper/build.gradle
View file @ e377abd8
......@@ -78,6 +78,7 @@ dependencies {
annotationProcessor 'com.github.bumptech.glide:compiler:4.7.1'
api 'com.github.bumptech.glide:okhttp3-integration:4.3.1'
api 'com.davemorrissey.labs:subsampling-scale-image-view:3.9.0'
api 'pub.devrel:easypermissions:1.3.0'
implementation 'com.alibaba:fastjson:1.2.21'
api project(':component_utils')
// implementation files('libs/tbs_sdk_thirdapp_v3.6.0.1310_43612_sharewithdownload_withoutGame_obfs_20180706_163319.jar')
......
module_camp/src/main/java/com/rv/camp/CampFragment.java
View file @ e377abd8
......@@ -38,6 +38,7 @@ import java.util.Map;
import butterknife.BindView;
import butterknife.OnClick;
import io.reactivex.functions.Consumer;
import pub.devrel.easypermissions.AppSettingsDialog;
/**
* 营地
......@@ -259,7 +260,7 @@ public class CampFragment extends BaseFragment<CampPresenter> implements BaseQui
/**
* 6.0以上手机做权限处理
*/
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
new RxPermission(getActivity()).request(
Manifest.permission.ACCESS_COARSE_LOCATION,
Manifest.permission.ACCESS_FINE_LOCATION
......@@ -268,8 +269,6 @@ public class CampFragment extends BaseFragment<CampPresenter> implements BaseQui
public void accept(Boolean aBoolean) throws Exception {
if (aBoolean == true) {
initGps();
} else {
getActivity().finish();
}
}
});
......
module_camp/src/main/java/com/rv/camp/camp/CampDetailActivity.java
View file @ e377abd8
......@@ -57,6 +57,7 @@ import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import io.reactivex.functions.Consumer;
import pub.devrel.easypermissions.AppSettingsDialog;
import static com.ruiwenliu.wrapper.weight.webview.SafeWebView.hasKitkat;
......@@ -393,7 +394,7 @@ public class CampDetailActivity extends BaseStatusActivity<CampPresenter> {
/**
* 6.0以上手机做权限处理
*/
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
new RxPermission(mActivity).request(
Manifest.permission.ACCESS_COARSE_LOCATION,
Manifest.permission.ACCESS_FINE_LOCATION
......@@ -403,7 +404,10 @@ public class CampDetailActivity extends BaseStatusActivity<CampPresenter> {
if (aBoolean == true) {
initGps();
} else {
finish();
new AppSettingsDialog.Builder(mActivity).
setTitle("需要定位权限")
.setRationale("如果没有此权限，此应用程序可能无法正常工作,是否打开设置修改该应用权限")
.build().show();
}
}
});
......
module_discovery/src/main/java/com/xxfc/discovery/other/PatGeneratePosterActivity.java
View file @ e377abd8
......@@ -54,6 +54,7 @@ import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import io.reactivex.functions.Consumer;
import pub.devrel.easypermissions.AppSettingsDialog;
/**
* 拍拍生成海报
......@@ -218,7 +219,7 @@ public class PatGeneratePosterActivity extends BaseStatusActivity<PickerPresente
/**
* 6.0以上手机做权限处理
*/
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
new RxPermission(mActivity).request(
Manifest.permission.WRITE_EXTERNAL_STORAGE,
Manifest.permission.CAMERA).subscribe(new Consumer<Boolean>() {
......@@ -233,7 +234,11 @@ public class PatGeneratePosterActivity extends BaseStatusActivity<PickerPresente
mPresenter.openAlbum(false);
break;
}
}else{
new AppSettingsDialog.Builder(PatGeneratePosterActivity.this).
setTitle("需要获取相机权限、存储权限")
.setRationale("如果没有此权限，此应用程序可能无法正常工作,是否打开设置修改该应用权限")
.build().show();
}
}
});
......
module_discovery/src/main/java/com/xxfc/discovery/other/PostPatActivity.java
View file @ e377abd8
......@@ -70,6 +70,7 @@ import butterknife.ButterKnife;
import butterknife.OnClick;
import io.reactivex.functions.Consumer;
import io.reactivex.schedulers.Schedulers;
import pub.devrel.easypermissions.AppSettingsDialog;
import top.zibin.luban.Luban;
import top.zibin.luban.OnCompressListener;
......@@ -531,7 +532,7 @@ public class PostPatActivity extends BaseStatusActivity<DiscoveryPresenter> {
/**
* 6.0以上手机做权限处理
*/
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
new RxPermission(mActivity).request(
Manifest.permission.WRITE_EXTERNAL_STORAGE,
Manifest.permission.CAMERA).subscribe(new Consumer<Boolean>() {
......@@ -546,7 +547,11 @@ public class PostPatActivity extends BaseStatusActivity<DiscoveryPresenter> {
selectPhoto();
break;
}
} else {
new AppSettingsDialog.Builder(PostPatActivity.this).
setTitle("需要获取相机权限、存储权限")
.setRationale("如果没有此权限，此应用程序可能无法正常工作,是否打开设置修改该应用权限")
.build().show();
}
}
});
......@@ -578,7 +583,7 @@ public class PostPatActivity extends BaseStatusActivity<DiscoveryPresenter> {
/**
* 6.0以上手机做权限处理
*/
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
new RxPermission(this).request(
Manifest.permission.ACCESS_COARSE_LOCATION,
Manifest.permission.ACCESS_FINE_LOCATION
......@@ -588,7 +593,10 @@ public class PostPatActivity extends BaseStatusActivity<DiscoveryPresenter> {
if (aBoolean == true) {
initGps();
} else {
finish();
new AppSettingsDialog.Builder(PostPatActivity.this).
setTitle("需要定位权限")
.setRationale("如果没有此权限，此应用程序可能无法正常工作,是否打开设置修改该应用权限")
.build().show();
}
}
});
......
module_discovery/src/main/java/com/xxfc/discovery/other/PublishingProblemActivity.java
View file @ e377abd8
......@@ -40,6 +40,7 @@ import java.util.Map;
import butterknife.BindView;
import butterknife.OnClick;
import io.reactivex.functions.Consumer;
import pub.devrel.easypermissions.AppSettingsDialog;
/**
* 问答 发布问题
......@@ -155,7 +156,7 @@ public class PublishingProblemActivity extends BaseStatusActivity<DiscoveryPrese
/**
* 6.0以上手机做权限处理
*/
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
new RxPermission(this).request(
Manifest.permission.ACCESS_COARSE_LOCATION,
Manifest.permission.ACCESS_FINE_LOCATION
......@@ -165,7 +166,10 @@ public class PublishingProblemActivity extends BaseStatusActivity<DiscoveryPrese
if (aBoolean == true) {
initGps();
} else {
finish();
new AppSettingsDialog.Builder(PublishingProblemActivity.this).
setTitle("需要定位权限")
.setRationale("如果没有此权限，此应用程序可能无法正常工作,是否打开设置修改该应用权限")
.build().show();
}
}
});
......
module_discovery/src/main/java/com/xxfc/discovery/other/SendVideoActivity.java
View file @ e377abd8
......@@ -62,6 +62,7 @@ import io.reactivex.functions.Consumer;
import okhttp3.MediaType;
import okhttp3.MultipartBody;
import okhttp3.RequestBody;
import pub.devrel.easypermissions.AppSettingsDialog;
/**
* 发短视频
......@@ -255,7 +256,7 @@ public class SendVideoActivity extends BaseStatusActivity<DiscoveryPresenter> {
/**
* 6.0以上手机做权限处理
*/
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
new RxPermission(this).request(
Manifest.permission.ACCESS_COARSE_LOCATION,
Manifest.permission.ACCESS_FINE_LOCATION
......@@ -265,7 +266,10 @@ public class SendVideoActivity extends BaseStatusActivity<DiscoveryPresenter> {
if (aBoolean == true) {
initGps();
} else {
finish();
new AppSettingsDialog.Builder(SendVideoActivity.this).
setTitle("需要定位权限")
.setRationale("如果没有此权限，此应用程序可能无法正常工作,是否打开设置修改该应用权限")
.build().show();
}
}
});
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/DrivingUploadActivity.java
View file @ e377abd8
......@@ -40,6 +40,7 @@ import io.reactivex.functions.Consumer;
import okhttp3.MediaType;
import okhttp3.MultipartBody;
import okhttp3.RequestBody;
import pub.devrel.easypermissions.AppSettingsDialog;
import top.zibin.luban.Luban;
import top.zibin.luban.OnCompressListener;
......@@ -245,7 +246,7 @@ public class DrivingUploadActivity extends BaseStatusActivity<PickerPresenter> {
/**
* 6.0以上手机做权限处理
*/
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
new RxPermission(mActivity).request(
Manifest.permission.WRITE_EXTERNAL_STORAGE,
Manifest.permission.READ_EXTERNAL_STORAGE,
......@@ -262,6 +263,11 @@ public class DrivingUploadActivity extends BaseStatusActivity<PickerPresenter> {
break;
}
}else {
new AppSettingsDialog.Builder(DrivingUploadActivity.this).
setTitle("需要获取相机权限、存储权限")
.setRationale("如果没有此权限，此应用程序可能无法正常工作,是否打开设置修改该应用权限")
.build().show();
}
}
});
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/HomeFragment.java
View file @ e377abd8
......@@ -90,6 +90,7 @@ import butterknife.BindView;
import butterknife.OnClick;
import butterknife.Unbinder;
import io.reactivex.functions.Consumer;
import pub.devrel.easypermissions.AppSettingsDialog;
/**
* 首页
......@@ -1275,7 +1276,7 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
/**
* 6.0以上手机做权限处理
*/
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
new RxPermission(getActivity()).request(
Manifest.permission.ACCESS_COARSE_LOCATION,
Manifest.permission.ACCESS_FINE_LOCATION
......@@ -1286,7 +1287,10 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
initGps();
initCity();
} else {
getActivity().finish();
new AppSettingsDialog.Builder(getActivity()).
setTitle("需要定位权限")
.setRationale("如果没有此权限，此应用程序可能无法正常工作,是否打开设置修改该应用权限")
.build().show();
}
}
});
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/EvaluationActivity.java
View file @ e377abd8
......@@ -50,6 +50,7 @@ import io.reactivex.functions.Consumer;
import okhttp3.MediaType;
import okhttp3.MultipartBody;
import okhttp3.RequestBody;
import pub.devrel.easypermissions.AppSettingsDialog;
/**
* Created :Auser
......@@ -90,7 +91,7 @@ public class EvaluationActivity extends BaseStatusActivity<PickerPresenter> {
private String mark2;
private String mark3;
private String no;
private String no;
public static Intent getIntent(Context context, String no) {
return new Intent(context, EvaluationActivity.class)
......@@ -121,7 +122,7 @@ public class EvaluationActivity extends BaseStatusActivity<PickerPresenter> {
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
titleView.setTitle(getString(R.string.rv_to_appointment_evaluation));
// dataBean = (OrderListBean.DataBeanX.DataBean) intent.getSerializableExtra("dataBean");
no = intent.getStringExtra("no");
no = intent.getStringExtra("no");
intiEt();
listImg = new ArrayList<>();
......@@ -204,14 +205,14 @@ public class EvaluationActivity extends BaseStatusActivity<PickerPresenter> {
}
private void setOrderDetail(OrderDetailBean result) {
dataBean = result.getData();
dataBean = result.getData();
if (dataBean != null) {
tvName.setText(dataBean.getName());
String icon ="";
if (!TextUtils.isEmpty(dataBean.getCoverPic())){
String icon = "";
if (!TextUtils.isEmpty(dataBean.getCoverPic())) {
icon = dataBean.getCoverPic();
}else {
} else {
icon = dataBean.getIcon();
}
GlideManager.getInstance(mActivity).loadImage(icon, ivCar);
......@@ -373,7 +374,7 @@ public class EvaluationActivity extends BaseStatusActivity<PickerPresenter> {
/**
* 6.0以上手机做权限处理
*/
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
new RxPermission(mActivity).request(
Manifest.permission.WRITE_EXTERNAL_STORAGE,
Manifest.permission.CAMERA).subscribe(new Consumer<Boolean>() {
......@@ -388,7 +389,11 @@ public class EvaluationActivity extends BaseStatusActivity<PickerPresenter> {
mPresenter.openAlbum(false);
break;
}
} else {
new AppSettingsDialog.Builder(EvaluationActivity.this).
setTitle("需要获取相机权限、存储权限")
.setRationale("如果没有此权限，此应用程序可能无法正常工作,是否打开设置修改该应用权限")
.build().show();
}
}
});
......
module_mine/src/dev/res/layout/activity_mine.xml deleted 100644 → 0
View file @ 9a38f571
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorLine"
android:orientation="vertical">
<com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/refresh"
android:layout_width="match_parent"
android:layout_height="match_parent">
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:id="@+id/travel_fragment_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="@dimen/size_240">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="190dp"
android:background="@drawable/mycenter_image_bg"
android:orientation="vertical">
<com.ruiwenliu.wrapper.statusbar.StatusBarHeightView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_marginEnd="@dimen/size_5"
android:orientation="vertical"
app:use_type="use_padding_top">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_8"
android:layout_marginTop="@dimen/size_10"
android:layout_marginRight="@dimen/size_8"
android:orientation="horizontal">
<ImageView
android:id="@+id/iv_item_message"
android:layout_width="@dimen/size_35"
android:layout_height="@dimen/size_35"
android:padding="@dimen/size_8"
android:src="@drawable/mycenter_icon_message" />
<ImageView
android:id="@+id/iv_item_setting"
android:layout_width="@dimen/size_35"
android:layout_height="@dimen/size_35"
android:layout_alignParentRight="true"
android:padding="@dimen/size_8"
android:src="@drawable/mycenter_icon_setting" />
</RelativeLayout>
</com.ruiwenliu.wrapper.statusbar.StatusBarHeightView>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/size_200"
android:layout_marginLeft="@dimen/size_15"
android:layout_marginTop="@dimen/size_80"
android:layout_marginRight="@dimen/size_15"
android:background="@drawable/shape_rv_bg_write"
android:orientation="vertical"
android:padding="@dimen/size_10">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<com.base.utils.ui.image.round.RoundImageView
android:id="@+id/iv_avatar"
android:layout_width="@dimen/size_60"
android:layout_height="@dimen/size_60"
android:src="@drawable/common_icon_avatar_default"
android:transitionName="sharedView" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="@dimen/size_60"
android:layout_marginLeft="@dimen/size_15"
android:layout_weight="1"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_nickname"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:singleLine="true"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_16"
android:visibility="gone" />
<TextView
android:id="@+id/tv_user_identity"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_5"
android:background="@drawable/common_icon_user_type"
android:maxLines="1"
android:paddingLeft="@dimen/size_3"
android:paddingTop="@dimen/size_1"
android:paddingRight="@dimen/size_3"
android:paddingBottom="@dimen/size_1"
android:textColor="@color/colorGray"
android:textSize="@dimen/text_10"
android:visibility="gone" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="@dimen/size_15"
android:layout_marginTop="@dimen/text_10"
android:orientation="horizontal"
android:visibility="gone">
<ImageView
android:id="@+id/iv_member"
android:layout_width="@dimen/size_15"
android:layout_height="@dimen/size_15" />
<TextView
android:id="@+id/tv_member"
android:layout_width="wrap_content"
android:layout_height="@dimen/size_15"
android:layout_marginLeft="@dimen/size_2"
android:gravity="center"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_10" />
</LinearLayout>
<TextView
android:id="@+id/tv_login"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
android:paddingRight="@dimen/size_30"
android:text="点击登录"
android:textColor="@color/colorYellow"
android:textSize="@dimen/text_16"
android:visibility="visible" />
</LinearLayout>
<TextView
android:id="@+id/tv_verified"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:drawableRight="@drawable/common_icon_rig_gray"
android:drawablePadding="@dimen/size_3"
android:text="未实名认证"
android:textColor="@color/text_Gray"
android:textSize="@dimen/text_12"
android:visibility="gone" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginTop="@dimen/size_10"
android:layout_weight="1"
android:gravity="center_vertical"
android:orientation="horizontal">
<LinearLayout
android:id="@+id/ll_item_integral"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="积分"
android:textColor="@color/textGray"
android:textSize="@dimen/text_12" />
<TextView
android:id="@+id/tv_integral"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_8"
android:text="0"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_16"
android:textStyle="bold" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_item_wallet"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="钱包"
android:textColor="@color/textGray"
android:textSize="@dimen/text_12" />
<TextView
android:id="@+id/tv_wallet"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_8"
android:text="0"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_16"
android:textStyle="bold" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_item_coupon"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="优惠券"
android:textColor="@color/textGray"
android:textSize="@dimen/text_12" />
<TextView
android:id="@+id/tv_coupon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_8"
android:text="0"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_16"
android:textStyle="bold" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_item_promotion"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:clickable="false"
android:gravity="center"
android:orientation="vertical"
>
<ImageView
android:layout_width="@dimen/size_25"
android:layout_height="@dimen/size_25"
android:src="@drawable/mycenter_icon_promotion"
android:textColor="@color/textGray"
android:textSize="@dimen/text_12" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_8"
android:text="推广有奖"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_12" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/size_50"
android:layout_alignParentBottom="true"
android:layout_marginLeft="@dimen/size_15"
android:layout_marginTop="@dimen/size_15"
android:layout_marginRight="@dimen/size_15"
android:layout_marginBottom="@dimen/size_15"
android:background="@drawable/resource_drawable_shape_member_bg"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:layout_width="@dimen/size_30"
android:layout_height="@dimen/size_30"
android:layout_marginLeft="@dimen/size_10"
android:src="@drawable/mycenter_icon_weal" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_10"
android:layout_weight="1"
android:orientation="vertical">
<TextView
android:id="@+id/tv_membership_level"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="会员特权"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_14"
android:textStyle="bold" />
<TextView
android:id="@+id/tv_member_hint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_2"
android:text="免费用车- -天"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_10" />
</LinearLayout>
<TextView
android:id="@+id/tv_item_view_privileges"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginRight="@dimen/size_15"
android:drawableRight="@drawable/common_icon_rig_black"
android:drawablePadding="@dimen/size_8"
android:gravity="center_vertical"
android:text="会员中心"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_12"
android:textStyle="bold" />
</LinearLayout>
<!--我的订单-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_15"
android:layout_marginRight="@dimen/size_15"
android:background="@drawable/shape_rv_bg_write"
android:orientation="vertical"
android:paddingLeft="@dimen/size_15"
android:paddingTop="@dimen/size_15"
android:paddingRight="@dimen/size_15">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/tv_my_order"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_16" />
<TextView
android:id="@+id/rl_item_order_all"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:drawableRight="@drawable/common_icon_rig_gray"
android:drawablePadding="@dimen/size_8"
android:paddingLeft="@dimen/size_30"
android:text="查看全部"
android:textColor="@color/text_Gray"
android:textSize="@dimen/text_12" />
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_30"
android:layout_marginBottom="@dimen/size_15"
android:orientation="horizontal">
<RelativeLayout
android:id="@+id/rl_item_to_be_paid"
android:layout_width="0dp"
android:layout_height="@dimen/size_60"
android:layout_weight="1"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:src="@drawable/mycenter_icon_unpaid" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/size_10"
android:text="@string/tv_to_be_paid"
android:textColor="@color/colorMain"
android:textSize="@dimen/size_12" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_item_staying"
android:layout_width="0dp"
android:layout_height="@dimen/size_60"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:src="@drawable/mycenter_icon_toravel" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:text="@string/tv_staying"
android:textColor="@color/colorMain"
android:textSize="@dimen/size_12" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_item_traveling"
android:layout_width="0dp"
android:layout_height="@dimen/size_60"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:src="@drawable/mycenter_icon_inthe_travel" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:text="@string/tv_traveling"
android:textColor="@color/colorMain"
android:textSize="@dimen/size_12" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_item_completed"
android:layout_width="0dp"
android:layout_height="@dimen/size_60"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:src="@drawable/mycenter_icon_completed" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:text="@string/tv_completed"
android:textColor="@color/colorMain"
android:textSize="@dimen/size_12" />
</RelativeLayout>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_15"
android:layout_marginTop="@dimen/size_15"
android:layout_marginRight="@dimen/size_15"
android:background="@drawable/shape_rv_bg_write"
android:orientation="horizontal"
android:paddingTop="@dimen/size_25"
android:paddingBottom="@dimen/size_15">
<RelativeLayout
android:id="@+id/rl_item_my_release"
android:layout_width="0dp"
android:layout_height="@dimen/size_60"
android:layout_weight="1"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:src="@drawable/mycenter_icon_issue" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/size_18"
android:text="@string/tv_my_release"
android:textColor="@color/colorMain"
android:textSize="@dimen/size_12" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_item_collection"
android:layout_width="0dp"
android:layout_height="@dimen/size_60"
android:layout_weight="1"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:src="@drawable/mycenter_icon_collect" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/size_18"
android:text="@string/tv_collection"
android:textColor="@color/colorMain"
android:textSize="@dimen/size_12" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_item_check_in"
android:layout_width="0dp"
android:layout_height="@dimen/size_60"
android:layout_weight="1"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:src="@drawable/mycenter_icon_personal_" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/size_18"
android:text="签到"
android:textColor="@color/colorMain"
android:textSize="@dimen/size_12" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_item_travel_management"
android:layout_width="0dp"
android:layout_height="@dimen/size_60"
android:layout_weight="1"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:src="@drawable/mycenter_icon_travel_management" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/size_18"
android:text="出游管理"
android:textColor="@color/colorMain"
android:textSize="@dimen/size_12" />
</RelativeLayout>
</LinearLayout>
<com.yuyife.banner.Banner
android:id="@+id/mine_banner"
android:layout_width="match_parent"
android:layout_height="@dimen/size_100"
android:layout_marginLeft="@dimen/size_15"
android:layout_marginTop="@dimen/size_15"
android:layout_marginRight="@dimen/size_15" />
</LinearLayout>
</ScrollView>
</com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout>
</LinearLayout>
\ No newline at end of file
module_mine/src/main/java/com/rv/rvmine/personal/IDCardCertificationActivity.java
View file @ e377abd8
......@@ -48,6 +48,7 @@ import io.reactivex.functions.Consumer;
import okhttp3.MediaType;
import okhttp3.MultipartBody;
import okhttp3.RequestBody;
import pub.devrel.easypermissions.AppSettingsDialog;
import top.zibin.luban.Luban;
import top.zibin.luban.OnCompressListener;
......@@ -243,7 +244,7 @@ public class IDCardCertificationActivity extends BaseStatusActivity<PickerPresen
/**
* 6.0以上手机做权限处理
*/
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
new RxPermission(mActivity).request(
Manifest.permission.WRITE_EXTERNAL_STORAGE,
Manifest.permission.CAMERA).subscribe(new Consumer<Boolean>() {
......@@ -259,7 +260,10 @@ public class IDCardCertificationActivity extends BaseStatusActivity<PickerPresen
break;
}
} else {
Toast.makeText(getApplicationContext(), "用户授权失败", Toast.LENGTH_SHORT).show();
new AppSettingsDialog.Builder(IDCardCertificationActivity.this).
setTitle("需要获取相机权限、存储权限")
.setRationale("如果没有此权限，此应用程序可能无法正常工作,是否打开设置修改该应用权限")
.build().show();
}
}
});
......
module_mine/src/main/java/com/rv/rvmine/traveler/PersonalInformationActivity.java
View file @ e377abd8
......@@ -56,6 +56,7 @@ import io.reactivex.functions.Consumer;
import okhttp3.MediaType;
import okhttp3.MultipartBody;
import okhttp3.RequestBody;
import pub.devrel.easypermissions.AppSettingsDialog;
/**
* 个人资料
......@@ -325,7 +326,7 @@ public class PersonalInformationActivity extends BaseStatusActivity<PickerPresen
/**
* 6.0以上手机做权限处理
*/
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
new RxPermission(mActivity).request(
Manifest.permission.WRITE_EXTERNAL_STORAGE,
Manifest.permission.CAMERA).subscribe(new Consumer<Boolean>() {
......@@ -341,6 +342,11 @@ public class PersonalInformationActivity extends BaseStatusActivity<PickerPresen
break;
}
}else{
new AppSettingsDialog.Builder(PersonalInformationActivity.this).
setTitle("需要获取相机权限、存储权限")
.setRationale("如果没有此权限，此应用程序可能无法正常工作,是否打开设置修改该应用权限")
.build().show();
}
}
});
......
module_mine/src/main/java/com/rv/rvmine/traveler/SettingActivity.java
View file @ e377abd8
......@@ -4,12 +4,16 @@ import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.os.Bundle;
import android.os.Environment;
import android.support.annotation.NonNull;
import android.text.TextUtils;
import android.view.View;
import android.widget.TextView;
import android.widget.Toast;
import com.frame.base.bus.LoginSuccessfulEvent;
import com.frame.base.bus.Observer;
import com.frame.base.bus.RxBus;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseStatusActivity;
import com.ruiwenliu.wrapper.base.presenter.CommonPresenter;
......@@ -77,6 +81,15 @@ public class SettingActivity extends BaseStatusActivity<CommonPresenter> impleme
tvOutSign.setText("退出登录");
tvOutSign.setBackgroundResource(R.drawable.shape_rv_button_light_gray);
}
DownListenerManager.getInstance().addDownListener(this);
versionName = UpdateAppUtils.getAppVersionName(this);
if (DownListenerManager.getInstance().isDown()) {
tvVersion.setText("下载中_" + DownListenerManager.getInstance().getProgress() + "%");
} else {
tvVersion.setText("当前版本 V" + versionName);
}
}
private void initRxBus() {
......@@ -91,16 +104,6 @@ public class SettingActivity extends BaseStatusActivity<CommonPresenter> impleme
});
}
DownListenerManager.getInstance().addDownListener(this);
versionName = UpdateAppUtils.getAppVersionName(this);
if (DownListenerManager.getInstance().isDown()) {
tvVersion.setText("下载中_" + DownListenerManager.getInstance().getProgress() + "%");
} else {
tvVersion.setText("当前版本 V" + versionName);
}
}
@Override
protected void loadData(Bundle savedInstanceState, Intent intent) {
super.loadData(savedInstanceState, intent);
......
module_mine/src/pro/res/layout/activity_mine.xml deleted 100644 → 0
View file @ 9a38f571
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorLine"
android:orientation="vertical">
<com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/refresh"
android:layout_width="match_parent"
android:layout_height="match_parent">
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:id="@+id/travel_fragment_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="@dimen/size_240">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="190dp"
android:background="@drawable/mycenter_image_bg"
android:orientation="vertical">
<com.ruiwenliu.wrapper.statusbar.StatusBarHeightView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_marginEnd="@dimen/size_5"
android:orientation="vertical"
app:use_type="use_padding_top">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_8"
android:layout_marginTop="@dimen/size_10"
android:layout_marginRight="@dimen/size_8"
android:orientation="horizontal">
<ImageView
android:id="@+id/iv_item_message"
android:layout_width="@dimen/size_35"
android:layout_height="@dimen/size_35"
android:padding="@dimen/size_8"
android:src="@drawable/mycenter_icon_message"
android:visibility="gone" />
<ImageView
android:id="@+id/iv_item_setting"
android:layout_width="@dimen/size_35"
android:layout_height="@dimen/size_35"
android:layout_alignParentRight="true"
android:padding="@dimen/size_8"
android:src="@drawable/mycenter_icon_setting" />
</RelativeLayout>
</com.ruiwenliu.wrapper.statusbar.StatusBarHeightView>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/size_200"
android:layout_marginLeft="@dimen/size_15"
android:layout_marginTop="@dimen/size_80"
android:layout_marginRight="@dimen/size_15"
android:background="@drawable/shape_rv_bg_write"
android:orientation="vertical"
android:padding="@dimen/size_10">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<com.base.utils.ui.image.round.RoundImageView
android:id="@+id/iv_avatar"
android:layout_width="@dimen/size_60"
android:layout_height="@dimen/size_60"
android:src="@drawable/common_icon_avatar_default"
android:transitionName="sharedView" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="@dimen/size_60"
android:layout_marginLeft="@dimen/size_15"
android:layout_weight="1"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_nickname"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:singleLine="true"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_16"
android:visibility="gone" />
<TextView
android:id="@+id/tv_user_identity"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_5"
android:background="@drawable/common_icon_user_type"
android:maxLines="1"
android:paddingLeft="@dimen/size_3"
android:paddingTop="@dimen/size_1"
android:paddingRight="@dimen/size_3"
android:paddingBottom="@dimen/size_1"
android:textColor="@color/colorGray"
android:textSize="@dimen/text_10"
android:visibility="gone" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="@dimen/size_15"
android:layout_marginTop="@dimen/text_10"
android:orientation="horizontal"
android:visibility="gone">
<ImageView
android:id="@+id/iv_member"
android:layout_width="@dimen/size_15"
android:layout_height="@dimen/size_15" />
<TextView
android:id="@+id/tv_member"
android:layout_width="wrap_content"
android:layout_height="@dimen/size_15"
android:layout_marginLeft="@dimen/size_2"
android:gravity="center"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_10" />
</LinearLayout>
<TextView
android:id="@+id/tv_login"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
android:paddingRight="@dimen/size_30"
android:text="点击登录"
android:textColor="@color/colorYellow"
android:textSize="@dimen/text_16"
android:visibility="visible" />
</LinearLayout>
<TextView
android:id="@+id/tv_verified"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:drawableRight="@drawable/common_icon_rig_gray"
android:drawablePadding="@dimen/size_3"
android:text="未实名认证"
android:textColor="@color/text_Gray"
android:textSize="@dimen/text_12"
android:visibility="gone" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginTop="@dimen/size_10"
android:layout_weight="1"
android:gravity="center_vertical"
android:orientation="horizontal">
<LinearLayout
android:id="@+id/ll_item_integral"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="积分"
android:textColor="@color/textGray"
android:textSize="@dimen/text_12" />
<TextView
android:id="@+id/tv_integral"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_8"
android:text="0"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_16"
android:textStyle="bold" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_item_wallet"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="钱包"
android:textColor="@color/textGray"
android:textSize="@dimen/text_12" />
<TextView
android:id="@+id/tv_wallet"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_8"
android:text="0"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_16"
android:textStyle="bold" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_item_coupon"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="优惠券"
android:textColor="@color/textGray"
android:textSize="@dimen/text_12" />
<TextView
android:id="@+id/tv_coupon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_8"
android:text="0"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_16"
android:textStyle="bold" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_item_promotion"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:clickable="false"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:layout_width="@dimen/size_25"
android:layout_height="@dimen/size_25"
android:src="@drawable/mycenter_icon_promotion"
android:textColor="@color/textGray"
android:textSize="@dimen/text_12" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_8"
android:text="推广有奖"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_12" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/size_50"
android:layout_alignParentBottom="true"
android:layout_marginLeft="@dimen/size_15"
android:layout_marginTop="@dimen/size_15"
android:layout_marginRight="@dimen/size_15"
android:layout_marginBottom="@dimen/size_15"
android:background="@drawable/resource_drawable_shape_member_bg"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:layout_width="@dimen/size_30"
android:layout_height="@dimen/size_30"
android:layout_marginLeft="@dimen/size_10"
android:src="@drawable/mycenter_icon_weal" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_10"
android:layout_weight="1"
android:orientation="vertical">
<TextView
android:id="@+id/tv_membership_level"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="会员特权"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_14"
android:textStyle="bold" />
<TextView
android:id="@+id/tv_member_hint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_2"
android:text="免费用车- -天"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_10" />
</LinearLayout>
<TextView
android:id="@+id/tv_item_view_privileges"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginRight="@dimen/size_15"
android:drawableRight="@drawable/common_icon_rig_black"
android:drawablePadding="@dimen/size_8"
android:gravity="center_vertical"
android:text="会员中心"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_12"
android:textStyle="bold" />
</LinearLayout>
<!--我的订单-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_15"
android:layout_marginRight="@dimen/size_15"
android:background="@drawable/shape_rv_bg_write"
android:orientation="vertical"
android:paddingLeft="@dimen/size_15"
android:paddingTop="@dimen/size_15"
android:paddingRight="@dimen/size_15">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/tv_my_order"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_16" />
<TextView
android:id="@+id/rl_item_order_all"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:drawableRight="@drawable/common_icon_rig_gray"
android:drawablePadding="@dimen/size_8"
android:paddingLeft="@dimen/size_30"
android:text="查看全部"
android:textColor="@color/text_Gray"
android:textSize="@dimen/text_12" />
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_30"
android:layout_marginBottom="@dimen/size_15"
android:orientation="horizontal">
<RelativeLayout
android:id="@+id/rl_item_to_be_paid"
android:layout_width="0dp"
android:layout_height="@dimen/size_60"
android:layout_weight="1"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:src="@drawable/mycenter_icon_unpaid" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/size_10"
android:text="@string/tv_to_be_paid"
android:textColor="@color/colorMain"
android:textSize="@dimen/size_12" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_item_staying"
android:layout_width="0dp"
android:layout_height="@dimen/size_60"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:src="@drawable/mycenter_icon_toravel" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:text="@string/tv_staying"
android:textColor="@color/colorMain"
android:textSize="@dimen/size_12" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_item_traveling"
android:layout_width="0dp"
android:layout_height="@dimen/size_60"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:src="@drawable/mycenter_icon_inthe_travel" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:text="@string/tv_traveling"
android:textColor="@color/colorMain"
android:textSize="@dimen/size_12" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_item_completed"
android:layout_width="0dp"
android:layout_height="@dimen/size_60"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:src="@drawable/mycenter_icon_completed" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:text="@string/tv_completed"
android:textColor="@color/colorMain"
android:textSize="@dimen/size_12" />
</RelativeLayout>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_15"
android:layout_marginTop="@dimen/size_15"
android:layout_marginRight="@dimen/size_15"
android:background="@drawable/shape_rv_bg_write"
android:orientation="horizontal"
android:paddingTop="@dimen/size_25"
android:paddingBottom="@dimen/size_15">
<RelativeLayout
android:id="@+id/rl_item_my_release"
android:layout_width="0dp"
android:layout_height="@dimen/size_60"
android:layout_weight="1"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:src="@drawable/mycenter_icon_issue" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/size_18"
android:text="@string/tv_my_release"
android:textColor="@color/colorMain"
android:textSize="@dimen/size_12" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_item_collection"
android:layout_width="0dp"
android:layout_height="@dimen/size_60"
android:layout_weight="1"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:src="@drawable/mycenter_icon_collect" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/size_18"
android:text="@string/tv_collection"
android:textColor="@color/colorMain"
android:textSize="@dimen/size_12" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_item_check_in"
android:layout_width="0dp"
android:layout_height="@dimen/size_60"
android:layout_weight="1"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:src="@drawable/mycenter_icon_personal_" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/size_18"
android:text="签到"
android:textColor="@color/colorMain"
android:textSize="@dimen/size_12" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_item_travel_management"
android:layout_width="0dp"
android:layout_height="@dimen/size_60"
android:layout_weight="1"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:src="@drawable/mycenter_icon_travel_management" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/size_18"
android:text="出游管理"
android:textColor="@color/colorMain"
android:textSize="@dimen/size_12" />
</RelativeLayout>
</LinearLayout>
<com.yuyife.banner.Banner
android:id="@+id/mine_banner"
android:layout_width="match_parent"
android:layout_height="@dimen/size_100"
android:layout_marginLeft="@dimen/size_15"
android:layout_marginTop="@dimen/size_15"
android:layout_marginRight="@dimen/size_15" />
</LinearLayout>
</ScrollView>
</com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout>
</LinearLayout>
\ No newline at end of file
module_tourism/src/main/java/com/rv/tourism/TourismFragment.java
View file @ e377abd8
......@@ -67,6 +67,7 @@ import java.util.List;
import butterknife.BindView;
import butterknife.OnClick;
import io.reactivex.functions.Consumer;
import pub.devrel.easypermissions.AppSettingsDialog;
/**
* 旅游
......@@ -565,7 +566,7 @@ public class TourismFragment extends BaseFragment<TourismPresenter> implements S
/**
* 6.0以上手机做权限处理
*/
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
new RxPermission(getActivity()).request(
Manifest.permission.ACCESS_COARSE_LOCATION,
Manifest.permission.ACCESS_FINE_LOCATION
......@@ -575,8 +576,6 @@ public class TourismFragment extends BaseFragment<TourismPresenter> implements S
if (aBoolean == true) {
initGps();
initCity();
} else {
getActivity().finish();
}
}
});
......
plugin_carpurchase/src/main/java/com/xxrv/carpurchase/activity/ReservationInformationActivity.java
View file @ e377abd8
......@@ -51,6 +51,7 @@ import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import io.reactivex.functions.Consumer;
import pub.devrel.easypermissions.AppSettingsDialog;
/**
* 预约信息
......@@ -290,7 +291,7 @@ public class ReservationInformationActivity extends BaseStatusActivity<CarPurcha
/**
* 6.0以上手机做权限处理
*/
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
new RxPermission(mActivity).request(
Manifest.permission.ACCESS_COARSE_LOCATION,
Manifest.permission.ACCESS_FINE_LOCATION
......@@ -300,7 +301,10 @@ public class ReservationInformationActivity extends BaseStatusActivity<CarPurcha
if (aBoolean == true) {
initGps();
} else {
finish();
new AppSettingsDialog.Builder(ReservationInformationActivity.this).
setTitle("需要定位权限")
.setRationale("如果没有此权限，此应用程序可能无法正常工作,是否打开设置修改该应用权限")
.build().show();
}
}
});
......
plugin_im/src/main/java/com/rv/im/ChatActivity.java
View file @ e377abd8
......@@ -58,6 +58,8 @@ import java.io.File;
import java.util.ArrayList;
import java.util.List;
import pub.devrel.easypermissions.AppSettingsDialog;
public class ChatActivity extends BaseStatusActivity<CommonPresenter> implements IChatView, ChatMessageListener, View.OnClickListener, RecordListener {
private ImageButton voiceImgBtn;
......@@ -341,7 +343,10 @@ public class ChatActivity extends BaseStatusActivity<CommonPresenter> implements
voiceImgBtn.setVisibility(View.GONE);
closeKeyboard();
} else {
Toast.makeText(getApplicationContext(), "用户授权失败", Toast.LENGTH_SHORT).show();
new AppSettingsDialog.Builder(ChatActivity.this).
setTitle("需要获取麦克风权限、存储权限")
.setRationale("如果没有此权限，此应用程序可能无法正常工作,是否打开设置修改该应用权限")
.build().show();
}
});
} else {
......@@ -372,7 +377,10 @@ public class ChatActivity extends BaseStatusActivity<CommonPresenter> implements
if (aBoolean == true) {
presenter.realDial(callType, null);
} else {
Toast.makeText(getApplicationContext(), "用户授权失败", Toast.LENGTH_SHORT).show();
new AppSettingsDialog.Builder(ChatActivity.this).
setTitle("需要录音权限")
.setRationale("如果没有此权限，此应用程序可能无法正常工作,是否打开设置修改该应用权限")
.build().show();
}
});
} else {
......@@ -388,7 +396,10 @@ public class ChatActivity extends BaseStatusActivity<CommonPresenter> implements
if (aBoolean == true) {
presenter.realDial(callType, null);
} else {
Toast.makeText(getApplicationContext(), "用户授权失败", Toast.LENGTH_SHORT).show();
new AppSettingsDialog.Builder(ChatActivity.this).
setTitle("需要视频权限")
.setRationale("如果没有此权限，此应用程序可能无法正常工作,是否打开设置修改该应用权限")
.build().show();
}
});
} else {
......
plugin_im/src/main/java/com/rv/im/mvp/presenter/ChatPresenterImp.java
View file @ e377abd8
......@@ -15,6 +15,7 @@ import android.util.Log;
import android.widget.Toast;
import com.ruiwenliu.wrapper.util.permission.RxPermission;
import com.rv.im.ChatActivity;
import com.rv.im.Constants;
import com.rv.im.ImSetting;
import com.rv.im.call.Jitsi_pre;
......@@ -37,6 +38,7 @@ import java.util.Arrays;
import java.util.List;
import java.util.UUID;
import pub.devrel.easypermissions.AppSettingsDialog;
import top.zibin.luban.Luban;
import top.zibin.luban.OnCompressListener;
......@@ -97,7 +99,10 @@ public class ChatPresenterImp implements IChatPresenter {
openAlbum();
}
} else {
Toast.makeText(weakReference.get(), "用户授权失败", Toast.LENGTH_SHORT).show();
new AppSettingsDialog.Builder((Activity) weakReference.get()).
setTitle("需要获取相机权限、存储权限")
.setRationale("如果没有此权限，此应用程序可能无法正常工作,是否打开设置修改该应用权限")
.build().show();
}
});
} else {
......@@ -334,7 +339,10 @@ public class ChatPresenterImp implements IChatPresenter {
if (aBoolean == true) {
showFileChoiceDialog();
} else {
Toast.makeText(weakReference.get(), "用户授权失败", Toast.LENGTH_SHORT).show();
new AppSettingsDialog.Builder((Activity) weakReference.get()).
setTitle("需要获取存储权限")
.setRationale("如果没有此权限，此应用程序可能无法正常工作,是否打开设置修改该应用权限")
.build().show();
}
});
} else {
......
plugin_member/src/main/java/com/rv.member/view/LoginView.java
View file @ e377abd8
......@@ -56,7 +56,7 @@ public class LoginView extends LinearLayout {
if (info != null) {
if (info.getIsMember() == 0) {
llLogin.setBackgroundResource(R.drawable.bg_normal_user);
ivMemberLevel.setVisibility(GONE);
ivMemberLevel.setVisibility(INVISIBLE);
} else {
switch (info.getMemberLevel()) {
case 1:
......
plugin_member/src/main/res/layout/view_member_privilege.xml
View file @ e377abd8
......@@ -147,7 +147,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="7dp"
android:gravity="center_vertical|right"
android:layout_marginLeft="@dimen/dp_10"
android:gravity="center_vertical|left"
android:orientation="horizontal">
<ImageView
......
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