合并代码

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java

@@ -49,6 +49,7 @@ import com.xzjmyk.pm.activity.broadcast.MsgBroadcast;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
 import com.xzjmyk.pm.activity.db.dao.SignAutoLogDao;
 import com.xzjmyk.pm.activity.db.dao.UserDao;
+import com.xzjmyk.pm.activity.db.dao.WorkModelDao;
 import com.xzjmyk.pm.activity.helper.LoginHelper;
 import com.xzjmyk.pm.activity.ui.account.LoginActivity;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
@@ -56,6 +57,7 @@ import com.xzjmyk.pm.activity.ui.circle.BusinessCircleFragment;
 import com.xzjmyk.pm.activity.ui.contact.ContactFragment;
 import com.xzjmyk.pm.activity.ui.erp.activity.me.FeedbackActivity;
 import com.xzjmyk.pm.activity.ui.erp.fragment.WorksFragment;
+import com.xzjmyk.pm.activity.ui.erp.model.oa.WorkModel;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
@@ -73,6 +75,7 @@ import com.xzjmyk.pm.activity.util.Constants;
 import com.xzjmyk.pm.activity.util.DateFormatUtil;
 import com.xzjmyk.pm.activity.util.DisplayUtil;
 import com.xzjmyk.pm.activity.util.PreferenceUtils;
+import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.view.DivideRadioGroup;
 import com.xzjmyk.pm.activity.volley.ArrayResult;
 import com.xzjmyk.pm.activity.volley.FastVolley;
@@ -149,6 +152,7 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
     private int mRetryCheckDelay = 0;
     public static int UPDATA_LIST = 101;
     public static String NEW_FUNCTION_NOTICE = "NEW_FUNCTION_NOTICE";
+    public static String NEW_VERSION_RATING = "NEW_VERSION_RATING";  // 判断是否为新版本弹出评分标志
     private TextView main_tab_three_tv;
     private SignAutoLogDao signAutoLogDao = new SignAutoLogDao();
     private Handler mUserCheckHander = new Handler() {
@@ -553,14 +557,6 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
         }
         //        CommonUtil.SaveAutoLogtoLocal("APP启动","外勤计划监控");
         doSendSignAutoLog(); // 获取数据库中监控日志上传至服务器操作
-        if (!CommonUtil.isReleaseVersion() && MyApplication.getInstance().isNetworkActive()){
-            new Handler().postDelayed(new Runnable() {
-                @Override
-                public void run() {
-                    initScoringWindows();  // 评价UU弹框
-                }
-            },1000);
-        }
     }
 
     private PopupWindow popupWindow;
@@ -569,13 +565,13 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
         DisplayMetrics dm = getResources().getDisplayMetrics();
         int w_screen = dm.widthPixels;
         int h_screen = dm.heightPixels;
-        w_screen = DisplayUtil.dip2px(this, 300);
+        w_screen = DisplayUtil.dip2px(this, 250);
         h_screen = DisplayUtil.dip2px(this, 250);
         popupWindow = new PopupWindow(contentView, w_screen, h_screen, true);
         popupWindow.setTouchable(true);
         popupWindow.setOutsideTouchable(false);
         // 如果不设置PopupWindow的背景，无论是点击外部区域还是Back键都无法dismiss弹框
-//        popupWindow.setBackgroundDrawable(getResources().getDrawable(R.drawable.bg_main));
+        popupWindow.setBackgroundDrawable(getResources().getDrawable(R.drawable.pop_round_bg));
         // 设置好参数之后再show
         popupWindow.showAtLocation(contentView, Gravity.CENTER, 0, 0);
         setbg(0.4f);
@@ -612,6 +608,8 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
                 popupWindow.dismiss();
             }
         });
