启动图标替换；Api接口更新

app/build.gradle

@@ -28,7 +28,7 @@ android {
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
 
-        buildConfigField "String", "BASE_URL", "\"http://10.190.183.37\""
+        buildConfigField "String", "BASE_URL", "\"http://10.190.183.37:80\""
 
         javaCompileOptions {
             annotationProcessorOptions {

app/src/main/AndroidManifest.xml

@@ -34,7 +34,7 @@
         android:name="com.project.survey.App"
         android:allowBackup="false"
         android:extractNativeLibs="true"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@mipmap/icon_launcher"
         android:label="@string/app_name"
         android:networkSecurityConfig="@xml/network_security_config"
         android:requestLegacyExternalStorage="true"

app/src/main/java/com/project/survey/constants/Constants.kt

@@ -7,7 +7,7 @@ object Constants {
 object SPConstants {
     const val TOKEN = "token"
     const val ACCOUNT = "account"
-    const val LOGIN = "login" //登录状态
+    const val MOBILE_PHONE = "mobilePhone"
 }
 
 object EventConstants{

app/src/main/java/com/project/survey/logic/bean/LoginBean.kt

@@ -0,0 +1,6 @@
+package com.project.survey.logic.bean
+
+data class LoginBean(
+    val token: String,
+    val mobilePhone: String
+)

app/src/main/java/com/project/survey/logic/viewmodel/LoginViewModel.kt

@@ -4,39 +4,48 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import com.project.survey.constants.EventConstants
 import com.project.survey.constants.SPConstants
+import com.project.survey.logic.bean.LoginBean
 import com.project.survey.logic.event.Message
 import com.project.survey.network.RetrofitClient
 import com.project.survey.util.SPUtils
 
-class LoginViewModel : BaseViewModel(){
+class LoginViewModel : BaseViewModel() {
 
     val api = RetrofitClient.createApiService()
 
 
-    val loginResponse: LiveData<String>
+    val loginResponse: LiveData<LoginBean>
         get() = _loginResponse
-    private val _loginResponse = MutableLiveData<String>()
+    private val _loginResponse = MutableLiveData<LoginBean>()
 
     /**
      * 登录
      */
-    fun login(account: String, password: String){
+    fun login(account: String, password: String) {
         launch {
-            // TODO:  
+            val res = api.login(account, password)
-//            val res = api.login(account, password)
+            if (res.success) {
-//            if (res.success){
+                _loginResponse.postValue(res.data)
-//                _loginResponse.postValue(res.data)
+                SPUtils.put(SPConstants.TOKEN, res.data.token)
-//                SPUtils.put(SPConstants.TOKEN, res.data)
+                SPUtils.put(SPConstants.ACCOUNT, account)
+                SPUtils.put(SPConstants.MOBILE_PHONE, res.data.mobilePhone)
+                msgEvent.postValue(Message(EventConstants.LOGIN_STATUS))
+            }
+
+//            _loginResponse.postValue("res.data")
+//            SPUtils.put(SPConstants.TOKEN, "res.data")
 //            SPUtils.put(SPConstants.LOGIN, true)
 //            SPUtils.put(SPConstants.ACCOUNT, account)
 //            msgEvent.postValue(Message(EventConstants.LOGIN_STATUS))
-//            }
+        }
+    }
 
-            _loginResponse.postValue("res.data")
+    fun sendSMS(mobile: String) {
-            SPUtils.put(SPConstants.TOKEN, "res.data")
+        launch {
-            SPUtils.put(SPConstants.LOGIN, true)
+            val res = api.sendSMS(mobile)
-            SPUtils.put(SPConstants.ACCOUNT, account)
+            if (res.success) {
-            msgEvent.postValue(Message(EventConstants.LOGIN_STATUS))
+
+            }
         }
     }
 }

app/src/main/java/com/project/survey/network/Api.kt

@@ -1,5 +1,6 @@
 package com.project.survey.network
 
+import com.project.survey.logic.bean.LoginBean
 import com.project.survey.model.ProjectBean
 import retrofit2.http.GET
 import retrofit2.http.Query
@@ -9,11 +10,11 @@ interface Api {
     /**
      * 登录
      */
-    @GET("/je/project/login")
+    @GET("/je/personInfo/externalEntry")
     suspend fun login(
         @Query("account") account: String,
         @Query("password") password: String
-    ): HttpResult<String>
+    ): HttpResult<LoginBean>
 
     /**
      * 获取用户可访问的所有项目的信息
@@ -22,4 +23,12 @@ interface Api {
     suspend fun getAllProjectIDByAccount(
         @Query("account") account: String
     ): HttpResult<List<ProjectBean>>
+
+    /**
+     *
+     */
+    @GET("/Api/Mas/sendSms")
+    suspend fun sendSMS(
+        @Query("mobile") mobile: String
+    ): HttpResult<Any>
 }

app/src/main/java/com/project/survey/ui/home/MeFragment.kt

@@ -25,33 +25,39 @@ class MeFragment : BaseBindingFragment<FragmentMeBinding>() {
 
     private val viewModel: LoginViewModel by viewModels()
 
-    private val account by lazy { SPUtils.getString(SPConstants.ACCOUNT) }
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentMeBinding =
-
+        FragmentMeBinding.inflate(inflater, container, false)
-    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentMeBinding {
-        return FragmentMeBinding.inflate(inflater, container, false)
-    }
 
     override fun initView() {
     }
 
     override fun initData() {
         viewModel.msgEvent.observe(this) {
-            binding.tvLoginOrOut.text =
+            updateUIByData()
-                if (SPUtils.getBoolean(SPConstants.LOGIN) == true) getString(R.string.login_out) else getString(
-                    R.string.login
-                )
-            binding.tvName.text =
-                if (SPUtils.getBoolean(SPConstants.LOGIN) == true) account else "请登录"
         }
-
+        updateUIByData()
         if (BuildConfig.DEBUG) {
             binding.tvVersion.text = BuildConfig.VERSION_NAME
         }
     }
 
+    private fun updateUIByData(){
+        val token = SPUtils.getString(SPConstants.TOKEN) ?: ""
+        binding.tvLoginOrOut.text =
+            if (token.isBlank())
+                getString(R.string.login)
+            else
+                getString(R.string.login_out)
+        binding.tvName.text =
+            if (token.isBlank()) "请登录" else SPUtils.getString(SPConstants.ACCOUNT) ?: ""
+    }
+
     override fun initListener() {
         binding.tvLoginOrOut.setOnClickNoRepeatListener {
-            if (SPUtils.getBoolean(SPConstants.LOGIN) == true) {
+            if (SPUtils.getString(SPConstants.TOKEN).isNullOrBlank()) {
+                // 登录
+                LoginActivity.start()
+            } else {
                 // 退出登录
                 MaterialDialog.Builder(mContext)
                     .title("确定退出吗?")
@@ -59,14 +65,10 @@ class MeFragment : BaseBindingFragment<FragmentMeBinding>() {
                     .positiveText("退出")
                     .onPositive { _, _ ->
                         SPUtils.removeKey(SPConstants.TOKEN)
-                        SPUtils.put(SPConstants.LOGIN, false)
                         SPUtils.removeKey(SPConstants.ACCOUNT)
                         viewModel.msgEvent.postValue(Message(EventConstants.LOGIN_STATUS))
                     }
                     .show()
-            } else {
-                // 登录
-                LoginActivity.start()
             }
         }
         binding.llSwitchProject.setOnClickNoRepeatListener {
@@ -74,7 +76,7 @@ class MeFragment : BaseBindingFragment<FragmentMeBinding>() {
         }
         // TODO:  
         binding.llAbout.setOnClickNoRepeatListener {
-            SPUtils.put(SPConstants.LOGIN, false)
+//            viewModel.sendSMS("17379748209")
         }
     }
 }

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

@@ -13,7 +13,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:src="@mipmap/ic_launcher" />
+        tools:src="@mipmap/icon_launcher" />
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/tvBadge"

app/src/main/res/mipmap-anydpi/ic_launcher.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>

app/src/main/res/mipmap-anydpi/ic_launcher_round.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>