15:05

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

@@ -201,7 +201,6 @@
                     android:background="@null"
                     android:hint="@string/common_input1"
                     android:textSize="15sp"
-                    android:inputType="number"
                     android:gravity="center_vertical|right"
                     android:layout_marginLeft="5dp"
                     whatever:testType="regexp"

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

@@ -9,6 +9,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.PopupWindow;
 import android.widget.RelativeLayout;
@@ -19,6 +20,7 @@ import com.common.LogUtil;
 import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
+import com.common.data.StringUtil;
 import com.common.system.DisplayUtil;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
@@ -29,6 +31,7 @@ import com.me.network.app.http.HttpClient;
 import com.me.network.app.http.Method;
 import com.me.network.app.http.rx.ResultListener;
 import com.me.network.app.http.rx.ResultSubscriber;
+import com.nostra13.universalimageloader.core.ImageLoader;
 import com.uas.appme.R;
 import com.uas.appme.settings.Constant.Constant;
 import com.uas.appme.settings.model.BSettingPlaceBean;
@@ -356,18 +359,38 @@ public class BSetComRestListActivity extends BaseActivity {
 				viewHolder = new ViewHolder();
 				convertView = View.inflate(mContext, R.layout.com_location_item, null);
 				viewHolder.name_tv = (TextView) convertView.findViewById(R.id.name_tv);
-				viewHolder.industry_tv = (TextView) convertView.findViewById(R.id.industry_tv);
+				viewHolder.image_im = (ImageView) convertView.findViewById(R.id.image_im);
+				viewHolder.sTime_rl = (RelativeLayout) convertView.findViewById(R.id.service_time_rl);
+				viewHolder.sTime_tv = (TextView) convertView.findViewById(R.id.service_time_tv);
+				viewHolder.image_rl = (RelativeLayout) convertView.findViewById(R.id.image_rl);
+				if("会所".equals(sc_industry) )
+					viewHolder.sTime_rl.setVisibility(View.VISIBLE);
+				else
+					viewHolder.sTime_rl.setVisibility(View.GONE);
 				convertView.setTag(viewHolder);
 			} else {
 				viewHolder = (ViewHolder) convertView.getTag();
 			}
+			//显示名称
 			viewHolder.name_tv.setText(model.getResult().get(position).getSt_name());
+
+			//显示服务时间
+			viewHolder.sTime_tv.setText(model.getResult().get(position).getSt_servicetime() + getString(R.string.minute));
+
+			//显示照片
+			if (!StringUtil.isEmpty(model.getResult().get(position).getSt_imageurl())){
+				viewHolder.image_rl.setVisibility(View.VISIBLE);
+				ImageLoader.getInstance().displayImage(model.getResult().get(position).getSt_imageurl(),viewHolder.image_im);
+			}else
+				viewHolder.image_rl.setVisibility(View.GONE);
+
 			return convertView;
 		}
 
 		class ViewHolder {
-			TextView name_tv;
-			TextView industry_tv;
+			TextView name_tv,sTime_tv;
+			ImageView image_im;
+			RelativeLayout sTime_rl,image_rl;
 		}
 	}
 

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

@@ -88,7 +88,7 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
     private Uri mNewPhotoUri;// 拍照和图库 获得图片的URI
     private static final int REQUEST_CODE_CAPTURE_PHOTO = 1;// 拍照
     private static final int REQUEST_CODE_PICK_PHOTO = 2;// 图库
-
+    private Boolean updateChangeP = false; //更新是否更换了照片，若没换
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -114,7 +114,7 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
             update = true;
             save_bt.setText(getString(R.string.common_update_button));
             add_new_rl.setVisibility(View.GONE);
-            getSupportActionBar().setTitle("更新设置服务/场地/房间");
+            getSupportActionBar().setTitle("更新服务/场地/房间");
 
             st_id = JSON.parseObject(updateData).getString("st_id");
             BSetLocationBean model = new BSetLocationBean();
@@ -122,6 +122,8 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
             model.setSt_companyid(JSON.parseObject(updateData).getString("st_companyid"));
             model.setSt_siid(JSON.parseObject(updateData).getString("st_siid"));
             model.setSt_name(JSON.parseObject(updateData).getString("st_name"));
