18034727885
2026-03-19 6d34a0979233e8f9dbc4fbcb5ba15db694b5b6b5
去掉友盟相关的功能
去掉高德地图相关的功能
15个文件已删除
2个文件已添加
13个文件已修改
2415 ■■■■■ 已修改文件
app/build.gradle 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/libs/AMap3DMap_11.1.063_AMapNavi_11.1.063_AMapSearch_9.7.4_AMapLocation_11.1.060_20260206.aar 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/AndroidManifest.xml 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/amaplib/BaseMapActivity.java 375 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/amaplib/GPSNaviActivity.java 58 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/amaplib/overlay/AMapServicesUtil.java 58 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/amaplib/overlay/DrivingRouteOverlay.java 279 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/amaplib/overlay/RouteOverlay.java 217 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/amaplib/util/ICallBack.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/amaplib/util/SystemTTS.java 114 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/amaplib/util/TTS.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/amaplib/util/TTSController.java 298 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/igo/user/IGoApplication.kt 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/igo/user/db/HistoryDBManager.kt 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/igo/user/network/entity/LatLonPoint.java 64 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/igo/user/network/entity/Tip.java 78 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/igo/user/ui/crosscity/ChooseMapPositionActivity.kt 328 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/igo/user/ui/crosscity/ConfirmPositionActivity.kt 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/igo/user/ui/login/LoginActivity.kt 80 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/igo/user/ui/mine/ShareAppActivity.kt 54 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/igo/user/ui/trip/ChoosePositionActivity.kt 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/igo/user/ui/trip/OrderDetailActivity.kt 53 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/igo/user/ui/trip/OrderDetailWithMapActivity.kt 41 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/igo/user/ui/trip/TripActivity.kt 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/igo/user/ui/trip/adapter/PositonAdapter.kt 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/igo/user/wxapi/WXEntryActivity.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/activity_basic_navi.xml 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/activity_choose_map_position.xml 84 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/activity_confirm_position.xml 96 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
umeng_sdk/build.gradle 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/build.gradle
@@ -160,7 +160,7 @@
    implementation project(path: ':xldutils-kotlin')
    implementation 'com.google.android.material:material:1.3.0-alpha01'
    implementation project(path: ':rxnetty')
    implementation project(path: ':umeng_sdk')
//    implementation project(path: ':umeng_sdk')
    implementation 'com.youth.banner:banner:2.0.11'
    implementation 'com.github.promeg:tinypinyin:2.0.3'
    implementation 'top.zibin:Luban:1.1.8'
@@ -186,4 +186,6 @@
    implementation 'com.github.bumptech.glide:glide:4.9.0'
    annotationProcessor 'com.github.bumptech.glide:compiler:4.10.0'
    implementation 'com.tencent.mm.opensdk:wechat-sdk-android:6.8.34' //微信官方依赖库
}
app/libs/AMap3DMap_11.1.063_AMapNavi_11.1.063_AMapSearch_9.7.4_AMapLocation_11.1.060_20260206.aar
Binary files differ
app/src/main/AndroidManifest.xml
@@ -123,8 +123,6 @@
        <activity android:name=".ui.crosscity.ShiftActivity"  android:exported="false"/>
        <activity android:name=".ui.crosscity.ChooseLineActivity"  android:exported="false"/>
        <activity android:name=".ui.crosscity.ConfirmCrossOrderActivity"  android:exported="false"/>
        <activity android:name=".ui.crosscity.ChooseMapPositionActivity" android:exported="false"/>
        <activity android:name=".ui.crosscity.ConfirmPositionActivity"  android:exported="false"/>
        <activity android:name=".ui.crosscity.PayCrossActivity"  android:exported="false"/>
        <activity android:name=".ui.crosscity.PaySuccessActivity"  android:exported="false"/>
        <activity android:name=".ui.crosscity.ShuttleBusActivity"  android:exported="false"/>
