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

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

@@ -396,7 +396,7 @@
         android:layout_width="match_parent"
         android:layout_height="@dimen/line"
         android:background="@color/item_line"
-        android:visibility="gone"/>
+        android:visibility="visible"/>
 
     <RelativeLayout
         android:id="@+id/uustep_rl"

app_core/common/src/main/java/com/common/data/StringUtil.java

@@ -12,216 +12,216 @@ import java.util.regex.Pattern;
 public class StringUtil {
 
 
-    public static boolean hasOneEqual(String messgae, String... keys) {
-        if (isEmpty(messgae) || keys == null || keys.length <= 0) return false;
-        for (String key : keys) {
-            if (messgae.equals(key))
-                return true;
-        }
-        return false;
-    }
-
-    public static boolean hasOneEqualUpperCase(String messgae, String... keys) {
-        if (isEmpty(messgae) || keys == null || keys.length <= 0) return false;
-        for (String key : keys) {
-            if (messgae.toUpperCase().equals(key.toUpperCase()))
-                return true;
-        }
-        return false;
-    }
-
-    /*判断是不是一个合法的电子邮件地址*/
-    public static boolean isEmail(String email) {
-        if (email == null || email.trim().length() == 0)
-            return false;
-        return Pattern.compile("\\w+([-+.]\\w+)*@\\w+([-.]\\w+)*\\.\\w+([-.]\\w+)*").matcher(email).matches();
-    }
-
-    /* 是否是手机号 */
-    public static boolean isMobileNumber(String mobiles) {
-        Matcher mat = Pattern.compile("^((13[0-9])|(147)|(15[0-3,5-9])|(17[0,6-8])|(18[0-9]))\\d{8}$").matcher(mobiles);
-        return mat.matches();
-    }
-
-    public static boolean isEmpty(String input) {
-        if (input == null || "".equals(input))
-            return true;
-        for (int i = 0; i < input.length(); i++) {
-            char c = input.charAt(i);
-            if (c != ' ' && c != '\t' && c != '\r' && c != '\n') {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * 判断指定字符是否被包含
-     *
-     * @param text 大字符
-     * @param str  小字符
-     * @return 是否包含
-     */
-    public static boolean isInclude(String text, String str) {
-        if (StringUtil.isEmpty(str))
-            return true;
-        if (StringUtil.isEmpty(text)) return false;
-        try {
-            Pattern p = Pattern.compile(str);
-            Matcher m = p.matcher(text);
-            return m.find();
-        } catch (Exception e) {
-            return false;
-        }
-    }
-
-    /* 检测是否是正确的昵称格式 ( 3-10个字符)*/
-    public static boolean isNickName(String nickName) {
-        if (TextUtils.isEmpty(nickName)) {
-            return false;
-        }
-        Matcher mat = Pattern.compile("^[\u4e00-\u9fa5_a-zA-Z0-9_]{0,15}$").matcher(nickName);
-        return mat.matches();
-    }
-
-    /*判断两个字符串相等*/
-    public static boolean strEquals(String s1, String s2) {
-        if (s1 == s2) {// 引用相等直接返回true
-            return true;
-        }
-        boolean emptyS1 = s1 == null || s1.trim().length() == 0;
-        boolean emptyS2 = s2 == null || s2.trim().length() == 0;
-        if (emptyS1 && emptyS2) {// 都为空，认为相等
-            return true;
-        }
-        if (s1 != null) {
-            return s1.equals(s2);
-        }
-        if (s2 != null) {
-            return s2.equals(s1);
-        }
-        return false;
-    }
-
-    /*获取字符中的中文*/
-    public static String getChinese(String message) {
-        String reg = "[^\u4e00-\u9fa5]";
-        return message.replaceAll(reg, "");
-    }
-
-    public static String getMessage(String message) {
-        return StringUtil.isEmpty(message) ? "" : message;
-    }
-
-    public static String getMessage(int reid) {
-        if (reid <= 0) return "";
-        try {
-            return BaseConfig.getContext().getString(reid);
-        } catch (Exception e) {
-            return "";
-        }
-    }
-
-
-    public static String getTextRexHttp(TextView tv) {
-        if (tv == null || TextUtils.isEmpty(tv.getText())) return "";
-        return toHttpString(tv.getText().toString());
-    }
-
-    //Bitliker 从字符串中取出第一个数字
-    public static int getFirstInt(String message, int defValue) {
-        if (StringUtil.isEmpty(message)) return defValue;
-        Pattern p = Pattern.compile("(\\d+)");
-        Matcher m = p.matcher(message);
-        if (m.find()) {
-            return Integer.parseInt(m.group(0));
-        }
-        return defValue;
-    }
-
-    /*获取第一个括号里的值*/
-    public static String getFirstBrackets(String str) {
-        if (str == null) return "";
-        Pattern pattern = Pattern.compile("(?<=\\()(.+?)(?=\\))");
-        Matcher matcher = pattern.matcher(str);
-        while (matcher.find()) {
-            String name = matcher.group();
-            if (name != null && name.length() > 0)
-                return name;
-        }
-        return "";
-    }
-
-    public static String getLastBracket(String str) {
-        if (str == null) return "";
-        String message = "";
-        Pattern p = Pattern.compile("(\\[[^\\]]*\\])");
-        Matcher m = p.matcher(str);
-        while (m.find()) {
-            message = m.group().substring(1, m.group().length() - 1);
-        }
-        return message;
-    }
-
-    /*去掉特殊字符  Im部分*/
-    public static String replaceSpecialChar(String str) {
-        if (str != null && str.length() > 0) {
-            return str.replaceAll("&#39;", "’").replaceAll("&#039;", "’").replaceAll("&nbsp;", " ").replaceAll("\r\n", "\n").replaceAll("\n", "\r\n");
-        }
-        return "";
-    }
-
-    /*特殊字符处理，转为可以上传的字符*/
-    public static String toHttpString(String s) {
-        if (StringUtil.isEmpty(s)) return "";
-        StringBuffer sb = new StringBuffer();
-        s.replaceAll("\n", "");
-        for (int i = 0; i < s.length(); i++) {
-            char c = s.charAt(i);
-            switch (c) {
-                case '\"':
-                    sb.append("\\\"");
-                    break;
-                case '\\':
-                    sb.append("\\\\");
-                    break;
-                case '/':
-                    sb.append("\\/");
-                    break;
-                case '\b':
-                    sb.append("\\b");
-                    break;
-                case '\f':
-                    sb.append("\\f");
-                    break;
-                case '\n':
-                    sb.append("\\n");
-                    break;
-                case '\r':
-                    sb.append("\\r");
-                    break;
-                case '\t':
-                    sb.append("\\t");
-                    break;
-                default:
-                    sb.append(c);
-            }
-        }
-        return sb.toString().replaceAll("%", "");
-    }
-
-    public static void removieLast(StringBuilder builder) {
-        if (builder.length() > 1)
-            builder.deleteCharAt(builder.length() - 1);
-    }
-
-    /*EditText显示Error*/
-    public static CharSequence editTextHtmlErrorTip(int resId) {
-        return editTextHtmlErrorTip(BaseConfig.getContext().getString(resId));
-    }
-
-    public static CharSequence editTextHtmlErrorTip(String text) {
-        CharSequence html = Html.fromHtml("<font color='red'>" + text + "</font>");
-        return html;
-    }
+	public static boolean hasOneEqual(String messgae, String... keys) {
+		if (isEmpty(messgae) || keys == null || keys.length <= 0) return false;
+		for (String key : keys) {
+			if (messgae.equals(key))
+				return true;
+		}
+		return false;
+	}
+
+	public static boolean hasOneEqualUpperCase(String messgae, String... keys) {
+		if (isEmpty(messgae) || keys == null || keys.length <= 0) return false;
+		for (String key : keys) {
+			if (messgae.toUpperCase().equals(key.toUpperCase()))
+				return true;
+		}
+		return false;
+	}
+
+	/*判断是不是一个合法的电子邮件地址*/
+	public static boolean isEmail(String email) {
+		if (email == null || email.trim().length() == 0)
+			return false;
+		return Pattern.compile("\\w+([-+.]\\w+)*@\\w+([-.]\\w+)*\\.\\w+([-.]\\w+)*").matcher(email).matches();
+	}
+
+	/* 是否是手机号 */
+	public static boolean isMobileNumber(String mobiles) {
+		Matcher mat = Pattern.compile("^[1][3,5,7,8][0-9]\\\\d{8}$").matcher(mobiles);
+		return mat.matches();
+	}
+
+	public static boolean isEmpty(String input) {
+		if (input == null || "".equals(input))
+			return true;
+		for (int i = 0; i < input.length(); i++) {
+			char c = input.charAt(i);
+			if (c != ' ' && c != '\t' && c != '\r' && c != '\n') {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	/**
+	 * 判断指定字符是否被包含
+	 *
+	 * @param text 大字符
+	 * @param str  小字符
+	 * @return 是否包含
+	 */
+	public static boolean isInclude(String text, String str) {
+		if (StringUtil.isEmpty(str))
+			return true;
+		if (StringUtil.isEmpty(text)) return false;
+		try {
+			Pattern p = Pattern.compile(str);
+			Matcher m = p.matcher(text);
+			return m.find();
+		} catch (Exception e) {
+			return false;
+		}
+	}
+
+	/* 检测是否是正确的昵称格式 ( 3-10个字符)*/
+	public static boolean isNickName(String nickName) {
+		if (TextUtils.isEmpty(nickName)) {
+			return false;
+		}
+		Matcher mat = Pattern.compile("^[\u4e00-\u9fa5_a-zA-Z0-9_]{0,15}$").matcher(nickName);
+		return mat.matches();
+	}
+
+	/*判断两个字符串相等*/
+	public static boolean strEquals(String s1, String s2) {
+		if (s1 == s2) {// 引用相等直接返回true
+			return true;
+		}
+		boolean emptyS1 = s1 == null || s1.trim().length() == 0;
+		boolean emptyS2 = s2 == null || s2.trim().length() == 0;
+		if (emptyS1 && emptyS2) {// 都为空，认为相等
+			return true;
+		}
+		if (s1 != null) {
+			return s1.equals(s2);
+		}
+		if (s2 != null) {
+			return s2.equals(s1);
+		}
+		return false;
+	}
+
+	/*获取字符中的中文*/
+	public static String getChinese(String message) {
+		String reg = "[^\u4e00-\u9fa5]";
+		return message.replaceAll(reg, "");
+	}
+
+	public static String getMessage(String message) {
+		return StringUtil.isEmpty(message) ? "" : message;
+	}
+
+	public static String getMessage(int reid) {
+		if (reid <= 0) return "";
+		try {
+			return BaseConfig.getContext().getString(reid);
+		} catch (Exception e) {
+			return "";
+		}
+	}
+
+
+	public static String getTextRexHttp(TextView tv) {
+		if (tv == null || TextUtils.isEmpty(tv.getText())) return "";
+		return toHttpString(tv.getText().toString());
+	}
+
+	//Bitliker 从字符串中取出第一个数字
+	public static int getFirstInt(String message, int defValue) {
+		if (StringUtil.isEmpty(message)) return defValue;
+		Pattern p = Pattern.compile("(\\d+)");
+		Matcher m = p.matcher(message);
+		if (m.find()) {
+			return Integer.parseInt(m.group(0));
+		}
+		return defValue;
+	}
+
+	/*获取第一个括号里的值*/
+	public static String getFirstBrackets(String str) {
+		if (str == null) return "";
+		Pattern pattern = Pattern.compile("(?<=\\()(.+?)(?=\\))");
+		Matcher matcher = pattern.matcher(str);
+		while (matcher.find()) {
+			String name = matcher.group();
+			if (name != null && name.length() > 0)
+				return name;
+		}
+		return "";
+	}
+
+	public static String getLastBracket(String str) {
+		if (str == null) return "";
+		String message = "";
+		Pattern p = Pattern.compile("(\\[[^\\]]*\\])");
+		Matcher m = p.matcher(str);
+		while (m.find()) {
+			message = m.group().substring(1, m.group().length() - 1);
+		}
+		return message;
+	}
+
+	/*去掉特殊字符  Im部分*/
+	public static String replaceSpecialChar(String str) {
+		if (str != null && str.length() > 0) {
+			return str.replaceAll("&#39;", "’").replaceAll("&#039;", "’").replaceAll("&nbsp;", " ").replaceAll("\r\n", "\n").replaceAll("\n", "\r\n");
+		}
+		return "";
+	}
+
+	/*特殊字符处理，转为可以上传的字符*/
+	public static String toHttpString(String s) {
+		if (StringUtil.isEmpty(s)) return "";
+		StringBuffer sb = new StringBuffer();
+		s.replaceAll("\n", "");
+		for (int i = 0; i < s.length(); i++) {
+			char c = s.charAt(i);
+			switch (c) {
+				case '\"':
+					sb.append("\\\"");
+					break;
+				case '\\':
+					sb.append("\\\\");
+					break;
+				case '/':
+					sb.append("\\/");
+					break;
+				case '\b':
+					sb.append("\\b");
+					break;
+				case '\f':
+					sb.append("\\f");
+					break;
+				case '\n':
+					sb.append("\\n");
+					break;
+				case '\r':
+					sb.append("\\r");
+					break;
+				case '\t':
+					sb.append("\\t");
+					break;
+				default:
+					sb.append(c);
+			}
+		}
+		return sb.toString().replaceAll("%", "");
+	}
+
+	public static void removieLast(StringBuilder builder) {
+		if (builder.length() > 1)
+			builder.deleteCharAt(builder.length() - 1);
+	}
+
+	/*EditText显示Error*/
+	public static CharSequence editTextHtmlErrorTip(int resId) {
+		return editTextHtmlErrorTip(BaseConfig.getContext().getString(resId));
+	}
+
+	public static CharSequence editTextHtmlErrorTip(String text) {
+		CharSequence html = Html.fromHtml("<font color='red'>" + text + "</font>");
+		return html;
+	}
 }

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

@@ -397,9 +397,8 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="@dimen/line"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
-        android:background="@color/transparent" />
+        android:background="@color/item_line"
+        android:visibility="visible"/>
 
     <RelativeLayout
         android:id="@+id/uustep_rl"

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

@@ -86,6 +86,7 @@
 
 
                 <TextView
+                    android:id="@+id/user_department_tv"
                     style="@style/form_relative_left_text"
                     android:text="科室"
                     android:layout_marginLeft="0dp"
@@ -93,7 +94,7 @@
                     android:textSize="15sp"/>
 
                 <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
-                    android:id="@+id/user_department_tv"
+                    android:id="@+id/user_department_et"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textColor="@color/dark_dark_grey"

app_modular/appme/src/main/java/com/uas/appme/pedometer/adapter/UUAttentionAdapter.java

@@ -82,11 +82,24 @@ public class UUAttentionAdapter extends BaseAdapter{
             if (MyApplication.getInstance().mLoginUser.getUserId().equals(model.getAttrank().get(position).getAs_userid())
                     && Integer.valueOf(model.getAttrank().get(position).getAs_prise()) > 0)
                 viewHolder.prise_im.setImageResource(R.drawable.praised);
+            }
+
+        //点赞后的红色图标显示
+        if (!ListUtils.isEmpty(model.getPricelist())){
+            for (int i = 0; i < model.getPricelist().size(); i++) {
+                if (model.getPricelist().get(i).getAp_userid().equals(model.getAttrank().get(position).getAs_userid())){
+                    viewHolder.prise_im.setImageResource(R.drawable.praised);
+                    break;//个人的点赞列表id中已经存在当前position的userid 则不点赞
+                }else if (i==model.getPricelist().size()-1){
+                    viewHolder.prise_im.setImageResource(R.drawable.praise);
+                }
+            }
         }
+
         viewHolder.prise_im.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                StepUtils.doStepPriseHttp(model,2,position);
+                    StepUtils.doStepPriseHttp(model,2,position);
             }
         });
         return convertView;

app_modular/appme/src/main/java/com/uas/appme/pedometer/adapter/UURankingAdapter.java

@@ -77,6 +77,17 @@ public class UURankingAdapter extends BaseAdapter{
             viewHolder.prise_im.setImageResource(R.drawable.praised);
         else
             viewHolder.prise_im.setImageResource(R.drawable.praise);
+        //点赞后的红色图标显示
+        if (!ListUtils.isEmpty(model.getPricelist())){
+            for (int i = 0; i < model.getPricelist().size(); i++) {
+                if (model.getPricelist().get(i).getAp_userid().equals(model.getToalrank().get(position).getAs_userid())){
+                    viewHolder.prise_im.setImageResource(R.drawable.praised);
+                    break;//个人的点赞列表id中已经存在当前position的userid 则不点赞
+                }else if (i==model.getPricelist().size()-1){
+                    viewHolder.prise_im.setImageResource(R.drawable.praise);
+                }
+            }
+        }
         viewHolder.prise_im.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {

app_modular/appme/src/main/java/com/uas/appme/pedometer/bean/StepsRankingBean.java

@@ -12,6 +12,15 @@ public class StepsRankingBean {
 
     private List<AttrankBean> attrank;
     private List<ToalrankBean> toalrank;
+    private List<Pricelist> pricelist;
+
+    public List<Pricelist> getPricelist() {
+        return pricelist;
+    }
+
+    public void setPricelist(List<Pricelist> pricelist) {
+        this.pricelist = pricelist;
+    }
 
     public List<AttrankBean> getAttrank() {
         return attrank;
@@ -180,4 +189,19 @@ public class StepsRankingBean {
             this.rank = rank;
         }
     }
+
+    public static class Pricelist{
+        /**
+         * "ap_userid": "109805"
+         */
+        private String ap_userid;
+
+        public String getAp_userid() {
+            return ap_userid;
+        }
+
+        public void setAp_userid(String ap_userid) {
+            this.ap_userid = ap_userid;
+        }
+    }
 }

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

@@ -173,6 +173,7 @@ public class StepUtils {
      * @param position
      */
     public static void doStepPriseHttp(StepsRankingBean model, int type, int position) {
+        Boolean doPrise = true;
         String userid = null;
         switch (type){
             case 2:
@@ -182,6 +183,20 @@ public class StepUtils {
                 userid = model.getToalrank().get(position).getAs_userid();
                 break;
         }
+        if (!ListUtils.isEmpty(model.getPricelist())){
+            for (int i = 0; i < model.getPricelist().size(); i++) {
+                if (model.getPricelist().get(i).getAp_userid().equals(userid)){
+                    doPrise = false;
+                    break;//个人的点赞列表id中已经存在当前position的userid 则不点赞
+                }else if (i==model.getPricelist().size()-1)
+                    doPrise = true;
+            }
+        }else{
+            doPrise = true;
+        }
+
+        Log.i("doPrise",doPrise.toString());
+        if (!doPrise) return;
         if (StringUtil.isEmpty(userid) || MyApplication.getInstance().mLoginUser.getUserId().equals(userid)) return;  //不可以赞自己
         //点赞操作
         HttpClient httpClient = new HttpClient.Builder(Constant.BASE_STEP_URL).isDebug(true).build(true);

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

@@ -1,5 +1,8 @@
 package com.uas.appme.settings.Constant;
 
+import com.core.app.MyApplication;
+import com.core.utils.CommonUtil;
+
 /**
  * Created by FANGlh on 2017/8/30.
  * function:
@@ -9,4 +12,6 @@ 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/";
+    public static String BASE_COMPANYID =  CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu");
+//    public static String BASE_COMPANYID = "201";
 }

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

@@ -76,7 +76,8 @@ public class BComSetCompanyRestActivity extends BaseActivity implements View.OnC
     public void onClick(View v) {
         if (v.getId() == R.id.add_new_rl){
             CompanyRestBean model = new CompanyRestBean();
-            model.setSc_companyid("201");
+            model.setSc_companyid(Constant.BASE_COMPANYID);
+//            model.setSc_companyid(CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"));
             model.setSc_companyname(CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_commpany"));
             model.setSc_date("");
             mList.add(model);

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

@@ -72,7 +72,8 @@ public class BComSetEmployeeRestActivity extends BaseActivity implements View.On
         HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appStoreman")
-                .add("companyid", 201)
+//                .add("companyid", 201)
+                .add("companyid", Constant.BASE_COMPANYID)
                 .add("serviceid", 10002)
                 .add("token",MyApplication.getInstance().mAccessToken)
                 .method(Method.GET)
@@ -118,7 +119,7 @@ public class BComSetEmployeeRestActivity extends BaseActivity implements View.On
     public void onClick(View v) {
         if (v.getId() == R.id.add_new_rl){
             ComRestBean model = new ComRestBean();
-            model.setSf_companyid("201");
+            model.setSf_companyid(Constant.BASE_COMPANYID);
             model.setSf_username("");
             model.setSf_companyname(CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_commpany"));
             model.setSf_userid(MyApplication.getInstance().mLoginUser.getUserId());

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

@@ -14,6 +14,7 @@ import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
 import com.common.LogUtil;
+import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.core.app.MyApplication;
@@ -140,7 +141,8 @@ public class BSetComRestListActivity extends BaseActivity {
 		HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
 		httpClient.Api().send(new HttpClient.Builder()
 				.url(url)
-				.add("companyid", 201)
+//				.add("companyid", 201)
+				.add("companyid",Constant.BASE_COMPANYID)
 				.add("token", MyApplication.getInstance().mAccessToken)
 				.method(Method.GET)
 				.build(), new ResultSubscriber<>(new ResultListener<Object>() {
@@ -307,7 +309,7 @@ public class BSetComRestListActivity extends BaseActivity {
 				viewHolder = (ViewHolder) convertView.getTag();
 			}
 			viewHolder.name_tv.setText(model.getResult().get(position).getSf_username());
-			viewHolder.date_tv.setText(model.getResult().get(position).getSf_date());
+			viewHolder.date_tv.setText(DateFormatUtil.long2Str(DateFormatUtil.str2Long(model.getResult().get(position).getSf_date(), DateFormatUtil.YMD_HMS), DateFormatUtil.YMD));
 			return convertView;
 		}
 
@@ -364,7 +366,7 @@ public class BSetComRestListActivity extends BaseActivity {
 
 			viewHolder.name_rl.setVisibility(View.GONE);
 			viewHolder.line.setVisibility(View.GONE);
-			viewHolder.date_tv.setText(model.getResult().get(position).getSc_date());
+			viewHolder.date_tv.setText(DateFormatUtil.long2Str(DateFormatUtil.str2Long(model.getResult().get(position).getSc_date(), DateFormatUtil.YMD_HMS), DateFormatUtil.YMD));
 
 			return convertView;
 		}

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

@@ -41,8 +41,8 @@ public class BSettingActivity extends BaseActivity implements View.OnClickListen
         HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appCompanyType")
-//                .add("companyid",CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"))
-                .add("companyid",201)
+                .add("companyid", Constant.BASE_COMPANYID)
+//                .add("companyid",201)
                 .add("token",MyApplication.getInstance().mAccessToken)
                 .method(Method.GET)
                 .build(),new ResultSubscriber<>(new ResultListener<Object>() {

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

@@ -106,7 +106,7 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
         if (v.getId() == R.id.add_new_rl){
             BSetLocationBean model = new BSetLocationBean();
             model.setSt_companyname(CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_commpany"));
-            model.setSt_companyid("201");
+            model.setSt_companyid(Constant.BASE_COMPANYID);
             model.setSt_siid(sc_industrycode);
             model.setSt_name("");
             mList.add(model);

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

@@ -9,6 +9,7 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.ImageView;
+import android.widget.Toast;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -137,7 +138,7 @@ public class ImageSettingActivity extends BaseActivity implements View.OnClickLi
     private void doUpdateUrl(String oUrl) {
         Map<String, Object> params = new HashMap<>();
         params.put("sc_imageurl",oUrl);
-        params.put("sc_uu",201);
+        params.put("sc_uu",Constant.BASE_COMPANYID);
 //        params.put("sc_uu", CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "erp_uu"));
         HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
@@ -151,7 +152,7 @@ public class ImageSettingActivity extends BaseActivity implements View.OnClickLi
                 LogUtil.prinlnLongMsg("hi/appStorurl", o.toString()+"ddd");
                 if (!JSONUtil.validate(o.toString()) || o == null) return;
                 if (o.toString().contains("result") && JSON.parseObject(o.toString()).getBoolean("result")){
-                    ToastMessage(getString(R.string.common_save_success));
+                    Toast.makeText(ct,getString(R.string.common_save_success),Toast.LENGTH_LONG).show();
                     progressDialog.dismiss();
                     finish();
                 }

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

@@ -7,12 +7,14 @@ import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
 import android.widget.RelativeLayout;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import com.alibaba.fastjson.JSON;
 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.hmac.Md5Util;
 import com.core.app.MyApplication;
@@ -26,10 +28,12 @@ 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.model.BSettingPlaceBean;
 import com.uas.appme.settings.model.PersonSetingBean;
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -41,7 +45,7 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
     private FormEditText mUserNameTv;
     private FormEditText mUserSexTv;
     private RelativeLayout mRySetStartTime;
-    private FormEditText mUserDepartmentTv;
+    private FormEditText mUserDepartmentEv;
     private FormEditText mUserJobTv;
     private FormEditText mUserTelTv;
     private FormEditText mUserEmailTv;
@@ -49,6 +53,8 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
     private String sm_id;
     private int sm_sex = -1;
     private RelativeLayout mDepartmentRl;
+    private TextView user_department_tv;
+    private List<String> departmentModel_list;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -65,19 +71,20 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
         mUserNameTv = (FormEditText) findViewById(R.id.user_name_tv);
         mUserSexTv = (FormEditText) findViewById(R.id.user_sex_tv);
         mRySetStartTime = (RelativeLayout) findViewById(R.id.ry_set_startTime);
-        mUserDepartmentTv = (FormEditText) findViewById(R.id.user_department_tv);
+        mUserDepartmentEv = (FormEditText) findViewById(R.id.user_department_et);
         mUserJobTv = (FormEditText) findViewById(R.id.user_job_tv);
         mUserTelTv = (FormEditText) findViewById(R.id.user_tel_tv);
         mUserEmailTv = (FormEditText) findViewById(R.id.user_email_tv);
         mBtnSave = (Button) findViewById(R.id.btn_save);
         mDepartmentRl = (RelativeLayout) findViewById(R.id.user_department_rl);
+        user_department_tv = (TextView) findViewById(R.id.user_department_tv);
 
         mUserSexTv.setKeyListener(null);
         mUserSexTv.setFocusable(false);
         mUserSexTv.setOnClickListener(this);
-        mUserDepartmentTv.setKeyListener(null);
-        mUserDepartmentTv.setFocusable(false);
-        mUserDepartmentTv.setOnClickListener(this);
+        mUserDepartmentEv.setKeyListener(null);
+        mUserDepartmentEv.setFocusable(false);
+        mUserDepartmentEv.setOnClickListener(this);
 
         mBtnSave.setOnClickListener(this);
 
@@ -94,10 +101,33 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
       String  sc_industry = getIntent().getStringExtra("sc_industry");
       String sc_industrycode = getIntent().getStringExtra("sc_industrycode");
 
-      if ("医疗".equals(sc_industry))
-          mDepartmentRl.setVisibility(View.VISIBLE);
-      else
-          mDepartmentRl.setVisibility(View.GONE);
+      if (!"医疗".equals(sc_industry))
+          user_department_tv.setText("部门");
+
+        HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
+        httpClient.Api().send(new HttpClient.Builder()
+                .url("user/appPlaceList")
+                .add("companyid",Constant.BASE_COMPANYID)
+                .add("token",MyApplication.getInstance().mAccessToken)
+                .method(Method.POST)
+                .build(),new ResultSubscriber<>(new ResultListener<Object>() {
+            @Override
+            public void onResponse(Object o) {
+                if (!JSONUtil.validate(o.toString()) || o == null) return;
+                LogUtil.prinlnLongMsg("appPlaceList", o.toString()+"");
+                    try {
+                        BSettingPlaceBean departmentModel = new BSettingPlaceBean();
+                        departmentModel = JSON.parseObject(o.toString(),BSettingPlaceBean.class);
+                        if (departmentModel == null || ListUtils.isEmpty(departmentModel.getResult())) return;
+                        departmentModel_list = new ArrayList<>();
+                        for (int i=0;i<departmentModel.getResult().size();i++)
+                            departmentModel_list.add(departmentModel.getResult().get(i).getSt_name());
+
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+            }
+        }));
 
     }
 
@@ -106,7 +136,7 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
         try {
             model = JSON.parseObject(result,PersonSetingBean.class);
             mUserNameTv.setText(model.getResult().get(position).getSm_username());
-            mUserDepartmentTv.setText(model.getResult().get(position).getSm_stname());
+            mUserDepartmentEv.setText(model.getResult().get(position).getSm_stname());
             mUserJobTv.setText(model.getResult().get(position).getSm_level());
             mUserTelTv.setText(model.getResult().get(position).getSm_telephone());
             mUserEmailTv.setText(model.getResult().get(position).getSm_email());
@@ -123,24 +153,38 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
     public void onClick(View v) {
         if (v.getId() == R.id.user_sex_tv){
             showSelectSexDialog();
-        }else if (v.getId() == R.id.user_department_tv){
-            String[] department = {"内科","外科","儿科","传染病科","妇产科","男科","精神心理科","皮肤性病科","中医科","肿瘤科","骨科","康复医学科","麻醉医学科","营养科","五官科","医学影像科","其他科室"};
+        }else if (v.getId() == R.id.user_department_et){
+//            String[] department = {"内科","外科","儿科","传染病科","妇产科","男科","精神心理科","皮肤性病科","中医科","肿瘤科","骨科","康复医学科","麻醉医学科","营养科","五官科","医学影像科","其他科室"};
             int requestCode = 0x01;
-            doSelectDepartment(department, requestCode);
+            if (ListUtils.isEmpty(departmentModel_list)) {
+                ToastMessage("暂未获取到部门/科室");
+                return;
+            }else {
+                doSelectDepartment(departmentModel_list, requestCode);
+            }
         }else if (v.getId() == R.id.btn_save){
             saveJudge();
         }
     }
 
-    private void doSelectDepartment(String[] department, int requestCode) {
+    private void doSelectDepartment(List<String> department, int requestCode) {
         ArrayList<SelectBean> beans = new ArrayList<>();
         SelectBean bean = null;
-        for (String e : department) {
+       /* for (String e : department) {
             bean = new SelectBean();
             bean.setName(e);
             bean.setClick(false);
             beans.add(bean);
+        }*/
+        LogUtil.prinlnLongMsg("department",JSON.toJSONString(department));
+
+        for (int i = 0; i < department.size(); i++) {
+            bean = new SelectBean();
+            bean.setName(department.get(i));
+            bean.setClick(false);
+            beans.add(bean);
         }
+        LogUtil.prinlnLongMsg("department beans",JSON.toJSONString(beans));
         Intent intent = new Intent(ct, SelectActivity.class);
         intent.putExtra("type", 2);
         intent.putParcelableArrayListExtra("data", beans);
@@ -157,7 +201,7 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
             if (b == null) return;
             String department = StringUtil.isEmpty(b.getName()) ? "" : b.getName();
             if (requestCode == 0x01) {
-                mUserDepartmentTv.setText(department);
+                mUserDepartmentEv.setText(department);
             }
         }
     }
@@ -185,12 +229,13 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
         params.put("sm_stid",111);
         params.put("sm_userid",MyApplication.getInstance().mLoginUser.getUserId());
         params.put("sm_username",mUserNameTv.getText().toString());
-//        params.put("sm_companyid",CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_uu"));
-        params.put("sm_companyid",201);
-        params.put("sm_stname",mUserDepartmentTv.getText().toString());
+        params.put("sm_companyid",Constant.BASE_COMPANYID);
+        params.put("sm_stname",mUserDepartmentEv.getText().toString());
         params.put("sm_companyname", CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_commpany"));
         params.put("sm_level",mUserJobTv.getText().toString());
         params.put("sm_telephone",mUserTelTv.getText().toString());
+        params.put("sm_sex",sm_sex);
+        params.put("sm_email",mUserEmailTv.getText().toString());
 
         HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()

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

@@ -71,7 +71,7 @@ public class PersonSettingListActivity extends BaseActivity {
         HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appStoreman")
-                .add("companyid", 201)
+                .add("companyid", Constant.BASE_COMPANYID)
                 .add("serviceid",0)
                 .add("token",MyApplication.getInstance().mAccessToken)
                 .method(Method.GET)

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/ExpenseReimbursementActivity.java

@@ -736,6 +736,7 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
                 //            String imName = String.valueOf(bean.getEM_NAME());
                 deparmentname = String.valueOf(bean.getEM_DEPART());
                 //            String imPosition = String.valueOf(bean.getEM_POSITION());
+                LogUtil.prinlnLongMsg("deparmentname",deparmentname);
             }
         } catch (Exception e) {
             e.printStackTrace();