|
|
@@ -23,7 +23,6 @@ import android.widget.Toast;
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
-import com.baidu.cyberplayer.utils.G;
|
|
|
import com.common.LogUtil;
|
|
|
import com.common.data.DateFormatUtil;
|
|
|
import com.common.data.JSONUtil;
|
|
|
@@ -32,7 +31,6 @@ import com.common.data.StringUtil;
|
|
|
import com.common.system.DisplayUtil;
|
|
|
import com.core.api.wxapi.ApiPlatform;
|
|
|
import com.core.api.wxapi.ApiUtils;
|
|
|
-import com.core.app.MyApplication;
|
|
|
import com.core.base.BaseActivity;
|
|
|
import com.core.net.http.ViewUtil;
|
|
|
import com.core.utils.CommonUtil;
|
|
|
@@ -137,7 +135,6 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
|
|
|
else if (sl_result == 0 && haveData)
|
|
|
mBtnSignature.setVisibility(View.VISIBLE);
|
|
|
|
|
|
-
|
|
|
sl_id = dataObject.getString("sl_id");
|
|
|
if (!ListUtils.isEmpty(configsArray) && dataObject.size() > 0){
|
|
|
for (int i = 0; i < configsArray.size(); i++) {
|
|
|
@@ -233,7 +230,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
|
|
|
if (v.getId() == R.id.btn_signature){
|
|
|
if (haveData && needSignature == 1)
|
|
|
showSiganWindow();
|
|
|
- else if (haveData && needSignature == 0)
|
|
|
+ else if (haveData )
|
|
|
doNewSubmit(null,null);
|
|
|
else
|
|
|
ToastMessage("暂无工资条数据");
|
|
|
@@ -354,7 +351,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
|
|
|
}));
|
|
|
}
|
|
|
|
|
|
- private void doNewSubmit(Bitmap pathBm, String plainpath) {
|
|
|
+ private void doNewSubmit(Bitmap pathBm, final String plainpath) {
|
|
|
String url = "http://192.168.253.58:8080/ERP/"+"mobile/salary/salaryBack.action";
|
|
|
RequestParams params = new RequestParams();
|
|
|
params.addBodyParameter("emcode", emcode);
|
|
|
@@ -362,14 +359,16 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
|
|
|
params.addBodyParameter("result","true");
|
|
|
params.addQueryStringParameter("master", master);
|
|
|
params.addBodyParameter("msg","");
|
|
|
- params.addBodyParameter("img",new File(plainpath));
|
|
|
+ if (!StringUtil.isEmpty(plainpath))
|
|
|
+ params.addBodyParameter("img",new File(plainpath));
|
|
|
final HttpUtils http = new HttpUtils();
|
|
|
Log.i("urlparams",url+params+"");
|
|
|
|
|
|
http.send(HttpRequest.HttpMethod.POST, url, params, new RequestCallBack<String>() {
|
|
|
@Override
|
|
|
public void onStart() {
|
|
|
- ViewUtil.ToastMessage(ct, getString(R.string.sending_picture)+"...");
|
|
|
+ if (!StringUtil.isEmpty(plainpath))
|
|
|
+ ViewUtil.ToastMessage(ct, getString(R.string.sending_picture)+"...");
|
|
|
}
|
|
|
@Override
|
|
|
public void onSuccess(ResponseInfo<String> responseInfo) {
|
|
|
@@ -412,7 +411,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
|
|
|
.add("emcode", emcode)
|
|
|
.add("sl_id",sl_id)
|
|
|
.add("result",true)
|
|
|
- .add("img", ppp)
|
|
|
+// .add("img", ppp)
|
|
|
.add("master", master)
|
|
|
.add("msg","")
|
|
|
.method(Method.POST)
|
|
|
@@ -421,6 +420,14 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
|
|
|
public void onResponse(Object o) {
|
|
|
if (!JSONUtil.validate(o.toString()) || o == null) return;
|
|
|
LogUtil.prinlnLongMsg("salaryBack", o.toString()+"");
|
|
|
+ if (JSONUtil.validate(o.toString()) && JSON.parseObject(o.toString()).getBoolean("success")) {
|
|
|
+ Toast.makeText(ct,"工资条签名提交成功",Toast.LENGTH_LONG).show();
|
|
|
+ received_im.setVisibility(View.VISIBLE);
|
|
|
+ mBtnSignature.setText("已收签");
|
|
|
+ mBtnSignature.setEnabled(false);
|
|
|
+ closePopupWindow();
|
|
|
+ }
|
|
|
+ progressDialog.dismiss();
|
|
|
}
|
|
|
}));
|
|
|
|
Bitliker
