文件名调整

张磊 · 张磊 · commit 1d0e98061315 · 2020-11-18T20:22:45.000+08:00
diff --git a/biz-module-newhouse/src/main/java/com/baronzhang/android/newhouse/MainActivity.java b/biz-module-newhouse/src/main/java/com/baronzhang/android/newhouse/MainActivity.java
@@ -31,7 +31,7 @@ public class MainActivity extends BaseActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.new_house_activity_new_house_main);
+        setContentView(R.layout.new_house_activity_main);
         unbinder = ButterKnife.bind(this);
         ARouter.getInstance().inject(this);
 
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,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.baronzhang.android.newhouse.MainActivity">
+    tools:context="com.baronzhang.android.newhouse.MainActivity"
+    tools:ignore="MissingDefaultResource">
 
     <TextView
         android:id="@+id/textView0"
diff --git a/biz-module-renthouse/src/main/debug/AndroidManifest.xml b/biz-module-renthouse/src/main/debug/AndroidManifest.xml
@@ -4,13 +4,13 @@
 
     <application
         android:allowBackup="true"
-        android:icon="@mipmap/im_ic_launcher"
-        android:label="@string/im_app_name"
+        android:icon="@mipmap/rent_house_ic_launcher"
+        android:label="@string/rent_house_app_name"
         android:supportsRtl="true"
-        android:theme="@style/IMAppTheme">
+        android:theme="@style/RentHouseAppTheme">
         <activity
             android:name="com.baronzhang.android.renthouse.MainActivity"
-            android:label="@string/im_label_home_page">
+            android:label="@string/rent_house_label_home_page">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/biz-module-renthouse/src/main/java/com/baronzhang/android/renthouse/MainActivity.java b/biz-module-renthouse/src/main/java/com/baronzhang/android/renthouse/MainActivity.java
@@ -23,7 +23,7 @@ public class MainActivity extends BaseActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.im_activity_instant_messaging_main);
+        setContentView(R.layout.rent_house_activity_main);
 
         ARouter.getInstance().inject(this);
 
diff --git a/biz-module-renthouse/src/main/release/AndroidManifest.xml b/biz-module-renthouse/src/main/release/AndroidManifest.xml
@@ -7,7 +7,7 @@
         android:supportsRtl="true">
         <activity
             android:name="com.baronzhang.android.renthouse.MainActivity"
-            android:label="@string/im_label_home_page">
+            android:label="@string/rent_house_label_home_page">
             <intent-filter>
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
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
diff --git a/biz-module-renthouse/src/main/res/mipmap-xxhdpi/rent_house_ic_launcher.png b/biz-module-renthouse/src/main/res/mipmap-xxhdpi/rent_house_ic_launcher.png
diff --git a/biz-module-renthouse/src/main/res/mipmap-xxxhdpi/rent_house_ic_launcher.png b/biz-module-renthouse/src/main/res/mipmap-xxxhdpi/rent_house_ic_launcher.png
diff --git a/biz-module-renthouse/src/main/res/values/colors.xml b/biz-module-renthouse/src/main/res/values/colors.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="im_colorPrimary">#3F51B5</color>
-    <color name="im_colorPrimaryDark">#303F9F</color>
-    <color name="im_colorAccent">#FF4081</color>
+    <color name="rent_house_colorPrimary">#3F51B5</color>
+    <color name="rent_house_colorPrimaryDark">#303F9F</color>
+    <color name="rent_house_colorAccent">#FF4081</color>
 </resources>
diff --git a/biz-module-renthouse/src/main/res/values/dimens.xml b/biz-module-renthouse/src/main/res/values/dimens.xml
@@ -1,5 +1,5 @@
 <resources>
     <!-- Default screen margins, per the Android Design guidelines. -->
-    <dimen name="im_activity_horizontal_margin">16dp</dimen>
-    <dimen name="im_activity_vertical_margin">16dp</dimen>
+    <dimen name="rent_house_activity_horizontal_margin">16dp</dimen>
+    <dimen name="rent_house_activity_vertical_margin">16dp</dimen>
 </resources>
diff --git a/biz-module-renthouse/src/main/res/values/strings.xml b/biz-module-renthouse/src/main/res/values/strings.xml
@@ -1,4 +1,4 @@
 <resources>
