修复闪存崩溃问题

raedev · raedev · commit fb8b72cd29cd · 2018-07-25T10:09:01.000+08:00
diff --git a/module-blog/src/main/java/com/rae/cnblogs/blog/fragment/BlogHomeFragment.java b/module-blog/src/main/java/com/rae/cnblogs/blog/fragment/BlogHomeFragment.java
@@ -221,4 +221,9 @@ private void clearFragments() {
         }
         fragmentTransaction.commit();
     }
+
+    @OnClick(R2.id.tv_search)
+    public void onSearchClick() {
+        AppRoute.routeToSearch(getContext());
+    }
 }
diff --git a/module-blog/src/main/res/layout/fm_blog_list.xml b/module-blog/src/main/res/layout/fm_blog_list.xml
@@ -3,7 +3,7 @@
     android:id="@+id/content"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/default_background"
+    android:background="@color/background_divider"
     android:orientation="vertical">
 
     <com.rae.cnblogs.widget.PlaceholderView
diff --git a/module-home/src/main/AndroidManifest.xml b/module-home/src/main/AndroidManifest.xml
@@ -9,11 +9,11 @@
         <activity
             android:name=".LauncherActivity"
             android:theme="@style/AppTheme.NoActionBar.FullScreen">
-               <intent-filter>
-                   <action android:name="android.intent.action.MAIN" />
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
 
-                   <category android:name="android.intent.category.LAUNCHER" />
-               </intent-filter>
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
         </activity>
 
 
@@ -33,5 +33,6 @@
             android:label="@string/feedback"
             android:launchMode="singleTop"
             android:windowSoftInputMode="stateVisible" />
+        <activity android:name=".search.SearchActivity" />
     </application>
 </manifest>
diff --git a/module-home/src/main/java/com/rae/cnblogs/home/search/SearchActivity.java b/module-home/src/main/java/com/rae/cnblogs/home/search/SearchActivity.java
@@ -0,0 +1,14 @@
+package com.rae.cnblogs.home.search;
+
+import com.alibaba.android.arouter.facade.annotation.Route;
+import com.rae.cnblogs.AppRoute;
+import com.rae.cnblogs.activity.SwipeBackBasicActivity;
+
+/**
+ * 搜索
+ * Created by rae on 2018/7/25.
+ * Copyright (c) https://github.com/raedev All rights reserved.
+ */
+@Route(path = AppRoute.PATH_SEARCH)
+public class SearchActivity extends SwipeBackBasicActivity {
+}
diff --git a/module-middleware/src/main/java/com/rae/cnblogs/AppRoute.java b/module-middleware/src/main/java/com/rae/cnblogs/AppRoute.java
@@ -111,7 +111,7 @@ public final class AppRoute {
     /**
      * 搜索
      */
-    public static final String PATH_SEARCH = "/blog/search";
+    public static final String PATH_SEARCH = "/home/search";
     /**
      * 博客评论
      */
diff --git a/module-moment/src/main/java/com/rae/cnblogs/moment/MomentMessageActivity.java b/module-moment/src/main/java/com/rae/cnblogs/moment/MomentMessageActivity.java
@@ -1,6 +1,5 @@
 package com.rae.cnblogs.moment;
 
-import android.annotation.SuppressLint;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 
@@ -20,14 +19,13 @@ public class MomentMessageActivity extends SwipeBackBasicActivity {
 
     private MomentMessageFragment mFragment;
 
-    @SuppressLint("InvalidR2Usage")
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_moment_message);
         mFragment = new MomentMessageFragment();
         getSupportFragmentManager().beginTransaction()
-                .add(R2.id.content, mFragment)
+                .add(R.id.content, mFragment)
                 .commitNow();
     }
 
diff --git a/module-moment/src/main/res/layout/fm_moment_home.xml b/module-moment/src/main/res/layout/fm_moment_home.xml
@@ -37,7 +37,9 @@
     <android.support.v7.widget.Toolbar
         android:id="@+id/tool_bar"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/action_bar_height"
+        android:layout_height="wrap_content"
+        android:paddingBottom="10dp"
+        android:paddingStart="12dp"
         android:paddingTop="10dp"
         app:contentInsetEnd="0dp"
         app:contentInsetStart="0dp"
diff --git a/module-moment/src/main/res/layout/item_moment_message.xml b/module-moment/src/main/res/layout/item_moment_message.xml
@@ -61,11 +61,10 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@+id/tv_blog_summary"
-        android:layout_marginTop="2dp"
+        android:layout_marginTop="8dp"
         android:layout_toRightOf="@+id/img_blog_avatar"
         android:background="@drawable/bg_moment_reference"
         android:gravity="center_vertical"
-        android:padding="5dp"
         android:text="@string/cancel"
         android:textColor="@color/ph2"
         android:textSize="12sp" />
diff --git a/module-resource/src/main/res/drawable-xhdpi/bg_moment_reference.9.png b/module-resource/src/main/res/drawable-xhdpi/bg_moment_reference.9.png
diff --git a/module-widget/src/main/res/layout/item_list_loading.xml b/module-widget/src/main/res/layout/item_list_loading.xml
@@ -20,30 +20,30 @@
         <com.makeramen.roundedimageview.RoundedImageView
             android:layout_width="32dp"
             android:layout_height="32dp"
-            android:src="@color/default_background"
+            android:src="@color/background_divider"
             app:riv_corner_radius="32dp" />
 
 
         <View
             android:layout_width="100dp"
             android:layout_height="4dp"
             android:layout_marginLeft="9dp"
-            android:background="@color/default_background" />
+            android:background="@color/background_divider" />
 
     </LinearLayout>
 
     <View
         android:layout_width="160dp"
         android:layout_height="4dp"
         android:layout_marginBottom="11dp"
-        android:background="@color/default_background" />
+        android:background="@color/background_divider" />
 
 
     <View
         android:layout_width="match_parent"
         android:layout_height="96dp"
         android:layout_marginBottom="6dp"
-        android:background="@color/default_background" />
+        android:background="@color/background_divider" />
 
 
     <RelativeLayout

Original file line number	Diff line number	Diff line change
`@@ -221,4 +221,9 @@ private void clearFragments() {`
`221`	`221`	`}`
`222`	`222`	`fragmentTransaction.commit();`
`223`	`223`	`}`
	`224`	`+`
	`225`	`+ @OnClick(R2.id.tv_search)`
	`226`	`+ public void onSearchClick() {`
	`227`	`+ AppRoute.routeToSearch(getContext());`
	`228`	`+ }`
`224`	`229`	`}`