+        PreferenceUtils.putInt(MainActivity.NEW_VERSION_RATING, 1);
+        PushManager.resumeWork(MyApplication.getInstance());
     }
 
     private void setbg(float alpha) {
@@ -748,7 +746,7 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
     private void LogSendToHttp(List<SignAutoLogEntity> isendEntity) {
         String url = "http://113.105.74.140:8092/user/appAutoLog";
         Map<String, Object> param = new HashMap<>();
-        param.put("map",JSON.toJSONString(isendEntity));
+        param.put("map", JSON.toJSONString(isendEntity));
         LogUtil.prinlnLongMsg("isendEntity", JSON.toJSONString(isendEntity));
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
@@ -914,6 +912,29 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
             main_tab_three_tv.setVisibility(View.VISIBLE);
         }
         LogUtil.d("onResume end:" + DateFormatUtil.getDateTimeStr());
+
+        int new_version_rating = PreferenceUtils.getInt(MyApplication.getInstance(), MainActivity.NEW_VERSION_RATING);
+        if (new_version_rating != 1 && MyApplication.getInstance().isNetworkActive()){
+            showsScoreWindowJudge();  // 显示为UU评分对话框逻辑
+        }
+    }
+
+    private void showsScoreWindowJudge() {
+        List<WorkModel> models = WorkModelDao.getInstance().query(true);
+        if (ListUtils.isEmpty(models)) return;
+
+        String off_time = models.get(models.size() - 1).getOffTime();
+        if (StringUtils.isEmpty(off_time)) return;
+        String cur_time =  TimeUtils.long2str(System.currentTimeMillis(), "HH:mm");
+        if (cur_time.compareTo(off_time) > 0){
+            new Handler().postDelayed(new Runnable() { // 下班时间
+                @Override
+                public void run() {
+                    initScoringWindows();  // 评价UU弹框
+                }
+            }, 1000);
+        }
+        Log.i("off_time,cur_time", off_time + "," +cur_time+":" +cur_time.compareTo(off_time));
     }
 
     @Override

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/SendShuoshuoActivity.java

@@ -174,7 +174,6 @@ public class SendShuoshuoActivity extends BaseActivity implements View.OnClickLi
                 else
                     new UploadPhpto().execute();
             }
-
         }else {
             return super.onOptionsItemSelected(item);
         }return true;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/DetailTaskActivity.java

@@ -211,12 +211,14 @@ public class DetailTaskActivity extends BaseActivity implements OnClickListener
         tv_task_status.setText(intent.getStringExtra("status") == null ? getString(R.string.common_noinput) : intent.getStringExtra("status"));
         tv_task_duration.setText(intent.getStringExtra("duration") == null ? getString(R.string.common_noinput) : intent.getStringExtra("duration"));
         tv_task_describe
-                .setText(intent.getStringExtra("description") == null ? getString(R.string.common_noinput) :intent.getStringExtra("description"));
+                .setText(intent.getStringExtra("description") == null ? getString(R.string.common_noinput) : intent.getStringExtra("description"));
         tv_task_starttime.setText(intent.getStringExtra("tasktime") == null ? getString(R.string.common_noinput) :
-                TimeUtils.long2str(TimeUtils.f_str_2_long(intent.getStringExtra("tasktime")), "yyyy-MM-dd HH:mm"));
+                intent.getStringExtra("tasktime"));
+//                TimeUtils.long2str(TimeUtils.f_str_2_long(intent.getStringExtra("tasktime")), "yyyy-MM-dd HH:mm"));
         taskId = intent.getStringExtra("taskid");
         tv_task_endtime.setText(intent.getStringExtra("endtime") == null ? getString(R.string.common_noinput) :
                 TimeUtils.long2str(TimeUtils.f_str_2_long(intent.getStringExtra("endtime")), "yyyy-MM-dd HH:mm"));
+        Log.i("tasktime2,endtime", intent.getStringExtra("tasktime") + "," + intent.getStringExtra("endtime"));
         String ra_taskid = intent.getStringExtra("ra_taskid");
         // String taskcode=intent.getStringExtra("taskcode");
         String attachs = intent.getStringExtra("attachs");

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/TaskActivity.java

@@ -311,6 +311,7 @@ public class TaskActivity extends BaseActivity implements OnClickListener, Recog
                 intent.putExtra("ra_taskid", store.task_id);//取回复内容id
                 intent.putExtra("attachs", store.attachs);
                 intent.putExtra("endtime", store.tv_task_duration);
+                Log.i("tasktime1,endtime",store.pTextView2.getText().toString()+","+store.tv_task_duration);
                 startActivityForResult(intent, 0x20);
             }
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/WebViewCommActivity.java

