Browse Source

完成个人账号时候的服务预约首页显示

Bitliker 8 years ago
parent
commit
e5dd30e4d0
20 changed files with 750 additions and 76 deletions
  1. 1 0
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java
  2. 108 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/MessageFragment.java
  3. 47 43
      WeiChat/src/main/res/layout/new_message_header.xml
  4. 34 30
      app_core/common/src/main/java/com/common/system/PermissionUtil.java
  5. 10 0
      app_core/common/src/main/java/com/core/app/Constants.java
  6. 2 2
      app_modular/appmessages/build.gradle
  7. BIN
      app_modular/appmessages/src/main/res/drawable-xhdpi/icon_message_food.png
  8. BIN
      app_modular/appmessages/src/main/res/drawable-xhdpi/icon_message_hair.png
  9. BIN
      app_modular/appmessages/src/main/res/drawable-xhdpi/icon_message_hospital.png
  10. BIN
      app_modular/appmessages/src/main/res/drawable-xhdpi/icon_message_huisuo.png
  11. BIN
      app_modular/appmessages/src/main/res/drawable-xhdpi/icon_message_ktv.png
  12. BIN
      app_modular/appmessages/src/main/res/drawable-xhdpi/icon_message_sport.png
  13. BIN
      app_modular/appmessages/src/main/res/drawable-xxhdpi/icon_message_food.png
  14. BIN
      app_modular/appmessages/src/main/res/drawable-xxhdpi/icon_message_hair.png
  15. BIN
      app_modular/appmessages/src/main/res/drawable-xxhdpi/icon_message_hospital.png
  16. BIN
      app_modular/appmessages/src/main/res/drawable-xxhdpi/icon_message_huisuo.png
  17. BIN
      app_modular/appmessages/src/main/res/drawable-xxhdpi/icon_message_ktv.png
  18. BIN
      app_modular/appmessages/src/main/res/drawable-xxhdpi/icon_message_sport.png
  19. 544 0
      app_modular/appmessages/src/main/res/layout/personal_message_header.xml
  20. 4 0
      app_modular/apputils/src/main/res/values/ids.xml

+ 1 - 0
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java

