登录添加用户协议

lmw

2023-04-21 710c5ca67b1c2e658ec5495c01136540fcfd21c3

登录添加用户协议

 app/build.gradle

@@ -120,10 +120,6 @@
    implementation 'com.wang.avi:library:2.1.3'
    implementation 'com.github.mcxtzhang:SwipeDelMenuLayout:V1.3.0'
    implementation 'com.google.zxing:core:3.3.0'
    implementation 'cn.jiguang.sdk:jpush:3.6.6'  // 此处以JPush 3.6.6 版本为例。
    implementation 'cn.jiguang.sdk:jcore:2.3.8'  // 此处以JCore 2.3.8 版本为例。
    implementation 'com.tencent.bugly:crashreport:3.1.0'
    implementation 'com.tencent.bugly:nativecrashreport:3.1.0'
    implementation project(path: ':ChipsLayoutManager')
//    implementation 'com.huaweicloud:esdk-obs-android:3.21.12'
    implementation 'com.squareup.okhttp3:okhttp:3.12.0'

 app/src/main/AndroidManifest.xml

@@ -184,34 +184,6 @@
            android:exported="true"
            android:theme="@android:style/Theme.Translucent.NoTitleBar" /> <!-- 微信 -->

        <!-- Since JCore2.0.0 Required SDK核心功能-->
        <!-- 可配置android:process参数将Service放在其他进程中；android:enabled属性不能是false -->
        <!-- 这个是自定义Service，要继承极光JCommonService，可以在更多手机平台上使得推送通道保持的更稳定 -->
        <service
            android:name="com.fuban.driver.ui.push.JCommonByService"
            android:enabled="true"
            android:exported="false"
            android:process=":pushcore">
            <intent-filter>
                <action android:name="cn.jiguang.user.service.action" />
            </intent-filter>
        </service>

        <!-- Required since 3.0.7 -->
        <!-- 新的 tag/alias 接口结果返回需要开发者配置一个自定的广播 -->
        <!-- 3.3.0开始所有事件将通过该类回调 -->
        <!-- 该广播需要继承 JPush 提供的 JPushMessageReceiver 类, 并如下新增一个 Intent-Filter -->
        <receiver
            android:name="com.fuban.driver.ui.push.JPushReceiver"
            android:enabled="true"
            android:exported="false">
            <intent-filter>
                <action android:name="cn.jpush.android.intent.RECEIVE_MESSAGE" />
                <category android:name="com.example.oktrip" />
            </intent-filter>
        </receiver>


    </application>

</manifest>

 app/src/main/java/com/fuban/driver/base/MyApplication.kt

