优化网络架构

app/build.gradle

@@ -135,7 +135,6 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-
     testImplementation rootProject.ext.support["junit"]
 
     //下拉刷新

app/src/androidTest/java/com/mints/street/ExampleInstrumentedTest.java

@@ -2,25 +2,18 @@ package com.mints.street;
 
 import android.content.Context;
 
-import androidx.test.platform.app.InstrumentationRegistry;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
 
 /**
  * Instrumented test, which will execute on an Android device.
  *
  * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
  */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
-        assertEquals("com.mints.goodnews", appContext.getPackageName());
-    }
-}
+//@RunWith(AndroidJUnit4.class)
+//public class ExampleInstrumentedTest {
+//    @Test
+//    public void useAppContext() {
+//        // Context of the app under test.
+//        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
+//        assertEquals("com.mints.goodnews", appContext.getPackageName());
+//    }
+//}
\ No newline at end of file

app/src/main/java/com/mints/street/main/MainActivity.kt

 package com.mints.street.main
 
+import android.media.AudioManager
 import android.os.Bundle
+import android.view.KeyEvent
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
@@ -16,7 +18,9 @@ import com.mints.street.databinding.ActivityMainBinding
 import com.mints.street.main.vr.VRFragment
 import com.mints.street.main.my.MyFragment
 import com.mints.street.main.home.HomeFragment
-
+import com.mints.street.manager.UmengManager
+import me.goldze.mvvmhabit.base.AppManager
+import me.goldze.mvvmhabit.utils.ToastUtils
 
 
 class MainActivity : BaseActivity<ActivityMainBinding, MainViewModel>() {
@@ -52,8 +56,26 @@ class MainActivity : BaseActivity<ActivityMainBinding, MainViewModel>() {
         )
 
 
+        // test
+        UmengManager.initUm()
     }
 
+    var oldTime: Long = 0
+    override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean {
+        when (keyCode) {
+            KeyEvent.KEYCODE_BACK -> {
+                // 设置为后台
+                val currentTime = System.currentTimeMillis()
+                if (currentTime - oldTime < 2 * 1000) {
+                    AppManager.getAppManager().finishAllActivity()
+                } else {
+                    ToastUtils.showLong("再次点击退出" + getString(R.string.app_name))
+                    oldTime = currentTime
+                }
+            }
+        }
+        return true
+    }
 
 }
 

app/src/main/java/com/mints/street/model/ApiModel.kt

 package com.mints.street.model
 
-import com.fry.base.netwrok.HttpManager
 import com.mints.street.api.MainApi
 import com.mints.street.bean.AwardBean
 import com.mints.street.bean.UserBean
+import com.mints.street.netwrok.HttpManager
 import com.trello.rxlifecycle2.LifecycleProvider
 import io.reactivex.Observable
 import me.goldze.mvvmhabit.http.BaseResponse

app/src/main/java/com/mints/street/netwrok/HttpManager.java

@@ -7,7 +7,7 @@ import com.fry.base.basenetwork.IHttpResponseListener;
 import com.fry.base.basenetwork.RetrofitClient;
 import com.fry.base.global.Constants;
 import com.fry.base.netwrok.OkHttpInterceptor;
-import com.fry.base.utils.encry.AESUtils;
+import com.mints.street.utils.encry.AESUtils;
 import com.trello.rxlifecycle2.LifecycleProvider;
 
 import io.reactivex.Observable;

app/src/main/java/com/mints/street/netwrok/OkHttpInterceptor.kt

@@ -4,13 +4,14 @@ import android.text.TextUtils
 import android.util.Log
 import com.bytedance.hume.readapk.HumeSDK
 import com.fry.base.bean.AppRequest
-import com.fry.base.utils.encry.AESUtils
-import com.fry.base.utils.encry.Base64
-import com.fry.base.utils.encry.MD5
 import com.google.gson.Gson
 import com.mints.street.AppApplication
+import com.mints.street.BuildConfig
 import com.mints.street.manager.UserManager
 import com.mints.street.utils.CommonUtils
