修改5G马甲包问题

app/build.gradle

@@ -104,7 +104,7 @@ android {
     }
 
     productFlavors {
-        streetpkgtext {}
+        streetpkg {}
     }
 
     productFlavors.all {

app/proguard-rules.pro

@@ -124,14 +124,14 @@
 
 
     #忽略警告
-    -dontwarn com.mints.freeworld.bean.**
+    -dontwarn com.mints.fiveworld.bean.**
     #保留实体类
     -keep class com.mints.fiveworld.bean.** {
         *;
     }
 
     #忽略警告
-    -dontwarn com.mints.freeworld.widget.**
+    -dontwarn com.mints.fiveworld.widget.**
     #保留实体类
     -keep class com.mints.fiveworld.widget.** {
         *;

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

-package com.mints.fiveworld;
-
-
-/**
- * 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());
-//    }
-//}
\ No newline at end of file

app/src/main/AndroidManifest.xml

@@ -26,7 +26,7 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true">
-        <activity android:name=".main.vr.DetailedActivity"></activity>
+        <activity android:name="com.mints.fiveworld.main.vr.DetailedActivity"></activity>
 
         <uses-library
             android:name="org.apache.http.legacy"
@@ -62,7 +62,7 @@
             android:process=":remote" />
 
         <activity
-            android:name=".splash.SplashActivity"
+            android:name="com.mints.fiveworld.splash.SplashActivity"
             android:theme="@style/NormalSplash"
             android:configChanges="screenLayout|screenSize|smallestScreenSize|orientation|keyboardHidden"
             android:screenOrientation="portrait"
@@ -73,47 +73,47 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".login.LoginActivity"
+        <activity android:name="com.mints.fiveworld.login.LoginActivity"
             android:configChanges="screenLayout|screenSize|smallestScreenSize|orientation|keyboardHidden"
             android:screenOrientation="portrait"
 
             />
         <activity
-            android:name=".main.MainActivity"
+            android:name="com.mints.fiveworld.main.MainActivity"
             android:configChanges="screenLayout|screenSize|smallestScreenSize|orientation|keyboardHidden"
             android:screenOrientation="portrait"
             android:launchMode="singleTask"
             android:theme="@style/AppTheme.NoneTranslucent" />
-        <activity android:name=".main.my.MoresettingsActivity"
+        <activity android:name="com.mints.fiveworld.main.my.MoresettingsActivity"
             android:configChanges="screenLayout|screenSize|smallestScreenSize|orientation|keyboardHidden"
             android:screenOrientation="portrait"
             />
-        <activity android:name=".main.my.AboutusActivity"
+        <activity android:name="com.mints.fiveworld.main.my.AboutusActivity"
             android:configChanges="screenLayout|screenSize|smallestScreenSize|orientation|keyboardHidden"
             android:screenOrientation="portrait"
             />
-        <activity android:name=".main.my.PermissionsActivity"
+        <activity android:name="com.mints.fiveworld.main.my.PermissionsActivity"
             android:configChanges="screenLayout|screenSize|smallestScreenSize|orientation|keyboardHidden"
             android:screenOrientation="portrait"
             />
-        <activity android:name=".main.my.OpenvipActivity"
+        <activity android:name="com.mints.fiveworld.main.my.OpenvipActivity"
             android:configChanges="screenLayout|screenSize|smallestScreenSize|orientation|keyboardHidden"
             android:screenOrientation="portrait"
             />
-        <activity android:name=".main.home.HistoricalimageActivity"
+        <activity android:name="com.mints.fiveworld.main.home.HistoricalimageActivity"
             android:configChanges="screenLayout|screenSize|smallestScreenSize|orientation|keyboardHidden"
             android:screenOrientation="portrait"
             />
-        <activity android:name=".main.my.BindMobileActivity"
+        <activity android:name="com.mints.fiveworld.main.my.BindMobileActivity"
             android:configChanges="screenLayout|screenSize|smallestScreenSize|orientation|keyboardHidden"
             android:screenOrientation="portrait"
             />
-        <activity android:name=".splash.GuideActivity"
+        <activity android:name="com.mints.fiveworld.splash.GuideActivity"
             android:configChanges="screenLayout|screenSize|smallestScreenSize|orientation|keyboardHidden"
             android:screenOrientation="portrait"
             />
 
-        <activity android:name=".main.home.SearchMapActivity"
+        <activity android:name="com.mints.fiveworld.main.home.SearchMapActivity"
             android:configChanges="screenLayout|screenSize|smallestScreenSize|orientation|keyboardHidden"
             android:screenOrientation="portrait"
             /> <!-- ShareSDK start -->
@@ -123,7 +123,7 @@
             android:theme="@android:style/Theme.Translucent.NoTitleBar"
             android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
-            android:name=".wxapi.WXEntryActivity"
+            android:name="com.mints.fiveworld.wxapi.WXEntryActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:exported="true"
             android:theme="@android:style/Theme.Translucent.NoTitleBar" />
@@ -196,15 +196,15 @@
             android:exported="false"
             android:screenOrientation="behind"
             android:windowSoftInputMode="adjustResize|stateHidden" />
-        <activity android:name=".main.vr.PanoramicActivity"
+        <activity android:name="com.mints.fiveworld.main.vr.PanoramicActivity"
             android:configChanges="screenLayout|screenSize|smallestScreenSize|orientation|keyboardHidden"
             android:screenOrientation="portrait"
             />
-        <activity android:name=".webview.MintsWebViewActivity"
+        <activity android:name="com.mints.fiveworld.webview.MintsWebViewActivity"
             android:configChanges="screenLayout|screenSize|smallestScreenSize|orientation|keyboardHidden"
             android:screenOrientation="portrait"
             />
-        <service android:name=".services.UpdateServices"
+        <service android:name="com.mints.fiveworld.services.UpdateServices"
             android:configChanges="screenLayout|screenSize|smallestScreenSize|orientation|keyboardHidden"
             android:screenOrientation="portrait"
             />

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

@@ -21,7 +21,6 @@ import me.goldze.mvvmhabit.utils.KLog
 /**
  * Created by 冯瑞雨 on 2021/7/1.
  */
-@WX(packageName = "com.mints.freeworld")
 class AppApplication : BaseApp() {
 
     override fun onCreate() {

app/src/main/java/com/mints/fiveworld/common/Constant.kt

@@ -12,7 +12,7 @@ object Constant {
     /**
      * 应用包名
      */
-    const val MINTS_PKG_NAME = "com.mints.freeworld"
+    const val MINTS_PKG_NAME = "com.mints.fiveworld"
 
     /**
      * 第一次打开权限页面
@@ -20,8 +20,8 @@ object Constant {
     const val FIRST_OPEN_PERMISSIONS = "first_open_permissions"
 
     // 协议地址
-    var REGISTER_URL = BuildConfig.MainIp + "map/register.html"//服务协议
-    var PRIVACY_URL = BuildConfig.MainIp + "map/privacy.html"//隐私协议
+    var REGISTER_URL = BuildConfig.MainIp + "mapzy/register.html"//服务协议
+    var PRIVACY_URL = BuildConfig.MainIp + "mapzy/privacy.html"//隐私协议
 
     /**
      * 第一次授权

app/src/main/java/com/mints/fiveworld/db/AppDatabase.kt

@@ -22,7 +22,7 @@ abstract class AppDatabase : RoomDatabase() {
                         _instance = Room.databaseBuilder(
                             Utils.getContext()
                             , AppDatabase::class.java
-                            , "mints_room.com.mints.freeworld.db")
+                            , "mints_room.com.mints.fiveworld.db")
                             .allowMainThreadQueries()//设置是否允许在主线程做查询操作
                             //.fallbackToDestructiveMigration()//设置迁移数据库如果发生错误，将会重新创建数据库，而不是发生崩溃
                             .build()

app/src/main/java/com/mints/fiveworld/main/my/AboutusActivity.kt

@@ -39,7 +39,7 @@ class AboutusActivity : BaseActivity<ActivityAboutusBinding, AboutusViewModel>()
         tv_title.setTextColor(Color.BLACK)
         iv_left_icon.setImageResource(R.mipmap.ic_arrow_back)
         iv_left_icon.visibility = View.VISIBLE
-        tvAboutasVersion.text = "3D高清街景  v" + DeviceInfo.instance.versionName
+        tvAboutasVersion.text = "自由世界  v" + DeviceInfo.instance.versionName
 
         tvAboutasService.setOnClickListener(this)
         tvAboutasPolicy.setOnClickListener(this)

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

@@ -22,6 +22,7 @@
 
 
         <ImageView
+
             android:visibility="gone"
             android:id="@+id/image_map_history"
             android:layout_width="35dp"
@@ -42,6 +43,7 @@
             app:layout_constraintEnd_toEndOf="parent" />
 
         <ImageView
+            android:visibility="gone"
             android:id="@+id/image_map_change_icon"
             android:layout_width="35dp"
             android:layout_height="35dp"
@@ -52,6 +54,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             />
         <ImageView
+            android:visibility="gone"
             android:id="@+id/ly_hotview"
             android:layout_width="35dp"
             android:layout_height="35dp"

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

@@ -19,7 +19,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:layout_marginTop="25dp"
-            android:text="3D高清街景"
+            android:text="自由世界"
             android:textStyle="bold"
             android:textColor="@color/black"
             android:textSize="25dp" />
@@ -183,7 +183,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="您的个人信息将受到严格的保密，3D高清街景不会将您的个人信息泄露给他人。您也可以在系统设置中关闭授权，但可能影响部分功能使用。"
+            android:text="您的个人信息将受到严格的保密，自由世界不会将您的个人信息泄露给他人。您也可以在系统设置中关闭授权，但可能影响部分功能使用。"
             android:layout_margin="10dp"
             android:textColor="#CD000000" />
 

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

@@ -49,7 +49,7 @@
             android:layout_height="wrap_content"
             android:elevation="5dp"
             android:layout_marginTop="6dp"
-            android:text="3D高清街景会员吗？"
+            android:text="自由世界会员吗？"
             android:textColor="#8E5832"
             android:textSize="26sp"
             android:textStyle="bold"

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

@@ -38,7 +38,7 @@
                     android:layout_marginLeft="16dp"
                     android:layout_marginTop="16dp"
                     android:layout_marginRight="16dp"
-                    android:text="我们依据最新的法律,向您说明3D高清街景软件的隐私政策,特向您推送本提示。请您阅读并充分理解相关条款。"
+                    android:text="我们依据最新的法律,向您说明自由世界软件的隐私政策,特向您推送本提示。请您阅读并充分理解相关条款。"
                     android:textColor="@color/black"
                     android:textSize="14sp" />
 

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

@@ -40,6 +40,7 @@
             app:layout_constraintTop_toBottomOf="@id/image_map_change_icon" />
 
         <ImageView
+            android:visibility="gone"
             android:id="@+id/ly_hotview"
             android:layout_width="35dp"
             android:layout_height="35dp"
@@ -59,6 +60,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent" />
         <ImageView
+            android:visibility="gone"
             android:id="@+id/image_map_change_icon"
             android:layout_width="35dp"
             android:layout_height="35dp"

app/src/test/java/com/mints/fiveworld/ExampleUnitTest.java

-package com.mints.fiveworld;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() {
-        assertEquals(4, 2 + 2);
-    }
-}
\ No newline at end of file

gradle.properties

@@ -17,8 +17,8 @@ org.gradle.jvmargs=-Xmx2048m
 isBuildModule=false
 
 DEBUG_URL="http://test.mints-id.com/map-api/"
-RELEASE_URL="https://api.mints-id.com/map-api/"
-
+RELEASE_URL="http://test.mints-id.com/map-api/"
+#https://api.mints-id.com/map-api/
 RELEASE_KEY_PASSWORD=mints.fiveworld
 RELEASE_KEY_ALIAS=mints_fiveworld
 RELEASE_STORE_PASSWORD=mints.fiveworld

library_base/src/main/AndroidManifest.xml

@@ -26,15 +26,15 @@
             android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
 
         <!--Android7App私有文件授权-->
-<!--        <provider-->
-<!--            android:name="com.fry.base.provider.BaseFileProvider"-->
-<!--            android:authorities="com.base.android.android7.fileprovider"-->
-<!--            android:exported="false"-->
-<!--            android:grantUriPermissions="true">-->
-<!--            <meta-data-->
-<!--                android:name="android.support.FILE_PROVIDER_PATHS"-->
-<!--                android:resource="@xml/file_provider_paths" />-->
-<!--        </provider>-->
+        <provider
+            android:name="com.fry.base.provider.BaseFileProvider"
+            android:authorities="com.base.android.android7.5g.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_provider_paths" />
+        </provider>
 
     </application>
 </manifest>

mvvmhabit/src/main/AndroidManifest.xml

@@ -17,11 +17,11 @@
             android:screenOrientation="portrait"
             />
 
-<!--        <provider-->
-<!--            android:name=".crash.CaocInitProvider"-->
-<!--            android:authorities="${applicationId}.customactivityoncrashinitprovider"-->
-<!--            android:exported="false"-->
-<!--            android:initOrder="101" />-->
+        <provider
+            android:name=".crash.CaocInitProvider"
+            android:authorities="${applicationId}.5g.customactivityoncrashinitprovider"
+            android:exported="false"
+            android:initOrder="101" />
     </application>
 
 </manifest>

mvvmhabit/src/main/java/me/goldze/mvvmhabit/utils/AppUtils.java

@@ -124,14 +124,14 @@ public class AppUtils {
         File file = new File(downloadApk);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
             //适配Android Q,注意mFilePath是通过ContentResolver得到的，上述有相关代码
-            Uri contentUri = FileProvider.getUriForFile(context, "com.mints.freeworld.fileprovider", file);
+            Uri contentUri = FileProvider.getUriForFile(context, "com.mints.fiveworld.fileprovider", file);
             intent.setDataAndType(contentUri, "application/vnd.android.package-archive");
             intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
         } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
             //  7.0
             intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
             //第二个参数是你的包名+.FileProvider（你也可以直接去AndroidMenifest中把你刚才写的provider的authorities拷贝过来，Fileprovider开头大小写不限）
-            Uri contentUri = FileProvider.getUriForFile(context, "com.mints.freeworld.fileprovider", file);
+            Uri contentUri = FileProvider.getUriForFile(context, "com.mints.fiveworld.fileprovider", file);
             intent.setDataAndType(contentUri, "application/vnd.android.package-archive");
         } else {//7.0以下
             intent.setDataAndType(Uri.fromFile(file), "application/vnd.android.package-archive");

settings.gradle

@@ -2,4 +2,4 @@ include ':library_base'
 include ':mvvmhabit'
 include ':shareSdkLib'
 include ':app'
-rootProject.name = "fiveworId"
\ No newline at end of file
+rootProject.name = "5G世界"
\ No newline at end of file

shareSdkLib/src/main/java/com/mints/fiveworld/wxapi/WXEntryActivity.java

@@ -10,6 +10,7 @@ package com.mints.fiveworld.wxapi;
 
 import android.content.Intent;
 import android.widget.Toast;
+
 import cn.sharesdk.wechat.utils.WXAppExtendObject;
 import cn.sharesdk.wechat.utils.WXMediaMessage;
 import cn.sharesdk.wechat.utils.WechatHandlerActivity;