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

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/MessageFragment.java

@@ -97,6 +97,7 @@ public class MessageFragment extends EasyFragment implements IMessageView, View.
 	private TextView tv_book_num;
 	private MessagePresenter.UnReaderListener unReaderListener;
 	private RelativeLayout uustep_rl;
+	private TextView uustepRedtv;
 
 
 	@Override
@@ -214,6 +215,10 @@ public class MessageFragment extends EasyFragment implements IMessageView, View.
 		book_time_tv = (TextView) view.findViewById(R.id.book_time_tv);
 		dingyue_num = (TextView) view.findViewById(R.id.tv_dingYue_num);//订阅红点
 		tv_dingyue_desc = (TextView) view.findViewById(R.id.tv_dingyue_desc);//订阅红点
+		uustepRedtv = (TextView) view.findViewById(R.id.uustep_red_tv);  //UU运动红点
+
+		if (PreferenceUtils.getBoolean(MyApplication.getInstance(),Constant.UU_STEP_RED))
+			uustepRedtv.setVisibility(View.GONE);
 
 		uustep_rl = (RelativeLayout) view.findViewById(R.id.uustep_rl);
 		if (CommonUtil.getSharedPreferencesBoolean(MyApplication.getInstance(), Constants.new_dingyue)) {
@@ -338,6 +343,8 @@ public class MessageFragment extends EasyFragment implements IMessageView, View.
 //                break;
 			case R.id.uustep_rl:
 				startActivity(new Intent(mContext, UUSportActivity.class));
+				uustepRedtv.setVisibility(View.GONE);
+				PreferenceUtils.putBoolean(Constant.UU_STEP_RED, true);
 				break;
 		}
 

WeiChat/src/main/res/layout/new_message_header.xml

@@ -407,7 +407,7 @@
         android:minHeight="@dimen/item_height"
         android:paddingLeft="15dp"
         android:paddingRight="15dp"
-        android:visibility="gone">
+        android:visibility="visible">
 
         <FrameLayout
             android:id="@+id/head_uustep"
@@ -457,7 +457,7 @@
                 android:textSize="16sp" />
 
             <TextView
-                android:id="@+id/tv_uustep_num"
+                android:id="@+id/uustep_red_tv"
                 android:layout_width="10dp"
                 android:layout_height="10dp"
                 android:layout_alignParentRight="true"

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

@@ -83,13 +83,13 @@
                 android:id="@+id/login_btn"
                 android:layout_width="match_parent"
                 android:layout_height="40dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
-                android:layout_marginTop="10dp"
+                android:layout_marginTop="68dp"
                 android:background="@drawable/bg_bule_btn"
                 android:text="@string/login_button"
                 android:textColor="@color/white"
-                android:textSize="@dimen/text_main" />
+                android:textSize="@dimen/text_main"
+                android:layout_alignParentTop="true"
+                android:layout_centerHorizontal="true" />
 
 
         </LinearLayout>

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

@@ -409,7 +409,7 @@
         android:minHeight="@dimen/item_height"
         android:paddingLeft="15dp"
         android:paddingRight="15dp"
-        android:visibility="gone">
+        android:visibility="visible">
 
         <FrameLayout
             android:id="@+id/head_uustep"
@@ -459,7 +459,7 @@
                 android:textSize="16sp" />
 
             <TextView
-                android:id="@+id/tv_uustep_num"
+                android:id="@+id/uustep_red_tv"
                 android:layout_width="10dp"
                 android:layout_height="10dp"
                 android:layout_alignParentRight="true"
@@ -467,7 +467,6 @@
                 android:background="@drawable/hongdian"
                 android:gravity="center"
                 android:text=""
-
                 android:textColor="@android:color/white"
                 android:textSize="10.0dp" />
 

app_modular/appme/src/main/java/com/uas/appme/settings/Constant/Constant.java

@@ -14,4 +14,7 @@ public class Constant {
     public static String BASE_BOOKING_SETTING_URL= "http://113.105.74.140:8092/";
     public static String BASE_COMPANYID =  CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu");
 //    public static String BASE_COMPANYID = "201";
+
+    public static String B_SETTINGRED = "B_SETTINGRED";
+    public static String UU_STEP_RED = "UU_STEP_RED";
 }

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

