Merge branch 'dev_1.0.0' of http://39.97.65.143:81/android/android_street into fry_dev

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

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

@@ -15,6 +15,7 @@ import com.orhanobut.logger.AndroidLogAdapter
 import com.orhanobut.logger.FormatStrategy
 import com.orhanobut.logger.Logger
 import com.orhanobut.logger.PrettyFormatStrategy
+import com.tencent.bugly.crashreport.CrashReport
 import me.goldze.mvvmhabit.utils.KLog
 
 /**
@@ -51,8 +52,13 @@ class AppApplication : BaseApp() {
         // 友盟预初始化
         UmengManager.preInit()
 
+        // bugly
+        CrashReport.initCrashReport(this, "df5783aab4", BuildConfig.DEBUG)
+
         // GroMore
         CsjGroMoreManager.init(this)
+
+
         //百度地图
         // 在使用 SDK 各组间之前初始化 context 信息，传入 ApplicationContext
         // 默认本地个性化地图初始化方法

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

@@ -56,6 +56,7 @@ class MainActivity : BaseActivity<ActivityMainBinding, MainViewModel>() {
                 R.id.menu_square -> binding.mainViewpager.setCurrentItem(1, false)
                 R.id.menu_my -> {
                     binding.mainViewpager.setCurrentItem(2, false)
+//                     stopAnim()
                 }
             }
         }
@@ -71,18 +72,12 @@ class MainActivity : BaseActivity<ActivityMainBinding, MainViewModel>() {
         )
 
         RxPermissions(this).request(
-            if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) Manifest.permission.ACCESS_BACKGROUND_LOCATION else "",
-           Manifest.permission.ACCESS_FINE_LOCATION ,
-             Manifest.permission.WRITE_EXTERNAL_STORAGE ,
-             Manifest.permission.READ_PHONE_STATE
-        )
-            .subscribe {
-            }
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) Manifest.permission.ACCESS_BACKGROUND_LOCATION else "",
+                Manifest.permission.ACCESS_FINE_LOCATION).subscribe {
+        }
     }
 
 
-
-
     var oldTime: Long = 0
     override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean {
         when (keyCode) {

app/src/main/java/com/mints/street/netwrok/baidu/BaiduRetrofitClient.java

@@ -65,8 +65,8 @@ public class BaiduRetrofitClient {
             clientBuilder.interceptors().add(logging);
         }
 
-        OkHttpInterceptor okHttpInterceptor = new OkHttpInterceptor(AESUtils.getDefaultKey());
-        clientBuilder.interceptors().add(okHttpInterceptor);
+//        OkHttpInterceptor okHttpInterceptor = new OkHttpInterceptor(AESUtils.getDefaultKey());
+//        clientBuilder.interceptors().add(okHttpInterceptor);
 
         mOkHttpClient = clientBuilder.build();
         mRetrofit = new Retrofit.Builder()

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

@@ -21,7 +21,6 @@
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@mipmap/ic_bg_guide"
             android:gravity="center|bottom">
 
             <LinearLayout