+            model.setSt_servicetime(JSON.parseObject(updateData).getString("st_servicetime"));
+            model.setSt_imageurl(JSON.parseObject(updateData).getString("st_imageurl"));
             mList.add(model);
             myAdapter.notifyDataSetChanged();
         }else {
@@ -131,7 +133,7 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
             model.setSt_companyid(CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"));
             model.setSt_siid(StringUtil.isEmpty(sc_industrycode) ? "0" : sc_industrycode);
             model.setSt_name("");
-            model.setSt_servicetime("");
+            model.setSt_servicetime("0");
             model.setSt_imageurl("");
 //            model.setSt_id("0");
             mList.add(model);
@@ -159,9 +161,7 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
     @Override
     public boolean onPrepareOptionsMenu(Menu menu) {
         menu.clear();
-        if (!StringUtil.isEmpty(updateData)) {
-
-        } else {
+        if (StringUtil.isEmpty(updateData)) {
             getMenuInflater().inflate(R.menu.bsetting_more, menu);
         }
         return super.onPrepareOptionsMenu(menu);
@@ -207,12 +207,20 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
         }else if (v.getId() == R.id.save_bt){
             LogUtil.prinlnLongMsg("mList", JSON.toJSONString(mList));
             if (ListUtils.isEmpty(mList)) return;
+            if (StringUtil.isEmpty(mList.get(mList.size()-1).getSt_name())){
+                ToastMessage("请输入名称");
+                return;
+            }
             if (!CommonUtil.isNetWorkConnected(this)) {
                 ToastMessage(getString(R.string.common_notlinknet));
                 return;
             }else {
-                if (update && !StringUtil.isEmpty(st_id))
-                    doUpdate();
+                if (update && !StringUtil.isEmpty(st_id)){
+                    if (updateChangeP)   // 更换过照片
+                        doJudegeCNow_p();//开始上传第一张图片
+                    else
+                        doUpdate();
+                }
                 else
                     doSaveJudge(mList);
             }
@@ -267,7 +275,8 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
             param.put("st_name",mList.get(0).getSt_name());
             param.put("st_siid",mList.get(0).getSt_siid());
             param.put("st_companyid",mList.get(0).getSt_companyid());
-            param.put("st_companyname",mList.get(0).getSt_companyname());
+            param.put("st_imageurl",mList.get(0).getSt_imageurl());
+            param.put("st_servicetime",mList.get(0).getSt_servicetime());
             progressDialog.show();save_bt.setEnabled(false);
 
             HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
@@ -310,7 +319,10 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
                 ToastMessage("请输入名称");
                 break;
             }else if (i==mList.size()-1){
-                doJudegeCNow_p();//开始上传第一张图片
+                if (updateChangeP)   // 更换过照片
+                    doJudegeCNow_p();//开始上传第一张图片
+                else
+                    doSaveDatasList();
             }
         }
 
@@ -365,6 +377,7 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
                             else
                                 mList.get(now_p).setSt_imageurl("");
 
+                            now_p++;
                             LogUtil.prinlnLongMsg("mList",JSON.toJSONString(mList));
                             doJudegeCNow_p();
 
@@ -376,6 +389,7 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
 
                 @Override
                 public void onFailure(HttpException error, String msg) {
+                    now_p++;
                     doJudegeCNow_p();
                     ViewUtil.ToastMessage(ct, getString(com.uas.appworks.R.string.common_save_failed) + msg);
                     progressDialog.dismiss();
@@ -386,12 +400,14 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
 
     //判断当前上传了几张照片，进行是否上传数据操作
     private void doJudegeCNow_p() {
-        if (now_p == mList.size())
-            doSaveDatasList();
-        else
+        if (now_p == mList.size()){
+            if (update && !StringUtil.isEmpty(st_id))
+                doUpdate();
+            else
+                doSaveDatasList();
+        } else
             sendPictureRequest(mPhotoList.get(now_p));
 
-        now_p++;
     }
 
     private int getID(String chche) {
@@ -406,6 +422,9 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
     private void doSaveDatasList() {
         progressDialog.show();save_bt.setEnabled(false);
         HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
+
+//        httpClient.getHeaders().remove("Content-Type");
+
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appBatchPlace")
                 .add("map",JSON.toJSONString(mList))
@@ -416,7 +435,7 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
             @Override
             public void onResponse(Object o) {
                 if (!JSONUtil.validate(o.toString()) || o == null) {
-                    progressDialog.dismiss();save_bt.setEnabled(true);
+                    progressDialog.dismiss();save_bt.setEnabled(true );
                     return;
                 }
                 LogUtil.prinlnLongMsg("appBatchPlace", o.toString()+"");
@@ -487,15 +506,16 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
                 viewHolder.image_im = (ImageView) convertView.findViewById(R.id.image_im);
                 viewHolder.sTime_rl = (RelativeLayout) convertView.findViewById(R.id.service_time_rl);
                 viewHolder.sTime_et = (FormEditText)convertView.findViewById(R.id.service_time_et);
+                viewHolder.delete_tv = (TextView) convertView.findViewById(R.id.delete_tv);
                 convertView.setTag(viewHolder);
                 viewHolder.name_tv.setFocusable(false);
                 viewHolder.name_tv.setKeyListener(null);
                 viewHolder.sTime_et.setFocusable(false);
                 viewHolder.sTime_et.setKeyListener(null);
-                if("会所".equals(sc_industry) || !CommonUtil.isReleaseVersion())
+                if("会所".equals(sc_industry))
                     viewHolder.sTime_rl.setVisibility(View.VISIBLE);
                 else
-                    viewHolder.sTime_et.setVisibility(View.VISIBLE);
+                    viewHolder.sTime_rl.setVisibility(View.GONE);
             }else {
                 viewHolder = (ViewHolder) convertView.getTag();
             }
@@ -538,6 +558,22 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
                     }
                 }
             });
+            viewHolder.delete_tv.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (modelList.size() > 1){
+                        mList.remove(position);
+                        if (mPhotoList.size() > position)
+                            mPhotoList.remove(position);
+
+                        notifyDataSetChanged();
+                    }
+                }
+            });
+
+//            if (modelList.size() == 1) viewHolder.delete_tv.setVisibility(View.GONE);
+//            else viewHolder.delete_tv.setVisibility(View.VISIBLE);
+
             //显示名称
             if (!ListUtils.isEmpty(modelList) && !StringUtil.isEmpty(modelList.get(position).getSt_name()))
                 viewHolder.name_tv.setText(modelList.get(position).getSt_name()+"");