app/src/main/java/amaplib/BaseMapActivity.java
File was deleted
app/src/main/java/amaplib/GPSNaviActivity.java
File was deleted
app/src/main/java/amaplib/overlay/AMapServicesUtil.java
File was deleted
app/src/main/java/amaplib/overlay/DrivingRouteOverlay.java
File was deleted
app/src/main/java/amaplib/overlay/RouteOverlay.java
File was deleted
app/src/main/java/amaplib/util/ICallBack.java
File was deleted
app/src/main/java/amaplib/util/SystemTTS.java
File was deleted
app/src/main/java/amaplib/util/TTS.java
File was deleted
app/src/main/java/amaplib/util/TTSController.java
File was deleted
app/src/main/java/com/igo/user/IGoApplication.kt
@@ -39,8 +39,8 @@
import com.igo.user.utils.pay.PayListener
import com.igo.user.utils.pay.PayUtil
import com.sinata.download.DownloadLibrary
import com.umeng.commonsdk.UMConfigure
import com.umeng.socialize.PlatformConfig
//import com.umeng.commonsdk.UMConfigure
//import com.umeng.socialize.PlatformConfig
import io.reactivex.Flowable
import io.reactivex.disposables.Disposable
import org.jetbrains.anko.runOnUiThread
@@ -70,10 +70,10 @@
        )
        initLogs()
        initNetty()
        UMConfigure.init(this, Const.UMENG_KEY, "", UMConfigure.DEVICE_TYPE_PHONE, "")
        PlatformConfig.setWeixin(Const.WX_APP_ID, Const.WX_SECRET)
        PlatformConfig.setWXFileProvider("com.igo.user.FileProvider")
        UMConfigure.setLogEnabled(true)
