Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into gitlab_developer

WeiChat/src/main/java/com/xzjmyk/pm/activity/db/SQLiteRawUtil.java

@@ -15,7 +15,6 @@ import java.util.List;
  */
 public class SQLiteRawUtil {
 	public static final String CHAT_MESSAGE_TABLE_PREFIX = "msg_";
-
 	public static String getCreateChatMessageTableSql(String tableName) {
 		String sql = "CREATE TABLE IF NOT EXISTS "
 				+ tableName
@@ -64,7 +63,7 @@ public class SQLiteRawUtil {
 	 * 获取当前用户的消息表
 	 * 
 	 * @param db
-	 * @param tableName
+	 * @param
 	 * @return
 	 */
 	public static List<String> getUserChatMessageTables(SQLiteDatabase db, String ownerId) {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/SubscriptionActivity.java

@@ -230,7 +230,7 @@ public class SubscriptionActivity extends BaseActivity {
         if (SubscriptionMessages == null || SubscriptionMessages.size() <= 0) {
             ToastMessage("没有更多内容");
             listView.onRefreshComplete();
-            View emptyView = LayoutInflater.from(mContext).inflate(R.layout.layout_list_empty_view, null);
+            View emptyView = LayoutInflater.from(mContext).inflate(R.layout.subscription_empty, null);
             listView.setEmptyView(emptyView);
             if (adapter != null)
                 adapter.notifyDataSetChanged();

WeiChat/src/main/res/layout/subscription_empty.xml

@@ -0,0 +1,19 @@
+<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"
+    android:orientation="horizontal">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal|top"
+        android:drawableBottom="@drawable/icon_not_found"
+        android:drawablePadding="5dp"
+        android:gravity="center"
+        android:padding="10dp"
+        android:text="今天暂时没有数据 \n向上拉取前一天数据"
+        android:textColor="@color/black"
+        android:textSize="@dimen/SmallerTextSize" />
+
+</FrameLayout>