@@ -545,11 +581,16 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
                 viewHolder.name_tv.setText(null);
 
             //显示照片
-            if (!ListUtils.isEmpty(photoList) && position < photoList.size() &&
-                    !StringUtil.isEmpty(photoList.get(position)))
-                ImageLoader.getInstance().displayImage(Uri.fromFile(new File(photoList.get(position))).toString(), viewHolder.image_im);
-            else
-                viewHolder.image_im.setImageResource(R.drawable.add_picture); //设置为默认头像不然会被复用
+            if (update && !updateChangeP){
+                ImageLoader.getInstance().displayImage(modelList.get(position).getSt_imageurl(),viewHolder.image_im);
+            }else {
+                if (!ListUtils.isEmpty(photoList) && position < photoList.size() &&
+                        !StringUtil.isEmpty(photoList.get(position)))
+                    ImageLoader.getInstance().displayImage(Uri.fromFile(new File(photoList.get(position))).toString(), viewHolder.image_im);
+                else
+                    viewHolder.image_im.setImageResource(R.drawable.add_picture); //设置为默认头像不然会被复用
+            }
+
 
 
             //显示服务时间/分钟
@@ -565,6 +606,7 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
             ImageView image_im;
             RelativeLayout sTime_rl;
             FormEditText sTime_et;
+            TextView delete_tv;
         }
     }
 
@@ -598,6 +640,7 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
         }
         myAdapter.notifyDataSetChanged();
         Log.i("files0x01",path);
+        updateChangeP = true;
     }
 
     private void showSelectPictureDialog() {
@@ -679,7 +722,7 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
                     }
                 }else if (type==2){
                         mList.get(position).setSt_servicetime(
-                                StringUtil.isEmpty(editname_et2.getText().toString()) ? "" :editname_et2.getText().toString());
+                                StringUtil.isEmpty(editname_et2.getText().toString()) ? "0" :editname_et2.getText().toString());
                         myAdapter.notifyDataSetChanged();
                 }
 