-    <string name="im_app_name">即时通讯</string>
-    <string name="im_label_home_page">即时通讯首页</string>
+    <string name="rent_house_app_name">租房</string>
+    <string name="rent_house_label_home_page">租房首页</string>
 </resources>
diff --git a/biz-module-renthouse/src/main/res/values/styles.xml b/biz-module-renthouse/src/main/res/values/styles.xml
@@ -1,11 +1,11 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="IMAppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="RentHouseAppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
         <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/im_colorPrimary</item>
-        <item name="colorPrimaryDark">@color/im_colorPrimaryDark</item>
-        <item name="colorAccent">@color/im_colorAccent</item>
+        <item name="colorPrimary">@color/rent_house_colorPrimary</item>
+        <item name="colorPrimaryDark">@color/rent_house_colorPrimaryDark</item>
+        <item name="colorAccent">@color/rent_house_colorAccent</item>
     </style>
 
 </resources>
diff --git a/biz-module-secondhouse/src/main/java/com/baronzhang/android/secondhouse/MainActivity.java b/biz-module-secondhouse/src/main/java/com/baronzhang/android/secondhouse/MainActivity.java
@@ -23,7 +23,7 @@ public class MainActivity extends BaseActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.second_house_activity_second_house_main);
+        setContentView(R.layout.second_house_activity_main);
 
         ARouter.getInstance().inject(this);
 
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
diff --git a/biz-service-newhouse/src/main/java/com/baronzhang/android/newhouse/api/NewHouseProvider.java b/biz-service-newhouse/src/main/java/com/baronzhang/android/newhouse/api/NewHouseProvider.java
@@ -3,7 +3,6 @@
 import com.alibaba.android.arouter.facade.template.IProvider;
 import com.baronzhang.android.service.base.ResponseCallback;
 
-import rx.Observable;
 import rx.Subscription;
 
 /**
@@ -14,4 +13,4 @@ public interface NewHouseProvider extends IProvider {
     NewHouseData fetchNewHouseData();
 
     Subscription callNewHouseApi(ResponseCallback<NewHouseApiData> callback);
-}
+}
diff --git a/lib-data-center/src/main/java/com/baronzhang/android/data/http/ApiClient.java b/lib-data-center/src/main/java/com/baronzhang/android/data/http/ApiClient.java
@@ -52,6 +52,7 @@ public void init(ApiConfiguration configuration) {
             httpLoggingInterceptor.setLevel(HttpLoggingInterceptor.Level.BODY);
             builder.addInterceptor(httpLoggingInterceptor).addNetworkInterceptor(new StethoInterceptor());
         }
+        builder.addNetworkInterceptor(new SignInterceptor());
         this.client = builder.build();
     }
 
diff --git a/lib-data-center/src/main/java/com/baronzhang/android/data/http/SignInterceptor.java b/lib-data-center/src/main/java/com/baronzhang/android/data/http/SignInterceptor.java
@@ -0,0 +1,19 @@
+package com.baronzhang.android.data.http;
+
+import java.io.IOException;
+
+import okhttp3.Interceptor;
+import okhttp3.Response;
+
+/**
+ * 用于API签名的拦截器å
+ *
+ * @author baronzhang (baron[dot]zhanglei[at]gmail[dot]com)
+ */
+public class SignInterceptor implements Interceptor {
+
+    @Override
+    public Response intercept(Chain chain) throws IOException {
+        return null;
+    }
+}
diff --git a/lib-data-center/src/main/java/com/baronzhang/android/data/preferences/AppSettings.java b/lib-data-center/src/main/java/com/baronzhang/android/data/preferences/AppSettings.java
@@ -3,7 +3,7 @@
 /**
  * @author baronzhang (baron[dot]zhanglei[at]gmail[dot]com)
  */
