商家统计备份

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/ui/message/MessageFragment.java

@@ -56,7 +56,6 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
-
 /**
  * Created by Bitliker on 2017/3/1.
  */
@@ -253,9 +252,9 @@ public class MessageFragment extends EasyFragment implements IMessageView, View.
                 //				startActivity(new Intent(mContext, UUSportActivity.class));
                 startActivity(new Intent(mContext, UURanking.class));
 //				uustepRedtv.setVisibility(View.GONE);
-                PreferenceUtils.putBoolean(Constant.UU_STEP_RED, true);
-                break;
-        }
+				PreferenceUtils.putBoolean(Constants.UU_STEP_RED, true);
+				break;
+		}
 
     }
 

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,16 +1,27 @@
 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";
+    //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,"
@@ -81,21 +92,18 @@ public class Constants {
             + "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
             + ")";
@@ -289,7 +297,7 @@ public class Constants {
             + "," + DatabaseTables.UUHelperTable.Cols.TYPE
             + ")";
 
-
+    public static String IS_NOTIFICATION = "is_notification";//是是否进行通知
     /**
      * @desc:常量
      * @author：Administrator on 2016/5/13 10:21
@@ -394,4 +402,15 @@ public class Constants {
     public static int WORK_REPORT_WEEK = 112;
     public static int WORK_REPORT_MONTH = 113;
     public static String REAL_TIME_CACHE = "real_time_cache";
+
+    //设置计步相关迁移
+    public static String BAIDU_PUSH = "BAIDUPUSH";
+    public static String UU_STEP = "UUSTEP";
+    public static String B_SETTINGRED = "B_SETTINGRED";
+    public static String UU_STEP_RED = "UU_STEP_RED";
+    public static final int MSG_FROM_CLIENT = 0;
+    public static final int MSG_FROM_SERVER = 1;
+    public static final String BASEURL = "http://news-at.zhihu.com/api/4/";
+    public static final String START = "start-image/1080*1776";
+    public static String BASE_STEP_URL = "http://113.105.74.140:8092/user/";
 }

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/person_setting_activity.xml

@@ -201,7 +201,6 @@
                     android:background="@null"
                     android:hint="@string/common_input1"
                     android:textSize="15sp"
-                    android:inputType="number"
                     android:gravity="center_vertical|right"
                     android:layout_marginLeft="5dp"
                     whatever:testType="regexp"

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/appme/src/main/java/com/uas/appme/pedometer/constant/Constant.java

@@ -1,27 +0,0 @@
-package com.uas.appme.pedometer.constant;
-
-/**
- * Created by FANGLH
- * Date : 2017/3/24
- * To do :
- */
-
-public class Constant {
-    public static final int MSG_FROM_CLIENT = 0;
-    public static final int MSG_FROM_SERVER = 1;
-    public static final String BASEURL = "http://news-at.zhihu.com/api/4/";
-    public static final String START = "start-image/1080*1776";
-    public static final String THEMES = "themes";
-    public static final String LATESTNEWS = "news/latest";
-    public static final String BEFORE = "news/before/";
-    public static final String THEMENEWS = "theme/";
-    public static final String CONTENT = "news/";
-    public static final int TOPIC = 131;
-    public static final String START_LOCATION = "start_location";
-    public static final String CACHE = "cache";
-    public static final int LATEST_COLUMN = Integer.MAX_VALUE;
-    public static final int BASE_COLUMN = 100000000;
-    public static String TRACK_STEP = "TRACKSTEP";
-    public static String BASE_STEP_URL = "http://113.105.74.140:8092/user/";
-//    public static String BASE_STEP_URL = "http://192.168.253.136:8092/";
-}

app_modular/appme/src/main/java/com/uas/appme/pedometer/service/StepService.java

@@ -25,10 +25,10 @@ import android.os.RemoteException;
 
 import com.baidu.mapapi.model.LatLng;
 import com.common.LogUtil;
+import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.uas.appme.R;
 import com.uas.appme.pedometer.bean.StepEntity;
-import com.uas.appme.pedometer.constant.Constant;
 import com.uas.appme.pedometer.db.StepDataDao;
 import com.uas.appme.pedometer.utils.StepUtils;
 import com.uas.appme.pedometer.utils.TimeUtil;
@@ -137,11 +137,11 @@ public class StepService extends Service implements SensorEventListener {
         @Override
         public void handleMessage(Message msg) {
             switch (msg.what) {
-                case Constant.MSG_FROM_CLIENT:
+                case Constants.MSG_FROM_CLIENT:
                     try {
                         //这里负责将当前的步数发送出去，可以在界面或者其他地方获取，我这里是在MainActivity中获取来更新界面
                         Messenger messenger = msg.replyTo;
-                        Message replyMsg = Message.obtain(null, Constant.MSG_FROM_SERVER);
+                        Message replyMsg = Message.obtain(null, Constants.MSG_FROM_SERVER);
                         Bundle bundle = new Bundle();
                         bundle.putInt("steps", CURRENT_STEP);
                         replyMsg.setData(bundle);

app_modular/appme/src/main/java/com/uas/appme/pedometer/utils/StepHttpUtils.java

@@ -4,9 +4,9 @@ import android.content.Context;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 
+import com.core.app.Constants;
 import com.loopj.android.http.AsyncHttpClient;
 import com.loopj.android.http.ResponseHandlerInterface;
-import com.uas.appme.pedometer.constant.Constant;
 
 /**
  *Created by FANGlh on 2017/4/24.
@@ -16,7 +16,7 @@ public class StepHttpUtils {
     private static AsyncHttpClient client = new AsyncHttpClient();
 
     public static void get(String url, ResponseHandlerInterface responseHandler) {
-        client.get(Constant.BASEURL + url, responseHandler);
+        client.get(Constants.BASEURL + url, responseHandler);
     }
 
     public static void getImage(String url, ResponseHandlerInterface responseHandler) {

app_modular/appme/src/main/java/com/uas/appme/pedometer/utils/StepUtils.java

@@ -1,7 +1,6 @@
 package com.uas.appme.pedometer.utils;
 
 import android.content.Intent;
-import android.support.v4.content.LocalBroadcastManager;
 import android.util.Log;
 import android.widget.Toast;
 
@@ -14,6 +13,7 @@ import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.core.app.AppConstant;
+import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.broadcast.MsgBroadcast;
 import com.core.model.Friend;
@@ -33,7 +33,6 @@ import com.me.network.app.http.rx.ResultSubscriber;
 import com.uas.appme.pedometer.bean.PersonalStepBean;
 import com.uas.appme.pedometer.bean.StepEntity;
 import com.uas.appme.pedometer.bean.StepsRankingBean;
-import com.uas.appme.pedometer.constant.Constant;
 import com.uas.appme.pedometer.db.StepDataDao;
 
 import java.util.HashMap;
@@ -66,7 +65,7 @@ public class StepUtils {
         saveMap.put("as_uusteps", steps);
         saveMap.put("as_date", date);
         String map = JSONUtil.map2JSON(saveMap);
-        HttpClient httpClient = new HttpClient.Builder(Constant.BASE_STEP_URL).isDebug(true).build(true);
+        HttpClient httpClient = new HttpClient.Builder(Constants.BASE_STEP_URL).isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("appUUsteps")
                 .add("map", map)
@@ -150,7 +149,7 @@ public class StepUtils {
         if (MyApplication.getInstance() == null
                 || MyApplication.getInstance().mLoginUser == null
                 || MyApplication.getInstance().mLoginUser.getUserId() == null) return;
-        HttpClient httpClient = new HttpClient.Builder(Constant.BASE_STEP_URL).isDebug(true).build(true);
+        HttpClient httpClient = new HttpClient.Builder(Constants.BASE_STEP_URL).isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("appSteps")
                 .add("userid", MyApplication.getInstance().mLoginUser.getUserId())
@@ -207,7 +206,7 @@ public class StepUtils {
         if (!doPrise) return;
 
         //点赞操作
-        HttpClient httpClient = new HttpClient.Builder(Constant.BASE_STEP_URL).isDebug(true).build(true);
+        HttpClient httpClient = new HttpClient.Builder(Constants.BASE_STEP_URL).isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("appStepPrise")
                 .add("userid",userid) // 点赞对象ID

app_modular/appme/src/main/java/com/uas/appme/pedometer/view/NewStepActivity.java

@@ -20,12 +20,12 @@ import android.view.WindowManager;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.core.app.Constants;
 import com.core.base.BaseActivity;
 import com.core.utils.CommonUtil;
 import com.uas.appme.R;
 import com.uas.appme.pedometer.bean.StepEntity;
 import com.uas.appme.pedometer.calendar.BeforeOrAfterCalendarView;
-import com.uas.appme.pedometer.constant.Constant;
 import com.uas.appme.pedometer.db.StepDataDao;
 import com.uas.appme.pedometer.service.StepService;
 import com.uas.appme.pedometer.utils.StepCountCheckUtil;
@@ -188,7 +188,7 @@ public class NewStepActivity extends BaseActivity implements Handler.Callback {
                 public void run() {
                     try {
                         messenger = new Messenger(service);
-                        Message msg = Message.obtain(null, Constant.MSG_FROM_CLIENT);
+                        Message msg = Message.obtain(null, Constants.MSG_FROM_CLIENT);
                         msg.replyTo = mGetReplyMessenger;
                         messenger.send(msg);
                     } catch (RemoteException e) {
@@ -282,7 +282,7 @@ public class NewStepActivity extends BaseActivity implements Handler.Callback {
     public boolean handleMessage(Message msg) {
         switch (msg.what) {
             //这里用来获取到Service发来的数据
-            case Constant.MSG_FROM_SERVER:
+            case Constants.MSG_FROM_SERVER:
 
                 //如果是今天则更新数据
                 if (curSelDate.equals(TimeUtil.getCurrentDate())) {

app_modular/appme/src/main/java/com/uas/appme/pedometer/view/PersonalPageActivity.java

@@ -25,6 +25,7 @@ import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.common.system.DisplayUtil;
+import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.utils.CommonUtil;
@@ -39,7 +40,6 @@ import com.uas.appcontact.ui.activity.ContactsActivity;
 import com.uas.appme.R;
 import com.uas.appme.pedometer.bean.ComPolylineBean;
 import com.uas.appme.pedometer.bean.PersonalStepBean;
-import com.uas.appme.pedometer.constant.Constant;
 import com.uas.appme.pedometer.utils.PolylineUtils;
 import com.uas.appme.pedometer.utils.StepUtils;
 import com.uas.appme.pedometer.utils.TimeUtil;
@@ -127,7 +127,7 @@ public class PersonalPageActivity extends BaseActivity implements View.OnClickLi
         }
         if (StringUtil.isEmpty(userid)) return;
         progressDialog.show();
-        HttpClient httpClient = new HttpClient.Builder(Constant.BASE_STEP_URL).isDebug(true).build(true);
+        HttpClient httpClient = new HttpClient.Builder(Constants.BASE_STEP_URL).isDebug(true).build(true);
         httpClient.getHeaders().remove("Content-Type");
         httpClient.Api().send(new HttpClient.Builder()
                 .url("appSteps")
@@ -209,7 +209,7 @@ public class PersonalPageActivity extends BaseActivity implements View.OnClickLi
         mMovementTotalStepsTimeTv.setText(now_time);
 
         //获取点赞信息
-        HttpClient httpClient = new HttpClient.Builder(Constant.BASE_STEP_URL).isDebug(true).build(true);
+        HttpClient httpClient = new HttpClient.Builder(Constants.BASE_STEP_URL).isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("appPriseList")
                 .add("userid",userid)
@@ -230,7 +230,7 @@ public class PersonalPageActivity extends BaseActivity implements View.OnClickLi
     }
 
     private void doAttendHandle(int attention_type) {
-        HttpClient httpClient = new HttpClient.Builder(Constant.BASE_STEP_URL).isDebug(true).build(true);
+        HttpClient httpClient = new HttpClient.Builder(Constants.BASE_STEP_URL).isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("appUUSet")
                 .add("userids", userid)

app_modular/appme/src/main/java/com/uas/appme/pedometer/view/StepSplashActivity.java

@@ -12,10 +12,10 @@ import android.view.animation.ScaleAnimation;
 import android.widget.ImageView;
 import android.widget.Toast;
 
+import com.core.app.Constants;
 import com.loopj.android.http.AsyncHttpResponseHandler;
 import com.loopj.android.http.BinaryHttpResponseHandler;
 import com.uas.appme.R;
-import com.uas.appme.pedometer.constant.Constant;
 import com.uas.appme.pedometer.utils.StepHttpUtils;
 
 import org.apache.http.Header;
@@ -74,7 +74,7 @@ public class StepSplashActivity extends Activity {
             @Override
             public void onAnimationEnd(Animation animation) {
                 if (StepHttpUtils.isNetworkConnected(StepSplashActivity.this)) {
-                    StepHttpUtils.get(Constant.START, new AsyncHttpResponseHandler() {
+                    StepHttpUtils.get(Constants.START, new AsyncHttpResponseHandler() {
                         @Override
                         public void onSuccess(int i, Header[] headers, byte[] bytes) {
                             try {

app_modular/appme/src/main/java/com/uas/appme/pedometer/view/UURanking.java

@@ -23,6 +23,7 @@ import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.core.app.AppConstant;
+import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.utils.CommonUtil;
@@ -40,7 +41,6 @@ import com.uas.appme.pedometer.adapter.UUAttentionAdapter;
 import com.uas.appme.pedometer.adapter.UURankingAdapter;
 import com.uas.appme.pedometer.bean.StepEntity;
 import com.uas.appme.pedometer.bean.StepsRankingBean;
-import com.uas.appme.pedometer.constant.Constant;
 import com.uas.appme.pedometer.db.StepDataDao;
 import com.uas.appme.pedometer.utils.StepUtils;
 import com.uas.appme.pedometer.utils.TimeUtil;
@@ -200,7 +200,7 @@ public class UURanking extends BaseActivity implements View.OnClickListener {
         }
         progressDialog.show();
         //获取所有人的当天步数数据
-        HttpClient httpClient = new HttpClient.Builder(Constant.BASE_STEP_URL).isDebug(true).build(true);
+        HttpClient httpClient = new HttpClient.Builder(Constants.BASE_STEP_URL).isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("appStepsrank")
                 .add("userid",MyApplication.getInstance().mLoginUser.getUserId())

app_modular/appme/src/main/java/com/uas/appme/settings/Constant/Constant.java

@@ -1,22 +0,0 @@
-package com.uas.appme.settings.Constant;
-
-import com.core.app.MyApplication;
-import com.core.utils.CommonUtil;
-
-/**
- * Created by FANGlh on 2017/8/30.
- * function:
- */
-
-public class Constant {
-    public static String BAIDU_PUSH = "BAIDUPUSH";
-    public static String UU_STEP = "UUSTEP";
-    public static String BASE_BOOKING_SETTING_URL= "http://113.105.74.140:8092/"; //发布正式ip
-//    public static String BASE_BOOKING_SETTING_URL= "http://192.168.253.136:8092/";   //测试LQM本地ip
-    public static String BASE_COMPANYID =  CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu");
-//    public static String BASE_COMPANYID = "201";
-
-    public static String B_SETTINGRED = "B_SETTINGRED";
-    public static String UU_STEP_RED = "UU_STEP_RED";
-    public static String BASE_LQM_URL = "http://192.168.253.136:8092/";
-}

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

@@ -19,6 +19,7 @@ import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
+import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.utils.CommonUtil;
@@ -31,7 +32,6 @@ import com.me.network.app.http.rx.Result2Listener;
 import com.me.network.app.http.rx.ResultSubscriber;
 import com.uas.appme.R;
 import com.uas.appme.pedometer.utils.TimeUtil;
-import com.uas.appme.settings.Constant.Constant;
 import com.uas.appme.settings.model.CompanyRestBean;
 
 import java.util.ArrayList;
@@ -118,7 +118,7 @@ public class BComSetCompanyRestActivity extends BaseActivity implements View.OnC
     }
 
     private void doSave(List<CompanyRestBean> mList) {
-        HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
+        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
         progressDialog.show();
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appBatchCrest")

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

@@ -26,6 +26,7 @@ import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.common.system.DisplayUtil;
+import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.model.SelectBean;
@@ -41,7 +42,6 @@ import com.me.network.app.http.rx.ResultListener;
 import com.me.network.app.http.rx.ResultSubscriber;
 import com.uas.appme.R;
 import com.uas.appme.pedometer.utils.TimeUtil;
-import com.uas.appme.settings.Constant.Constant;
 import com.uas.appme.settings.model.ComRestBean;
 import com.uas.appme.settings.model.PersonSetingBean;
 
@@ -72,7 +72,7 @@ public class BComSetEmployeeRestActivity extends BaseActivity implements View.On
     private void initData() {
 
         //获取商家服务人员
-        HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
+        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appStoreman")
 //                .add("companyid", 201)
@@ -179,7 +179,7 @@ public class BComSetEmployeeRestActivity extends BaseActivity implements View.On
     }
 
     private void doSave(List<ComRestBean> mList) {
-        HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
+        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
         progressDialog.show();
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appBatchMrest")

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

@@ -28,7 +28,6 @@ import com.me.network.app.http.Method;
 import com.me.network.app.http.rx.ResultListener;
 import com.me.network.app.http.rx.ResultSubscriber;
 import com.uas.appme.R;
-import com.uas.appme.settings.Constant.Constant;
 import com.uas.appme.settings.adapter.BRestAdapter;
 import com.uas.appme.settings.model.BRest;
 import com.uas.appworks.OA.erp.utils.MostLinearLayoutManager;
@@ -172,7 +171,7 @@ public class BRestActivity extends BaseActivity implements BRestAdapter.OnItemCl
                     break;
             }
 
-			HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
+			HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
 			httpClient.Api().send(new HttpClient.Builder()
 					.url("user/appStoreDel")
 					.add("keyfield", keyfield)
@@ -205,7 +204,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 +262,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/BSetComRestListActivity.java

@@ -9,6 +9,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.PopupWindow;
 import android.widget.RelativeLayout;
@@ -19,7 +20,9 @@ import com.common.LogUtil;
 import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
+import com.common.data.StringUtil;
 import com.common.system.DisplayUtil;
+import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.utils.CommonUtil;
@@ -29,8 +32,8 @@ import com.me.network.app.http.HttpClient;
 import com.me.network.app.http.Method;
 import com.me.network.app.http.rx.ResultListener;
 import com.me.network.app.http.rx.ResultSubscriber;
+import com.nostra13.universalimageloader.core.ImageLoader;
 import com.uas.appme.R;
-import com.uas.appme.settings.Constant.Constant;
 import com.uas.appme.settings.model.BSettingPlaceBean;
 import com.uas.appme.settings.model.CompanyRestListBean;
 import com.uas.appme.settings.model.EmployeeRestListBean;
@@ -155,7 +158,7 @@ public class BSetComRestListActivity extends BaseActivity {
 				break;
 		}
 
-		HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
+		HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
 		httpClient.Api().send(new HttpClient.Builder()
 				.url("user/appStoreDel")
 				.add("keyfield", keyfield)
@@ -244,7 +247,7 @@ public class BSetComRestListActivity extends BaseActivity {
 			ToastMessage(getString(R.string.common_notlinknet));
 			return;
 		}
-		HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
+		HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
 		httpClient.Api().send(new HttpClient.Builder()
 				.url(url)
 //				.add("companyid", 201)
@@ -356,18 +359,38 @@ public class BSetComRestListActivity extends BaseActivity {
 				viewHolder = new ViewHolder();
 				convertView = View.inflate(mContext, R.layout.com_location_item, null);
 				viewHolder.name_tv = (TextView) convertView.findViewById(R.id.name_tv);
-				viewHolder.industry_tv = (TextView) convertView.findViewById(R.id.industry_tv);
+				viewHolder.image_im = (ImageView) convertView.findViewById(R.id.image_im);
+				viewHolder.sTime_rl = (RelativeLayout) convertView.findViewById(R.id.service_time_rl);
+				viewHolder.sTime_tv = (TextView) convertView.findViewById(R.id.service_time_tv);
+				viewHolder.image_rl = (RelativeLayout) convertView.findViewById(R.id.image_rl);
+				if("会所".equals(sc_industry) )
+					viewHolder.sTime_rl.setVisibility(View.VISIBLE);
+				else
+					viewHolder.sTime_rl.setVisibility(View.GONE);
 				convertView.setTag(viewHolder);
 			} else {
 				viewHolder = (ViewHolder) convertView.getTag();
 			}
+			//显示名称
 			viewHolder.name_tv.setText(model.getResult().get(position).getSt_name());
+
+			//显示服务时间
+			viewHolder.sTime_tv.setText(model.getResult().get(position).getSt_servicetime() + getString(R.string.minute));
+
+			//显示照片
+			if (!StringUtil.isEmpty(model.getResult().get(position).getSt_imageurl())){
+				viewHolder.image_rl.setVisibility(View.VISIBLE);
+				ImageLoader.getInstance().displayImage(model.getResult().get(position).getSt_imageurl(),viewHolder.image_im);
+			}else
+				viewHolder.image_rl.setVisibility(View.GONE);
+
 			return convertView;
 		}
 
 		class ViewHolder {
-			TextView name_tv;
-			TextView industry_tv;
+			TextView name_tv,sTime_tv;
+			ImageView image_im;
+			RelativeLayout sTime_rl,image_rl;
 		}
 	}
 

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

@@ -10,6 +10,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.common.LogUtil;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
+import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.utils.CommonUtil;
@@ -18,7 +19,6 @@ import com.me.network.app.http.Method;
 import com.me.network.app.http.rx.ResultListener;
 import com.me.network.app.http.rx.ResultSubscriber;
 import com.uas.appme.R;
-import com.uas.appme.settings.Constant.Constant;
 
 /**
  * Created by FANGlh on 2017/10/10.
@@ -40,7 +40,7 @@ public class BSettingActivity extends BaseActivity implements View.OnClickListen
     }
 
     private void judgeWhichType() {
-        HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
+        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appCompanyType")
                 .add("companyid", CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"))

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

@@ -1,8 +1,12 @@
 package com.uas.appme.settings.activity;
 
+import android.Manifest;
 import android.app.Activity;
+import android.app.AlertDialog;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
 import android.util.DisplayMetrics;
 import android.view.Gravity;
@@ -15,35 +19,52 @@ import android.view.WindowManager;
 import android.widget.BaseAdapter;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.ImageView;
 import android.widget.PopupWindow;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.andreabaccega.widget.FormEditText;
 import com.common.LogUtil;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.common.system.DisplayUtil;
+import com.common.system.PermissionUtil;
+import com.common.ui.CameraUtil;
+import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
+import com.core.net.http.ViewUtil;
 import com.core.utils.CommonUtil;
+import com.core.utils.ToastUtil;
 import com.core.widget.MyListView;
+import com.lidroid.xutils.HttpUtils;
+import com.lidroid.xutils.exception.HttpException;
+import com.lidroid.xutils.http.ResponseInfo;
+import com.lidroid.xutils.http.callback.RequestCallBack;
+import com.lidroid.xutils.http.client.HttpRequest;
 import com.me.network.app.http.HttpClient;
 import com.me.network.app.http.Method;
 import com.me.network.app.http.rx.Result2Listener;
 import com.me.network.app.http.rx.ResultListener;
 import com.me.network.app.http.rx.ResultSubscriber;
+import com.nostra13.universalimageloader.core.ImageLoader;
 import com.uas.appme.R;
-import com.uas.appme.settings.Constant.Constant;
 import com.uas.appme.settings.model.BSetLocationBean;
+import com.umeng.socialize.utils.Log;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * Created by FANGlh on 2017/10/12.
@@ -62,34 +83,28 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
     private String st_id;
     private String updateData;
     private Button deleteBtn;
-
+    private ArrayList<String> mPhotoList;
+    private int image_position; // 点击点击照片添加/更换 记住的position
+    private Uri mNewPhotoUri;// 拍照和图库 获得图片的URI
+    private static final int REQUEST_CODE_CAPTURE_PHOTO = 1;// 拍照
+    private static final int REQUEST_CODE_PICK_PHOTO = 2;// 图库
+    private Boolean updateChangeP = false; //更新是否更换了照片，若没换
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.service_bcom_setting_activity);
         initView();
         initData();
+        String[] permissions = new String[]{Manifest.permission.CAMERA, Manifest.permission.READ_EXTERNAL_STORAGE};
+        for (String permission : permissions) {
+            if (PermissionUtil.lacksPermissions(ct, permission)) {
+                PermissionUtil.requestPermission(this, PermissionUtil.DEFAULT_REQUEST, permission);
+            }
+        }
     }
 
     private void initData() {
 
-    }
-
-    private void initView() {
-        mList = new ArrayList<>();
-        mComList = (MyListView) findViewById(R.id.com_list);
-        add_new_rl = (RelativeLayout) findViewById(R.id.add_new_rl);
-        add_new_rl.setOnClickListener(this);
-        myAdapter = new BSetLocationAdapter(this);
-        myAdapter.setModelList(mList);
-        mComList.setAdapter(myAdapter);
-        save_bt = (Button) findViewById(R.id.save_bt);
-        save_bt.setOnClickListener(this);
-
-        deleteBtn = (Button)findViewById(R.id.deleteBtn);
-        deleteBtn.setOnClickListener(this);
-
-
         //接收商家类型
         sc_industry = getIntent().getStringExtra("sc_industry");
         sc_industrycode = getIntent().getStringExtra("sc_industrycode");
@@ -99,7 +114,7 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
             update = true;
             save_bt.setText(getString(R.string.common_update_button));
             add_new_rl.setVisibility(View.GONE);
-            getSupportActionBar().setTitle("更新设置服务/场地/房间");
+            getSupportActionBar().setTitle("更新服务/场地/房间");
 
             st_id = JSON.parseObject(updateData).getString("st_id");
             BSetLocationBean model = new BSetLocationBean();
@@ -107,6 +122,8 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
             model.setSt_companyid(JSON.parseObject(updateData).getString("st_companyid"));
             model.setSt_siid(JSON.parseObject(updateData).getString("st_siid"));
             model.setSt_name(JSON.parseObject(updateData).getString("st_name"));
+            model.setSt_servicetime(JSON.parseObject(updateData).getString("st_servicetime"));
+            model.setSt_imageurl(JSON.parseObject(updateData).getString("st_imageurl"));
             mList.add(model);
             myAdapter.notifyDataSetChanged();
         }else {
@@ -116,17 +133,35 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
             model.setSt_companyid(CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"));
             model.setSt_siid(StringUtil.isEmpty(sc_industrycode) ? "0" : sc_industrycode);
             model.setSt_name("");
+            model.setSt_servicetime("0");
+            model.setSt_imageurl("");
 //            model.setSt_id("0");
             mList.add(model);
             myAdapter.notifyDataSetChanged();
         }
     }
+
+    private void initView() {
+        mList = new ArrayList<>();
+        mComList = (MyListView) findViewById(R.id.com_list);
+        add_new_rl = (RelativeLayout) findViewById(R.id.add_new_rl);
+        add_new_rl.setOnClickListener(this);
+        myAdapter = new BSetLocationAdapter(this);
+        myAdapter.setModelList(mList);
+        mComList.setAdapter(myAdapter);
+        save_bt = (Button) findViewById(R.id.save_bt);
+        save_bt.setOnClickListener(this);
+
+        deleteBtn = (Button)findViewById(R.id.deleteBtn);
+        deleteBtn.setOnClickListener(this);
+
+        mPhotoList = new ArrayList<>();
+        myAdapter.setPhotoList(mPhotoList);
+    }
     @Override
     public boolean onPrepareOptionsMenu(Menu menu) {
         menu.clear();
-        if (!StringUtil.isEmpty(updateData)) {
-
-        } else {
+        if (StringUtil.isEmpty(updateData)) {
             getMenuInflater().inflate(R.menu.bsetting_more, menu);
         }
         return super.onPrepareOptionsMenu(menu);
@@ -150,29 +185,44 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
     @Override
     public void onClick(View v) {
         if (v.getId() == R.id.add_new_rl){
+            LogUtil.prinlnLongMsg("mPhotoList",JSON.toJSONString(mPhotoList));
             if (StringUtil.isEmpty(mList.get(mList.size()-1).getSt_name())){
                 ToastMessage("请输入名称");
                 return;
             }
+            if (mPhotoList.size() < mList.size()){
+                ToastMessage("请添加照片");
+                return;
+            }
             BSetLocationBean model = new BSetLocationBean();
             model.setSt_companyname(CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_commpany"));
             model.setSt_companyid(CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"));
             model.setSt_siid(StringUtil.isEmpty(sc_industrycode) ? "0" : sc_industrycode);
             model.setSt_name("");
+            model.setSt_servicetime("");
+            model.setSt_imageurl("");
 //            model.setSt_id("0");
             mList.add(model);
             myAdapter.notifyDataSetChanged();
         }else if (v.getId() == R.id.save_bt){
             LogUtil.prinlnLongMsg("mList", JSON.toJSONString(mList));
             if (ListUtils.isEmpty(mList)) return;
+            if (StringUtil.isEmpty(mList.get(mList.size()-1).getSt_name())){
+                ToastMessage("请输入名称");
+                return;
+            }
             if (!CommonUtil.isNetWorkConnected(this)) {
                 ToastMessage(getString(R.string.common_notlinknet));
                 return;
             }else {
-                if (update && !StringUtil.isEmpty(st_id))
-                    doUpdate();
+                if (update && !StringUtil.isEmpty(st_id)){
+                    if (updateChangeP)   // 更换过照片
+                        doJudegeCNow_p();//开始上传第一张图片
+                    else
+                        doUpdate();
+                }
                 else
-                    doSave(mList);
+                    doSaveJudge(mList);
             }
 
         }else if (v.getId() == R.id.deleteBtn){
@@ -189,7 +239,7 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
         String tablename = "ServiceType";
         String id = st_id;
 
-        HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
+        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appStoreDel")
                 .add("keyfield", keyfield)
@@ -225,10 +275,11 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
             param.put("st_name",mList.get(0).getSt_name());
             param.put("st_siid",mList.get(0).getSt_siid());
             param.put("st_companyid",mList.get(0).getSt_companyid());
-            param.put("st_companyname",mList.get(0).getSt_companyname());
+            param.put("st_imageurl",mList.get(0).getSt_imageurl());
+            param.put("st_servicetime",mList.get(0).getSt_servicetime());
             progressDialog.show();save_bt.setEnabled(false);
 
-            HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
+            HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
             httpClient.Api().send(new HttpClient.Builder()
                     .url("user/appServiceSet")
                     .add("map",JSON.toJSONString(param))
@@ -258,53 +309,166 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
 
     }
 
-    private void doSave(List<BSetLocationBean> mList) {
+    private void doSaveJudge(List<BSetLocationBean> mList) {
+        if (mPhotoList.size() < mList.size()){
+            ToastMessage("请添加照片");
+            return;
+        }
         for (int i = 0; i < mList.size(); i++) {
             if (StringUtil.isEmpty(mList.get(i).getSt_name())){
                 ToastMessage("请输入名称");
                 break;
             }else if (i==mList.size()-1){
-                progressDialog.show();save_bt.setEnabled(false);
-                HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
-                httpClient.Api().send(new HttpClient.Builder()
-                        .url("user/appBatchPlace")
-                        .add("map",JSON.toJSONString(mList))
-                        .add("token",MyApplication.getInstance().mAccessToken)
-                        .connectTimeout(10000)
-                        .method(Method.POST)
-                        .build(),new ResultSubscriber<>(new Result2Listener<Object>() {
-                    @Override
-                    public void onResponse(Object o) {
-                        if (!JSONUtil.validate(o.toString()) || o == null) {
-                            progressDialog.dismiss();save_bt.setEnabled(true);
-                            return;
-                        }
-                        LogUtil.prinlnLongMsg("appBatchPlace", o.toString()+"");
-                        if (o.toString().contains("result") && JSON.parseObject(o.toString()).getBooleanValue("result")) {
-                            Toast.makeText(ct,getString(R.string.common_save_success),Toast.LENGTH_LONG).show();
-                            startActivity(new Intent(ct,BSetComRestListActivity.class)
-                                    .putExtra("sc_industry",sc_industry)
-                                    .putExtra("sc_industrycode",sc_industrycode)
-                                    .putExtra("type","place"));
-                            finish();
-                        }
-                        progressDialog.dismiss();save_bt.setEnabled(true);
+                if (updateChangeP)   // 更换过照片
+                    doJudegeCNow_p();//开始上传第一张图片
+                else
+                    doSaveDatasList();
+            }
+        }
+
+
+    }
+    private int now_p = 0;
+    private void sendPictureRequest(String path) {
+        if (StringUtil.isEmpty(path)) return;
+        File waterBitmapToFile=  new File(path);
+        if (!waterBitmapToFile.isFile()){
+            return;
+        }else {
+            com.lidroid.xutils.http.RequestParams params = new com.lidroid.xutils.http.RequestParams();
+            params.addQueryStringParameter("master", CommonUtil.getSharedPreferences(ct, "erp_master"));
+            params.addHeader("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+            params.addBodyParameter("userid", MyApplication.getInstance().mLoginUser.getUserId());
+            params.addBodyParameter("file1", waterBitmapToFile);
+            String url = "http://113.105.74.140:8080/upload/UploadServlet";
+            final HttpUtils http = new HttpUtils();
+            http.send(HttpRequest.HttpMethod.POST, url, params, new RequestCallBack<String>() {
+                @Override
+                public void onStart() {
+                    progressDialog.show();
+                    ViewUtil.ToastMessage(ct, getString(com.uas.appworks.R.string.sending_picture)+"...");
+                }
+                @Override
+                public void onLoading(long total, long current, boolean isUploading) {
+                    if (isUploading) {
+                    } else {
                     }
+                }
 
-                    @Override
-                    public void onFailure(Object t) {
-                        progressDialog.dismiss();save_bt.setEnabled(true);
+                @Override
+                public void onSuccess(ResponseInfo<String> responseInfo) {
+                    if (JSONUtil.validate(responseInfo.result) && JSON.parseObject(responseInfo.result).getBoolean("success")) {
+                        LogUtil.prinlnLongMsg("UploadServlet", responseInfo.result + "");
+                        try {
+                            JSONObject object = JSON.parseObject(responseInfo.result);
+                            JSONObject dataobject = object.getJSONObject("data");
+                            if (dataobject == null) {
+                                doJudegeCNow_p();
+                                return;
+                            }
+                            JSONArray imagearray = dataobject.getJSONArray("images");
+                            if (ListUtils.isEmpty(imagearray)) {
+                                doJudegeCNow_p();
+                                return;
+                            }
+                            String oUrl = imagearray.getJSONObject(0).getString("oUrl");
+                            if (!StringUtil.isEmpty(oUrl))
+                                mList.get(now_p).setSt_imageurl(oUrl);
+                            else
+                                mList.get(now_p).setSt_imageurl("");
+
+                            now_p++;
+                            LogUtil.prinlnLongMsg("mList",JSON.toJSONString(mList));
+                            doJudegeCNow_p();
+
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
                     }
-                }));
-            }
+                }
+
+                @Override
+                public void onFailure(HttpException error, String msg) {
+                    now_p++;
+                    doJudegeCNow_p();
+                    ViewUtil.ToastMessage(ct, getString(com.uas.appworks.R.string.common_save_failed) + msg);
+                    progressDialog.dismiss();
+                }
+            });
         }
+    }
 
+    //判断当前上传了几张照片，进行是否上传数据操作
+    private void doJudegeCNow_p() {
+        if (now_p == mList.size()){
+            if (update && !StringUtil.isEmpty(st_id))
+                doUpdate();
+            else
+                doSaveDatasList();
+        } else
+            sendPictureRequest(mPhotoList.get(now_p));
 
     }
 
+    private int getID(String chche) {
+        if (StringUtil.isEmpty(chche)) return 0;
+        Pattern p = Pattern.compile("(\\d+)");
+        Matcher m = p.matcher(chche);
+        if (m.find()) {
+            return Integer.parseInt(m.group(0));
+        }
+        return -1;
+    }
+    private void doSaveDatasList() {
+        progressDialog.show();save_bt.setEnabled(false);
+        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
+
+//        httpClient.getHeaders().remove("Content-Type");
+
+        httpClient.Api().send(new HttpClient.Builder()
+                .url("user/appBatchPlace")
+                .add("map",JSON.toJSONString(mList))
+                .add("token",MyApplication.getInstance().mAccessToken)
+                .connectTimeout(10000)
+                .method(Method.POST)
+                .build(),new ResultSubscriber<>(new Result2Listener<Object>() {
+            @Override
+            public void onResponse(Object o) {
+                if (!JSONUtil.validate(o.toString()) || o == null) {
+                    progressDialog.dismiss();save_bt.setEnabled(true );
+                    return;
+                }
+                LogUtil.prinlnLongMsg("appBatchPlace", o.toString()+"");
+                if (o.toString().contains("result") && JSON.parseObject(o.toString()).getBooleanValue("result")) {
+                    Toast.makeText(ct,getString(R.string.common_save_success),Toast.LENGTH_LONG).show();
+                    startActivity(new Intent(ct,BSetComRestListActivity.class)
+                            .putExtra("sc_industry",sc_industry)
+                            .putExtra("sc_industrycode",sc_industrycode)
+                            .putExtra("type","place"));
+                    finish();
+                }
+                progressDialog.dismiss();save_bt.setEnabled(true);
+            }
+
+            @Override
+            public void onFailure(Object t) {
+                progressDialog.dismiss();save_bt.setEnabled(true);
+            }
+        }));
+    }
+
     private class BSetLocationAdapter extends BaseAdapter{
         private Context mContext;
         private List<BSetLocationBean> modelList;
+        private ArrayList<String> photoList;
+
+        public ArrayList<String> getPhotoList() {
+            return photoList;
+        }
+
+        public void setPhotoList(ArrayList<String> photoList) {
+            this.photoList = photoList;
+        }
 
         public List<BSetLocationBean> getModelList() {
             return modelList;
@@ -339,58 +503,201 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
                 viewHolder = new ViewHolder();
                 convertView =  View.inflate(mContext, R.layout.com_location_input_item,null);
                 viewHolder.name_tv = (FormEditText) convertView.findViewById(R.id.name_tv);
-                viewHolder.industry_tv = (TextView) convertView.findViewById(R.id.industry_tv);
+                viewHolder.image_im = (ImageView) convertView.findViewById(R.id.image_im);
+                viewHolder.sTime_rl = (RelativeLayout) convertView.findViewById(R.id.service_time_rl);
+                viewHolder.sTime_et = (FormEditText)convertView.findViewById(R.id.service_time_et);
+                viewHolder.delete_tv = (TextView) convertView.findViewById(R.id.delete_tv);
                 convertView.setTag(viewHolder);
                 viewHolder.name_tv.setFocusable(false);
                 viewHolder.name_tv.setKeyListener(null);
+                viewHolder.sTime_et.setFocusable(false);
+                viewHolder.sTime_et.setKeyListener(null);
+                if("会所".equals(sc_industry))
+                    viewHolder.sTime_rl.setVisibility(View.VISIBLE);
+                else
+                    viewHolder.sTime_rl.setVisibility(View.GONE);
             }else {
                 viewHolder = (ViewHolder) convertView.getTag();
             }
             viewHolder.name_tv.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    doInputName(position);
+                    doInputName(1,position);
                 }
             });
-
-            /*viewHolder.name_tv.addTextChangedListener(new TextWatcher() {
+            viewHolder.sTime_et.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    doInputName(2,position);
+                }
+            });
+      /*     viewHolder.name_tv.addTextChangedListener(new TextWatcher() {
                 @Override
                 public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
                 @Override
                 public void onTextChanged(CharSequence s, int start, int before, int count) {}
                 @Override
                 public void afterTextChanged(Editable s) {
-//                    String strChche =  s.toString().replace(" ", "");//去除空格
-//                    strChche = strChche.replace(" ", " ");//去除空格
-                    if(StringUtil.isEmpty(s.toString())) return;
-                    mList.get(position).setSt_name(s.toString());
+                    String strChche =  s.toString().replace(" ", "");//去除空格
+                    strChche = strChche.replace(" ", " ");//去除空格
+                    if(StringUtil.isEmpty(strChche.toString())) return;
+                    mList.get(position).setSt_name(strChche.toString());
                     myAdapter.notifyDataSetChanged();
                 }
+            });*/
+
+            viewHolder.image_im.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    image_position = position;  //点击的图片位置
+                    if (PermissionUtil.lacksPermissions(ct, Manifest.permission.CAMERA)) {
+                        PermissionUtil.requestPermission(BSettingLocationActivity.this,PermissionUtil.DEFAULT_REQUEST,Manifest.permission.CAMERA);
+                        ToastUtil.showToast(ct,R.string.not_camera_permission);
+                    } else {
+                        showSelectPictureDialog();//添加
+                    }
+                }
+            });
+            viewHolder.delete_tv.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (modelList.size() > 1){
+                        mList.remove(position);
+                        if (mPhotoList.size() > position)
+                            mPhotoList.remove(position);
+
+                        notifyDataSetChanged();
+                    }
+                }
             });
-*/
-            if (!ListUtils.isEmpty(modelList)){
+
+//            if (modelList.size() == 1) viewHolder.delete_tv.setVisibility(View.GONE);
+//            else viewHolder.delete_tv.setVisibility(View.VISIBLE);
+
+            //显示名称
+            if (!ListUtils.isEmpty(modelList) && !StringUtil.isEmpty(modelList.get(position).getSt_name()))
                 viewHolder.name_tv.setText(modelList.get(position).getSt_name()+"");
+            else
+                viewHolder.name_tv.setText(null);
+
+            //显示照片
+            if (update && !updateChangeP){
+                ImageLoader.getInstance().displayImage(modelList.get(position).getSt_imageurl(),viewHolder.image_im);
+            }else {
+                if (!ListUtils.isEmpty(photoList) && position < photoList.size() &&
+                        !StringUtil.isEmpty(photoList.get(position)))
+                    ImageLoader.getInstance().displayImage(Uri.fromFile(new File(photoList.get(position))).toString(), viewHolder.image_im);
+                else
+                    viewHolder.image_im.setImageResource(R.drawable.add_picture); //设置为默认头像不然会被复用
             }
+
+
+
+            //显示服务时间/分钟
+            if (!ListUtils.isEmpty(modelList) && !StringUtil.isEmpty(modelList.get(position).getSt_servicetime()))
+                viewHolder.sTime_et.setText(modelList.get(position).getSt_servicetime());
+            else
+                viewHolder.sTime_et.setText(null);
+
             return convertView;
         }
         class ViewHolder{
             FormEditText name_tv;
-            TextView industry_tv;
+            ImageView image_im;
+            RelativeLayout sTime_rl;
+            FormEditText sTime_et;
+            TextView delete_tv;
+        }
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == REQUEST_CODE_CAPTURE_PHOTO) {// 拍照返回
+            if (resultCode == Activity.RESULT_OK) {
+                if (mNewPhotoUri != null) {
+                    String path = mNewPhotoUri.getPath();
+                    addPhotoList(path);
+                } else {
+                    ToastUtil.showToast(this, com.uas.appworks.R.string.c_take_picture_failed);
+                }
+            }
+        }else if (requestCode == REQUEST_CODE_PICK_PHOTO) {// 传统单选方式，选择一张图片,然后立即调用裁减
+            if (resultCode == Activity.RESULT_OK){
+                if (data != null && data.getData() != null){
+                    String path= CameraUtil.getImagePathFromUri(this, data.getData());
+                    addPhotoList(path);
+                }
+            }
         }
     }
