Ver código fonte

1.添加app升级弹窗

王鹏鹏 2 anos atrás
pai
commit
83c898099b
25 arquivos alterados com 39 adições e 32 exclusões
  1. 0 1
      baselib/src/main/java/com/yingyangfly/baselib/BaseApplication.kt
  2. 0 1
      baselib/src/main/java/com/yingyangfly/baselib/adapter/BaseDataBindingAdapter.kt
  3. 0 1
      baselib/src/main/java/com/yingyangfly/baselib/base/BaseFragment.kt
  4. 0 1
      baselib/src/main/java/com/yingyangfly/baselib/bean/StatusViewType.kt
  5. 0 1
      baselib/src/main/java/com/yingyangfly/baselib/config/AccountConfig.kt
  6. 0 1
      baselib/src/main/java/com/yingyangfly/baselib/dialog/TipDialogFragment.kt
  7. 0 1
      baselib/src/main/java/com/yingyangfly/baselib/ext/ActivityExt.kt
  8. 0 1
      baselib/src/main/java/com/yingyangfly/baselib/ext/StringExt.kt
  9. 0 1
      baselib/src/main/java/com/yingyangfly/baselib/ext/ViewExt.kt
  10. 0 1
      baselib/src/main/java/com/yingyangfly/baselib/mvvm/BaseMVVMActivity.kt
  11. 0 1
      baselib/src/main/java/com/yingyangfly/baselib/mvvm/BaseMVVMFragment.kt
  12. 0 1
      baselib/src/main/java/com/yingyangfly/baselib/mvvm/BaseViewModel.kt
  13. 0 1
      baselib/src/main/java/com/yingyangfly/baselib/mvvm/ViewBindingUtil.kt
  14. 0 1
      baselib/src/main/java/com/yingyangfly/baselib/net/BaseNetWork.kt
  15. 0 1
      baselib/src/main/java/com/yingyangfly/baselib/net/BaseResp.kt
  16. 0 1
      baselib/src/main/java/com/yingyangfly/baselib/net/convert/GsonResponseBodyConverter.java
  17. 0 1
      baselib/src/main/java/com/yingyangfly/baselib/net/convert/XlGsonResponseBodyConverter.java
  18. 0 1
      baselib/src/main/java/com/yingyangfly/baselib/utils/ImageUtil.kt
  19. 0 1
      baselib/src/main/java/com/yingyangfly/baselib/utils/Preferences.kt
  20. 0 1
      baselib/src/main/java/com/yingyangfly/baselib/utils/ResUtil.kt
  21. 0 1
      baselib/src/main/java/com/yingyangfly/baselib/utils/ScreenUtil.kt
  22. 0 1
      baselib/src/main/java/com/yingyangfly/baselib/utils/StringUtil.kt
  23. 15 0
      baselib/src/main/java/com/yingyangfly/baselib/utils/User.kt
  24. 24 8
      login/src/main/java/com/yingyang/login/ui/login/LoginActivity.kt
  25. 0 2
      login/src/main/res/layout/activity_login.xml

+ 0 - 1
baselib/src/main/java/com/yingyangfly/baselib/BaseApplication.kt

@@ -16,7 +16,6 @@ import java.lang.reflect.Method
  * @author: gold
  * @time: 2022/6/1 下午2:26
  * @description: application基础类