@@ -231,6 +231,7 @@ public class MainActivity extends BaseActivity implements ImStatusListener, NetW
 
 
 	private void initPermission() {
+		LogUtil.i("initPermission");
 		String[] permissions = {Manifest.permission.ACCESS_FINE_LOCATION
 //                ,Manifest.permission.READ_EXTERNAL_STORAGE,
 //                Manifest.permission.CAMERA,

+ 108 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/MessageFragment.java

@@ -16,11 +16,13 @@ import android.widget.PopupWindow;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import com.alibaba.fastjson.JSON;
 import com.common.LogUtil;
 import com.common.data.DateFormatUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.common.preferences.PreferenceUtils;
+import com.common.preferences.RedSpUtil;
 import com.common.system.DisplayUtil;
 import com.core.api.wxapi.ApiPlatform;
 import com.core.api.wxapi.ApiUtils;
@@ -31,6 +33,7 @@ import com.core.model.Friend;
 import com.core.utils.CommonUtil;
 import com.core.utils.sortlist.BaseSortModel;
 import com.core.widget.DrawableCenterTextView;
+import com.core.widget.RedView;
 import com.core.widget.VoiceSearchView;
 import com.core.widget.listener.EditChangeListener;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
@@ -44,6 +47,8 @@ import com.modular.appmessages.activity.UUSportActivity;
 import com.modular.appmessages.adapter.MessageAdapter;
 import com.modular.appmessages.presenter.MessagePresenter;
 import com.modular.appmessages.presenter.imp.IMessageView;
+import com.modular.booking.activity.services.BServiceListActivity;
+import com.modular.booking.model.SBMenuModel;
 import com.uas.appme.settings.Constant.Constant;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.platform.task.TaskActivity;
@@ -97,6 +102,7 @@ public class MessageFragment extends EasyFragment implements IMessageView, View.
 	private TextView tv_book_num;
 	private MessagePresenter.UnReaderListener unReaderListener;
 	private RelativeLayout uustep_rl;
+	private RedView foodRv, hairRv, ktvRv, sportRv, hospitalRv, clubRv;//红点
 
 
 	@Override
@@ -238,6 +244,9 @@ public class MessageFragment extends EasyFragment implements IMessageView, View.
 			view.findViewById(R.id.schedule_rl).setVisibility(View.GONE);//审批流
 			view.findViewById(R.id.waitting_work_rl).setVisibility(View.GONE);//待办工作
 			view.findViewById(R.id.subscribe_rl).setVisibility(View.GONE);//我的订阅
+			setPersonalShow(view);
+		} else {
+
 		}
 
 		if (PreferenceUtils.getInt(MyApplication.getInstance(), Constant.UU_STEP) == 1
@@ -248,6 +257,87 @@ public class MessageFragment extends EasyFragment implements IMessageView, View.
 		return view;
 	}
 
+	private void setPersonalShow(View view) {
+		view.findViewById(R.id.personalLL).setVisibility(View.VISIBLE);
+		foodRv = (RedView) view.findViewById(R.id.foodRv);
+		hairRv = (RedView) view.findViewById(R.id.hairRv);
+		ktvRv = (RedView) view.findViewById(R.id.ktvRv);
+		sportRv = (RedView) view.findViewById(R.id.sportRv);
+		clubRv = (RedView) view.findViewById(R.id.clubRv);
+		hospitalRv = (RedView) view.findViewById(R.id.hospitalRv);
+
+		SBMenuModel menuModel = new SBMenuModel();
+		menuModel.setUrl(Constants.MESSAGE_FOOD);
+		menuModel.setCode("10003");
+		menuModel.setIcon(R.drawable.icon_food);
+		menuModel.setDesc("美味齐全");
+		menuModel.setTitle("餐饮");
+		view.findViewById(R.id.foodRl).setTag(menuModel);
+		view.findViewById(R.id.foodRl).setTag(R.id.tag_key, foodRv);
+		view.findViewById(R.id.foodRl).setOnClickListener(this);
+
+		menuModel = new SBMenuModel();
+		menuModel.setUrl(Constants.MESSAGE_HAIR);
+		menuModel.setCode("10004");
+		menuModel.setIcon(R.drawable.icon_hair);
+		menuModel.setDesc("时尚潮流");
+		menuModel.setTitle("美容美发");
+		view.findViewById(R.id.hairRl).setTag(menuModel);
+		view.findViewById(R.id.hairRl).setTag(R.id.tag_key, hairRv);
+		view.findViewById(R.id.hairRl).setOnClickListener(this);
+
+		menuModel = new SBMenuModel();
+		menuModel.setUrl(Constants.MESSAGE_KTV);
+		menuModel.setCode("10006");
+		menuModel.setIcon(R.drawable.icon_ktv);
+		menuModel.setDesc("音乐节");
+		menuModel.setTitle("KTV");
+		view.findViewById(R.id.ktvRl).setTag(R.id.tag_key, ktvRv);
+		view.findViewById(R.id.ktvRl).setTag(menuModel);
+		view.findViewById(R.id.ktvRl).setOnClickListener(this);
+
+		menuModel = new SBMenuModel();
+		menuModel.setUrl(Constants.MESSAGE_SPORT);
+		menuModel.setCode("10002");
+		menuModel.setIcon(R.drawable.icon_sport);
+		menuModel.setDesc("hi起来");
+		menuModel.setTitle("运动健身");
+		view.findViewById(R.id.sportRl).setTag(menuModel);
+		view.findViewById(R.id.sportRl).setTag(R.id.tag_key, sportRv);
+		view.findViewById(R.id.sportRl).setOnClickListener(this);
+
+		menuModel = new SBMenuModel();
+		menuModel.setUrl(Constants.MESSAGE_CLUB);
+		menuModel.setCode("10005");
+		menuModel.setIcon(R.drawable.icon_club);
+		menuModel.setDesc("预约有优惠");
+		menuModel.setTitle("会所");
+		view.findViewById(R.id.clubRl).setTag(menuModel);
+		view.findViewById(R.id.clubRl).setTag(R.id.tag_key, clubRv);
+		view.findViewById(R.id.clubRl).setOnClickListener(this);
+
+		menuModel = new SBMenuModel();
+		menuModel.setUrl(Constants.MESSAGE_HOSPITAL);
+		menuModel.setCode("10001");
+		menuModel.setIcon(R.drawable.icon_hospital);
+		menuModel.setDesc("您的健康助手");
+		menuModel.setTitle("医院挂号");
+		view.findViewById(R.id.hospitalRl).setTag(menuModel);
+		view.findViewById(R.id.hospitalRl).setTag(R.id.tag_key, hospitalRv);
+		view.findViewById(R.id.hospitalRl).setOnClickListener(this);
+		showRv(Constants.MESSAGE_FOOD, foodRv);
+		showRv(Constants.MESSAGE_HAIR, hairRv);
+		showRv(Constants.MESSAGE_KTV, ktvRv);
+		showRv(Constants.MESSAGE_SPORT, sportRv);
+		showRv(Constants.MESSAGE_CLUB, clubRv);
+		showRv(Constants.MESSAGE_HOSPITAL, hospitalRv);
+	}
+
+	private void showRv(String key, Object foodRv) {
+		if (foodRv != null && !StringUtil.isEmpty(key) && foodRv instanceof View) {
+			((View) foodRv).setVisibility(RedSpUtil.api().getBoolean(key, false) ? View.GONE : View.VISIBLE);
+		}
+	}
 
 	private void showPopupWindow() {
 		if (setWindow == null) initPopupWindow();
@@ -340,7 +430,24 @@ public class MessageFragment extends EasyFragment implements IMessageView, View.
 				startActivity(new Intent(mContext, UUSportActivity.class));
 				break;
 		}
-
+		int id = v.getId();
+		if (id == R.id.foodRl || id == R.id.hairRl || id == R.id.ktvRl || id == R.id.sportRl || id == R.id.clubRl || id == R.id.hospitalRl) {
+			SBMenuModel sbMenuModel = (SBMenuModel) v.getTag();
+			if (sbMenuModel == null) {
+				LogUtil.i("sbMenuModel == null");
+			} else {
+				LogUtil.i("SBMenuModel=" + JSON.toJSONString(sbMenuModel));
+				String key = sbMenuModel.getUrl();
+				if (!StringUtil.isEmpty(key)) {
+					RedSpUtil.api().put(key, true);
+					showRv(sbMenuModel.getUrl(), v.getTag(R.id.tag_key));
+				}
+				sbMenuModel.setUrl("");
+				Intent intent = new Intent(mContext, BServiceListActivity.class);
+				intent.putExtra("SBMenuModel", sbMenuModel);
+				startActivity(intent);
+			}
+		}
 	}
 
 