@@ -70,6 +70,14 @@ public class BComSetCompanyRestActivity extends BaseActivity implements View.OnC
         //初始化今天日期
         String CURRENT_DATE = TimeUtil.getCurrentDate();
         current_date = TimeUtils.s_long_2_str(DateFormatUtil.str2Long(CURRENT_DATE, "yyyy年MM月dd日"));
+
+        CompanyRestBean model = new CompanyRestBean();
+        model.setSc_companyid(Constant.BASE_COMPANYID);
+//            model.setSc_companyid(CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"));
+        model.setSc_companyname(CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_commpany"));
+        model.setSc_date("");
+        mList.add(model);
+        myAdapter.notifyDataSetChanged();
     }
 
     @Override

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

@@ -113,6 +113,15 @@ public class BComSetEmployeeRestActivity extends BaseActivity implements View.On
         //初始化今天日期
         String CURRENT_DATE = TimeUtil.getCurrentDate();
         current_date = TimeUtils.s_long_2_str(DateFormatUtil.str2Long(CURRENT_DATE, "yyyy年MM月dd日"));
+
+        ComRestBean model = new ComRestBean();
+        model.setSf_companyid(Constant.BASE_COMPANYID);
+        model.setSf_username("");
+        model.setSf_companyname(CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_commpany"));
+        model.setSf_userid(MyApplication.getInstance().mLoginUser.getUserId());
+        model.setSf_date("");
+        mList.add(model);
+        myAdapter.notifyDataSetChanged();
     }
 
     @Override

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

@@ -29,6 +29,7 @@ import com.core.utils.CommonUtil;
 import com.core.widget.MyListView;
 import com.me.network.app.http.HttpClient;
 import com.me.network.app.http.Method;
+import com.me.network.app.http.rx.Result2Listener;
 import com.me.network.app.http.rx.ResultListener;
 import com.me.network.app.http.rx.ResultSubscriber;
 import com.uas.appme.R;
@@ -98,6 +99,14 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
             model.setSt_name(JSON.parseObject(updateData).getString("st_name"));
             mList.add(model);
             myAdapter.notifyDataSetChanged();
+        }else {
+            BSetLocationBean model = new BSetLocationBean();
+            model.setSt_companyname(CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_commpany"));
+            model.setSt_companyid(Constant.BASE_COMPANYID);
+            model.setSt_siid(sc_industrycode);
+            model.setSt_name("");
+            mList.add(model);
+            myAdapter.notifyDataSetChanged();
         }
     }
 
@@ -109,6 +118,7 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
             model.setSt_companyid(Constant.BASE_COMPANYID);
             model.setSt_siid(sc_industrycode);
             model.setSt_name("");
+            model.setSt_id("0");
             mList.add(model);
             myAdapter.notifyDataSetChanged();
         }else if (v.getId() == R.id.save_bt){
@@ -146,7 +156,8 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
                     .add("map",JSON.toJSONString(param))
                     .add("token",MyApplication.getInstance().mAccessToken)
                     .method(Method.POST)
-                    .build(),new ResultSubscriber<>(new ResultListener<Object>() {
+                    .connectTimeout(10000)
+                    .build(),new ResultSubscriber<>(new Result2Listener<Object>() {
                 @Override
                 public void onResponse(Object o) {
                     if (!JSONUtil.validate(o.toString()) || o == null) return;
@@ -156,10 +167,15 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
                         setResult(20);
                         finish();
                     }
+                    progressDialog.dismiss();save_bt.setEnabled(true);
+                }
 
+                @Override
+                public void onFailure(Object t) {
                     progressDialog.dismiss();save_bt.setEnabled(true);
                 }
             }));
+
         }
 
     }
@@ -267,6 +283,7 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
         TextView cancel_tv = (TextView) contentView.findViewById(R.id.cancel_tv);
         TextView sure_tv = (TextView) contentView.findViewById(R.id.sure_tv);
 
+        editname_et.setText(mList.get(position).getSt_name()+"");
         DisplayMetrics dm = getResources().getDisplayMetrics();
         int w_screen = dm.widthPixels;
         int h_screen = dm.heightPixels;

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

@@ -50,197 +50,195 @@ import java.util.Map;
  * function:
  */
 
