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

app/build.gradle

@@ -67,7 +67,7 @@ android {
             // 不显示Log
             buildConfigField "boolean", "LOG_DEBUG", "true"
             buildConfigField "String", "AppKeyPre", "\"abcd\""
-            buildConfigField "String", "MainIp", DEBUG_URL
+            buildConfigField "String", "MainIp", RELEASE_URL
 
             //混淆
             minifyEnabled false

app/src/main/java/com/mints/street/main/home/HomeFragment.kt

@@ -312,6 +312,7 @@ class HomeFragment(val mainActivity: MainActivity) : BaseFragment<FragmentHomeBi
         mSensorManager?.unregisterListener(this)
         // 退出时销毁定位
         mLocClient?.stop()
+        mSearch?.destroy()
         // 关闭定位图层
         mBaiduMap?.isMyLocationEnabled = false
         binding.bmapView.onDestroy()

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

@@ -49,6 +49,7 @@
                 android:layout_height="wrap_content"
                 android:paddingLeft="15dp"
                 android:paddingTop="5dp"
+                android:paddingRight="15dp"
                 android:textSize="12sp"
                 android:text="巴黎嫩作为文化十字路口的历史可以追溯到数千年前。探索其古老的以及和自然奇观。" />
 

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

@@ -21,7 +21,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:layout_marginTop="30dp"
-            android:text="想要继续无限方法又不模糊？"
+            android:text="想要继续无限缩放又不模糊？"
             android:textColor="@color/black"
             android:textSize="14sp" />
 

library.build.gradle

@@ -52,13 +52,14 @@ android {
     buildTypes {
         release {
             buildConfigField ("boolean","IS_DEV","false")
-            buildConfigField ("String","DEBUG_URL",DEBUG_URL)
+            buildConfigField ("String","MAINIP",RELEASE_URL)
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
         debug{
             buildConfigField ("boolean","IS_DEV","true")
-            buildConfigField ("String","DEBUG_URL",DEBUG_URL)
+            buildConfigField ("String","MAINIP",DEBUG_URL)
+//            buildConfigField ("String","MAINIP",RELEASE_URL)
         }
     }
 //    productFlavors {

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

@@ -41,7 +41,6 @@ public class Constants {
     }
 
     public static String getBaseUrl() {
-
-        return BuildConfig.DEBUG_URL;
+        return BuildConfig.MAINIP;
     }
 }
\ No newline at end of file