Merge remote-tracking branch 'origin/master'

app/dev/debug/output-metadata.json

@@ -1,20 +0,0 @@
-{
-  "version": 1,
-  "artifactType": {
-    "type": "APK",
-    "kind": "Directory"
-  },
-  "applicationId": "com.quansu.heifengwuliu",
-  "variantName": "devDebug",
-  "elements": [
-    {
-      "type": "SINGLE",
-      "filters": [],
-      "properties": [],
-      "versionCode": 1,
-      "versionName": "1.0.1-debug",
-      "enabled": true,
-      "outputFile": "dev_1.0.1.apk"
-    }
-  ]
-}

app/src/main/java/com/quansu/heifengwuliu/activity/RegisterActivity.kt

@@ -20,6 +20,7 @@ class RegisterActivity : MBActivity<RegisterVModel, ActivityRegisterBinding>() {
     override fun title(): String? {
         return null
     }
+
     override fun binding(): ActivityRegisterBinding {
         return ActivityRegisterBinding.inflate(layoutInflater)
     }
@@ -31,4 +32,5 @@ class RegisterActivity : MBActivity<RegisterVModel, ActivityRegisterBinding>() {
     override fun createRepository(): BRepository {
         return RegisterRepository()
     }
+
 }

app/src/main/java/com/quansu/heifengwuliu/fragment/IndexFragment.kt

@@ -1,19 +1,30 @@
 package com.quansu.heifengwuliu.fragment
 
-import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import com.qmuiteam.qmui.kotlin.onClick
+import com.quansu.heifengwuliu.activity.OneLoginActivity
 import com.quansu.heifengwuliu.base.MBFragment
 import com.quansu.heifengwuliu.databinding.FragmentIndexBinding
 import com.ysnows.base.base.BRepository
 import com.ysnows.base.base.BViewModel
+import com.ysnows.base.utils.MMKVManager
+import com.ysnows.base.utils.UiSwitch
 
 /**
  *Created by shihuiyun
  *on 2020/9/9
  */
-class IndexFragment  : MBFragment<BViewModel<BRepository>, FragmentIndexBinding>(){
+class IndexFragment : MBFragment<BViewModel<BRepository>, FragmentIndexBinding>() {
 
+    override fun listeners() {
+        super.listeners()
+
+        binding.btnLogout.onClick {
+            MMKVManager.instance().clearAll()
+            UiSwitch.single_new_task_with_clear_task(context, OneLoginActivity::class.java)
+        }
+    }
 
     override fun binding(inflater: LayoutInflater, container: ViewGroup?): FragmentIndexBinding {
         return FragmentIndexBinding.inflate(layoutInflater)

app/src/main/java/com/quansu/heifengwuliu/repository/HomeRepository.kt

@@ -1,20 +1,18 @@
 package com.quansu.heifengwuliu.repository
 
 import android.annotation.SuppressLint
-import com.quansu.heifengwuliu.activity.OneLoginActivity
 import com.quansu.heifengwuliu.utils.net.NetEngine
 import com.ysnows.base.base.BRepository
-import com.ysnows.base.net.NetCode
-import com.ysnows.base.utils.UiSwitch
 
 class HomeRepository : BRepository() {
     @SuppressLint("CheckResult")
     fun getuserinfo() {
 
         lreq(NetEngine.service.getuserinfo())
-                .doOnNext{
-                    if (it.ok(true)) {
-                    }else{
+                .doOnNext {
+                    if (it.ok(false)) {
+
+                    } else {
 //                        if(it.code()== NetCode.CODE_OFFLINE){
 //                            UiSwitch.single(context, OneLoginActivity::class.java)
 //

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

@@ -11,6 +11,16 @@
         android:layout_height="match_parent"
         android:orientation="vertical" >
 
+        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+            android:id="@+id/btn_logout"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_40"
+            android:layout_marginStart="@dimen/dp_40"
+            android:layout_marginEnd="@dimen/dp_40"
+            android:layout_marginBottom="@dimen/dp_80"
+            android:text="@string/logout"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
 
     </androidx.constraintlayout.widget.ConstraintLayout >
 </layout >