合并冲突代码

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/base/BaseActivity.java

@@ -180,10 +180,7 @@ public abstract class BaseActivity extends ActionBackActivity {
     }
 
 
-    /**
-     * @author LiuJie
-     * @功能:ToastMessage
-     */
+
     public void ToastMessage(String message) {
         ViewUtil.ToastMessage(this, message);
     }

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

@@ -144,8 +144,7 @@ public class ProcessB2BActivity extends BaseActivity implements View.OnClickList
                     break;
                 case SUSSCESS_already:
                     itemArray = JSON.parseObject(result).getJSONArray("data");
-                    if (page == 1)
-                        arrayRe.clear();
+                    if (pageDone == 1) arrayRe.clear();
                     arrayRe.addAll(itemArray);
                     if (mAdapter == null) {
                         mAdapter = new ProcessAdapter(ct, arrayRe);
@@ -442,7 +441,7 @@ public class ProcessB2BActivity extends BaseActivity implements View.OnClickList
                 tv_process_un.setSelected(true);
                 tv_process_already.setSelected(false);
                 tv_process_me.setSelected(false);
-                mList.setMode(PullToRefreshBase.Mode.PULL_FROM_START);
+                mList.setMode(PullToRefreshBase.Mode.BOTH);
                 loadProcessToDo(page);
 
                 break;
@@ -488,13 +487,13 @@ public class ProcessB2BActivity extends BaseActivity implements View.OnClickList
     }
 
 
-    private void loadProcesstoAlreadyDo(int page) {
+    private void loadProcesstoAlreadyDo(int pageDone) {
         String url = ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getAuditDone;
         Map<String, Object> params = new HashMap<>();
         params.put("emuu", CommonUtil.getSharedPreferences(MyApplication.getInstance(), "b2b_uu"));
         params.put("enuu", CommonUtil.getSharedPreferences(MyApplication.getInstance(), "companyEnUu"));
         params.put("count", "1000");
-        params.put("page", page);
+        params.put("page", pageDone);
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getCookie());
         ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, SUSSCESS_already, null, null, "get");

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

@@ -22,6 +22,7 @@ import com.alibaba.fastjson.JSON;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.adapter.DailyDetailsApprovalFlowAdapter;
 import com.xzjmyk.pm.activity.bean.oa.CommonApprovalFlowBean;
+import com.xzjmyk.pm.activity.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
 import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
@@ -31,6 +32,7 @@ import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 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.erp.view.CustomerScrollView;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 import com.xzjmyk.pm.activity.view.MyListView;
 
