Skip to content

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

定位监听；启动页添加一个定位权限。

parent 0a9b7579
Hide whitespace changes
Inline Side-by-side
Showing with 204 additions and 146 deletions
RvClient/src/main/java/com/xxfc/rv/MainActivity.java
View file @ e4582669
package com.xxfc.rv;
import android.Manifest;
import android.annotation.SuppressLint;
import android.app.AlertDialog;
import android.app.Notification;
import android.content.ComponentName;
......@@ -9,7 +7,6 @@ import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.ServiceConnection;
import android.content.pm.PackageManager;
import android.location.LocationManager;
import android.net.ConnectivityManager;
import android.net.Uri;
......@@ -46,7 +43,6 @@ import com.ruiwenliu.wrapper.statusbar.StatusBarUtil;
import com.ruiwenliu.wrapper.util.GpsManager;
import com.ruiwenliu.wrapper.util.UtilsManager;
import com.ruiwenliu.wrapper.util.listener.SwitchFragment;
import com.ruiwenliu.wrapper.util.permission.RxPermission;
import com.ruiwenliu.wrapper.weight.CustomScrollViewPager;
import com.ruiwenliu.wrapper.weight.TitleView;
import com.rv.camp.CampFragment;
......@@ -97,9 +93,6 @@ import butterknife.BindView;
import butterknife.OnClick;
import cn.jpush.android.api.BasicPushNotificationBuilder;
import cn.jpush.android.api.JPushInterface;
import io.reactivex.functions.Consumer;
import pub.devrel.easypermissions.AppSettingsDialog;
public class MainActivity extends BaseActivity<CommonPresenter> implements DownListenerManager.DownListener, ChatMessageListener {
......@@ -189,7 +182,6 @@ public class MainActivity extends BaseActivity<CommonPresenter> implements DownL
initNotification();
SwitchFragment.setFragmentSelected(postion -> setCurrent(postion));
if (!isGpsOpen()) {
new AlertDialog.Builder(this).setTitle("提示")
.setMessage("定位服务尚未打开，定位导航功能可能无法正常使用，是否进入设置界面打开定位服务")
......@@ -197,45 +189,13 @@ public class MainActivity extends BaseActivity<CommonPresenter> implements DownL
dialogInterface.dismiss();
})
.setPositiveButton("好的", (dialogInterface, i) -> {
Intent intent1 = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
startActivity(intent1);
Intent in = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
startActivity(in);
dialogInterface.dismiss();
})
.setCancelable(false).show();
}).setCancelable(false).show();
}
}
/**
* 定位权限处理
*/
@SuppressLint("CheckResult")
private void permissionProcess() {
/**
* 6.0以上手机做权限处理
*/
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
new RxPermission(mActivity).request(
Manifest.permission.ACCESS_COARSE_LOCATION,
Manifest.permission.ACCESS_FINE_LOCATION
).subscribe(new Consumer<Boolean>() {
@Override
public void accept(Boolean aBoolean) throws Exception {
if (aBoolean == true) {
initGps();
initCity();
} else {
new AppSettingsDialog.Builder(mActivity).
setTitle("需要定位权限")
.setRationale("如果没有此权限，此应用程序可能无法正常工作,是否打开设置修改该应用权限")
.build().show();
}
}
});
} else {
initGps();
initCity();
}
}
private void initNotification() {
BasicPushNotificationBuilder builder = new BasicPushNotificationBuilder(mActivity);
......@@ -287,10 +247,10 @@ public class MainActivity extends BaseActivity<CommonPresenter> implements DownL
case 1:
EffectiveTimeBean bean = (EffectiveTimeBean) result;
if (bean != null && bean.isRel() && bean.getData() != null) {
AppCookie.save(getApplicationContext(), "actRent", bean.getData().getActRent());
AppCookie.save(getApplicationContext(), "actTour", bean.getData().getActTour());
AppCookie.save(getApplicationContext(), "insurePrice", bean.getData().getInsurePrice());
AppCookie.save(getApplicationContext(), "actMember", bean.getData().getActMember());
AppCookie.save( "actRent", bean.getData().getActRent());
AppCookie.save( "actTour", bean.getData().getActTour());
AppCookie.save( "insurePrice", bean.getData().getInsurePrice());
AppCookie.save("actMember", bean.getData().getActMember());
}
break;
case 2:
......@@ -337,7 +297,7 @@ public class MainActivity extends BaseActivity<CommonPresenter> implements DownL
if (data != null) {
try {
int value = Integer.parseInt(data.getParams());
AppCookie.save(mActivity, AppCookie.KEY_PRERENT_DAYS, value);
AppCookie.save(AppCookie.KEY_PRERENT_DAYS, value);
} catch (Exception e) {
showToast("传入的预租车天数格式有误");
}
......@@ -570,7 +530,7 @@ public class MainActivity extends BaseActivity<CommonPresenter> implements DownL
header.put("Authorization", OkGoUtil.getToken());
Map<String, Object> body = new HashMap<>();
body.put("code", AppCookie.getStringValue(getApplicationContext(), "code"));
body.put("code", AppCookie.getStringValue("code"));
mPresenter.postData(RvFrameConfig.HOST, 10000, ApiConfig.HTTP_URL_RELATION_BIND, null, body, header, false);
}
......
RvClient/src/main/java/com/xxfc/rv/WakeUpActivity.java
View file @ e4582669
......@@ -41,7 +41,7 @@ public class WakeUpActivity extends AppCompatActivity {
JSONObject object = new JSONObject(info);
String inviteCode = object.optString("code");
if (!TextUtils.isEmpty(inviteCode)) {
AppCookie.save(getApplicationContext(), "code", inviteCode);
AppCookie.save("code", inviteCode);
}
String url = object.optString("url");
LogUtil.d("唤醒传过来的url=" + url);
......
RvClient/src/main/java/com/xxfc/rv/WelcomeActivity.java
View file @ e4582669
package com.xxfc.rv;
import android.app.Dialog;
import android.Manifest;
import android.annotation.SuppressLint;
import android.app.AlertDialog;
import android.content.Intent;
import android.content.SharedPreferences;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.provider.Settings;
import android.support.annotation.Nullable;
import android.text.TextUtils;
import android.view.View;
......@@ -13,6 +17,7 @@ import com.base.utils.tools.android.NetworkUtil;
import com.ruiwenliu.wrapper.SPConstance;
import com.ruiwenliu.wrapper.base.BaseActivity;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.util.permission.RxPermission;
import com.ruiwenliu.wrapper.weight.TitleView;
import com.rv.component.utils.AppCookie;
import com.rv.component.utils.CacheEnum;
......@@ -32,6 +37,9 @@ import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable;
public class WelcomeActivity extends BaseActivity<CommonPresenter> {
private static final int CODE_REQUEST_POISITION = 1000;
private Disposable mDisposable = null;
private boolean isImInitOk = false;
......@@ -64,9 +72,10 @@ public class WelcomeActivity extends BaseActivity<CommonPresenter> {
@Override
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
showTitle(false);//隐藏菜单栏
permissionProcess();
}
// showPermissionDialog();
private void init() {
AppConfig appConfig = (AppConfig) RvCache.getInstance().get(CacheEnum.IM_CONFIG);
if (appConfig == null) {
if (!NetworkUtil.isNetworkAvailable(getApplicationContext())) {
......@@ -79,16 +88,37 @@ public class WelcomeActivity extends BaseActivity<CommonPresenter> {
LogUtil.d("start");
}
// /******
// * 显示授权弹框
// */
// private void showPermissionDialog() {
// if (!AppCookie.getBooleanValue(this, AppCookie.KEY_ALLOWED_MOBILE_NET)
// && com.rv.im.util.NetworkUtil.isMobileConnected(this)) {
// Dialog dialog = new Dialog(this);
// dialog.setContentView(R.layout.);
// }
// }
/**
* 定位权限处理
*/
@SuppressLint("CheckResult")
private void permissionProcess() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
new RxPermission(mActivity).request(
Manifest.permission.ACCESS_COARSE_LOCATION,
Manifest.permission.ACCESS_FINE_LOCATION
).subscribe(aBoolean -> {
if (aBoolean == true) {
init();
} else {
new AlertDialog.Builder(this).setTitle("需要定位权限")
.setMessage("位置权限已关闭，开启以便滴房车正常使用")
.setNegativeButton("取消", (dialogInterface, i) -> {
finish();
dialogInterface.dismiss();
})
.setPositiveButton("设置", (dialogInterface, i) -> {
Intent in = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
.setData(Uri.fromParts("package", getPackageName(), null));
startActivityForResult(in, CODE_REQUEST_POISITION);
dialogInterface.dismiss();
}).setCancelable(false).show();
}
});
} else {
init();
}
}
@Override
protected void loadData(Bundle savedInstanceState, Intent intent) {
......@@ -110,7 +140,7 @@ public class WelcomeActivity extends BaseActivity<CommonPresenter> {
* 计时器
*/
private void interval() {
mDisposable = Flowable.interval(2, TimeUnit.SECONDS)
mDisposable = Flowable.interval(1, TimeUnit.SECONDS)
.doOnNext(aLong -> {
})
.observeOn(AndroidSchedulers.mainThread())
......@@ -142,9 +172,8 @@ public class WelcomeActivity extends BaseActivity<CommonPresenter> {
}
private void go() {
SharedPreferences preferences = getSharedPreferences("first_open", MODE_PRIVATE);
if (preferences.getBoolean("first", true)) {
preferences.edit().putBoolean("first", false).commit();
if (AppCookie.getBooleanValue("first_open", true)) {
AppCookie.save("first_open", false);
startActivity(GuideActivity.getIntent(mActivity));
} else {
startActivity(MainActivity.getIntent(mActivity));
......@@ -156,18 +185,18 @@ public class WelcomeActivity extends BaseActivity<CommonPresenter> {
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// this.getWindow().getDecorView().setBackground(null);
if (Build.VERSION.SDK_INT >= 21) {
getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_FULLSCREEN);
getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_FULLSCREEN);
// getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_FULLSCREEN);
}
}
@Override
protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == CODE_REQUEST_POISITION) {
permissionProcess();
}
// if (Build.VERSION.SDK_INT >= 21) {
// View decorView = getWindow().getDecorView();
// int option = View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
// | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
// | View.SYSTEM_UI_FLAG_LAYOUT_STABLE;
// decorView.setSystemUiVisibility(option);
// getWindow().setNavigationBarColor(Color.TRANSPARENT);
// getWindow().setStatusBarColor(Color.TRANSPARENT);
// }
}
}
RvClient/src/main/res/drawable/start_back_icon.xml
View file @ e4582669
......@@ -6,7 +6,8 @@
<solid android:color="@color/colorWrite" />
</shape>
</item>
<item>
<item
android:bottom="@dimen/size_5">
<bitmap
android:gravity="bottom|center_horizontal"
android:src="@drawable/bottom_backgroud2"
......
RvWrapper/src/main/java/com/ruiwenliu/wrapper/base/BaseWrapperFragment.java
View file @ e4582669
......@@ -35,6 +35,7 @@ import me.yokeyword.fragmentation.SupportFragment;
*/
public abstract class BaseWrapperFragment<P extends MvpPresenter> extends SupportFragment implements BaseView, NetWorkReceiver.NetChangListener {
protected static final int CODE_REQUEST_POISITION = 101010 ;
protected P mPresenter;
private LoadingDialog mLoadingDialog;
private View contentView;
......
component_utils/src/main/java/com/rv/component/utils/AppCookie.java
View file @ e4582669
......@@ -33,63 +33,63 @@ public class AppCookie {
return preferences;
}
public static void save(Context context, String key, String s) {
public static void save(String key, String s) {
getPreference().edit().putString(key, s).commit();
}
public static void save(Context context, String key, int i) {
public static void save(String key, int i) {
getPreference().edit().putInt(key, i).commit();
}
public static void save(Context context, String key, long l) {
public static void save(String key, long l) {
getPreference().edit().putLong(key, l).commit();
}
public static void save(Context context, String key, boolean b) {
public static void save(String key, boolean b) {
getPreference().edit().putBoolean(key, b).commit();
}
public static void save(Context context, String key, float f) {
public static void save(String key, float f) {
getPreference().edit().putFloat(key, f).commit();
}
public static String getStringValue(Context context, String key) {
return getStringValue(context, key, "");
public static String getStringValue(String key) {
return getStringValue(key, "");
}
public static String getStringValue(Context context, String key, String def) {
public static String getStringValue(String key, String def) {
return getPreference().getString(key, def);
}
public static int getIntValue(Context context, String key) {
return getIntValue(context, key, -1);
public static int getIntValue(String key) {
return getIntValue( key, -1);
}
public static int getIntValue(Context context, String key, int def) {
public static int getIntValue(String key, int def) {
return getPreference().getInt(key, def);
}
public static long getLongValue(Context context, String key) {
return getLongValue(context, key, 0l);
public static long getLongValue(String key) {
return getLongValue( key, 0l);
}
public static long getLongValue(Context context, String key, long def) {
public static long getLongValue(String key, long def) {
return getPreference().getLong(key, def);
}
public static float getFloatValue(Context context, String key) {
return getFloatValue(context, key, 0f);
public static float getFloatValue(String key) {
return getFloatValue(key, 0f);
}
public static float getFloatValue(Context context, String key, float def) {
public static float getFloatValue(String key, float def) {
return getPreference().getFloat(key, def);
}
public static boolean getBooleanValue(Context context, String key) {
return getBooleanValue(context, key, false);
public static boolean getBooleanValue( String key) {
return getBooleanValue(key, false);
}
public static boolean getBooleanValue(Context context, String key, boolean def) {
public static boolean getBooleanValue( String key, boolean def) {
return getPreference().getBoolean(key, def);
}
}
module_camp/src/main/java/com/rv/camp/CampFragment.java
View file @ e4582669
package com.rv.camp;
import android.Manifest;
import android.annotation.SuppressLint;
import android.graphics.Rect;
import android.os.Build;
import android.os.Bundle;
......@@ -18,6 +19,7 @@ import com.frame.base.url.Constance;
import com.frame.rv.config.RvFrameConfig;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseFragment;
import com.ruiwenliu.wrapper.util.GpsManager;
import com.ruiwenliu.wrapper.util.LocationManager;
import com.ruiwenliu.wrapper.util.permission.RxPermission;
import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout;
......@@ -43,7 +45,7 @@ import pub.devrel.easypermissions.AppSettingsDialog;
/**
* 营地
*/
public class CampFragment extends BaseFragment<CampPresenter> implements BaseQuickAdapter.RequestLoadMoreListener, SimpleRefreshLayout.OnSimpleRefreshListener {
public class CampFragment extends BaseFragment<CampPresenter> implements BaseQuickAdapter.RequestLoadMoreListener, SimpleRefreshLayout.OnSimpleRefreshListener, GpsManager.GpsChangeListener {
@BindView(R2.id.rv_content)
RecyclerView rvContent;
......@@ -83,6 +85,7 @@ public class CampFragment extends BaseFragment<CampPresenter> implements BaseQui
@Override
protected void initView(Bundle savedInstanceState) {
GpsManager.getInstance(_mActivity).bindGpsListener(this);
mSimpleRefreshLayout.setHeaderView(new SimpleRefreshView(_mActivity));
mSimpleRefreshLayout.setOnSimpleRefreshListener(this);
permissionProcess();
......@@ -261,11 +264,8 @@ public class CampFragment extends BaseFragment<CampPresenter> implements BaseQui
/**
* 定位权限处理
*/
@SuppressLint("CheckResult")
private void permissionProcess() {
/**
* 6.0以上手机做权限处理
*/
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
new RxPermission(getActivity()).request(
Manifest.permission.ACCESS_COARSE_LOCATION,
......@@ -315,11 +315,24 @@ public class CampFragment extends BaseFragment<CampPresenter> implements BaseQui
});
}
@Override
public void onDestroyView() {
super.onDestroyView();
GpsManager.getInstance(_mActivity).unbindGpsListener(this);
}
@Override
public void onRefresh() {
loadDataList();
}
@Override
public void gpsChange(boolean b) {
if (b) {
permissionProcess();
}
}
public class AbSpacesItemDecoration extends RecyclerView.ItemDecoration {
......
module_home/build.gradle
View file @ e4582669
......@@ -37,6 +37,10 @@ android {
pro {
}
}
compileOptions {
sourceCompatibility = '1.8'
targetCompatibility = '1.8'
}
}
dependencies {
......
module_home/src/main/java/com/rv/home/rv/module/basic/BaseLoginActivity.java
View file @ e4582669
......@@ -129,7 +129,7 @@ public abstract class BaseLoginActivity<P extends MvpPresenter> extends BaseStat
if (isQQ == 0) {
map.put("unionid", uid);
}
map.put("code", AppCookie.getStringValue(getApplicationContext(), "code"));
map.put("code", AppCookie.getStringValue("code"));
mPresenter.postData(2, ApiConfig.HTTP_URL_OTHER_LOGIN_BIND, RegisteredBean.class, map, true);
}
......
module_home/src/main/java/com/rv/home/rv/module/ui/login/LoginRvActivity.java
View file @ e4582669
......@@ -108,7 +108,7 @@ public class LoginRvActivity extends BaseLoginActivity<CommonPresenter> {
JSONObject object = new JSONObject(info);
String inviteCode = object.optString("code");
if (!TextUtils.isEmpty(inviteCode)) {
AppCookie.save(getApplicationContext(), "code", inviteCode);
AppCookie.save( "code", inviteCode);
}
} catch (JSONException e) {
e.printStackTrace();
......@@ -226,7 +226,7 @@ public class LoginRvActivity extends BaseLoginActivity<CommonPresenter> {
Map<String, Object> map = new LinkedHashMap<>();
map.put("username", getPhone());
map.put("type", 4);
map.put("code", AppCookie.getStringValue(getApplicationContext(), "code"));
map.put("code", AppCookie.getStringValue( "code"));
mPresenter.postData(0, ApiConfig.HTTP_URL_SEND_CODE, SendCodeBean.class, map, true);
}
......@@ -237,7 +237,7 @@ public class LoginRvActivity extends BaseLoginActivity<CommonPresenter> {
Map<String, Object> map = new LinkedHashMap<>();
map.put("openid", openid);
map.put("isQQ", isQQ);
map.put("code", AppCookie.getStringValue(getApplicationContext(), "code"));
map.put("code", AppCookie.getStringValue("code"));
mPresenter.postData(1, ApiConfig.HTTP_URL_OTHER_LOGIN, RegisteredBean.class, map, true);
}
......@@ -249,7 +249,7 @@ public class LoginRvActivity extends BaseLoginActivity<CommonPresenter> {
map.put("username", getPhone());
map.put("mobilecode", getCode());
map.put("type", 2);
map.put("code", AppCookie.getStringValue(getApplicationContext(), "code"));
map.put("code", AppCookie.getStringValue("code"));
mPresenter.postData(2, ApiConfig.HTTP_URL_PWD_LOGIN, RegisteredBean.class, map, true);
}
......
module_home/src/main/java/com/rv/home/rv/module/ui/login/PwdLoginActivity.java
View file @ e4582669
......@@ -255,7 +255,7 @@ public class PwdLoginActivity extends BaseLoginActivity<CommonPresenter> {
map.put("username", getPhone());
map.put("password", getPwd());
map.put("type", 1);
map.put("code", AppCookie.getStringValue(getApplicationContext(), "code"));
map.put("code", AppCookie.getStringValue( "code"));
mPresenter.postData(0, ApiConfig.HTTP_URL_PWD_LOGIN, RegisteredBean.class, map, true);
}
......
module_home/src/main/java/com/rv/home/rv/module/ui/login/RegisteredActivity.java
View file @ e4582669
......@@ -284,7 +284,7 @@ public class RegisteredActivity extends BaseLoginActivity<CommonPresenter> {
map.put("username", getPhone());
map.put("mobilecode", getCode());
map.put("password", getPwd());
map.put("code", AppCookie.getStringValue(this, "code"));
map.put("code", AppCookie.getStringValue("code"));
mPresenter.postData(RvFrameConfig.AUTH_POST, 1, ApiConfig.HTTP_URL_USER_REGISTER, RegisteredBean.class, map, headMap, true);
}
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/HomeFragment.java
View file @ e4582669
package com.rv.home.rv.module.ui.main.home;
import android.Manifest;
import android.annotation.SuppressLint;
import android.app.AlertDialog;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
......@@ -10,6 +12,7 @@ import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.provider.Settings;
import android.support.annotation.Nullable;
import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.LinearLayoutManager;
......@@ -484,7 +487,8 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
@Override
public void gpsChange(boolean b) {
if (b) {
initGps();
initCity();
}
}
......@@ -953,6 +957,11 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
@Override
public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (CODE_REQUEST_POISITION == requestCode) {
permissionProcess();
return;
}
if (resultCode == RESULT_OK) {
int type = data.getIntExtra("type", 1);
String requestData = data.getStringExtra("location");
......@@ -1347,26 +1356,29 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
/**
* 定位权限处理
*/
@SuppressLint("CheckResult")
private void permissionProcess() {
/**
* 6.0以上手机做权限处理
*/
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
new RxPermission(getActivity()).request(
Manifest.permission.ACCESS_COARSE_LOCATION,
Manifest.permission.ACCESS_FINE_LOCATION
).subscribe(new Consumer<Boolean>() {
@Override
public void accept(Boolean aBoolean) throws Exception {
if (aBoolean == true) {
initGps();
initCity();
} else {
new AppSettingsDialog.Builder(getActivity()).
setTitle("需要定位权限")
.setRationale("如果没有此权限，此应用程序可能无法正常工作,是否打开设置修改该应用权限")
.build().show();
}
).subscribe(aBoolean -> {
if (aBoolean == true) {
initGps();
initCity();
} else {
new AlertDialog.Builder(_mActivity).setTitle("需要定位权限")
.setMessage("位置权限已关闭，开启以便滴房车正常使用")
.setNegativeButton("取消", (dialogInterface, i) -> {
_mActivity.finish();
dialogInterface.dismiss();
})
.setPositiveButton("设置", (dialogInterface, i) -> {
Intent in = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
.setData(Uri.fromParts("package", _mActivity.getPackageName(), null));
startActivityForResult(in, CODE_REQUEST_POISITION);
dialogInterface.dismiss();
}).setCancelable(false).show();
}
});
} else {
......@@ -1454,6 +1466,12 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
// }
}
@Override
public void onDestroyView() {
super.onDestroyView();
GpsManager.getInstance(_mActivity).unbindGpsListener(this);
}
@Override
public void onDestroy() {
super.onDestroy();
......@@ -1463,6 +1481,5 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
if (locationManager != null) {
locationManager.onDestroy();
}
GpsManager.getInstance(_mActivity).unbindGpsListener(this);
}
}
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/adapter/ForPaymentAdapter.java
View file @ e4582669
......@@ -49,7 +49,7 @@ public class ForPaymentAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity
if (dataBean == null) {
return;
}
setTimes(AppCookie.getLongValue(mContext, "actRent"), helper, (OrderListBean.DataBeanX.DataBean) item);
setTimes(AppCookie.getLongValue( "actRent"), helper, (OrderListBean.DataBeanX.DataBean) item);
helper.setText(R.id.tv_order_time, String.format("%1$s%2$s", mContext.getString(R.string.rv_order_time), dataBean.getCrtTime()));
if (dataBean.getOrderRentVehicleDetail() != null && dataBean.getOrderRentVehicleDetail().getStart_city_name() != null) {
helper.setText(R.id.tv_city, dataBean.getOrderRentVehicleDetail().getStart_city_name());
......@@ -83,7 +83,7 @@ public class ForPaymentAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity
if (dataBean.getOrderTourDetail() == null) {
return;
}
setTimes(AppCookie.getLongValue(mContext, "actTour"), helper, (OrderListBean.DataBeanX.DataBean) item);
setTimes(AppCookie.getLongValue( "actTour"), helper, (OrderListBean.DataBeanX.DataBean) item);
helper.setText(R.id.tv_order_time, String.format("%1$s%2$s", mContext.getString(R.string.rv_order_time), dataBean.getCrtTime()));
helper.setText(R.id.tv_city, dataBean.getOrderTourDetail().getStartCityName());
helper.loadRoundImage(mContext, dataBean.getPicture(), (ImageView) helper.getView(R.id.iv_goods), 8);
......@@ -102,7 +102,7 @@ public class ForPaymentAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity
if (dataBean.getOrderMemberDetail() == null) {
return;
}
setTimes(AppCookie.getLongValue(mContext, "actMember"), helper, (OrderListBean.DataBeanX.DataBean) item);
setTimes(AppCookie.getLongValue("actMember"), helper, (OrderListBean.DataBeanX.DataBean) item);
helper.setText(R.id.tv_order_time, String.format("%1$s%2$s", mContext.getString(R.string.rv_order_time), dataBean.getCrtTime()));
helper.loadRoundImage(mContext, dataBean.getPicture(), (ImageView) helper.getView(R.id.iv_goods), 8);
helper.setText(R.id.tv_name, dataBean.getName());
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/adapter/OrderListAdapter.java
View file @ e4582669
......@@ -92,7 +92,7 @@ public class OrderListAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_for_payment));
helper.setText(R.id.tv_process, mContext.getString(R.string.rv_to_pay_for));
helper.setVisible(R.id.tv_process, true);
setTimes(AppCookie.getLongValue(mContext, "actRent"), helper, (OrderListBean.DataBeanX.DataBean) item);
setTimes(AppCookie.getLongValue( "actRent"), helper, (OrderListBean.DataBeanX.DataBean) item);
break;
case 4:
helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_to_travel));
......@@ -161,7 +161,7 @@ public class OrderListAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_for_payment));
helper.setText(R.id.tv_camp_process, mContext.getString(R.string.rv_to_pay_for));
helper.setVisible(R.id.tv_camp_process, true);
setTimes(AppCookie.getLongValue(mContext, "actTour"), helper, (OrderListBean.DataBeanX.DataBean) item);
setTimes(AppCookie.getLongValue("actTour"), helper, (OrderListBean.DataBeanX.DataBean) item);
break;
case 4:
helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_to_travel));
......
module_tourism/src/main/java/com/rv/tourism/TourismFragment.java
View file @ e4582669
package com.rv.tourism;
import android.Manifest;
import android.annotation.SuppressLint;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
......@@ -32,6 +33,7 @@ import com.ruiwenliu.wrapper.SPConstance;
import com.frame.base.url.Constance;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseFragment;
import com.ruiwenliu.wrapper.util.GpsManager;
import com.ruiwenliu.wrapper.util.LocationManager;
import com.ruiwenliu.wrapper.util.glide.GlideManager;
import com.ruiwenliu.wrapper.util.permission.RxPermission;
......@@ -69,7 +71,7 @@ import io.reactivex.functions.Consumer;
* 旅游
*/
public class TourismFragment extends BaseFragment<TourismPresenter> implements SimpleRefreshLayout.OnSimpleRefreshListener {
public class TourismFragment extends BaseFragment<TourismPresenter> implements SimpleRefreshLayout.OnSimpleRefreshListener, GpsManager.GpsChangeListener {
//BaseQuickAdapter.RequestLoadMoreListener,
@BindView(R2.id.travel_city_text)
TextView travelCityText;
......@@ -128,6 +130,7 @@ public class TourismFragment extends BaseFragment<TourismPresenter> implements S
@Override
protected void initView(Bundle savedInstanceState) {
GpsManager.getInstance(_mActivity).bindGpsListener(this);
mSimpleRefreshLayout.setHeaderView(new SimpleRefreshView(_mActivity));
mSimpleRefreshLayout.setOnSimpleRefreshListener(this);
setBanner();
......@@ -511,6 +514,13 @@ public class TourismFragment extends BaseFragment<TourismPresenter> implements S
loadPopularBrigadeAllData();
}
@Override
public void gpsChange(boolean b) {
if (b) {
permissionProcess();
}
}
public class AbSpacesItemDecoration extends RecyclerView.ItemDecoration {
......@@ -575,18 +585,15 @@ public class TourismFragment extends BaseFragment<TourismPresenter> implements S
/**
* 定位权限处理
*/
@SuppressLint("CheckResult")
private void permissionProcess() {
/**
* 6.0以上手机做权限处理
*/
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
new RxPermission(getActivity()).request(
Manifest.permission.ACCESS_COARSE_LOCATION,
Manifest.permission.ACCESS_FINE_LOCATION
).subscribe(new Consumer<Boolean>() {
@Override
public void accept(Boolean aBoolean) throws Exception {
public void accept(Boolean aBoolean) {
if (aBoolean == true) {
initGps();
initCity();
......@@ -632,6 +639,11 @@ public class TourismFragment extends BaseFragment<TourismPresenter> implements S
});
}
@Override
public void onDestroyView() {
super.onDestroyView();
GpsManager.getInstance(_mActivity).unbindGpsListener(this);
}
/**
* 初始化定位
......
plugin_calendar/src/main/java/com/rv/plugin/calendar/CalendarActivity.java
View file @ e4582669
......@@ -83,7 +83,7 @@ public class CalendarActivity extends BaseStatusActivity<CalendarPresenter> {
super.onCreate(savedInstanceState);
ButterKnife.bind(this);
context = this;
MAX_SPAN = AppCookie.getIntValue(context, AppCookie.KEY_PRERENT_DAYS, 30);
MAX_SPAN = AppCookie.getIntValue(AppCookie.KEY_PRERENT_DAYS, 30);
begDay = DateUtils.formatDate16(begDate);
begTime = DateUtils.formatDate17(begDate);
endDay = DateUtils.formatDate16(endDate);
......
plugin_carpurchase/src/main/java/com/xxrv/carpurchase/activity/ReservationInformationActivity.java
View file @ e4582669
......@@ -29,6 +29,7 @@ import com.frame.base.view.StarBar;
import com.frame.rv.config.RvFrameConfig;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseStatusActivity;
import com.ruiwenliu.wrapper.util.GpsManager;
import com.ruiwenliu.wrapper.util.LocationManager;
import com.ruiwenliu.wrapper.util.glide.GlideApp;
import com.ruiwenliu.wrapper.util.glide.GlideManager;
......@@ -56,7 +57,7 @@ import pub.devrel.easypermissions.AppSettingsDialog;
/**
* 预约信息
*/
public class ReservationInformationActivity extends BaseStatusActivity<CarPurchasePresenter> {
public class ReservationInformationActivity extends BaseStatusActivity<CarPurchasePresenter> implements GpsManager.GpsChangeListener {
@BindView(R2.id.iv_car_goods)
......@@ -112,6 +113,7 @@ public class ReservationInformationActivity extends BaseStatusActivity<CarPurcha
@Override
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
titleView.setTitle("预约信息");
GpsManager.getInstance(this).bindGpsListener(this);
permissionProcess();
initData(intent);
}
......@@ -191,7 +193,7 @@ public class ReservationInformationActivity extends BaseStatusActivity<CarPurcha
}
String branchoffice = tvBranchOfficeName.getText().toString();
if (TextUtils.isEmpty(branchoffice)){
if (TextUtils.isEmpty(branchoffice)) {
showToast("分公司不能为空！");
return;
}
......@@ -339,4 +341,17 @@ public class ReservationInformationActivity extends BaseStatusActivity<CarPurcha
}
});
}
@Override
public void gpsChange(boolean b) {
if (b) {
permissionProcess();
}
}
@Override
public void onDestroy() {
super.onDestroy();
GpsManager.getInstance(this).unbindGpsListener(this);
}
}
plugin_points/src/main/res/layout/activity_points.xml
View file @ e4582669
......@@ -28,11 +28,12 @@
android:textSize="@dimen/text_18" />
</RelativeLayout>
<RelativeLayout
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/size_100"
android:layout_marginBottom="@dimen/dp_10"
android:background="@drawable/bg_points_userinfo"
android:gravity="center_vertical"
android:orientation="horizontal">
<com.base.utils.ui.image.round.RoundImageView
......@@ -46,11 +47,16 @@
<TextView
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/dp_10"
android:layout_toEndOf="@+id/tv_point"
android:layout_toRightOf="@id/rimg_avatar"
android:layout_weight="1"
android:ellipsize="end"
android:maxLength="12"
android:singleLine="true"
android:textColor="@color/white"
android:textSize="@dimen/text_18" />
......@@ -58,16 +64,16 @@
android:id="@+id/tv_point"
android:layout_width="wrap_content"
android:layout_height="@dimen/size_100"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="@dimen/size_50"
android:fontFamily="sans-serif-condensed"
android:gravity="center"
android:lines="2"
android:text="0"
android:textColor="@color/white"
android:textSize="24sp"
android:textStyle="bold" />
</RelativeLayout>
</LinearLayout>
<include layout="@layout/common_rv" />
......
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