-public enum WeatherSettings {
+public enum AppSettings {
 
     /*默认配置项*/
     SETTINGS_FIRST_USE("first_use", Boolean.TRUE),
@@ -13,7 +13,7 @@ public enum WeatherSettings {
     private final String mId;
     private final Object mDefaultValue;
 
-    WeatherSettings(String id, Object defaultValue) {
+    AppSettings(String id, Object defaultValue) {
         this.mId = id;
         this.mDefaultValue = defaultValue;
     }
@@ -26,9 +26,9 @@ public Object getDefaultValue() {
         return this.mDefaultValue;
     }
 
-    public static WeatherSettings fromId(String id) {
-        WeatherSettings[] values = values();
-        for (WeatherSettings value : values) {
+    public static AppSettings fromId(String id) {
+        AppSettings[] values = values();
+        for (AppSettings value : values) {
             if (value.mId.equals(id)) {
                 return value;
             }
diff --git a/lib-data-center/src/main/java/com/baronzhang/android/data/preferences/ConfigurationListener.java b/lib-data-center/src/main/java/com/baronzhang/android/data/preferences/ConfigurationListener.java
@@ -17,5 +17,5 @@
 
 public interface ConfigurationListener {
 
-    void onConfigurationChanged(WeatherSettings pref, Object newValue);
+    void onConfigurationChanged(AppSettings pref, Object newValue);
 }
diff --git a/lib-data-center/src/main/java/com/baronzhang/android/data/preferences/Preferences.java b/lib-data-center/src/main/java/com/baronzhang/android/data/preferences/Preferences.java
@@ -22,7 +22,7 @@ public final class Preferences {
 
     private static final String SETTINGS_FILENAME = "com.baronzhang.android.modularization";
 
-    private static final List<ConfigurationListener> CONFIGURATION_LISTENERS = Collections.synchronizedList(new ArrayList<ConfigurationListener>());
+    private static final List<ConfigurationListener> CONFIGURATION_LISTENERS = Collections.synchronizedList(new ArrayList<>());
 
     private Context context;
     private static volatile Preferences instance;
@@ -45,9 +45,9 @@ public static Preferences getInstance(Context context) {
     public void loadDefaults() {
         //设置SharedPreferences默认值
         try {
-            Map<WeatherSettings, Object> defaultPrefs = new HashMap<>();
-            WeatherSettings[] values = WeatherSettings.values();
-            for (WeatherSettings value : values) {
+            Map<AppSettings, Object> defaultPrefs = new HashMap<>();
+            AppSettings[] values = AppSettings.values();
+            for (AppSettings value : values) {
                 defaultPrefs.put(value, value.getDefaultValue());
             }
             savePreferences(defaultPrefs, true);
@@ -68,22 +68,22 @@ public SharedPreferences getSharedPreferences(Context context) {
         return context.getSharedPreferences(SETTINGS_FILENAME, Context.MODE_PRIVATE);
     }
 
-    public void savePreference(WeatherSettings pref, Object value) throws InvalidClassException {
-        Map<WeatherSettings, Object> prefs = new HashMap<>();
+    public void savePreference(AppSettings pref, Object value) throws InvalidClassException {
+        Map<AppSettings, Object> prefs = new HashMap<>();
         prefs.put(pref, value);
         savePreferences(prefs, false);
     }
 
-    public void savePreferences(Map<WeatherSettings, Object> prefs) throws InvalidClassException {
+    public void savePreferences(Map<AppSettings, Object> prefs) throws InvalidClassException {
         savePreferences(prefs, false);
     }
 
-    private void savePreferences(Map<WeatherSettings, Object> prefs, boolean noSaveIfExists) throws InvalidClassException {
+    private void savePreferences(Map<AppSettings, Object> prefs, boolean noSaveIfExists) throws InvalidClassException {
 
         SharedPreferences sp = getSharedPreferences(context);
         SharedPreferences.Editor editor = sp.edit();
 
-        for (WeatherSettings pref : prefs.keySet()) {
+        for (AppSettings pref : prefs.keySet()) {
 
             Object value = prefs.get(pref);
 
@@ -114,7 +114,7 @@ private void savePreferences(Map<WeatherSettings, Object> prefs, boolean noSaveI
         editor.apply();
 
         if (CONFIGURATION_LISTENERS != null && CONFIGURATION_LISTENERS.size() > 0) {
-            for (WeatherSettings pref : prefs.keySet()) {
+            for (AppSettings pref : prefs.keySet()) {
                 Object value = prefs.get(pref);
                 for (ConfigurationListener listener : CONFIGURATION_LISTENERS) {
                     listener.onConfigurationChanged(pref, value);
