18:14

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/BusinessHoursSetting.java

@@ -138,6 +138,10 @@ public class BusinessHoursSetting extends BaseActivity implements View.OnClickLi
             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"));

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);