@@ -98,6 +100,138 @@ public class DailydetailsActivity extends BaseActivity {
     private String undotask;
     private WebSettings undo_settings;
     private View hide_above_af;
+    private ImageView photo_im;
+    private TextView name_tv;
+    private TextView section_tv;
+    private CustomerScrollView csv_hide;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        progressDialog.show();
+        initView();
+        initData();
+        initClickEvent();
+    }
+
+    private void initClickEvent() {
+
+        resubmit_ll.setOnClickListener(new View.OnClickListener() { //TODO 重新提交
+            @Override
+            public void onClick(View v) {
+
+                if (!TextUtils.isEmpty(submittype) && submittype.equals("unsubmit")){//未提交状态
+                    startActivity(new Intent(activity, WorkDailyAddActivity.class)
+                            .putExtra("caller", mCaller)
+                            .putExtra("id", mkeyValue)
+                            .putExtra("rs_summary", summary)
+                            .putExtra("rs_plan", plan)
+                            .putExtra("rs_experience", experience)
+                            .putExtra("resubmit", "resubmit"));
+                    Log.i("dosubmit_id", mkeyValue + "");
+                    finish();
+                }else {                                                             //提交状态
+                    new AlertDialog
+                            .Builder(mContext)
+                            .setTitle("温馨提示")
+                            .setMessage("\t\t确认反提交该条单据？")
+                            .setNegativeButton("取消",null)
+                            .setPositiveButton("确认", new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialog, int which) {
+                                    String retype = "reforsub";
+                                    doresubmit(retype);
+                                }
+                            }).show();
+                }
+
+            }
+        });
+
+        delete_ll.setOnClickListener(new View.OnClickListener() {  //TODO 删除
+            @Override
+            public void onClick(View v) {
+                if (!TextUtils.isEmpty(submittype) && submittype.equals("unsubmit")){
+                    new AlertDialog
+                            .Builder(mContext)
+                            .setTitle("温馨提示")
+                            .setMessage("\t\t确认删除该条已保存单据?")
+                            .setNegativeButton("取消", null)
+                            .setPositiveButton("确认", new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialog, int which) {
+                                    dodelete(mCaller, mkeyValue);
+                                }
+                            }).show();
+
+                }else {
+                    new AlertDialog
+                            .Builder(mContext)
+                            .setTitle("温馨提示")
+                            .setMessage("\t\t确认删除该条已提交单据?")
+                            .setNegativeButton("取消", null)
+                            .setPositiveButton("确认", new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialog, int which) {
+                                    String retype = "refordelete";
+                                    doresubmit(retype);
+                                }
+                            }).show();
+                }
+
+            }
+        });
+    }
+
+
+    public void initView() {
+
+        setContentView(R.layout.activity_workdaily_detail);
+        getSupportActionBar().setTitle("日报详情");
+
+        csv_hide = (CustomerScrollView) findViewById(R.id.csv_hide);
+        photo_im = (ImageView) findViewById(R.id.common_docui_photo_img);
+        name_tv = (TextView) findViewById(R.id.common_docui_name_tv);
+        section_tv = (TextView) findViewById(R.id.common_docui_Section_tv);
+        wdd_data = (TextView) findViewById(R.id.work_daily_detail_time_tv);
+        wdd_summary = (TextView) findViewById(R.id.work_daily_detail_summary_tv);
+        wdd_plan = (TextView) findViewById(R.id.work_daily_detail_plan_tv);
+        wdd_experience = (TextView) findViewById(R.id.work_daily_detail_experience_tv);
+        wdd_status = (TextView) findViewById(R.id.work_daily_detail_status_tv);
+        plan_ll = (LinearLayout) findViewById(R.id.work_daily_detail_plan_ll);
+        experience_ll = (LinearLayout) findViewById(R.id.work_daily_detail_experience_ll);
+        approval_flowlv = (MyListView) findViewById(R.id.work_daily_detail_approval_flow_lv);
+        unsubmit_iv = (ImageView) findViewById(R.id.work_daily_unsubmit_iv);
+        resanddel_ll = (LinearLayout) findViewById(R.id.item_common_docui_res_and_del_ll);
+        resubmit_ll = (LinearLayout) findViewById(R.id.common_docui_resubmit_ll);
+        delete_ll = (LinearLayout) findViewById(R.id.common_docui_delete_ll);
+        resubmit_tv = (TextView) findViewById(R.id.common_docui_resubmit_tv);
+        done_task_ll = (LinearLayout) findViewById(R.id.work_daily_detail_donetask_ll);
+        donetask_wv = (WebView) findViewById(R.id.donetask_wv);
+        undo_task_ll = (LinearLayout) findViewById(R.id.work_daily_detail_undotask_ll);
+        undotask_wv = (WebView) findViewById(R.id.undotask_wv);
+        hide_above_af = findViewById(R.id.hide_above_af);
+
+        done_settings = donetask_wv.getSettings();
+        done_settings.setSupportZoom(true);
+        done_settings.setTextSize(WebSettings.TextSize.SMALLER);//已完成任务设置web字体大小
+
+        undo_settings = undotask_wv.getSettings();
+        undo_settings.setSupportZoom(true);
+        undo_settings.setTextSize(WebSettings.TextSize.SMALLER); //未完成任务设置web字体大小
+
+        mEmptyLayput_approvalflow = new EmptyLayout(this, approval_flowlv);
+        mEmptyLayput_approvalflow.setShowEmptyButton(false);
+        mEmptyLayput_approvalflow.setShowErrorButton(false);
+        mEmptyLayput_approvalflow.setShowLoadingButton(false);
+        //加载审批流的适配器
+        mCommonApprovalFlowBean = new CommonApprovalFlowBean();
+        mDailyDetailsApprovalFlowAdapter = new DailyDetailsApprovalFlowAdapter(this);
+
+        manager = new DBManager(this);
+        im_ids =new ArrayList<>();
+        afpeople_names = new ArrayList<>();
+    }
     private Handler handler = new Handler(){
         @Override
         public void handleMessage(Message msg) {
@@ -176,7 +310,7 @@ public class DailydetailsActivity extends BaseActivity {
                     break;
 
 
-                default:
+               case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     if (msg.getData() != null) {
                         if (!StringUtils.isEmpty(msg.getData().getString("result"))) {
                             ToastMessage(msg.getData().getString("result"));
@@ -201,6 +335,7 @@ public class DailydetailsActivity extends BaseActivity {
                 hide_above_af.setVisibility(View.GONE);
             }else{
                 mCommonApprovalFlowBean = JSON.parseObject(resultJsonObject.toString(), CommonApprovalFlowBean.class);
+                getapplypeomsg(mCommonApprovalFlowBean);
                 em_code = new String();
                 if (manager == null) manager = new DBManager(mContext);
                 if("已审核".equals(wd_status) && (mCommonApprovalFlowBean.getData().size() == 0 ||
@@ -394,126 +529,46 @@ public class DailydetailsActivity extends BaseActivity {
         progressDialog.dismiss();
     }
 
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        progressDialog.show();
-        initView();
-        initData();
-    }
-
-
-    public void initView() {
-
-        setContentView(R.layout.activity_workdaily_detail);
-        getSupportActionBar().setTitle("日报详情");
-
-        wdd_data = (TextView) findViewById(R.id.work_daily_detail_time_tv);
-        wdd_summary = (TextView) findViewById(R.id.work_daily_detail_summary_tv);
-        wdd_plan = (TextView) findViewById(R.id.work_daily_detail_plan_tv);
-        wdd_experience = (TextView) findViewById(R.id.work_daily_detail_experience_tv);
-        wdd_status = (TextView) findViewById(R.id.work_daily_detail_status_tv);
-        plan_ll = (LinearLayout) findViewById(R.id.work_daily_detail_plan_ll);
-        experience_ll = (LinearLayout) findViewById(R.id.work_daily_detail_experience_ll);
-        approval_flowlv = (MyListView) findViewById(R.id.work_daily_detail_approval_flow_lv);
-        unsubmit_iv = (ImageView) findViewById(R.id.work_daily_unsubmit_iv);
-        resanddel_ll = (LinearLayout) findViewById(R.id.item_common_docui_res_and_del_ll);
-        resubmit_ll = (LinearLayout) findViewById(R.id.common_docui_resubmit_ll);
-        delete_ll = (LinearLayout) findViewById(R.id.common_docui_delete_ll);
-        resubmit_tv = (TextView) findViewById(R.id.common_docui_resubmit_tv);
-        done_task_ll = (LinearLayout) findViewById(R.id.work_daily_detail_donetask_ll);
-        donetask_wv = (WebView) findViewById(R.id.donetask_wv);
-        undo_task_ll = (LinearLayout) findViewById(R.id.work_daily_detail_undotask_ll);
-        undotask_wv = (WebView) findViewById(R.id.undotask_wv);
-        hide_above_af = findViewById(R.id.hide_above_af);
-
-        done_settings = donetask_wv.getSettings();
-        done_settings.setSupportZoom(true);
-        done_settings.setTextSize(WebSettings.TextSize.SMALLER);//已完成任务设置web字体大小
-
-        undo_settings = undotask_wv.getSettings();
-        undo_settings.setSupportZoom(true);
-        undo_settings.setTextSize(WebSettings.TextSize.SMALLER); //未完成任务设置web字体大小
-
-        mEmptyLayput_approvalflow = new EmptyLayout(this, approval_flowlv);
-        mEmptyLayput_approvalflow.setShowEmptyButton(false);
-        mEmptyLayput_approvalflow.setShowErrorButton(false);
-        mEmptyLayput_approvalflow.setShowLoadingButton(false);
-        //加载审批流的适配器
-        mCommonApprovalFlowBean = new CommonApprovalFlowBean();
-        mDailyDetailsApprovalFlowAdapter = new DailyDetailsApprovalFlowAdapter(this);
-
-        manager = new DBManager(this);
-        im_ids =new ArrayList<>();
-        afpeople_names = new ArrayList<>();
-
-        resubmit_ll.setOnClickListener(new View.OnClickListener() { //TODO 重新提交
-            @Override
-            public void onClick(View v) {
-
-                if (!TextUtils.isEmpty(submittype) && submittype.equals("unsubmit")){//未提交状态
-                    startActivity(new Intent(activity, WorkDailyAddActivity.class)
-                            .putExtra("caller", mCaller)
-                            .putExtra("id", mkeyValue)
-                            .putExtra("rs_summary", summary)
-                            .putExtra("rs_plan", plan)
-                            .putExtra("rs_experience", experience)
-                            .putExtra("resubmit", "resubmit"));
-                    Log.i("dosubmit_id", mkeyValue + "");
-                    finish();
-                }else {                                                             //提交状态
-                    new AlertDialog
-                            .Builder(mContext)
-                            .setTitle("温馨提示")
-                            .setMessage("\t\t确认反提交该条单据？")
-                            .setNegativeButton("取消",null)
-                            .setPositiveButton("确认", new DialogInterface.OnClickListener() {
-                                @Override
-                                public void onClick(DialogInterface dialog, int which) {
-                                    String retype = "reforsub";
-                                    doresubmit(retype);
-                                }
-                            }).show();
-                }
-
-            }
-        });
-
-        delete_ll.setOnClickListener(new View.OnClickListener() {  //TODO 删除
-            @Override
-            public void onClick(View v) {
-                if (!TextUtils.isEmpty(submittype) && submittype.equals("unsubmit")){
-                    new AlertDialog
-                            .Builder(mContext)
-                            .setTitle("温馨提示")
-                            .setMessage("\t\t确认删除该条已保存单据?")
-                            .setNegativeButton("取消", null)
-                            .setPositiveButton("确认", new DialogInterface.OnClickListener() {
-                                @Override
-                                public void onClick(DialogInterface dialog, int which) {
-                                    dodelete(mCaller, mkeyValue);
-                                }
-                            }).show();
-
-                }else {
-                    new AlertDialog
-                            .Builder(mContext)
-                            .setTitle("温馨提示")
-                            .setMessage("\t\t确认删除该条已提交单据?")
-                            .setNegativeButton("取消", null)
-                            .setPositiveButton("确认", new DialogInterface.OnClickListener() {
-                                @Override
-                                public void onClick(DialogInterface dialog, int which) {
-                                    String retype = "refordelete";
-                                        doresubmit(retype);
-                                }
-                            }).show();
+    private void getapplypeomsg(CommonApprovalFlowBean mCommonApprovalFlowBean) {
+        if (ListUtils.isEmpty(mCommonApprovalFlowBean.getProcesss())) return;
+        String applypeo_name = mCommonApprovalFlowBean.getProcesss().get(0).getJp_launcherName();
+        String applypeo_number = mCommonApprovalFlowBean.getProcesss().get(0).getJp_launcherId();
+
+        name_tv.setText(applypeo_name);
+        if (!applypeo_number.isEmpty()){
+            String whichsys = CommonUtil.getSharedPreferences(mContext, "erp_master");
+            String[] selectionArgs = {applypeo_number == null ? "" : applypeo_number, whichsys};
+            String selection = "em_code=? and whichsys=? ";
+
+            try {
+                //获取数据库数据
+                EmployeesEntity bean = manager.selectForEmployee(selectionArgs, selection);
+                if (bean != null) {
+                    String imId = String.valueOf(bean.getEm_IMID());
+                    String imName = String.valueOf(bean.getEM_NAME());
+                    String imDepartment = String.valueOf(bean.getEM_DEFAULTORNAME());
+                    String imPosition = String.valueOf(bean.getEM_POSITION());
+
+                    name_tv.setText(imName);
+                    if (!StringUtils.isEmpty(imId)) {
+                        AvatarHelper.getInstance().display(imId, photo_im, true, false);
+                    } else {
+                        String imageUri = "drawable://" + R.drawable.common_header_boy;
+                        AvatarHelper.getInstance().display(imageUri, photo_im, true);
+                    }//显示圆角图片
+                    section_tv.setText(imDepartment + ">" + imPosition);
+
+                    Log.i("aptodo", "imId=" + imId + "imName" + imName + "imDepartment" + imDepartment + "imPosition" + imPosition);
+                } else {
+                    ToastMessage("单据申请人数据获取异常");
                 }
-
+            } catch (Exception e) {
+                e.printStackTrace();
             }
-        });
+        }
     }
 
+
     // 删除
     private void dodelete(String mCaller, int mkeyValue) {
         String url = CommonUtil.getSharedPreferences(ct, "erp_baseurl") + "/mobile/commondelete.action";
@@ -595,7 +650,7 @@ public class DailydetailsActivity extends BaseActivity {
             resanddel_ll.setVisibility(View.VISIBLE);
         }else if (wd_status.equals("在录入")){
             wdd_status.setTextColor(mContext.getResources().getColor(R.color.done_approval));
-            wdd_status.setText("未提交");
+            wdd_status.setText("在录入");
             resanddel_ll.setVisibility(View.VISIBLE);
             submittype = "unsubmit";
             resubmit_tv.setText("提交");
@@ -620,7 +675,7 @@ public class DailydetailsActivity extends BaseActivity {
             approval_flowlv.setVisibility(View.GONE);
             hide_above_af.setVisibility(View.GONE);
         }
-
+        csv_hide.setVisibility(View.VISIBLE);
     }
 
     @Override

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

@@ -416,6 +416,7 @@ public class MsgsSecondCommonActivity extends BaseActivity implements View.OnCli
             Intent intent_web = new Intent(mContext, WebViewCommActivity.class);
             intent_web.putExtra("url", url + "?id=" + msg_id);
             intent_web.putExtra("title", msg_title);
+            intent_web.putExtra("cookie", true);
             startActivityForResult(intent_web, MSG_MARKED_READED);
 
         Log.d("322msg_id",msg_id + ":" + url);

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

@@ -32,6 +32,7 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.adapter.PlatComAfAdapter;
 import com.xzjmyk.pm.activity.bean.oa.PlatComAfBean;
 import com.xzjmyk.pm.activity.bean.oa.SelectEmUser;
+import com.xzjmyk.pm.activity.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.entity.SelectCollisionTurnBean;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
@@ -113,6 +114,12 @@ public class PlatWDdetailyActivity extends BaseActivity {
     private CustomerScrollView csv_hide;
     @ViewInject(R.id.ly_head_display)
     private LinearLayout ly_head_display;
+    @ViewInject(R.id.common_docui_photo_img)
+    private ImageView photo_im;
+    @ViewInject(R.id.common_docui_name_tv)
+    private TextView name_tv;
+    @ViewInject(R.id.common_docui_Section_tv)
+    private TextView section_tv;
     private String date;
     private String summary;
     private String wd_status;
@@ -554,7 +561,6 @@ public class PlatWDdetailyActivity extends BaseActivity {
                         LogUtil.prinlnLongMsg("app_flow_result", app_flow_result);
 
                         doPlatComAfShow(app_flow_result);
-                        progressDialog.dismiss();
                     }
                     break;
                 case RESUBMIT_OF_DELETEAPPFL:
@@ -668,6 +674,7 @@ public class PlatWDdetailyActivity extends BaseActivity {
                         LogUtil.prinlnLongMsg("doc_em_data", doc_em_data);
                         if (!StringUtils.isEmpty(doc_em_data)) {
                             getDailyStatue(doc_em_data);
+                            getapplypeomsg(doc_em_data);
                         }
                     }
                     break;
@@ -683,6 +690,23 @@ public class PlatWDdetailyActivity extends BaseActivity {
         }
     };
 
+    private void getapplypeomsg(String doc_em_data) {
+       try{
+           JSONObject object = JSON.parseObject(doc_em_data);
+           JSONObject dataObject = object.getJSONObject("data");
+           Long em_code = dataObject.getLongValue("emcode");
+           String em_name = dataObject.getString("wd_emp");
+
+           name_tv.setText(em_name);
+           String imageUri = "drawable://" + R.drawable.common_header_boy;
+           AvatarHelper.getInstance().display(imageUri, photo_im, true);
+
+           Log.i("em_name,em_code",em_name + "," + em_code);
+       }catch (Exception e){
+           e.printStackTrace();
+       }
+    }
+
     private void getDailyStatue(String doc_em_data) {
         JSONObject Object = JSON.parseObject(doc_em_data);
         JSONObject dataObject = Object.getJSONObject("data");
@@ -773,6 +797,8 @@ public class PlatWDdetailyActivity extends BaseActivity {
             }
 
         }
+
+        progressDialog.dismiss();
     }
 
 

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

@@ -76,35 +76,11 @@ public class WorkDailyShowActivity extends BaseActivity implements RecognizerDia
         super.onCreate(savedInstanceState);
         initView();
         initData();
+        initClickEvent();
         super.onResume();
     }
 
-    public void initView() {
-        setContentView(R.layout.activity_work_daily);
-        getSupportActionBar().setTitle("日报记录");
-        mSearchEt = (ClearEditText) findViewById(R.id.work_daily_search_edit);
-        mPullToRefreshListView = (PullToRefreshListView) findViewById(R.id.work_daily_context_ptlv);
-        voice_search = (ImageView) findViewById(R.id.voice_search_iv);
-
-        mEmptyLayout = new EmptyLayout(this, mPullToRefreshListView.getRefreshableView());
-        mEmptyLayout.setShowEmptyButton(false);
-        mEmptyLayout.setShowErrorButton(false);
-        mEmptyLayout.setShowLoadingButton(false);
-        mPullToRefreshListView.setMode(PullToRefreshBase.Mode.BOTH);
-
-        real_list = new ArrayList<>();
-        mWorkDailyAdapter = new WorkDailyAdapter(this);
-        mWorkDailyAdapter.setmWorkDailyBeanList(real_list);
-        mPullToRefreshListView.getRefreshableView().setAdapter(mWorkDailyAdapter);
-        real_list = mWorkDailyAdapter.getmWorkDailyBeanList();
-        final VoiceToWord voice = new VoiceToWord(mContext,"534e3fe2");
-        voice.setRecognizerDialogListener(this);  //自己调用自己
-        voice_search.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                voice.GetWordFromVoice();
-            }
-        });
+    private void initClickEvent() {
         mSearchEt.addTextChangedListener(new TextWatcher() {
             @Override
             public void beforeTextChanged(CharSequence s, int start, int count, int after) {
@@ -220,6 +196,35 @@ public class WorkDailyShowActivity extends BaseActivity implements RecognizerDia
         });
     }
 
+    public void initView() {
+        progressDialog.show();
+        setContentView(R.layout.activity_work_daily);
+        getSupportActionBar().setTitle("日报记录");
+        mSearchEt = (ClearEditText) findViewById(R.id.work_daily_search_edit);
+        mPullToRefreshListView = (PullToRefreshListView) findViewById(R.id.work_daily_context_ptlv);
+        voice_search = (ImageView) findViewById(R.id.voice_search_iv);
+
+        mEmptyLayout = new EmptyLayout(this, mPullToRefreshListView.getRefreshableView());
+        mEmptyLayout.setShowEmptyButton(false);
+        mEmptyLayout.setShowErrorButton(false);
+        mEmptyLayout.setShowLoadingButton(false);
+        mPullToRefreshListView.setMode(PullToRefreshBase.Mode.BOTH);
+
+        real_list = new ArrayList<>();
+        mWorkDailyAdapter = new WorkDailyAdapter(this);
+        mWorkDailyAdapter.setmWorkDailyBeanList(real_list);
+        mPullToRefreshListView.getRefreshableView().setAdapter(mWorkDailyAdapter);
+        real_list = mWorkDailyAdapter.getmWorkDailyBeanList();
+        final VoiceToWord voice = new VoiceToWord(mContext,"534e3fe2");
+        voice.setRecognizerDialogListener(this);  //自己调用自己
+        voice_search.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                voice.GetWordFromVoice();
+            }
+        });
+    }
+
     private void dodelete(String mCaller, int mkeyValue) {
         String url = CommonUtil.getSharedPreferences(ct, "erp_baseurl") + "/mobile/commondelete.action";
         Map<String, Object> formStoreMap = new HashMap<>();
@@ -230,37 +235,9 @@ public class WorkDailyShowActivity extends BaseActivity implements RecognizerDia
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
         LogUtil.prinlnLongMsg("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
-        ViewUtil.httpSendRequest(this, url, params, handler, headers, DELETE_DOC_REQUEST_SUCCESSFULLY, null, null, "get");
+        ViewUtil.httpSendRequest(this, url, params, mHandler, headers, DELETE_DOC_REQUEST_SUCCESSFULLY, null, null, "get");
     }
 
-    private Handler handler = new Handler() {
-        @Override
-        public void handleMessage(Message msg) {
-            super.handleMessage(msg);
-
-            switch (msg.what) {
-                case DELETE_DOC_REQUEST_SUCCESSFULLY:
-                    if (!StringUtils.isEmpty(msg.getData().getString("result"))) {
-                        String delete_result = msg.getData().getString("result");
-                        LogUtil.prinlnLongMsg("delete_result", delete_result);
-                        if (JSON.parseObject(delete_result).containsKey("success") && JSON.parseObject(delete_result).getBoolean("success")) {
-                            Toast.makeText(mContext, "工作日报删除成功", Toast.LENGTH_LONG).show();
-                            real_list.remove(mPosition);
-                            mWorkDailyAdapter.notifyDataSetChanged();
-                        }
-                    }
-                    break;
-                default:
-                    if (msg.getData() != null) {
-                        if (!StringUtils.isEmpty(msg.getData().getString("result"))) {
-                            Toast.makeText(mContext, msg.getData().getString("result"), Toast.LENGTH_LONG).show();
-                        }
-                    }
-                    break;
-            }
-        }
-    };
-
     //正则
     private static boolean getResult(String text, String str) {
         Pattern p = Pattern.compile(str);
@@ -276,7 +253,6 @@ public class WorkDailyShowActivity extends BaseActivity implements RecognizerDia
             LinkedHashMap headers = new LinkedHashMap();
             headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(getApplicationContext(), "sessionId"));
             ViewUtil.httpSendRequest(getApplicationContext(), url, param, mHandler, headers, WORK_DAILY_REQUEST, null, null, "post");
-
     }
 
     @Override
@@ -347,7 +323,28 @@ public class WorkDailyShowActivity extends BaseActivity implements RecognizerDia
                     }catch (Exception e){
                         e.printStackTrace();
                     }
+                    progressDialog.dismiss();
+                    break;
+                case DELETE_DOC_REQUEST_SUCCESSFULLY:
+                    if (!StringUtils.isEmpty(msg.getData().getString("result"))) {
+                        String delete_result = msg.getData().getString("result");
+                        LogUtil.prinlnLongMsg("delete_result", delete_result);
+                        if (JSON.parseObject(delete_result).containsKey("success") && JSON.parseObject(delete_result).getBoolean("success")) {
+                            Toast.makeText(mContext, "工作日报删除成功", Toast.LENGTH_LONG).show();
+                            real_list.remove(mPosition);
+                            mWorkDailyAdapter.notifyDataSetChanged();
+                        }
+                    }
+                    break;
+                case Constants.APP_SOCKETIMEOUTEXCEPTION:
+                    if (msg.getData() != null) {
+                        if (!StringUtils.isEmpty(msg.getData().getString("result"))) {
+                            ToastMessage(msg.getData().getString("result"));
+                            progressDialog.dismiss();
+                        }
+                    }
 
+                    break;
             }
 
         }

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

@@ -451,8 +451,8 @@ public class ViewUtil {
         params.put("appId", "b2b");
         params.put("username", phone);
         params.put("password", password);
-        params.put("spaceId", String.valueOf(spaceId));
-       // params.put("spaceId", "76035");
+        //params.put("spaceId", String.valueOf(spaceId));
+       params.put("spaceId", "76035");
         startNetThread(url, params, handler, Constants.SUCCESS_B2B, null, null, "post");
     }
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/activity/ChangeDealManActivity.java

@@ -177,7 +177,9 @@ public class ChangeDealManActivity extends BaseActivity implements RecognizerDia
                         String change_deal_man_result = msg.getData().getString("result");
                         LogUtil.prinlnLongMsg("change_deal_man_result", change_deal_man_result);
                         Toast.makeText(getApplicationContext(), "变更成功", Toast.LENGTH_LONG).show();
-                        setResult(0x333);
+                        Intent intent  = new Intent();
+                        intent.putExtra("change",true);
+                        setResult(0x333,intent);
                         finish();
                     }
                     break;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/adapter/PagesModelAdapter.java

@@ -22,6 +22,7 @@ import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 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;
 import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
@@ -182,6 +183,7 @@ public class PagesModelAdapter extends BaseAdapter implements Filterable {
         }else {
             model.delete_tv.setVisibility(View.GONE);
         }
+        final ViewModel finalModel = model;
         model.delete_tv.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -196,6 +198,7 @@ public class PagesModelAdapter extends BaseAdapter implements Filterable {
                                 int item_id= CommonUtil.getNumByString(datas.get(position).getId());
                                 mPosition = position;
                                 doPlatDeleteByid(item_id,whichpage);
+                                finalModel.delete_tv.setEnabled(false);
                             }
                         }).show();
             }
