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

# Conflicts:
#	WeiChat/version.properties

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Mon Nov 27 12:41:26 CST 2017
+#Mon Nov 27 17:56:36 CST 2017
 debugName=1
-versionName=618
-debugCode=138
-versionCode=118
+versionName=620
+debugCode=163
+versionCode=120

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

@@ -16,7 +16,7 @@ public class Constants {
 	public static String IM_BASE_URL() {
 		String url = "";
 		if (BaseConfig.isDebug()) {
-			url = IM_BASE_URL;
+			url = IM_BASE_URL_TEST;
 		} else {
 			url = IM_BASE_URL;
 		}

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

@@ -1036,15 +1036,15 @@ public class ViewUtil {
     public static void LoginERPTask(String url, String master, String username,
                                     String password) {
         mdProcessDialog.setContent(MyApplication.getInstance().getString(R.string.login_progress_erp));
-//        url = url + "mobile/login.action";
+        url = url + "mobile/login.action";
 //        url = "http://192.168.253.29:8080/ERP/mobile/login.action";
 //        url = "http://192.168.253.6/uas_dev/mobile/login.action";
-        url = "https://admin-city.ubtob.com/mobile/login.action";
+       // url = "https://admin-city.ubtob.com/mobile/login.action";
         Map<String, String> params = new HashMap<String, String>();
         params.put("username", username);
         params.put("password", password);
-//        params.put("master", master);
-        params.put("master", "CITIES_CONTROL");
+       params.put("master", master);
+       // params.put("master", "CITIES_CONTROL");
         LogUtil.i("login", "url=" + url);
         LogUtil.i("login", "params=" + JSONUtil.map2JSON(params));
         startNetThread(url, params, handler, Constants.SUCCESS_ERP, null, null, "post");

app_core/common/src/main/java/com/core/utils/CommonUtil.java

@@ -98,10 +98,10 @@ public class CommonUtil {
             return "";
         }
         String baseUrl = getSharedPreferences(ct, "erp_baseurl");
-        //return baseUrl;
+        return baseUrl;
         //return "http://192.168.253.6/uas_dev/";
 //        return "http://192.168.253.29:8080/ERP/";
-        return "https://admin-city.ubtob.com/";
+      //  return "https://admin-city.ubtob.com/";
     }
 
     /**

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

@@ -91,6 +91,7 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
     private String dataService;//详情数据
     private boolean isHasPerson;//是否指定了人员
     private AddSubUtils addSubUtils;
+    private String sb_sex="0";//默认女士
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -174,9 +175,11 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                 .setOnChangeValueListener(new AddSubUtils.OnChangeValueListener() {
                     @Override
                     public void onChangeValue(int value, int position) {
-                        // Toast.makeText(mContext, "当前值:" + value, Toast.LENGTH_SHORT).show();
                         tv_food_peoples.setText(String.valueOf(value));
                         tv_food_peoples.setVisibility(View.GONE);
+                        if (!StringUtil.isEmpty(tv_food_times.getText().toString())) {
+                            searchSeatNumbers(tv_food_times.getText().toString(), model.getCompanyid());
+                        }
                     }
                 });
         tv_food_peoples.setText("1");
@@ -186,6 +189,11 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
             public void onCheckedChanged(RadioGroup group, int checkedId) {
                 RadioButton radioButton = (RadioButton)findViewById(rg_sex.getCheckedRadioButtonId());
                 ToastMessage("id:"+radioButton.getId()+"text:"+radioButton.getText().toString());
+                if (radioButton.getText().toString().equals("先生")){
+                    sb_sex="0";
+                }else if(radioButton.getText().toString().equals("女士")){
+                    sb_sex="1";
+                }
             }
         });
     }
@@ -804,8 +812,10 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
             progressDialog.dismiss();
             return;
         } else {
+            map.put("sb_sex",sb_sex);
             LogUtil.i("map=1" + JSONUtil.map2JSON(map));
             LogUtil.i("map=2" + JSON.toJSONString(map));
+            
 //			if (1 == 1) {
 //				submiting = false;
 //				progressDialog.dismiss();
@@ -1451,10 +1461,24 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
     }
     
     
+    //人数默认是1  小桌
+    //选择时间
     //查询桌子余量
     public void searchSeatNumbers(String yearmonth,String companyid){
         //companyid,userid,yearmonth,token
-        LogUtil.i("yearmonth:"+yearmonth+"  companyid:"+companyid);
+        String peopleNumber=tv_food_peoples.getText().toString();
+        String as_type="小桌";
+        if (Integer.valueOf(peopleNumber)>2&&Integer.valueOf(peopleNumber)<=5){
+            //中
+            as_type="中桌";
+        }else  if(Integer.valueOf(peopleNumber)>5){
+            //大
+            as_type="大桌";
+        }else{
+            //小
+            as_type="小桌";
+        }
+        LogUtil.i("座位："+as_type+"yearmonth:"+yearmonth+"  companyid:"+companyid+" peopleNumber:"+peopleNumber);
           HttpClient httpClient=new HttpClient.Builder(Constants.IM_BASE_URL()).build();
                  httpClient.Api().send(new HttpClient.Builder()
                  .url("/user/appLineList")

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

@@ -469,6 +469,7 @@
 
             <RelativeLayout
                 android:id="@+id/food_peoples_rl"
+           
                 style="@style/item_menu">
 
                 <TextView

app_modular/appcontact/src/main/java/com/uas/appcontact/manager/ContactsManager.java

@@ -124,7 +124,7 @@ public class ContactsManager implements OnHttpResultListener {
 
     @Override
     public void error(int what, String message, Bundle bundle) {
-
+             
     }
 
 

app_modular/appcontact/src/main/java/com/uas/appcontact/ui/fragment/ContactsFragment.java

@@ -330,6 +330,7 @@ public class ContactsFragment extends EasyFragment
     @Override
     public void callback(List<EmployeesEntity> employees) {
         try {
+            dimssLoading();
             final List<BaseSortModel<Friend>> friends = getFriendsByErpDB(employees);
             ThreadUtil.getInstance().addTask(new Runnable() {
                 @Override

app_modular/appworks/src/main/java/com/uas/appworks/activity/CommonDataFormActivity.java

@@ -40,6 +40,7 @@ import com.common.data.StringUtil;
 import com.common.preferences.PreferenceUtils;
 import com.common.ui.CameraUtil;
 import com.common.ui.ImageUtil;
+import com.core.api.wxapi.ApiBase;
 import com.core.api.wxapi.ApiPlatform;
 import com.core.api.wxapi.ApiUtils;
 import com.core.app.AppConfig;
@@ -1159,7 +1160,7 @@ public class CommonDataFormActivity extends BaseActivity implements View.OnClick
                         grid_view.setOnItemClickListener(new AdapterView.OnItemClickListener() {
                             @Override
                             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                                int viewType = mAdapter.getItemViewType(position);
+                                int viewType = cAdapter.getItemViewType(position);
                                 if (viewType == 1) {
                                     showSelectPictureDialog();//添加
                                 } else {
@@ -2733,6 +2734,8 @@ public class CommonDataFormActivity extends BaseActivity implements View.OnClick
 
 
     private void showPictureActionDialog(final int position) {
+        
+//        ToastMessage("删除的位置是：position:"+position);
         String[] items = new String[]{getString(R.string.look_over), getString(R.string.common_delete)};
         android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(this).setTitle(R.string.pictures)
                 .setSingleChoiceItems(items, 0, new DialogInterface.OnClickListener() {
@@ -2745,8 +2748,13 @@ public class CommonDataFormActivity extends BaseActivity implements View.OnClick
                             intent.putExtra(AppConstant.EXTRA_CHANGE_SELECTED, false);
                             startActivity(intent);
                         } else {// 删除
-                            mPhotoList.remove(position);
-                            cAdapter.notifyDataSetInvalidated();
+                            try {
+                                cAdapter.getmPhotoList().remove(position);
+                                cAdapter.notifyDataSetChanged();
+                                mAdapter.notifyDataSetChanged();
+                            } catch (Exception e) {
+                                e.printStackTrace();
+                            }
                         }
                         dialog.dismiss();
                     }