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

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

@@ -261,10 +261,38 @@
             android:background="@drawable/oa_next"
             android:contentDescription="@string/app_name" />
     </RelativeLayout>
+
     <RelativeLayout
-        android:id="@+id/business_introduction_rl"
+        android:id="@+id/room_type_rl"
         style="@style/IMTbleLine"
         android:background="@drawable/selector_me_menu_item_bg">
+        <View
+            android:layout_alignParentBottom="true"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/line"
+            android:background="@color/item_line" />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:gravity="center"
+            android:text="设置包房预订类型"
+            android:textColor="@color/black"
+            android:textSize="14sp" />
+        <ImageView
+            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" />
+    </RelativeLayout>
+    <RelativeLayout
+        android:id="@+id/business_introduction_rl"
+        style="@style/IMTbleLine"
+        android:background="@drawable/selector_me_menu_item_bg"
+        android:layout_alignParentTop="true"
+        android:layout_centerHorizontal="true">
         <View
             android:layout_alignParentBottom="true"
             android:layout_width="match_parent"

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

@@ -179,6 +179,21 @@ public class BComSetEmployeeRestActivity extends BaseActivity implements View.On
     }
 
     private void doSave(List<ComRestBean> mList) {
+        Boolean canSave = true;
+        if (mList.size() > 1){
+            for (int i = 0; i < mList.size() - 1; i++) {
+                for (int j = 1;j < mList.size();j++){
+                    if (mList.get(i).getSf_username().equals(mList.get(j).getSf_username()) &&
+                            mList.get(i).getSf_date().equals(mList.get(j).getSf_date())){
+                        ToastMessage("存在重复的条目明细");
+                        canSave = false;
+                        break;
+                    }
+                }
+            }
+        }
+        
+        if (!canSave) return;
         HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
         progressDialog.show();
         httpClient.Api().send(new HttpClient.Builder()
@@ -264,6 +279,7 @@ public class BComSetEmployeeRestActivity extends BaseActivity implements View.On
             viewHolder.name_tv.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
+                    click_positon = position;
                     if (ListUtils.isEmpty(serviceMans)) {
                         doInputName(position);
                     }

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

@@ -22,12 +22,14 @@ import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.common.system.DisplayUtil;
+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;
 import com.core.widget.EmptyLayout;
 import com.core.widget.MyListView;
+import com.core.widget.view.Activity.MultiImagePreviewActivity;
 import com.me.network.app.http.HttpClient;
 import com.me.network.app.http.Method;
 import com.me.network.app.http.rx.ResultListener;
@@ -38,6 +40,8 @@ import com.uas.appme.settings.model.BSettingPlaceBean;
 import com.uas.appme.settings.model.CompanyRestListBean;
 import com.uas.appme.settings.model.EmployeeRestListBean;
 
+import java.util.ArrayList;
+
 
 /**
  * Created by ${FANGLH} on 2017/10/14.
@@ -384,6 +388,19 @@ public class BSetComRestListActivity extends BaseActivity {
 			}else
 				viewHolder.image_rl.setVisibility(View.GONE);
 
+
+			viewHolder.image_rl.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					ArrayList<String> mPhotoList = new ArrayList<>();
+					mPhotoList.add(model.getResult().get(position).getSt_imageurl());
+					Intent intent = new Intent(ct, MultiImagePreviewActivity.class);
+					intent.putExtra(AppConstant.EXTRA_IMAGES, mPhotoList);
+					intent.putExtra(AppConstant.EXTRA_POSITION, 0);
+					intent.putExtra(AppConstant.EXTRA_CHANGE_SELECTED, false);
+					startActivity(intent);
+				}
+			});
 			return convertView;
 		}
 

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

@@ -3,6 +3,7 @@ package com.uas.appme.settings.activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
+import android.widget.RelativeLayout;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -29,6 +30,7 @@ public class BSettingActivity extends BaseActivity implements View.OnClickListen
 
     private String sc_industry = null;
     private String sc_industrycode = null;
+    private RelativeLayout rTyperl;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -94,6 +96,9 @@ public class BSettingActivity extends BaseActivity implements View.OnClickListen
         }else if (v.getId() == R.id.business_introduction_rl){
             startActivity(new Intent(ct,BusinessHoursSetting.class)
                     .putExtra("setType",3));
+        }else if (v.getId() == R.id.room_type_rl){
+            startActivity(new Intent(ct,BusinessHoursSetting.class)
+                    .putExtra("setType",4));
         }
     }
 
@@ -107,5 +112,12 @@ public class BSettingActivity extends BaseActivity implements View.OnClickListen
         findViewById(R.id.business_hours_rl).setOnClickListener(this);
         findViewById(R.id.booking_timetype_rl).setOnClickListener(this);
         findViewById(R.id.business_introduction_rl).setOnClickListener(this);
+        rTyperl = (RelativeLayout) findViewById(R.id.room_type_rl);
+        rTyperl.setOnClickListener(this);
+
+        if ("餐饮".equals(sc_industry))
+            rTyperl.setVisibility(View.VISIBLE);
+        else
+            rTyperl.setVisibility(View.GONE);
     }
 }

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

@@ -42,8 +42,12 @@ public class BusinessHoursSetting extends BaseActivity implements View.OnClickLi
     private TextView period_tv;
     private TextView timpoint_tv;
     private int sc_booktype = -1;
+    private int sc_cytype = -1;
     private int setType;
     private FormEditText bIntroductionEt;
+    private LinearLayout roomType_ll;
+    private TextView rtype1_tv;
+    private TextView rtype2_tv;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -58,6 +62,7 @@ public class BusinessHoursSetting extends BaseActivity implements View.OnClickLi
     private void initView() {
         setType = getIntent().getIntExtra("setType",-1);
 
+        //设置营业时间
         mTvStartTime = (TextView) findViewById(R.id.tv_startTime);
         mTvEndTime = (TextView) findViewById(R.id.tv_endTime);
         mSubmitBtn = (Button) findViewById(R.id.submit_btn);
@@ -66,6 +71,7 @@ public class BusinessHoursSetting extends BaseActivity implements View.OnClickLi
         mTvEndTime.setOnClickListener(this);
         mSubmitBtn.setOnClickListener(this);
 
+        //设置预约时间类型
         set_hour_ll = (LinearLayout)findViewById(R.id.set_hour_ll);
         set_booktype_ll = (LinearLayout)findViewById(R.id.set_booktype_ll);
 
@@ -75,22 +81,38 @@ public class BusinessHoursSetting extends BaseActivity implements View.OnClickLi
         timpoint_tv = (TextView) findViewById(R.id.timpoint_tv);
         timpoint_tv.setOnClickListener(this);
 
+        //设置包房预订类型
+        roomType_ll = (LinearLayout) findViewById(R.id.set_roomtype_ll);
+        rtype1_tv = (TextView) findViewById(R.id.rtype1_tv);
+        rtype2_tv = (TextView) findViewById(R.id.rtype2_tv);
+        rtype1_tv.setOnClickListener(this);
+        rtype2_tv.setOnClickListener(this);
+
         bIntroductionEt = (FormEditText) findViewById(R.id.business_Introduction_et);
         if (setType == 1){
             getSupportActionBar().setTitle("设置营业时间");
             set_hour_ll.setVisibility(View.VISIBLE);
             set_booktype_ll.setVisibility(View.GONE);
             bIntroductionEt.setVisibility(View.GONE);
+            roomType_ll.setVisibility(View.GONE);
         }else if (setType == 2){
             getSupportActionBar().setTitle("设置预约时间类型");
             set_hour_ll.setVisibility(View.GONE);
             set_booktype_ll.setVisibility(View.VISIBLE);
             bIntroductionEt.setVisibility(View.GONE);
+            roomType_ll.setVisibility(View.GONE);
         }else if (setType == 3){
             getSupportActionBar().setTitle("商家详情");
             set_hour_ll.setVisibility(View.GONE);
             set_booktype_ll.setVisibility(View.GONE);
             bIntroductionEt.setVisibility(View.VISIBLE);
+            roomType_ll.setVisibility(View.GONE);
+        }else if (setType == 4){
+            getSupportActionBar().setTitle("设置包房预订类型");
+            set_hour_ll.setVisibility(View.GONE);
+            set_booktype_ll.setVisibility(View.GONE);
+            bIntroductionEt.setVisibility(View.GONE);
+            roomType_ll.setVisibility(View.VISIBLE);
         }
     }
 
@@ -108,6 +130,8 @@ public class BusinessHoursSetting extends BaseActivity implements View.OnClickLi
                 doSaveTimeType();
             else if (setType == 3)
                 doSaveBIntroduction();
+            else if (setType == 4)
+                doSaveRoomtype();
         }else if (v.getId() == R.id.tv_startTime){
             startActivityForResult(new Intent(mContext, SelectCalendarActivity.class)
                             .putExtra("startDate", DateFormatUtil.long2Str(DateFormatUtil.YMD_HMS))
@@ -130,14 +154,61 @@ public class BusinessHoursSetting extends BaseActivity implements View.OnClickLi
             sc_booktype = 0;
             period_tv.setBackgroundResource(R.color.white);
             timpoint_tv.setBackgroundResource(R.color.aqua);
+        }else if (v.getId() == R.id.rtype1_tv){
+            sc_cytype = 0;
+            rtype1_tv.setBackgroundResource(R.color.aqua);
+            rtype2_tv.setBackgroundResource(R.color.white);
+        }else if (v.getId() == R.id.rtype2_tv){
+            sc_cytype = 1;
+            rtype1_tv.setBackgroundResource(R.color.white);
+            rtype2_tv.setBackgroundResource(R.color.aqua);
         }
     }
 
+    private void doSaveRoomtype() {
+        if ( sc_cytype == -1){
+            ToastMessage("请选择包房预订类型");
+            return;
+        }
+        Map<String,Object> param = new HashMap<>();
+        param.put("sc_uu",CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"));
+        param.put(" sc_cytype", sc_cytype);
+
+        LogUtil.prinlnLongMsg("appStoreUpdate",JSONUtil.map2JSON(param));
+        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))
+                .add("token", MyApplication.getInstance().mAccessToken)
+                .method(Method.POST)
+                .build(),new ResultSubscriber<>(new ResultListener<Object>() {
+            @Override
+            public void onResponse(Object o) {
+                try {
+                    if (!JSONUtil.validate(o.toString()) || o == null) return;
+                    LogUtil.prinlnLongMsg("appStoreUpdate", o.toString()+"");
+                    //{"result":"true"}
+                    if (o.toString().contains("result") && JSON.parseObject(o.toString()).getBooleanValue("result")){
+                        Toast.makeText(ct,getString(R.string.save_success),Toast.LENGTH_LONG).show();
+                        finish();
+                    }
+
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        }));
+    }
+
     private void doSaveBIntroduction() {
         if (StringUtil.isEmpty(bIntroductionEt.getText().toString())){
             ToastMessage("请输入商家详情介绍");
             return;
         }
+        if (bIntroductionEt.getText().toString().contains("'")){
+            ToastMessage("含违规字符");
+            return;
+        }
 
         Map<String,Object> param = new HashMap<>();
         param.put("sc_uu",CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"));
@@ -237,11 +308,14 @@ public class BusinessHoursSetting extends BaseActivity implements View.OnClickLi
                     LogUtil.prinlnLongMsg("appCompanyAdmin", o.toString()+"");
 // {"endtime":"17:00","result":"1","starttime":"10:00","url":"http://113.105.74.140:8081/u/123/100123/201709/o/ab6d93f74f9b4ec7a06f7dbfd725ec38.png"}
 
+
+                    //预约时间段
                     if (o.toString().contains("starttime"))
                         mTvStartTime.setText(JSON.parseObject(o.toString()).getString("starttime")+"");
                     if (o.toString().contains("endtime"))
                         mTvEndTime.setText(JSON.parseObject(o.toString()).getString("endtime"));
                     String timekind = JSON.parseObject(o.toString()).getString("timekind");
+                   //预约时间类型
                     if (!StringUtil.isEmpty(timekind)){
                         if ("1".equals(timekind)){
                             sc_booktype = 1;
@@ -253,9 +327,25 @@ public class BusinessHoursSetting extends BaseActivity implements View.OnClickLi
                             timpoint_tv.setBackgroundResource(R.color.aqua);
                         }
                     }
+
+                    //商家详情介绍
                     if (o.toString().contains("introduce") && !StringUtil.isEmpty(JSON.parseObject(o.toString()).getString("introduce"))){
             bIntroductionEt.setText(JSON.parseObject(o.toString()).getString("introduce"));
                     }
+
+                    //包房预订类型
+                    String cytype = JSON.parseObject(o.toString()).getString("cytype");
+                    if (!StringUtil.isEmpty(cytype)){
+                        if ("1".equals(cytype)){
+                            sc_cytype = 1;
+                            rtype1_tv.setBackgroundResource(R.color.white);
+                            rtype2_tv.setBackgroundResource(R.color.aqua);
+                        }else {
+                            sc_cytype = 0;
+                            rtype1_tv.setBackgroundResource(R.color.aqua);
+                            rtype2_tv.setBackgroundResource(R.color.white);
+                        }
+                    }
                 } catch (Exception e) {
                     e.printStackTrace();
                 }

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

@@ -440,6 +440,8 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
                         }else
                             beforeSendMsg();
 
+                    }else if (!StringUtil.isEmpty(JSON.parseObject(o.toString()).getString("result"))){
+                        ToastMessage(JSON.parseObject(o.toString()).getString("result"));
                     }else
                         ToastMessage(getString(R.string.save_failed));
                 } catch (Exception e) {

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

@@ -292,9 +292,10 @@ 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 (!CommonUtil.isReleaseVersion()) {
-                            businessmen_setting_rl.setVisibility(View.VISIBLE);
-                        }else 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);
                         }else{
                             businessmen_setting_rl.setVisibility(View.GONE);

app_modular/appme/src/main/java/com/uas/appme/settings/handwritedemo/LandscapeActivity.java

@@ -25,6 +25,7 @@ public class LandscapeActivity extends Activity implements View.OnClickListener
         findViewById(R.id.clear1).setOnClickListener(this);
         findViewById(R.id.save1).setOnClickListener(this);
         pathView = (LinePathView) findViewById(R.id.view);
+        pathView.setPaintWidth(5);
     }
 
 

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

@@ -72,6 +72,34 @@
                     android:gravity="center"/>
             </LinearLayout>
 
+            <LinearLayout
+                android:id="@+id/set_roomtype_ll"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:padding="20dp"
+                android:orientation="horizontal">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:text="包房预订类型："/>
+                <TextView
+                    android:id="@+id/rtype1_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    style="@style/crm_business_btn"
+                    android:text="早中晚"
+                    android:gravity="center"/>
+                <TextView
+                    android:id="@+id/rtype2_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    style="@style/crm_business_btn"
+                    android:text="中晚"
+                    android:gravity="center"/>
+            </LinearLayout>
 
             <com.andreabaccega.widget.FormEditText
                 android:id="@+id/business_Introduction_et"