@@ -228,12 +231,14 @@ public class PagesModelAdapter extends BaseAdapter implements Filterable {
                     if (msg.getData() != null){
                         String delete_result=msg.getData().getString("result");
                         LogUtil.d("delete_result", delete_result);
-//                        if (JSON.parseObject(delete_result).containsKey("success")
-//                                && "true".equals(JSON.parseObject(delete_result).getJSONObject("success"))){
+                        if (JSON.parseObject(delete_result).containsKey("success")
+                                && JSON.parseObject(delete_result).getBooleanValue("success")){
                             Toast.makeText(ct,"删除成功",Toast.LENGTH_LONG).show();
-                            datas.remove(mPosition);
-                            notifyDataSetChanged();
-//                        }
+                            if (!ListUtils.isEmpty(datas)) {
+                                datas.remove(mPosition);
+                                notifyDataSetChanged();
+                            }
+                        }
                     }else {
                         Toast.makeText(ct,"删除失败，请稍候再试",Toast.LENGTH_LONG).show();
                     }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/pageforms/FormDetailActivity.java

@@ -17,6 +17,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
 import android.widget.BaseAdapter;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.PopupWindow;
 import android.widget.SimpleAdapter;
@@ -36,6 +37,7 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.adapter.PlatComAfAdapter;
 import com.xzjmyk.pm.activity.bean.oa.PlatComAfBean;
 import com.xzjmyk.pm.activity.bean.oa.SelectEmUser;
+import com.xzjmyk.pm.activity.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.PlatLeaveAddActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.TravelActivity;
@@ -107,6 +109,8 @@ public class FormDetailActivity extends BaseActivity {
     private TextView status_tv;
     @ViewInject(R.id.common_docui_name_tv)
     private TextView doc_em_name_tv;
+    @ViewInject(R.id.common_docui_photo_img)
+    private ImageView photo_im;
     List<LinkedHashMap<String, String>> datas = new ArrayList<>();
     List<LinkedHashMap<String, String>> details = new ArrayList<>();
     private int mkeyValue = -1;
@@ -169,7 +173,8 @@ public class FormDetailActivity extends BaseActivity {
                     break;
             }
         }
-
+        String imageUri = "drawable://" + R.drawable.common_header_boy;
+        AvatarHelper.getInstance().display(imageUri, photo_im, true);
         if (!StringUtils.isEmpty(fromwhere) && "examine_and_approve".equals(fromwhere)) {
             deal_id = intent.getIntExtra("deal_id", -1);
             detail_id = intent.getIntExtra("detail_id", -1);
@@ -686,6 +691,7 @@ public class FormDetailActivity extends BaseActivity {
             if ("已审批".equals(status) || "已审核".equals(status)) {
                 status_tv.setTextColor(getApplicationContext().getResources().getColor(R.color.approval));
                 status_tv.setText("已审批");
+                resanddel_ll.setVisibility(View.GONE);
             } else {
                 status_tv.setTextColor(getApplicationContext().getResources().getColor(R.color.no_approval));
                 status_tv.setText("待审批");
@@ -771,7 +777,7 @@ public class FormDetailActivity extends BaseActivity {
                     if (msg.getData() != null) {
                         String r_for_s_result = msg.getData().getString("result");
                         LogUtil.prinlnLongMsg("r_for_s_result", r_for_s_result);
-                        ToastMessage("反提交成功");
+//                        ToastMessage("反提交成功");
                         Log.i("doresubmit_id", mkeyValue + "");
                         // TODO 跳转至录入界面操作
                         doJumpToAdd(mkeyValue);
@@ -782,7 +788,7 @@ public class FormDetailActivity extends BaseActivity {
                     if (msg.getData() != null) {
                         String r_for_d_result = msg.getData().getString("result");
                         LogUtil.prinlnLongMsg("r_for_d_result", r_for_d_result);
-                        ToastMessage("反提交成功");
+//                        ToastMessage("反提交成功");
                         doPlatDeleteByid(mkeyValue);
                     }
                     break;
@@ -939,10 +945,10 @@ public class FormDetailActivity extends BaseActivity {
     }
 
     private void doShowDocDetails(String com_doc_details) {
-        common_docui_sv.setVisibility(View.VISIBLE);
         JSONObject Object = JSON.parseObject(com_doc_details);
         JSONObject dataObject = Object.getJSONObject("data");
         if (dataObject != null) {
+            common_docui_sv.setVisibility(View.VISIBLE);
             if (!ListUtils.isEmpty(doc_key)) doc_key.clear();
             if (!ListUtils.isEmpty(doc_value)) doc_value.clear();
             if (whichpage == 1) {

WeiChat/src/main/java/com/xzjmyk/pm/activity/wxapi/ApiPlatform.java

@@ -7,14 +7,14 @@ package com.xzjmyk.pm.activity.wxapi;
  */
 public class ApiPlatform extends ApiBase implements ApiModel {
 //
-//      private final String mBaseUrl="http://uas.ubtob.com/";
+      //private final String mBaseUrl="http://uas.ubtob.com/";
     private final String mBaseUrl = "http://218.17.158.219:9090/platform-b2b/"; //测试ip
 //    private final String mBaseUrl = "http://192.168.253.102:8090/platform-b2b/"; //董必伟本地ip
 //    private final String mBaseUrl = "http://192.168.253.192:8088/platform-b2b/"; //何本地ip
 
-    private String url_login_test="https://uas.ubtob.com/sso/login";
-    //private String url_login_test = "http://113.105.74.135:8001/sso/login";
-    private String url_login_formal = "https://account.ubtob.com/sso/login";
+    //private String url_login_test="https://uas.ubtob.com/sso/login";
+   private String url_login_test = "http://113.105.74.135:8001/sso/login";
+   // private String url_login_formal = "https://account.ubtob.com/sso/login";
 
     private String OBTAIN_ANNOUNCE_URL = mBaseUrl + "/bulletinCenter/getAllbulletins?pageNumber=1&pageSize=10&enuu=10030994";
     private String PUNCH_ADDRESS_URL = mBaseUrl + "/clockAddress/getSignCardAddress?enuu=10030994";

WeiChat/src/main/java/com/xzjmyk/pm/newpedo/view/NewStepActivity.java

@@ -112,6 +112,7 @@ public class NewStepActivity extends BaseActivity implements Handler.Callback {
         } else {
             totalStepsTv.setText("0");
             supportTv.setVisibility(View.VISIBLE);
+            steps_history_ll.setVisibility(View.GONE);
         }
     }
 

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

@@ -13,7 +13,7 @@
         android:layout_weight="1"
         android:fillViewport="true"
         android:scrollbars="none"
-        android:visibility="gone"
+        android:visibility="visible"
         android:focusableInTouchMode="true">
 
         <LinearLayout

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

@@ -170,7 +170,7 @@
         <TextView
             android:id="@+id/is_support_tv"
             android:textSize="15sp"
-            android:layout_marginTop="15dp"
+            android:layout_marginTop="25dp"
             android:layout_gravity="center_horizontal"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -183,8 +183,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:layout_marginTop="100dp"
-        android:layout_marginBottom="40dp"
+        android:layout_marginTop="50dp"
         >
         <ImageView
             android:layout_width="wrap_content"

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

@@ -13,7 +13,7 @@
         android:layout_weight="1"
         android:fillViewport="true"
         android:scrollbars="none"
-        android:visibility="gone">
+        android:visibility="visible">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -21,7 +21,6 @@
             android:focusable="true"
             android:focusableInTouchMode="true"
             android:orientation="vertical"
-            android:layout_marginTop="5dp"
             >
 
             <LinearLayout
@@ -31,6 +30,52 @@
                 android:orientation="vertical"
                 android:layout_marginBottom="10dp"
                 >
+                <RelativeLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:padding="5dp"
+                    android:layout_marginLeft="10dp"
+                    android:layout_marginRight="10dp"
+                    >
+
+                    <ImageView
+                        android:id="@+id/common_docui_photo_img"
+                        android:layout_width="45dp"
+                        android:layout_height="45dp"
+                        android:contentDescription="@string/app_name"
+                        android:layout_marginTop="5dp"
+                        android:layout_marginBottom="5dp" />
+
+                    <TextView
+                        android:id="@+id/common_docui_name_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="8dp"
+                        android:layout_toRightOf="@+id/common_docui_photo_img"
+                        android:textColor="#575757"
+                        android:textSize="@dimen/text_hine"
+                        android:layout_marginTop="10dp"
+
+                        />
+                    <TextView
+                        android:id="@+id/common_docui_Section_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="8dp"
+                        android:layout_toRightOf="@+id/common_docui_photo_img"
+                        android:layout_below="@id/common_docui_name_tv"
+                        android:textColor="@color/text_main"
+                        android:textSize="@dimen/text_hine"
+                        android:layout_marginTop="4dp"/>
+                    <TextView
+                        android:id="@+id/work1_daily_detail_status_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentRight="true"
+                        android:layout_marginTop="5dp"
+                        android:layout_marginBottom="0dp"
+                        android:textSize="@dimen/text_hine"/>
+                </RelativeLayout>
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/line"

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

@@ -11,14 +11,15 @@
         android:layout_height="match_parent"
         android:layout_weight="1"
         android:fillViewport="true"
-        android:scrollbars="none">
+        android:scrollbars="none"
+        android:visibility="gone">
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:focusable="true"
             android:focusableInTouchMode="true"
             android:orientation="vertical"
-            android:layout_marginTop="5dp">
+            >
             <LinearLayout
                 android:id="@+id/ly_head_display"
                 android:layout_width="match_parent"
@@ -26,6 +27,52 @@
                 android:orientation="vertical"
                 android:layout_marginBottom="10dp"
                 >
+                <RelativeLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:padding="5dp"
+                    android:layout_marginLeft="10dp"
+                    android:layout_marginRight="10dp"
+                    >
+
+                    <ImageView
+                        android:id="@+id/common_docui_photo_img"
+                        android:layout_width="45dp"
+                        android:layout_height="45dp"
+                        android:contentDescription="@string/app_name"
+                        android:layout_marginTop="5dp"
+                        android:layout_marginBottom="5dp" />
+
+                    <TextView
+                        android:id="@+id/common_docui_name_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="8dp"
+                        android:layout_toRightOf="@+id/common_docui_photo_img"
+                        android:textColor="#575757"
+                        android:textSize="@dimen/text_hine"
+                        android:layout_marginTop="10dp"
+
+                        />
+                    <TextView
+                        android:id="@+id/common_docui_Section_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="8dp"
+                        android:layout_toRightOf="@+id/common_docui_photo_img"
+                        android:layout_below="@id/common_docui_name_tv"
+                        android:textColor="@color/text_main"
+                        android:textSize="@dimen/text_hine"
+                        android:layout_marginTop="4dp"/>
+                    <TextView
+                        android:id="@+id/work1_daily_detail_status_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentRight="true"
+                        android:layout_marginTop="5dp"
+                        android:layout_marginBottom="0dp"
+                        android:textSize="@dimen/text_hine"/>
+                </RelativeLayout>
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/line"
@@ -40,6 +87,7 @@
                     android:layout_marginLeft="10dp"
                     android:layout_marginRight="10dp"
                     >
+
                 <RelativeLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"

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

@@ -17,10 +17,11 @@
             android:orientation="vertical">
             <RelativeLayout
                 style="@style/IMTbleLine2"
-                android:layout_height="50dp"
+                android:minHeight="45dp"
                 android:background="@color/white">
                 <TextView
                     style="@style/form_relative_left_text"
+                    android:id="@+id/name_tv"
                     android:text="姓     名"
                     android:layout_marginLeft="0dp"
                     android:textColor="@color/text_main"
@@ -32,6 +33,7 @@
                     android:layout_height="wrap_content"
                     android:textColor="@color/dark_dark_grey"
                     android:padding="10dp"
+                    android:layout_toRightOf="@+id/name_tv"
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
                     android:background="@null"
@@ -39,8 +41,9 @@
                     android:textSize="15sp"
                     android:gravity="center_vertical|right"
                     whatever:testType="regexp"
-                    whatever:customRegexp="^[A-Za-z\u4e00-\u9fa5]+$"
-                    whatever:testErrorString="姓名只能为中、英文"/>
+                    whatever:customRegexp="^[A-Za-z\u4e00-\u9fa5]{1,24}+$"
+                    whatever:testErrorString="姓名只能为12个字符之内的中、英文"
+                    android:layout_marginLeft="10dp"/>
             </RelativeLayout>
             <View
                 android:layout_width="match_parent"
@@ -141,6 +144,7 @@
                 android:layout_height="50dp"
                 android:background="@color/white">
                 <TextView
+                    android:id="@+id/tel_tv"
                     style="@style/form_relative_left_text"
                     android:text="电话号码"
                     android:layout_marginLeft="0dp"
@@ -159,7 +163,10 @@
                     android:hint="请输入(必填)"
                     android:textSize="15sp"
                     android:inputType="number"
-                    android:gravity="center_vertical|right"/>
+                    android:gravity="center_vertical|right"
+                    android:layout_toRightOf="@id/tel_tv"
+                    android:layout_marginLeft="5dp"
+                    android:maxLength="11"/>
             </RelativeLayout>
             <View
                 android:layout_width="match_parent"
@@ -167,9 +174,10 @@
                 android:background="@color/item_line" />
             <RelativeLayout
                 style="@style/IMTbleLine2"
-                android:layout_height="50dp"
+                android:minHeight="40dp"
                 android:background="@color/white">
                 <TextView
+                    android:id="@+id/email_tv"
                     style="@style/form_relative_left_text"
                     android:text="邮箱地址"
                     android:layout_marginLeft="0dp"
@@ -177,7 +185,7 @@
                     android:textSize="15sp"/>
 
                 <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
-                   android:id="@+id/user_email_tv"
+                    android:id="@+id/user_email_tv"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textColor="@color/dark_dark_grey"
@@ -185,12 +193,15 @@
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
                     android:background="@null"
+                    android:layout_toRightOf="@+id/email_tv"
                     android:hint="请输入(必填)"
                     android:textSize="15sp"
                     android:gravity="center_vertical|right"
                     whatever:testType="regexp"
                     whatever:customRegexp="^([\\w-])+(\\.\\w+)*@([\\w-])+((\\.\\w{2,3}){1,3})$"
-                    whatever:testErrorString="请输入正确的邮箱格式"/>
+                    whatever:testErrorString="请输入正确的邮箱格式"
+                    android:maxLength="50"
+                    android:layout_marginLeft="10dp"/>
             </RelativeLayout>
             <View
                 android:layout_width="match_parent"

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

@@ -13,7 +13,9 @@
         android:layout_weight="1"
         android:fillViewport="true"
         android:scrollbars="none"
-        android:focusableInTouchMode="true">
+        android:focusableInTouchMode="true"
+        android:visibility="gone"
+        >
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -38,7 +40,7 @@
                 android:contentDescription="@string/app_name"
                 android:layout_marginTop="5dp"
                 android:layout_marginBottom="5dp"
-                android:src="@drawable/b2bs"/>
+                />
 
             <TextView
                 android:id="@+id/common_docui_name_tv"