-public class ImageSettingActivity extends BaseActivity implements View.OnClickListener {
-	private ImageView mImageIm;
-	private Uri mNewPhotoUri;// 拍照和图库 获得图片的URI
-	private static final int REQUEST_CODE_CAPTURE_PHOTO = 1;// 拍照
-	private static final int REQUEST_CODE_PICK_PHOTO = 2;//单选照片
-	private int Max_Size = 1;
-	private String photoselect = null;
-	private ProgressDialog mProgressDialog;
+public class ImageSettingActivity extends BaseActivity implements View.OnClickListener{
+    private ImageView mImageIm;
+    private Uri mNewPhotoUri;// 拍照和图库 获得图片的URI
+    private static final int REQUEST_CODE_CAPTURE_PHOTO = 1;// 拍照
+    private static final int REQUEST_CODE_PICK_PHOTO = 2;//单选照片
+    private int Max_Size = 1;
+    private String photoselect=null;
+    private ProgressDialog mProgressDialog;
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.image_setting_activity);
 
-		initView();
-	}
-
-	@Override
-	protected void onResume() {
-		super.onResume();
-		String[] permissions = new String[]{Manifest.permission.CAMERA, Manifest.permission.READ_EXTERNAL_STORAGE};
-		for (String permission : permissions) {
-			if (PermissionUtil.lacksPermissions(ct, permission)) {
-				PermissionUtil.requestPermission(this, PermissionUtil.DEFAULT_REQUEST, permission);
-			}
-		}
-	}
-
-	private void initView() {
-		mImageIm = (ImageView) findViewById(R.id.image_im);
-		findViewById(R.id.image_tv).setOnClickListener(this);
-		findViewById(R.id.btn_save).setOnClickListener(this);
-		mProgressDialog = ProgressDialogUtil.init(mContext, null, getString(R.string.please_wait));
-	}
-
-	@Override
-	public void onClick(View v) {
-		if (v.getId() == R.id.image_tv) {
-			showSelectPictureDialog();
-		} else if (v.getId() == R.id.btn_save) {
-			doSaveImage();
-		}
-
-	}
-
-	private void doSaveImage() {
-		if (StringUtil.isEmpty(photoselect)) return;
-		File waterBitmapToFile = new File(photoselect);
-		if (!waterBitmapToFile.isFile()) {
-			return;
-		} else {
-			com.lidroid.xutils.http.RequestParams params = new com.lidroid.xutils.http.RequestParams();
-			params.addQueryStringParameter("master", CommonUtil.getSharedPreferences(ct, "erp_master"));
-			params.addHeader("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
-			params.addBodyParameter("userid", MyApplication.getInstance().mLoginUser.getUserId());
-			params.addBodyParameter("file1", waterBitmapToFile);
-			String url = "http://113.105.74.140:8080/upload/UploadServlet";
-			final HttpUtils http = new HttpUtils();
-			http.send(HttpRequest.HttpMethod.POST, url, params, new RequestCallBack<String>() {
-				@Override
-				public void onStart() {
-					progressDialog.show();
-					ViewUtil.ToastMessage(ct, getString(com.uas.appworks.R.string.sending_picture) + "...");
-				}
-
-				@Override
-				public void onLoading(long total, long current, boolean isUploading) {
-					if (isUploading) {
-					} else {
-					}
-				}
-
-				@Override
-				public void onSuccess(ResponseInfo<String> responseInfo) {
-					if (JSONUtil.validate(responseInfo.result) && JSON.parseObject(responseInfo.result).getBoolean("success")) {
-						LogUtil.prinlnLongMsg("UploadServlet", responseInfo.result + "");
-
-						try {
-							JSONObject object = JSON.parseObject(responseInfo.result);
-							JSONObject dataobject = object.getJSONObject("data");
-							if (dataobject == null) return;
-							JSONArray imagearray = dataobject.getJSONArray("images");
-							if (ListUtils.isEmpty(imagearray)) return;
-							String oUrl = imagearray.getJSONObject(0).getString("oUrl");
-							if (!StringUtil.isEmpty(oUrl))
-								doUpdateUrl(oUrl);
-						} catch (Exception e) {
-							e.printStackTrace();
-						}
-					}
-				}
-
-				@Override
-				public void onFailure(HttpException error, String msg) {
-					ViewUtil.ToastMessage(ct, getString(com.uas.appworks.R.string.common_save_failed) + msg);
-					progressDialog.dismiss();
-				}
-			});
-		}
-	}
-
-	private void doUpdateUrl(String oUrl) {
-		Map<String, Object> params = new HashMap<>();
-		params.put("sc_imageurl", oUrl);
-		params.put("sc_uu", Constant.BASE_COMPANYID);
-//        params.put("sc_uu", CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "erp_uu"));
-		HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
-		httpClient.Api().send(new HttpClient.Builder()
-				.url("user/appStorurl")
-				.add("map", JSONUtil.map2JSON(params))
-				.add("token", MyApplication.getInstance().mAccessToken)
-				.method(Method.POST)
-				.build(), new ResultSubscriber<>(new ResultListener<Object>() {
-			@Override
-			public void onResponse(Object o) {
-				LogUtil.prinlnLongMsg("hi/appStorurl", o.toString() + "ddd");
-				if (!JSONUtil.validate(o.toString()) || o == null) return;
-				if (o.toString().contains("result") && JSON.parseObject(o.toString()).getBoolean("result")) {
-					Toast.makeText(ct, getString(R.string.common_save_success), Toast.LENGTH_LONG).show();
-					progressDialog.dismiss();
-					finish();
-				}
-			}
-		}));
-	}
-
-
-	@Override
-	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-		super.onActivityResult(requestCode, resultCode, data);
-
-		if (requestCode == 0x01 && resultCode == 0x02 && data != null) {  //新的多选方式
-			photoselect = data.getStringArrayListExtra("files").get(0);
-			mImageIm.setImageURI(Uri.fromFile(new File(photoselect)));
-			Log.i("files0x01", data.getStringArrayListExtra("files").toString());
-			Log.i("files0x01", photoselect);
-		} else if (requestCode == REQUEST_CODE_CAPTURE_PHOTO) {// 拍照返回
-			if (resultCode == Activity.RESULT_OK) {
-				if (mNewPhotoUri != null) {
-					photoselect = mNewPhotoUri.getPath();
-					LogUtil.i("photoselect=" + photoselect);
-					ImageLoader.getInstance().displayImage(mNewPhotoUri.toString(),mImageIm);
-				} else {
-					ToastUtil.showToast(this, com.uas.appworks.R.string.c_take_picture_failed);
-				}
-			}
-		} else if (requestCode == REQUEST_CODE_PICK_PHOTO) {// 传统单选方式，选择一张图片,然后立即调用裁减
-			if (resultCode == Activity.RESULT_OK) {
-				if (data != null && data.getData() != null) {
-					photoselect = CameraUtil.getImagePathFromUri(this, data.getData());
-					ImageLoader.getInstance().displayImage(Uri.fromFile(new File(photoselect)).toString(),mImageIm);
-					Log.i("files0x01", photoselect);
-				}
-			}
-		}
-	}
-
-	private void showSelectPictureDialog() {
-		String[] items = new String[]{getString(com.uas.appworks.R.string.c_take_picture), getString(com.uas.appworks.R.string.c_photo_album)};
-		AlertDialog.Builder builder = new AlertDialog.Builder(this).setSingleChoiceItems(items, 0,
-				new DialogInterface.OnClickListener() {
-					@Override
-					public void onClick(DialogInterface dialog, int which) {
-						if (which == 0) {
-							takePhoto();
-						} else {
-							selectPhoto();
-						}
-						dialog.dismiss();
-					}
-				});
-		builder.show();
-	}
-
-	private void takePhoto() {
-		try {
-			mNewPhotoUri = CameraUtil.getOutputMediaFileUri(this, MyApplication.getInstance().getLoginUserId(), CameraUtil.MEDIA_TYPE_IMAGE);
-			CameraUtil.captureImage(this, mNewPhotoUri, REQUEST_CODE_CAPTURE_PHOTO);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	private void selectPhoto() {
-		CameraUtil.pickImageSimple(this, REQUEST_CODE_PICK_PHOTO);  //传统单选方式
-		//新式多选方式
+        initView();
+    }
+    @Override
+    protected void onResume() {
+        super.onResume();
+        String[] permissions = new String[]{Manifest.permission.CAMERA, Manifest.permission.READ_EXTERNAL_STORAGE};
+        for (String permission : permissions) {
+            if (PermissionUtil.lacksPermissions(ct, permission)) {
+                PermissionUtil.requestPermission(this, PermissionUtil.DEFAULT_REQUEST, permission);
+            }else
+                return;
+        }
+    }
+    private void initView() {
+        mImageIm = (ImageView) findViewById(R.id.image_im);
+        findViewById(R.id.image_tv).setOnClickListener(this);
+        findViewById(R.id.btn_save).setOnClickListener(this);
+        mProgressDialog = ProgressDialogUtil.init(mContext, null, getString(R.string.please_wait));
+    }
+
+    @Override
+    public void onClick(View v) {
+        if (v.getId() == R.id.image_tv){
+            showSelectPictureDialog();
+        }else if (v.getId() == R.id.btn_save){
+            doSaveImage();
+        }
+
+    }
+    private void doSaveImage() {
+        if (StringUtil.isEmpty(photoselect)) return;
+        File waterBitmapToFile=  new File(photoselect);
+        if (!waterBitmapToFile.isFile()){
+            return;
+        }else {
+            com.lidroid.xutils.http.RequestParams params = new com.lidroid.xutils.http.RequestParams();
+            params.addQueryStringParameter("master", CommonUtil.getSharedPreferences(ct, "erp_master"));
+            params.addHeader("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+            params.addBodyParameter("userid", MyApplication.getInstance().mLoginUser.getUserId());
+            params.addBodyParameter("file1", waterBitmapToFile);
+            String url = "http://113.105.74.140:8080/upload/UploadServlet";
+            final HttpUtils http = new HttpUtils();
+            http.send(HttpRequest.HttpMethod.POST, url, params, new RequestCallBack<String>() {
+                @Override
+                public void onStart() {
+                    progressDialog.show();
+                    ViewUtil.ToastMessage(ct, getString(com.uas.appworks.R.string.sending_picture)+"...");
+                }
+                @Override
+                public void onLoading(long total, long current, boolean isUploading) {
+                    if (isUploading) {
+                    } else {
+                    }
+                }
+
+                @Override
+                public void onSuccess(ResponseInfo<String> responseInfo) {
+                    if (JSONUtil.validate(responseInfo.result) && JSON.parseObject(responseInfo.result).getBoolean("success")) {
+                        LogUtil.prinlnLongMsg("UploadServlet", responseInfo.result + "");
+
+                        try {
+                            JSONObject object = JSON.parseObject(responseInfo.result);
+                            JSONObject dataobject = object.getJSONObject("data");
+                            if (dataobject == null) return;
+                            JSONArray imagearray = dataobject.getJSONArray("images");
+                            if (ListUtils.isEmpty(imagearray)) return;
+                            String oUrl = imagearray.getJSONObject(0).getString("oUrl");
+                            if (!StringUtil.isEmpty(oUrl))
+                                doUpdateUrl(oUrl);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    }
+                }
+
+                @Override
+                public void onFailure(HttpException error, String msg) {
+                    ViewUtil.ToastMessage(ct, getString(com.uas.appworks.R.string.common_save_failed) + msg);
+                    progressDialog.dismiss();
+                }
+            });
+        }
+    }
+
+    private void doUpdateUrl(String oUrl) {
+        Map<String, Object> params = new HashMap<>();
+        params.put("sc_imageurl",oUrl);
+        params.put("sc_uu",Constant.BASE_COMPANYID);
+        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/appStorurl")
+                .add("map",JSONUtil.map2JSON(params))
+                .add("token",MyApplication.getInstance().mAccessToken)
+                .method(Method.POST)
+                .build(),new ResultSubscriber<>(new ResultListener<Object>() {
+            @Override
+            public void onResponse(Object o) {
+                LogUtil.prinlnLongMsg("hi/appStorurl", o.toString()+"ddd");
+                if (!JSONUtil.validate(o.toString()) || o == null) return;
+                if (o.toString().contains("result") && JSON.parseObject(o.toString()).getBoolean("result")){
+                    Toast.makeText(ct,getString(R.string.common_save_success),Toast.LENGTH_LONG).show();
+                    progressDialog.dismiss();
+                    finish();
+                }
+        }
+    }));
+    }
+
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        if (requestCode == 0x01 && resultCode == 0x02 && data != null){  //新的多选方式
+            photoselect = data.getStringArrayListExtra("files").get(0);
+            mImageIm.setImageURI(Uri.fromFile(new File(photoselect)));
+            Log.i("files0x01",data.getStringArrayListExtra("files").toString());
+            Log.i("files0x01",photoselect);
+        }else if (requestCode == REQUEST_CODE_CAPTURE_PHOTO) {// 拍照返回
+            if (resultCode == Activity.RESULT_OK) {
+                if (mNewPhotoUri != null) {
+                    photoselect = mNewPhotoUri.getPath();
+//                    mImageIm.setImageURI(mNewPhotoUri);
+                    ImageLoader.getInstance().displayImage(mNewPhotoUri.toString(),mImageIm);
+                    Log.i("files0x01",photoselect);
+                } else {
+                    ToastUtil.showToast(this, com.uas.appworks.R.string.c_take_picture_failed);
+                }
+            }
+        }else if (requestCode == REQUEST_CODE_PICK_PHOTO) {// 传统单选方式，选择一张图片,然后立即调用裁减
+            if (resultCode == Activity.RESULT_OK){
+                if (data != null && data.getData() != null){
+                    photoselect= CameraUtil.getImagePathFromUri(this, data.getData());
+                    mImageIm.setImageURI(Uri.fromFile(new File(photoselect)));
+                    Log.i("files0x01",photoselect);
+                }
+            }
+        }
+    }
+
+    private void showSelectPictureDialog() {
+        String[] items = new String[]{getString(com.uas.appworks.R.string.c_take_picture), getString(com.uas.appworks.R.string.c_photo_album)};
+        AlertDialog.Builder builder = new AlertDialog.Builder(this).setSingleChoiceItems(items, 0,
+                new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        if (which == 0) {
+                            takePhoto();
+                        } else {
+                            selectPhoto();
+                        }
+                        dialog.dismiss();
+                    }
+                });
+        builder.show();
+    }
+
+    private void takePhoto() {
+        try {
+            mNewPhotoUri = CameraUtil.getOutputMediaFileUri(this, MyApplication.getInstance().getLoginUserId(), CameraUtil.MEDIA_TYPE_IMAGE);
+            CameraUtil.captureImage(this, mNewPhotoUri, REQUEST_CODE_CAPTURE_PHOTO);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void selectPhoto() {
+        CameraUtil.pickImageSimple(this, REQUEST_CODE_PICK_PHOTO);  //传统单选方式
+        //新式多选方式
 //        Intent intent = new Intent();
 //        intent.putExtra("MAX_SIZE",Max_Size);
 //        intent.putExtra("CURRENT_SIZE",0);
 //        intent.setClass(ct,ImgFileListActivity.class);
 //        startActivityForResult(intent,0x01);
-	}
+    }
 
 }

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

