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

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/secretary/BookingAddActivity.java

@@ -304,7 +304,7 @@ public class BookingAddActivity extends OABaseActivity implements HttpImp, View.
                 "\"ab_latitude\":\"" + latitude + "\"" +
                 "}\n";
         LogUtil.prinlnLongMsg("Test", json);
-        String url = Constants.IM_BASE_URL + "user/appSaveBooking";
+        String url = Constants.IM_BASE_URL() + "user/appSaveBooking";
         Map<String, Object> params = new HashMap<>();
         params.put("token", MyApplication.getInstance().mAccessToken);
         params.put("map", json);
@@ -374,7 +374,7 @@ public class BookingAddActivity extends OABaseActivity implements HttpImp, View.
                 "\"ab_longitude\":\"" + longitude + "\",\n" +
                 "\"ab_latitude\":\"" + latitude + "\"" +
                 "}\n";
-        String url = Constants.IM_BASE_URL + "user/appUpdateBooking";
+        String url = Constants.IM_BASE_URL() + "user/appUpdateBooking";
         Map<String, Object> params = new HashMap<>();
         params.put("token", MyApplication.getInstance().mAccessToken);
         params.put("map", json);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/secretary/BookingDetailActivity.java

@@ -350,7 +350,7 @@ public class BookingDetailActivity extends OABaseActivity implements HttpImp,Vie
     }
 
     private void updateBooking(String map) {
-        String url = Constants.IM_BASE_URL + "user/appUpdateBooking";
+        String url = Constants.IM_BASE_URL() + "user/appUpdateBooking";
         Map<String, Object> params = new HashMap<>();
         params.put("token", MyApplication.getInstance().mAccessToken);
         params.put("map", map);
@@ -435,7 +435,7 @@ public class BookingDetailActivity extends OABaseActivity implements HttpImp,Vie
         showLoading();
         String map="{\"ab_bmanid\":\"" + model.getAb_bmanid() + "\",\"as_planid\":\""+id+"\",\"as_userids\":\""+imids+"\"}";
         LogUtil.d("HttpLogs","map:"+map);
-        String url = Constants.IM_BASE_URL + "user/appSharePlan";
+        String url = Constants.IM_BASE_URL() + "user/appSharePlan";
         Map<String, Object> params = new HashMap<>();
         params.put("token", MyApplication.getInstance().mAccessToken);
         params.put("map", map);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/secretary/BookingListActivity.java

@@ -337,7 +337,7 @@ public class BookingListActivity extends OABaseActivity implements HttpImp, View
 
     private void loadListData() {
         showLoading();
-        String url = Constants.IM_BASE_URL + "user/appBookingList";
+        String url = Constants.IM_BASE_URL() + "user/appBookingList";
         Map<String, Object> params = new HashMap<>();
         params.put("token",  UserSp.getInstance(MyApplication.getInstance()).getAccessToken(""));
         params.put("userid", UserSp.getInstance(MyApplication.getInstance()).getUserId(""));

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/dialog/QSearchPpwindowUtils.java

@@ -114,7 +114,7 @@ public class QSearchPpwindowUtils{
         Map<String,Object> params = new HashMap<>();
 
         if (text.contains("预约")){
-            url =   Constants.IM_BASE_URL + "user/appBookingList";
+            url =   Constants.IM_BASE_URL() + "user/appBookingList";
             params.put("token", MyApplication.getInstance().mAccessToken);
             params.put("userid", MyApplication.getInstance().mLoginUser.getUserId());
             params.put("telephone",MyApplication.getInstance().mLoginUser.getTelephone());

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/oa/DepositNoticeUtil.java

@@ -98,7 +98,7 @@ public class DepositNoticeUtil {
     public void loadDepostNotice() {
         String curDate = TimeUtils.s_long_2_str(DateFormatUtil.str2Long(TimeUtil.getCurrentDate(), "yyyy年MM月dd日"));
         String yyyymmdd = curDate.replaceAll("-", "");
-        String url = Constants.IM_BASE_URL + "user/appCurrentList";
+        String url = Constants.IM_BASE_URL() + "user/appCurrentList";
         Map<String, Object> params = new HashMap<>();
         params.put("token", MyApplication.getInstance().mAccessToken);
         params.put("userid", MyApplication.getInstance().mLoginUser.getUserId());

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

@@ -21,6 +21,7 @@
             android:id="@+id/mList"
             style="@style/ListViewBasic"
             android:layout_height="wrap_content"
-            android:dividerHeight="0dp"></ListView>
+            android:divider="@color/item_line"
+            android:dividerHeight="0.1dp"></ListView>
     </LinearLayout>
 </com.xzjmyk.pm.activity.view.shadow.ShadowLayout>

app_core/common/src/main/java/com/core/app/Constants.java

@@ -1,352 +1,358 @@
 package com.core.app;
 
+import com.common.config.BaseConfig;
 import com.core.db.DatabaseTables;
 
-/**
- * Created by Administrator on 2016/1/30.
- */
-public class Constants {
 
-	public static String IS_NOTIFICATION = "is_notification";//是是否进行通知
-	public static final String BASE_URL_LOGIN = "http://manage.ubtob.com/public/account";
-	public static final String IM_BASE_URL = "http://113.105.74.140:8092/";
-
-	//通讯录表
-	public static final String TABLE_CONTANCTS = "CREATE TABLE  tbl_contacts " +
-			"(id integer primary key autoincrement,"
-			+ "tf_name varchar(50),"
-			+ "tf_whichSys varchar(50),"
-			+ "tf_company varchar(50),"
-			+ "tf_phone varchar(50),"
-			+ "tf_email varchar(50),"
-			+ "tf_type integer,"
-			+ "tf_ownerId varchar(50),"
-			+ "tf_imId varchar(50) default '0')";
-
-	//组织架构 员工信息
-	public static final String SQL_EMPLOYEES_CREATETABLE = "CREATE TABLE EMPLOYEES "
-			+ "(id integer primary key autoincrement,"
-			+ "em_id integer,"
-			+ "em_code varchar(50) NOT NULL UNIQUE,"
-			+ "em_name varchar(50),"
-			+ "em_position varchar(50),"
-			+ "em_jobs varchar(50),"
-			+ "em_defaultorname varchar(50),"
-			+ "em_depart varchar(50),"
-			+ "em_tel varchar(50),"
-			+ "em_imid varchar(50) default '0',"
-			+ "em_mobile varchar(50),"
-			+ "em_email varchar(50),"
-			+ "em_uu varchar(50),"
-			+ "em_imageid integer,"
-			+ "company varchar(100),"
-			+ "whichsys varchar(50),"
-			+ "em_defaultorid integer,"
-			+ "em_flag varchar(50))";
-	//组织架构表
-	public static final String SQL_HRORGS_CREATETABLE = "CREATE TABLE HRORGS "
-			+ "(id integer primary key autoincrement,"
-			+ "or_id integer,"
-			+ "or_code varchar(50) NOT NULL UNIQUE,"
-			+ "or_name varchar(50),"
-			+ "or_subof varchar(50),"
-			+ "or_isleaf varchar(50),"
-			+ "company varchar(100),"
-			+ "whichsys varchar(50),"
-			+ "or_flag varchar(50),"
-			+ "or_headmanname varchar(50),"
-			+ "or_headmancode varchar(50),"
-			+ "or_remark integer" +
-			")";
-	//组织架构 更新时间表
-	public static final String SQL_empdate_CREATETABLE = "CREATE TABLE empdate "
-			+ "(id integer primary key autoincrement,"
-			+ "ed_lastdate varchar(50),"
-			+ "ed_kind varchar(50),"
-			+ "ed_company varchar(50),"
-			+ "ed_whichsys varchar(50)"
-			+ ")";
-	//b2b消息通知表
-	public static final String SQL_B2B_MSG = "CREATE TABLE B2BMSG "
-			+ "(id integer primary key autoincrement,"
-			+ "b2b_content varchar(50),"
-			+ "b2b_time varchar(50),"
-			+ "b2b_hasRead integer,"
-			+ "b2b_master varchar(50)"
-			+ ")";
-
-	//OA内勤签到表
-	public static final String WORKTIBLE = "CREATE TABLE workdata("
-			+ "id integer UNIQUE,"//id  唯一不可重复
-			+ "emCode  varchar(10),"//员工编号
-			+ "master  varchar(20),"//账套
-			+ "date  varchar(20),"//日期  yyyy-MM-dd
-
-			+ "workStart  varchar(6),"//上班开始时间  hh:mm
-			+ "workTime  varchar(6),"//上班时间  hh:mm
-			+ "workend  varchar(6),"//上班结束时间  hh:mm
-			+ "workSignin  varchar(6),"//上班签到  hh:mm
-			+ "workAllegedly  varchar(6),"//上班申诉时间  hh:mm
-			+ "workAlarm INTEGER,"//上班提醒 0|1
-
-			+ "offStart  varchar(6),"//下班开始时间  hh:mm
-			+ "offTime  varchar(6),"//下班时间  hh:mm
-			+ "offend  varchar(6),"//下班结束时间  hh:mm
-			+ "offSignin  varchar(6),"//下班签到  hh:mm
-			+ "offAllegedly  varchar(6),"//下班申诉时间  hh:mm
-			+ "offAlarm INTEGER,"//下班提醒 0|1
-
-			+ "isNextDay INTEGER,"//是否是跨天 0|1
-			+ "leaveAlarm INTEGER"//离开提示次数  0|1
-			+ ")";
-
-
-	//OA内勤签到表
-	public static final String SIGNING = "CREATE TABLE signing("
-			+ "emCode  varchar(10),"//员工编号
-			+ "master  varchar(20),"//账套
-
-			+ "workTime  varchar(6),"//上班时间  hh:mm
-			+ "offTime  varchar(6),"//下班时间   hh:mm
-
-			+ "workSignin  varchar(6),"//上班签到时间 hh:mm
-			+ "offSignin  varchar(6),"//下班签到时间  hh:mm
-
-			+ "startTime  varchar(6),"//上班开始签到时间  hh:mm
-			+ "endTime  varchar(6),"//下班开始签到时间    hh:mm
-
-			+ "leave INTEGER,"//下班开始签到时间    hh:mm
-
-			+ "workAlarm INTEGER,"//上班提醒
-			+ "offAlarm INTEGER"//下班提醒
-
-			+ ")";
-
-	/**
-	 * oa签到时间表
-	 */
-	@Deprecated
-	public static final String OA_SIGNIN_TIME = "CREATE TABLE Signin("
-			+ "emCode  varchar(10),"//员工编号
-			+ "master  varchar(20),"//账套
-
-			+ "workTime  varchar(6),"//上班时间  hh:mm
-			+ "offTime  varchar(6),"//下班时间   hh:mm
-
-			+ "workSignin  varchar(6),"//上班签到时间  hh:mm
-			+ "offSignin  varchar(6),"//下班签到时间  hh:mm
-
-			+ "startTime  varchar(6),"//上班开始签到时间  hh:mm
-			+ "endTime  varchar(6),"//下班开始签到时间     hh:mm
-
-			+ "workAlarm ,"//上班提醒
-			+ "offAlarm"//下班提醒 boolean
-
-			+ ")";
-
-
-	public static final String SUB_MESSAGE = "CREATE TABLE submessage(" +
-			"isRead ," +//员工账套
-			"master  varchar(20)," +//员工账套
-			"emcode  varchar(20)," +//员工编号
-			"id integer," +//Id   连接时候使用
-			"numId integer," +//Id   连接时候使用
-			"instanceId integer," +//Id   连接时候使用
-			"title  varchar(40)," +//主标题
-			"subTitle varchar(40)," +//副标题
-			"status integer," +//状态
-			"date varchar(20)," +//yyyy-mm-dd
-			"createTime" +//创建时间  与date关联
-			")";
-
-	//所有订阅号表
-	public static final String TABLE_ALL_SUBSCRIPTION = "CREATE TABLE AllSubs "
-			+ "(id integer primary key autoincrement,"
-			+ "subs_id integer,"
-			+ "subs_title varchar(50),"
-			+ "subs_kind varchar(50),"
-			+ "subs_status integer,"
-			+ "subs_type varchar(50),"
-			+ "subs_master varchar(50),"
-			+ "subs_username varchar(50),"
-			+ "subs_removed integer,"
-			+ "subs_img BLOB"
-			+ ")";
-
-
-	//监控日志表
-	public static final String AUTO_LOG = "CREATE TABLE SignAutoLog ("
-			+ "_id INTEGER PRIMARY KEY AUTOINCREMENT, "
-			+ "aa_type TEXT, "
-			+ "aa_location TEXT, "
-			+ "aa_remark TEXT, "
-			+ "aa_date TEXT, "
-			+ "aa_telephone TEXT, "
-			+ "sendstatus TEXT"
-			+ ")";
-	//用于创建记步数统计表
-	public static final String CREATE_BANNER = "create table step ("
-			+ "_id INTEGER PRIMARY KEY AUTOINCREMENT, "
-			+ "curDate TEXT, "
-			+ "totalSteps TEXT)";
-
-	/* //运行轨迹，实时定位点记录表
-	 public static final String TRACK_POINT = "CREATE TABLE trackPoint ("
-			 +"_id INTEGER PRIMARY KEY AUTOINCREMENT,"
-			 +"latitude double(13,10)," //纬度
-			 +"longitude double(13,10)," //经度
-			 +"timestamp varchar(50)," //实时定位时的时间戳
-			 +"type varchar(10)," //类型 run、walk
-			 +"startTime varchar(50),"  //开始定位后全部默认为开始时间：yyyy-MM-dd HH:mm
-			 +"endTime varchar(50)"  //未点击结束前都为空 点击格式：yyyy-MM-dd HH:mm
-			 +")";*/
-	//已订阅号表
-	public static final String TABLE_MY_SUBSCRIPTION = "CREATE TABLE MySubs "
-			+ "(id integer primary key autoincrement,"
-			+ "subs_id integer,"
-			+ "subs_title varchar(50),"
-			+ "subs_kind varchar(50),"
-			+ "subs_type varchar(50),"
-			+ "subs_applied integer,"
-			+ "subs_master varchar(50),"
-			+ "subs_username varchar(50),"
-			+ "subs_img BLOB"
-			+ ")";
-
-	//消息红点数据表
-	public static final String EM_ERPNEWS = "CREATE TABLE em_erpnews ("
-			+ "id integer ,"
-			+ "master  varchar(20)," //员工账套
-			+ "emcode  varchar(20)," //员工编号
-			+ "count integer ,"
-			+ "title varchar(20),"//位置
-			+ "subTitle varchar(20),"//详细信息
-			+ "time varchar(20),"//时间
-			+ "type varchar(20),"//类型
-			+ "hierarchy integer,"//类型
-			+ "readTime integer,"//阅读时间
-			+ "isReaded integer"//阅读状态，1阅读
-			+ ")";
-	//考勤地址表
-	public static final String WORK_LOCATION = "CREATE TABLE work_location ("
-			+ "id integer primary key autoincrement,"
-
-			+ "master  varchar(20)," //员工账套
-			+ "emcode  varchar(20)," //员工编号
-
-			+ "latitude double,"//纬度
-			+ "longitude double,"//经度
-			+ "shortName varchar(20),"//位置
-			+ "workaddr varchar(20),"//地址
-			+ "validrange integer,"//打卡距离
-			+ "innerdistance integer"//办公范围
-			+ ")";
-
-	//外勤计划表
-	public static final String TABLE_MISSION = "CREATE TABLE mission ("
-			+ "id integer UNIQUE,"//id  唯一不可重复
-			+ "status integer,"//状态  1.结束   2.进行中
-			+ "master  varchar(20)," //员工账套
-			+ "emcode  varchar(20)," //员工编号
-			+ "company varchar(50),"//公司
-			+ "companyAddr varchar(50),"//公司地址
-			+ "signinNum integer,"//签到次数
-			+ "latitude Double,"//纬度
-			+ "longitude Double,"//经度
-			+ "date varchar(50),"//日期 yyyy-MM-dd
-			+ "visittime varchar(50),"//预计到达时间 yyyy-MM-dd HH:mm:ss
-			+ "realvisitTime varchar(50),"//实际到达时间yyyy-MM-dd HH:mm:ss
-			+ "realLeaveTime varchar(50),"//实际离开时间yyyy-MM-dd HH:mm:ss
-			//update by 2016/12/19
-			+ "distance Double,"//距离  米
-			+ "type integer,"//距离  米
-			+ "remark varchar(50),"//距离  米
-			+ "location varchar(50),"//录入位置
-			+ "recorddate varchar(50)"//录入时间yyyy-MM-dd HH:mm:ss
-			+ ")";
-
-	//数据查询历史记录表
-	public static final String TABLE_HISTORICAL_RECORD = "create table "
-			+ DatabaseTables.HistoricalRecordTable.NAME + "("
-			+ "_id integer primary key autoincrement, "
-			+ DatabaseTables.HistoricalRecordTable.Cols.SCHEME_ID + ", "
-			+ DatabaseTables.HistoricalRecordTable.Cols.SCHEME_NAME + ", "
-			+ DatabaseTables.HistoricalRecordTable.Cols.SEARCH_FIELD + ")";
-
-	//UU助手
-	public static final String TABLE_UUHELPER_RECORD = "create table "
-			+ DatabaseTables.UUHelperTable.NAME + "("
-			+ DatabaseTables.UUHelperTable.Cols.ID + " integer primary key autoincrement"
-			+ "," + DatabaseTables.UUHelperTable.Cols.USER_ID
-			+ "," + DatabaseTables.UUHelperTable.Cols.TIME_SEND
-			+ "," + DatabaseTables.UUHelperTable.Cols.DATE
-			+ "," + DatabaseTables.UUHelperTable.Cols.IMAGE_URL
-			+ "," + DatabaseTables.UUHelperTable.Cols.ICON_URL
-			+ "," + DatabaseTables.UUHelperTable.Cols.LINK_URL
-			+ "," + DatabaseTables.UUHelperTable.Cols.CONTENT
-			+ "," + DatabaseTables.UUHelperTable.Cols.READED
-			+ "," + DatabaseTables.UUHelperTable.Cols.TITLE
-			+ "," + DatabaseTables.UUHelperTable.Cols.TYPE
-			+ ")";
-
-
-	/**
-	 * @desc:常量
-	 * @author：Administrator on 2016/5/13 10:21
-	 */
-	public final static int TYPE_CHAT_MANAGE = 2;
-	public final static int TYPE_CHAT_All = 1;
-
-	/**
-	 * @desc:http 请求状态码
-	 * @author：Arison on 2016/7/18
-	 */
-	public static final int HTTP_SUCCESS_INIT = 1;
-	public final static int APP_SOCKETIMEOUTEXCEPTION = 99;//网络请求超时，错误，404响应
-
-	public final static int LOAD_SUCCESS = 1;
-	public final static int SocketTimeoutException = 0;//ERP登录成功
-	public final static int APP_NOTNETWORK = 111;//网络未连接
-	public final static int SUCCESS_LOGIN = 3;//获取用户开通的平台信息
-	public final static int SUCCESS_B2B = 4;//B2B登录成功
-	public final static int SUCCESS_ERP = 5;//ERP登录成功
-	public final static int SUCCESS_INITDATA = 7;
-	public final static int FIRST_MSG_REQUEST = 17022801;
-
-	//新功能红点
-	public final static String new_signin = "signin";
-	public final static String new_signout = "signout";
-	public final static String new_oa = "oa_menu";
-	public final static String new_business = "business";
-	public final static String NEW_SETING = "seting_2";
-	public final static String NEW_UURUN = "NEW_UURUN";
-	public final static String NEW_ME_TAG = "ME_TAG";
-	public final static String SET_SIGN_AUTO = "set_sign_auto";
-	public final static String SET_SIGN_IN = "set_sign_in";
-	public final static String SET_SIGN_LANGUAGE = "set_sign_language";
-	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_YUYUE = "message_yuyue";
-	public final static String MESSAGE_RUN = "message_run";
-	public final static String MESSAGE_DINGYUE = "message_dingyue";
-
-	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";
-	public final static String MORE_FUNCTION = "MORE_FUNCTION";
-
-	public final static String SET_UU_NEW = "set_uu_new";
+public class Constants {
+    
+    //管理平台账户地址
+    public static final String BASE_URL_LOGIN = "http://manage.ubtob.com/public/account";
+    //IM正式地址
+    public static final String IM_BASE_URL = "http://113.105.74.140:8092/";
+    //IM测试地址
+    public static final String IM_BASE_URL_TEST = "http://113.105.74.135:8092/";
+    
+    public static String IM_BASE_URL(){
+        String url="";
+        if (BaseConfig.isDebug()){
+            url=IM_BASE_URL_TEST;
+        }else{
+            url=IM_BASE_URL;
+        }
+        return url;
+    }
+    //通讯录表
+    public static final String TABLE_CONTANCTS = "CREATE TABLE  tbl_contacts " +
+            "(id integer primary key autoincrement,"
+            + "tf_name varchar(50),"
+            + "tf_whichSys varchar(50),"
+            + "tf_company varchar(50),"
+            + "tf_phone varchar(50),"
+            + "tf_email varchar(50),"
+            + "tf_type integer,"
+            + "tf_ownerId varchar(50),"
+            + "tf_imId varchar(50) default '0')";
+
+    //组织架构 员工信息
+    public static final String SQL_EMPLOYEES_CREATETABLE = "CREATE TABLE EMPLOYEES "
+            + "(id integer primary key autoincrement,"
+            + "em_id integer,"
+            + "em_code varchar(50) NOT NULL UNIQUE,"
+            + "em_name varchar(50),"
+            + "em_position varchar(50),"
+            + "em_jobs varchar(50),"
+            + "em_defaultorname varchar(50),"
+            + "em_depart varchar(50),"
+            + "em_tel varchar(50),"
+            + "em_imid varchar(50) default '0',"
+            + "em_mobile varchar(50),"
+            + "em_email varchar(50),"
+            + "em_uu varchar(50),"
+            + "em_imageid integer,"
+            + "company varchar(100),"
+            + "whichsys varchar(50),"
+            + "em_defaultorid integer,"
+            + "em_flag varchar(50))";
+    //组织架构表
+    public static final String SQL_HRORGS_CREATETABLE = "CREATE TABLE HRORGS "
+            + "(id integer primary key autoincrement,"
+            + "or_id integer,"
+            + "or_code varchar(50) NOT NULL UNIQUE,"
+            + "or_name varchar(50),"
+            + "or_subof varchar(50),"
+            + "or_isleaf varchar(50),"
+            + "company varchar(100),"
+            + "whichsys varchar(50),"
+            + "or_flag varchar(50),"
+            + "or_headmanname varchar(50),"
+            + "or_headmancode varchar(50),"
+            + "or_remark integer" +
+            ")";
+    //组织架构 更新时间表
+    public static final String SQL_empdate_CREATETABLE = "CREATE TABLE empdate "
+            + "(id integer primary key autoincrement,"
+            + "ed_lastdate varchar(50),"
+            + "ed_kind varchar(50),"
+            + "ed_company varchar(50),"
+            + "ed_whichsys varchar(50)"
+            + ")";
+    //b2b消息通知表
+    public static final String SQL_B2B_MSG = "CREATE TABLE B2BMSG "
+            + "(id integer primary key autoincrement,"
+            + "b2b_content varchar(50),"
+            + "b2b_time varchar(50),"
+            + "b2b_hasRead integer,"
+            + "b2b_master varchar(50)"
+            + ")";
+
+    //OA内勤签到表
+    public static final String WORKTIBLE = "CREATE TABLE workdata("
+            + "id integer UNIQUE,"//id  唯一不可重复
+            + "emCode  varchar(10),"//员工编号
+            + "master  varchar(20),"//账套
+            + "date  varchar(20),"//日期  yyyy-MM-dd
+            + "workStart  varchar(6),"//上班开始时间  hh:mm
+            + "workTime  varchar(6),"//上班时间  hh:mm
+            + "workend  varchar(6),"//上班结束时间  hh:mm
+            + "workSignin  varchar(6),"//上班签到  hh:mm
+            + "workAllegedly  varchar(6),"//上班申诉时间  hh:mm
+            + "workAlarm INTEGER,"//上班提醒 0|1
+            + "offStart  varchar(6),"//下班开始时间  hh:mm
+            + "offTime  varchar(6),"//下班时间  hh:mm
+            + "offend  varchar(6),"//下班结束时间  hh:mm
+            + "offSignin  varchar(6),"//下班签到  hh:mm
+            + "offAllegedly  varchar(6),"//下班申诉时间  hh:mm
+            + "offAlarm INTEGER,"//下班提醒 0|1
+            + "isNextDay INTEGER,"//是否是跨天 0|1
+            + "leaveAlarm INTEGER"//离开提示次数  0|1
+            + ")";
+
+
+    //OA内勤签到表
+    public static final String SIGNING = "CREATE TABLE signing("
+            + "emCode  varchar(10),"//员工编号
+            + "master  varchar(20),"//账套
+
+            + "workTime  varchar(6),"//上班时间  hh:mm
+            + "offTime  varchar(6),"//下班时间   hh:mm
+
+            + "workSignin  varchar(6),"//上班签到时间 hh:mm
+            + "offSignin  varchar(6),"//下班签到时间  hh:mm
+
+            + "startTime  varchar(6),"//上班开始签到时间  hh:mm
+            + "endTime  varchar(6),"//下班开始签到时间    hh:mm
+
+            + "leave INTEGER,"//下班开始签到时间    hh:mm
+
+            + "workAlarm INTEGER,"//上班提醒
+            + "offAlarm INTEGER"//下班提醒
+
+            + ")";
+
+    /**
+     * oa签到时间表
+     */
+    @Deprecated
+    public static final String OA_SIGNIN_TIME = "CREATE TABLE Signin("
+            + "emCode  varchar(10),"//员工编号
+            + "master  varchar(20),"//账套
+
+            + "workTime  varchar(6),"//上班时间  hh:mm
+            + "offTime  varchar(6),"//下班时间   hh:mm
+
+            + "workSignin  varchar(6),"//上班签到时间  hh:mm
+            + "offSignin  varchar(6),"//下班签到时间  hh:mm
+
+            + "startTime  varchar(6),"//上班开始签到时间  hh:mm
+            + "endTime  varchar(6),"//下班开始签到时间     hh:mm
+
+            + "workAlarm ,"//上班提醒
+            + "offAlarm"//下班提醒 boolean
+
+            + ")";
+
+
+    public static final String SUB_MESSAGE = "CREATE TABLE submessage(" +
+            "isRead ," +//员工账套
+            "master  varchar(20)," +//员工账套
+            "emcode  varchar(20)," +//员工编号
+            "id integer," +//Id   连接时候使用
+            "numId integer," +//Id   连接时候使用
+            "instanceId integer," +//Id   连接时候使用
+            "title  varchar(40)," +//主标题
+            "subTitle varchar(40)," +//副标题
+            "status integer," +//状态
+            "date varchar(20)," +//yyyy-mm-dd
+            "createTime" +//创建时间  与date关联
+            ")";
+
+    //所有订阅号表
+    public static final String TABLE_ALL_SUBSCRIPTION = "CREATE TABLE AllSubs "
+            + "(id integer primary key autoincrement,"
+            + "subs_id integer,"
+            + "subs_title varchar(50),"
+            + "subs_kind varchar(50),"
+            + "subs_status integer,"
+            + "subs_type varchar(50),"
+            + "subs_master varchar(50),"
+            + "subs_username varchar(50),"
+            + "subs_removed integer,"
+            + "subs_img BLOB"
+            + ")";
+
+
+    //监控日志表
+    public static final String AUTO_LOG = "CREATE TABLE SignAutoLog ("
+            + "_id INTEGER PRIMARY KEY AUTOINCREMENT, "
+            + "aa_type TEXT, "
+            + "aa_location TEXT, "
+            + "aa_remark TEXT, "
+            + "aa_date TEXT, "
+            + "aa_telephone TEXT, "
+            + "sendstatus TEXT"
+            + ")";
+    //用于创建记步数统计表
+    public static final String CREATE_BANNER = "create table step ("
+            + "_id INTEGER PRIMARY KEY AUTOINCREMENT, "
+            + "curDate TEXT, "
+            + "totalSteps TEXT)";
+
+    /* //运行轨迹，实时定位点记录表
+     public static final String TRACK_POINT = "CREATE TABLE trackPoint ("
+             +"_id INTEGER PRIMARY KEY AUTOINCREMENT,"
+             +"latitude double(13,10)," //纬度
+             +"longitude double(13,10)," //经度
+             +"timestamp varchar(50)," //实时定位时的时间戳
+             +"type varchar(10)," //类型 run、walk
+             +"startTime varchar(50),"  //开始定位后全部默认为开始时间：yyyy-MM-dd HH:mm
+             +"endTime varchar(50)"  //未点击结束前都为空 点击格式：yyyy-MM-dd HH:mm
+             +")";*/
+    //已订阅号表
+    public static final String TABLE_MY_SUBSCRIPTION = "CREATE TABLE MySubs "
+            + "(id integer primary key autoincrement,"
+            + "subs_id integer,"
+            + "subs_title varchar(50),"
+            + "subs_kind varchar(50),"
+            + "subs_type varchar(50),"
+            + "subs_applied integer,"
+            + "subs_master varchar(50),"
+            + "subs_username varchar(50),"
+            + "subs_img BLOB"
+            + ")";
+
+    //消息红点数据表
+    public static final String EM_ERPNEWS = "CREATE TABLE em_erpnews ("
+            + "id integer ,"
+            + "master  varchar(20)," //员工账套
+            + "emcode  varchar(20)," //员工编号
+            + "count integer ,"
+            + "title varchar(20),"//位置
+            + "subTitle varchar(20),"//详细信息
+            + "time varchar(20),"//时间
+            + "type varchar(20),"//类型
+            + "hierarchy integer,"//类型
+            + "readTime integer,"//阅读时间
+            + "isReaded integer"//阅读状态，1阅读
+            + ")";
+    //考勤地址表
+    public static final String WORK_LOCATION = "CREATE TABLE work_location ("
+            + "id integer primary key autoincrement,"
+
+            + "master  varchar(20)," //员工账套
+            + "emcode  varchar(20)," //员工编号
+
+            + "latitude double,"//纬度
+            + "longitude double,"//经度
+            + "shortName varchar(20),"//位置
+            + "workaddr varchar(20),"//地址
+            + "validrange integer,"//打卡距离
+            + "innerdistance integer"//办公范围
+            + ")";
+
+    //外勤计划表
+    public static final String TABLE_MISSION = "CREATE TABLE mission ("
+            + "id integer UNIQUE,"//id  唯一不可重复
+            + "status integer,"//状态  1.结束   2.进行中
+            + "master  varchar(20)," //员工账套
+            + "emcode  varchar(20)," //员工编号
+            + "company varchar(50),"//公司
+            + "companyAddr varchar(50),"//公司地址
+            + "signinNum integer,"//签到次数
+            + "latitude Double,"//纬度
+            + "longitude Double,"//经度
+            + "date varchar(50),"//日期 yyyy-MM-dd
+            + "visittime varchar(50),"//预计到达时间 yyyy-MM-dd HH:mm:ss
+            + "realvisitTime varchar(50),"//实际到达时间yyyy-MM-dd HH:mm:ss
+            + "realLeaveTime varchar(50),"//实际离开时间yyyy-MM-dd HH:mm:ss
+            //update by 2016/12/19
+            + "distance Double,"//距离  米
+            + "type integer,"//距离  米
+            + "remark varchar(50),"//距离  米
+            + "location varchar(50),"//录入位置
+            + "recorddate varchar(50)"//录入时间yyyy-MM-dd HH:mm:ss
+            + ")";
+
+    //数据查询历史记录表
+    public static final String TABLE_HISTORICAL_RECORD = "create table "
+            + DatabaseTables.HistoricalRecordTable.NAME + "("
+            + "_id integer primary key autoincrement, "
+            + DatabaseTables.HistoricalRecordTable.Cols.SCHEME_ID + ", "
+            + DatabaseTables.HistoricalRecordTable.Cols.SCHEME_NAME + ", "
+            + DatabaseTables.HistoricalRecordTable.Cols.SEARCH_FIELD + ")";
+
+    //UU助手
+    public static final String TABLE_UUHELPER_RECORD = "create table "
+            + DatabaseTables.UUHelperTable.NAME + "("
+            + DatabaseTables.UUHelperTable.Cols.ID + " integer primary key autoincrement"
+            + "," + DatabaseTables.UUHelperTable.Cols.USER_ID
+            + "," + DatabaseTables.UUHelperTable.Cols.TIME_SEND
+            + "," + DatabaseTables.UUHelperTable.Cols.DATE
+            + "," + DatabaseTables.UUHelperTable.Cols.IMAGE_URL
+            + "," + DatabaseTables.UUHelperTable.Cols.ICON_URL
+            + "," + DatabaseTables.UUHelperTable.Cols.LINK_URL
+            + "," + DatabaseTables.UUHelperTable.Cols.CONTENT
+            + "," + DatabaseTables.UUHelperTable.Cols.READED
+            + "," + DatabaseTables.UUHelperTable.Cols.TITLE
+            + "," + DatabaseTables.UUHelperTable.Cols.TYPE
+            + ")";
+
+    public static String IS_NOTIFICATION = "is_notification";//是是否进行通知
+    /**
+     * @desc:常量
+     * @author：Administrator on 2016/5/13 10:21
+     */
+    public final static int TYPE_CHAT_MANAGE = 2;
+    public final static int TYPE_CHAT_All = 1;
+
+    /**
+     * @desc:http 请求状态码
+     * @author：Arison on 2016/7/18
+     */
+    public static final int HTTP_SUCCESS_INIT = 1;
+    public final static int APP_SOCKETIMEOUTEXCEPTION = 99;//网络请求超时，错误，404响应
+
+    public final static int LOAD_SUCCESS = 1;
+    public final static int SocketTimeoutException = 0;//ERP登录成功
+    public final static int APP_NOTNETWORK = 111;//网络未连接
+    public final static int SUCCESS_LOGIN = 3;//获取用户开通的平台信息
+    public final static int SUCCESS_B2B = 4;//B2B登录成功
+    public final static int SUCCESS_ERP = 5;//ERP登录成功
+    public final static int SUCCESS_INITDATA = 7;
+    public final static int FIRST_MSG_REQUEST = 17022801;
+
+    //新功能红点
+    public final static String new_signin = "signin";
+    public final static String new_signout = "signout";
+    public final static String new_oa = "oa_menu";
+    public final static String new_business = "business";
+    public final static String NEW_SETING = "seting_2";
+    public final static String NEW_UURUN = "NEW_UURUN";
+    public final static String NEW_ME_TAG = "ME_TAG";
+    public final static String SET_SIGN_AUTO = "set_sign_auto";
+    public final static String SET_SIGN_IN = "set_sign_in";
+    public final static String SET_SIGN_LANGUAGE = "set_sign_language";
+    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_YUYUE = "message_yuyue";
+    public final static String MESSAGE_RUN = "message_run";
+    public final static String MESSAGE_DINGYUE = "message_dingyue";
+
+    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";
+    public final static String MORE_FUNCTION = "MORE_FUNCTION";
+
+    public final static String SET_UU_NEW = "set_uu_new";
 
 //    public static void cleanRed(Context ct) throws PackageManager.NameNotFoundException {
 //        int versionCode = PreferenceUtils.getInt("versionCode", 0);
@@ -360,32 +366,32 @@ public class Constants {
 //        }
 //    }
 
-	public static String INSTANT_MESSAGE = "instant_message";//转发消息的标记
-	public static String INSTANT_MESSAGE_FILE = "instant_message_file";//转发文件稍有不同
-	public static String INSTANT_SEND = "instant_send";//转发
-	public static String CHAT_MESSAGE_DELETE_ACTION = "chat_message_delete";
-	public static String CHAT_MESSAGE_DELETE_FRIENDID = "chat_message_delete_friendid";//删除消息要带过去的朋友id
-	public static String CHAT_REMOVE_MESSAGE_FALG = "CHAT_REMOVE_MESSAGE_FALG";
-	public static String CHAT_REMOVE_MESSAGE_POSITION = "CHAT_REMOVE_MESSAGE_POSITION";
-	public static String ONRECORDSTART = "onrecordstart";
-	public static String GROUP_JOIN_NOTICE = "group_join_notice";//加入新群的通知
+    public static String INSTANT_MESSAGE = "instant_message";//转发消息的标记
+    public static String INSTANT_MESSAGE_FILE = "instant_message_file";//转发文件稍有不同
+    public static String INSTANT_SEND = "instant_send";//转发
+    public static String CHAT_MESSAGE_DELETE_ACTION = "chat_message_delete";
+    public static String CHAT_MESSAGE_DELETE_FRIENDID = "chat_message_delete_friendid";//删除消息要带过去的朋友id
+    public static String CHAT_REMOVE_MESSAGE_FALG = "CHAT_REMOVE_MESSAGE_FALG";
+    public static String CHAT_REMOVE_MESSAGE_POSITION = "CHAT_REMOVE_MESSAGE_POSITION";
+    public static String ONRECORDSTART = "onrecordstart";
+    public static String GROUP_JOIN_NOTICE = "group_join_notice";//加入新群的通知
 
 
-	public static String GROUP_JOIN_NOTICE_ACTION = "group_join_notice_action";//加入新群的通知
-	public static String GROUP_JOIN_NOTICE_FRIEND_ID = "group_join_notice_friend_id";//加入新群发送朋友的id
+    public static String GROUP_JOIN_NOTICE_ACTION = "group_join_notice_action";//加入新群的通知
+    public static String GROUP_JOIN_NOTICE_FRIEND_ID = "group_join_notice_friend_id";//加入新群发送朋友的id
 
-	public static String OFFLINE_TIME = "offline_time";//离线时间
-	public static String LAST_OFFLINE_TIME = "last_offline_time";
+    public static String OFFLINE_TIME = "offline_time";//离线时间
+    public static String LAST_OFFLINE_TIME = "last_offline_time";
 
 
-	public static String AUDIO_PHONENUMBER = "audio_phonenumber";//语音
-	public static String IS_AUDIO_OR_VIDEO = "is_audio_or_video";//是语音还是视频
+    public static String AUDIO_PHONENUMBER = "audio_phonenumber";//语音
+    public static String IS_AUDIO_OR_VIDEO = "is_audio_or_video";//是语音还是视频
 
 
-	public final static int REQUEST_MANAGE_ALL_SUBSCRIPTON = 101;
-	public final static int RESULT_MANAGE_ALL_SUBSCRIPTION = 102;
+    public final static int REQUEST_MANAGE_ALL_SUBSCRIPTON = 101;
+    public final static int RESULT_MANAGE_ALL_SUBSCRIPTION = 102;
 
 
-	public static final String ACTION_LOCATION_CHANGE = "action_location_Change";//位置改变发送广播
-	public static final String ACTION_WORK_SIGNIN = "action_work_signin";//当时间合理的时候回调计算内勤打卡
+    public static final String ACTION_LOCATION_CHANGE = "action_location_Change";//位置改变发送广播
+    public static final String ACTION_WORK_SIGNIN = "action_work_signin";//当时间合理的时候回调计算内勤打卡
 }

app_core/common/src/main/java/com/core/net/http/ViewUtil.java

@@ -181,7 +181,6 @@ public class ViewUtil {
                 boolean isNetHas = NetUtils.isNetWorkConnected(MyApplication.getInstance());
                 if (isNetHas) {
                     String result = getDataFromServer(url, params, request);
-                    LogUtil.d("result:" + result);
                     if (result != null) {
                         if (bundle == null || message == null) {
                             Bundle bundle = new Bundle();
@@ -565,7 +564,7 @@ public class ViewUtil {
      */
     public static void LoginSucess(Message msg) {
         String json = msg.getData().getString("result");
-        LogUtil.d("Test", "管理平台登录：" + json);
+        LogUtil.prinlnLongMsg("HttpLogs", "管理平台登录：" + json);
         CommonUtil.setSharedPreferences(ct, "loginJson", json);
         String phone = msg.getData().getString("phone");
         String password = msg.getData().getString("password");

app_core/common/src/main/java/com/core/net/http/http/OAHttpHelper.java

@@ -119,7 +119,7 @@ public class OAHttpHelper extends Handler {
     }
 
     private void loadIM(Request request, OnHttpResultListener listener) throws Exception {
-        String url = Constants.IM_BASE_URL + request.getUrl();
+        String url = Constants.IM_BASE_URL() + request.getUrl();
         Bundle bundle = getBundle(request);
         if (listener != null)
             bundle.putSerializable("listener", listener);

app_core/common/src/main/java/com/core/widget/view/selectcalendar/SelectCalendarActivity.java

@@ -1203,7 +1203,7 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
      */
     private void getBookingTotalTime(String imId) {
         if (type == 1) {
-            String url = Constants.IM_BASE_URL + "user/appUsertime";
+            String url = Constants.IM_BASE_URL() + "user/appUsertime";
             Map<String, Object> params = new HashMap<>();
             params.put("token", MyApplication.getInstance().mAccessToken);
             params.put("userid", imId);
@@ -1220,7 +1220,7 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
      */
     public void getBookingTime(String imId) {
         if (type == 1) {
-            String url = Constants.IM_BASE_URL + "user/appBusytime";
+            String url = Constants.IM_BASE_URL() + "user/appBusytime";
             String ym;
             if (startDate) {
                 ym = DateFormatUtil.formatChange(v_date_start.getText().toString().replace("-", ""), "yyyyMMdd");
@@ -1347,7 +1347,7 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
         LogUtil.d("HttpLogs", "commonid:" + serviceId);
         LogUtil.d("HttpLogs", "ym:" + ym);
         LogUtil.d("HttpLogs", "companyId:" + companyId);
-        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL).isDebug(true).build();
+        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build();
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appServiceBusytime")
                 .add("type", businessType)

app_core/common/src/main/res/layout/pop_crm_list.xml

@@ -5,17 +5,17 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     app:sl_cornerRadius="0dp"
-    app:sl_dx="-1dp"
-    app:sl_dy="3dp"
+    app:sl_dx="0dp"
+    app:sl_dy="0dp"
     app:sl_shadowColor="@color/shadow"
-    app:sl_shadowRadius="3dp">
+    app:sl_shadowRadius="1dp">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/shape_pop_ll"
         android:orientation="vertical"
-        android:padding="0.5dp">
+        android:padding="0.1dp">
 
         <ListView
             android:id="@+id/mList"

app_modular/appbooking/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.modular.booking"
-          xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.modular.booking">
 
     <application>
         <activity android:name=".activity.business.BBookingAddActivity" />
@@ -16,6 +16,7 @@
             android:name=".activity.services.BServiceSearchActivity"
             android:windowSoftInputMode="adjustPan|stateHidden" />
         <activity android:name=".activity.services.BServiceDetailActivity" />
+        <activity android:name=".activity.utils.GridSelectActivity"></activity>
     </application>
 
 </manifest>

app_modular/appbooking/src/main/java/com/modular/booking/activity/business/BBookingAddActivity.java

@@ -349,7 +349,7 @@ public class BBookingAddActivity extends OABaseActivity implements View.OnClickL
                 "}\n";
         showLoading();
         LogUtil.d("HttpLogs","map:"+map);
-        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL).isDebug(true).build();
+        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build();
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appSaveBusiness")
                 .header("Content-Type", "application/x-www-form-urlencoded;charset=UTF-8")
@@ -412,7 +412,7 @@ public class BBookingAddActivity extends OABaseActivity implements View.OnClickL
                 "\"ab_latitude\":\"" + latitude + "\"" +
                 "}\n";
         LogUtil.d("HttpLogs","map:"+map);
-        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL).isDebug(true).build();
+        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build();
         httpClient.Api().send(new HttpClient.Builder()
                 .url("/user/appUpdateBusiness")
                 .header("Content-Type", "application/x-www-form-urlencoded;charset=UTF-8")

app_modular/appbooking/src/main/java/com/modular/booking/activity/business/BBookingDetailActivity.java

@@ -429,7 +429,7 @@ public class BBookingDetailActivity extends OABaseActivity implements View.OnCli
         //map包括planids 个人计划id,bplanids商务计划id,userids共享人员imid，多个id用逗号连接
         String map="{\"planids\":\"" +"" + "\",\"bplanids\":\""+id+"\",\"userids\":\""+imids+"\"}";
         LogUtil.d("HttpLogs","map:"+map);
-        HttpClient httpClient=new HttpClient.Builder(Constants.IM_BASE_URL).isDebug(true).build();
+        HttpClient httpClient=new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build();
         httpClient.Api().send(new HttpClient.Builder()
         .url("/user/appBatchShare")
         .add("token", MyApplication.getInstance().mAccessToken)
@@ -552,7 +552,7 @@ public class BBookingDetailActivity extends OABaseActivity implements View.OnCli
     public void actionOrder(String id, String map){
         LogUtil.d("HttpLogs","id:"+id);
         LogUtil.d("HttpLogs","map:"+map);
-        HttpClient httpClient=new HttpClient.Builder(Constants.IM_BASE_URL).isDebug(true).build();
+        HttpClient httpClient=new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build();
         httpClient.Api().send(new HttpClient.Builder()
                 .url("/user/appDoBusiness")
                 .header("Content-Type","application/x-www-form-urlencoded;charset=UTF-8")

app_modular/appbooking/src/main/java/com/modular/booking/activity/services/BServiceAddActivity.java

@@ -1,7 +1,11 @@
 package com.modular.booking.activity.services;
 
+import android.Manifest;
 import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.net.Uri;
 import android.os.Bundle;
+import android.support.v4.app.ActivityCompat;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.WindowManager;
@@ -10,6 +14,7 @@ import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.afollestad.materialdialogs.MaterialDialog;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -17,12 +22,14 @@ import com.android.volley.AuthFailureError;
 import com.android.volley.Request;
 import com.android.volley.Response;
 import com.android.volley.VolleyError;
+import com.baidu.mapapi.model.LatLng;
 import com.common.LogUtil;
 import com.common.config.BaseConfig;
 import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
+import com.common.system.PermissionUtil;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.OABaseActivity;
@@ -126,6 +133,10 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
         submit_btn.setOnClickListener(this);
         et_book_name.setText(CommonUtil.getName());
         et_book_phone.setText(MyApplication.getInstance().mLoginUser.getTelephone());
+        
+        et_book_phone.setOnClickListener(this);
+        tv_sub.setOnClickListener(this);
+        tv_title.setOnClickListener(this);
     }
 
     private boolean isEdited = true;
@@ -284,6 +295,51 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
     @Override
     public void onClick(View v) {
         int id = v.getId();
+        if (id==R.id.tv_title){
+            //简介
+//            ToastMessage("简介");
+            try {
+                if (!StringUtil.isEmpty(dataService)){
+                    showDialog(JSON.parseObject(dataService).getString("sc_introduce"));
+                }else{
+                    showDialog(model.getIntroduce());
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+
+        }else if (id==R.id.tv_sub){
+            //地图定位(需要经纬度)
+            try {
+                if (model!=null){
+                    if(!StringUtil.isEmpty(model.getLatitude())){
+                        LatLng latLng=new LatLng(Double.valueOf(model.getLatitude()),
+                                Double.valueOf(model.getLongitude()));
+                        Intent  intent = new Intent("com.modular.appworks.NavigationActivity");
+                        intent.putExtra("toLocation", latLng);
+                        startActivityForResult(intent, 0x23);
+                    }else{
+                        LatLng latLng=new LatLng(Double.valueOf(JSON.parseObject(dataService).getString("sc_latitude")),
+                                Double.valueOf(JSON.parseObject(dataService).getString("sc_longitude")));
+                        Intent  intent = new Intent("com.modular.appworks.NavigationActivity");
+                        intent.putExtra("toLocation", latLng);
+                        startActivityForResult(intent, 0x23);
+                    }
+                }else{
+                    LatLng latLng=new LatLng(Double.valueOf(JSON.parseObject(dataService).getString("sc_latitude")),
+                            Double.valueOf(JSON.parseObject(dataService).getString("sc_longitude")));
+                    Intent  intent = new Intent("com.modular.appworks.NavigationActivity");
+                    intent.putExtra("toLocation", latLng);
+                    startActivityForResult(intent, 0x23);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }else if(id==R.id.et_book_phone){
+            //打电话
+            phoneAction(et_book_phone.getText().toString());
+        }
+        
         //选择时间（用餐时间、唱歌时间....）
         if (id == R.id.tv_food_times
                 || id == R.id.tv_hair_times
@@ -382,7 +438,7 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
 
     public void cancle(String id) {
         LogUtil.d(TAG, "id:" + id);
-        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL).build();
+        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).build();
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appCancelService")
                 .add("id", id)
@@ -481,7 +537,7 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
     //load 服务项目
     public void loadStoreService(final CharSequence title) {
         progressDialog.show();
-        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL)
+        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL())
                 .isDebug(BaseConfig.isDebug()).build();
         httpClient.Api().send(new HttpClient.Builder()
                 .url("/user/appStoreService")
@@ -531,7 +587,7 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
     //load 选择服务人员
     public void loadServiceMan(String serviceId, final String title) {
         progressDialog.show();
-        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL).isDebug(BaseConfig.isDebug()).build();
+        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(BaseConfig.isDebug()).build();
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appStoreman")
                 .add("companyid", model.getCompanyid())
@@ -601,12 +657,12 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
 //			if (1 == 1) {
 //				submiting = false;
 //				progressDialog.dismiss();
-//				return;
+//				return;`
 //			}
         }
         final String startTime = map.get("sb_endtime").toString();
         new HttpClient
-                .Builder(Constants.IM_BASE_URL)
+                .Builder(Constants.IM_BASE_URL())
                 .isDebug(BaseConfig.isDebug())
                 .build()
                 .Api()
@@ -851,7 +907,7 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
             et_book_phone.setText(data.getString("sb_telephone"));
             et_book_name.setText(data.getString("sb_recordor"));
             et_book_notes.setText(data.getString("sb_remark"));
-            et_book_phone.setEnabled(false);
+            et_book_phone.setKeyListener(null);
             et_book_name.setEnabled(false);
             et_book_notes.setEnabled(false);
         }
@@ -1108,4 +1164,57 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
         };
         MyApplication.getInstance().getFastVolley().addDefaultRequest("Volley", request);
     }
+
+
+    public void phoneAction(final String phone) {
+        MaterialDialog dialog = new MaterialDialog.Builder(this)
+                .title(getString(R.string.dialog_confim_phone))
+                .content(getString(R.string.dialog_phone) + ":" + phone)
+                .positiveText(getString(R.string.dialog_phone_action))
+                .negativeText(getString(R.string.common_cancel))
+                .autoDismiss(false)
+                .callback(new MaterialDialog.ButtonCallback() {
+                    @Override
+                    public void onPositive(MaterialDialog dialog) {
+                        // 用intent启动拨打电话
+                        if (PermissionUtil.lacksPermissions(ct, Manifest.permission.CALL_PHONE)) {
+                            PermissionUtil.requestPermission(activity, PermissionUtil.DEFAULT_REQUEST, Manifest.permission.CALL_PHONE);
+                        } else {
+                            if (!StringUtil.isMobileNumber(phone)) {
+                                ToastUtil.showToast(ct, R.string.phone_number_format_error);
+                                return;
+                            }
+                            if (ActivityCompat.checkSelfPermission(activity, Manifest.permission.CALL_PHONE) != PackageManager.PERMISSION_GRANTED) {
+                                ToastUtil.showToast(ct, R.string.not_system_permission);
+                                return;
+                            }
+                            activity.startActivity(new Intent(Intent.ACTION_CALL, Uri.parse("tel:" + phone)));
+                        }
+
+                    }
+
+                    @Override
+                    public void onNegative(MaterialDialog dialog) {
+                        super.onNegative(dialog);
+                        dialog.dismiss();
+                    }
+                }).build();
+
+        dialog.show();
+    }
+    
+    public void showDialog(String content){
+        MaterialDialog dialog = new MaterialDialog.Builder(this)
+                .content(content)
+                .positiveText("知道了")
+                .callback(new MaterialDialog.ButtonCallback() {
+                    @Override
+                    public void onPositive(MaterialDialog dialog) {
+                        dialog.dismiss();
+                    }
+                })
+                .build();
+        dialog.show();
+                
+    }
 }

app_modular/appbooking/src/main/java/com/modular/booking/activity/services/BServiceDetailActivity.java

@@ -144,7 +144,7 @@ public class BServiceDetailActivity extends OABaseActivity implements View.OnCli
 			}
 		}
 
-		mHttpClient = new HttpClient.Builder(Constants.IM_BASE_URL).isDebug(true).build();
+		mHttpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build();
 		mStoremanModels = new ArrayList<>();
 		mStoremanListAdapter = new ItemBserviceStoremanListAdapter(this, mStoremanModels);
 		mStoremanListAdapter.setModel(model);

app_modular/appbooking/src/main/java/com/modular/booking/activity/services/BServiceListActivity.java

@@ -178,7 +178,7 @@ public class BServiceListActivity extends OABaseActivity {
     
     public void loadListData(String type,int page){
         MyApplication.getInstance().getBdLocationHelper().requestLocation();
-        HttpClient httpClient=new HttpClient.Builder(Constants.IM_BASE_URL).isDebug(true).build();
+        HttpClient httpClient=new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build();
         httpClient.Api().send(new HttpClient.Builder()
                 .url("/user/appStoreList")
                 .add("type",type)
@@ -206,6 +206,9 @@ public class BServiceListActivity extends OABaseActivity {
                             sbListModel.setIndustrycode(mObject.getString("sc_industrycode"));
                             String sc_latitude=mObject.getString("sc_latitude");
                             String sc_longitude=mObject.getString("sc_longitude");
+                            sbListModel.setLatitude(sc_latitude);
+                            sbListModel.setLongitude(sc_longitude);
+                            sbListModel.setIntroduce(mObject.getString("sc_introduce"));
                             LatLng latLng = new LatLng(Double.valueOf(sc_latitude), Double.valueOf(sc_longitude));
                             float distance = BaiduMapUtil.getInstence().autoDistance(latLng);
                             sbListModel.setDistance(String.valueOf(DistanceUtils.mToKm(distance,"#.0")));

app_modular/appbooking/src/main/java/com/modular/booking/activity/services/BServiceSearchActivity.java

@@ -153,7 +153,7 @@ public class BServiceSearchActivity extends OABaseActivity implements View.OnCli
     }
 
     public void loadListData(final int pageIndex) {
-        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL).isDebug(true).build();
+        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build();
         httpClient.Api().send(new HttpClient.Builder()
                 .url("/user/appStoreList")
                 .add("type", "0")
@@ -186,6 +186,9 @@ public class BServiceSearchActivity extends OABaseActivity implements View.OnCli
                                 sbListModel.setCompanyid(mObject.getString("sc_uu"));
                                 String sc_latitude=mObject.getString("sc_latitude");
                                 String sc_longitude=mObject.getString("sc_longitude");
+                                sbListModel.setLatitude(sc_latitude);
+                                sbListModel.setLongitude(sc_longitude);
+                                sbListModel.setIntroduce(mObject.getString("sc_introduce"));
                                 LatLng latLng = new LatLng(Double.valueOf(sc_latitude), Double.valueOf(sc_longitude));
                                 float distance = BaiduMapUtil.getInstence().autoDistance(latLng);
                                 sbListModel.setDistance(String.valueOf(DistanceUtils.mToKm(distance,"#.0")));

app_modular/appbooking/src/main/java/com/modular/booking/activity/services/BServicesActivity.java

@@ -1,16 +1,23 @@
 package com.modular.booking.activity.services;
 
+import android.content.Context;
 import android.content.Intent;
+import android.graphics.Color;
+import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-import android.os.Handler;
 import android.support.v7.app.ActionBar;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
 import android.widget.AdapterView;
 import android.widget.ImageView;
 import android.widget.ListView;
+import android.widget.PopupWindow;
 import android.widget.RelativeLayout;
+import android.widget.SimpleAdapter;
+import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -19,6 +26,7 @@ import com.baidu.mapapi.model.LatLng;
 import com.common.LogUtil;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
+import com.common.system.DisplayUtil;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.OABaseActivity;
@@ -40,7 +48,9 @@ import com.modular.booking.model.SBMenuModel;
 import com.modular.booking.widget.ObservableScrollView;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @desc:服务预约
@@ -55,11 +65,12 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
     private DrawableCenterTextView mSearchTv;
     private RelativeLayout mRelativeTop;
     private Drawable drawBg;
-    private int pageSize=1;
+    private int pageSize = 1;
+    private TextView tv_distance;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-       // getWindow().requestFeature(Window.FEATURE_ACTION_BAR_OVERLAY);
+        // getWindow().requestFeature(Window.FEATURE_ACTION_BAR_OVERLAY);
         super.onCreate(savedInstanceState);
 //        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
 //            Window window = getWindow();
@@ -77,9 +88,9 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
 //            //window.setStatusBarColor(Color.TRANSPARENT);
 //            window.setNavigationBarColor(Color.TRANSPARENT);
 //        }
-       
+
         setContentView(R.layout.activity_bservices);
-        
+
         initView();
         initEvent();
         intData();
@@ -92,13 +103,14 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
         mRelativeTop = (RelativeLayout) view.findViewById(R.id.book_service_action);
         ActionBar bar = this.getSupportActionBar();
         bar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
-        drawBg= getResources().getDrawable(R.color.antionbarcolor);
-      //  drawBg.setAlpha(0);
-      // bar.setSplitBackgroundDrawable(new ColorDrawable(Color.parseColor("#330000ff")));
+        drawBg = getResources().getDrawable(R.color.antionbarcolor);
+        //  drawBg.setAlpha(0);
+        // bar.setSplitBackgroundDrawable(new ColorDrawable(Color.parseColor("#330000ff")));
         bar.setBackgroundDrawable(drawBg);
         bar.setCustomView(view);
 
         mListView = (PullToRefreshListView) findViewById(R.id.mListView);
+    
         initHeader();
         mListAdapter = new ItemBserviceListAdapter(mContext, modelList);
         mListView.setAdapter(mListAdapter);
@@ -107,6 +119,7 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
     private void initHeader() {
         View headview = LayoutInflater.from(ct).inflate(R.layout.header_bservices_grid, null);
         mListView.getRefreshableView().addHeaderView(headview);
+        tv_distance =(TextView)findViewById(R.id.tv_distance);
         MyGridView mGridView = (MyGridView) findViewById(R.id.mGridView);
         List<SBMenuModel> menuModels = new ArrayList<>();
         SBMenuModel menuModel = new SBMenuModel();
@@ -114,6 +127,7 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
         menuModel.setCode("10003");
         menuModel.setIcon(R.drawable.icon_food);
         menuModel.setDesc("美味齐全");
+        menuModel.setDescColor(Color.parseColor("#FDC34F"));
         menuModel.setTitle("餐饮");
         menuModels.add(menuModel);
 
@@ -123,6 +137,7 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
         menuModel.setIcon(R.drawable.icon_hair);
         menuModel.setDesc("时尚潮流");
         menuModel.setTitle("美容美发");
+        menuModel.setDescColor(Color.parseColor("#FE7F19"));
         menuModels.add(menuModel);
 
         menuModel = new SBMenuModel();
@@ -131,6 +146,7 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
         menuModel.setIcon(R.drawable.icon_ktv);
         menuModel.setDesc("音乐节");
         menuModel.setTitle("KTV");
+        menuModel.setDescColor(Color.parseColor("#2ED3AE"));
         menuModels.add(menuModel);
 
         menuModel = new SBMenuModel();
@@ -139,6 +155,7 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
         menuModel.setIcon(R.drawable.icon_sport);
         menuModel.setDesc("hi起来");
         menuModel.setTitle("运动健身");
+        menuModel.setDescColor(Color.parseColor("#F96173"));
         menuModels.add(menuModel);
 
         menuModel = new SBMenuModel();
@@ -147,6 +164,7 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
         menuModel.setIcon(R.drawable.icon_club);
         menuModel.setDesc("预约有优惠");
         menuModel.setTitle("会所");
+        menuModel.setDescColor(Color.parseColor("#65EA6E"));
         menuModels.add(menuModel);
 
         menuModel = new SBMenuModel();
@@ -155,6 +173,7 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
         menuModel.setIcon(R.drawable.icon_hospital);
         menuModel.setDesc("您的健康助手");
         menuModel.setTitle("医院挂号");
+        menuModel.setDescColor(Color.parseColor("#D357DE"));
         menuModels.add(menuModel);
 
         itemAdapter = new ItemBserviceHeaderAdapter(mContext, menuModels);
@@ -190,29 +209,30 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
     @Override
     protected void onPause() {
         super.onPause();
-        new Handler().postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                drawBg.setAlpha(255);
-            }
-        },10);
+//        new Handler().postDelayed(new Runnable() {
+//            @Override
+//            public void run() {
+//                drawBg.setAlpha(255);
+//            }
+//        }, 10);
     }
-    
+
     private void initEvent() {
         mListView.setMode(PullToRefreshBase.Mode.BOTH);
+        tv_distance.setOnClickListener(this);
         mListView.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener2<ListView>() {
 
 
             @Override
             public void onPullDownToRefresh(PullToRefreshBase<ListView> refreshView) {
-                pageSize=1;
+                pageSize = 1;
                 loadListData(pageSize);
             }
 
             @Override
             public void onPullUpToRefresh(PullToRefreshBase<ListView> refreshView) {
-              pageSize++;
-              loadListData(pageSize);
+                pageSize++;
+                loadListData(pageSize);
             }
         });
         mListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@@ -293,8 +313,8 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
 //    }
 
     public void loadListData(final int pageSize) {
-  
-        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL).isDebug(true).build();
+
+        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build();
         httpClient.Api().send(new HttpClient.Builder()
                 .url("/user/appStoreList")
                 .add("type", "0")
@@ -306,7 +326,7 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
             public void onResponse(Object o) {
                 mListView.onRefreshComplete();
                 try {
-                    if (pageSize==1) {
+                    if (pageSize == 1) {
                         modelList.clear();
                     }
                     LogUtil.d("o.toString" + o.toString());
@@ -325,8 +345,12 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
                                 sbListModel.setIndustrycode(mObject.getString("sc_industrycode"));
                                 sbListModel.setCompanyid(mObject.getString("sc_uu"));
                                 sbListModel.setPhone(mObject.getString("sc_telephone"));
+                            
                                 String sc_latitude = mObject.getString("sc_latitude");
                                 String sc_longitude = mObject.getString("sc_longitude");
+                                sbListModel.setLatitude(sc_latitude);
+                                sbListModel.setLongitude(sc_longitude);
+                                sbListModel.setIntroduce(mObject.getString("sc_introduce"));
                                 LatLng latLng = new LatLng(Double.valueOf(sc_latitude), Double.valueOf(sc_longitude));
                                 float distance = BaiduMapUtil.getInstence().autoDistance(latLng);
                                 sbListModel.setDistance(String.valueOf(DistanceUtils.mToKm(distance, "#.0")));
@@ -338,19 +362,19 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
                                 modelList.add(sbListModel);
                             }
                             LogUtil.d("myTest", JSON.toJSONString(modelList));
-                            if (mListAdapter==null) {
+                            if (mListAdapter == null) {
                                 mListAdapter = new ItemBserviceListAdapter(mContext, modelList);
                                 mListView.setAdapter(mListAdapter);
-                            }else{
+                            } else {
                                 mListAdapter.notifyDataSetChanged();
                             }
                             //mListAdapter.notifyDataSetChanged();
-                        }else{
+                        } else {
                             ToastMessage("没有更多数据");
                         }
                     }
                 } catch (Exception e) {
-                         e.printStackTrace();
+                    e.printStackTrace();
                 }
             }
         }));
@@ -365,9 +389,90 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
             Intent intent = new Intent();
             intent.setClass(this, BServiceSearchActivity.class);
             startActivity(intent);
-        } else {
+        } else if (id==R.id.tv_distance){
+            //搜索距离-showPopupWindow
+            showPopupWindow(v);
+        }
+    }
 
+    
+    //距离popupWindow
+    private PopupWindow popupWindow = null;
+
+    public void showPopupWindow(View parent) {
+        View view = null;
+        WindowManager windowManager = (WindowManager) getSystemService(Context.WINDOW_SERVICE);
+        if (popupWindow == null) {
+            LayoutInflater layoutInflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+            view = layoutInflater.inflate(R.layout.pop_crm_list, null);
+            ListView plist = (ListView) view.findViewById(R.id.mList);
+            SimpleAdapter adapter = new SimpleAdapter(ct, getPopData(),
+                    R.layout.item_pop_list, new String[]{"item_name"}, new int[]{R.id.tv_item_name});
+            plist.setAdapter(adapter);
+            plist.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+                @Override
+                public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                    popupWindow.dismiss();
+                    switch (position) {
+                        case 0:
+            
+                            break;
+                        case 1:
+                        
+                            break;
+                        case 2:
+                        
+                            break;
+                        default:
+                           
+                            break;
+                    }
+                }
+            });
+            popupWindow = new PopupWindow(view, windowManager.getDefaultDisplay().getWidth() / 3, windowManager.getDefaultDisplay().getHeight() / 3);
         }
+        popupWindow.setFocusable(true);
+        popupWindow.setOutsideTouchable(true);
+        popupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
+            @Override
+            public void onDismiss() {
+                DisplayUtil.backgroundAlpha(activity, 1f);
+            }
+        });
+        DisplayUtil.backgroundAlpha(this, 1f);
+        popupWindow.setBackgroundDrawable(new BitmapDrawable());
+        popupWindow.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
+        // 显示的位置为:屏幕的宽度的一半-PopupWindow的高度的一半
+        popupWindow.showAsDropDown(parent, windowManager.getDefaultDisplay().getWidth(), 0);
+    }
+
+    private List<Map<String, Object>> getPopData() {
+        List<Map<String, Object>> list = new ArrayList<>();
+        Map<String, Object> map = new HashMap<>();
+        map.put("item_name","0.5km");
+        list.add(map);
+        map = new HashMap<>();
+        map.put("item_name","1km");
+        list.add(map);
+        map = new HashMap<>();
+        map.put("item_name", "2km");
+        list.add(map);
+        map = new HashMap<>();
+        map.put("item_name", "5km");
+        list.add(map);
+        map = new HashMap<>();
+        map.put("item_name", "10km");
+        list.add(map);
+        map = new HashMap<>();
+        map.put("item_name", "20km");
+        list.add(map);
+        map = new HashMap<>();
+        map.put("item_name", "30km");
+        list.add(map);
+        map = new HashMap<>();
+        map.put("item_name", "深圳");
+        list.add(map);
+        return list;
     }
 
     @Override

app_modular/appbooking/src/main/java/com/modular/booking/activity/shares/MuiltSelectShareActivity.java

@@ -157,7 +157,7 @@ public class MuiltSelectShareActivity extends OABaseActivity {
         //map包括planids 个人计划id,bplanids商务计划id,userids共享人员imid，多个id用逗号连接
         String map = "{\"planids\":\"" + planids + "\",\"bplanids\":\"" + bplanids + "\",\"userids\":\"" + imids + "\"}";
         LogUtil.d("HttpLogs", "map:" + map);
-        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL).isDebug(true).build();
+        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build();
         httpClient.Api().send(new HttpClient.Builder()
                 .url("/user/appBatchShare")
                 .add("token", MyApplication.getInstance().mAccessToken)

app_modular/appbooking/src/main/java/com/modular/booking/activity/utils/GridSelectActivity.java

@@ -0,0 +1,18 @@
+package com.modular.booking.activity.utils;
+
+import android.os.Bundle;
+
+import com.core.base.OABaseActivity;
+
+/**
+  * @desc:功能界面  表格选择界面
+  * @author：Arison on 2017/11/1
+  */
+public class GridSelectActivity extends OABaseActivity {
+    
+    
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
+}

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

@@ -60,6 +60,7 @@ public class ItemBserviceHeaderAdapter extends BaseAdapter {
     private void initializeViews(SBMenuModel object, ViewHolder holder) {
        holder.tvTitle.setText(object.getTitle());
        holder.tvDesc.setText(object.getDesc());
+       holder.tvDesc.setTextColor(object.getDescColor());
       // holder.ivMenu.setBackgroundResource(object.getIcon());
        holder.ivMenu.setImageResource(object.getIcon());
        holder.menuModel=object;

app_modular/appbooking/src/main/java/com/modular/booking/model/SBListModel.java

@@ -28,6 +28,8 @@ public class SBListModel implements Parcelable {
 	private String type;//行业名
 	private String industrycode;//行业号码
 	private String stars;
+	private String latitude;
+	private String longitude;
 	private String distance;
 	private String cash;
 	private String phone;//手机号码
@@ -35,6 +37,7 @@ public class SBListModel implements Parcelable {
 	private String imid;//新加字段
 	private String companyid;//新加字段
 	private String address;//新加字段
+	private String introduce;//简介
 	private int id;//新加字段
 	private String starttime;
 	private String	 endtime;
@@ -79,10 +82,26 @@ public class SBListModel implements Parcelable {
 		this.stars = stars;
 	}
 
+	public String getLatitude() {
+		return latitude;
+	}
+
+	public void setLatitude(String latitude) {
+		this.latitude = latitude;
+	}
+
+	public String getLongitude() {
+		return longitude;
+	}
+
+	public void setLongitude(String longitude) {
+		this.longitude = longitude;
+	}
+
 	public String getDistance() {
 		return distance;
 	}
-
+  
 	public void setDistance(String distance) {
 		this.distance = distance;
 	}
@@ -143,6 +162,14 @@ public class SBListModel implements Parcelable {
 		this.industrycode = industrycode;
 	}
 
+	public String getIntroduce() {
+		return introduce;
+	}
+
+	public void setIntroduce(String introduce) {
+		this.introduce = introduce;
+	}
+
 	public SBListModel() {
 	}
 
@@ -180,6 +207,8 @@ public class SBListModel implements Parcelable {
 		dest.writeString(this.type);
 		dest.writeString(this.industrycode);
 		dest.writeString(this.stars);
+		dest.writeString(this.latitude);
+		dest.writeString(this.longitude);
 		dest.writeString(this.distance);
 		dest.writeString(this.cash);
 		dest.writeString(this.phone);
@@ -187,6 +216,7 @@ public class SBListModel implements Parcelable {
 		dest.writeString(this.imid);
 		dest.writeString(this.companyid);
 		dest.writeString(this.address);
+		dest.writeString(this.introduce);
 		dest.writeInt(this.id);
 		dest.writeString(this.starttime);
 		dest.writeString(this.endtime);
@@ -198,6 +228,8 @@ public class SBListModel implements Parcelable {
 		this.type = in.readString();
 		this.industrycode = in.readString();
 		this.stars = in.readString();
+		this.latitude = in.readString();
+		this.longitude = in.readString();
 		this.distance = in.readString();
 		this.cash = in.readString();
 		this.phone = in.readString();
@@ -205,6 +237,7 @@ public class SBListModel implements Parcelable {
 		this.imid = in.readString();
 		this.companyid = in.readString();
 		this.address = in.readString();
+		this.introduce = in.readString();
 		this.id = in.readInt();
 		this.starttime = in.readString();
 		this.endtime = in.readString();

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

@@ -55,6 +55,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="********"
+                    android:gravity="center_vertical"
+                    android:drawableRight="@drawable/icon_detail"
                     android:textColor="@color/black"
                     android:textSize="20sp"
                     android:textStyle="bold"/>
@@ -63,7 +65,9 @@
                     android:id="@+id/tv_sub"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
                     android:text="********"
+                    android:drawableRight="@drawable/icon_map"
                     android:textColor="@color/black"
                     android:textSize="14sp"/>
             </LinearLayout>
@@ -587,9 +591,10 @@
                 <EditText
                     android:id="@+id/et_book_phone"
                     style="@style/item_menu_input"
-                    android:layout_width="290dp"
-                    android:layout_toRightOf="@id/tag_book_phone"
-                    android:drawablePadding="6dp"
+                    android:layout_width="110dp"
+                    android:drawablePadding="2dp"
+                    android:drawableLeft="@drawable/icon_tel"
+                    android:textColor="#0CB88C"
                     android:ellipsize="end"
                     android:hint="@string/common_input2"
                     android:inputType="phone"/>

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

@@ -0,0 +1,17 @@
+<?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">
+    <com.core.widget.NScrollerGridView
+        android:id="@+id/gv_topic"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/white"
+        android:horizontalSpacing="15dp"
+        android:numColumns="4"
+        android:paddingLeft="15dp"
+        android:paddingRight="15dp"
+        android:paddingTop="5dp"
+        android:scrollbars="none"
+        android:verticalSpacing="10dp" />
+</RelativeLayout>

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

@@ -23,14 +23,30 @@
         android:background="@color/white"
         android:gravity="center"
         android:orientation="vertical">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:gravity="center"
-            android:padding="5dp"
-            android:text="@string/service_hot_list" />
+         <RelativeLayout
+             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"
+                 android:gravity="center"
+                 android:layout_centerInParent="true"
+                 android:padding="5dp"
+                 android:text="@string/service_hot_list" />
+             <TextView
+                 android:id="@+id/tv_distance"
+                 android:layout_width="wrap_content"
+                 android:layout_height="wrap_content"
+                 android:layout_centerVertical="true"
+                 android:layout_alignParentRight="true"
+                 android:layout_marginRight="5dp"
+                 android:drawableRight="@drawable/icon_distances"
+                 android:padding="5dp"
+                 android:text="距离" />
+         </RelativeLayout>
+       
 
         <View
             android:layout_width="match_parent"

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

@@ -60,8 +60,7 @@
         android:layout_height="wrap_content"
         android:paddingLeft="10dp"
         android:paddingRight="10dp"
-        android:paddingBottom="10dp"
-       >
+        android:paddingBottom="10dp">
         <TextView
             android:id="@+id/tvReason"
             android:layout_width="wrap_content"

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" 
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</LinearLayout>

app_modular/appcontact/src/main/java/com/uas/appcontact/ui/activity/ContactsActivity.java

@@ -852,7 +852,7 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
     }
 
     private void searchContactsByNet(String key) {
-        String url = Constants.IM_BASE_URL + "user/appSearch";
+        String url = Constants.IM_BASE_URL() + "user/appSearch";
         Map<String, Object> params = new HashMap<>();
         params.put("token", MyApplication.getInstance().mAccessToken);
         params.put("name", key);
@@ -922,7 +922,7 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
                 }
             }
 
-            HttpClient httpClient = new HttpClient.Builder().url(Constants.IM_BASE_URL)
+            HttpClient httpClient = new HttpClient.Builder().url(Constants.IM_BASE_URL())
                     .add("comParam", "param")
                     .isDebug(true).build(true);
             httpClient.Api().send(new HttpClient.Builder()

app_modular/applogin/src/main/java/com/modular/login/activity/LoginActivity.java

@@ -40,7 +40,6 @@ import java.util.HashMap;
 import de.hdodenhof.circleimageview.CircleImageView;
 
 
-
 public class LoginActivity extends BaseActivity implements View.OnClickListener {
 
     private String PASS_WORDS = "PASS_WORDS";
@@ -77,7 +76,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
         if (!MyApplication.getInstance().getBdLocationHelper().isLocationUpdate()) {
             MyApplication.getInstance().getBdLocationHelper().requestLocation();
         }
-        if (ViewUtil.mdProcessDialog!=null){
+        if (ViewUtil.mdProcessDialog != null) {
             ViewUtil.mdProcessDialog.cancel();
         }
     }
@@ -120,11 +119,11 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
 
     @Override
     public void onClick(View v) {
-        if (v.getId() == R.id.login_btn){
+        if (v.getId() == R.id.login_btn) {
             login();
-        }else if (v.getId() == R.id.tv_register){
-            startActivity(new Intent(mContext,RegisterSelectActivity.class));
-        }else if (v.getId() == R.id.tv_findPwd){
+        } else if (v.getId() == R.id.tv_register) {
+            startActivity(new Intent(mContext, RegisterSelectActivity.class));
+        } else if (v.getId() == R.id.tv_findPwd) {
             IntentUtils.webLinks(mContext,
                     "https://account.ubtob.com/user/pwd?appId=home&returnURL=http%3A%2F%2Fwww.ubtob.com%2F",
                     getString(R.string.login_getpwd));
@@ -218,7 +217,6 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
     }
 
 
-
     private void login_manage(String phone, String password) {
         if (TextUtils.isEmpty(phone)) {
             return;

app_modular/appme/src/main/java/com/uas/appme/settings/activity/BRestActivity.java

@@ -205,7 +205,7 @@ public class BRestActivity extends BaseActivity implements BRestAdapter.OnItemCl
 	//load 选择服务人员
 	public void loadServiceMan() {
 		progressDialog.show();
-		new HttpClient.Builder(Constants.IM_BASE_URL)
+		new HttpClient.Builder(Constants.IM_BASE_URL())
 				.isDebug(BaseConfig.isDebug())
 				.build()
 				.Api()
@@ -263,7 +263,7 @@ public class BRestActivity extends BaseActivity implements BRestAdapter.OnItemCl
 			return;
 		}
 		LogUtil.i(JSONUtil.map2JSON(map));
-		new HttpClient.Builder(Constants.IM_BASE_URL)
+		new HttpClient.Builder(Constants.IM_BASE_URL())
 				.isDebug(BaseConfig.isDebug())
 				.build()
 				.Api()

app_modular/appme/src/main/java/com/uas/appme/settings/activity/BookingSetActivity.java

@@ -163,7 +163,7 @@ public class BookingSetActivity extends OABaseActivity implements HttpImp, View.
 
 
     public void getBookingTime() {
-        String url = Constants.IM_BASE_URL + "user/appUsertime";
+        String url = Constants.IM_BASE_URL() + "user/appUsertime";
         Map<String, Object> params = new HashMap<>();
         params.put("token", MyApplication.getInstance().mAccessToken);
         params.put("userid", MyApplication.getInstance().mLoginUser.getUserId());
@@ -182,7 +182,7 @@ public class BookingSetActivity extends OABaseActivity implements HttpImp, View.
             ToastMessage(getString(R.string.not_time_start_biger_end));
             return;
         }
-        String url = Constants.IM_BASE_URL + "user/appTimeSet";
+        String url = Constants.IM_BASE_URL() + "user/appTimeSet";
         Map<String, Object> params = new HashMap<>();
         MapData data = new MapData();
         data.setAt_userid(MyApplication.getInstance().mLoginUser.getUserId());