setBookType

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

@@ -236,5 +236,30 @@
             android:contentDescription="@string/app_name" />
         Business hours
     </RelativeLayout>
-
+    <RelativeLayout
+        android:id="@+id/booking_timetype_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" />
+        Business hours
+    </RelativeLayout>
 </LinearLayout>

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

@@ -88,7 +88,11 @@ public class BSettingActivity extends BaseActivity implements View.OnClickListen
                     .putExtra("sc_industry",sc_industry)
                     .putExtra("sc_industrycode",sc_industrycode));
         }else if (v.getId() == R.id.business_hours_rl){
-            startActivity(new Intent(ct,BusinessHoursSetting.class));
+            startActivity(new Intent(ct,BusinessHoursSetting.class)
+            .putExtra("setType",1));
+        }else if (v.getId() == R.id.booking_timetype_rl){
+            startActivity(new Intent(ct,BusinessHoursSetting.class)
+                    .putExtra("setType",2));
         }
     }
 
@@ -100,5 +104,6 @@ public class BSettingActivity extends BaseActivity implements View.OnClickListen
         findViewById(R.id.companyrest_rl).setOnClickListener(this);
         findViewById(R.id.batchplace_rl).setOnClickListener(this);
         findViewById(R.id.business_hours_rl).setOnClickListener(this);
+        findViewById(R.id.booking_timetype_rl).setOnClickListener(this);
     }
 }

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

@@ -4,6 +4,7 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -14,6 +15,7 @@ import com.common.data.JSONUtil;
 import com.common.data.StringUtil;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
+import com.core.utils.CommonUtil;
 import com.core.widget.view.selectcalendar.SelectCalendarActivity;
 import com.me.network.app.http.HttpClient;
 import com.me.network.app.http.Method;
@@ -34,6 +36,12 @@ public class BusinessHoursSetting extends BaseActivity implements View.OnClickLi
     private TextView mTvStartTime;
     private TextView mTvEndTime;
     private Button mSubmitBtn;
+    private LinearLayout set_hour_ll;
+    private LinearLayout set_booktype_ll;
+    private TextView period_tv;
+    private TextView timpoint_tv;
+    private int sc_booktype = -1;
+    private int setType;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -46,6 +54,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);
@@ -54,12 +63,37 @@ public class BusinessHoursSetting extends BaseActivity implements View.OnClickLi
         mTvStartTime.setOnClickListener(this);
         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);
+
+        period_tv = (TextView) findViewById(R.id.period_tv);
+        period_tv.setOnClickListener(this);
+
+        timpoint_tv = (TextView) findViewById(R.id.timpoint_tv);
+        timpoint_tv.setOnClickListener(this);
+
+        if (setType == 1){
+            set_hour_ll.setVisibility(View.VISIBLE);
+            set_booktype_ll.setVisibility(View.GONE);
+        }else if (setType == 2){
+            set_hour_ll.setVisibility(View.GONE);
+            set_booktype_ll.setVisibility(View.VISIBLE);
+        }
     }
 
     @Override
     public void onClick(View v) {
+
         if (v.getId() == R.id.submit_btn){
-            doSaveBHours();
+            if (!CommonUtil.isNetWorkConnected(ct)){
+                ToastMessage(getString(R.string.common_notlinknet));
+                return;
+            }
+            if (setType == 1)
+                doSaveBHours();
+            else if (setType == 2)
+                doSaveTimeType();
         }else if (v.getId() == R.id.tv_startTime){
             startActivityForResult(new Intent(mContext, SelectCalendarActivity.class)
                             .putExtra("startDate", DateFormatUtil.long2Str(DateFormatUtil.YMD_HMS))
@@ -74,9 +108,52 @@ public class BusinessHoursSetting extends BaseActivity implements View.OnClickLi
                             .putExtra("hasMenu", false)
                             .putExtra("type", 2)
                     , 0x24);
+        }else if (v.getId() == R.id.period_tv){
+            sc_booktype = 1;
+            period_tv.setBackgroundResource(R.color.blue);
+            timpoint_tv.setBackgroundResource(R.color.white);
+        }else if (v.getId() == R.id.timpoint_tv){
+            sc_booktype = 0;
+            period_tv.setBackgroundResource(R.color.white);
+            timpoint_tv.setBackgroundResource(R.color.blue);
         }
     }
 
+    private void doSaveTimeType() {
+        if (sc_booktype == -1){
+            ToastMessage("请选择预约时间类型");
+            return;
+        }
+        Map<String,Object> param = new HashMap<>();
+        param.put("sc_uu",Constant.BASE_COMPANYID);
+        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.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();
+                }
+            }
+        }));
+    }
+
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (data == null) return;

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

@@ -6,10 +6,12 @@
     android:orientation="vertical"
     >
       <LinearLayout
+          android:id="@+id/set_hour_ll"
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:padding="20dp"
-          android:orientation="horizontal">
+          android:orientation="horizontal"
+          >
           <TextView
               android:layout_width="wrap_content"
               android:layout_height="wrap_content" 
@@ -29,8 +31,36 @@
               android:layout_gravity="center_vertical"
               style="@style/crm_business_btn"
               android:text="23:59"/>
-      </LinearLayout>  
-    
+      </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/set_booktype_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/period_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/timpoint_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>
     <Button
             android:id="@+id/submit_btn"
             android:layout_width="match_parent"