//        UMConfigure.init(this, Const.UMENG_KEY, "", UMConfigure.DEVICE_TYPE_PHONE, "")
//        PlatformConfig.setWeixin(Const.WX_APP_ID, Const.WX_SECRET)
//        PlatformConfig.setWXFileProvider("com.igo.user.FileProvider")
//        UMConfigure.setLogEnabled(true)
        Places.initialize(this, Const.google_key)
        MapsInitializer.initialize(
            this, MapsInitializer.Renderer.LATEST
app/src/main/java/com/igo/user/db/HistoryDBManager.kt
@@ -3,8 +3,8 @@
import android.content.ContentValues
import android.content.Context
import cn.sinata.xldutils.sysErr
import com.amap.api.services.core.LatLonPoint
import com.amap.api.services.help.Tip
import com.igo.user.network.entity.LatLonPoint
import com.igo.user.network.entity.Tip
import org.jetbrains.anko.db.RowParser
import org.jetbrains.anko.db.SqlOrderDirection
import org.jetbrains.anko.db.delete
app/src/main/java/com/igo/user/network/entity/LatLonPoint.java
New file
@@ -0,0 +1,64 @@
package com.igo.user.network.entity;
public class LatLonPoint {
    private double a;
    private double b;
    public LatLonPoint(double var1, double var3) {
        this.a = var1;
        this.b = var3;
    }
    public double getLongitude() {
        return this.b;
    }
    public void setLongitude(double var1) {
        this.b = var1;
    }
    public double getLatitude() {
        return this.a;
    }
    public void setLatitude(double var1) {
        this.a = var1;
    }
    public LatLonPoint copy() {
        double var1 = this.a;
        double var3 = this.b;
        return new LatLonPoint(var1, var3);
    }
    @Override
    public int hashCode() {
        long var10000 = Double.doubleToLongBits(this.a);
        int var3 = 31 + (int) (var10000 ^ var10000 >>> 32);
        long var1 = Double.doubleToLongBits(this.b);
        return var3 * 31 + (int) (var1 ^ var1 >>> 32);
    }
    @Override
    public boolean equals(Object var1) {
        if (this == var1) {
            return true;
        } else if (var1 == null) {
            return false;
        } else if (this.getClass() != var1.getClass()) {
            return false;
        } else {
            if (Double.doubleToLongBits(this.a) != Double.doubleToLongBits(((LatLonPoint) var1).getLatitude())) {
                return false;
            } else {
                return Double.doubleToLongBits(this.b) == Double.doubleToLongBits(((LatLonPoint) var1).getLongitude());
            }
        }
    }
    @Override
    public String toString() {
        return "" + this.a + "," + this.b;
    }
}
app/src/main/java/com/igo/user/network/entity/Tip.java
New file
@@ -0,0 +1,78 @@
package com.igo.user.network.entity;
public class Tip {
    private String a;
    private LatLonPoint b;
    private String c;
    private String d;
    private String e;
    private String f;
    private String g;
    private String h;
    public Tip() {
        this.h = "";
    }
    public String getPoiID() {
        return this.a;
    }
    public void setID(String var1) {
        this.a = var1;
    }
    public LatLonPoint getPoint() {
        return this.b;
    }
    public void setPostion(LatLonPoint var1) {
        this.b = var1;
    }
    public String getName() {
        return this.c;
    }
    public void setName(String var1) {
        this.c = var1;
    }
    public String getDistrict() {
        return this.d;
    }
    public void setDistrict(String var1) {
        this.d = var1;
    }
    public String getAdcode() {
        return this.e;
    }
    public void setAdcode(String var1) {
        this.e = var1;
    }
    public String getAddress() {
        return this.f;
    }
    public void setAddress(String var1) {
        this.f = var1;
    }
    public void setTypeCode(String var1) {
        this.g = var1;
    }
    public String getTypeCode() {
        return this.g;
    }
    @Override
    public String toString() {
        return "name:" + this.c + " district:" + this.d + " adcode:" + this.e;
    }
}
app/src/main/java/com/igo/user/ui/crosscity/ChooseMapPositionActivity.kt
File was deleted
app/src/main/java/com/igo/user/ui/crosscity/ConfirmPositionActivity.kt
File was deleted
app/src/main/java/com/igo/user/ui/login/LoginActivity.kt
@@ -61,10 +61,10 @@
import com.twitter.sdk.android.core.TwitterSession
import com.twitter.sdk.android.core.identity.TwitterAuthClient
import com.twitter.sdk.android.core.models.User
import com.umeng.socialize.UMAuthListener
import com.umeng.socialize.UMShareAPI
import com.umeng.socialize.UMShareConfig
import com.umeng.socialize.bean.SHARE_MEDIA
//import com.umeng.socialize.UMAuthListener
//import com.umeng.socialize.UMShareAPI
//import com.umeng.socialize.UMShareConfig
//import com.umeng.socialize.bean.SHARE_MEDIA
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
@@ -72,7 +72,7 @@
import org.jetbrains.anko.startActivity
import org.jetbrains.anko.startActivityForResult
class LoginActivity : TransparentStatusBarActivity(), UMAuthListener {
class LoginActivity : TransparentStatusBarActivity()/*, UMAuthListener*/ {
    override fun setContentView() = R.layout.activity_login
    companion object {
@@ -335,15 +335,15 @@
            }
        }
        val config = UMShareConfig()
        config.isNeedAuthOnGetUserInfo(true)
        UMShareAPI.get(this).setShareConfig(config)
//        val config = UMShareConfig()
//        config.isNeedAuthOnGetUserInfo(true)
//        UMShareAPI.get(this).setShareConfig(config)
        tv_wx.setOnClickListener {
            if (!cb_rule.isChecked)
                myToast(getString(R.string.please_agree))
            else{
                UMShareAPI.get(this).getPlatformInfo(this, SHARE_MEDIA.WEIXIN, this)
//                UMShareAPI.get(this).getPlatformInfo(this, SHARE_MEDIA.WEIXIN, this)
            }
        }
@@ -539,37 +539,37 @@
    override fun onStart(p0: SHARE_MEDIA?) {
        Log.e("mmp", "开始了")
    }
    override fun onComplete(p0: SHARE_MEDIA?, p1: Int, p2: MutableMap<String, String>?) {
        showDialog()
        HttpManager.wxLogin(
            p2?.get("openid"), p2?.get("unionid"), p2?.get("iconurl"),
            p2?.get("name"), if (p2?.get("gender") == "男") 1 else 2
        ).request(this){ _, data->
            data?.let {
                SPUtils.instance().put(Const.User.APP_ID, it.optString("appid"))
                    .put(Const.User.TOKEN, it.optString("token"))
                    .put(Const.User.USER_ID, it.optInt("id")).apply()
                if (it.optInt("phone") != 2){ //没有手机号
                    startActivityForResult<BindPhoneActivity>(1)
                    SPUtils.instance().put(Const.User.NO_PHONE, true).apply()
                }else
                    finish()
            }
        }
    }
    override fun onCancel(p0: SHARE_MEDIA?, p1: Int) {
        Log.e("mmp", "取消了")
    }
    override fun onError(p0: SHARE_MEDIA?, p1: Int, p2: Throwable?) {
        Log.e("mmp", "失败了")
        myToast("登录失败 原因:" + p2?.message)
    }
//    override fun onStart(p0: SHARE_MEDIA?) {
//        Log.e("mmp", "开始了")
//    }
//
//    override fun onComplete(p0: SHARE_MEDIA?, p1: Int, p2: MutableMap<String, String>?) {
//        showDialog()
//        HttpManager.wxLogin(
//            p2?.get("openid"), p2?.get("unionid"), p2?.get("iconurl"),
//            p2?.get("name"), if (p2?.get("gender") == "男") 1 else 2
//        ).request(this){ _, data->
//            data?.let {
//                SPUtils.instance().put(Const.User.APP_ID, it.optString("appid"))
//                    .put(Const.User.TOKEN, it.optString("token"))
//                    .put(Const.User.USER_ID, it.optInt("id")).apply()
//                if (it.optInt("phone") != 2){ //没有手机号
//                    startActivityForResult<BindPhoneActivity>(1)
//                    SPUtils.instance().put(Const.User.NO_PHONE, true).apply()
//                }else
//                    finish()
//            }
//        }
//    }
//
//    override fun onCancel(p0: SHARE_MEDIA?, p1: Int) {
//        Log.e("mmp", "取消了")
//    }
//
//    override fun onError(p0: SHARE_MEDIA?, p1: Int, p2: Throwable?) {
//        Log.e("mmp", "失败了")
//        myToast("登录失败 原因:" + p2?.message)
//    }
    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
        super.onActivityResult(requestCode, resultCode, data)
app/src/main/java/com/igo/user/ui/mine/ShareAppActivity.kt
@@ -16,14 +16,14 @@
import com.igo.user.ui.TransparentStatusBarActivity
import com.igo.user.utils.Const
import com.igo.user.utils.IGoShareUtils
import com.share.utils.ShareUtils
import com.umeng.socialize.UMShareListener
import com.umeng.socialize.bean.SHARE_MEDIA
import com.umeng.socialize.media.UMImage
//import com.share.utils.ShareUtils
//import com.umeng.socialize.UMShareListener
//import com.umeng.socialize.bean.SHARE_MEDIA
//import com.umeng.socialize.media.UMImage
import org.jetbrains.anko.find
import org.jetbrains.anko.imageResource
class ShareAppActivity : TransparentStatusBarActivity(), UMShareListener {
class ShareAppActivity : TransparentStatusBarActivity()/*, UMShareListener*/ {
    override fun setContentView() = R.layout.activity_share
    private val tv_action by lazy { find<TextView>(R.id.tv_action) }
@@ -56,17 +56,17 @@
                    } else if (way == 5) {
                        IGoShareUtils.shareTweet(this@ShareAppActivity, getString(R.string.下载注册即送打车券), url, "/mipmap-xxhdpi/ic_launcher.png")
                    } else {
                        ShareUtils.share(
                            this@ShareAppActivity,
                            if (way == 0) SHARE_MEDIA.WEIXIN else if (way == 1) SHARE_MEDIA.WEIXIN_CIRCLE else if (way == 4) SHARE_MEDIA.FACEBOOK else
                                SHARE_MEDIA.MORE,
                            getString(R.string.下载注册即送打车券),
                            Const.Share.TITLE,
                            url,
                            UMImage(this@ShareAppActivity, R.mipmap.ic_launcher),
                            this@ShareAppActivity,
                            ""
                        )
//                        ShareUtils.share(
//                            this@ShareAppActivity,
//                            if (way == 0) SHARE_MEDIA.WEIXIN else if (way == 1) SHARE_MEDIA.WEIXIN_CIRCLE else if (way == 4) SHARE_MEDIA.FACEBOOK else
//                                SHARE_MEDIA.MORE,
//                            getString(R.string.下载注册即送打车券),
//                            Const.Share.TITLE,
//                            url,
//                            UMImage(this@ShareAppActivity, R.mipmap.ic_launcher),
//                            this@ShareAppActivity,
//                            ""
//                        )
                    }
                    shareDialog.dismiss()
@@ -118,16 +118,16 @@
        }
    }
    override fun onResult(p0: SHARE_MEDIA?) {
    }
    override fun onCancel(p0: SHARE_MEDIA?) {
    }
    override fun onError(p0: SHARE_MEDIA?, p1: Throwable?) {
    }
    override fun onStart(p0: SHARE_MEDIA?) {
    }
//    override fun onResult(p0: SHARE_MEDIA?) {
//    }
//
//    override fun onCancel(p0: SHARE_MEDIA?) {
//    }
//
//    override fun onError(p0: SHARE_MEDIA?, p1: Throwable?) {
//    }
//
//    override fun onStart(p0: SHARE_MEDIA?) {
//    }
}
app/src/main/java/com/igo/user/ui/trip/ChoosePositionActivity.kt
@@ -15,15 +15,15 @@
import cn.sinata.xldutils.utils.SPUtils
import cn.sinata.xldutils.view.SwipeRefreshRecyclerLayout
import cn.sinata.xldutils.visible
import com.amap.api.services.core.LatLonPoint
import com.amap.api.services.help.Tip
import com.igo.user.IGoApplication
import com.igo.user.R
import com.igo.user.db.HistoryDBManager
import com.igo.user.network.HttpManager
import com.igo.user.network.entity.Anchor
import com.igo.user.network.entity.LatLonPoint
import com.igo.user.network.entity.PlaceDetailBean
import com.igo.user.network.entity.SearchBean
import com.igo.user.network.entity.Tip
import com.igo.user.ui.ChooseCityActivity
import com.igo.user.ui.TransparentStatusBarActivity
import com.igo.user.ui.trip.adapter.PositionAdapter
@@ -184,7 +184,12 @@
                        val tip = Tip()
                        tip.name = it.name
                        tip.address = it.formatted_address
                        tip.setPostion( LatLonPoint(it.geometry.location.lat,it.geometry.location.lng))
                        tip.setPostion(
                            LatLonPoint(
                                it.geometry.location.lat,
                                it.geometry.location.lng
                            )
                        )
                        tip
                    })
                }
