形象设置接口调试完成

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

@@ -185,7 +185,14 @@
                     android:text="@string/set_push"
                     android:textColor="@color/black"
                     android:textSize="14sp" />
-
+                <com.core.widget.view.SwitchView
+                    android:id="@+id/cb_task_reply"
+                    android:layout_width="40dp"
+                    android:layout_height="25dp"
+                    android:layout_alignParentBottom="true"
+                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentRight="true"
+                    android:layout_marginBottom="17dp" />
             </RelativeLayout>
             <RelativeLayout
                 android:id="@+id/businessmen_setting_rl"
@@ -261,14 +268,7 @@
                     android:textColor="@android:color/white"
                     android:textSize="10.0dip" />
 
-                <com.core.widget.view.SwitchView
-                    android:id="@+id/cb_task_reply"
-                    android:layout_width="40dp"
-                    android:layout_height="25dp"
-                    android:layout_alignParentBottom="true"
-                    android:layout_alignParentEnd="true"
-                    android:layout_alignParentRight="true"
-                    android:layout_marginBottom="17dp" />
+
             </RelativeLayout>
 
             <RelativeLayout

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

@@ -185,7 +185,14 @@
                     android:text="@string/set_push"
                     android:textColor="@color/black"
                     android:textSize="14sp" />
-
+                <com.core.widget.view.SwitchView
+                    android:id="@+id/cb_task_reply"
+                    android:layout_width="40dp"
+                    android:layout_height="25dp"
+                    android:layout_alignParentBottom="true"
+                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentRight="true"
+                    android:layout_marginBottom="17dp" />
             </RelativeLayout>
             <RelativeLayout
                 android:id="@+id/businessmen_setting_rl"
@@ -261,14 +268,7 @@
                     android:textColor="@android:color/white"
                     android:textSize="10.0dip" />
 
-                <com.core.widget.view.SwitchView
-                    android:id="@+id/cb_task_reply"
-                    android:layout_width="40dp"
-                    android:layout_height="25dp"
-                    android:layout_alignParentBottom="true"
-                    android:layout_alignParentEnd="true"
-                    android:layout_alignParentRight="true"
-                    android:layout_marginBottom="17dp" />
+
             </RelativeLayout>
 
             <RelativeLayout
@@ -417,7 +417,7 @@
                     android:contentDescription="@string/app_name" />
             </RelativeLayout>
 
-          
+
             <RelativeLayout
                 android:id="@+id/language_us_rl"
                 style="@style/IMTbleLine"
@@ -455,7 +455,7 @@
                     android:background="@drawable/oa_next"
                     android:contentDescription="@string/app_name" />
             </RelativeLayout>
-            
+
             <View
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/line"

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

@@ -103,7 +103,9 @@
                     android:background="@null"
                     android:hint="请选择(必选)"
                     android:textSize="15sp"
-                    android:gravity="center_vertical|right"/>
+                    android:gravity="center_vertical|right"
+                    android:text="医科"
+                    />
             </RelativeLayout>
             <View
                 android:layout_width="match_parent"
@@ -133,7 +135,8 @@
                     android:background="@null"
                     android:hint="请选择(必选)"
                     android:textSize="15sp"
-                    android:gravity="center_vertical|right"/>
+                    android:gravity="center_vertical|right"
+                    android:text="医师"/>
             </RelativeLayout>
             <View
                 android:layout_width="match_parent"

app_core/network/src/main/java/com/me/network/app/http/HttpClient.java

@@ -120,7 +120,7 @@ public class HttpClient {
         public Builder() {
             this.method = Method.GET;
             this.params.put("client","Android Client");
-            this.headers.put("Content-Type", "application/x-www-form-urlencoded;charset=UTF-8");
+//            this.headers.put("Content-Type", "application/x-www-form-urlencoded;charset=UTF-8");
         }
 
         public Builder(String url) {

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

@@ -2,6 +2,7 @@ package com.uas.appme.settings.activity;
 
 import android.app.Activity;
 import android.app.AlertDialog;
+import android.app.ProgressDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
@@ -9,14 +10,35 @@ import android.os.Bundle;
 import android.view.View;
 import android.widget.ImageView;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.common.LogUtil;
+import com.common.data.JSONUtil;
+import com.common.data.ListUtils;
+import com.common.data.StringUtil;
 import com.common.ui.CameraUtil;
+import com.common.ui.ProgressDialogUtil;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
+import com.core.net.http.ViewUtil;
+import com.core.utils.CommonUtil;
 import com.core.utils.ToastUtil;
+import com.lidroid.xutils.HttpUtils;
+import com.lidroid.xutils.exception.HttpException;
+import com.lidroid.xutils.http.ResponseInfo;
+import com.lidroid.xutils.http.callback.RequestCallBack;
+import com.lidroid.xutils.http.client.HttpRequest;
+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.uas.appme.R;
 import com.umeng.socialize.utils.Log;
 
 import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Created by FANGlh on 2017/10/10.
@@ -30,6 +52,7 @@ public class ImageSettingActivity extends BaseActivity implements View.OnClickLi
     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) {
@@ -40,10 +63,10 @@ public class ImageSettingActivity extends BaseActivity implements View.OnClickLi
     }
 
     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
@@ -51,9 +74,88 @@ public class ImageSettingActivity extends BaseActivity implements View.OnClickLi
         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",201);
+//        params.put("sc_uu", CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "erp_uu"));
+        HttpClient httpClient = new HttpClient.Builder("http://113.105.74.140:8092/").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")){
+                    ToastMessage(getString(R.string.common_save_success));
+                    progressDialog.dismiss();
+                    finish();
+                }
+        }
+    }));
     }
 
 
