管理员[email protected]操作

app/build.gradle

@@ -73,6 +73,9 @@ dependencies {
     implementation project(path: ':mvp')
     implementation project(path: ':network')
     implementation project(path: ':common')
+
+    debugImplementation 'com.readystatesoftware.chuck:library:1.1.0'
+    releaseImplementation 'com.readystatesoftware.chuck:library-no-op:1.1.0'
 }
 
 aspectjx {

app/src/main/AndroidManifest.xml

@@ -68,6 +68,12 @@
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:screenOrientation="portrait"
             android:theme="@style/TextInputStyle"/>
+
+        <!--个人中心-->
+        <activity android:name=".ui.home.more.MineActivity"
+            android:configChanges="orientation|screenSize|keyboardHidden"
+            android:screenOrientation="portrait"
+            android:theme="@style/TextInputStyle"/>
     </application>
 
 </manifest>

app/src/main/java/com/miekir/ym/YangApplication.kt

@@ -2,6 +2,7 @@ package com.miekir.ym
 
 import android.app.Application
 import com.miekir.ym.manager.PreferenceManager
+import rx_activity_result2.RxActivityResult
 
 /**
  * Copyright (C), 2019-2020, Miekir
@@ -12,6 +13,7 @@ import com.miekir.ym.manager.PreferenceManager
 class YangApplication : Application() {
     override fun onCreate() {
         super.onCreate()
+        RxActivityResult.register(this)
         PreferenceManager.getInstance().initPreference(this)
     }
 }

network/src/main/java/com/miekir/network/RetrofitHelper.java

@@ -1,10 +1,12 @@
-package com.miekir.network;
+package com.miekir.ym.net;
 
 import android.content.Context;
 import android.text.TextUtils;
 import android.util.Log;
 
 import com.miekir.common.utils.ContextManager;
+import com.miekir.network.BuildConfig;
+import com.miekir.ym.manager.UserInfoManager;
 import com.readystatesoftware.chuck.ChuckInterceptor;
 
 import java.io.IOException;
@@ -55,10 +57,10 @@ public class RetrofitHelper {
         public Response intercept(Chain chain) throws IOException {
             String token = "";
             String email = "";
-//            if (EdenManager.getInstance().isLogin()) {
-//                token = EdenManager.getInstance().getBeiUser().token;
-//                email = EdenManager.getInstance().getBeiUser().email;
-//            }
+            if (UserInfoManager.getInstance().isLogin()) {
+                token = UserInfoManager.getInstance().getBeiUser().token;
+                email = UserInfoManager.getInstance().getBeiUser().email;
+            }
 
             Request.Builder builder = chain.request().newBuilder();
             if (!TextUtils.isEmpty(token)) {

app/src/main/java/com/miekir/ym/ui/home/MainActivity.kt

@@ -6,6 +6,7 @@ import android.view.View
 import androidx.fragment.app.Fragment
 import com.flyco.tablayout.listener.OnTabSelectListener
 import com.miekir.common.adapter.TabFragmentAdapter
+import com.miekir.common.utils.ToastTool
 import com.miekir.common.utils.ViewTool
 import com.miekir.ym.R
 import com.miekir.ym.base.YangActivity
@@ -90,4 +91,15 @@ class MainActivity : YangActivity(), View.OnClickListener {
             }
         }
     }
+
+    private var mLastBackMillis : Long = 0L
+    override fun onBackPressed() {
+        if (System.currentTimeMillis() - mLastBackMillis > 2500) {
+            ToastTool.showShort("再按一次退出")
+            mLastBackMillis = System.currentTimeMillis()
+            return
+        }
+
+        super.onBackPressed()
+    }
 }

app/src/main/java/com/miekir/ym/ui/home/coupon/CouponPresenter.java

@@ -3,10 +3,9 @@ package com.miekir.ym.ui.home.coupon;
 import android.text.TextUtils;
 
 import com.miekir.mvp.presenter.BasePresenter;
-import com.miekir.network.RetrofitHelper;
 import com.miekir.network.widget.observe.NetMvpObserver;
 import com.miekir.ym.base.ApiService;
-import com.miekir.ym.tool.DataTool;
+import com.miekir.ym.net.RetrofitHelper;
 
 import java.util.List;
 
@@ -31,11 +30,9 @@ public class CouponPresenter extends BasePresenter<ICouponView<CouponBean>> {
 
             @Override
             public void onFailure(int code, Throwable e, String errMsg) {
-//                post(view -> view.onCouponDataCome(false,
-//                        TextUtils.isEmpty(errMsg) ? "获取失败："+e.getMessage() : errMsg,
-//                        null));
-                // todo 删除假数据
-                post(view -> view.onCouponDataCome(true, "", DataTool.getTemplateList()));
+                post(view -> view.onCouponDataCome(false,
+                        TextUtils.isEmpty(errMsg) ? "获取失败："+e.getMessage() : errMsg,
+                        null));
             }
         };
 

app/src/main/java/com/miekir/ym/ui/home/more/add/AddCouponPresenter.java

@@ -3,9 +3,9 @@ package com.miekir.ym.ui.home.more.add;
 import android.text.TextUtils;
 
 import com.miekir.mvp.presenter.BasePresenter;
-import com.miekir.network.RetrofitHelper;
 import com.miekir.network.widget.observe.NetMvpObserver;
 import com.miekir.ym.base.ApiService;
+import com.miekir.ym.net.RetrofitHelper;
 import com.miekir.ym.ui.home.coupon.CouponBean;
 
 import io.reactivex.android.schedulers.AndroidSchedulers;

app/src/main/java/com/miekir/ym/ui/home/more/forget/ForgetPresenter.java

@@ -3,10 +3,10 @@ package com.miekir.ym.ui.home.more.forget;
 import android.text.TextUtils;
 
 import com.miekir.mvp.presenter.BasePresenter;
-import com.miekir.network.RetrofitHelper;
 import com.miekir.network.widget.observe.NetMvpObserver;
 import com.miekir.ym.base.ApiService;
 import com.miekir.ym.bean.BeiUser;
+import com.miekir.ym.net.RetrofitHelper;
 
 import java.util.HashMap;
 import java.util.Map;

app/src/main/java/com/miekir/ym/ui/home/more/login/LoginPresenter.java

@@ -3,10 +3,10 @@ package com.miekir.ym.ui.home.more.login;
 import android.text.TextUtils;
 
 import com.miekir.mvp.presenter.BasePresenter;
-import com.miekir.network.RetrofitHelper;
 import com.miekir.network.widget.observe.NetMvpObserver;
 import com.miekir.ym.base.ApiService;
 import com.miekir.ym.bean.BeiUser;
+import com.miekir.ym.net.RetrofitHelper;
 
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;

app/src/main/java/com/miekir/ym/ui/home/more/register/CodePresenter.java

@@ -1,9 +1,9 @@
 package com.miekir.ym.ui.home.more.register;
 
 import com.miekir.mvp.presenter.BasePresenter;
-import com.miekir.network.RetrofitHelper;
 import com.miekir.network.widget.observe.NetMvpObserver;
 import com.miekir.ym.base.ApiService;
+import com.miekir.ym.net.RetrofitHelper;
 
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;

app/src/main/java/com/miekir/ym/ui/home/more/register/fill/RegisterPresenter.java

@@ -3,10 +3,10 @@ package com.miekir.ym.ui.home.more.register.fill;
 import android.text.TextUtils;
 
 import com.miekir.mvp.presenter.BasePresenter;
-import com.miekir.network.RetrofitHelper;
 import com.miekir.network.widget.observe.NetMvpObserver;
 import com.miekir.ym.base.ApiService;
 import com.miekir.ym.bean.BeiUser;
+import com.miekir.ym.net.RetrofitHelper;
 
 import java.util.HashMap;
 import java.util.Map;

app/src/main/java/com/miekir/ym/ui/home/search/SearchPresenter.java

@@ -3,9 +3,9 @@ package com.miekir.ym.ui.home.search;
 import android.text.TextUtils;
 
 import com.miekir.mvp.presenter.BasePresenter;
-import com.miekir.network.RetrofitHelper;
 import com.miekir.network.widget.observe.NetMvpObserver;
 import com.miekir.ym.base.ApiService;
+import com.miekir.ym.net.RetrofitHelper;
 import com.miekir.ym.ui.home.coupon.CouponBean;
 
 import java.util.List;

network/build.gradle

@@ -74,6 +74,6 @@ dependencies {
     api "com.squareup.okhttp3:logging-interceptor:3.6.0"
 
     // 调试过程中可以在通知栏查看详细的网络请求
-    debugImplementation 'com.readystatesoftware.chuck:library:1.1.0'
-    releaseImplementation 'com.readystatesoftware.chuck:library-no-op:1.1.0'
+//    debugImplementation 'com.readystatesoftware.chuck:library:1.1.0'
+//    releaseImplementation 'com.readystatesoftware.chuck:library-no-op:1.1.0'
 }