+ 47 - 43
WeiChat/src/main/res/layout/new_message_header.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/Transpant"
-    android:orientation="vertical">
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:background="@color/Transpant"
+              android:orientation="vertical">
 
     <RelativeLayout
         android:id="@+id/schedule_rl"
@@ -29,7 +29,7 @@
                 android:background="@color/transparent"
                 android:contentDescription="@string/app_name"
                 android:padding="1dp"
-                android:src="@drawable/home_image_01_u" />
+                android:src="@drawable/home_image_01_u"/>
 
             <TextView
                 android:id="@+id/schedule_num_tv"
@@ -41,7 +41,7 @@
                 android:text="999"
                 android:textColor="@android:color/white"
                 android:textSize="10.0dp"
-                android:visibility="gone" />
+                android:visibility="gone"/>
         </FrameLayout>
 
         <RelativeLayout
@@ -61,7 +61,7 @@
                 android:ellipsize="end"
                 android:text="@string/msg_approval"
                 android:textColor="@color/text_main"
-                android:textSize="16sp" />
+                android:textSize="16sp"/>
 
             <TextView
                 android:id="@+id/schedule_time_tv"
@@ -70,7 +70,7 @@
                 android:layout_alignParentRight="true"
                 android:ellipsize="end"
                 android:textColor="@color/text_hine"
-                android:textSize="14sp" />
+                android:textSize="14sp"/>
 
             <TextView
                 android:id="@+id/schedule_content_tv"
@@ -81,7 +81,7 @@
                 android:ellipsize="end"
                 android:lines="1"
                 android:textColor="@color/text_hine"
-                android:textSize="14sp" />
+                android:textSize="14sp"/>
         </RelativeLayout>
 
     </RelativeLayout>
@@ -89,7 +89,7 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="@dimen/line"
-        android:background="@color/item_line" />
+        android:background="@color/item_line"/>
 
     <RelativeLayout
         android:id="@+id/waitting_work_rl"
@@ -115,7 +115,7 @@
                 android:background="@color/transparent"
                 android:contentDescription="@string/app_name"
                 android:padding="1dp"
-                android:src="@drawable/daibangongzuo" />
+                android:src="@drawable/daibangongzuo"/>
 
             <TextView
                 android:id="@+id/waitting_work_num_tv"
@@ -127,7 +127,7 @@
                 android:text="999"
                 android:textColor="@android:color/white"
                 android:textSize="10.0dp"
-                android:visibility="gone" />
+                android:visibility="gone"/>
         </FrameLayout>
 
         <RelativeLayout
@@ -147,7 +147,7 @@
                 android:ellipsize="end"
                 android:text="@string/msg_work"
                 android:textColor="@color/text_main"
-                android:textSize="16sp" />
+                android:textSize="16sp"/>
 
             <TextView
                 android:id="@+id/waitting_work_time_tv"
@@ -156,7 +156,7 @@
                 android:layout_alignParentRight="true"
                 android:ellipsize="end"
                 android:textColor="@color/text_hine"
-                android:textSize="14sp" />
+                android:textSize="14sp"/>
 
             <TextView
                 android:id="@+id/waitting_work_content_tv"
@@ -168,21 +168,22 @@
                 android:ellipsize="end"
                 android:lines="1"
                 android:textColor="@color/text_hine"
-                android:textSize="14sp" />
+                android:textSize="14sp"/>
         </RelativeLayout>
 
     </RelativeLayout>
 
-   <!-- <View
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/line"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
-        android:background="@color/transparent" />-->
+    <!-- <View
+         android:layout_width="match_parent"
+         android:layout_height="@dimen/line"
+         android:layout_marginLeft="10dp"
+         android:layout_marginRight="10dp"
+         android:background="@color/transparent" />-->
     <View
         android:layout_width="match_parent"
         android:layout_height="@dimen/line"
-        android:background="@color/item_line" />
+        android:background="@color/item_line"/>
+
     <RelativeLayout
         android:id="@+id/subscribe_rl"
         android:layout_width="match_parent"
@@ -206,7 +207,7 @@
                 android:background="@color/transparent"
                 android:contentDescription="@string/app_name"
                 android:padding="1dp"
-                android:src="@drawable/tingyue" />
+                android:src="@drawable/tingyue"/>
 
             <TextView
                 android:id="@+id/subscribe_num_tv"