+import com.mints.street.utils.encry.AESUtils
+import com.mints.street.utils.encry.Base64
+import com.mints.street.utils.encry.MD5
 import okhttp3.*
 import okio.Buffer
 import org.json.JSONObject

app/src/main/java/com/mints/street/splash/SplashActivity.kt

@@ -129,9 +129,7 @@ class SplashActivity:BaseActivity<ActivitySplashBinding,SplashViewModel>() {
             }
 
             override fun onSplashAdLoadSuccess() {
-                if (mTTSplashAd != null) {
-                    mTTSplashAd!!.showAd(mSplashContainer)
-                }
+                mTTSplashAd?.showAd(mSplashContainer)
             }
 
             override fun onAdLoadTimeout() {

library_base/src/main/java/com/fry/base/utils/encry/AESUtils.java → app/src/main/java/com/mints/street/utils/encry/AESUtils.java

-package com.fry.base.utils.encry;
-
-import android.util.Log;
+package com.mints.street.utils.encry;
 
 
 import com.fry.base.BuildConfig;
@@ -12,6 +10,7 @@ import javax.crypto.spec.SecretKeySpec;
 import Decoder.BASE64Decoder;
 import Decoder.BASE64Encoder;
 
+
 public class AESUtils {
 
     private static final String vis = MD5.GetMD5Code("street_2021").substring(8, 24);

library_base/src/main/java/com/fry/base/utils/encry/Base64.java → app/src/main/java/com/mints/street/utils/encry/Base64.java

-package com.fry.base.utils.encry;
+package com.mints.street.utils.encry;
 
 
 import java.io.ByteArrayOutputStream;

library_base/src/main/java/com/fry/base/utils/encry/Des3.java → app/src/main/java/com/mints/street/utils/encry/Des3.java

-package com.fry.base.utils.encry;
+package com.mints.street.utils.encry;
 
 
 import android.util.Log;

library_base/src/main/java/com/fry/base/utils/encry/MD5.java → app/src/main/java/com/mints/street/utils/encry/MD5.java

-package com.fry.base.utils.encry;
+package com.mints.street.utils.encry;
 
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;

gradle.properties

@@ -33,4 +33,4 @@ RELEASE_SHARESDK_KEY=
 RELEASE_SHARESDK_SECRET=
 
 #友盟
-RELEASE_UMENG_KEY=
+RELEASE_UMENG_KEY=60e80209a6f90557b7b19aa7
\ No newline at end of file

library_base/build.gradle

@@ -44,7 +44,7 @@ dependencies {
     api project(':mvvmhabit')
 
     //阿里路由框架
-    api rootProject.ext.dependencies["arouter-api"]
+//    api rootProject.ext.dependencies["arouter-api"]
     //指示器
     api rootProject.ext.dependencies["hackware1993"]
 

library_base/src/main/java/com/fry/base/base/BaseModuleInit.java

@@ -3,8 +3,6 @@ package com.fry.base.base;
 import android.app.Application;
 import android.view.Gravity;
 
-import com.alibaba.android.arouter.launcher.ARouter;
-
 import me.goldze.mvvmhabit.utils.KLog;
 import me.goldze.mvvmhabit.utils.ToastUtils;
 import com.fry.base.BuildConfig;
@@ -22,10 +20,10 @@ public class BaseModuleInit implements IModuleInit<Void> {
         //开启打印日志
         KLog.init(BuildConfig.DEBUG);
         //初始化阿里路由框架
-        if (BuildConfig.DEBUG) {
-            ARouter.openLog();     // 打印日志
-            ARouter.openDebug();   // 开启调试模式(如果在InstantRun模式下运行，必须开启调试模式！线上版本需要关闭,否则有安全风险)
-        }
+//        if (BuildConfig.DEBUG) {
+//            ARouter.openLog();     // 打印日志
+//            ARouter.openDebug();   // 开启调试模式(如果在InstantRun模式下运行，必须开启调试模式！线上版本需要关闭,否则有安全风险)
+//        }
         // 尽可能早，推荐在Application中初始化
        // ARouter.init(application);
         ToastUtils.setGravity(Gravity.CENTER,0,0);

library_base/src/main/java/com/fry/base/basenetwork/RetrofitClient.java

@@ -6,8 +6,6 @@ import android.text.TextUtils;
 import androidx.annotation.NonNull;
 
 import com.fry.base.BuildConfig;
-import com.fry.base.netwrok.OkHttpInterceptor;
-import com.fry.base.utils.encry.AESUtils;
 
 import java.util.concurrent.TimeUnit;
 
@@ -34,7 +32,7 @@ import retrofit2.converter.gson.GsonConverterFactory;
  */
 public class RetrofitClient {
 
-    private HttpConfiguation mHttpConfig;
+    public HttpConfiguation mHttpConfig;
 
     private Context mContext = Utils.getContext();
 

library_base/src/main/java/com/fry/base/global/Constants.java

@@ -16,22 +16,6 @@ public class Constants {
     /***
      * bugly配置信息
      */
-    public static final String BUGLY_APP_ID = "1aa21b8cc3";
-    public static final String UMENG_APP_KEY = "58c35e724544cb4fa8001acf";
-
-    public static final String JPUSH_KEY = "830808eb0ee65458c952891c";
-
-    public static final String WX_APP_ID = "wxff15efaf15adc6f8";
-    public static final String WX_APP_SECRET = "83d6dbe46f84bde4cf78d0b58764d797";
-    public static final String QQAppID = "1105708819";
-    public static final String QQAppKey = "J9olD7s7udx8rJ0E";
-    public static final String SinaAppKey = "824068500";
-    public static final String SinaAppSecret = "99dd08e9f7de660cb81ddc8f90e67e7c";
-    public static final String SinaCallBackURL = "http://sns.whalecloud.com/sina2/callback";
-
-    public static final String BUNDLE_ID = "bundleId";
-
-
     public static final String ID = "id";
 
     /**

library_base/src/main/java/com/fry/base/provider/IFlutterProvider.kt

-package com.fry.base.provider
-
-import android.content.Context
-import com.alibaba.android.arouter.facade.template.IProvider
-import com.alibaba.android.arouter.launcher.ARouter
-
-/**
- * Description :
- * Created by yue on 2021/3/10
- */
-interface IFlutterProvider : IProvider {
-
-    companion object {
-        const val PROVIDER: String = "/flutter/provider"
-
-        @JvmStatic
-        fun getInstance(): IFlutterProvider {
-            return ARouter.getInstance().build(PROVIDER).navigation() as IFlutterProvider
-        }
-    }
-
-    fun toFlutter(context: Context, path: String, arguments: HashMap<String, Any>? = null, requestCode: Int = 0)
-}
\ No newline at end of file

library_base/version.properties

-#Fri Jul 09 14:29:26 CST 2021
-VERSION_BUILD=2633
+#Fri Jul 09 16:57:51 CST 2021
+VERSION_BUILD=2659

shareSdkLib/build/intermediates/incremental/packageDebugResources/compile-file-map.properties

-#Fri Jul 09 11:54:15 CST 2021
+#Fri Jul 09 15:21:04 CST 2021
 D\:\\android_space\\MyStreet\\shareSdkLib\\src\\main\\res\\drawable-xhdpi\\ssdk_auth_title_back.png=D\:\\android_space\\MyStreet\\shareSdkLib\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\ssdk_auth_title_back.png
 D\:\\android_space\\MyStreet\\shareSdkLib\\src\\main\\res\\drawable-xhdpi\\ssdk_oks_classic_yixin.png=D\:\\android_space\\MyStreet\\shareSdkLib\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\ssdk_oks_classic_yixin.png
 D\:\\android_space\\MyStreet\\shareSdkLib\\src\\main\\res\\drawable-xhdpi\\ssdk_oks_classic_wechatfavorite.png=D\:\\android_space\\MyStreet\\shareSdkLib\\build\\intermediates\\packaged_res\\debug\\drawable-xhdpi-v4\\ssdk_oks_classic_wechatfavorite.png