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

# Conflicts:
#	WeiChat/version.properties

app_core/common/src/main/java/com/common/system/ActivityUtils.java

@@ -21,21 +21,21 @@ import java.util.List;
  */
 public class ActivityUtils {
 
-    /**
-     * 判断程序是否打开
-     * @return
-     */
-    public static boolean isRunningInForeground() {
-        boolean isActivityFound = false;
-        ActivityManager activityManager = (ActivityManager) MyApplication.getInstance().getSystemService(Context.ACTIVITY_SERVICE);
-        List<ActivityManager.RunningTaskInfo> services = activityManager
-                .getRunningTasks(1);
-        if (services.get(0).topActivity.getPackageName().toString()
-                .equalsIgnoreCase(MyApplication.getInstance().getPackageName().toString())) {
-            isActivityFound = true;
+        /**
+         * 判断程序是否打开
+         * @return
+         */
+        public static boolean isRunningInForeground() {
+            boolean isActivityFound = false;
+            ActivityManager activityManager = (ActivityManager) MyApplication.getInstance().getSystemService(Context.ACTIVITY_SERVICE);
+            List<ActivityManager.RunningTaskInfo> services = activityManager
+                    .getRunningTasks(1);
+            if (services.get(0).topActivity.getPackageName().toString()
+                    .equalsIgnoreCase(MyApplication.getInstance().getPackageName().toString())) {
+                isActivityFound = true;
+            }
+            return isActivityFound;
         }
-        return isActivityFound;
-    }
 
     private ActivityUtils() {
         throw new UnsupportedOperationException("u can't instantiate me...");

app_modular/appbooking/src/main/java/com/modular/booking/adapter/ItemDishCategoryListAdapter.java

@@ -0,0 +1,10 @@
+package com.modular.booking.adapter;
+
+/**
+ * Created by Arison on 2018/1/24.
+ */
+
+public class ItemDishCategoryListAdapter {
+    
+    
+}

app_modular/appbooking/src/main/java/com/modular/booking/adapter/ItemDishPinnedListAdapter.java

@@ -0,0 +1,11 @@
+package com.modular.booking.adapter;
+
+/**
+ * Created by Arison on 2018/1/24.
+ */
+
+public class ItemDishPinnedListAdapter {
+    
+    
+    
+}

app_modular/appbooking/src/main/res/layout/item_dish_catagory_list.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent" 
+    android:layout_height="match_parent">
+    <TextView
+        android:id="@+id/tv_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginTop="@dimen/dp_4"
+        android:layout_marginBottom="@dimen/dp_4"
+        android:maxLines="2"
+        android:text="热销榜"
+        android:textSize="@dimen/sp_14"
+        android:textColor="#9e9e9e" />
+</RelativeLayout>