@@ -217,7 +218,7 @@
                 android:gravity="center"
                 android:textColor="@android:color/white"
                 android:textSize="10.0dp"
-                android:visibility="gone" />
+                android:visibility="gone"/>
         </FrameLayout>
 
         <RelativeLayout
@@ -236,7 +237,7 @@
                 android:ellipsize="end"
                 android:text="@string/msg_subscribe"
                 android:textColor="@color/text_main"
-                android:textSize="16sp" />
+                android:textSize="16sp"/>
 
             <TextView
                 android:id="@+id/tv_dingyue_desc"
@@ -245,7 +246,7 @@
                 android:layout_below="@+id/subscribe_time_tv"
                 android:layout_toLeftOf="@+id/tv_dingYue_num"
                 android:layout_toStartOf="@+id/tv_dingYue_num"
-                android:text="@string/msg_subscribe_data" />
+                android:text="@string/msg_subscribe_data"/>
 
             <TextView
                 android:id="@+id/tv_dingYue_num"
@@ -257,7 +258,7 @@
                 android:gravity="center"
                 android:text=""
                 android:textColor="@android:color/white"
-                android:textSize="10.0dp" />
+                android:textSize="10.0dp"/>
 
             <TextView
                 android:id="@+id/subscribe_time_tv"
@@ -267,7 +268,7 @@
                 android:ellipsize="end"
                 android:textColor="@color/text_hine"
                 android:textSize="14sp"
-                android:visibility="gone" />
+                android:visibility="gone"/>
 
             <TextView
                 android:id="@+id/subscribe_content_tv"
@@ -278,7 +279,7 @@
                 android:ellipsize="end"
                 android:lines="1"
                 android:textColor="@color/text_hine"
-                android:textSize="14sp" />
+                android:textSize="14sp"/>
         </RelativeLayout>
 
     </RelativeLayout>
@@ -286,7 +287,7 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="@dimen/line"
-        android:background="@color/item_line" />
+        android:background="@color/item_line"/>
 
 
     <RelativeLayout
@@ -313,7 +314,7 @@
                 android:background="@color/transparent"
                 android:contentDescription="@string/app_name"
                 android:padding="1dp"
-                android:src="@drawable/icon_yuyue3" />
+                android:src="@drawable/icon_yuyue3"/>
 
             <TextView
                 android:id="@+id/booking_num_tv"
@@ -324,7 +325,7 @@
                 android:gravity="center"
                 android:textColor="@android:color/white"
                 android:textSize="10.0dp"
-                android:visibility="gone" />
+                android:visibility="gone"/>
         </FrameLayout>
 
         <RelativeLayout
@@ -343,7 +344,7 @@
                 android:ellipsize="end"
                 android:text="@string/booking_menu"
                 android:textColor="@color/text_main"
-                android:textSize="16sp" />
+                android:textSize="16sp"/>
 
             <TextView
                 android:id="@+id/tv_book_desc"
@@ -353,7 +354,7 @@
                 android:layout_toLeftOf="@+id/tv_book_num"
                 android:layout_toStartOf="@+id/tv_book_num"
 
-                android:text="" />
+                android:text=""/>
 
             <TextView
                 android:id="@+id/tv_book_num"
@@ -366,7 +367,7 @@
                 android:text=""
 
                 android:textColor="@android:color/white"
-                android:textSize="10.0dp" />
+                android:textSize="10.0dp"/>
 
             <TextView
                 android:id="@+id/book_time_tv"
@@ -376,7 +377,7 @@
                 android:ellipsize="end"
                 android:textColor="@color/text_hine"
                 android:textSize="14sp"
-                android:visibility="gone" />
+                android:visibility="gone"/>
 
             <TextView
                 android:id="@+id/book_content_tv"
@@ -387,7 +388,7 @@
                 android:ellipsize="end"
                 android:lines="1"
                 android:textColor="@color/text_hine"
-                android:textSize="14sp" />
+                android:textSize="14sp"/>
         </RelativeLayout>
 
     </RelativeLayout>
@@ -398,6 +399,9 @@
         android:background="@color/item_line"
         android:visibility="visible"/>
 
+    <include
+        layout="@layout/personal_message_header"/>
+
     <RelativeLayout
         android:id="@+id/uustep_rl"
         android:layout_width="match_parent"
@@ -423,7 +427,7 @@
                 android:background="@color/transparent"
                 android:contentDescription="@string/app_name"
                 android:padding="1dp"
-                android:src="@drawable/uu_run" />
+                android:src="@drawable/uu_run"/>
 
             <TextView
                 android:id="@+id/uustep_num_tv"
@@ -432,9 +436,9 @@
                 android:layout_gravity="top|right"
                 android:background="@drawable/tab_unread_bg"
                 android:gravity="center"
-                android:visibility="gone"
                 android:textColor="@android:color/white"
                 android:textSize="10.0dp"
+                android:visibility="gone"
                 />
         </FrameLayout>
 
@@ -454,7 +458,7 @@
                 android:ellipsize="end"
                 android:text="@string/set_sport"
                 android:textColor="@color/text_main"