- * @copyright (C) 2019-2021, XiaoLiu All Rights Reserved
  */
 open class BaseApplication : Application() {
 

+ 0 - 1
baselib/src/main/java/com/yingyangfly/baselib/adapter/BaseDataBindingAdapter.kt

@@ -12,7 +12,6 @@ import com.yingyangfly.baselib.utils.ViewTool
 /**
  * @author gold
  * @date 2022/9/5 上午10:09
- * @copyright (C) 2019-2022, XiaoLiu All Rights Reserved
  * @description 加入了DataBinding的RecyclerView.Adapter基类,在RecyclerView中实现了DataBinding,适合简单列表。
  * 只支持绑定一种数据类型,重写[layoutId]设置布局,重写[onBindViewHolder]抽象函数实现数据绑定。
  * 其中[T]是数据类型,在xml中使用;[B]是对应布局的数据绑定类。

+ 0 - 1
baselib/src/main/java/com/yingyangfly/baselib/base/BaseFragment.kt

@@ -24,7 +24,6 @@ import gorden.rxbus2.RxBus
  * @author: gold
  * @time: 2021/11/19 上午10:46
  * @description: 封装DataBinding基类,减少样板代码 re = reflect  反射  该类用到了反射
- * @copyright (C) 2019-2021, XiaoLiu All Rights Reserved
  */
 abstract class BaseFragment<DB : ViewDataBinding> : Fragment(), OnRefreshLoadMoreListener {
     /**

+ 0 - 1
baselib/src/main/java/com/yingyangfly/baselib/bean/StatusViewType.kt

@@ -11,7 +11,6 @@ import com.yingyangfly.baselib.bean.StatusViewType.Companion.LOADING
  * @author: gold
  * @time: 2022/2/21 下午3:00
  * @description: View状态枚举类:
- * @copyright (C) 2019-2021, XiaoLiu All Rights Reserved
  */
 
 @Retention(AnnotationRetention.SOURCE)

+ 0 - 1
baselib/src/main/java/com/yingyangfly/baselib/config/AccountConfig.kt

@@ -5,7 +5,6 @@ import com.yingyangfly.baselib.BuildConfig
 /**
  * @author gold
  * @date 2022/9/14 下午4:50
- * @copyright (C) 2019-2022, XiaoLiu All Rights Reserved
  * @description 相关账号配置
  */
 object AccountConfig {

+ 0 - 1
baselib/src/main/java/com/yingyangfly/baselib/dialog/TipDialogFragment.kt

@@ -13,7 +13,6 @@ import com.yingyangfly.baselib.ext.show
 /**
  * @author gold
  * @date 2022/9/9 上午9:24
- * @copyright (C) 2019-2022, XiaoLiu All Rights Reserved
  * @description 弹框封装
  */
 class TipDialogFragment(val builder: TipDialogBuilder) : BaseDialogFragment<DialogTipBinding>() {

+ 0 - 1
baselib/src/main/java/com/yingyangfly/baselib/ext/ActivityExt.kt

@@ -19,7 +19,6 @@ import java.lang.reflect.ParameterizedType
 /**
  * @author gold
  * @date 2022/9/5 下午1:57
- * @copyright (C) 2019-2022, XiaoLiu All Rights Reserved
  * @description Activity 扩展函数  扩展属性
  */
 

+ 0 - 1
baselib/src/main/java/com/yingyangfly/baselib/ext/StringExt.kt

@@ -9,7 +9,6 @@ import com.yingyangfly.baselib.utils.ToastUtil
  * @author: gold
  * @time: 2021/12/8 下午3:04
  * @description: String相关扩展函数
- * @copyright (C) 2019-2021, XiaoLiu All Rights Reserved
  */
 
 /**

+ 0 - 1
baselib/src/main/java/com/yingyangfly/baselib/ext/ViewExt.kt

@@ -15,7 +15,6 @@ import java.util.regex.Pattern
  * @author: gold
  * @time: 2022/8/29 上午10:47
  * @description:
- * @copyright (C) 2019-2022, XiaoLiu All Rights Reserved
  */
 
 /**

+ 0 - 1
baselib/src/main/java/com/yingyangfly/baselib/mvvm/BaseMVVMActivity.kt

@@ -14,7 +14,6 @@ import kotlinx.coroutines.launch
  * @author: gold
  * @time: 2021/12/8 下午5:31
  * @description: MVVM基类封装
- * @copyright (C) 2019-2021, XiaoLiu All Rights Reserved
  */
 private const val TAG = "BaseMVVMActivity"
 

+ 0 - 1
baselib/src/main/java/com/yingyangfly/baselib/mvvm/BaseMVVMFragment.kt

@@ -15,7 +15,6 @@ import kotlinx.coroutines.launch
  * @author: gold
  * @time: 2021/12/8 下午5:31
  * @description: MVVM基类封装
- * @copyright (C) 2019-2021, XiaoLiu All Rights Reserved
  */
 private const val TAG = "BaseMVVMFragment"
 

+ 0 - 1
baselib/src/main/java/com/yingyangfly/baselib/mvvm/BaseViewModel.kt

@@ -22,7 +22,6 @@ import javax.net.ssl.SSLException
  * @author: gold
  * @time: 2022/3/23 下午7:45
  * @description: ViewModel基础类
- * @copyright (C) 2019-2022, XiaoLiu All Rights Reserved
  */
 abstract class BaseViewModel : ViewModel() {
     val loadingStateFlow = MutableStateFlow(0)

+ 0 - 1
baselib/src/main/java/com/yingyangfly/baselib/mvvm/ViewBindingUtil.kt

@@ -13,7 +13,6 @@ import java.lang.reflect.ParameterizedType
  * @author: gold
  * @time: 2022/3/23 下午7:45
  * @description: activity和fragment中使用
- * @copyright (C) 2019-2021, XiaoLiu All Rights Reserved
  */
 
 @JvmName("inflateWithGeneric")

+ 0 - 1
baselib/src/main/java/com/yingyangfly/baselib/net/BaseNetWork.kt

@@ -12,7 +12,6 @@ import java.util.concurrent.TimeUnit
 /**
  * @author gold
  * @date 2022/9/2 上午11:37
- * @copyright (C) 2019-2022, XiaoLiu All Rights Reserved
  * @description 创建Retrofit Okhttp
  */
 fun <T> Any.initAPI(url: String, cla: Class<T>): T = BaseNetWork.initRetrofit(url).create(cla)

+ 0 - 1
baselib/src/main/java/com/yingyangfly/baselib/net/BaseResp.kt

@@ -3,7 +3,6 @@ package com.yingyangfly.baselib.net
 /**
  * @author gold
  * @date 2022/9/2 下午12:24
- * @copyright (C) 2019-2022, XiaoLiu All Rights Reserved
  * @description 网络响应基类
  */
 open class BaseResp<T>(

+ 0 - 1
baselib/src/main/java/com/yingyangfly/baselib/net/convert/GsonResponseBodyConverter.java

@@ -29,7 +29,6 @@ import retrofit2.Converter;
  * @author: gold
  * @time: 2021/12/16 下午1:34
  * @description:  自定义GsonResponseBodyConverter 处理响应码不为200时,data解析处理
- * @copyright (C) 2019-2021, XiaoLiu All Rights Reserved
  */
 final class GsonResponseBodyConverter<T> implements Converter<ResponseBody, T> {
   private final Gson gson;

+ 0 - 1
baselib/src/main/java/com/yingyangfly/baselib/net/convert/XlGsonResponseBodyConverter.java

@@ -29,7 +29,6 @@ import retrofit2.Converter;
  * @author: gold
  * @time: 2021/12/16 下午1:34
  * @description: 自定义GsonResponseBodyConverter 处理响应码不为200时,data解析处理
- * @copyright (C) 2019-2021, XiaoLiu All Rights Reserved
  */
 final class XlGsonResponseBodyConverter<T> implements Converter<ResponseBody, T> {
     private final Gson gson;

+ 0 - 1
baselib/src/main/java/com/yingyangfly/baselib/utils/ImageUtil.kt

@@ -18,7 +18,6 @@ import com.bumptech.glide.request.target.Target
 /**
  * @author wangsai
  * @date 2022/9/15 11:58
- * @copyright (C) 2019-2022, XiaoLiu All Rights Reserved
  * @description 图片处理工具类
  */
 object ImageUtil {

+ 0 - 1
baselib/src/main/java/com/yingyangfly/baselib/utils/Preferences.kt

@@ -6,7 +6,6 @@ import com.tencent.mmkv.MMKV
 /**
  * @author gold
  * @date 2022/9/6 下午6:31
- * @copyright (C) 2019-2022, XiaoLiu All Rights Reserved
  * @description MMKV二次封装
  */
 object Preferences {

+ 0 - 1
baselib/src/main/java/com/yingyangfly/baselib/utils/ResUtil.kt

@@ -10,7 +10,6 @@ import com.blankj.utilcode.util.StringUtils
 /**
  * @author wangsai
  * @date 2022/9/13 16:50
- * @copyright (C) 2019-2022, XiaoLiu All Rights Reserved
  * @description
  */
 object ResUtil {

+ 0 - 1
baselib/src/main/java/com/yingyangfly/baselib/utils/ScreenUtil.kt

@@ -12,7 +12,6 @@ import com.blankj.utilcode.util.ConvertUtils
 /**
  * @author wangsai
  * @date 2022/9/15 18:11
- * @copyright (C) 2019-2022, XiaoLiu All Rights Reserved
  * @description 屏幕相关工具类
  */
 object ScreenUtil {

+ 0 - 1
baselib/src/main/java/com/yingyangfly/baselib/utils/StringUtil.kt

@@ -7,7 +7,6 @@ import java.util.*
 /**
  * @author wangsai
  * @date 2022/9/14 20:46
- * @copyright (C) 2019-2022, XiaoLiu All Rights Reserved
  * @description 字符串相关的工具类
  */
 object StringUtil {

+ 15 - 0
baselib/src/main/java/com/yingyangfly/baselib/utils/User.kt

@@ -25,6 +25,21 @@ object User {
         }
     }
 
+    /**
+     * 保存用户登陆密码
+     */
+    fun savePassword(password: String) {
+        Preferences.put(CommonParam.PASSWORD, password)
+    }
+
+    fun getPassword(): String {
+        return if (Preferences.getString(CommonParam.PASSWORD).isNullOrEmpty()) {
+            ""
+        } else {
+            Preferences.getString(CommonParam.PASSWORD)!!
+        }
+    }
+
     /**
      * 保存用户token
      */

+ 24 - 8
login/src/main/java/com/yingyang/login/ui/login/LoginActivity.kt

@@ -34,14 +34,30 @@ class LoginActivity : BaseMVVMActivity<ActivityLoginBinding, LoginViewModel>() {
      * 用户登录
      */
     private fun login() {
-        viewModel.login("18701938401", "yingyang2023@@!", fail = {
-            it.toast()
-        }, success = {
-            if (it != null) {
-                User.saveToken(it)
-                getUserInfo()
-            }
-        })
+        viewModel.login(
+            binding.username.text.toString().trim(),
+            binding.password.text.toString().trim(),
+            fail = {
+                it.toast()
+            },
+            success = {
+                if (it != null) {
+                    User.savePhone(binding.username.text.toString().trim())
+                    User.savePassword(binding.password.text.toString().trim())
+                    User.saveToken(it)
+                    getUserInfo()
+                }
+            })
+    }
+
+    override fun onResume() {
+        super.onResume()
+        if (User.getPhone().isNullOrEmpty().not()) {
+            binding.username.setText(User.getPhone())
+        }
+        if (User.getPassword().isNullOrEmpty().not()) {
+            binding.password.setText(User.getPassword())
+        }
     }
 
     /**

+ 0 - 2
login/src/main/res/layout/activity_login.xml

@@ -84,7 +84,6 @@
                 android:inputType="text"
                 android:paddingStart="@dimen/divider_21px"
                 android:selectAllOnFocus="true"
-                android:text="18701938401"
                 android:textColor="@color/color_FF222222"
                 android:textSize="@dimen/divider_28px"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -104,7 +103,6 @@
                 android:inputType="textPassword"
                 android:paddingStart="@dimen/divider_21px"
                 android:selectAllOnFocus="true"
-                android:text="yaorong2023@@!"
                 android:textColor="@color/color_FF222222"
                 android:textSize="@dimen/divider_28px"
                 app:layout_constraintEnd_toEndOf="parent"