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

# Conflicts:
#	WeiChat/version.properties

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Wed Dec 13 16:31:58 CST 2017
-debugName=148
-versionName=618
-debugCode=148
-versionCode=157
+#Wed Dec 13 16:55:40 CST 2017
+debugName=150
+versionName=624
+debugCode=150
+versionCode=163

app_core/common/src/main/java/com/common/hmac/HmacUtils.java

@@ -1,5 +1,7 @@
 package com.common.hmac;
 
+import com.common.LogUtil;
+
 /**
  * Hmac加密工具
  *
@@ -23,7 +25,9 @@ public class HmacUtils {
      */
     public static String encode(Object message) {
         byte[] encodeData = hmacEncoder.encode(String.valueOf(message).getBytes(), key);
-        return new String(Hex.encode(encodeData));
+        String result=  new String(Hex.encode(encodeData));
+        LogUtil.d("AppLogs","encode result:"+result);
+        return result;
     }
 
 }

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

@@ -122,12 +122,10 @@ public class HttpClient {
 
     public String sendPostRequest(String url, Map<String, String> params)
             throws IOException {
-        // SSLSocketFactory.getSocketFactory().setHostnameVerifier(new AllowAllHostnameVerifier());
         Log.i("HTTP", "post url=" + url);
         String result = null;
         HttpResponse response = null;
         DefaultHttpClient httpclient = MyHttpClient.getNewHttpClient();
-        ;
         boolean sign = true;
         if (sign) {
             url += (url.indexOf("?") == -1 ? "?" : "&") + "_timestamp="

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

@@ -16,6 +16,7 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.afollestad.materialdialogs.MaterialDialog;
@@ -63,6 +64,7 @@ import com.modular.booking.model.SeatsStateModel;
 import com.modular.booking.widget.AddSubUtils;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -111,6 +113,7 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
     private LinearLayout llPanelBusiness;
     private TextView tvSeatsLeft;
     private TextView tvSeatsRight;
+    private RelativeLayout notes_rl;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -182,6 +185,7 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
         tvSeatsRight=findViewById(R.id.tvSeatsRight);
         llPanelWait=(LinearLayout)findViewById(R.id.llPanelWait);
         llPanelBusiness=(LinearLayout)findViewById(R.id.llPanelBusiness);
+        notes_rl =(RelativeLayout)findViewById(R.id.notes_rl);
                 
         submit_btn.setOnClickListener(this);
         et_book_name.setText(CommonUtil.getName());
@@ -265,6 +269,11 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                 tvSeatsRight.setTextColor(mContext.getResources().getColor(R.color.blue_seats_num));
                 llPanelBusiness.setVisibility(View.VISIBLE);
                 llPanelWait.setVisibility(View.GONE);
+                try {
+                    getSteatListStates(JSON.parseObject(dataService ).getString("sb_companyid"));//获取餐饮类别状态信息
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
             }
         });
     }
@@ -988,7 +997,12 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                         map.put("sb_spname", tv_food_rooms.getText());
                     }else{
                         //选桌位
-                        map.put("sb_stname", tv_food_seats.getTag(R.id.tag_id));
+                        if (((Integer)tv_food_seats.getTag(R.id.tag_id2))>0) {
+                            map.put("sb_stname", tv_food_seats.getTag(R.id.tag_id));
+                        }else{
+                            ToastMessage("已无剩余桌位！");
+                            return null;
+                        }
                     }
                   
                 }