-                android:textSize="16sp" />
+                android:textSize="16sp"/>
 
             <TextView
                 android:id="@+id/tv_uustep_num"
@@ -467,7 +471,7 @@
                 android:text=""
 
                 android:textColor="@android:color/white"
-                android:textSize="10.0dp" />
+                android:textSize="10.0dp"/>
 
             <TextView
                 android:id="@+id/uustep_time_tv"
@@ -477,7 +481,7 @@
                 android:ellipsize="end"
                 android:textColor="@color/text_hine"
                 android:textSize="14sp"
-                android:visibility="gone" />
+                android:visibility="gone"/>
 
             <TextView
                 android:id="@+id/uustep_content_tv"
@@ -488,7 +492,7 @@
                 android:ellipsize="end"
                 android:lines="1"
                 android:textColor="@color/text_hine"
-                android:textSize="14sp" />
+                android:textSize="14sp"/>
         </RelativeLayout>
 
     </RelativeLayout>

+ 34 - 30
app_core/common/src/main/java/com/common/system/PermissionUtil.java

@@ -7,6 +7,8 @@ import android.os.Build;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.ContextCompat;
 
+import com.common.LogUtil;
+
 /**
  * android6.0以上权限控制
  * 使用:
@@ -18,34 +20,36 @@ import android.support.v4.content.ContextCompat;
  * permission.RECORD_AUDIO//录音权限
  */
 public class PermissionUtil {
-    public static final int DEFAULT_REQUEST = 0x31;
-
-
-    // 判断权限集合
-    public static boolean lacksPermissions(Context context, String... permissions) {
-        if (Build.VERSION.SDK_INT >= 23) {
-            for (String permission : permissions) {
-                if (lacksPermission(context, permission)) {
-                    return true;
-                }
-            }
-        } else {
-            PackageManager pm = context.getPackageManager();
-            for (String permission : permissions)
-                if (pm.checkPermission(permission, context.getPackageName()) == PackageManager.PERMISSION_GRANTED)
-                    return true;
-        }
-        return false;
-    }
-
-    // 判断是否缺少权限
-    private static boolean lacksPermission(Context context, String permission) {
-        return ContextCompat.checkSelfPermission(context, permission) ==
-                PackageManager.PERMISSION_DENIED;
-    }
-
-
-    public static void requestPermission(Activity ct, int requestCode, String... permissions) {
-        ActivityCompat.requestPermissions(ct, permissions, requestCode);
-    }
+	public static final int DEFAULT_REQUEST = 0x31;
+
+
+	// 判断权限集合
+	public static boolean lacksPermissions(Context context, String... permissions) {
+		if (Build.VERSION.SDK_INT >= 23) {
+			for (String permission : permissions) {
+				if (lacksPermission(context, permission)) {
+					return true;
+				}
+			}
+		} else {
+			PackageManager pm = context.getPackageManager();
+			for (String permission : permissions)
+				if (pm.checkPermission(permission, context.getPackageName()) == PackageManager.PERMISSION_GRANTED)
+					return true;
+		}
+		return false;
+	}
+
+	// 判断是否缺少权限
+	private static boolean lacksPermission(Context context, String permission) {
+		int status = ContextCompat.checkSelfPermission(context, permission);
+		LogUtil.i("permission="+permission);
+		LogUtil.i("status="+status);
+		return status == PackageManager.PERMISSION_DENIED;
+	}
+
+
+	public static void requestPermission(Activity ct, int requestCode, String... permissions) {
+		ActivityCompat.requestPermissions(ct, permissions, requestCode);
+	}
 }

+ 10 - 0
app_core/common/src/main/java/com/core/app/Constants.java