+
+    private void addPhotoList(String path) {
+        if (image_position > mPhotoList.size() -1){
+            mPhotoList.add(path);
+        }else if (image_position <= mPhotoList.size() -1){
+            mPhotoList.set(image_position,path); //替换
+        }
+        myAdapter.notifyDataSetChanged();
+        Log.i("files0x01",path);
+        updateChangeP = true;
+    }
+
+    private void showSelectPictureDialog() {
+        String[] items = new String[]{getString(com.uas.appworks.R.string.c_take_picture), getString(com.uas.appworks.R.string.c_photo_album)};
+        AlertDialog.Builder builder = new AlertDialog.Builder(this).setSingleChoiceItems(items, 0,
+                new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        if (which == 0) {
+                            try {
+                                takePhoto();
+                            } catch (Exception e) {
+                                String message=e.getMessage();
+                                if (!StringUtil.isEmpty(message)&&message.contains("Permission")){
+                                    ToastUtil.showToast(ct,R.string.not_system_permission);
+                                }
+                            }
+                        } else {
+                            CameraUtil.pickImageSimple(BSettingLocationActivity.this, REQUEST_CODE_PICK_PHOTO);  //传统单选方式
+                        }
+                        dialog.dismiss();
+                    }
+                });
+        builder.show();
+    }
+
+    private void takePhoto() {
+        try {
+            mNewPhotoUri = CameraUtil.getOutputMediaFileUri(this, MyApplication.getInstance().getLoginUserId(), CameraUtil.MEDIA_TYPE_IMAGE);
+            CameraUtil.captureImage(this, mNewPhotoUri, REQUEST_CODE_CAPTURE_PHOTO);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
     private PopupWindow popupWindow = null;
-    private void doInputName(final int position) {
+    private void doInputName(final int type, final int position) {
         // 一个自定义的布局，作为显示的内容
         View contentView = LayoutInflater.from(ct).inflate(
                 R.layout.item_edit_location_pop, null);
 
         // 设置按钮的点击事件
         final EditText editname_et = (EditText) contentView.findViewById(R.id.editname_et);
-        TextView cancel_tv = (TextView) contentView.findViewById(R.id.cancel_tv);
-        TextView sure_tv = (TextView) contentView.findViewById(R.id.sure_tv);
-
+        final EditText editname_et2 = (EditText) contentView.findViewById(R.id.editname_et2);
+        TextView title_tv = (TextView) contentView.findViewById(R.id.title_tv);
         editname_et.setText(mList.get(position).getSt_name()+"");
+        editname_et2.setText(mList.get(position).getSt_servicetime()+"");
         DisplayMetrics dm = getResources().getDisplayMetrics();
+        if (type==1) {
+            editname_et.setVisibility(View.VISIBLE);
+            editname_et2.setVisibility(View.GONE);
+            title_tv.setText("请输入服务/场地/房间名称");
+        } else if(type==2) {
+            editname_et.setVisibility(View.GONE);
+            editname_et2.setVisibility(View.VISIBLE);
+            title_tv.setText("请输入服务时间/分钟");
+        }
         int w_screen = dm.widthPixels;
         int h_screen = dm.heightPixels;
         w_screen = DisplayUtil.dip2px(this, 300);
@@ -405,13 +712,20 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
         contentView.findViewById(R.id.sure_tv).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                if (StringUtil.isEmpty(editname_et.getText().toString())){
-                    ToastMessage("请输入服务/场地/房间名称");
-                    return;
-                }else {
-                    mList.get(position).setSt_name(editname_et.getText().toString());
-                    myAdapter.notifyDataSetChanged();
+                if (type==1){
+                    if (StringUtil.isEmpty(editname_et.getText().toString())){
+                        ToastMessage("请输入服务/场地/房间名称");
+                        return;
+                    }else {
+                        mList.get(position).setSt_name(editname_et.getText().toString());
+                        myAdapter.notifyDataSetChanged();
+                    }
+                }else if (type==2){
+                        mList.get(position).setSt_servicetime(
+                                StringUtil.isEmpty(editname_et2.getText().toString()) ? "0" :editname_et2.getText().toString());
+                        myAdapter.notifyDataSetChanged();
                 }
+
                 popupWindow.dismiss();
             }
         });

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());

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

@@ -13,6 +13,7 @@ import com.common.LogUtil;
 import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
 import com.common.data.StringUtil;
+import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.utils.CommonUtil;
@@ -22,7 +23,6 @@ import com.me.network.app.http.Method;
 import com.me.network.app.http.rx.ResultListener;
 import com.me.network.app.http.rx.ResultSubscriber;
 import com.uas.appme.R;
-import com.uas.appme.settings.Constant.Constant;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -131,7 +131,7 @@ public class BusinessHoursSetting extends BaseActivity implements View.OnClickLi
         param.put("sc_booktype",sc_booktype);
 
         LogUtil.prinlnLongMsg("appStoreUpdate",JSONUtil.map2JSON(param));
-        HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
+        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appStoreUpdate")
                 .add("map", JSONUtil.map2JSON(param))
@@ -174,7 +174,7 @@ public class BusinessHoursSetting extends BaseActivity implements View.OnClickLi
 
     //获取是否之前有设置的时间
     private void initData() {
-        HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
+        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appCompanyAdmin")
                 .add("companyid",CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"))
@@ -228,7 +228,7 @@ public class BusinessHoursSetting extends BaseActivity implements View.OnClickLi
         param.put("sc_endtime",mTvEndTime.getText().toString());
 
         LogUtil.prinlnLongMsg("appStoreUpdate",JSONUtil.map2JSON(param));
-        HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
+        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appStoreUpdate")
                 .add("map", JSONUtil.map2JSON(param))

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

@@ -22,6 +22,7 @@ import com.common.data.StringUtil;
 import com.common.system.PermissionUtil;
 import com.common.ui.CameraUtil;
 import com.common.ui.ProgressDialogUtil;
+import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.net.http.ViewUtil;
@@ -38,7 +39,6 @@ import com.me.network.app.http.rx.ResultListener;
 import com.me.network.app.http.rx.ResultSubscriber;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.uas.appme.R;
-import com.uas.appme.settings.Constant.Constant;
 import com.umeng.socialize.utils.Log;
 
 import java.io.File;
@@ -161,7 +161,7 @@ public class ImageSettingActivity extends BaseActivity implements View.OnClickLi
         Map<String, Object> params = new HashMap<>();
         params.put("sc_imageurl",oUrl);
         params.put("sc_uu",CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"));
-        HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
+        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
         httpClient.getHeaders().remove("Content-Type");
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appStorurl")

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

@@ -32,6 +32,7 @@ import com.common.system.PermissionUtil;
 import com.common.ui.CameraUtil;
 import com.common.ui.ImageUtil;
 import com.common.ui.ProgressDialogUtil;
+import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.model.SelectBean;
@@ -52,7 +53,6 @@ import com.me.network.app.http.rx.ResultListener;
 import com.me.network.app.http.rx.ResultSubscriber;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.uas.appme.R;
-import com.uas.appme.settings.Constant.Constant;
 import com.uas.appme.settings.model.BSettingPlaceBean;
 import com.uas.appme.settings.model.PersonSetingBean;
 import com.umeng.socialize.utils.Log;
@@ -162,7 +162,7 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
 
         HttpClient httpClient =
 //                new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);\
-                new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
+                new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appPlaceList")
                 .add("companyid",CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"))
@@ -271,7 +271,7 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
         }
     }
     private void doDelete() {
-        HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
+        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appStoreDel")
                 .add("keyfield", "sm_id")
@@ -358,6 +358,10 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
     }
 
     private void saveJudge() {
+        if (StringUtil.isEmpty(photoselect)) {
+            ToastMessage("请添加头像照片");
+            return;
+        }
         File file=  new File(photoselect);
         if (StringUtil.isEmpty(result)){
             if (!file.exists()) {// 录入时的，且图片文件不存在
@@ -405,7 +409,7 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
 
         HttpClient httpClient =
 //                new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
-                    new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
+                    new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appPersonSet")
                 .add("map", JSONUtil.map2JSON(params))

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

@@ -14,6 +14,7 @@ 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.BaseActivity;
 import com.core.utils.CommonUtil;
@@ -24,7 +25,6 @@ import com.me.network.app.http.Method;
 import com.me.network.app.http.rx.ResultListener;
 import com.me.network.app.http.rx.ResultSubscriber;
 import com.uas.appme.R;
-import com.uas.appme.settings.Constant.Constant;
 import com.uas.appme.settings.adapter.PSettingListAdapter;
 import com.uas.appme.settings.model.PersonSetingBean;
 
@@ -75,7 +75,7 @@ public class PersonSettingListActivity extends BaseActivity {
             ToastMessage(getString(R.string.common_notlinknet));
             return;
         }
-        HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
+        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appStoreman")
                 .add("companyid", CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"))
@@ -156,7 +156,7 @@ public class PersonSettingListActivity extends BaseActivity {
         DisplayUtil.backgroundAlpha(this, 1f);
     }
     private void doDeleteHandle(int longPosition) {
-        HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
+        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appStoreDel")
                 .add("keyfield", "sm_id")

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

@@ -59,7 +59,6 @@ import com.me.network.app.http.rx.ResultSubscriber;
 import com.uas.appme.R;
 import com.uas.appme.pedometer.view.NewStepActivity;
 import com.uas.appme.pedometer.view.StepSplashActivity;
-import com.uas.appme.settings.Constant.Constant;
 import com.uas.appworks.OA.erp.activity.FlightsActivity;
 import com.uas.appworks.OA.erp.activity.MissionSetActivity;
 import com.uas.appworks.OA.erp.activity.MyRuleSetActivity;
@@ -140,7 +139,7 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
         businessmen_setting_rl.setOnClickListener(this);
         bsettingRed = (TextView) findViewById(R.id.businessmen_setting_new);
 
-        if (PreferenceUtils.getBoolean(MyApplication.getInstance(), Constant.B_SETTINGRED)) //商家设置红点
+        if (PreferenceUtils.getBoolean(MyApplication.getInstance(), Constants.B_SETTINGRED)) //商家设置红点
             bsettingRed.setVisibility(View.GONE);
 
         new_step_rl.setOnClickListener(this);
@@ -151,7 +150,7 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
         share_rl = (RelativeLayout) findViewById(R.id.share_rl);
         mExitBtn = (Button) findViewById(R.id.exit_btn);
         //share_rl.setVisibility(View.GONE);
-        int isPush = PreferenceUtils.getInt(MyApplication.getInstance(), Constant.BAIDU_PUSH);
+        int isPush = PreferenceUtils.getInt(MyApplication.getInstance(), Constants.BAIDU_PUSH);
 
         if (isPush == -1) {//第一次进入没有配置
             cb_task_reply.setChecked(true);
@@ -165,11 +164,11 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
             @Override
             public void onCheckedChanged(View view, boolean isChecked) {
                 if (isChecked) {
-                    PreferenceUtils.putInt(Constant.BAIDU_PUSH, 1);
+                    PreferenceUtils.putInt(Constants.BAIDU_PUSH, 1);
                     PushManager.resumeWork(MyApplication.getInstance());
                 } else {
                     PushManager.stopWork(MyApplication.getInstance());
-                    PreferenceUtils.putInt(Constant.BAIDU_PUSH, 0);
+                    PreferenceUtils.putInt(Constants.BAIDU_PUSH, 0);
                 }
             }
         });
@@ -198,7 +197,7 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
 
 
         //UU开关的 根据StepService是否开启显示状态
-        int isStep = PreferenceUtils.getInt(MyApplication.getInstance(), Constant.UU_STEP);
+        int isStep = PreferenceUtils.getInt(MyApplication.getInstance(), Constants.UU_STEP);
         if (isServiceRunning(newStep_service_name) && (isStep == -1 || isStep == 1)) {
             uu_step_reply.setChecked(true);
         } else {
@@ -212,13 +211,13 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
                 tv_menu_setting.setVisibility(View.GONE);
                 CommonUtil.putSharedPreferencesBoolean(SettingActivity.this, Constants.NEW_UURUN, true);
                 if (isChecked) {
-                    PreferenceUtils.putInt(Constant.UU_STEP, 1);
+                    PreferenceUtils.putInt(Constants.UU_STEP, 1);
 //                    PushManager.resumeWork(MyApplication.getInstance());
 //
                     startActivity(new Intent(mContext, StepSplashActivity.class));
                 } else {
 //                    PushManager.stopWork(MyApplication.getInstance());
-                    PreferenceUtils.putInt(Constant.UU_STEP, 0);
+                    PreferenceUtils.putInt(Constants.UU_STEP, 0);
 //                    stopService(intent);
                     Toast.makeText(mContext, getString(R.string.set_close_step_notice1), Toast.LENGTH_LONG).show();
                     speech_recognition_rl.setVisibility(View.GONE);
@@ -230,7 +229,7 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
             public void onClick(View v) {
                 tv_menu_setting.setVisibility(View.GONE);
                 CommonUtil.putSharedPreferencesBoolean(SettingActivity.this, Constants.NEW_UURUN, true);
-                int last_isStep = PreferenceUtils.getInt(MyApplication.getInstance(), Constant.UU_STEP);
+                int last_isStep = PreferenceUtils.getInt(MyApplication.getInstance(), Constants.UU_STEP);
                 if (isServiceRunning(newStep_service_name) && last_isStep == 1) {
                     startActivity(new Intent(mContext, NewStepActivity.class));
                 } else {
@@ -273,7 +272,7 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
     }
 
     private void doShowBSettingJudge() {
-        HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
+        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appCompanyAdmin")
 //                .add("companyid",10043574)
@@ -294,16 +293,14 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
                 try {
                     //{"result":"1","url":"http://113.105.74.140:8081/u/0/0/201710/o/48fda5af663f40f795f2dd49e2d8801f.jpg"}
                     if (o.toString().contains("result")) {
-                        if ("1".equals(JSON.parseObject(o.toString()).getString("result"))){
+                        if (!CommonUtil.isReleaseVersion()) {
+                            businessmen_setting_rl.setVisibility(View.VISIBLE);
+                        }else if ("1".equals(JSON.parseObject(o.toString()).getString("result"))){
                             businessmen_setting_rl.setVisibility(View.VISIBLE);
                             if (o.toString().contains("url"))
                                 business_iamge = JSON.parseObject(o.toString()).getString("url");
-                        }
-//                        else if (!CommonUtil.isReleaseVersion()) {
-//                            businessmen_setting_rl.setVisibility(View.VISIBLE);
-//                        }
-                        else{
-                            businessmen_setting_rl.setVisibility(View.VISIBLE);
+                        }else{
+                            businessmen_setting_rl.setVisibility(View.GONE);
                         }
                     }
                 } catch (Exception e) {
@@ -441,7 +438,7 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
        }else if (v.getId() == R.id.businessmen_setting_rl){
            startActivity(new Intent(this,BSettingActivity.class)
            .putExtra("business_iamge",business_iamge));
-           PreferenceUtils.putBoolean(Constant.B_SETTINGRED, true);
+           PreferenceUtils.putBoolean(Constants.B_SETTINGRED, true);
            bsettingRed.setVisibility(View.GONE);
        }
     }

app_modular/appme/src/main/java/com/uas/appme/settings/model/BSetLocationBean.java

@@ -11,6 +11,24 @@ public class BSetLocationBean {
     private String st_companyid;
     private String st_companyname;
     private String st_id;
+    private String st_servicetime;
+    private String st_imageurl;
+
+    public String getSt_imageurl() {
+        return st_imageurl;
+    }
+
+    public void setSt_imageurl(String st_imageurl) {
+        this.st_imageurl = st_imageurl;
+    }
+
+    public String getSt_servicetime() {
+        return st_servicetime;
+    }
+
+    public void setSt_servicetime(String st_servicetime) {
+        this.st_servicetime = st_servicetime;
+    }
 
     public String getSt_id() {
         return st_id;

app_modular/appme/src/main/java/com/uas/appme/settings/model/BSettingPlaceBean.java

@@ -8,7 +8,8 @@ import java.util.List;
  */
 
 public class BSettingPlaceBean {
-    public List<ResultBean> result;
+
+    private List<ResultBean> result;
 
     public List<ResultBean> getResult() {
         return result;
@@ -19,10 +20,24 @@ public class BSettingPlaceBean {
     }
 
     public static class ResultBean {
+        /**
+         * st_companyid : 10046529
+         * st_companyname : 服务预约1
+         * st_id : 20244
+         * st_imageurl : http://113.105.74.140:8081/u/0/0/201711/o/7cf6e83f6d114352b4e0bea103cc8826.png
+         * st_name : 奋斗的
+         * st_price : 0
+         * st_servicetime : 222
+         * st_siid : 0
+         */
+
         private String st_companyid;
         private String st_companyname;
         private String st_id;
+        private String st_imageurl;
         private String st_name;
+        private String st_price;
+        private String st_servicetime;
         private String st_siid;
 
         public String getSt_companyid() {
@@ -49,6 +64,14 @@ public class BSettingPlaceBean {
             this.st_id = st_id;
         }
 
+        public String getSt_imageurl() {
+            return st_imageurl;
+        }
+
+        public void setSt_imageurl(String st_imageurl) {
+            this.st_imageurl = st_imageurl;
+        }
+
         public String getSt_name() {
             return st_name;
         }
@@ -57,6 +80,22 @@ public class BSettingPlaceBean {
             this.st_name = st_name;
         }
 
+        public String getSt_price() {
+            return st_price;
+        }
+
+        public void setSt_price(String st_price) {
+            this.st_price = st_price;
+        }
+
+        public String getSt_servicetime() {
+            return st_servicetime;
+        }
+
+        public void setSt_servicetime(String st_servicetime) {
+            this.st_servicetime = st_servicetime;
+        }
+
         public String getSt_siid() {
             return st_siid;
         }

app_modular/appme/src/main/res/layout/com_location_input_item.xml

@@ -3,8 +3,6 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     xmlns:whatever="http://schemas.android.com/tools"
-    android:layout_marginLeft="25dp"
-    android:layout_marginRight="25dp"
     android:orientation="vertical">
     <TextView
         android:layout_width="wrap_content"
@@ -20,7 +18,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:background="@drawable/rl_circular_bg">
+        android:background="@drawable/rl_circular_bg"
+        android:layout_marginBottom="10dp">
 
         <RelativeLayout
             android:id="@id/name_rl"
@@ -36,6 +35,7 @@
                 android:layout_centerVertical="true"
                 android:text="名称"
                 android:textSize="14sp"
+                android:textColor="@color/text_main"
                 />
 
             <com.andreabaccega.widget.FormEditText
@@ -43,7 +43,6 @@
                 style="@style/IMTbleLine_TextValue"
                 android:layout_toLeftOf="@+id/of_add_set_range_img"
                 android:layout_toRightOf="@+id/of_add_set_range_text"
-                android:textColor="@color/dark_dark_grey"
                 android:padding="10dp"
                 android:hint="@string/common_input"
                 android:layout_width="wrap_content"
@@ -57,6 +56,7 @@
                 whatever:customRegexp="^[A-Za-z\u4e00-\u9fa5]{1,8}+$"
                 whatever:testErrorString="姓名只能为12个字符之内的中、英文"
                 android:layout_marginLeft="10dp"
+                android:textColor="@color/text_main"
                 />
             <ImageView
                 android:id="@+id/of_add_set_range_img"
@@ -72,49 +72,102 @@
         <View
             android:id="@+id/line"
             android:layout_width="match_parent"
-            android:layout_height="2px"
+            android:layout_height="1px"
             android:background="@color/item_line"
             android:layout_below="@+id/position_tv"
-            android:layout_marginLeft="20dp"
-            android:layout_marginRight="20dp"
-            android:visibility="gone"
+            android:visibility="visible"
+            />
+        <RelativeLayout
+            style="@style/IMTbleLine2"
+            android:minHeight="150dp"
+            android:layout_height="150dp"
+            android:background="@color/white"
+            android:layout_marginTop="10dp">
+            <TextView
+                android:id="@+id/image_tv"
+                style="@style/form_relative_left_text"
+                android:text="照片"
+                android:layout_marginLeft="0dp"
+                android:textColor="@color/text_main"
+                android:textSize="15sp"
+                android:layout_centerVertical="false"
+                />
+            <TextView
+                android:id="@+id/image_tv_"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="点击照片添加/更换"
+                android:textSize="14sp"
+                android:layout_centerHorizontal="true"
+                android:layout_marginBottom="10dp"/>
+            <ImageView
+                android:id="@+id/image_im"
+                android:layout_below="@+id/image_tv_"
+                android:layout_width="100dp"
+                android:layout_height="100dp"
+                android:src="@drawable/add_picture"
+                android:layout_centerInParent="true"/>
+        </RelativeLayout>
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1px"
+            android:background="@color/item_line"
+            android:layout_below="@+id/position_tv"
+            android:visibility="visible"
             />
         <RelativeLayout
+            android:id="@+id/service_time_rl"
             style="@style/IMTbleLine2"
             android:layout_height="50dp"
             android:background="@color/white"
-            android:visibility="gone"
             >
 
             <TextView
-                android:id="@+id/of_add_set_range_text2"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="行业"
+                android:text="服务时间/分钟"
                 android:textSize="14sp"
-                android:layout_alignParentTop="true"
+                android:textColor="@color/text_main"
+                android:layout_alignBaseline="@+id/service_time_et"
+                android:layout_alignBottom="@+id/service_time_et"
                 android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
-                android:layout_marginTop="16dp" />
+                android:layout_alignParentStart="true" />
 
-            <TextView
-                android:id="@+id/industry_tv"
+            <com.andreabaccega.widget.FormEditText
+                android:id="@+id/service_time_et"
                 style="@style/IMTbleLine_TextValue"
-                android:textColor="@color/dark_dark_grey"
                 android:padding="10dp"
-                android:layout_alignBaseline="@+id/of_add_set_range_text2"
-                android:layout_alignBottom="@+id/of_add_set_range_text2"
-                android:layout_toRightOf="@+id/of_add_set_range_text2"
-                android:layout_toEndOf="@+id/of_add_set_range_text2" />
+                android:hint="@string/common_input1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:background="@null"
+                android:textSize="15sp"
+                android:gravity="center_vertical|right"
+                android:inputType="number"
+                android:textColor="@color/text_main"
+                />
             <ImageView
-                android:id="@+id/of_add_set_range_img2"
                 android:layout_width="@dimen/next_width"
                 android:layout_height="@dimen/next_height"
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name"
+                android:visibility="gone"
                 />
         </RelativeLayout>
+        <TextView
+            android:id="@+id/delete_tv"
+            android:layout_gravity="right"
+            android:layout_width="100dp"
+            android:layout_height="30dp"
+            android:text="@string/delete"
+            android:textColor="@color/red"
+            android:paddingLeft="40dp"
+            android:paddingTop="6dp"
+            android:visibility="gone"
+            />
     </LinearLayout>
 </LinearLayout>

app_modular/appme/src/main/res/layout/com_location_item.xml

@@ -2,10 +2,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginLeft="25dp"
-    android:layout_marginRight="25dp"
-    android:orientation="vertical"
-    >
+    xmlns:whatever="http://schemas.android.com/tools"
+    android:orientation="vertical">
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -20,7 +18,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:background="@drawable/rl_circular_bg">
+        android:background="@drawable/rl_circular_bg"
+        android:layout_marginBottom="10dp">
 
         <RelativeLayout
             android:id="@id/name_rl"
@@ -36,16 +35,18 @@
                 android:layout_centerVertical="true"
                 android:text="名称"
                 android:textSize="14sp"
+                android:textColor="@color/text_main"
                 />
 
+
             <TextView
                 android:id="@+id/name_tv"
                 style="@style/IMTbleLine_TextValue"
                 android:layout_toLeftOf="@+id/of_add_set_range_img"
                 android:layout_toRightOf="@+id/of_add_set_range_text"
-                android:textColor="@color/dark_dark_grey"
                 android:padding="10dp"
                 android:hint="@string/common_input"
+                android:textColor="@color/text_main"
                 />
             <ImageView
                 android:id="@+id/of_add_set_range_img"
@@ -61,48 +62,73 @@
         <View
             android:id="@+id/line"
             android:layout_width="match_parent"
-            android:layout_height="2px"
+            android:layout_height="1px"
+            android:background="@color/item_line"
+            android:layout_below="@+id/position_tv"
+            android:visibility="visible"
+            />
+        <RelativeLayout
+            android:id="@+id/image_rl"
+            style="@style/IMTbleLine2"
+            android:minHeight="150dp"
+            android:layout_height="150dp"
+            android:background="@color/white"
+            android:layout_marginTop="10dp">
+            <TextView
+                android:id="@+id/image_tv"
+                style="@style/form_relative_left_text"
+                android:text="照片"
+                android:layout_marginLeft="0dp"
+                android:textColor="@color/text_main"
+                android:textSize="15sp"
+                android:layout_centerVertical="false"
+                />
+            <ImageView
+                android:id="@+id/image_im"
+                android:layout_below="@+id/image_tv_"
+                android:layout_width="100dp"
+                android:layout_height="100dp"
+                android:src="@drawable/add_picture"
+                android:layout_centerInParent="true"/>
+        </RelativeLayout>
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1px"
             android:background="@color/item_line"
             android:layout_below="@+id/position_tv"
-            android:layout_marginLeft="20dp"
-            android:layout_marginRight="20dp"
-            android:visibility="gone"
+            android:visibility="visible"
             />
         <RelativeLayout
+            android:id="@+id/service_time_rl"
             style="@style/IMTbleLine2"
             android:layout_height="50dp"
             android:background="@color/white"
-            android:visibility="gone"
             >
 
             <TextView
-                android:id="@+id/of_add_set_range_text2"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="行业"
+                android:layout_centerVertical="true"
+                android:text="服务时间/分钟"
                 android:textSize="14sp"
-                android:layout_alignParentTop="true"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
-                android:layout_marginTop="16dp" />
+                android:textColor="@color/text_main"
+                />
 
             <TextView
-                android:id="@+id/industry_tv"
+                android:id="@+id/service_time_tv"
                 style="@style/IMTbleLine_TextValue"
-                android:textColor="@color/dark_dark_grey"
                 android:padding="10dp"
-                android:layout_alignBaseline="@+id/of_add_set_range_text2"
-                android:layout_alignBottom="@+id/of_add_set_range_text2"
-                android:layout_toRightOf="@+id/of_add_set_range_text2"
-                android:layout_toEndOf="@+id/of_add_set_range_text2" />
+                android:hint="@string/common_input"
+                android:textColor="@color/text_main"
+                />
             <ImageView
-                android:id="@+id/of_add_set_range_img2"
                 android:layout_width="@dimen/next_width"
                 android:layout_height="@dimen/next_height"
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name"
+                android:visibility="gone"
                 />
         </RelativeLayout>
     </LinearLayout>

app_modular/appme/src/main/res/layout/com_rest_item.xml

@@ -60,11 +60,11 @@
         <View
             android:id="@+id/line"
             android:layout_width="match_parent"
-            android:layout_height="2px"
+            android:layout_height="1px"
             android:background="@color/item_line"
             android:layout_below="@+id/position_tv"
-            android:layout_marginLeft="20dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
             />
         <RelativeLayout
             style="@style/IMTbleLine2"

app_modular/appme/src/main/res/layout/item_edit_location_pop.xml

@@ -42,7 +42,20 @@
             android:hint="@string/common_input"
             android:textColor="@color/text_main"
             android:textSize="@dimen/text_main"
-            android:gravity="center_horizontal"/>
+            android:gravity="center_horizontal"
+            />
+        <EditText
+            android:id="@+id/editname_et2"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@null"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:hint="@string/common_input2"
+            android:textColor="@color/text_main"
+            android:textSize="@dimen/text_main"
+            android:gravity="center_horizontal"
+            android:inputType="number"/>
     </LinearLayout>
 
 

app_modular/appmessages/src/main/assets/business_statistics.json

@@ -0,0 +1,336 @@
+[
+	{
+		industry:"KTV",
+		targets:[
+			{	
+				targetName:"房间预订时数列表",
+				typelist:"0",
+				targetDetails:[
+					{
+						detailName:"日期",
+						detailValue:""
+					},
+					{
+						detailName:"时数",
+						detailValue:""
+					},
+					{
+						detailName:"房间名称",
+						detailValue:""
+					}
+				]
+			},
+			{	
+				targetName:"订单数量",
+				typelist:"1",
+				targetDetails:[
+					{
+						detailName:"日期",
+						detailValue:""
+					},
+					{
+						detailName:"数量",
+						detailValue:""
+					}
+				]
+			},
+			{	
+				targetName:"客户资料",
+				typelist:"2",
+				targetDetails:[
+					{
+						detailName:"姓名",
+						detailValue:""
+					},
+					{
+						detailName:"电话",
+						detailValue:""
+					},
+					{
+						detailName:"预约次数",
+						detailValue:""
+					}
+				]
+			}
+		]
+	},
+	{
+		industry:"会所",
+		targets:[
+			{	
+				targetName:"技师预约时数列表",
+				typelist:"0",
+				targetDetails:[
+					{
+						detailName:"日期",
+						detailValue:""
+					},
+					{
+						detailName:"预约次数",
+						detailValue:""
+					},
+					{
+						detailName:"工作时数",
+						detailValue:""
+					}
+				]
+			},
+			{	
+				targetName:"服务项目列表",
+				typelist:"1",
+				targetDetails:[
+					{
+						detailName:"日期",
+						detailValue:""
+					},
+					{
+						detailName:"项目名称",
+						detailValue:""
+					},
+					{
+						detailName:"项目预约次数",
+						detailValue:""
+					}
+				]
+			},
+			{	
+				targetName:"客户资料",
+				typelist:"2",
+				targetDetails:[
+					{
+						detailName:"姓名",
+						detailValue:""
+					},
+					{
+						detailName:"电话",
+						detailValue:""
+					},
+					{
+						detailName:"预约次数",
+						detailValue:""
+					}
+				]
+			}
+		]
+	},
+	{
+		industry:"餐饮",
+		targets:[
+			{	
+				targetName:"包房预约量",
+				typelist:"0",
+				targetDetails:[
+					{
+						detailName:"日期",
+						detailValue:""
+					},
+					{
+						detailName:"房间名称",
+						detailValue:""
+					},
+					{
+						detailName:"预约时数",
+						detailValue:""
+					}
+				]
+			},
+			{	
+				targetName:"客户资料",
+				typelist:"1",
+				targetDetails:[
+					{
+						detailName:"姓名",
+						detailValue:""
+					},
+					{
+						detailName:"电话",
+						detailValue:""
+					},
+					{
+						detailName:"预约次数",
+						detailValue:""
+					}
+				]
+			}
+		]
+	},
+	{
+		industry:"美容美发",
+		targets:[
+			{	
+				targetName:"发型师预约数量",
+				typelist:"0",
+				targetDetails:[
+					{
+						detailName:"日期",
+						detailValue:""
+					},
+					{
+						detailName:"发型师姓名",
+						detailValue:""
+					},
+					{
+						detailName:"预约次数",
+						detailValue:""
+					},
+					{
+						detailName:"当前排名",
+						detailValue:""
+					}
+				]
+			},
+			{	
+				targetName:"服务项目排名",
+				typelist:"1",
+				targetDetails:[
+					{
+						detailName:"日期",
+						detailValue:""
+					},
+					{
+						detailName:"项目名称",
+						detailValue:""
+					},
+					{
+						detailName:"预约次数",
+						detailValue:""
+					},
+					{
+						detailName:"当前排名",
+						detailValue:""
+					}
+				]
+			},
+			{	
+				targetName:"客户资料",
+				typelist:"2",
+				targetDetails:[
+					{
+						detailName:"姓名",
+						detailValue:""
+					},
+					{
+						detailName:"电话",
+						detailValue:""
+					},
+					{
+						detailName:"预约次数",
+						detailValue:""
+					}
+				]
+			}
+		]
+	},
+	{
+		industry:"运动健身",
+		targets:[
+			{	
+				targetName:"场地预约量排行榜",
+				typelist:"0",
+				targetDetails:[
+					{
+						detailName:"日期",
+						detailValue:""
+					},
+					{
+						detailName:"场地名称",
+						detailValue:""
+					},
+					{
+						detailName:"预约量",
+						detailValue:""
+					},
+					{
+						detailName:"当前排名",
+						detailValue:""
+					}
+				]
+			},
+			{	
+				targetName:"客户资料",
+				typelist:"1",
+				targetDetails:[
+					{
+						detailName:"姓名",
+						detailValue:""
+					},
+					{
+						detailName:"电话",
+						detailValue:""
+					},
+					{
+						detailName:"预约次数",
+						detailValue:""
+					}
+				]
+			}
+		]
+	},
+	{
+		industry:"医院挂号",
+		targets:[
+			{	
+				targetName:"科室预约排行榜",
+				typelist:"1",
+				targetDetails:[
+					{
+						detailName:"日期",
+						detailValue:""
+					},
+					{
+						detailName:"科室名称",
+						detailValue:""
+					},
+					{
+						detailName:"预约量",
+						detailValue:""
+					},
+					{
+						detailName:"当前排行",
+						detailValue:""
+					}
+				]
+			},
+			{	
+				targetName:"医生预约量排行",
+				typelist:"02",
+				targetDetails:[
+					{
+						detailName:"日期",
+						detailValue:""
+					},
+					{
+						detailName:"预约次数",
+						detailValue:""
+					},
+					{
+						detailName:"医生姓名",
+						detailValue:""
+					},
+					{
+						detailName:"当前排名",
+						detailValue:""
+					}
+				]
+			},
+			{	
+				targetName:"客户资料",
+				typelist:"2",
+				targetDetails:[
+					{
+						detailName:"姓名",
+						detailValue:""
+					},
+					{
+						detailName:"电话",
+						detailValue:""
+					},
+					{
+						detailName:"预约次数",
+						detailValue:""
+					}
+				]
+			}
+		]
+	}
+]

app_modular/appmessages/src/main/java/com/modular/appmessages/activity/BusinessTargetDetailActivity.java

@@ -0,0 +1,10 @@
+package com.modular.appmessages.activity;
+
+/**
+ * @author RaoMeng
+ * @describe
+ * @date 2017/11/3 11:26
+ */
+
+public class BusinessTargetDetailActivity {
+}

app_modular/appmessages/src/main/java/com/modular/appmessages/activity/BusinessTargetsActivity.java

@@ -0,0 +1,10 @@
+package com.modular.appmessages.activity;
+
+/**
+ * @author RaoMeng
+ * @describe
+ * @date 2017/11/3 11:25
+ */
+
+public class BusinessTargetsActivity {
+}

app_modular/appmessages/src/main/java/com/modular/appmessages/adapter/BusinessTargetsAdapter.java

@@ -0,0 +1,10 @@
+package com.modular.appmessages.adapter;
+
+/**
+ * @author RaoMeng
+ * @describe
+ * @date 2017/11/3 13:47
+ */
+
+public class BusinessTargetsAdapter {
+}

app_modular/appmessages/src/main/java/com/modular/appmessages/adapter/BusinessTargetsDetailAdapter.java

@@ -0,0 +1,10 @@
+package com.modular.appmessages.adapter;
+
+/**
+ * @author RaoMeng
+ * @describe
+ * @date 2017/11/3 15:37
+ */
+
+public class BusinessTargetsDetailAdapter {
+}

app_modular/appmessages/src/main/java/com/modular/appmessages/model/BusinessStatisticsBean.java

@@ -0,0 +1,10 @@
+package com.modular.appmessages.model;
+
+/**
+ * @author RaoMeng
+ * @describe
+ * @date 2017/11/3 11:17
+ */
+
+public class BusinessStatisticsBean {
+}

app_modular/appmessages/src/main/res/layout/activity_business_target_detail.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/appmessages/src/main/res/layout/activity_business_targets.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/appmessages/src/main/res/layout/item_business_targets.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/appmessages/src/main/res/layout/item_business_targets_child_detail.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/appmessages/src/main/res/layout/item_business_targets_detail.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/appworks/src/main/java/com/uas/appworks/OA/erp/activity/ExpenseReimbursementActivity.java

@@ -1940,8 +1940,12 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
     }
 
     private void takePhoto() {
-        mNewPhotoUri = CameraUtil.getOutputMediaFileUri(this,MyApplication.getInstance().getLoginUserId(), CameraUtil.MEDIA_TYPE_IMAGE);
-        CameraUtil.captureImage(this, mNewPhotoUri, REQUEST_CODE_CAPTURE_PHOTO);
+        try {
+            mNewPhotoUri = CameraUtil.getOutputMediaFileUri(this, MyApplication.getInstance().getLoginUserId(), CameraUtil.MEDIA_TYPE_IMAGE);
+            CameraUtil.captureImage(this, mNewPhotoUri, REQUEST_CODE_CAPTURE_PHOTO);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
     private int Max_Size = 9;
     private void selectPhoto() {

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/utils/approvautils/NodeAdapter.java

@@ -22,95 +22,95 @@ import java.util.List;
 
 public class NodeAdapter extends BaseAdapter {
 
-    private Context ct;
-    private List<Approval> approvals;
-
-
-    public NodeAdapter(Context ct, List<Approval> approvals) {
-        this.ct = ct;
-        this.approvals = approvals;
-    }
-
-    @Override
-    public int getCount() {
-        return ListUtils.getSize(approvals);
-    }
-
-    @Override
-    public Object getItem(int position) {
-        return approvals.get(position);
-    }
-
-    @Override
-    public long getItemId(int position) {
-        return position;
-    }
-
-    @Override
-    public View getView(int position, View itemView, ViewGroup parent) {
-        NodeViewHolder holder = null;
-        if (itemView == null) {
-            holder = new NodeViewHolder();
-            itemView = LayoutInflater.from(ct).inflate(R.layout.item_approval_node, parent, false);
-            holder.timeTv = (TextView) itemView.findViewById(R.id.timeTv);
-            holder.keyTv = (TextView) itemView.findViewById(R.id.keyTv);
-            holder.valuesTv = (TextView) itemView.findViewById(R.id.valuesTv);
-            holder.handIv = (ImageView) itemView.findViewById(R.id.handIv);
-            holder.statusIV = (ImageView) itemView.findViewById(R.id.statusIV);
-            holder.padding = itemView.findViewById(R.id.padding);
-            itemView.setTag(holder);
-        } else {
-            holder = (NodeViewHolder) itemView.getTag();
-        }
-        bindNodeView(holder, position);
-        return itemView;
-    }
-
-    private void bindNodeView(NodeViewHolder holder, int position) {
-        Approval approval = approvals.get(position);
-        if (position > 0 && approvals.get(position - 1).getType() != Approval.NODES) {
-            holder.padding.setVisibility(View.VISIBLE);
-        } else {
-            holder.padding.setVisibility(View.GONE);
-        }
-        int textColor = R.color.hintColor;
-        if (!StringUtil.isEmpty(approval.getIdKey())) {
-            holder.valuesTv.setText(approval.getIdKey());
-            if (approval.getIdKey().startsWith("待审批")) {
-                textColor = R.color.approvaling;
-            } else if (approval.getIdKey().startsWith("未通过")) {
-                textColor = R.color.crimson;
-            }
-        } else {
-            holder.valuesTv.setText("");
-        }
-        holder.valuesTv.setTextColor(ct.getResources().getColor(textColor));
-        holder.keyTv.setText(approval.getCaption());
-        int reId = R.drawable.weishenpi;
-        if (!StringUtil.isEmpty(approval.getIdKey())) {
-            String status = approval.getIdKey().split("\\(")[0];
-            if (StringUtil.isEmpty(status)) status = "";
-            if ("已审批".equals(status)) {
-                reId = R.drawable.node_finished3;
-            } else if ("待审批".equals(status)) {
-                reId = R.drawable.daishenpi;
-            } else if ("未通过".equals(status)) {
-                reId = R.drawable.node_delete;
-            } else {
-                reId = R.drawable.weishenpi;
-            }
-        }
-        holder.statusIV.setImageResource(reId);
-        AvatarHelper.getInstance().display(String.valueOf(approval.getId()), holder.handIv, true, false);
-        holder.timeTv.setTextColor(ct.getResources().getColor(R.color.text_normal));
-        holder.timeTv.setText(approval.getValues());
-    }
-
-    private class NodeViewHolder {
-        ImageView handIv, statusIV;
-        TextView timeTv, keyTv, valuesTv;
-        View padding;
-
-
-    }
+	private Context ct;
+	private List<Approval> approvals;
+
+
+	public NodeAdapter(Context ct, List<Approval> approvals) {
+		this.ct = ct;
+		this.approvals = approvals;
+	}
+
+	@Override
+	public int getCount() {
+		return ListUtils.getSize(approvals);
+	}
+
+	@Override
+	public Object getItem(int position) {
+		return approvals.get(position);
+	}
+
+	@Override
+	public long getItemId(int position) {
+		return position;
+	}
+
+	@Override
+	public View getView(int position, View itemView, ViewGroup parent) {
+		NodeViewHolder holder = null;
+		if (itemView == null) {
+			holder = new NodeViewHolder();
+			itemView = LayoutInflater.from(ct).inflate(R.layout.item_approval_node, parent, false);
+			holder.timeTv = (TextView) itemView.findViewById(R.id.timeTv);
+			holder.keyTv = (TextView) itemView.findViewById(R.id.keyTv);
+			holder.valuesTv = (TextView) itemView.findViewById(R.id.valuesTv);
+			holder.handIv = (ImageView) itemView.findViewById(R.id.handIv);
+			holder.statusIV = (ImageView) itemView.findViewById(R.id.statusIV);
+			holder.padding = itemView.findViewById(R.id.padding);
+			itemView.setTag(holder);
+		} else {
+			holder = (NodeViewHolder) itemView.getTag();
+		}
+		bindNodeView(holder, position);
+		return itemView;
+	}
+
+	private void bindNodeView(NodeViewHolder holder, int position) {
+		Approval approval = approvals.get(position);
+		if (position > 0 && approvals.get(position - 1).getType() != Approval.NODES) {
+			holder.padding.setVisibility(View.VISIBLE);
+		} else {
+			holder.padding.setVisibility(View.GONE);
+		}
+		int textColor = R.color.hintColor;
+		if (!StringUtil.isEmpty(approval.getIdKey())) {
+			holder.valuesTv.setText(approval.getIdKey().replace("\\n", "\n"));
+			if (approval.getIdKey().startsWith("待审批")) {
+				textColor = R.color.approvaling;
+			} else if (approval.getIdKey().startsWith("未通过")) {
+				textColor = R.color.crimson;
+			}
+		} else {
+			holder.valuesTv.setText("");
+		}
+		holder.valuesTv.setTextColor(ct.getResources().getColor(textColor));
+		holder.keyTv.setText(approval.getCaption());
+		int reId = R.drawable.weishenpi;
+		if (!StringUtil.isEmpty(approval.getIdKey())) {
+			String status = approval.getIdKey().split("\\(")[0];
+			if (StringUtil.isEmpty(status)) status = "";
+			if ("已审批".equals(status)) {
+				reId = R.drawable.node_finished3;
+			} else if ("待审批".equals(status)) {
+				reId = R.drawable.daishenpi;
+			} else if ("未通过".equals(status)) {
+				reId = R.drawable.node_delete;
+			} else {
+				reId = R.drawable.weishenpi;
+			}
+		}
+		holder.statusIV.setImageResource(reId);
+		AvatarHelper.getInstance().display(String.valueOf(approval.getId()), holder.handIv, true, false);
+		holder.timeTv.setTextColor(ct.getResources().getColor(R.color.text_normal));
+		holder.timeTv.setText(approval.getValues());
+	}
+
+	private class NodeViewHolder {
+		ImageView handIv, statusIV;
+		TextView timeTv, keyTv, valuesTv;
+		View padding;
+
+
+	}
 }