app_modular/appme/src/main/java/com/uas/appme/settings/model/BSettingPlaceBean.java

@@ -8,7 +8,8 @@ import java.util.List;
  */
 
 public class BSettingPlaceBean {
-    public List<ResultBean> result;
+
+    private List<ResultBean> result;
 
     public List<ResultBean> getResult() {
         return result;
@@ -19,10 +20,24 @@ public class BSettingPlaceBean {
     }
 
     public static class ResultBean {
+        /**
+         * st_companyid : 10046529
+         * st_companyname : 服务预约1
+         * st_id : 20244
+         * st_imageurl : http://113.105.74.140:8081/u/0/0/201711/o/7cf6e83f6d114352b4e0bea103cc8826.png
+         * st_name : 奋斗的
+         * st_price : 0
+         * st_servicetime : 222
+         * st_siid : 0
+         */
+
         private String st_companyid;
         private String st_companyname;
         private String st_id;
+        private String st_imageurl;
         private String st_name;
+        private String st_price;
+        private String st_servicetime;
         private String st_siid;
 
         public String getSt_companyid() {
@@ -49,6 +64,14 @@ public class BSettingPlaceBean {
             this.st_id = st_id;
         }
 
+        public String getSt_imageurl() {
+            return st_imageurl;
+        }
+
+        public void setSt_imageurl(String st_imageurl) {
+            this.st_imageurl = st_imageurl;
+        }
+
         public String getSt_name() {
             return st_name;
         }
@@ -57,6 +80,22 @@ public class BSettingPlaceBean {
             this.st_name = st_name;
         }
 
+        public String getSt_price() {
+            return st_price;
+        }
+
+        public void setSt_price(String st_price) {
+            this.st_price = st_price;
+        }
+
+        public String getSt_servicetime() {
+            return st_servicetime;
+        }
+
+        public void setSt_servicetime(String st_servicetime) {
+            this.st_servicetime = st_servicetime;
+        }
+
         public String getSt_siid() {
             return st_siid;
         }

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

@@ -35,6 +35,7 @@
                 android:layout_centerVertical="true"
                 android:text="名称"
                 android:textSize="14sp"
+                android:textColor="@color/text_main"
                 />
 
             <com.andreabaccega.widget.FormEditText
@@ -42,7 +43,6 @@
                 style="@style/IMTbleLine_TextValue"
                 android:layout_toLeftOf="@+id/of_add_set_range_img"
                 android:layout_toRightOf="@+id/of_add_set_range_text"
-                android:textColor="@color/dark_dark_grey"
                 android:padding="10dp"
                 android:hint="@string/common_input"
                 android:layout_width="wrap_content"
@@ -56,6 +56,7 @@
                 whatever:customRegexp="^[A-Za-z\u4e00-\u9fa5]{1,8}+$"
                 whatever:testErrorString="姓名只能为12个字符之内的中、英文"
                 android:layout_marginLeft="10dp"
+                android:textColor="@color/text_main"
                 />
             <ImageView
                 android:id="@+id/of_add_set_range_img"
@@ -124,15 +125,17 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
                 android:text="服务时间/分钟"
                 android:textSize="14sp"
-                />
+                android:textColor="@color/text_main"
+                android:layout_alignBaseline="@+id/service_time_et"
+                android:layout_alignBottom="@+id/service_time_et"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true" />
 
             <com.andreabaccega.widget.FormEditText
                 android:id="@+id/service_time_et"
                 style="@style/IMTbleLine_TextValue"
-                android:textColor="@color/dark_dark_grey"
                 android:padding="10dp"
                 android:hint="@string/common_input1"
                 android:layout_width="wrap_content"
@@ -143,6 +146,7 @@
                 android:textSize="15sp"
                 android:gravity="center_vertical|right"
                 android:inputType="number"
+                android:textColor="@color/text_main"
                 />
             <ImageView
                 android:layout_width="@dimen/next_width"
@@ -154,5 +158,16 @@
                 android:visibility="gone"
                 />
         </RelativeLayout>
+        <TextView
+            android:id="@+id/delete_tv"
+            android:layout_gravity="right"
+            android:layout_width="100dp"
+            android:layout_height="30dp"
+            android:text="@string/delete"
+            android:textColor="@color/red"
+            android:paddingLeft="40dp"
+            android:paddingTop="6dp"
+            android:visibility="gone"
+            />
     </LinearLayout>
 </LinearLayout>

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

@@ -2,8 +2,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
-    >
+    xmlns:whatever="http://schemas.android.com/tools"
+    android:orientation="vertical">
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -35,16 +35,18 @@
                 android:layout_centerVertical="true"
                 android:text="名称"
                 android:textSize="14sp"
+                android:textColor="@color/text_main"
                 />
 
+
             <TextView
                 android:id="@+id/name_tv"
                 style="@style/IMTbleLine_TextValue"
                 android:layout_toLeftOf="@+id/of_add_set_range_img"
                 android:layout_toRightOf="@+id/of_add_set_range_text"
-                android:textColor="@color/dark_dark_grey"
                 android:padding="10dp"
                 android:hint="@string/common_input"
+                android:textColor="@color/text_main"
                 />
             <ImageView
                 android:id="@+id/of_add_set_range_img"
@@ -60,48 +62,73 @@
         <View
             android:id="@+id/line"
             android:layout_width="match_parent"
-            android:layout_height="2px"
+            android:layout_height="1px"
+            android:background="@color/item_line"
+            android:layout_below="@+id/position_tv"
+            android:visibility="visible"
+            />
+        <RelativeLayout
+            android:id="@+id/image_rl"
+            style="@style/IMTbleLine2"
+            android:minHeight="150dp"
+            android:layout_height="150dp"
+            android:background="@color/white"
+            android:layout_marginTop="10dp">
+            <TextView
+                android:id="@+id/image_tv"
+                style="@style/form_relative_left_text"
+                android:text="照片"
+                android:layout_marginLeft="0dp"
+                android:textColor="@color/text_main"
+                android:textSize="15sp"
+                android:layout_centerVertical="false"
+                />
+            <ImageView
+                android:id="@+id/image_im"
+                android:layout_below="@+id/image_tv_"
+                android:layout_width="100dp"
+                android:layout_height="100dp"
+                android:src="@drawable/add_picture"
+                android:layout_centerInParent="true"/>
+        </RelativeLayout>
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1px"
             android:background="@color/item_line"
             android:layout_below="@+id/position_tv"
-            android:layout_marginLeft="20dp"
-            android:layout_marginRight="20dp"
-            android:visibility="gone"
+            android:visibility="visible"
             />
         <RelativeLayout
+            android:id="@+id/service_time_rl"
             style="@style/IMTbleLine2"
             android:layout_height="50dp"
             android:background="@color/white"
-            android:visibility="gone"
             >
 
             <TextView
-                android:id="@+id/of_add_set_range_text2"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="行业"
+                android:layout_centerVertical="true"
+                android:text="服务时间/分钟"
                 android:textSize="14sp"
-                android:layout_alignParentTop="true"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
-                android:layout_marginTop="16dp" />
+                android:textColor="@color/text_main"
+                />
 
             <TextView
-                android:id="@+id/industry_tv"
+                android:id="@+id/service_time_tv"
                 style="@style/IMTbleLine_TextValue"
-                android:textColor="@color/dark_dark_grey"
                 android:padding="10dp"
-                android:layout_alignBaseline="@+id/of_add_set_range_text2"
-                android:layout_alignBottom="@+id/of_add_set_range_text2"
-                android:layout_toRightOf="@+id/of_add_set_range_text2"
-                android:layout_toEndOf="@+id/of_add_set_range_text2" />
+                android:hint="@string/common_input"
+                android:textColor="@color/text_main"
+                />
             <ImageView
-                android:id="@+id/of_add_set_range_img2"
                 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"
+                android:visibility="gone"
                 />
         </RelativeLayout>
     </LinearLayout>

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

@@ -60,11 +60,11 @@
         <View
             android:id="@+id/line"
             android:layout_width="match_parent"
-            android:layout_height="2px"
+            android:layout_height="1px"
             android:background="@color/item_line"
             android:layout_below="@+id/position_tv"
-            android:layout_marginLeft="20dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
             />
         <RelativeLayout
             style="@style/IMTbleLine2"