@@ -328,6 +328,16 @@ public class Constants {
 	public final static String SET_BOOKING_TIME = "set_booking_time";
 	public final static String SET_BOOKING = "set_booking";
 	public final static String SET_CALL = "set_call";
+	
+	public final static String MESSAGE_FOOD = "message_food";
+	public final static String MESSAGE_HAIR = "message_hair";
+	public final static String MESSAGE_KTV = "message_ktv";
+	public final static String MESSAGE_SPORT = "message_sport";
+	public final static String MESSAGE_CLUB = "message_club";
+	public final static String MESSAGE_HOSPITAL = "message_hospital";
+	
+	
+	
 
 	public final static String NEW_FUNCTION_NOTICE = "NEWFUNCTIONNOTICE";
 	public final static String NEW_EXPENSE_REIMBURSEMENT_NOTICE = "NEWEXPENSEREIMBURSEMENTNOTICE";

+ 2 - 2
app_modular/appmessages/build.gradle

@@ -24,8 +24,8 @@ dependencies {
     testCompile deps.junit
     compile deps.appcompatV7
     compile deps.recyclerviewV7
-    compile project(':common')
-    compile project(':network')
+    compile project(':apputils')
     compile project(':appworks')
+    compile project(':appbooking')
 
 }

BIN
app_modular/appmessages/src/main/res/drawable-xhdpi/icon_message_food.png


BIN
app_modular/appmessages/src/main/res/drawable-xhdpi/icon_message_hair.png


BIN
app_modular/appmessages/src/main/res/drawable-xhdpi/icon_message_hospital.png


BIN
app_modular/appmessages/src/main/res/drawable-xhdpi/icon_message_huisuo.png


BIN
app_modular/appmessages/src/main/res/drawable-xhdpi/icon_message_ktv.png


BIN
app_modular/appmessages/src/main/res/drawable-xhdpi/icon_message_sport.png


BIN
app_modular/appmessages/src/main/res/drawable-xxhdpi/icon_message_food.png


BIN
app_modular/appmessages/src/main/res/drawable-xxhdpi/icon_message_hair.png


BIN
app_modular/appmessages/src/main/res/drawable-xxhdpi/icon_message_hospital.png


BIN
app_modular/appmessages/src/main/res/drawable-xxhdpi/icon_message_huisuo.png


BIN
app_modular/appmessages/src/main/res/drawable-xxhdpi/icon_message_ktv.png


BIN
app_modular/appmessages/src/main/res/drawable-xxhdpi/icon_message_sport.png


+ 544 - 0
app_modular/appmessages/src/main/res/layout/personal_message_header.xml

@@ -0,0 +1,544 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+       xmlns:app="http://schemas.android.com/apk/res-auto"
+       android:id="@+id/personalLL"
+       android:layout_width="match_parent"
+       android:visibility="gone"
+       android:layout_height="match_parent"
+       android:orientation="vertical">
+
+    <RelativeLayout
+        android:id="@+id/foodRl"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/item_height"
+        android:background="@drawable/selector_me_menu_item_bg"
+        android:descendantFocusability="blocksDescendants"
+        android:minHeight="@dimen/item_height"
+        android:paddingLeft="15dp"
+        android:paddingRight="15dp">
+
+        <FrameLayout
+            android:id="@+id/foodFl"
+            android:layout_width="57dp"
+            android:layout_height="65dp"
+            android:layout_centerVertical="true">
+
+            <ImageView
+                android:id="@+id/foodImg"
+                android:layout_width="@dimen/item_img_height"
+                android:layout_height="@dimen/item_img_width"
+                android:layout_gravity="center_vertical"
+                android:background="@color/transparent"
+                android:contentDescription="@string/app_name"
+                android:padding="1dp"
+                android:src="@drawable/icon_message_food"/>
+
+            <TextView
+                android:id="@+id/foodNumTv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="top|right"
+                android:background="@drawable/tab_unread_bg"
+                android:gravity="center"
+                android:text="999"
+                android:textColor="@android:color/white"
+                android:textSize="10.0dp"
+                android:visibility="gone"/>
+        </FrameLayout>
+
+        <RelativeLayout
+            android:id="@+id/foodContactRl"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="3dp"
+            android:layout_toRightOf="@id/foodFl"
+            android:gravity="center_vertical">
+
+            <com.core.widget.RedView
+                android:id="@+id/foodRv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="8dp"
+                app:text=""/>
+
+            <TextView
+                android:id="@+id/foodTv"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_toLeftOf="@+id/schedule_time_tv"
+                android:ellipsize="end"
+                android:lines="1"
+                android:text="餐饮"
+                android:textColor="@color/text_main"
+                android:textSize="16sp"/>
+
+
+            <TextView
+                android:id="@+id/foodSubTv"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/foodTv"
+                android:layout_marginTop="8dp"
+                android:layout_toLeftOf="@+id/schedule_time_tv"
+                android:ellipsize="end"
+                android:lines="1"
+                android:text="美味齐全"
+                android:textColor="@color/text_hine"
+                android:textSize="14sp"/>
+        </RelativeLayout>
+
+    </RelativeLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/line"
+        android:background="@color/item_line"/>
+
+    <RelativeLayout
+        android:id="@+id/hairRl"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/item_height"
+        android:background="@drawable/selector_me_menu_item_bg"
+        android:descendantFocusability="blocksDescendants"
+        android:minHeight="@dimen/item_height"
+        android:paddingLeft="15dp"
+        android:paddingRight="15dp">
+
+        <FrameLayout
+            android:id="@+id/hairFl"
+            android:layout_width="57dp"
+            android:layout_height="65dp"
+            android:layout_centerVertical="true">
+
+            <ImageView
+                android:id="@+id/hairImg"
+                android:layout_width="@dimen/item_img_height"
+                android:layout_height="@dimen/item_img_width"
+                android:layout_gravity="center_vertical"
+                android:background="@color/transparent"
+                android:contentDescription="@string/app_name"
+                android:padding="1dp"
+                android:src="@drawable/icon_message_hair"/>
+
+            <TextView
+                android:id="@+id/hairNumTv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="top|right"
+                android:background="@drawable/tab_unread_bg"
+                android:gravity="center"
+                android:text="999"
+                android:textColor="@android:color/white"
+                android:textSize="10.0dp"
+                android:visibility="gone"/>
+        </FrameLayout>
+
+        <RelativeLayout
+            android:id="@+id/hairContactRl"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="3dp"
+            android:layout_toRightOf="@id/hairFl"
+            android:gravity="center_vertical">
+
+            <com.core.widget.RedView
+                android:id="@+id/hairRv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="8dp"
+                app:text=""/>
+
+            <TextView
+                android:id="@+id/hairTv"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_toLeftOf="@+id/schedule_time_tv"
+                android:ellipsize="end"
+                android:lines="1"
+                android:text="美容美发"
+                android:textColor="@color/text_main"
+                android:textSize="16sp"/>
+
+
+            <TextView
+                android:id="@+id/hairSubTv"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/hairTv"
+                android:layout_marginTop="8dp"
+                android:layout_toLeftOf="@+id/schedule_time_tv"
+                android:ellipsize="end"
+                android:lines="1"
+                android:text="时尚潮流"
+                android:textColor="@color/text_hine"
+                android:textSize="14sp"/>
+        </RelativeLayout>
+
+    </RelativeLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/line"
+        android:background="@color/item_line"/>
+
+    <RelativeLayout
+        android:id="@+id/ktvRl"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/item_height"
+        android:background="@drawable/selector_me_menu_item_bg"
+        android:descendantFocusability="blocksDescendants"
+        android:minHeight="@dimen/item_height"
+        android:paddingLeft="15dp"
+        android:paddingRight="15dp">
+
+        <FrameLayout
+            android:id="@+id/ktvFl"
+            android:layout_width="57dp"
+            android:layout_height="65dp"
+            android:layout_centerVertical="true">
+
+            <ImageView
+                android:id="@+id/ktvImg"
+                android:layout_width="@dimen/item_img_height"
+                android:layout_height="@dimen/item_img_width"
+                android:layout_gravity="center_vertical"
+                android:background="@color/transparent"
+                android:contentDescription="@string/app_name"
+                android:padding="1dp"
+                android:src="@drawable/icon_message_ktv"/>
+
+            <TextView
+                android:id="@+id/ktvNumTv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="top|right"
+                android:background="@drawable/tab_unread_bg"
+                android:gravity="center"
+                android:text="999"
+                android:textColor="@android:color/white"
+                android:textSize="10.0dp"
+                android:visibility="gone"/>
+        </FrameLayout>
+
+        <RelativeLayout
+            android:id="@+id/ktvContactRl"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="3dp"
+            android:layout_toRightOf="@id/ktvFl"
+            android:gravity="center_vertical">
+
+            <com.core.widget.RedView
+                android:id="@+id/ktvRv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="8dp"
+                app:text=""/>
+
+            <TextView
+                android:id="@+id/ktvTv"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_toLeftOf="@+id/schedule_time_tv"
+                android:ellipsize="end"
+                android:lines="1"
+                android:text="KTV"
+                android:textColor="@color/text_main"
+                android:textSize="16sp"/>
+
+
+            <TextView
+                android:id="@+id/ktvSubTv"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/ktvTv"
+                android:layout_marginTop="8dp"
+                android:layout_toLeftOf="@+id/schedule_time_tv"
+                android:ellipsize="end"
+                android:lines="1"
+                android:text="音乐节"
+                android:textColor="@color/text_hine"
+                android:textSize="14sp"/>
+        </RelativeLayout>
+
+    </RelativeLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/line"
+        android:background="@color/item_line"/>
+
+    <RelativeLayout
+        android:id="@+id/sportRl"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/item_height"
+        android:background="@drawable/selector_me_menu_item_bg"
+        android:descendantFocusability="blocksDescendants"
+        android:minHeight="@dimen/item_height"
+        android:paddingLeft="15dp"
+        android:paddingRight="15dp">
+
+        <FrameLayout
+            android:id="@+id/sportFl"
+            android:layout_width="57dp"
+            android:layout_height="65dp"
+            android:layout_centerVertical="true">
+
+            <ImageView
+                android:id="@+id/sportImg"
+                android:layout_width="@dimen/item_img_height"
+                android:layout_height="@dimen/item_img_width"
+                android:layout_gravity="center_vertical"
+                android:background="@color/transparent"
+                android:contentDescription="@string/app_name"
+                android:padding="1dp"
+                android:src="@drawable/icon_message_sport"/>
+
+            <TextView
+                android:id="@+id/sportNumTv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="top|right"
+                android:background="@drawable/tab_unread_bg"
+                android:gravity="center"
+                android:text="999"
+                android:textColor="@android:color/white"
+                android:textSize="10.0dp"
+                android:visibility="gone"/>
+        </FrameLayout>
+
+        <RelativeLayout
+            android:id="@+id/sportContactRl"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="3dp"
+            android:layout_toRightOf="@id/sportFl"
+            android:gravity="center_vertical">
+
+            <com.core.widget.RedView
+                android:id="@+id/sportRv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="8dp"
+                app:text=""/>
+
+            <TextView
+                android:id="@+id/sportTv"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_toLeftOf="@+id/schedule_time_tv"
+                android:ellipsize="end"
+                android:lines="1"
+                android:text="运动健身"
+                android:textColor="@color/text_main"
+                android:textSize="16sp"/>
+
+
+            <TextView
+                android:id="@+id/sportSubTv"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/sportTv"
+                android:layout_marginTop="8dp"
+                android:layout_toLeftOf="@+id/schedule_time_tv"
+                android:ellipsize="end"
+                android:lines="1"
+                android:text="hi起来"
+                android:textColor="@color/text_hine"
+                android:textSize="14sp"/>
+        </RelativeLayout>
+
+    </RelativeLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/line"
+        android:background="@color/item_line"/>
+
+    <RelativeLayout
+        android:id="@+id/clubRl"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/item_height"
+        android:background="@drawable/selector_me_menu_item_bg"
+        android:descendantFocusability="blocksDescendants"
+        android:minHeight="@dimen/item_height"
+        android:paddingLeft="15dp"
+        android:paddingRight="15dp">
+
+        <FrameLayout
+            android:id="@+id/clubFl"
+            android:layout_width="57dp"
+            android:layout_height="65dp"
+            android:layout_centerVertical="true">
+
+            <ImageView
+                android:id="@+id/clubImg"
+                android:layout_width="@dimen/item_img_height"
+                android:layout_height="@dimen/item_img_width"
+                android:layout_gravity="center_vertical"
+                android:background="@color/transparent"
+                android:contentDescription="@string/app_name"
+                android:padding="1dp"
+                android:src="@drawable/icon_message_huisuo"/>
+
+            <TextView
+                android:id="@+id/clubNumTv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="top|right"
+                android:background="@drawable/tab_unread_bg"
+                android:gravity="center"
+                android:text="999"
+                android:textColor="@android:color/white"
+                android:textSize="10.0dp"
+                android:visibility="gone"/>
+        </FrameLayout>
+
+        <RelativeLayout
+            android:id="@+id/clubContactRl"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="3dp"
+            android:layout_toRightOf="@id/clubFl"
+            android:gravity="center_vertical">
+
+            <com.core.widget.RedView
+                android:id="@+id/clubRv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="8dp"
+                app:text=""/>
+
+            <TextView
+                android:id="@+id/clubTv"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_toLeftOf="@+id/schedule_time_tv"
+                android:ellipsize="end"
+                android:lines="1"
+                android:text="会所"
+                android:textColor="@color/text_main"
+                android:textSize="16sp"/>
+
+
+            <TextView
+                android:id="@+id/clubSubTv"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/clubTv"
+                android:layout_marginTop="8dp"
+                android:layout_toLeftOf="@+id/schedule_time_tv"
+                android:ellipsize="end"
+                android:lines="1"
+                android:text="预约有优惠"
+                android:textColor="@color/text_hine"
+                android:textSize="14sp"/>
+        </RelativeLayout>
+
+    </RelativeLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/line"
+        android:background="@color/item_line"/>
+
+
+    <RelativeLayout
+        android:id="@+id/hospitalRl"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/item_height"
+        android:background="@drawable/selector_me_menu_item_bg"
+        android:descendantFocusability="blocksDescendants"
+        android:minHeight="@dimen/item_height"
+        android:paddingLeft="15dp"
+        android:paddingRight="15dp">
+
+        <FrameLayout
+            android:id="@+id/hospitalFl"
+            android:layout_width="57dp"
+            android:layout_height="65dp"
+            android:layout_centerVertical="true">
+
+            <ImageView
+                android:id="@+id/hospitalImg"
+                android:layout_width="@dimen/item_img_height"
+                android:layout_height="@dimen/item_img_width"
+                android:layout_gravity="center_vertical"
+                android:background="@color/transparent"
+                android:contentDescription="@string/app_name"
+                android:padding="1dp"
+                android:src="@drawable/icon_message_hospital"/>
+
+            <TextView
+                android:id="@+id/hospitalNumTv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="top|right"
+                android:background="@drawable/tab_unread_bg"
+                android:gravity="center"
+                android:text="999"
+                android:textColor="@android:color/white"
+                android:textSize="10.0dp"
+                android:visibility="gone"/>
+        </FrameLayout>
+
+        <RelativeLayout
+            android:id="@+id/hospitalContactRl"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="3dp"
+            android:layout_toRightOf="@id/hospitalFl"
+            android:gravity="center_vertical">
+
+            <com.core.widget.RedView
+                android:id="@+id/hospitalRv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="8dp"
+                app:text=""/>
+
+            <TextView
+                android:id="@+id/hospitalTv"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_toLeftOf="@+id/schedule_time_tv"
+                android:ellipsize="end"
+                android:lines="1"
+                android:text="医院挂号"
+                android:textColor="@color/text_main"
+                android:textSize="16sp"/>
+
+
+            <TextView
+                android:id="@+id/hospitalSubTv"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/hospitalTv"
+                android:layout_marginTop="8dp"
+                android:layout_toLeftOf="@+id/schedule_time_tv"
+                android:ellipsize="end"
+                android:lines="1"
+                android:text="您的健康助手"
+                android:textColor="@color/text_hine"
+                android:textSize="14sp"/>
+        </RelativeLayout>
+
+    </RelativeLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/line"
+        android:background="@color/item_line"/>
+</LinearLayout>

+ 4 - 0
app_modular/apputils/src/main/res/values/ids.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <item name="tag_key" type="id"></item>
+</resources>