包结构调整

张磊 · 张磊 · commit c831c5ce4d81 · 2020-11-25T17:50:57.000+08:00
diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.modularization.android.app.SplashActivity">
+    tools:context="com.modularization.app.SplashActivity">
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/biz-module-main/src/main/res/layout/activity_main.xml b/biz-module-main/src/main/res/layout/activity_main.xml
@@ -10,7 +10,7 @@
     android:paddingTop="@dimen/activity_vertical_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingBottom="@dimen/activity_vertical_margin"
-    tools:context="com.baronzhang.android.main.com.modularization.android.main.MainActivity">
+    tools:context="com.modularization.biz.module.main.MainActivity">
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/biz-module-newhouse/src/main/debug/AndroidManifest.xml b/biz-module-newhouse/src/main/debug/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?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.biz.module.newhouse">
 
     <application
         android:allowBackup="true"
@@ -9,7 +9,7 @@
         android:supportsRtl="true"
         android:theme="@style/NewHouseAppTheme">
         <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>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/biz-module-newhouse/src/main/java/com/modularization/biz/module/newhouse/MainActivity.java b/biz-module-newhouse/src/main/java/com/modularization/biz/module/newhouse/MainActivity.java
@@ -6,8 +6,6 @@
 import com.alibaba.android.arouter.facade.annotation.Autowired;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
-import com.modularization.android.newhouse.R;
-import com.modularization.android.newhouse.R2;
 import com.modularization.biz.service.renthouse.RentHouseRouterTable;
 import com.modularization.biz.service.newhouse.NewHouseRouterTable;
 import com.modularization.common.base.activity.BaseActivity;
diff --git a/biz-module-newhouse/src/main/release/AndroidManifest.xml b/biz-module-newhouse/src/main/release/AndroidManifest.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.modularization.android.newhouse">
+    package="com.modularization.biz.module.newhouse">
 
     <application
         android:allowBackup="true"
         android:supportsRtl="true">
         <activity
-            android:name="com.modularization.biz.module.newhouse.MainActivity"
+            android:name=".MainActivity"
             android:label="@string/new_house_label_home_page">
             <intent-filter>
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
                 <action android:name="android.intent.action.VIEW" />
                 <data
-                    android:host="com.baronzhang.android.newhouse"
+                    android:host="com.modularization.newhouse"
                     android:scheme="router" />
             </intent-filter>
         </activity>
diff --git a/biz-module-newhouse/src/main/res/layout/new_house_activity_main.xml b/biz-module-newhouse/src/main/res/layout/new_house_activity_main.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.baronzhang.android.newhouse.com.modularization.android.newhouse.MainActivity"
+    tools:context="com.modularization.biz.module.newhouse.MainActivity"
     tools:ignore="MissingDefaultResource">
 
     <TextView
diff --git a/biz-module-renthouse/src/main/debug/AndroidManifest.xml b/biz-module-renthouse/src/main/debug/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?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.biz.module.renthouse">
 
     <application
         android:allowBackup="true"
@@ -9,7 +9,7 @@
         android:supportsRtl="true"
         android:theme="@style/RentHouseAppTheme">
         <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>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/biz-module-renthouse/src/main/java/com/modularization/biz/module/renthouse/MainActivity.java b/biz-module-renthouse/src/main/java/com/modularization/biz/module/renthouse/MainActivity.java
@@ -6,7 +6,6 @@
 import com.alibaba.android.arouter.facade.annotation.Autowired;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
-import com.modularization.android.renthouse.R;
 import com.modularization.biz.service.renthouse.RentHouseRouterTable;
 import com.modularization.biz.service.newhouse.NewHouseProviderHelper;
 import com.modularization.common.base.activity.BaseActivity;
diff --git a/biz-module-renthouse/src/main/release/AndroidManifest.xml b/biz-module-renthouse/src/main/release/AndroidManifest.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.modularization.android.renthouse">
+    package="com.modularization.biz.module.renthouse">
 
     <application
         android:allowBackup="true"
         android:supportsRtl="true">
         <activity
-            android:name="com.modularization.biz.module.renthouse.MainActivity"
+            android:name=".MainActivity"
             android:label="@string/rent_house_label_home_page">
             <intent-filter>
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
                 <action android:name="android.intent.action.VIEW" />
                 <data
-                    android:host="com.baronzhang.android.im"
+                    android:host="com.modularization.renthouse"
                     android:scheme="router"
                     android:port="6666"
                     android:path="/im/home"/>
diff --git a/biz-module-renthouse/src/main/res/layout/rent_house_activity_main.xml b/biz-module-renthouse/src/main/res/layout/rent_house_activity_main.xml
@@ -4,7 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.baronzhang.android.renthouse.com.modularization.android.renthouse.MainActivity">
+    tools:context="com.modularization.biz.module.renthouse.MainActivity"
+    tools:ignore="ResourceName">
 
 
     <TextView
diff --git a/biz-module-secondhouse/build.gradle b/biz-module-secondhouse/build.gradle
@@ -61,5 +61,6 @@ dependencies {
     implementation project(path: ':biz-service-renthouse')
 
     implementation 'com.alibaba:arouter-api:1.5.1'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     annotationProcessor 'com.alibaba:arouter-compiler:1.5.1'
 }
