修复包名调整带来的问题

张磊 · 张磊 · commit 0f81c2c4f11f · 2020-11-19T10:43:48.000+08:00
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.baronzhang.android.modularization">
+    package="com.modularization.android.app">
 
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
-        android:name="com.modularization.android.app.ModularizationApp"
+        android:name=".ModularizationApp"
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         tools:replace="android:theme,android:icon,android:label,android:allowBackup">
-        <activity android:name="com.modularization.android.app.SplashActivity">
+        <activity android:name=".SplashActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/app/src/main/java/com/modularization/android/app/SplashActivity.java b/app/src/main/java/com/modularization/android/app/SplashActivity.java
@@ -6,7 +6,6 @@
 import android.os.Bundle;
 
 import com.modularization.android.main.MainActivity;
-import com.baronzhang.android.modularization.R;
 
 /**
  * App闪屏页
diff --git a/biz-module-newhouse/src/main/java/com/modularization/android/newhouse/MainActivity.java b/biz-module-newhouse/src/main/java/com/modularization/android/newhouse/MainActivity.java
@@ -8,7 +8,6 @@
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.modularization.android.commonbusiness.base.activity.BaseActivity;
 import com.modularization.android.commonbusiness.model.HouseDetail;
-import com.baronzhang.android.newhouse.R;
 import com.modularization.android.renthouse.api.RentHouseRouterTable;
 import com.modularization.android.newhouse.api.NewHouseRouterTable;
 
diff --git a/biz-module-newhouse/src/main/release/AndroidManifest.xml b/biz-module-newhouse/src/main/release/AndroidManifest.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.baronzhang.android.newhouse">
+    package="com.modularization.android.newhouse">
 
     <application
         android:allowBackup="true"
         android:supportsRtl="true">
         <activity
-            android:name="com.baronzhang.android.newhouse.com.modularization.android.newhouse.MainActivity"
+            android:name=".MainActivity"
             android:label="@string/new_house_label_home_page">
             <intent-filter>
                 <category android:name="android.intent.category.DEFAULT" />
diff --git a/biz-module-renthouse/src/main/java/com/modularization/android/renthouse/MainActivity.java b/biz-module-renthouse/src/main/java/com/modularization/android/renthouse/MainActivity.java
@@ -7,7 +7,6 @@
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.modularization.android.commonbusiness.base.activity.BaseActivity;
-import com.baronzhang.android.renthouse.R;
 import com.modularization.android.renthouse.api.RentHouseRouterTable;
 import com.modularization.android.newhouse.api.NewHouseProviderHelper;
 
diff --git a/biz-module-renthouse/src/main/release/AndroidManifest.xml b/biz-module-renthouse/src/main/release/AndroidManifest.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.baronzhang.android.renthouse">
+    package="com.modularization.android.renthouse">
 
     <application
         android:allowBackup="true"
         android:supportsRtl="true">
         <activity
-            android:name="com.baronzhang.android.renthouse.com.modularization.android.renthouse.MainActivity"
+            android:name=".MainActivity"
             android:label="@string/rent_house_label_home_page">
             <intent-filter>
                 <category android:name="android.intent.category.DEFAULT" />
diff --git a/biz-module-secondhouse/src/main/java/com/modularization/android/secondhouse/MainActivity.java b/biz-module-secondhouse/src/main/java/com/modularization/android/secondhouse/MainActivity.java
@@ -8,7 +8,6 @@
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.modularization.android.commonbusiness.base.activity.BaseActivity;
 import com.modularization.android.commonbusiness.model.HouseDetail;
-import com.baronzhang.android.secondhouse.R;
 import com.modularization.android.secondhouse.api.SecondHouseRouterTable;
 
 import java.util.ArrayList;
diff --git a/biz-module-secondhouse/src/main/release/AndroidManifest.xml b/biz-module-secondhouse/src/main/release/AndroidManifest.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.baronzhang.android.secondhouse">
+    package="com.modularization.android.secondhouse">
 
     <application
         android:allowBackup="true"
         android:supportsRtl="true">
         <activity
-            android:name="com.baronzhang.android.secondhouse.com.modularization.android.secondhouse.MainActivity"
+            android:name=".MainActivity"
             android:label="@string/second_house_label_home_page">
             <intent-filter>
                 <category android:name="android.intent.category.DEFAULT" />
diff --git a/biz-service-newhouse/src/main/AndroidManifest.xml b/biz-service-newhouse/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.baronzhang.android.newhouse.api">
+    package="com.modularization.android.newhouse.api">
 
 </manifest>
diff --git a/biz-service-renthouse/src/main/AndroidManifest.xml b/biz-service-renthouse/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.baronzhang.android.renthouse.api">
+    package="com.modularization.android.renthouse.api">
 
 </manifest>
diff --git a/biz-service-secondhouse/src/main/AndroidManifest.xml b/biz-service-secondhouse/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.baronzhang.android.secondhouse.api">
+    package="com.modularization.android.secondhouse.api">
 
 </manifest>
diff --git a/lib-common-business/src/main/AndroidManifest.xml b/lib-common-business/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-
-    package="com.baronzhang.android.commonbusiness">
+    package="com.modularization.android.commonbusiness">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <application
diff --git a/lib-data-center/src/main/AndroidManifest.xml b/lib-data-center/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.baronzhang.android.data">
+    package="com.modularization.android.data">
 
     <application android:allowBackup="true"
         android:supportsRtl="true">
diff --git a/lib-data-center/src/main/java/com/modularization/android/data/http/ApiClient.java b/lib-data-center/src/main/java/com/modularization/android/data/http/ApiClient.java
@@ -3,7 +3,6 @@
 import com.modularization.android.data.http.service.ServiceWrap;
 import com.facebook.stetho.okhttp3.StethoInterceptor;
 
-import com.modularization.android.data.BuildConfig;
 import com.modularization.android.data.http.configuration.ApiConfiguration;
 import com.modularization.android.data.http.converter.FastJsonConverterFactory;
 
@@ -47,11 +46,11 @@ public void init(ApiConfiguration configuration) {
         this.apiServiceMap = new HashMap<>();
 
         OkHttpClient.Builder builder = new OkHttpClient().newBuilder();
-        if (BuildConfig.DEBUG) {
-            HttpLoggingInterceptor httpLoggingInterceptor = new HttpLoggingInterceptor();
-            httpLoggingInterceptor.setLevel(HttpLoggingInterceptor.Level.BODY);
-            builder.addInterceptor(httpLoggingInterceptor).addNetworkInterceptor(new StethoInterceptor());
-        }
+//        if (BuildConfig.DEBUG) {
+//            HttpLoggingInterceptor httpLoggingInterceptor = new HttpLoggingInterceptor();
+//            httpLoggingInterceptor.setLevel(HttpLoggingInterceptor.Level.BODY);
+//            builder.addInterceptor(httpLoggingInterceptor).addNetworkInterceptor(new StethoInterceptor());
+//        }
         builder.addNetworkInterceptor(new SignInterceptor());
         this.client = builder.build();
     }
diff --git a/lib-open-source/src/main/AndroidManifest.xml b/lib-open-source/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.baronzhang.android.opensourcelibrary">
+    package="com.modularization.android.opensourcelibrary">
 
     <application android:allowBackup="true"
         android:supportsRtl="true">
diff --git a/module-main/src/main/AndroidManifest.xml b/module-main/src/main/AndroidManifest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.baronzhang.android.main">
+    package="com.modularization.android.main">
 
     <application>
-        <activity android:name="com.modularization.android.main.MainActivity"></activity>
+        <activity android:name=".MainActivity"></activity>
     </application>
 
 </manifest>
diff --git a/module-main/src/main/java/com/modularization/android/main/MainActivity.java b/module-main/src/main/java/com/modularization/android/main/MainActivity.java
@@ -6,7 +6,6 @@
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.modularization.android.commonbusiness.base.activity.BaseActivity;
 import com.modularization.android.commonbusiness.model.HouseDetail;
-import com.baronzhang.android.main.R;
 import com.modularization.android.newhouse.api.NewHouseApiData;
 import com.modularization.android.renthouse.api.RentHouseData;
 import com.modularization.android.renthouse.api.RentHouseRouterTable;
