移除位置上传相关代码
This commit is contained in:
@@ -274,9 +274,6 @@ dependencies {
|
|||||||
//验证码控件 https://github.com/JingYeoh/VercodeEditText
|
//验证码控件 https://github.com/JingYeoh/VercodeEditText
|
||||||
implementation 'com.justkiddingbaby:vercodeedittext:1.1.0'
|
implementation 'com.justkiddingbaby:vercodeedittext:1.1.0'
|
||||||
|
|
||||||
//高德地图
|
|
||||||
implementation 'com.amap.api:location:3.3.0'
|
|
||||||
|
|
||||||
implementation 'it.sephiroth.android.library.imagezoom:library:1.0.4'
|
implementation 'it.sephiroth.android.library.imagezoom:library:1.0.4'
|
||||||
|
|
||||||
// 易盾一键登录
|
// 易盾一键登录
|
||||||
|
@@ -19,19 +19,16 @@
|
|||||||
<!-- Required -->
|
<!-- Required -->
|
||||||
<uses-permission android:name="android.permission.RECORD_AUDIO" />
|
<uses-permission android:name="android.permission.RECORD_AUDIO" />
|
||||||
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
|
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
|
||||||
<!-- <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />-->
|
|
||||||
<uses-permission android:name="android.permission.GET_TASKS" />
|
<uses-permission android:name="android.permission.GET_TASKS" />
|
||||||
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
|
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
|
||||||
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
|
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
|
||||||
<uses-permission android:name="android.permission.WAKE_LOCK" />
|
<uses-permission android:name="android.permission.WAKE_LOCK" />
|
||||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
|
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
|
||||||
<!-- <uses-permission android:name="android.permission.READ_PHONE_STATE" />-->
|
|
||||||
<uses-permission
|
<uses-permission
|
||||||
android:name="android.permission.READ_PHONE_STATE"
|
android:name="android.permission.READ_PHONE_STATE"
|
||||||
tools:node="remove" />
|
tools:node="remove" />
|
||||||
|
|
||||||
<!-- 云信权限声明 -->
|
<!-- 云信权限声明 -->
|
||||||
<!-- <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />-->
|
|
||||||
<!-- 控制呼吸灯,振动器等,用于新消息提醒 -->
|
<!-- 控制呼吸灯,振动器等,用于新消息提醒 -->
|
||||||
<uses-permission android:name="android.permission.FLASHLIGHT" />
|
<uses-permission android:name="android.permission.FLASHLIGHT" />
|
||||||
<uses-permission android:name="android.permission.VIBRATE" /> <!-- 外置存储存取权限 -->
|
<uses-permission android:name="android.permission.VIBRATE" /> <!-- 外置存储存取权限 -->
|
||||||
@@ -112,13 +109,6 @@
|
|||||||
android:name="CHANNEL"
|
android:name="CHANNEL"
|
||||||
android:value="official" />
|
android:value="official" />
|
||||||
|
|
||||||
<!-- 高德地图 begin -->
|
|
||||||
<meta-data
|
|
||||||
android:name="com.amap.api.v2.apikey"
|
|
||||||
android:value="50ab4ea0fed58ae8b99a6a7914cab197" />
|
|
||||||
|
|
||||||
<service android:name="com.amap.api.location.APSService" />
|
|
||||||
<!-- 高德地图 end -->
|
|
||||||
<!-- 刘海屏适配 begin -->
|
<!-- 刘海屏适配 begin -->
|
||||||
<!-- 小米 -->
|
<!-- 小米 -->
|
||||||
<meta-data
|
<meta-data
|
||||||
|
@@ -26,9 +26,6 @@ import androidx.databinding.DataBindingUtil;
|
|||||||
import androidx.fragment.app.Fragment;
|
import androidx.fragment.app.Fragment;
|
||||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||||
|
|
||||||
import com.amap.api.location.AMapLocationClient;
|
|
||||||
import com.amap.api.location.AMapLocationClientOption;
|
|
||||||
import com.amap.api.location.AMapLocationListener;
|
|
||||||
import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
|
import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
|
||||||
import com.bumptech.glide.load.resource.bitmap.BitmapTransformation;
|
import com.bumptech.glide.load.resource.bitmap.BitmapTransformation;
|
||||||
import com.bumptech.glide.request.RequestOptions;
|
import com.bumptech.glide.request.RequestOptions;
|
||||||
@@ -54,7 +51,6 @@ import com.yizhuan.erban.home.adapter.HomeConcernsAdapter;
|
|||||||
import com.yizhuan.erban.home.adapter.MainMagicIndicatorAdapter;
|
import com.yizhuan.erban.home.adapter.MainMagicIndicatorAdapter;
|
||||||
import com.yizhuan.erban.home.presenter.MainFragmentPresenter;
|
import com.yizhuan.erban.home.presenter.MainFragmentPresenter;
|
||||||
import com.yizhuan.erban.home.view.IMainFragmentView;
|
import com.yizhuan.erban.home.view.IMainFragmentView;
|
||||||
import com.yizhuan.erban.location.LocationManager;
|
|
||||||
import com.yizhuan.erban.radish.signin.SignInActivity;
|
import com.yizhuan.erban.radish.signin.SignInActivity;
|
||||||
import com.yizhuan.erban.ui.search.SearchActivity;
|
import com.yizhuan.erban.ui.search.SearchActivity;
|
||||||
import com.yizhuan.erban.ui.webview.CommonWebViewActivity;
|
import com.yizhuan.erban.ui.webview.CommonWebViewActivity;
|
||||||
@@ -122,18 +118,6 @@ public class HomeFragment extends BaseMvpFragment<IMainFragmentView, MainFragmen
|
|||||||
public static final String TAG = "GameHomeFragment";
|
public static final String TAG = "GameHomeFragment";
|
||||||
private FragmentGameHomeBinding mBinding;
|
private FragmentGameHomeBinding mBinding;
|
||||||
|
|
||||||
//声明定位回调监听器
|
|
||||||
private final AMapLocationListener mLocationListener = aMapLocation -> {
|
|
||||||
long uid = AuthModel.get().getCurrentUid();
|
|
||||||
if (aMapLocation != null && aMapLocation.getErrorCode() == 0 && uid != 0L) {
|
|
||||||
try {
|
|
||||||
LocationManager.saveUploadTime();
|
|
||||||
getMvpPresenter().uploadAddress(AuthModel.get().getCurrentUid(), aMapLocation.getAddress(), Integer.parseInt(aMapLocation.getAdCode()), aMapLocation.getLongitude(), aMapLocation.getLatitude());
|
|
||||||
} catch (NumberFormatException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
@NonNull
|
@NonNull
|
||||||
private final List<Fragment> mFragments = new ArrayList<>();
|
private final List<Fragment> mFragments = new ArrayList<>();
|
||||||
private List<Fragment> mFragmentsBottom;
|
private List<Fragment> mFragmentsBottom;
|
||||||
@@ -236,7 +220,6 @@ public class HomeFragment extends BaseMvpFragment<IMainFragmentView, MainFragmen
|
|||||||
public void initiate() {
|
public void initiate() {
|
||||||
mBinding.rollView.setVisibility(View.GONE);
|
mBinding.rollView.setVisibility(View.GONE);
|
||||||
this.uiHandler = new Handler();
|
this.uiHandler = new Handler();
|
||||||
initLocation();
|
|
||||||
initGuide();
|
initGuide();
|
||||||
initRefreshView();
|
initRefreshView();
|
||||||
initTitleTab();
|
initTitleTab();
|
||||||
@@ -293,23 +276,6 @@ public class HomeFragment extends BaseMvpFragment<IMainFragmentView, MainFragmen
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private void initLocation() {
|
|
||||||
//初始化定位
|
|
||||||
//声明AMapLocationClient类对象
|
|
||||||
AMapLocationClient mLocationClient = new AMapLocationClient(getContext().getApplicationContext());
|
|
||||||
//设置定位回调监听
|
|
||||||
mLocationClient.setLocationListener(mLocationListener);
|
|
||||||
|
|
||||||
//声明AMapLocationClientOption对象
|
|
||||||
AMapLocationClientOption mLocationOption = new AMapLocationClientOption();
|
|
||||||
mLocationOption.setLocationMode(AMapLocationClientOption.AMapLocationMode.Hight_Accuracy);
|
|
||||||
mLocationOption.setOnceLocation(true);
|
|
||||||
mLocationOption.setNeedAddress(true);
|
|
||||||
mLocationOption.setMockEnable(true);
|
|
||||||
mLocationClient.setLocationOption(mLocationOption);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 推荐房间TAG
|
* 推荐房间TAG
|
||||||
*/
|
*/
|
||||||
|
@@ -363,14 +363,6 @@ public class MainFragmentPresenter extends BaseMvpPresenter<IMainFragmentView> {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public void uploadAddress(long uid, String address, int adcode, double longitude, double latitude) {
|
|
||||||
Disposable disposable = HomeModel.get().uploadAddress(uid, address, adcode, longitude, latitude).compose(bindUntilEvent(PresenterEvent.DESTROY)).subscribe(new BiConsumer<Object, Throwable>() {
|
|
||||||
@Override
|
|
||||||
public void accept(Object o, Throwable throwable) throws Exception {
|
|
||||||
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
public void roomWorldModeClose(long roomUid) {
|
public void roomWorldModeClose(long roomUid) {
|
||||||
MiniWorldModel.getInstance().roomWorldModeClose(roomUid).subscribe(new BeanObserver<String>() {
|
MiniWorldModel.getInstance().roomWorldModeClose(roomUid).subscribe(new BeanObserver<String>() {
|
||||||
|
@@ -502,14 +502,6 @@ public class HomeModel extends BaseModel implements IHomeModel {
|
|||||||
;
|
;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public Single<Object> uploadAddress(long uid, String address, int adcode, double longitude, double latitude) {
|
|
||||||
return api.uploadAddress(uid, address, adcode, longitude, latitude)
|
|
||||||
.compose(RxHelper.handleSchedulers())
|
|
||||||
.compose(RxHelper.handleException())
|
|
||||||
.compose(RxHelper.singleMainResult());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Single<List<RecommendationUserInfo>> getGodList(long uid, int pageIndex, int pageSize, String type) {
|
public Single<List<RecommendationUserInfo>> getGodList(long uid, int pageIndex, int pageSize, String type) {
|
||||||
return api.getHomeListV5(uid, pageIndex, pageSize, type)
|
return api.getHomeListV5(uid, pageIndex, pageSize, type)
|
||||||
@@ -760,21 +752,6 @@ public class HomeModel extends BaseModel implements IHomeModel {
|
|||||||
@GET("home/v5/getFirstPageBanner")
|
@GET("home/v5/getFirstPageBanner")
|
||||||
Single<ServiceResult<HomeBannerInfo>> getHomeBannerInfo(@Query("type") long type);
|
Single<ServiceResult<HomeBannerInfo>> getHomeBannerInfo(@Query("type") long type);
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 上传地理位置信息
|
|
||||||
*
|
|
||||||
* @param uid
|
|
||||||
* @param address
|
|
||||||
* @param adcode
|
|
||||||
* @param longitude
|
|
||||||
* @param latitude
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
@FormUrlEncoded
|
|
||||||
@POST("user/address/save")
|
|
||||||
Single<ServiceResult<Object>> uploadAddress(@Field("uid") long uid, @Field("address") String address, @Field("adcode") int adcode, @Field("longitude") double longitude, @Field("latitude") double latitude);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取语音派对里面的banner
|
* 获取语音派对里面的banner
|
||||||
*
|
*
|
||||||
|
@@ -140,17 +140,6 @@ public interface IHomeModel extends IModel {
|
|||||||
*/
|
*/
|
||||||
Single<HomeBannerInfo> getHomeBannerInfo();
|
Single<HomeBannerInfo> getHomeBannerInfo();
|
||||||
|
|
||||||
/**
|
|
||||||
* 上传用户位置信息
|
|
||||||
* @param uid
|
|
||||||
* @param address
|
|
||||||
* @param adcode
|
|
||||||
* @param longitude
|
|
||||||
* @param latitude
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
Single<Object> uploadAddress(long uid, String address, int adcode, double longitude, double latitude);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取男神女神数据和banner信息
|
* 获取男神女神数据和banner信息
|
||||||
* @return
|
* @return
|
||||||
|
Reference in New Issue
Block a user