From 1f9f6aa98d5cf84d76a97ce3f5d977e5f5221be0 Mon Sep 17 00:00:00 2001 From: huangjian Date: Tue, 13 Jul 2021 16:21:15 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E4=BD=8D=E7=BD=AE=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 3 -- app/src/main/AndroidManifest.xml | 10 ------ .../erban/home/fragment/HomeFragment.java | 34 ------------------- .../home/presenter/MainFragmentPresenter.java | 8 ----- .../home/model/HomeModel.java | 23 ------------- .../home/model/IHomeModel.java | 11 ------ 6 files changed, 89 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 7abd56cec..d04b660a5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -274,9 +274,6 @@ dependencies { //验证码控件 https://github.com/JingYeoh/VercodeEditText 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' // 易盾一键登录 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c233d9945..099986082 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -19,19 +19,16 @@ - - - @@ -112,13 +109,6 @@ android:name="CHANNEL" android:value="official" /> - - - - - { - 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 private final List mFragments = new ArrayList<>(); private List mFragmentsBottom; @@ -236,7 +220,6 @@ public class HomeFragment extends BaseMvpFragment { }); } - 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() { - @Override - public void accept(Object o, Throwable throwable) throws Exception { - - } - }); - } public void roomWorldModeClose(long roomUid) { MiniWorldModel.getInstance().roomWorldModeClose(roomUid).subscribe(new BeanObserver() { diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/HomeModel.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/HomeModel.java index f3e8101ad..df40393ea 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/HomeModel.java +++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/HomeModel.java @@ -502,14 +502,6 @@ public class HomeModel extends BaseModel implements IHomeModel { ; } - @Override - public Single 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 public Single> getGodList(long uid, int pageIndex, int pageSize, String type) { return api.getHomeListV5(uid, pageIndex, pageSize, type) @@ -760,21 +752,6 @@ public class HomeModel extends BaseModel implements IHomeModel { @GET("home/v5/getFirstPageBanner") Single> getHomeBannerInfo(@Query("type") long type); - - /** - * 上传地理位置信息 - * - * @param uid - * @param address - * @param adcode - * @param longitude - * @param latitude - * @return - */ - @FormUrlEncoded - @POST("user/address/save") - Single> uploadAddress(@Field("uid") long uid, @Field("address") String address, @Field("adcode") int adcode, @Field("longitude") double longitude, @Field("latitude") double latitude); - /** * 获取语音派对里面的banner * diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/IHomeModel.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/IHomeModel.java index 632223483..47690fc90 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/IHomeModel.java +++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/IHomeModel.java @@ -140,17 +140,6 @@ public interface IHomeModel extends IModel { */ Single getHomeBannerInfo(); - /** - * 上传用户位置信息 - * @param uid - * @param address - * @param adcode - * @param longitude - * @param latitude - * @return - */ - Single uploadAddress(long uid, String address, int adcode, double longitude, double latitude); - /** * 获取男神女神数据和banner信息 * @return