@@ -6,8 +6,6 @@
import android.os.*
import android.util.Log
import androidx.annotation.RequiresApi
import cn.jpush.android.api.JPushInterface
import cn.jpush.android.api.TagAliasCallback
import cn.sinata.rxnetty.NettyClient
import cn.sinata.xldutils.BaseApplication
import cn.sinata.xldutils.utils.sysErr
@@ -33,7 +31,6 @@
import com.fuban.driver.utils.Cache.CacheUtil
import com.fuban.driver.utils.LogUtils
import com.google.gson.Gson
import com.tencent.bugly.crashreport.CrashReport
import com.umeng.commonsdk.UMConfigure
import com.umeng.socialize.PlatformConfig
import com.xuexiang.xui.XUI
@@ -88,62 +85,11 @@
        )
        PlatformConfig.setWeixin("wx19a713b4943f9568", "5d4ca951a855b1e2c86a844cd42fd133")
        PlatformConfig.setQQZone("1112151767", "5viZ7mQkNkYtUr7b") //qq互联
        JPushInterface.setDebugMode(true)
        JPushInterface.init(this)
        setAlisa()
    }

    public fun setAlisa() {
        if (CacheKey.getUserId().isNotEmpty()) {
            var alisa = "DRIVER" + CacheKey.getUserId()
            sysErr(alisa)
            mHandler.sendMessage(mHandler.obtainMessage(MSG_SET_ALIAS, alisa))
        }
    }

    private val MSG_SET_ALIAS = 1001
    private val mHandler: Handler = object : Handler() {
        override fun handleMessage(msg: Message) {
            super.handleMessage(msg)
            when (msg.what) {
                MSG_SET_ALIAS -> {
                    Log.d(TAG, "Set alias in handler.")
                    // 调用 JPush 接口来设置别名。
                    JPushInterface.setAliasAndTags(
                        applicationContext,
                        msg.obj as String,
                        null,
                        mAliasCallback
                    )
                }
                else -> Log.i(TAG, "Unhandled msg - " + msg.what)
            }
        }
    }

    private val mAliasCallback =
        TagAliasCallback { code, alias, tags ->
            val logs: String
            when (code) {
                0 -> {
                    logs = "Set tag and alias success"
                    Log.i("TAG", logs)
                }
                6002 -> {
                    logs = "Failed to set alias and tags due to timeout. Try again after 60s."
                    Log.i("TAG", logs)
                    // 延迟 60 秒来调用 Handler 设置别名
                    var alisa = "DRIVER" + CacheKey.getUserId()
                    Handler().postDelayed({
                        JPushInterface.setAliasAndTags(this, alisa, null, null)
                    }, 60 * 1000)
                }
                else -> {
                    logs = "Failed with errorCode = $code"
                    Log.e("TAG", logs)
                }
            }
        }


    private fun initSocket() {
        NettyClient.getInstance().init(this, Api.SOCKET_SERVER, Api.SOCKET_PORT, true)

 app/src/main/java/com/fuban/driver/netUtls/Api.java

@@ -109,6 +109,7 @@
    public static String queryLineShiftInfo = "api/line/queryLineShiftInfo"; ///api/line/queryLineShiftInfo 获取线路的班次数据
    public static String reservation = "api/line/reservation"; //api/line/reservation 预约/取消预约
    public static String reassignOrderCrossCityReassign = "api/orderCrossCity/reassignOrderCrossCityReassign"; ///api/orderCrossCity/reassignOrderCrossCityReassign 提交改派申请（跨城）
    public static String cancelAccount = "api/driver/cancelAccount"; //注销

    /***
     * card

 app/src/main/java/com/fuban/driver/ui/mine/AcountSafeActivity.kt

@@ -1,13 +1,22 @@
package com.fuban.driver.ui.mine

import cn.sinata.rxnetty.NettyClient
import cn.sinata.xldutils.utils.clickDelay
import com.fuban.driver.R
import com.fuban.driver.base.MyApplication
import com.fuban.driver.base.MyBaseActivity
import com.fuban.driver.netUtls.Api
import com.fuban.driver.netUtls.callNet
import com.fuban.driver.netUtls.getMapByAny
import com.fuban.driver.ui.DialogUtil
import com.fuban.driver.ui.card.CardListActivity
import com.fuban.driver.ui.card.CommitPwdActivity
import com.fuban.driver.ui.pub.LoginActivity
import com.fuban.driver.utils.Cache.CacheKey
import com.fuban.driver.utils.Cache.CacheUtil
import kotlinx.android.synthetic.main.activity_safe_acount.*
import org.jetbrains.anko.startActivity
import org.jetbrains.anko.toast

class AcountSafeActivity : MyBaseActivity(){

@@ -45,6 +54,18 @@
        tv_money_pwd.clickDelay {
            startActivity<CommitPwdActivity>()
        }

        tv_unregister.clickDelay {
            DialogUtil.getDelAndSureDialog(this,"是否确认注销账户？",{},{
                callNet(Api.cancelAccount, getMapByAny()){
                    toast("注销成功")
                    CacheUtil.get().clear()
                    NettyClient.getInstance().stopService()
                    MyApplication.isLogin = false
                    startActivity<LoginActivity>()
                }
            })
        }
    }

}

 app/src/main/java/com/fuban/driver/ui/pub/LoginActivity.kt

@@ -6,6 +6,7 @@
import android.widget.TextView
import android.widget.Toast
import androidx.core.app.NotificationManagerCompat
import cn.sinata.xldutils.utils.clickDelay
import cn.sinata.xldutils.utils.getString
import cn.sinata.xldutils.utils.gone
import com.kuaiyun.emanagercar.ui.base.Local.BaseLoginActivity
@@ -19,6 +20,7 @@
import com.fuban.driver.ui.main.MainActivity
import com.fuban.driver.utils.Cache.CacheKey
import com.fuban.driver.utils.PhoneCheckUtil
import com.kuaiyun.emanagercar.ui.base.BaseWebActivity
import kotlinx.android.synthetic.main.activity_login.*
import kotlinx.android.synthetic.main.include_login_phone.*
import kotlinx.android.synthetic.main.include_login_pwd.*
@@ -62,7 +64,7 @@
    }
    fun callHtml(click: (s: String) -> Unit) {
        var map = getMapByAny()
        map["type"] = 9
        map["type"] = 2
        callNet(Api.queryByType, map) {
            var data = gson.fromJson<AgreeBean>(it, AgreeBean::class.java)
            click(data.data.content)
@@ -71,8 +73,6 @@


    override fun setOnclick() {


        tv_driver.setOnClickListener {
            startActivity<BecomeDriverActivity>()
        }
@@ -81,13 +81,19 @@
            startActivity<ForgetPwdActivity>()
        }

        iv_eye.setOnClickListener {
        tv_rule.clickDelay {
            callHtml {

                BaseWebActivity.to(this, it, "用户协议", "1")
            }
        }
        iv_eye.setOnClickListener {
            showEye(iv_eye,et_login_pwd)
        }
        tv_login.setOnClickListener {
            if (!cb_rule.isChecked){
                toast("请阅读并同意《福伴司机用户服务协议》")
                return@setOnClickListener
            }
            if (et_login_phone.getString().isEmpty()){
                toast("请输入手机号")
                return@setOnClickListener
@@ -116,7 +122,6 @@
                CacheKey.putKeyStr("terminalName",bean.data.terminalId.toString())

                toast("登录成功")
                MyApplication.getInstance()!!.setAlisa()
                startActivity<MainActivity>()
            }
        }

 app/src/main/java/com/fuban/driver/ui/push/JCommonByService.java

File was deleted

 app/src/main/java/com/fuban/driver/ui/push/JPushReceiver.java

File was deleted

 app/src/main/res/drawable/selector_radio.xml

New file
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
    <item android:drawable="@mipmap/icon_raidobutton_selected" android:state_checked="true"/>
    <item android:drawable="@mipmap/icon_raidobutton" android:state_checked="false"/>
</selector>

 app/src/main/res/layout/activity_login.xml

@@ -25,6 +25,8 @@

    </LinearLayout>



    <TextView
        android:id="@+id/tv_forget_pwd"
        android:layout_gravity="right"
@@ -36,14 +38,36 @@
        android:textColor="@color/blue"
        android:textSize="12sp"
        />

    <LinearLayout
        android:layout_width="match_parent"
        android:layout_marginTop="20dp"
        android:layout_height="wrap_content">
        <CheckBox
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:id="@+id/cb_rule"
            android:layout_marginStart="14dp"
            android:text="我已阅读并同意"
            android:textSize="11sp"
            android:paddingStart="4dp"
            android:textColor="@color/textColor"
            android:paddingVertical="8dp"
            android:button="@drawable/selector_radio"/>
        <TextView
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:textSize="11sp"
            android:textColor="#0853FD"
            android:paddingVertical="8dp"
            android:id="@+id/tv_rule"
            android:text="《福伴司机用户服务协议》"/>
    </LinearLayout>
    <TextView
        android:id="@+id/tv_login"
        android:layout_width="match_parent"
        android:text="登录"
        android:textColor="#ffffffff"
        android:gravity="center"
        android:layout_marginTop="44dp"
        android:layout_marginStart="14dp"
        android:layout_marginEnd="14dp"
        android:background="@drawable/bg_login"

 app/src/main/res/layout/activity_safe_acount.xml

@@ -98,4 +98,21 @@
        />


    <include layout="@layout/include_line_14"/>

    <TextView
        android:id="@+id/tv_unregister"
        android:layout_width="match_parent"
        android:layout_height="50dp"
        android:gravity="center_vertical"
        android:paddingStart="14dp"
        android:background="@color/white"
        android:paddingEnd="14dp"
        android:drawableEnd="@mipmap/more_black"
        android:text="账户注销"
        android:textColor="#ff333333"
        android:textSize="14sp"
        />


</LinearLayout>