@@ -1150,7 +1164,17 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
         if (!isEdited) {
             et_book_phone.setText(data.getString("sb_telephone"));
             et_book_name.setText(data.getString("sb_recordor"));
-            et_book_notes.setText(data.getString("sb_remark"));
+            if ("0".equals(data.getString("sb_sex"))){
+                rg_sex.check(rg_sex.getChildAt(0).getId());
+            }else if("1".equals(data.getString("sb_sex"))){
+                rg_sex.check(rg_sex.getChildAt(1).getId());
+            }
+            if (!StringUtil.isEmpty(data.getString("sb_remark"))){
+                et_book_notes.setText(data.getString("sb_remark"));
+                notes_rl.setVisibility(View.VISIBLE);
+            }else{
+                notes_rl.setVisibility(View.GONE);
+            }
             et_book_phone.setKeyListener(null);
             et_book_name.setEnabled(false);
             et_book_notes.setEnabled(false);
@@ -1159,6 +1183,7 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
             case "餐饮"://餐饮
                 findViewById(R.id.ll_food).setVisibility(View.VISIBLE);
                 if (isEdited) {
+                    searchSeatNumbers(DateFormatUtil.getStrDate4Date(new Date(),"yyyy-MM-dd HH:ss"),model.getCompanyid());
                     tv_food_times.setOnClickListener(this);
                     tv_food_rooms.setOnClickListener(this);
                     tv_food_peoples.setOnClickListener(this);
@@ -1175,6 +1200,12 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
              
                     searchSeatNumbers(tv_food_times.getText().toString(),data.getString("sb_companyid"));
                     getSteatListStates(data.getString("sb_companyid"));//获取餐饮类别状态信息
+                    
+                    if(StringUtil.isEmpty(data.getString("sb_stname"))){
+                        tv_food_rooms.setText("无");
+                    }else{
+                        tv_food_rooms.setText(data.getString("sb_stname"));
+                    }
                     tv_food_rooms.setText(data.getString("sb_stname"));
                     tv_food_peoples.setText(data.getString("sb_person"));
                     tv_food_peoples.setVisibility(View.VISIBLE);
@@ -1315,11 +1346,12 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
             case "10003"://餐饮
                 findViewById(R.id.ll_food).setVisibility(View.VISIBLE);
                 if (isEdited) {
+                    searchSeatNumbers(DateFormatUtil.getStrDate4Date(new Date(),"yyyy-MM-dd HH:ss"),model.getCompanyid());
                     tv_food_times.setOnClickListener(this);
                     tv_food_rooms.setOnClickListener(this);
                     tv_food_peoples.setOnClickListener(this);
-                    addSubUtils.setVisibility(View.VISIBLE);
                     tv_food_peoples.setVisibility(View.GONE);
+                    addSubUtils.setVisibility(View.VISIBLE);
                     tvSeatsRight.setVisibility(View.GONE);
                 } else {
                     if (StringUtil.isEmpty(data.getString("sb_starttime"))) {
@@ -1328,8 +1360,14 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                         tv_food_times.setText(data.getString("sb_starttime").substring(0, 10) + " "
                                 + data.getString("sb_starttime").substring(11, 16) + "-" + data.getString("sb_endtime").substring(11, 16));
                     }
+
                     searchSeatNumbers(tv_food_times.getText().toString(),data.getString("sb_companyid"));
-                    tv_food_rooms.setText(data.getString("sb_spname"));
+                    if(StringUtil.isEmpty(data.getString("sb_stname"))){
+                        tv_food_rooms.setText("无");
+                    }else{
+                        tv_food_rooms.setText(data.getString("sb_stname"));
+                    }
+                    tv_food_rooms.setText(data.getString("sb_stname"));
                     tv_food_peoples.setText(data.getString("sb_person"));
                     tv_food_peoples.setVisibility(View.VISIBLE);
                     addSubUtils.setVisibility(View.GONE);
@@ -1624,8 +1662,14 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                                              CommonUtil.textSpanForStyle(tvDSeatsNum,"前方"+number+"桌",number,ct.getResources().getColor(R.color.blue_seats_num));
                                          }
                                     if (asType.equals(king)){
+                                        if (bookednumber<=0){
+                                            bookednumber=0;
+                                            ToastMessage("已无剩余桌量！");
+                                        }
                                         tv_food_seats.setTag(R.id.tag_id,deskcode);
+                                        tv_food_seats.setTag(R.id.tag_id2,bookednumber);//桌位数量
                                         CommonUtil.textSpanForStyle(tv_food_seats,"仅剩"+bookednumber+"桌",String.valueOf(bookednumber),ct.getResources().getColor(R.color.blue_seats_num));
+                                        isEnter=false;
                                     }else{
                                        isEnter=true;//置空，下面循环会进入指定逻辑代码
                                     }
@@ -1645,10 +1689,15 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                                     if (ListUtils.isEmpty(deskbook)) {
                                         if (as_type.equals(asType)||isEnter) {
                                             //tv_food_seats.setText("仅剩"+as_number+"桌");
+                                            if (bookNum<=0){
+                                                bookNum=0;
+                                                ToastMessage("已无剩余桌量！");
+                                            }
                                             CommonUtil.textSpanForStyle(tv_food_seats,"仅剩"+bookNum+"桌",String.valueOf(bookNum),ct.getResources().getColor(R.color.blue_seats_num));
                                             LogUtil.d(TAG,"as_number:"+as_number+" as_deskcode:"+as_deskcode);
                                            // tv_food_seats.setTag(0,as_number);
                                             tv_food_seats.setTag(R.id.tag_id,as_deskcode+"01");//桌位编号
+                                            tv_food_seats.setTag(R.id.tag_id2,bookNum);//桌位数量
                                        }
                                         LogUtil.d(TAG,"桌:"+as_type+"：前方"+as_number+"桌");
                                         if ("小桌".equals(as_type)){

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

@@ -438,15 +438,15 @@
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_alignParentRight="true"
+                    android:gravity="center_vertical"
                     jmf:editable="true"
-                    jmf:ImageWidth="40dp"
-                    jmf:contentWidth="20dp"
+                    jmf:all_background="@color/me_menu_item_normal"
                     jmf:contentTextColor="@color/black"
                     jmf:contentBackground="@color/me_menu_item_normal"
-                    jmf:leftBackground="@color/me_menu_item_normal"
-                    jmf:rightBackground="@color/me_menu_item_normal"
-                    jmf:leftResources="@drawable/icon_remove"
-                    jmf:rightResources="@drawable/icon_add">
+                    jmf:leftBackground="@drawable/icon_remove"
+                    jmf:rightBackground="@drawable/icon_add"
+                    jmf:leftResources="@color/me_menu_item_normal"
+                    jmf:rightResources="@color/me_menu_item_normal">
                 </com.modular.booking.widget.AddSubUtils>
             </RelativeLayout>
 
@@ -495,7 +495,7 @@
                     android:layout_toLeftOf="@+id/sv_food_rooms"
                     android:drawableRight="@drawable/oa_next"
                     android:contentDescription="@string/service_food_rooms"
-                    android:hint="@string/common_select"
+                    android:hint="@string/common_select_not_must"
                     android:text="否"
                     android:textColor="@color/hintColor" />
                 <com.core.widget.view.SwitchView

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

@@ -53,13 +53,8 @@ public class BComSetCompanyRestActivity extends BaseActivity implements View.OnC
         super.onCreate(savedInstanceState);
         setContentView(R.layout.service_bcom_setting_activity);
         initView();
-        initData();
     }
 
-    private void initData() {
-
-
-    }
 
 
     private void initView() {
@@ -231,6 +226,10 @@ public class BComSetCompanyRestActivity extends BaseActivity implements View.OnC
                     ToastMessage("不可选择过去时间");
                     return;
                 }else {
+                    if (JSON.toJSONString(mList).contains(time)){
+                        ToastMessage("休息时间不可重复");
+                        return;
+                    }
                     mList.get(pos).setSc_date(time);
                     myAdapter.notifyDataSetChanged();
                 }

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

@@ -335,6 +335,10 @@ public class BComSetEmployeeRestActivity extends BaseActivity implements View.On
     //load 选择服务人员
     private String companyid;
     public void loadServiceMan() {
+        if (!CommonUtil.isNetWorkConnected(ct)){
+            ToastMessage(getString(R.string.common_notlinknet));
+            return;
+        }
         progressDialog.show();
         new HttpClient.Builder(Constants.IM_BASE_URL())
                 .isDebug(BaseConfig.isDebug())
@@ -483,6 +487,10 @@ public class BComSetEmployeeRestActivity extends BaseActivity implements View.On
                     ToastMessage("不可选择过去时间");
                     return;
                 }else {
+                    if (JSON.toJSONString(mList).contains(time)){
+                        ToastMessage("休息时间不可重复");
+                        return;
+                    }
                     mList.get(pos).setSf_date(time);
                     myAdapter.notifyDataSetChanged();
                 }

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

@@ -104,6 +104,11 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
     }
 
     private void judgeWhichType() {
+        if (!CommonUtil.isNetWorkConnected(ct)){
+            ToastMessage(getString(R.string.common_notlinknet));
+            initData();
+            return;
+        }
         HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appCompanyType")

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

@@ -229,8 +229,16 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
                 doSelectDepartment(departmentModel_list, requestCode);
             }
         }else if (v.getId() == R.id.btn_save){
+            if (!CommonUtil.isNetWorkConnected(ct)){
+                ToastMessage(getString(R.string.common_notlinknet));
+                return;
+            }
             saveJudge();
         }else if (v.getId() == R.id.deleteBtn){
+            if (!CommonUtil.isNetWorkConnected(ct)){
+                ToastMessage(getString(R.string.common_notlinknet));
+                return;
+            }
             doDelete();
         }else if (v.getId() == R.id.image_im || v.getId() == R.id.image_tv_){
             if (PermissionUtil.lacksPermissions(ct, Manifest.permission.CAMERA)) {
@@ -315,11 +323,18 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
             bean.setClick(false);
             beans.add(bean);
         }
+
+        String title = null;
+        if (!"医疗".equals(sc_industry))
+            title = "选择部门";
+        else
+            title = "选择科室";
+
         LogUtil.prinlnLongMsg("department beans",JSON.toJSONString(beans));
         Intent intent = new Intent(ct, SelectActivity.class);
         intent.putExtra("type", 2);
         intent.putParcelableArrayListExtra("data", beans);
-        intent.putExtra("title", "选择科室");
+        intent.putExtra("title", title);
         startActivityForResult(intent, requestCode);
     }