浏览代码

1.默认启动界面替换。

石慧云 4 年之前
父节点
当前提交
69bceabba3

+ 8 - 8
app/src/main/AndroidManifest.xml

@@ -52,19 +52,19 @@
             android:screenOrientation="portrait"
             android:theme="@style/HomeTheme"
             >
-<!--            <intent-filter>-->
-<!--                <action android:name="android.intent.action.MAIN" />-->
-<!--                <category android:name="android.intent.category.LAUNCHER" />-->
-<!--            </intent-filter>-->
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
         </activity>
 
         <activity android:name=".activity.OneLoginActivity"
             android:launchMode="singleTask"
             >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
+<!--            <intent-filter>-->
+<!--                <action android:name="android.intent.action.MAIN" />-->
+<!--                <category android:name="android.intent.category.LAUNCHER" />-->
+<!--            </intent-filter>-->
 
         </activity>
 

+ 4 - 1
app/src/main/java/com/quansu/heifengwuliu/activity/HomeActivity.kt

@@ -16,6 +16,7 @@ import com.quansu.heifengwuliu.repository.OneLoginRepository
 import com.quansu.heifengwuliu.vmodel.HomeVModel
 import com.quansu.heifengwuliu.vmodel.OneLoginVModel
 import com.ysnows.base.base.BRepository
+import com.ysnows.base.utils.UiSwitch
 import kotlinx.android.synthetic.main.activity_home.*
 import java.util.ArrayList
 
@@ -52,7 +53,7 @@ class HomeActivity : MBActivity<HomeVModel, ActivityHomeBinding>() {
         initTab()
         tab_layout.currentTab = mIndex
         switchFragment(mIndex)
-      //  vm.getUserInfo();
+        vm.getUserInfo();
 
     }
 
@@ -136,4 +137,6 @@ class HomeActivity : MBActivity<HomeVModel, ActivityHomeBinding>() {
         return null
     }
 
+
+
 }

+ 3 - 2
app/src/main/java/com/quansu/heifengwuliu/base/MBActivity.kt

@@ -2,6 +2,7 @@ package com.quansu.heifengwuliu.base
 
 import androidx.databinding.ViewDataBinding
 import com.quansu.heifengwuliu.activity.LoginActivity
+import com.quansu.heifengwuliu.activity.OneLoginActivity
 import com.quansu.heifengwuliu.model.User
 import com.ysnows.base.base.BActivity
 import com.ysnows.base.base.BViewModel
@@ -18,11 +19,11 @@ abstract class MBActivity<VM : BViewModel<*>, B : ViewDataBinding> : BActivity<V
     override fun toLogin() {
         super.toLogin()
 //        toast(R.string.please_login)
-        UiSwitch.single(context(), LoginActivity::class.java)
+        UiSwitch.single(context(), OneLoginActivity::class.java)
     }
 
     override fun user(): IUser? {
         return User.get()
     }
 
-}
+}

+ 3 - 2
app/src/main/java/com/quansu/heifengwuliu/base/MBFragment.kt

@@ -2,6 +2,7 @@ package com.quansu.heifengwuliu.base
 
 import androidx.databinding.ViewDataBinding
 import com.quansu.heifengwuliu.activity.LoginActivity
+import com.quansu.heifengwuliu.activity.OneLoginActivity
 import com.quansu.heifengwuliu.model.User
 import com.ysnows.base.base.BFragment
 import com.ysnows.base.base.BViewModel
@@ -17,7 +18,7 @@ import com.ysnows.base.utils.UiSwitch
 abstract class MBFragment<VM : BViewModel<*>, B : ViewDataBinding> : BFragment<VM, B>() {
     override fun toLogin() {
         super.toLogin()
-        UiSwitch.single(context(), LoginActivity::class.java)
+        UiSwitch.single(context(), OneLoginActivity::class.java)
 //        toast(R.string.please_login)
 
     }
@@ -25,4 +26,4 @@ abstract class MBFragment<VM : BViewModel<*>, B : ViewDataBinding> : BFragment<V
     override fun user(): IUser? {
         return User.get()
     }
-}
+}

+ 4 - 4
app/src/main/java/com/quansu/heifengwuliu/base/MBRActivity.kt

@@ -4,6 +4,7 @@ import androidx.databinding.ViewDataBinding
 import com.chad.library.adapter.base.BaseQuickAdapter
 import com.chad.library.adapter.base.viewholder.BaseViewHolder
 import com.quansu.heifengwuliu.activity.LoginActivity
+import com.quansu.heifengwuliu.activity.OneLoginActivity
 import com.quansu.heifengwuliu.model.User
 import com.ysnows.base.base.BRActivity
 import com.ysnows.base.base.BRViewModel
@@ -20,11 +21,10 @@ import com.ysnows.base.utils.UiSwitch
 abstract class MBRActivity<VM : BRViewModel<*>, A : BaseQuickAdapter<*, out BaseViewHolder>, B : ViewDataBinding> : BRActivity<VM, A, B>() {
     override fun toLogin() {
         super.toLogin()
-        UiSwitch.single(context(), LoginActivity::class.java)
-//        toast(R.string.please_login)
+        UiSwitch.single(context(), OneLoginActivity::class.java)
+//     toast(R.string.please_login)
     }
-
     override fun user(): IUser? {
         return User.get()
     }
-}
+}

+ 3 - 2
app/src/main/java/com/quansu/heifengwuliu/base/MBRFragment.kt

@@ -4,6 +4,7 @@ import androidx.databinding.ViewDataBinding
 import com.chad.library.adapter.base.BaseQuickAdapter
 import com.chad.library.adapter.base.viewholder.BaseViewHolder
 import com.quansu.heifengwuliu.activity.LoginActivity