app/src/main/java/com/igo/user/ui/trip/OrderDetailActivity.kt
@@ -45,16 +45,15 @@
import com.igo.user.utils.showMoney
import com.igo.user.views.CenterFlowLayout
import com.igo.user.views.RatingBar
import com.share.utils.ShareUtils
import com.umeng.socialize.UMShareListener
import com.umeng.socialize.bean.SHARE_MEDIA
//import com.share.utils.ShareUtils
//import com.umeng.socialize.UMShareListener
//import com.umeng.socialize.bean.SHARE_MEDIA
import org.jetbrains.anko.find
import org.jetbrains.anko.sdk27.coroutines.onClick
import org.jetbrains.anko.startActivity
import org.jetbrains.anko.support.v4.startActivityForResult
class OrderDetailActivity : TransparentStatusBarActivity(), OrderStateChangeListener, PayListener,
    UMShareListener {
class OrderDetailActivity : TransparentStatusBarActivity(), OrderStateChangeListener, PayListener/*, UMShareListener*/ {
    override fun setContentView() = R.layout.activity_order_detail
    private val id by lazy {
@@ -326,16 +325,16 @@
                                                url
                                            )
                                        } else {
                                            ShareUtils.share(
                                                this@OrderDetailActivity,
                                                if (way == 0) SHARE_MEDIA.WEIXIN else if (way == 1) SHARE_MEDIA.QQ else
                                                    SHARE_MEDIA.MORE,
                                                getString(R.string.下载注册即送打车券),
                                                Const.Share.TITLE,
                                                url,
                                                this@OrderDetailActivity,
                                                ""
                                            )
//                                            ShareUtils.share(
//                                                this@OrderDetailActivity,
//                                                if (way == 0) SHARE_MEDIA.WEIXIN else if (way == 1) SHARE_MEDIA.QQ else
//                                                    SHARE_MEDIA.MORE,
//                                                getString(R.string.下载注册即送打车券),
//                                                Const.Share.TITLE,
//                                                url,
//                                                this@OrderDetailActivity,
//                                                ""
//                                            )
                                        }
                                    shareDialog.dismiss()
                                    if (!hasGetRed) {
@@ -749,18 +748,18 @@
        app.removeTripStateListener(this)
    }
    override fun onResult(p0: SHARE_MEDIA?) {
    }
    override fun onCancel(p0: SHARE_MEDIA?) {
    }
    override fun onError(p0: SHARE_MEDIA?, p1: Throwable?) {
    }
    override fun onStart(p0: SHARE_MEDIA?) {
    }
//    override fun onResult(p0: SHARE_MEDIA?) {
//    }
//
//    override fun onCancel(p0: SHARE_MEDIA?) {
//    }
//
//    override fun onError(p0: SHARE_MEDIA?, p1: Throwable?) {
//    }
//
//    override fun onStart(p0: SHARE_MEDIA?) {
//
//    }
    override fun onStateChanged(id: Int, state: Int) {
        if (id == this.id && order?.state == 6) { //当前是待司机确认费用,需要重新获取订单信息
app/src/main/java/com/igo/user/ui/trip/OrderDetailWithMapActivity.kt
@@ -39,14 +39,14 @@
import com.igo.user.utils.showMoney
import com.igo.user.views.CenterFlowLayout
import com.igo.user.views.RatingBar
import com.share.utils.ShareUtils
import com.umeng.socialize.UMShareListener
import com.umeng.socialize.bean.SHARE_MEDIA
//import com.share.utils.ShareUtils
//import com.umeng.socialize.UMShareListener
//import com.umeng.socialize.bean.SHARE_MEDIA
import org.jetbrains.anko.find
import org.jetbrains.anko.sdk27.coroutines.onClick
import org.jetbrains.anko.startActivity
class OrderDetailWithMapActivity :TransparentStatusBarActivity(),UMShareListener {
class OrderDetailWithMapActivity :TransparentStatusBarActivity()/*,UMShareListener*/ {
    override fun setContentView() = R.layout.activity_map_order_detail
    private val id by lazy {
@@ -282,7 +282,7 @@
                val money = it.optDouble("amount")
                if (money>0){
                    val tipDialog = TipDialog()
                    tipDialog.arguments = bundleOf("msg" to String.format(getString(R.string.分享APP给好友可以获得红包),money),
                    tipDialog.arguments = bundleOf("msg" to String.format(getString(R.string.分享APP给好友可以获得红包),"$money"),
                        "ok" to getString(R.string.去分享),"cancel" to getString(R.string.不分享))
                    tipDialog.setCallback(object :TipDialog.OnClickCallback{
                        override fun onOk() {
@@ -299,10 +299,11 @@
                                        IGoShareUtils.shareFB(this@OrderDetailWithMapActivity,url,getString(R.string.下载注册即送打车券),null)
                                    else if (way == 5)
                                        IGoShareUtils.shareTweet(this@OrderDetailWithMapActivity,getString(R.string.下载注册即送打车券),url)
                                    else
                                        ShareUtils.share(this@OrderDetailWithMapActivity,if (way == 0) SHARE_MEDIA.WEIXIN else if (way == 1) SHARE_MEDIA.QQ else
                                            SHARE_MEDIA.MORE, getString(R.string.下载注册即送打车券),Const.Share.TITLE,
                                            url,this@OrderDetailWithMapActivity,"")
                                    else {
//                                        ShareUtils.share(this@OrderDetailWithMapActivity,if (way == 0) SHARE_MEDIA.WEIXIN else if (way == 1) SHARE_MEDIA.QQ else
//                                            SHARE_MEDIA.MORE, getString(R.string.下载注册即送打车券),Const.Share.TITLE,
//                                            url,this@OrderDetailWithMapActivity,"")
                                    }
                                    shareDialog.dismiss()
                                    getRed(money)
                                }
@@ -330,15 +331,15 @@
        }
    }
    override fun onResult(p0: SHARE_MEDIA?) {
    }
    override fun onCancel(p0: SHARE_MEDIA?) {
    }
    override fun onError(p0: SHARE_MEDIA?, p1: Throwable?) {
    }
    override fun onStart(p0: SHARE_MEDIA?) {
    }
//    override fun onResult(p0: SHARE_MEDIA?) {
//    }
//
//    override fun onCancel(p0: SHARE_MEDIA?) {
//    }
//
//    override fun onError(p0: SHARE_MEDIA?, p1: Throwable?) {
//    }
//
//    override fun onStart(p0: SHARE_MEDIA?) {
//    }
}
app/src/main/java/com/igo/user/ui/trip/TripActivity.kt
@@ -76,8 +76,8 @@
import com.igo.user.utils.google.AMapKit
import com.igo.user.utils.google.JsonAuthTokenFactory
import com.tbruyelle.rxpermissions2.RxPermissions
import com.umeng.socialize.UMShareListener
import com.umeng.socialize.bean.SHARE_MEDIA
//import com.umeng.socialize.UMShareListener
//import com.umeng.socialize.bean.SHARE_MEDIA
import io.reactivex.subscribers.DisposableSubscriber
import org.jetbrains.anko.dip
import org.jetbrains.anko.find
@@ -86,7 +86,7 @@
import org.jetbrains.anko.startActivity
import org.jetbrains.anko.startActivityForResult
class TripActivity : BaseActivity(), Handler.Callback, OrderStateChangeListener, UMShareListener {
class TripActivity : BaseActivity(), Handler.Callback, OrderStateChangeListener/*, UMShareListener*/ {
    lateinit var aMap: ConsumerGoogleMap
    private val TAG = "TripActivity"
@@ -1208,17 +1208,17 @@
        super.onDestroy()
    }
    override fun onResult(p0: SHARE_MEDIA?) {
    }
    override fun onCancel(p0: SHARE_MEDIA?) {
    }
    override fun onError(p0: SHARE_MEDIA?, p1: Throwable?) {
    }
    override fun onStart(p0: SHARE_MEDIA?) {
    }
//    override fun onResult(p0: SHARE_MEDIA?) {
//    }
//
//    override fun onCancel(p0: SHARE_MEDIA?) {
//    }
//
//    override fun onError(p0: SHARE_MEDIA?, p1: Throwable?) {
//    }
//
//    override fun onStart(p0: SHARE_MEDIA?) {
//    }
    override fun onBackPressed() {
        if (ll_progress.visibility == View.VISIBLE)
app/src/main/java/com/igo/user/ui/trip/adapter/PositonAdapter.kt
@@ -3,8 +3,8 @@
import android.widget.ImageView
import cn.sinata.xldutils.adapter.HFRecyclerAdapter
import cn.sinata.xldutils.adapter.util.ViewHolder
import com.amap.api.services.help.Tip
import com.igo.user.R
import com.igo.user.network.entity.Tip
import org.jetbrains.anko.imageResource
class PositionAdapter(data:ArrayList<Tip>, private var isSearch:Boolean = false):HFRecyclerAdapter<Tip>(data, R.layout.item_taxi_position) {
app/src/main/java/com/igo/user/wxapi/WXEntryActivity.java
@@ -1,7 +1,9 @@
package com.igo.user.wxapi;
import com.umeng.socialize.weixin.view.WXCallbackActivity;
//import com.umeng.socialize.weixin.view.WXCallbackActivity;
public class WXEntryActivity  extends WXCallbackActivity {
import android.app.Activity;
public class WXEntryActivity  extends Activity/*WXCallbackActivity*/ {
}
app/src/main/res/layout/activity_basic_navi.xml
File was deleted
app/src/main/res/layout/activity_choose_map_position.xml
File was deleted
app/src/main/res/layout/activity_confirm_position.xml
File was deleted
umeng_sdk/build.gradle
@@ -33,5 +33,4 @@
    api  'com.umeng.umsdk:asms:1.8.7.2'// 必选
    api 'com.umeng.umsdk:share-core:7.3.7'//分享核心库,必选
    api 'com.umeng.umsdk:share-wx:7.3.7' //微信完整版
    api 'com.tencent.mm.opensdk:wechat-sdk-android:6.8.34' //微信官方依赖库
}