diff --git a/biz-module-secondhouse/src/main/debug/AndroidManifest.xml b/biz-module-secondhouse/src/main/debug/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?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.biz.module.secondhouse">
 
     <application
         android:allowBackup="true"
@@ -9,7 +9,7 @@
         android:supportsRtl="true"
         android:theme="@style/SecondHouseAppTheme">
         <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>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/biz-module-secondhouse/src/main/java/com/modularization/biz/module/secondhouse/BlankFragment.java b/biz-module-secondhouse/src/main/java/com/modularization/biz/module/secondhouse/BlankFragment.java
@@ -0,0 +1,46 @@
+package com.modularization.biz.module.secondhouse;
+
+import android.os.Bundle;
+
+import androidx.fragment.app.Fragment;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.alibaba.android.arouter.facade.annotation.Route;
+import com.modularization.biz.service.secondhouse.SecondHouseRouterTable;
+
+@Route(path = SecondHouseRouterTable.PATH_FRAGMENT_BLANK)
+public class BlankFragment extends Fragment {
+
+    private static final String ARG_PARAM1 = "param1";
+
+    private String mParam1;
+
+    public BlankFragment() {
+        // Required empty public constructor
+    }
+
+    public static BlankFragment newInstance(String param1) {
+        BlankFragment fragment = new BlankFragment();
+        Bundle args = new Bundle();
+        args.putString(ARG_PARAM1, param1);
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (getArguments() != null) {
+            mParam1 = getArguments().getString(ARG_PARAM1);
+        }
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_blank, container, false);
+    }
+}
diff --git a/biz-module-secondhouse/src/main/java/com/modularization/biz/module/secondhouse/MainActivity.java b/biz-module-secondhouse/src/main/java/com/modularization/biz/module/secondhouse/MainActivity.java
@@ -6,7 +6,6 @@
 import com.alibaba.android.arouter.facade.annotation.Autowired;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
-import com.modularization.android.secondhouse.R;
 import com.modularization.biz.service.secondhouse.SecondHouseRouterTable;
 import com.modularization.common.base.activity.BaseActivity;
 import com.modularization.common.model.HouseDetail;
diff --git a/biz-module-secondhouse/src/main/release/AndroidManifest.xml b/biz-module-secondhouse/src/main/release/AndroidManifest.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.modularization.android.secondhouse">
+    package="com.modularization.biz.module.secondhouse">
 
     <application
         android:allowBackup="true"
         android:supportsRtl="true">
         <activity
-            android:name="com.modularization.biz.module.secondhouse.MainActivity"
+            android:name=".MainActivity"
             android:label="@string/second_house_label_home_page">
             <intent-filter>
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
                 <action android:name="android.intent.action.VIEW" />
                 <data
-                    android:host="com.baronzhang.android.secondhouse"
+                    android:host="com.modularization.secondhouse"
                     android:scheme="router" />
             </intent-filter>
         </activity>
diff --git a/biz-module-secondhouse/src/main/res/layout/fragment_blank.xml b/biz-module-secondhouse/src/main/res/layout/fragment_blank.xml
@@ -0,0 +1,14 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.modularization.biz.module.secondhouse.BlankFragment"
+    tools:ignore="ResourceName">
+
+    <TextView
+        android:id="@+id/textView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:text="我是二手房Fragment" />
+
+</FrameLayout>
diff --git a/biz-module-secondhouse/src/main/res/layout/second_house_activity_main.xml b/biz-module-secondhouse/src/main/res/layout/second_house_activity_main.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.baronzhang.android.secondhouse.com.modularization.android.secondhouse.MainActivity">
+    tools:context="com.modularization.biz.module.secondhouse.MainActivity">
 
     <TextView
         android:id="@+id/textView0"
diff --git a/biz-service-secondhouse/src/main/java/com/modularization/biz/service/secondhouse/SecondHouseRouterTable.java b/biz-service-secondhouse/src/main/java/com/modularization/biz/service/secondhouse/SecondHouseRouterTable.java
@@ -7,5 +7,7 @@ public interface SecondHouseRouterTable {
 
     String PATH_ACTIVITY_MAIN = "/secondhouse/mainActivity";
 
+    String PATH_FRAGMENT_BLANK = "/secondhouse/blankFragment";
+
     String PATH_SERVICE_SECOND_HOUSE = "/secondhouse/service";
 }
diff --git a/lib-data-local/src/main/AndroidManifest.xml b/lib-data-local/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.modularization.android.data">
+    package="com.modularization.data.local">
 
     <application android:allowBackup="true"
         android:supportsRtl="true">
diff --git a/lib-data-net/src/main/java/com/modularization/data/net/converter/FastJsonResponseBodyConvert.java b/lib-data-net/src/main/java/com/modularization/data/net/converter/FastJsonResponseBodyConvert.java
@@ -24,4 +24,4 @@ public FastJsonResponseBodyConvert(Type type) {
     public T convert(ResponseBody value) throws IOException {
         return JSON.parseObject(value.string(), type);
     }
-}
+}