@@ -102,6 +102,7 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
 
     private PopupWindow setWindow = null;//
     private RelativeLayout businessmen_setting_rl;
+    private TextView bsettingRed;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -135,6 +136,10 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
         booking_set_rl = (RelativeLayout) findViewById(R.id.booking_set_rl);
         businessmen_setting_rl = (RelativeLayout) findViewById(R.id.businessmen_setting_rl);
         businessmen_setting_rl.setOnClickListener(this);
+        bsettingRed = (TextView) findViewById(R.id.businessmen_setting_new);
+
+        if (PreferenceUtils.getBoolean(MyApplication.getInstance(), Constant.B_SETTINGRED)) //商家设置红点
+            bsettingRed.setVisibility(View.GONE);
 
         new_step_rl.setOnClickListener(this);
 //        new_step_rl.setVisibility(View.GONE);
@@ -417,6 +422,8 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
            closePopupWindow();
        }else if (v.getId() == R.id.businessmen_setting_rl){
            startActivity(new Intent(this,BSettingActivity.class));
+           PreferenceUtils.putBoolean(Constant.B_SETTINGRED, true);
+           bsettingRed.setVisibility(View.GONE);
        }
     }
 

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

@@ -10,6 +10,15 @@ public class BSetLocationBean {
     private String st_siid;
     private String st_companyid;
     private String st_companyname;
+    private String st_id;
+
+    public String getSt_id() {
+        return st_id;
+    }
+
+    public void setSt_id(String st_id) {
+        this.st_id = st_id;
+    }
 
     public String getSt_name() {
         return st_name;

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

@@ -46,7 +46,11 @@
                 android:paddingTop="10dp"
                 android:text="骨科"
                 android:layout_alignParentRight="true"
-                android:layout_marginRight="20dp"/>
+                android:layout_marginRight="20dp"
+                android:maxLength="8"
+                android:singleLine="true"
+                android:ellipsize="end"
+                />
             <TextView
                 android:id="@+id/position_tv"
                 android:layout_width="wrap_content"