@@ -464,7 +464,6 @@ public class WebViewCommActivity extends BaseActivity implements View.OnClickLis
         }
         if (isStartApp) {
             Intent intent = new Intent(WebViewCommActivity.this, MainActivity.class);
-           
             startActivity(intent);
             overridePendingTransition(0,0);
         } else {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/form/DataFormDetailActivity.java

@@ -1037,6 +1037,8 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                         if (StringUtils.isEmpty(itemValue.getGroup())) {
                             header.setVisibility(View.GONE);
                         } else {
+                            header.setVisibility(View.GONE);
+                            LogUtil.d("MainActivity:"+itemValue.getGroup());
                             if (itemValue.getGroup().contains("明细") && !itemValue.getGroup().equals("明细项1")) {
                                 item_add.setVisibility(View.VISIBLE);
                             } else {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/me/FeedbackActivity.java

@@ -17,14 +17,22 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
+import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.android.volley.Response;
 import com.android.volley.VolleyError;
+import com.lidroid.xutils.HttpUtils;
+import com.lidroid.xutils.exception.HttpException;
+import com.lidroid.xutils.http.RequestParams;
+import com.lidroid.xutils.http.ResponseInfo;
+import com.lidroid.xutils.http.callback.RequestCallBack;
+import com.lidroid.xutils.http.client.HttpRequest;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.xzjmyk.pm.activity.AppConstant;
 import com.xzjmyk.pm.activity.MyApplication;
@@ -38,6 +46,9 @@ import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
+import com.xzjmyk.pm.activity.ui.erp.util.JsonValidator;
+import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
+import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.tool.MultiImagePreviewActivity;
 import com.xzjmyk.pm.activity.util.CameraUtil;
@@ -60,10 +71,13 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * @desc:用户反馈界面
  * @author：Arison on 2016/9/27
+ * update : FANGlh on 2017-5-23 关于问题反馈上传文字新增字段，发送图片及更新更新附件ID接口
  */
 public class FeedbackActivity extends BaseActivity implements View.OnClickListener {
     private static final int REQUEST_CODE_CAPTURE_PHOTO = 1;// 拍照
@@ -77,6 +91,7 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
     private ArrayList<String> mPhotoList;
     private GridViewAdapter mAdapter;
     private String mImageData;
+    private String cb_emcode;
 
     //添加位置和查阅人员选择
     private TextView location_tv, display_tv;
@@ -84,22 +99,58 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
 
     private int mType;
     private final int http_commit = 0;
+    private final int send_picture_request = 3;
+    private int sended_p = 0;
+    private final int common_id_request = 4;
+    private final int update_ID = 5;
 
     private Handler mHandler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
             switch (msg.what) {
                 case http_commit:
-                    Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
-                    progressDialog.dismiss();
-                    Toast.makeText(getApplicationContext(), getString(R.string.ask_submit_success), Toast.LENGTH_LONG);
-                    finish();
+                    if (msg.getData() != null){
+                        String word_result = msg.getData().getString("result");
+                        Log.i(word_result, msg.getData().getString("result"));
+                        try {
+                            if (JSON.parseObject(word_result).containsKey("success")
+                                    && JSON.parseObject(word_result).getBoolean("success")) {
+                                sendPicture();
+                            }
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+                    }
                     break;
                 case Constants.HTTP_SUCCESS_INIT:
                     Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
                     cb_code = JSON.parseObject(msg.getData().getString("result")).getString("code");
                     progressDialog.dismiss();
                     break;
+                case  common_id_request:
+                    if (msg.getData() != null){
+                        String resultStr = msg.getData().getString("result");
+                        JSONObject resultJsonObject = JSON.parseObject(resultStr);
+                        cb_id = resultJsonObject.getInteger("id");
+                        Log.i("resultStr",resultStr+"");
+                    }
+                    break;
+
+                case update_ID:
+                    if (msg.getData() != null){
+                        String updateID_result = msg.getData().getString("result");
+                        Log.i("updateID_result", updateID_result);
+                        progressDialog.dismiss();
+                        release_btn.setEnabled(true);
+                        Toast.makeText(ct,getString(R.string.fangkui_success),Toast.LENGTH_LONG).show();
+                       new Handler().postDelayed(new Runnable() {
+                           @Override
+                           public void run() {
+                               finish();
+                           }
+                       },1000);
+                    }
+                    break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
                     ToastMessage(msg.getData().getString("result"));
@@ -108,7 +159,29 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
             }
         }
     };
+    private Button release_btn;
+
+    private void doUpdateId(String update) {
+        String url = "http://218.18.115.198:8888/ERP/common/attach/change.action";
+        Map<String,Object> params = new HashMap<>();
+        params.put("caller","Commentsback_mobile");
+        params.put("table","Commentsback_mobile");
+        params.put("update","cb_attch = '"+update+"'");
+        params.put("condition","cb_id = '"+cb_id+"'");
+        params.put("type","添加附件");
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        if (platform){
+            headers.put("Cookie", "JSESSIONID=" + ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getCookie());
+        }else {
+            headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        }
+        ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, update_ID, null, null, "post");
+    }
+
+
     private Boolean platform;
+    private int cb_id;
+    private String update = "";
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -127,6 +200,7 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
     private void initView() {
         location_tv = (TextView) findViewById(R.id.location_tv);
         display_tv = (TextView) findViewById(R.id.display_tv);
+        release_btn = (Button) findViewById(R.id.release_btn);
         findViewById(R.id.release_btn).setOnClickListener(this);
         //findViewById(R.id.location_rl).setOnClickListener(this);
         findViewById(R.id.display_rl).setOnClickListener(this);
@@ -134,7 +208,7 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
         if (mType == 0) {
             getSupportActionBar().setTitle(getString(R.string.send_words));
         } else {
-            getSupportActionBar().setTitle(getString(R.string.set_suggest));
+            getSupportActionBar().setTitle(getString(R.string.Rated_suggest));
         }
         mTextEdit = (EditText) findViewById(R.id.text_edit);
         mSelectImagePromptTv = (TextView) findViewById(R.id.select_img_prompt_tv);
@@ -168,7 +242,14 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
             getCode();
         }
 
+        getCommonId();
+    }
+
+    private void getCommonId() {
+        CommonUtil.getCommonId(ct, "Commentsback_mobile_SEQ", mHandler, common_id_request);
+        cb_emcode = CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_username");;
     }
+
     private void getCode() {
         String url = Constants.getAppBaseUrl(ct) + "common/getCodeString.action";
         Map<String, Object> params = new HashMap<>();
@@ -350,7 +431,13 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
                 ToastMessage("该功能还未完善");
                 break;
             case R.id.release_btn:
-                commit();
+                release_btn.setEnabled(false);
+                if (!platform){
+                    sendWord();
+                }else {
+                    sendPlatWord();
+                }
+                LogUtil.prinlnLongMsg("mPhotoList", JSON.toJSONString(mPhotoList) + "hi");
                /* if (mPhotoList.size() <= 0 && TextUtils.isEmpty(mTextEdit.getText().toString())) {// 没有照片，也没有说说，直接返回
                     return;
                 }
@@ -365,6 +452,37 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
 
     }
 
+    private void sendPlatWord() {
+        if (!StringUtils.isEmpty(mTextEdit.getText().toString())) {
+            String url = "http://218.18.115.198:8888/ERP/mobile/Commentsback_mobile.action";
+            String emname = CommonUtil.getSharedPreferences(ct, "erp_emname");
+            if (StringUtils.isEmpty(emname)) {
+                emname = MyApplication.getInstance().mLoginUser.getNickName().trim();
+            }
+            String formStore = "{\n" +
+                    " \"cb_id\":\"" + cb_id + "\",\n" +
+                    " \"cb_emcode\":\"" + cb_emcode + "\",\n" +
+                    " \"cb_code\":\"" + CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "b2b_uu") + "\",\n" +
+                    " \"cb_company\":\"" + CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "companyName") + "\",\n" +
+                    " \"cb_whichsys\":\"" + "USOFTSYS" + "\",\n" +
+                    " \"cb_kind\":\"问题\",\n" +
+                    " \"cb_text\":\"" + mTextEdit.getText().toString() + "\",\n" +
+                    " \"cb_date\":\"" + DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd HH:mm:ss") + "\",\n" +
+                    " \"cb_person\":\"" + emname + "\",\n" +
+                    " \"cb_tel\":\"" + MyApplication.getInstance().mLoginUser.getTelephone() + "\",\n" +
+                    "}\n";
+            Map<String, Object> params = new HashMap<>();
+            params.put("formStore", formStore);
+            params.put("master", "USOFTSYS");
+            params.put("caller", "Commentsback_mobile");
+            LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+            headers.put("Cookie", "JSESSIONID=" + ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getCookie());
+            ViewUtil.httpSendRequest(mContext, url, params, mHandler, headers, http_commit, null, null, "post");
+        } else {
+            ToastMessage(getString(R.string.suggest_hink));
+        }
+    }
+
     private class UploadPhpto extends AsyncTask<Void, Integer, Integer> {
         @Override
         protected void onPreExecute() {
@@ -422,7 +540,7 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
                 startActivity(new Intent(ct, LoginActivity.class));
             } else if (result == 2) {
                 ProgressDialogUtil.dismiss(mProgressDialog);
-                ToastUtil.showToast(ct, getString(R.string.upload_failed));
+                ToastUtil.showToast(ct, getString(R.string.qzone_upload_failed));
             } else {
                 sendShuoshuo();
             }
@@ -487,7 +605,7 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
                 ImageView iconImageView = (ImageView) view.findViewById(R.id.icon_image_view);
                 TextView voiceTextTv = (TextView) view.findViewById(R.id.text_tv);
                 iconImageView.setBackgroundResource(R.drawable.add_picture);
-                voiceTextTv.setText(R.string.circle_add_image);
+                voiceTextTv.setText(R.string.qzone_add_picture);
                 return view;
             }
         }
@@ -497,7 +615,7 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
 
     String cb_code;
 
-    private void commit() {
+    private void sendWord() {
         if (!StringUtils.isEmpty(mTextEdit.getText().toString())) {
             String url = "http://218.18.115.198:8888/ERP/mobile/Commentsback_mobile.action";
             String emname = CommonUtil.getSharedPreferences(ct, "erp_emname");
@@ -505,6 +623,8 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
                 emname = MyApplication.getInstance().mLoginUser.getNickName().trim();
             }
             String formStore = "{\n" +
+                    " \"cb_id\":\"" + cb_id + "\",\n" +
+                    " \"cb_emcode\":\"" + cb_emcode + "\",\n" +
                     " \"cb_code\":\"" + cb_code + "\",\n" +
                     " \"cb_company\":\"" + CommonUtil.getSharedPreferences(ct, "erp_commpany") + "\",\n" +
                     " \"cb_whichsys\":\"" + CommonUtil.getSharedPreferences(ct, "erp_master") + "\",\n" +
@@ -522,7 +642,94 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
             headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
             ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, http_commit, null, null, "post");
         } else {
-            ToastMessage("请输入您的问题！");
+            ToastMessage(getString(R.string.suggest_hink));
+        }
+    }
+
+    private void sendPicture() {
+        if (ListUtils.isEmpty(mPhotoList))  return;
+        for (int i = 0; i < mPhotoList.size(); i++) {
+            String path = mPhotoList.get(i);
+            sendPictureRequest(path);
+        }
+    }
+
+   /* private void sendPictureRequest(String path) {
+        if (StringUtils.isEmpty(path)) return;
+        String url = "http://218.18.115.198:8888/ERP/mobile/uploadEmployeeAttach.action";
+        Map<String,Object> params = new HashMap<>();
+        params.put("emcode", cb_emcode);
+        params.put("type", "common");
+        params.put("img", path);
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, send_picture_request, null, null, "post");
+    }*/
+
+    private void sendPictureRequest(String path) {
+        if (StringUtils.isEmpty(path)) return;
+        File waterBitmapToFile=  new File(path);
+        if (!waterBitmapToFile.isFile())return;
+        RequestParams params = new RequestParams();
+        if (platform){
+            params.addQueryStringParameter("master", CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "companyEnUu"));
+            params.addHeader("Cookie", "JSESSIONID=" + ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getCookie());
+            params.addBodyParameter("em_code", CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "b2b_uu"));
+
+        }else {
+            params.addQueryStringParameter("master", CommonUtil.getSharedPreferences(ct, "erp_master"));
+            params.addHeader("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+            params.addBodyParameter("em_code", CommonUtil.getSharedPreferences(ct, "erp_username"));
+        }
+        params.addBodyParameter("type", "common");
+        params.addBodyParameter("img", waterBitmapToFile);
+        String url = Constants.getAppBaseUrl(ct) + "mobile/uploadEmployeeAttach.action";
+        final HttpUtils http = new HttpUtils();
+        http.send(HttpRequest.HttpMethod.POST, url, params, new RequestCallBack<String>() {
+            @Override
+            public void onStart() {
+                progressDialog.show();
+                ViewUtil.ToastMessage(ct, "正在上传图片...");
+            }
+
+            @Override
+            public void onLoading(long total, long current, boolean isUploading) {
+                if (isUploading) {
+                } else {
+                }
+            }
+
+            @Override
+            public void onSuccess(ResponseInfo<String> responseInfo) {
+                ViewUtil.ToastMessage(ct, getString(R.string.Uploaded_successfully));
+                JsonValidator validator = new JsonValidator();
+                if (validator.validate(responseInfo.result) && JSON.parseObject(responseInfo.result).getBoolean("success")) {
+                    sended_p ++;
+                    update = update + getID(JSON.parseObject(responseInfo.result).getString("id"))+";";
+                    Log.i("update_cb_attch",update+"");
+                    if (sended_p == mPhotoList.size()){
+                        //TODO 更新附件ID接口
+                        doUpdateId(update);
+                    }
+                }
+            }
+
+
+            @Override
+            public void onFailure(HttpException error, String msg) {
+                ViewUtil.ToastMessage(ct, getString(R.string.common_save_failed) + msg);
+                progressDialog.dismiss();
+            }
+        });
+    }
+
+    private int getID(String chche) {
+        if (StringUtils.isEmpty(chche)) return 0;
+        Pattern p = Pattern.compile("(\\d+)");
+        Matcher m = p.matcher(chche);
+        if (m.find()) {
+            return Integer.parseInt(m.group(0));
         }
+        return -1;
     }
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/OutSigninOKActivity.java

@@ -246,9 +246,10 @@ public class OutSigninOKActivity extends BaseActivity {
     private boolean isTask = false;
 
     private void uploadFile(String path) {
-        if (StringUtils.isEmpty(path)) return;
-        /*File waterBitmapToFile = ImageUtil.compressWaterBitmapToFile(path, 100, 300, 300
-                , time_tv.getText().toString().trim(), addr_tv.getText().toString().trim(), 0);*/
+        waterBitmapToFile=  new File(path);
+//        if (StringUtils.isEmpty(path)) return;
+//        File waterBitmapToFile = ImageUtil.compressWaterBitmapToFile(path, 100, 300, 300
+//                , time_tv.getText().toString().trim(), addr_tv.getText().toString().trim(), 0);
         if (!waterBitmapToFile.isFile()) return;
         RequestParams params = new RequestParams();
         params.addQueryStringParameter("master", CommonUtil.getSharedPreferences(ct, "erp_master"));

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/setting/SelectLanguageActivity.java

@@ -49,7 +49,7 @@ public class SelectLanguageActivity extends BaseActivity {
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.main_btn_submit, menu);
-        menu.findItem(R.id.btn_save).setTitle("保存");
+        menu.findItem(R.id.btn_save).setTitle(getString(R.string.common_save_button));
         return true;
     }
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/CommonUtil.java

@@ -981,7 +981,7 @@ public class CommonUtil {
     }
 
     public static void getCommonId(Context ct, String seq, Handler mHandler, int codeWhat) {
-        String url = Constants.getAppBaseUrl(ct) + "/common/getId.action";
+        String url = "http://218.18.115.198:8888/ERP/common/getId.action";
         final Map<String, Object> param = new HashMap<>();
         param.put("seq", seq);
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/OfficeAddressSettingsActivity.java

@@ -645,7 +645,7 @@ public class OfficeAddressSettingsActivity extends BaseActivity {
         popupWindow.setTouchable(true);
         popupWindow.setOutsideTouchable(false);
         // 如果不设置PopupWindow的背景，无论是点击外部区域还是Back键都无法dismiss弹框
-        popupWindow.setBackgroundDrawable(getResources().getDrawable(R.drawable.bg_main));
+        popupWindow.setBackgroundDrawable(getResources().getDrawable(R.drawable.pop_round_bg));
         // 设置好参数之后再show
         popupWindow.showAtLocation(contentView, Gravity.CENTER, 0, 0);
         setbg(0.4f);

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

@@ -307,7 +307,7 @@
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
                     android:gravity="center"
-                    android:text="@string/set_suggest"
+                    android:text="@string/Rated_suggest"
                     android:textColor="@color/black"
                     android:textSize="14sp" />
 

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

@@ -39,7 +39,7 @@
                     android:layout_centerVertical="true"
                     android:layout_toLeftOf="@+id/phone_number_tv"
                     android:textColor="@color/text_main"
-                    android:textSize="@dimen/text_main" />
+                    android:textSize="16dp" />
 
                 <ImageView
                     android:id="@id/tag"
@@ -205,7 +205,7 @@
                 android:gravity="center"
                 android:text="@string/user_firend_cirle"
                 android:textColor="@color/text_main"
-                android:textSize="14sp" />
+                android:textSize="16sp" />
 
             <ImageView
                 android:id="@+id/iv_remain"
@@ -256,7 +256,7 @@
                 android:gravity="center"
                 android:text="@string/user_company"
                 android:textColor="@color/text_main"
-                android:textSize="@dimen/text_main" />
+                android:textSize="16sp" />
 
             <TextView
                 android:id="@+id/company_tv"
@@ -299,7 +299,7 @@
                 android:gravity="center"
                 android:text="@string/user_account"
                 android:textColor="@color/text_main"
-                android:textSize="@dimen/text_main" />
+                android:textSize="16sp" />
 
             <TextView
                 android:id="@+id/master_tv"

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

@@ -26,7 +26,7 @@
             android:hint="@string/common_search"
             android:textColor="@color/dark_grey"
             android:textColorHint="@color/grey"
-            android:textSize="15sp" />
+            android:textSize="@dimen/text_main" />
 
         <ImageView
             android:id="@+id/voice_search_iv"

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

@@ -57,7 +57,7 @@
                 android:gravity="center"
                 android:text="@string/work_customer"
                 android:textColor="@color/text_main"
-                android:textSize="14sp" />
+                android:textSize="16sp" />
 
             <ImageView
                 android:layout_width="@dimen/next_width"
@@ -118,7 +118,7 @@
                 android:gravity="center"
                 android:text="@string/work_oa"
                 android:textColor="@color/text_main"
-                android:textSize="14sp" />
+                android:textSize="16sp" />
 
             <ImageView
                 android:id="@+id/oa_next"
@@ -226,7 +226,7 @@
                 android:gravity="center"
                 android:text="@string/work_business_manage"
                 android:textColor="@color/text_main"
-                android:textSize="14sp"
+                android:textSize="16sp"
                 android:id="@+id/textView2" />
 
             <ImageView
@@ -259,7 +259,7 @@
                 android:gravity="center"
                 android:text="@string/work_business_mall"
                 android:textColor="@color/text_main"
-                android:textSize="14sp" />
+                android:textSize="16sp" />
 
             <ImageView
                 android:layout_width="@dimen/next_width"

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

@@ -26,7 +26,7 @@
             android:hint="@string/search"
             android:textColor="@color/dark_grey"
             android:textColorHint="@color/grey"
-            android:textSize="15sp" />
+            android:textSize="16sp" />
 
         <ImageView
             android:id="@+id/voice_search_iv"
@@ -55,7 +55,8 @@
             android:layout_weight="1"
             android:drawableTop="@drawable/qiyetongxunlu"
             android:gravity="center"
-            android:text="@string/contact_company" />
+            android:text="@string/contact_company"
+            android:textSize="16sp"/>
 
         <TextView
             android:id="@+id/group"
@@ -64,6 +65,7 @@
             android:layout_weight="1"
             android:drawableTop="@drawable/qunliao"
             android:gravity="center"
+            android:textSize="16sp"
             android:text="@string/contact_business" />
 
         <TextView
@@ -73,7 +75,8 @@
             android:layout_weight="1"
             android:drawableTop="@drawable/uuhaoyou"
             android:gravity="center"
-            android:text="@string/contact_friend" />
+            android:text="@string/contact_friend"
+            android:textSize="16sp"/>
 
         <TextView
             android:id="@+id/peculiar_tv"
@@ -82,7 +85,8 @@
             android:layout_weight="1"
             android:drawableTop="@drawable/guanzhu"
             android:gravity="center"
-            android:text="@string/contact_often" />
+            android:text="@string/contact_often"
+            android:textSize="16sp"/>
     </LinearLayout>
 
     <View

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

@@ -11,7 +11,7 @@
         android:minHeight="45dp"
         android:layout_weight="2"
         android:gravity="center"
-        android:text="为UU评分"
+        android:text="@string/Rated_UU"
         android:textColor="@color/black"
         android:textSize="15sp"/>
     <TextView
@@ -20,7 +20,7 @@
         android:layout_weight="3"
         android:minHeight="70dp"
         android:gravity="center"
-        android:text="请您为UU评一个分数吧，只需要花费您很少的时间，感谢您的支持!"
+        android:text="@string/Rated_notice1"
         android:textColor="@color/black"
         android:textSize="15sp"
         android:paddingBottom="5dp"
@@ -37,7 +37,7 @@
         android:layout_weight="2"
         android:gravity="center"
         android:minHeight="45dp"
-        android:text="现在去评分"
+        android:text="@string/Rated_now"
         android:textColor="@color/blue"
         android:textSize="15sp"/>
     <View
@@ -50,7 +50,7 @@
         android:layout_height="0dp"
         android:layout_weight="2"
         android:gravity="center"
-        android:text="建议反馈"
+        android:text="@string/Rated_suggest"
         android:minHeight="45dp"
         android:textColor="@color/blue"
         android:textSize="15sp"/>
@@ -66,7 +66,7 @@
         android:layout_weight="2"
         android:gravity="center"
         android:textColor="@color/blue"
-        android:text="下次再说"
+        android:text="@string/Rated_next"
         android:minHeight="45dp"
         android:textSize="15sp"/>
 

WeiChat/src/main/res/values-en/strings.xml

@@ -1099,6 +1099,17 @@
     <string name="describe">Description</string>
 
     <!--翻译补漏-->
+    <string name="language_sys">Follow the system</string>
+    <string name="language_rCN">Simplified Chinese</string>
+    <string name="language_rTW">Traditional Chinese</string>
+    <string name="language_en">English(UK)</string>
+    <string name="Rated_UU">Rated UU</string>
+    <string name="Rated_notice1">Please give you a score for UU, you only need to spend your little time, thank you for your support!</string>
+    <string name="Rated_now">Now to score</string>
+    <string name="Rated_suggest">Feedback</string>
+    <string name="Rated_next">Next time</string>
+    <string name="fangkui_success">Submitted success, we will be the first time to view your question, thank you for your cooperation!</string>
+    <string name="Uploaded_successfully">Uploaded successfully</string>
     <string name="language_sys">跟随系统</string>
     <string name="language_rCN">简体中文</string>
     <string name="language_rTW">繁体中文</string>

WeiChat/src/main/res/values-zh-rCN/strings.xml

@@ -183,7 +183,7 @@
     <string name="add_office_address">添加办公地址</string>
     <string name="select_range">选择范围</string>
     <string name="edit_office_address_name">完善办公地址名称</string>
-    <string name="detail_address">详细地址：</string>
+    <string name="detail_address">详细地址</string>
     <string name="delete_address_notice1">确认删除该条办公地址？</string>
     <!-- end 办公地址设置 -->
 
@@ -1224,4 +1224,12 @@
     <string name="language_rCN">简体中文</string>
     <string name="language_rTW">繁体中文</string>
     <string name="language_en">英文</string>
+
+    <string name="Rated_UU">为UU评分</string>
+    <string name="Rated_notice1">请您为UU评一个分数吧，只需要花费您很少的时间，感谢您的支持!</string>
+    <string name="Rated_now">现在去评分</string>
+    <string name="Rated_suggest">问题反馈</string>
+    <string name="Rated_next">以后再说</string>
+    <string name="fangkui_success">提交成功,我们会在第一时间查看您的问题,谢谢您的配合！</string>
+    <string name="Uploaded_successfully">上传成功</string>
 </resources>

WeiChat/src/main/res/values-zh-rTW/strings.xml

@@ -1215,4 +1215,12 @@
     <string name="update_business">修改商機</string>
     <string name="search_select_hint">蒐索項目、品牌、物料、型號等</string>
     <string name="not_search_message">沒有符合條件的結果</string>
+
+    <string name="Rated_UU">為UU評分</string>
+    <string name="Rated_notice1">請您為UU評一個分數吧，只需要花費您很少的時間，感謝您的支持!</string>
+    <string name="Rated_now">現在去評分</string>
+    <string name="Rated_suggest">問題反饋</string>
+    <string name="Rated_next">下次再​​說</string>
+    <string name="fangkui_success">提交成功,我們會在第一時間查看您的問題,謝謝您的配合！</string>
+    <string name="Uploaded_successfully">上傳成功</string>
 </resources>

WeiChat/src/main/res/values/dimens.xml

@@ -26,7 +26,7 @@
     <dimen name="line_big">7.0dip</dimen>
     <dimen name="line_min">2.0dip</dimen>
     <dimen name="next_height">15.0dip</dimen>
-    <dimen name="text_main">17.0sp</dimen>
+    <dimen name="text_main">16.0sp</dimen>
     <dimen name="text_hine">14.0sp</dimen>
     <dimen name="text_min">12.0sp</dimen>
     <dimen name="item_height_edit">100.0dip</dimen>

WeiChat/src/main/res/values/strings.xml

@@ -1228,7 +1228,7 @@
     <string name="set_push">允许推送</string>
     <string name="set_clear">清除缓存</string>
     <string name="set_sigin">打卡设置</string>
-    <string name="set_suggest">用户反馈</string>
+    <string name="set_suggest">问题反馈</string>
     <string name="set_about">关于UU互联</string>
     <string name="set_version">当前版本</string>
     <string name="set_login_out">退出登录</string>
@@ -1568,4 +1568,12 @@
     <string name="delete_business_ok">删除商机成功</string>
     <string name="input_visit_remark">输入拜访目的</string>
     <string name="input_contact">输入联系人</string>
+
+    <string name="Rated_UU">为UU评分</string>
+    <string name="Rated_notice1">请您为UU评一个分数吧，只需要花费您很少的时间，感谢您的支持!</string>
+    <string name="Rated_now">现在去评分</string>
+    <string name="Rated_suggest">问题反馈</string>
+    <string name="Rated_next">下次再说</string>
+    <string name="fangkui_success">"提交成功,我们会在第一时间查看您的问题,谢谢您的配合！</string>
+    <string name="Uploaded_successfully">上传成功</string>
 </resources>