@@ -88,7 +190,6 @@ public class ImageSettingActivity extends BaseActivity implements View.OnClickLi
 
     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)};
-//        String[] items = new String[]{getString(R.string.c_take_picture)};
         AlertDialog.Builder builder = new AlertDialog.Builder(this).setSingleChoiceItems(items, 0,
                 new DialogInterface.OnClickListener() {
                     @Override

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

@@ -2,33 +2,43 @@ package com.uas.appme.settings.activity;
 
 import android.app.AlertDialog;
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
 import android.widget.RelativeLayout;
-import android.widget.TextView;
 
 import com.andreabaccega.widget.FormEditText;
+import com.common.LogUtil;
+import com.common.data.JSONUtil;
+import com.common.data.StringUtil;
+import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
+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.uas.appme.R;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * Created by FANGlh on 2017/10/10.
  * function:
  */
 
 public class PersonSettingActivity extends BaseActivity implements View.OnClickListener{
-    private TextView mNameTv;
     private FormEditText mUserNameTv;
     private FormEditText mUserSexTv;
     private RelativeLayout mRySetStartTime;
     private FormEditText mUserDepartmentTv;
     private FormEditText mUserJobTv;
-    private TextView mTelTv;
     private FormEditText mUserTelTv;
-    private TextView mEmailTv;
     private FormEditText mUserEmailTv;
     private Button mBtnSave;
+    private String sm_id;
+    private int sm_sex = -1;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -40,15 +50,12 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
 
     private void initView() {
 
-        mNameTv = (TextView) findViewById(R.id.name_tv);
         mUserNameTv = (FormEditText) findViewById(R.id.user_name_tv);
         mUserSexTv = (FormEditText) findViewById(R.id.user_sex_tv);
         mRySetStartTime = (RelativeLayout) findViewById(R.id.ry_set_startTime);
         mUserDepartmentTv = (FormEditText) findViewById(R.id.user_department_tv);
         mUserJobTv = (FormEditText) findViewById(R.id.user_job_tv);
-        mTelTv = (TextView) findViewById(R.id.tel_tv);
         mUserTelTv = (FormEditText) findViewById(R.id.user_tel_tv);
-        mEmailTv = (TextView) findViewById(R.id.email_tv);
         mUserEmailTv = (FormEditText) findViewById(R.id.user_email_tv);
         mBtnSave = (Button) findViewById(R.id.btn_save);
 
@@ -61,6 +68,11 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
 
         mBtnSave.setOnClickListener(this);
 
+
+        //更新时的数据获取
+        Intent intent = getIntent();
+        sm_id = intent.getStringExtra("sm_id");
+
     }
 
     @Override
@@ -89,6 +101,34 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
     }
 
     private void saveRequest() {
+        Map<String, Object> params = new HashMap<>();
+        if (!StringUtil.isEmpty(sm_id))
+            params.put("sm_id",sm_id);
+
+        params.put("sm_stid",111);
+        params.put("sm_userid",MyApplication.getInstance().mLoginUser.getUserId());
+        params.put("sm_username",mUserNameTv.getText().toString());
+        params.put("sm_companyid",201);
+        params.put("sm_companyname",mUserDepartmentTv.getText().toString());
+        params.put("sm_level",mUserJobTv.getText().toString());
+        params.put("sm_telephone",mUserTelTv.getText().toString());
+        params.put("sm_email",mUserEmailTv.getText().toString());
+        params.put("sm_sex",sm_sex);
+
+        HttpClient httpClient = new HttpClient.Builder("http://113.105.74.140:8092/").isDebug(true).build(true);
+        httpClient.Api().send(new HttpClient.Builder()
+                .url("user/appPersonSet")
+                .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) {
+                if (!JSONUtil.validate(o.toString()) || o == null) return;
+                LogUtil.prinlnLongMsg("appPersonSet", o.toString()+"");
+
+            }
+        }));
 
     }
 
@@ -102,8 +142,10 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
                     public void onClick(DialogInterface dialog, int which) {
                         if (which == 0) {
                             mUserSexTv.setText(R.string.user_body);
+                            sm_sex = 1;
                         } else {
                             mUserSexTv.setText(R.string.user_girl);
+                            sm_sex = 0;
                         }
                         dialog.dismiss();
                     }

version.gradle

@@ -11,8 +11,8 @@ ext {
             minSdkVersion    : 9,
             targetSdkVersion : 24,
             javaVersion      : JavaVersion.VERSION_1_8,
-            versionCode      : 119,
-            versionName      : '5.9.7',
+            versionCode      : 121,
+            versionName      : '5.9.9',
     ]
 
     depsVersion = [