+import com.quansu.heifengwuliu.activity.OneLoginActivity
 import com.quansu.heifengwuliu.model.User
 import com.ysnows.base.base.BRFragment
 import com.ysnows.base.base.BRViewModel
@@ -21,11 +22,11 @@ abstract class MBRFragment<VM : BRViewModel<*>, A : BaseQuickAdapter<*, out Base
 
     override fun toLogin() {
         super.toLogin()
-        UiSwitch.single(context(), LoginActivity::class.java)
+        UiSwitch.single(context(), OneLoginActivity::class.java)
 //        toast(R.string.please_login)
     }
 
     override fun user(): IUser? {
         return User.get()
     }
-}
+}

+ 9 - 11
app/src/main/java/com/quansu/heifengwuliu/repository/HomeRepository.kt

@@ -1,26 +1,24 @@
 package com.quansu.heifengwuliu.repository
 
 import android.annotation.SuppressLint
-import com.quansu.heifengwuliu.activity.HomeActivity
-import com.quansu.heifengwuliu.model.LoginBean
+import com.quansu.heifengwuliu.activity.OneLoginActivity
 import com.quansu.heifengwuliu.utils.net.NetEngine
-import com.tencent.mmkv.MMKV
 import com.ysnows.base.base.BRepository
+import com.ysnows.base.net.NetCode
 import com.ysnows.base.utils.UiSwitch
 
 class HomeRepository : BRepository() {
     @SuppressLint("CheckResult")
-    fun login(token: String) {
+    fun getuserinfo() {
 
-        lreq(NetEngine.service.wxLogin(token))
+        lreq(NetEngine.service.getuserinfo())
                 .doOnNext{
                     if (it.ok(true)) {
-
-                        var bean: LoginBean =it.data() as LoginBean;
-                        MMKV.defaultMMKV().putString("token",bean.TOKEN)
-
-                        UiSwitch.single(context, HomeActivity::class.java)
-
+                    }else{
+//                        if(it.code()== NetCode.CODE_OFFLINE){
+//                            UiSwitch.single(context, OneLoginActivity::class.java)
+//
+//                        }
                     }
                 }
                 .subscribe();

+ 1 - 0
app/src/main/java/com/quansu/heifengwuliu/utils/MUiSwitch.kt

@@ -18,6 +18,7 @@ object MUiSwitch {
         }
     }
 
+
     fun toLogin(context: Context) {
         single(context, LoginActivity::class.java)
     }

+ 3 - 0
app/src/main/java/com/quansu/heifengwuliu/utils/net/ApiService.kt

@@ -116,4 +116,7 @@ interface ApiService {
     @FormUrlEncoded
     fun wxLogin(@Field("code") code: String?): Observable<Response<LoginBean>>
 
+
+    @GET("api/user/getuserinfo")
+    fun getuserinfo(): Observable<Response<LoginBean>>
 }

+ 1 - 1
app/src/main/java/com/quansu/heifengwuliu/vmodel/HomeVModel.kt

@@ -8,7 +8,7 @@ open class HomeVModel : BViewModel<HomeRepository>() {
 
 
     fun getUserInfo() {
-        repository().login("")
+        repository().getuserinfo()
     }
 
 

+ 7 - 2
base/build.gradle

@@ -42,7 +42,12 @@ android {
 dependencies {
     api fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'com.billy.android:cc:2.1.5'
-    debugImplementation 'com.readystatesoftware.chuck:library:1.1.0'
-    releaseImplementation 'com.readystatesoftware.chuck:library-no-op:1.1.0'
+
+    debugImplementation('com.github.ChuckerTeam.Chucker:library:3.2.0') {
+        exclude group: 'com.android.support', module: 'support-v4'
+    }
+    releaseImplementation('com.github.ChuckerTeam.Chucker:library-no-op:3.2.0') {
+        exclude group: 'com.android.support', module: 'support-v4'
+    }
 
 }

+ 2 - 0
base/src/main/java/com/ysnows/base/base/BRepository.kt

@@ -121,6 +121,8 @@ open class BRepository : IRepository {
                                     bView?.loadService?.showCallback(ToLoginCallback::class.java)
                                 }
                                 bView?.processCodeOffline()
+                                bView?.toLogin()
+
                             } else {
                                 if (pageReq) {
                                     bView?.loadService?.showSuccess()

+ 2 - 2
base/src/main/java/com/ysnows/base/net/NetCode.java

@@ -1,5 +1,5 @@
 package com.ysnows.base.net;
 
 public class NetCode {
-    public static final int CODE_OFFLINE = -11;
-}
+    public static final int CODE_OFFLINE = 10;
+}

+ 5 - 2
base/src/main/java/com/ysnows/base/net/NetEngine.java

@@ -1,7 +1,8 @@
 package com.ysnows.base.net;
 
 
-import com.readystatesoftware.chuck.ChuckInterceptor;
+import com.chuckerteam.chucker.api.ChuckerCollector;
+import com.chuckerteam.chucker.api.ChuckerInterceptor;
 import com.ysnows.base.base.BApp;
 
 import java.util.WeakHashMap;
@@ -48,7 +49,9 @@ public class NetEngine {
                     .writeTimeout(156760, TimeUnit.MILLISECONDS)
                     .connectTimeout(15676, TimeUnit.MILLISECONDS)
                     .retryOnConnectionFailure(true)
-                   // .addInterceptor(new ChuckInterceptor( BApp.instance()))
+                    .addInterceptor(new ChuckerInterceptor(BApp.instance().getApplicationContext()))
+
+                    // .addInterceptor(new ChuckInterceptor( BApp.instance()))
                     .cookieJar(new BCookieJar())
                     .addInterceptor(new BHeaderInterceptor());