Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into fix_bug

# Conflicts:
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/CommonDocDetailsActivity.java

WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/CommonDocApprovalFlowAdapter.java

@@ -99,8 +99,9 @@ public class CommonDocApprovalFlowAdapter extends BaseAdapter {
 
         }
 
-        // TODO  审批流倒序排列
+        //   审批流倒序排列
         if (nodesnum == 0) {
+            viewHolder.AppFlowDescriptionll.setVisibility(View.GONE);
             if (mCommonApprovalFlowBean.getCurrentnode().getNodename()
                     .equals(mCommonApprovalFlowBean.getData().get(getCount() - position - 1).getJP_NODENAME())) {
                 viewHolder.AppFlowStatus.setTextColor(mContext.getResources().getColor(R.color.no_approval));
@@ -119,13 +120,12 @@ public class CommonDocApprovalFlowAdapter extends BaseAdapter {
                     viewHolder.AppFlowNode.setImageResource(R.drawable.node_finished3);
                     viewHolder.AppFlowTime.setText(mCommonApprovalFlowBean.getNodes().get(datanum - position - 1).getJn_dealTime());
 
-                    //当有审批时判断有没有审批语
-                    if (mCommonApprovalFlowBean.getNodes().get(datanum -position -1).getJn_dealResult() != null &&
-                            mCommonApprovalFlowBean.getNodes().get(datanum -position -1).getJn_nodeDescription() != null) {
+                    //当已审批时判断有没有审批语
+                    if (mCommonApprovalFlowBean.getNodes().get(datanum - position - 1).getJn_nodeDescription() != null) {
                         viewHolder.AppFlowDescriptionll.setVisibility(View.VISIBLE);
                         viewHolder.AppFlowDescriptiontv.setTextColor(mContext.getResources().getColor(R.color.done_approval));
                         viewHolder.AppFlowDescriptiontv.setText("( " + mCommonApprovalFlowBean.getNodes().get(datanum - position - 1).getJn_nodeDescription().toString() + " )");
-                        final String des_msg = mCommonApprovalFlowBean.getNodes().get(datanum -position -1).getJn_nodeDescription().toString();
+                        final String des_msg = mCommonApprovalFlowBean.getNodes().get(datanum - position - 1).getJn_nodeDescription().toString();
                         viewHolder.AppFlowDescriptionll.setOnClickListener(new View.OnClickListener() {
                             //点击查看详细批语
                             @Override
@@ -138,28 +138,39 @@ public class CommonDocApprovalFlowAdapter extends BaseAdapter {
                                         .show();
                             }
                         });
-                    }else {
+                    } else {
+                        viewHolder.AppFlowDescriptionll.setVisibility(View.GONE);
                         viewHolder.AppFlowDescriptiontv.setText("");
                     }
-                }else if (mCommonApprovalFlowBean.getNodes().get(datanum - position - 1).getJn_dealResult().equals("不同意")) {
-                        viewHolder.AppFlowStatus.setTextColor(mContext.getResources().getColor(R.color.no_approval));
-                        viewHolder.AppFlowStatus.setText("不同意");
-                        viewHolder.AppFlowNode.setImageResource(R.drawable.node_wait3);
-                        viewHolder.AppFlowTime.setText(mCommonApprovalFlowBean.getNodes().get(datanum - position - 1).getJn_dealTime());
-                    }
-            } else if (position == (datanum - nodesnum - 1)) { //当前待处理的节点（nodes里面将要统计的数据）
-                if (mCommonApprovalFlowBean.getNodes().get(position - (datanum - nodesnum - 1)).getJn_dealResult().equals("同意")) {
+                } else if (mCommonApprovalFlowBean.getNodes().get(datanum - position - 1).getJn_dealResult().equals("不同意")) {
+                    viewHolder.AppFlowStatus.setTextColor(mContext.getResources().getColor(R.color.no_approval));
+                    viewHolder.AppFlowStatus.setText("不同意");
+                    viewHolder.AppFlowNode.setImageResource(R.drawable.icon_disagree_nor);
+                    viewHolder.AppFlowTime.setText(mCommonApprovalFlowBean.getNodes().get(datanum - position - 1).getJn_dealTime());
+                }
+
+            } else if (position == (datanum - nodesnum - 1) ) { //当前待处理的节点（nodes里面将要统计的数据）
+                if (mCommonApprovalFlowBean.getNodes().get(datanum -position -2).getJn_dealResult().equals("同意")) {
                     viewHolder.AppFlowNode.setImageResource(R.drawable.node_wait3);
                     viewHolder.AppFlowStatus.setTextColor(mContext.getResources().getColor(R.color.no_approval));
                     viewHolder.AppFlowStatus.setText("待审批");
                     viewHolder.AppFlowTime.setText("");
+                    viewHolder.AppFlowDescriptionll.setVisibility(View.GONE);
+                }else {
+                    if (position == datanum - nodesnum -1){
+                        viewHolder.AppFlowNode.setImageResource(R.drawable.node_none3);
+                        viewHolder.AppFlowStatus.setText("");
+                    }
                 }
             } else if (position < (datanum - nodesnum - 1)) {    //未走过审批流的节点
                 viewHolder.AppFlowStatus.setText("");
                 viewHolder.AppFlowNode.setImageResource(R.drawable.node_none3);
                 viewHolder.AppFlowTime.setText("");
+                viewHolder.AppFlowDescriptionll.setVisibility(View.GONE);
             }
         }
+
+
         return convertView;
     }
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/DailyDetailsApprovalFlowAdapter.java

@@ -100,8 +100,8 @@ public class DailyDetailsApprovalFlowAdapter extends BaseAdapter {
             viewHolder = (ViewHolder) convertView.getTag();
         }
 
-        //ToDo 日报详情审批流过程显示，逻辑比较繁琐
-       if (!ListUtils.isEmpty(mCommonApprovalFlowBean.getNodes())   // TODO 兼容某些情况下data[]审批人信息为空的情况
+        // 日报详情审批流过程显示，逻辑比较繁琐
+       if (!ListUtils.isEmpty(mCommonApprovalFlowBean.getNodes())   //  兼容某些情况下data[]审批人信息为空的情况
                && !ListUtils.isEmpty(mCommonApprovalFlowBean.getProcesss())
                && mCommonApprovalFlowBean.getCurrentnode().getNodename() !=null
                && ListUtils.isEmpty( mCommonApprovalFlowBean.getData())
@@ -148,7 +148,7 @@ public class DailyDetailsApprovalFlowAdapter extends BaseAdapter {
                viewHolder.AppFlowDescriptionll.setVisibility(View.GONE);
                viewHolder.AppFlowDescriptiontv.setText("");
            }
-       }else if (!ListUtils.isEmpty(mCommonApprovalFlowBean.getData())){  //Todo 正常情况下的审批流程
+       }else if (!ListUtils.isEmpty(mCommonApprovalFlowBean.getData())){  // 正常情况下的审批流程
            //获取 已审批节点数量 和总审批节点数
            final int nodesnum = mCommonApprovalFlowBean.getNodes().size();
            final int datanum = mCommonApprovalFlowBean.getData().size();
@@ -167,7 +167,7 @@ public class DailyDetailsApprovalFlowAdapter extends BaseAdapter {
 
            }
 
-           // TODO  审批流倒序排列
+           //   审批流倒序排列
            if (nodesnum == 0) {
                viewHolder.AppFlowDescriptionll.setVisibility(View.GONE);
                if (mCommonApprovalFlowBean.getCurrentnode().getNodename()
@@ -213,17 +213,22 @@ public class DailyDetailsApprovalFlowAdapter extends BaseAdapter {
                    } else if (mCommonApprovalFlowBean.getNodes().get(datanum - position - 1).getJn_dealResult().equals("不同意")) {
                        viewHolder.AppFlowStatus.setTextColor(mContext.getResources().getColor(R.color.no_approval));
                        viewHolder.AppFlowStatus.setText("不同意");
-                       viewHolder.AppFlowNode.setImageResource(R.drawable.node_wait3);
+                       viewHolder.AppFlowNode.setImageResource(R.drawable.icon_disagree_nor);
                        viewHolder.AppFlowTime.setText(mCommonApprovalFlowBean.getNodes().get(datanum - position - 1).getJn_dealTime());
                    }
 
-               } else if (position == (datanum - nodesnum - 1)) { //当前待处理的节点（nodes里面将要统计的数据）
-                   if (mCommonApprovalFlowBean.getNodes().get(position - (datanum - nodesnum - 1)).getJn_dealResult().equals("同意")) {
+               } else if (position == (datanum - nodesnum - 1) ) { //当前待处理的节点（nodes里面将要统计的数据）
+                   if (mCommonApprovalFlowBean.getNodes().get(datanum -position -2).getJn_dealResult().equals("同意")) {
                        viewHolder.AppFlowNode.setImageResource(R.drawable.node_wait3);
                        viewHolder.AppFlowStatus.setTextColor(mContext.getResources().getColor(R.color.no_approval));
                        viewHolder.AppFlowStatus.setText("待审批");
                        viewHolder.AppFlowTime.setText("");
                        viewHolder.AppFlowDescriptionll.setVisibility(View.GONE);
+                   }else {
+                       if (position == datanum - nodesnum -1){
+                           viewHolder.AppFlowNode.setImageResource(R.drawable.node_none3);
+                           viewHolder.AppFlowStatus.setText("");
+                       }
                    }
                } else if (position < (datanum - nodesnum - 1)) {    //未走过审批流的节点
                    viewHolder.AppFlowStatus.setText("");

WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/PublicMessageAdapter.java

@@ -100,10 +100,6 @@ public class PublicMessageAdapter extends BaseAdapter implements BusinessCircleA
 
     private Map<String, String> mShowNameMaps;
     private CommentAdapter mAdapter;
-    private View mMoreMenuView;
-    private PopupWindow mMoreWindow;
-    private TextView sava_picture_tv;
-    private TextView cancel_picture_tv;
 
     public List<PublicMessage> getmMessages() {
         return mMessages;
@@ -263,7 +259,7 @@ public class PublicMessageAdapter extends BaseAdapter implements BusinessCircleA
     }
 
     @Override
-    public View getView(final int position, View convertView, ViewGroup parent) {
+    public View getView(final int position, View convertView, final ViewGroup parent) {
         int viewType = getItemViewType(position);
         ViewHolder viewHolder = null;
         if (convertView == null || ((Integer) convertView.getTag(R.id.tag_key_list_item_type)) != viewType) {
@@ -544,13 +540,8 @@ public class PublicMessageAdapter extends BaseAdapter implements BusinessCircleA
             if (!TextUtils.isEmpty(url)) {
                 ImageLoader.getInstance().displayImage(url, image_view);
                 image_view.setOnClickListener(new SingleImageClickListener(url));
-                image_view.setOnLongClickListener(new View.OnLongClickListener() {
-                    @Override
-                    public boolean onLongClick(View v) {
-                        longclickshowppw();
-                        return true;
-                    }
-                });
+
+                final View finalConvertView = convertView;
             } else {
                 image_view.setImageBitmap(null);
             }
@@ -662,56 +653,6 @@ public class PublicMessageAdapter extends BaseAdapter implements BusinessCircleA
         return convertView;
     }
 
-    /**
-     * @param ：长按点击弹出PopupWindow事件，
-     * @author: FANGlh 2016-12-6
-     */
-    public void longclickshowppw(){
-
-        mMoreMenuView = View.inflate(mContext, R.layout.layout_menu_common_save_picture, null);
-        sava_picture_tv = (TextView) mMoreMenuView.findViewById(R.id.save_tv);
-        cancel_picture_tv = (TextView) mMoreMenuView.findViewById(R.id.cancel_tv);
-
-        mMoreWindow = new PopupWindow(mMoreMenuView, LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT, true);
-        mMoreWindow.setAnimationStyle(R.style.MenuAnimationFade);
-        mMoreWindow.setBackgroundDrawable(new BitmapDrawable());
-        mMoreWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
-            @Override
-            public void onDismiss() {
-                closeMorePopupWindow();
-            }
-        });
-
-//        mMoreWindow.showAtLocation(mContext, Gravity.BOTTOM, 0, 0);
-        DisplayUtil.backgroundAlpha(mContext, 0.5f);
-
-        sava_picture_tv.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-//                CommonUtil.saveImageToLocal(mContext, BitmapFactory.decodeFile(url));
-                closeMorePopupWindow();
-            }
-        });
-
-        cancel_picture_tv.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                closeMorePopupWindow();
-            }
-        });
-
-
-    }
-
-    private void closeMorePopupWindow() {
-        if (mMoreWindow != null) {
-            mMoreWindow.dismiss();
-            DisplayUtil.backgroundAlpha(mContext, 1f);
-        }
-
-    }
-
-
     public void notifyDataSetChanged(boolean isfrish) {
         this.isfrish = isfrish;
         notifyDataSetChanged();

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

@@ -196,20 +196,20 @@ public class CommonDocDetailsActivity extends BaseActivity {
         }
     }
 
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.comdoc_list, menu);
-        return super.onCreateOptionsMenu(menu);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == R.id.more_doc){
-            startActivity(new Intent(mContext, FormListSelectActivity.class).putExtra("caller",mCaller));
-            finish();
-        }
-        return super.onOptionsItemSelected(item);
-    }
+//    @Override
+//    public boolean onCreateOptionsMenu(Menu menu) {
+//        getMenuInflater().inflate(R.menu.comdoc_list, menu);
+//        return super.onCreateOptionsMenu(menu);
+//    }
+//
+//    @Override
+//    public boolean onOptionsItemSelected(MenuItem item) {
+//        if (item.getItemId() == R.id.more_doc){
+//            startActivity(new Intent(mContext,FormListSelectActivity.class)
+//                    .putExtra("caller", mCaller));
+//        }
+//        return super.onOptionsItemSelected(item);
+//    }
 
     public Handler mHandler = new Handler(){
         @Override
@@ -286,7 +286,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
                     mEmptyLayput_applymsg.showEmpty();
                 } else {
 
-                    // ToDo 获取需要显示的主表单配置数据属性保存到mFormconfigsBean中
+                    //  获取需要显示的主表单配置数据属性保存到mFormconfigsBean中
                     if (mCommonDocAMBean.getDatas().getFormdata() !=null && mCommonDocAMBean.getDatas().getFormconfigs() != null) {
                         int allFormdata_num = mCommonDocAMBean.getDatas().getFormdata().size();
                         int allFormconfigs_num = mCommonDocAMBean.getDatas().getFormconfigs().size();
@@ -303,18 +303,18 @@ public class CommonDocDetailsActivity extends BaseActivity {
                         LogUtil.prinlnLongMsg("mFormconfigsBean", mFormconfigsBean.toString());
                     }
 
-                    // ToDo 获取需要显示的从表单配置数据属性保存到mGridconfigsBean中
+                    //  获取需要显示的从表单配置数据属性保存到mGridconfigsBean中
                     if (mCommonDocAMBean.getDatas().getGriddata() != null && mCommonDocAMBean.getDatas().getGridconfigs()!= null){
                         int allGriddate_num = mCommonDocAMBean.getDatas().getGriddata().size();
                         int allGridconfigs_num = mCommonDocAMBean.getDatas().getGridconfigs().size();
-                            for (int i = 0; i < allGridconfigs_num; i++) {
-                                String dg_caption = mCommonDocAMBean.getDatas().getGridconfigs().get(i).getDG_CAPTION();
-                                String dg_field = mCommonDocAMBean.getDatas().getGridconfigs().get(i).getDG_FIELD();
-                                int mdg_isdefault = mCommonDocAMBean.getDatas().getGridconfigs().get(i).getMDG_ISDEFAULT();
-                                if (mdg_isdefault !=0 && dg_caption != null && dg_field !=null) {
-                                    mGridconfigsBean.add(mCommonDocAMBean.getDatas().getGridconfigs().get(i));
-                                }
+                        for (int i = 0; i < allGridconfigs_num; i++) {
+                            String dg_caption = mCommonDocAMBean.getDatas().getGridconfigs().get(i).getDG_CAPTION();
+                            String dg_field = mCommonDocAMBean.getDatas().getGridconfigs().get(i).getDG_FIELD();
+                            int mdg_isdefault = mCommonDocAMBean.getDatas().getGridconfigs().get(i).getMDG_ISDEFAULT();
+                            if (mdg_isdefault !=0 && dg_caption != null && dg_field !=null) {
+                                mGridconfigsBean.add(mCommonDocAMBean.getDatas().getGridconfigs().get(i));
                             }
+                        }
                         mComDocGriddataOutAdapter.setmGridconfigsBean(mGridconfigsBean);
                         second_msg_lv.setAdapter(mComDocGriddataOutAdapter);
                         LogUtil.prinlnLongMsg("mGridconfigsBean", mGridconfigsBean.toString());
@@ -344,45 +344,45 @@ public class CommonDocDetailsActivity extends BaseActivity {
                     mEmptyLayput_approvalflow.showEmpty();
                     ToastMessage("单据审批流数据获取异常");
                 }else {
-                    //TODO 从im获取头像
+                    // 从im获取头像
                     for (int i = 0; i < mCommonApprovalFlowBean.getData().size(); i++) {
                         if (manager == null) manager = new DBManager(mContext);
                         String whichsys = CommonUtil.getSharedPreferences(mContext, "erp_master");
                         String emCode = mCommonApprovalFlowBean.getData().get(i).getJP_NODEDEALMAN();
-                       try{
-                           if( emCode.contains(",")){
+                        try{
+                            if( emCode.contains(",")){
 //                                im_ids.add("");
-                               String str[] = emCode.split(",");
-                               emCode = str[0];
-                               ToastMessage("多人审批，头像已显示为首个");   //该情况只有在测试账号情况下出现
-                           }
-                       }catch (Exception e){
-                           e.printStackTrace();
-                       }
+                                String str[] = emCode.split(",");
+                                emCode = str[0];
+                                ToastMessage("多人审批，头像已显示为首个");   //该情况只有在测试账号情况下出现
+                            }
+                        }catch (Exception e){
+                            e.printStackTrace();
+                        }
 
                         String[] selectionArgs = {emCode, whichsys};
                         String selection = "em_code=? and whichsys=? ";
                         //获取数据库数据
-                      try {
-                          EmployeesEntity bean = manager.selectForEmployee(selectionArgs, selection);
-                          if (bean != null) {
-                              String imId = String.valueOf(bean.getEm_IMID());
-                              Log.i("todo", "imId=" + imId);
-                              im_ids.add(imId);
-                          } else {
-                              im_ids.add("");
+                        try {
+                            EmployeesEntity bean = manager.selectForEmployee(selectionArgs, selection);
+                            if (bean != null) {
+                                String imId = String.valueOf(bean.getEm_IMID());
+                                Log.i("todo", "imId=" + imId);
+                                im_ids.add(imId);
+                            } else {
+                                im_ids.add("");
 //                              ToastMessage("审批流头像获取异常，已显示为默认");
-                          }
-                          mCommonDocApprovalFlowAdapter.setIm_ids(im_ids);
-                          Log.i("afimids", im_ids.toString());
-                      }catch (Exception e){
-                          e.printStackTrace();
-                      }
+                            }
+                            mCommonDocApprovalFlowAdapter.setIm_ids(im_ids);
+                            Log.i("afimids", im_ids.toString());
+                        }catch (Exception e){
+                            e.printStackTrace();
+                        }
                     }
                 }
 
 
-                //TODO 设置数据之前先通过数据库获取到所有的imid保存到内存中
+                // 设置数据之前先通过数据库获取到所有的imid保存到内存中
                 mCommonDocApprovalFlowAdapter.setmCommonApprovalFlowBean(mCommonApprovalFlowBean);
                 appflow_lv.setAdapter(mCommonDocApprovalFlowAdapter);
             }
@@ -396,68 +396,71 @@ public class CommonDocDetailsActivity extends BaseActivity {
      * 申请单据申请人姓名、头像、部门、职位获取显示
      */
     public void ShowApplyPeoMsg() {
-        // TODO 当单据是提交状态 触发审批流时获取
-            if ( !ListUtils.isEmpty(mCommonApprovalFlowBean.getProcesss())) {
-                String em_number = mCommonApprovalFlowBean.getProcesss().get(0).getJp_launcherId();   //申请人编号 从process获取
-                name_tv.setText(mCommonApprovalFlowBean.getProcesss().get(0).getJp_launcherName());  //申请人姓名 从process获取
-                if (!ListUtils.isEmpty(mCommonApprovalFlowBean.getNodes())){
-                    int data_num = mCommonApprovalFlowBean.getData().size();
-                    int nodes_num = mCommonApprovalFlowBean.getNodes().size();
-                    String app_status = mCommonApprovalFlowBean.getNodes().get(nodes_num - 1).getJn_dealResult();
-                    if ((nodes_num == data_num && nodes_num > 0) &&
-                            mCommonApprovalFlowBean.getNodes().get(data_num - 1).getJn_dealResult() != null &&
-                            mCommonApprovalFlowBean.getNodes().get(data_num - 1).getJn_dealResult().equals("同意")) {
-                        status_tv.setTextColor(getApplicationContext().getResources().getColor(R.color.approval));
-                        status_tv.setText("已审批");
-                    }
-                }
-                else {
+        //  当单据是提交状态 触发审批流时获取
+        if ( !ListUtils.isEmpty(mCommonApprovalFlowBean.getProcesss())) {
+            String em_number = mCommonApprovalFlowBean.getProcesss().get(0).getJp_launcherId();   //申请人编号 从process获取
+            name_tv.setText(mCommonApprovalFlowBean.getProcesss().get(0).getJp_launcherName());  //申请人姓名 从process获取
+            if (!ListUtils.isEmpty(mCommonApprovalFlowBean.getNodes())){
+                int data_num = mCommonApprovalFlowBean.getData().size();
+                int nodes_num = mCommonApprovalFlowBean.getNodes().size();
+                String app_status = mCommonApprovalFlowBean.getNodes().get(nodes_num - 1).getJn_dealResult();
+                if ((nodes_num == data_num && nodes_num > 0) &&
+                        mCommonApprovalFlowBean.getNodes().get(data_num - 1).getJn_dealResult() != null &&
+                        mCommonApprovalFlowBean.getNodes().get(data_num - 1).getJn_dealResult().equals("同意")) {
+                    status_tv.setTextColor(getApplicationContext().getResources().getColor(R.color.approval));
+                    status_tv.setText("已审批");
+                }else {
                     status_tv.setTextColor(getApplicationContext().getResources().getColor(R.color.no_approval));
                     status_tv.setText("待审批");
                 }
-                if (!em_number.isEmpty() && em_number.length() > 0) {
-                    String whichsys = CommonUtil.getSharedPreferences(mContext, "erp_master");
-                    String[] selectionArgs = {em_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("todo", "imId=" + imId + "imName" + imName + "imDepartment" + imDepartment + "imPosition" + imPosition);
-                      } else {
-                          ToastMessage("单据申请人数据获取异常");
-                      }
-                  }catch (Exception e){
-                      e.printStackTrace();
-                  }
-                }
-            } else if (ListUtils.isEmpty(mCommonApprovalFlowBean.getProcesss())
-                    && ListUtils.isEmpty(mCommonApprovalFlowBean.getNodes())
-                    && ListUtils.isEmpty(mCommonApprovalFlowBean.getData())){
-
-                status_tv.setTextColor(getApplicationContext().getResources().getColor(R.color.titleBlue));
-                status_tv.setText("未提交");
-              
-            }else {
+            }
+            else {
                 status_tv.setTextColor(getApplicationContext().getResources().getColor(R.color.no_approval));
                 status_tv.setText("待审批");
             }
+            if (!em_number.isEmpty() && em_number.length() > 0) {
+                String whichsys = CommonUtil.getSharedPreferences(mContext, "erp_master");
+                String[] selectionArgs = {em_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("todo", "imId=" + imId + "imName" + imName + "imDepartment" + imDepartment + "imPosition" + imPosition);
+                    } else {
+                        ToastMessage("单据申请人数据获取异常");
+                    }
+                }catch (Exception e){
+                    e.printStackTrace();
+                }
+            }
+        } else if (ListUtils.isEmpty(mCommonApprovalFlowBean.getProcesss())
+                && ListUtils.isEmpty(mCommonApprovalFlowBean.getNodes())
+                && ListUtils.isEmpty(mCommonApprovalFlowBean.getData())){
+
+            status_tv.setTextColor(getApplicationContext().getResources().getColor(R.color.titleBlue));
+            status_tv.setText("未提交");
+
+        }else {
+            status_tv.setTextColor(getApplicationContext().getResources().getColor(R.color.no_approval));
+            status_tv.setText("待审批");
+        }
 
-        // TODO 当单据未提交 未触发审批流时，默认静态显示申请人的信息
+        // 当单据未提交 未触发审批流时，默认静态显示申请人的信息
         if(ListUtils.isEmpty(mCommonApprovalFlowBean.getProcesss())){
             String en_code = CommonUtil.getSharedPreferences(ct,"erp_username");
             manager = new DBManager(ct);
@@ -481,28 +484,43 @@ public class CommonDocDetailsActivity extends BaseActivity {
             }
         }
 
-        //ToDo 界面下面的按钮操作
-        if (!ListUtils.isEmpty(mCommonApprovalFlowBean.getNodes()) && !ListUtils.isEmpty(mCommonApprovalFlowBean.getProcesss())){
-            if (mCommonApprovalFlowBean.getData().size() == mCommonApprovalFlowBean.getNodes().size()
-                    && mCommonApprovalFlowBean.getNodes().get(mCommonApprovalFlowBean.getNodes().size() -1).getJn_dealResult().equals("同意")){
-                resanddel_ll.setVisibility(View.GONE);
-                approval_ll.setVisibility(View.GONE);
-            }
-        }else{
+        // 界面下面的按钮操作
+        if ((!ListUtils.isEmpty(mCommonApprovalFlowBean.getNodes()) && !ListUtils.isEmpty(mCommonApprovalFlowBean.getData()) &&
+                mCommonApprovalFlowBean.getData().size() == mCommonApprovalFlowBean.getNodes().size())
+                && mCommonApprovalFlowBean.getNodes().get(mCommonApprovalFlowBean.getNodes().size() -1).getJn_dealResult().equals("同意")){
+            resanddel_ll.setVisibility(View.GONE);
+            approval_ll.setVisibility(View.GONE);
+        }else {
             approval_ll.setVisibility(View.GONE);
             resanddel_ll.setVisibility(View.VISIBLE);
 
-            // ToDo 重新提交
+            //  重新提交
             resubmit_ll.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    startActivity(new Intent(activity, DataFormDetailActivity.class)
-                            .putExtra("caller", mCaller)
-                            .putExtra("id", mkeyValue));
-                    //finish();
+                    resubmit_ll.setOnClickListener(new View.OnClickListener() { // 重新提交
+                        @Override
+                        public void onClick(View v) {
+                            new AlertDialog
+                                    .Builder(mContext)
+                                    .setTitle("温馨提示")
+                                    .setMessage("\t\t确定反提交该条单据吗？")
+                                    .setNegativeButton("取消", null)
+                                    .setPositiveButton("确认", new DialogInterface.OnClickListener() {
+                                        @Override
+                                        public void onClick(DialogInterface dialog, int which) {
+                                            startActivity(new Intent(CommonDocDetailsActivity.this, DataFormDetailActivity.class)
+                                                    .putExtra("caller", mCaller)
+                                                    .putExtra("id", mkeyValue));
+                                            //finish();
+                                        }
+                                    }).show();
+                        }
+                    });
+
                 }
             });
-            //ToDO 删除
+            //            // 删除
             delete_ll.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
@@ -529,6 +547,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
         }
     }
 
+
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         if ((keyCode == KeyEvent.KEYCODE_BACK)) {

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

@@ -1,256 +0,0 @@
-package com.xzjmyk.pm.activity.ui.erp.activity.oa;
-
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.support.v7.app.AlertDialog;
-import android.text.TextUtils;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-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.xzjmyk.pm.activity.MyApplication;
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.Area;
-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.StringUtils;
-import com.xzjmyk.pm.activity.util.DeviceInfoUtil;
-import com.xzjmyk.pm.activity.util.ToastUtil;
-import com.xzjmyk.pm.activity.view.crouton.Crouton;
-
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-public class AddDailyActivity extends BaseActivity{
-    private EditText sum_tv;
-    private EditText plan_tv;
-    private EditText learned_tv;
-    private TextView type_tv;
-    private Button btn_submit;
-    private ImageView im_share;
-    private boolean imOk = false;
-    private boolean erpOk = false;
-    private boolean isSbmit = false;
-    private Handler handler = new Handler() {
-        @Override
-        public void handleMessage(Message msg) {
-            switch (msg.what) {
-                case 0x11:
-                    imOk = true;
-                    if (erpOk) {
-                        setResult(0x22, new Intent());
-                        isSbmit = false;
-                        finish();
-                    }
-                    break;
-                case 0x12:
-                    if (msg.getData() != null) {
-                        if (!StringUtils.isEmpty(msg.getData().getString("result"))) {
-                            String message = msg.getData().getString("result");
-                            if (JSON.parseObject(message).containsKey("success") && JSON.parseObject(message).getBoolean("success")) {
-                                Toast.makeText(ct, "工作日报提交成功", Toast.LENGTH_SHORT).show();
-                                erpOk = true;
-                                if (imOk) {
-                                    isSbmit = false;
-                                    setResult(0x22, new Intent());
-                                    finish();
-                                }
-                            } else {
-                                Crouton.makeText(ct, "工作日报提交失败");
-                            }
-                        }
-                    }
-                    break;
-                default:
-                    if (msg.getData() != null) {
-                        if (!StringUtils.isEmpty(msg.getData().getString("result"))) {
-                            ToastMessage(msg.getData().getString("result"));
-                        }
-                    }
-                    break;
-            }
-        }
-    };
-
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_add_work_daily);
-        getSupportActionBar().setTitle("工作日报");
-        initView();
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.menu_list, menu);
-        return super.onCreateOptionsMenu(menu);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == R.id.push) {
-//            startActivity(new Intent(activity, WorkLogsActivity.class));
-            startActivity(new Intent(activity, WorkDailyShowActivity.class));
-            //sendAble();
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-    private void initView() {
-        sum_tv = (EditText) findViewById(R.id.sum_tv);
-        plan_tv = (EditText) findViewById(R.id.plan_tv);
-        learned_tv = (EditText) findViewById(R.id.learned_tv);
-        type_tv = (TextView) findViewById(R.id.type_tv);
-
-        btn_submit = (Button) findViewById(R.id.btn_Daily_submitted);
-        im_share = (ImageView) findViewById(R.id.im_Experience_sharing);
-
-        type_tv.setText("今天日报");
-        type_tv.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                showDialog();
-            }
-        });
-
-        btn_submit.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                showsubmitDialog();
-            }
-        });
-        im_share.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                ToastMessage("分享功能后续完善");
-            }
-        });
-    }
-    //确认是否提交工作日报
-    private  void showsubmitDialog(){
-        new AlertDialog
-                .Builder(mContext)
-                .setTitle("温馨提示")
-                .setMessage("是否确认提交该次工作日报")
-                .setNegativeButton("取消", null)
-                .setPositiveButton("确认" ,new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-               sendAble();
-            }
-        }).show();
-
-        }
-    private void showDialog() {
-        AlertDialog.Builder builder = new AlertDialog.Builder(ct);
-       // final String[] str = {"周日志", "月日志", "年日志"};
-        final String[] str = {"今天日报"};
-        builder.setItems(str, new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialogInterface, int i) {
-                type_tv.setText(str[i]);
-            }
-        });
-        builder.show();
-    }
-
-    private void sendAble() {
-        if (isSbmit) {
-            return;
-        }
-        StringBuilder builder = new StringBuilder();
-        builder.append(type_tv.getText().toString() + ":\n");
-        if (!StringUtils.isEmpty(sum_tv.getText().toString())) {
-            builder.append("  工作总结:\n     " + sum_tv.getText().toString() + "\n");
-        } else {
-            Crouton.makeText(ct, R.string.add_summed);
-            return;
-        }
-        if (!StringUtils.isEmpty(plan_tv.getText().toString())) {
-            builder.append("  工作计划:\n     " + plan_tv.getText().toString() + "\n");
-        }
-        /*else {
-            Crouton.makeText(ct, R.string.add_plan);
-            return;
-        }*/
-        if (!StringUtils.isEmpty(learned_tv.getText().toString())) {
-            builder.append("  心得体会:\n     " + learned_tv.getText().toString() + "\n");
-        }
-        /*else {
-            Crouton.makeText(ct, R.string.add_learned);
-            return;
-        }*/
-        isSbmit = true;
-        sendWorkLogByErp(sum_tv.getText().toString(), plan_tv.getText().toString(), learned_tv.getText().toString());
-        sendWorkLog(builder.deleteCharAt(builder.length() - 1).toString());
-    }
-
-    /**
-     * 添加一条评论的操作
-     * 新一条回复
-     */
-    private void sendWorkLog(String text) {
-        if (text.length() <= 3) {
-            ToastUtil.showToast(this, "请填写完整日志");
-            return;
-        }
-        //参数
-        HashMap<String, Object> params = new HashMap<>();
-        params.put("access_token", MyApplication.getInstance().mAccessToken);
-        params.put("type", "1");
-        // 消息标记：1：求职消息；2：招聘消息；3：普通消息；
-        params.put("flag", "1");
-        params.put("visible", "3");
-        params.put("text", text);// 内容
-        params.put("model", DeviceInfoUtil.getModel());
-        params.put("osVersion", DeviceInfoUtil.getOsVersion());
-        params.put("serialNumber", DeviceInfoUtil.getDeviceId(mContext));
-        //位置信息
-        double latitude = MyApplication.getInstance().getBdLocationHelper().getLatitude();
-        double longitude = MyApplication.getInstance().getBdLocationHelper().getLongitude();
-        if (latitude != 0)
-            params.put("latitude", String.valueOf(latitude));
-        if (longitude != 0)
-            params.put("longitude", String.valueOf(longitude));
-        String address = MyApplication.getInstance().getBdLocationHelper().getAddress();
-        if (!TextUtils.isEmpty(address))
-            params.put("location", address);
-        Area area = Area.getDefaultCity();
-        if (area != null) {
-            params.put("cityId", String.valueOf(area.getId()));//城市Id
-        } else {
-            params.put("cityId", "0");
-        }
-        ViewUtil.httpSendRequest(this, mConfig.MSG_ADD_URL, params, handler, null, 0x11, null, null, "get");
-    }
-
-    private void sendWorkLogByErp(String text, String plan, String experience) {
-        String url = CommonUtil.getSharedPreferences(ct, "erp_baseurl") + "mobile/addWorkReport.action";
-        Map<String, Object> formStoreMap = new HashMap<>();
-        formStoreMap.put("wd_empcode", CommonUtil.getSharedPreferences(ct, "erp_username"));
-        formStoreMap.put("wd_comment", text);
-
-        formStoreMap.put("wd_plan", plan);
-        formStoreMap.put("wd_experience", experience);
-
-        String formStore = StringUtils.mapToJson(formStoreMap);
-        HashMap<String, Object> params = new HashMap<>();
-        params.put("caller", "WorkDaily");
-        params.put("formStore", formStore);
-        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
-        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
-        ViewUtil.httpSendRequest(this, url, params, handler, headers, 0x12, null, null, "get");
-    }
-}

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

@@ -175,7 +175,7 @@ public class WorkDailyAddActivity extends BaseActivity {
         initView();
     }
 
- /*   @Override
+    @Override
     public boolean onPrepareOptionsMenu(Menu menu) {
         menu.clear();
         if ( !TextUtils.isEmpty(resubmit) && resubmit.equals("resubmit")){
@@ -184,7 +184,7 @@ public class WorkDailyAddActivity extends BaseActivity {
             getMenuInflater().inflate(R.menu.menu_list, menu);
         }
         return super.onPrepareOptionsMenu(menu);
-    }*/
+    }
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/tool/MultiImagePreviewActivity.java

@@ -3,6 +3,7 @@ package com.xzjmyk.pm.activity.ui.tool;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.graphics.Bitmap;
+import android.graphics.drawable.BitmapDrawable;
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.v4.view.PagerAdapter;
@@ -10,11 +11,14 @@ import android.support.v4.view.ViewPager;
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.SparseArray;
+import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.PopupWindow;
 import android.widget.TextView;
 
 import com.nostra13.universalimageloader.core.ImageLoader;
@@ -23,6 +27,8 @@ import com.nostra13.universalimageloader.core.assist.ImageLoadingListener;
 import com.xzjmyk.pm.activity.AppConstant;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.ActionBackActivity;
+import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
+import com.xzjmyk.pm.activity.util.DisplayUtil;
 import com.xzjmyk.pm.activity.util.Scheme;
 
 import java.io.File;
@@ -47,7 +53,10 @@ public class MultiImagePreviewActivity extends ActionBackActivity {
 	private CheckBox mCheckBox;
 	private TextView mIndexCountTv;
 	private List<Integer> mRemovePosition = new ArrayList<Integer>();
-
+	private View mMoreMenuView;
+	private PopupWindow mMoreWindow;
+	private TextView sava_picture_tv;
+	private TextView cancel_picture_tv;
 	@SuppressWarnings("unchecked")
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
@@ -192,6 +201,9 @@ public class MultiImagePreviewActivity extends ActionBackActivity {
 		@Override
 		public Object instantiateItem(ViewGroup container, final int position) {
 			View view = mViews.get(position);
+			// init status
+			final String imageUrl = mImages.get(position);
+			Scheme scheme = Scheme.ofUri(imageUrl);
 			if (view == null) {
 				view = new ImageView(MultiImagePreviewActivity.this);
 				mViews.put(position, view);
@@ -201,11 +213,16 @@ public class MultiImagePreviewActivity extends ActionBackActivity {
 						doFinish();
 					}
 				});
+				view.setOnLongClickListener(new View.OnLongClickListener() {
+					@Override
+					public boolean onLongClick(View v) {
+						longclickshowppw();
+						return true;
+					}
+				});
 			}
 
-			// init status
-			String imageUrl = mImages.get(position);
-			Scheme scheme = Scheme.ofUri(imageUrl);
+
 			switch (scheme) {
 			case HTTP:
 			case HTTPS:// 需要网络加载的
@@ -238,6 +255,58 @@ public class MultiImagePreviewActivity extends ActionBackActivity {
 		}
 
 	}
+
+	/**
+	 * @param ：长按点击弹出PopupWindow事件，
+	 * @author: FANGlh 2016-12-6
+	 */
+	public void longclickshowppw(){
+
+		mMoreMenuView = View.inflate(mContext, R.layout.layout_menu_common_save_picture, null);
+		sava_picture_tv = (TextView) mMoreMenuView.findViewById(R.id.save_tv);
+		cancel_picture_tv = (TextView) mMoreMenuView.findViewById(R.id.cancel_tv);
+
+		mMoreWindow = new PopupWindow(mMoreMenuView, LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT, true);
+		mMoreWindow.setAnimationStyle(R.style.MenuAnimationFade);
+		mMoreWindow.setBackgroundDrawable(new BitmapDrawable());
+		mMoreWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
+			@Override
+			public void onDismiss() {
+				closeMorePopupWindow();
+			}
+		});
+
+		mMoreWindow.showAtLocation(getWindow().getDecorView(), Gravity.CENTER, 0, 0);
+		DisplayUtil.backgroundAlpha(mContext, 0.5f);
+
+		sava_picture_tv.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+//				CommonUtil.saveImageToLocal(mContext, ImageLoader.getInstance().getMemoryCache().get(imageUrl));
+				closeMorePopupWindow();
+			}
+		});
+
+		cancel_picture_tv.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				closeMorePopupWindow();
+			}
+		});
+
+
+	}
+
+
+	private void closeMorePopupWindow() {
+		if (mMoreWindow != null) {
+			mMoreWindow.dismiss();
+			DisplayUtil.backgroundAlpha(mContext, 1f);
+		}
+
+	}
+
+
 	private ImageLoadingListener mImageLoadingListener = new ImageLoadingListener() {
 		@Override
 		public void onLoadingStarted(String arg0, View arg1) {
@@ -269,6 +338,13 @@ public class MultiImagePreviewActivity extends ActionBackActivity {
 
 				}
 			});
+			mAttacher.setOnLongClickListener(new View.OnLongClickListener() {
+				@Override
+				public boolean onLongClick(View v) {
+					longclickshowppw();
+					return true;
+				}
+			});
 		}
 
 		@Override

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/tool/SingleImagePreviewActivity.java

@@ -1,22 +1,32 @@
 package com.xzjmyk.pm.activity.ui.tool;
 
 import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.drawable.BitmapDrawable;
 import android.net.Uri;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;
+import android.view.Gravity;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.PopupWindow;
 import android.widget.ProgressBar;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.assist.FailReason;
 import com.nostra13.universalimageloader.core.assist.ImageLoadingListener;
 import com.xzjmyk.pm.activity.AppConstant;
 import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.adapter.PublicMessageAdapter;
 import com.xzjmyk.pm.activity.ui.base.ActionBackActivity;
+import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
+import com.xzjmyk.pm.activity.util.DisplayUtil;
 import com.xzjmyk.pm.activity.util.Scheme;
 
 import java.io.File;
@@ -38,6 +48,10 @@ public class SingleImagePreviewActivity extends ActionBackActivity {
 	@SuppressWarnings("unused")
 	private TextView mProgressTextTv;
 	PhotoViewAttacher mAttacher;
+	private View mMoreMenuView;
+	private PopupWindow mMoreWindow;
+	private TextView sava_picture_tv;
+	private TextView cancel_picture_tv;
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
@@ -88,9 +102,10 @@ public class SingleImagePreviewActivity extends ActionBackActivity {
 			ImageLoader.getInstance().displayImage(mImageUri, mImageView, mImageLoadingListener);
 		}
 
-		mImageView.setOnClickListener(new View.OnClickListener() {
+		/*mImageView.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
+				Toast.makeText(SingleImagePreviewActivity.this, "onClick", Toast.LENGTH_SHORT).show();
 				finish();
 				overridePendingTransition(0, R.anim.alpha_scale_out);
 			}
@@ -99,11 +114,65 @@ public class SingleImagePreviewActivity extends ActionBackActivity {
 		mImageView.setOnLongClickListener(new View.OnLongClickListener() {
 			@Override
 			public boolean onLongClick(View v) {
-				return false;
+//				return false;
+				Toast.makeText(SingleImagePreviewActivity.this, "onLongClick", Toast.LENGTH_SHORT).show();
+				longclickshowppw();
+				return true;
+			}
+		});*/
+	}
+
+
+	/**
+	 * @param ：长按点击弹出PopupWindow事件，
+	 * @author: FANGlh 2016-12-6
+	 */
+	public void longclickshowppw(){
+
+		mMoreMenuView = View.inflate(mContext, R.layout.layout_menu_common_save_picture, null);
+		sava_picture_tv = (TextView) mMoreMenuView.findViewById(R.id.save_tv);
+		cancel_picture_tv = (TextView) mMoreMenuView.findViewById(R.id.cancel_tv);
+
+		mMoreWindow = new PopupWindow(mMoreMenuView, LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT, true);
+		mMoreWindow.setAnimationStyle(R.style.MenuAnimationFade);
+		mMoreWindow.setBackgroundDrawable(new BitmapDrawable());
+		mMoreWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
+			@Override
+			public void onDismiss() {
+				closeMorePopupWindow();
 			}
 		});
+
+		mMoreWindow.showAtLocation(getWindow().getDecorView(), Gravity.CENTER, 0, 0);
+		DisplayUtil.backgroundAlpha(mContext, 0.5f);
+
+		sava_picture_tv.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+                CommonUtil.saveImageToLocal(mContext, ImageLoader.getInstance().getMemoryCache().get(mImageUri));
+				closeMorePopupWindow();
+			}
+		});
+
+		cancel_picture_tv.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				closeMorePopupWindow();
+			}
+		});
+
+
+	}
+
+	private void closeMorePopupWindow() {
+		if (mMoreWindow != null) {
+			mMoreWindow.dismiss();
+			DisplayUtil.backgroundAlpha(mContext, 1f);
+		}
+
 	}
 
+
 	@Override
 	public void onBackPressed() {
 		finish();
@@ -137,7 +206,7 @@ public class SingleImagePreviewActivity extends ActionBackActivity {
 			mAttacher.setOnPhotoTapListener(new PhotoViewAttacher.OnPhotoTapListener() {
 				@Override
 				public void onPhotoTap(View view, float x, float y) {
-				 	finish();
+					finish();
 					overridePendingTransition(0, R.anim.alpha_scale_out);
 				}
 
@@ -146,6 +215,14 @@ public class SingleImagePreviewActivity extends ActionBackActivity {
 
 				}
 			});
+
+			mAttacher.setOnLongClickListener(new View.OnLongClickListener() {
+				@Override
+				public boolean onLongClick(View v) {
+					longclickshowppw();
+					return true;
+				}
+			});
 		}
 
 		@Override

WeiChat/src/main/res/color/selector_subscribe_tv.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/red" android:state_checked="true"/>
-    <item android:color="@color/red" android:state_pressed="true"/>
-    <item android:color="@color/red" android:state_selected="true"/>
-
-    <item android:color="@color/black"/>
-</selector>

WeiChat/src/main/res/drawable/anim_app_crash.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<animation-list xmlns:android="http://schemas.android.com/apk/res/android"
-    android:oneshot="false">
-    <item android:drawable="@drawable/songsu1" android:duration="50"/>
-    <item android:drawable="@drawable/songsu2" android:duration="50"/>
-    <item android:drawable="@drawable/songsu3" android:duration="50"/>
-    <item android:drawable="@drawable/songsu4" android:duration="50"/>
-    <item android:drawable="@drawable/songsu5" android:duration="50"/>
-</animation-list>

WeiChat/src/main/res/drawable/operation_more_bg.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:drawable="@drawable/operate_more_press" android:state_focused="true"/>
-    <item android:drawable="@drawable/operate_more_press" android:state_selected="true"/>
-    <item android:drawable="@drawable/operate_more_press" android:state_pressed="true"/>
-    <item android:drawable="@drawable/operate_more"/>
-
-</selector>

WeiChat/src/main/res/drawable/selector_subscribe_bg.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/white" android:state_checked="true"/>
-    <item android:drawable="@color/white" android:state_pressed="true"/>
-    <item android:drawable="@color/white" android:state_selected="true"/>
-
-    <item android:drawable="@color/umeng_socialize_ucenter_bg"/>
-</selector>

WeiChat/src/main/res/drawable/shape_process_selected.xml

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_focused="true">
-        <layer-list>
-            <item android:bottom="0.5dp" android:left="-1dp" android:right="-1dp" android:top="-1dp">
-                <shape>
-                    <solid android:color="#00F5FF" />
-                    <stroke android:width="0.5dp" android:color="#00F5FF" />
-                </shape>
-            </item>
-        </layer-list>
-    </item>
-    <item android:state_selected="true">
-        <layer-list>
-            <item android:bottom="0.0dp" android:left="-2.7dp" android:right="-2.7dp" android:top="-2.7dp">
-                <shape>
-                    <solid android:color="@color/white" />
-                    <stroke android:width="2.5dp" android:color="@color/yellow_home" />
-                </shape>
-            </item>
-        </layer-list>
-    </item>
-    <item>
-        <layer-list>
-            <item android:bottom="0.5dp" android:left="-1dp" android:right="-1dp" android:top="-1dp">
-                <shape>
-                    <solid android:color="@color/white" />
-                    <stroke android:width="0.5dp" android:color="@color/white" />
-                </shape>
-            </item>
-        </layer-list>
-    </item>
-</selector>

WeiChat/src/main/res/drawable/text_button_stye.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape>
-            <solid android:color="@color/red" />
-            <corners android:radius="360dp" />
-            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
-        </shape>
-    </item>
-</selector>

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

@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:whatever="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@drawable/bg_main"
-    android:orientation="vertical">
-
-    <com.xzjmyk.pm.activity.ui.erp.view.CustomerScrollView
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:fillViewport="true">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:focusable="true"
-            android:focusableInTouchMode="true"
-            android:orientation="vertical">
-
-            <LinearLayout
-                android:id="@+id/ly_head_display"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/line"
-                    android:layout_marginTop="8dp"
-                    android:background="@color/item_line" />
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textSize="18sp"
-                    android:text="工作总结"
-                    android:paddingLeft="20dp"
-                    android:layout_marginTop="1dp"
-                    />
-                <com.andreabaccega.widget.FormEditText
-                    android:id="@+id/sum_tv"
-                    style="@style/form_relative_right_text"
-                    android:hint="请输入今日工作总结(必填)"
-                    android:layout_marginLeft="20dp"
-                    android:layout_marginTop="1dp"
-                    android:gravity="top"
-                    android:minHeight="120dp"
-                    android:maxHeight="300dp"
-                    android:padding="5dp"
-                    />
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/line"
-                    android:background="@color/item_line" />
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textSize="18sp"
-                    android:text="工作计划"
-                    android:paddingLeft="20dp"
-                    android:layout_marginTop="1dp"/>
-                <com.andreabaccega.widget.FormEditText
-                    android:id="@+id/plan_tv"
-                    style="@style/form_relative_right_text"
-                    android:layout_marginLeft="20dp"
-                    android:gravity="top"
-                    android:hint="请输入明日工作计划(非必填)"
-                    android:layout_marginTop="1dp"
-                    android:minHeight="120dp"
-                    android:maxHeight="300dp"
-                    android:padding="5dp" />
-
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/line"
-                    android:background="@color/item_line" />
-
-                <RelativeLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    >
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="工作心得"
-                        android:paddingLeft="20dp"
-                        android:layout_marginTop="1dp"
-                        android:textSize="18sp"
-                        />
-                    <ImageButton
-                        android:id="@+id/im_Experience_sharing"
-                        android:layout_width="40dp"
-                        android:layout_height="40dp"
-                        android:src="@drawable/icon_app_share"
-                        android:layout_alignParentRight="true"
-                        android:layout_marginTop="1dp"
-                        android:layout_marginRight="20dp"
-                        />
-                </RelativeLayout>
-                <com.andreabaccega.widget.FormEditText
-                    android:id="@+id/learned_tv"
-                    style="@style/form_relative_right_text"
-                    android:layout_marginLeft="20dp"
-                    android:gravity="top"
-                    android:hint="点击分享按钮可将工作心得分享到工作圈(非必填)"
-                    android:minHeight="120dp"
-                    android:maxHeight="300dp"
-                    android:layout_marginTop="1dp"
-                    android:padding="5dp" />
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/line"
-                    android:background="@color/item_line" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/ly_bottom_submit"
-                style="@style/form_linear_customer">
-
-                <Button
-                    android:id="@+id/btn_Daily_submitted"
-                    style="@style/from_button_base_bule"
-                    android:layout_marginTop="10dp"
-                    android:textSize="20sp"
-                    android:text="提    交" />
-            </LinearLayout>
-        </LinearLayout>
-    </com.xzjmyk.pm.activity.ui.erp.view.CustomerScrollView>
-
-
-
-    <include layout="@layout/item_work_view" />
-
-
-
-    <!--gone-->
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:orientation="horizontal"
-        android:visibility="gone">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_marginLeft="10dp"
-            android:gravity="center_vertical"
-            android:text="日志类型"
-            android:textColor="@color/text_main"
-            android:textSize="@dimen/text_main" />
-
-        <TextView
-            android:id="@+id/type_tv"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginLeft="20dp"
-            android:drawableRight="@drawable/oa_next"
-            android:gravity="center_vertical"
-            android:textColor="@color/text_main"
-            android:textSize="@dimen/text_main" />
-    </LinearLayout>
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="30dp"
-        android:background="@drawable/oa_signin_tv_bg"
-        android:padding="20dp"
-        android:text="选择点评人（默认指向自己领导）"
-        android:textColor="@color/text_main"
-        android:textSize="@dimen/text_main"
-        android:visibility="gone" />
-</LinearLayout>

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

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
-    android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.form.DataFormControllActivity">
-
-</RelativeLayout>

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

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
-    android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.form.FormListSelectActivity">
-
-</RelativeLayout>

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

@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    tools:context=".ui.erp.activity.oa.LocationMapActivity">
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="48dp"
-        android:background="@drawable/bg_bar"
-        android:orientation="horizontal"
-        android:paddingBottom="5dp"
-        android:paddingLeft="15dp"
-        android:paddingRight="15dp"
-        android:paddingTop="5dp">
-
-        <com.xzjmyk.pm.activity.view.ClearEditText
-            android:id="@+id/search_edit"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@drawable/search_input"
-            android:drawableLeft="@drawable/search"
-            android:drawableRight="@drawable/search_clear"
-            android:hint="@string/search"
-            android:textColor="@color/dark_grey"
-            android:textColorHint="@color/grey"
-            android:textSize="15sp" />
-    </RelativeLayout>
-    <com.baidu.mapapi.map.MapView
-        android:id="@+id/bmapView"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="3"
-        android:clickable="true"
-        android:visibility="gone"/>
-
-    <com.handmark.pulltorefresh.library.PullToRefreshListView
-        android:id="@+id/listview"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="5"
-        android:scrollingCache="false"
-        android:dividerHeight="1dp"
-        android:divider="@color/item_line"
-         />
-</LinearLayout>

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

@@ -1,79 +0,0 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white" >
-
-    <ScrollView
-        android:id="@+id/scroll_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_above="@+id/bottom_layout" >
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical" >
-
-            <EditText
-                android:id="@+id/text_edit"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:background="@drawable/full_edit_bg"
-                android:gravity="top"
-                android:hint="@string/circle_now_think"
-                android:inputType="textMultiLine"
-                android:minHeight="150dp"
-                android:padding="10dp"
-                android:textColor="@color/black"
-                android:textColorHint="@color/grey"
-                android:textSize="16sp" />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="3dp"
-                android:layout_marginLeft="10dp"
-                android:layout_marginTop="10dp"
-                android:shadowColor="@color/white"
-                android:shadowRadius="1"
-                android:text="@string/circle_select_video"
-                android:textColor="@color/gray"
-                android:textSize="14sp" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@color/light_gray"
-                android:padding="10dp" >
-
-                <include
-                    android:id="@+id/add_video_item"
-                    layout="@layout/layout_circle_add_more_item" />
-            </LinearLayout>
-        </LinearLayout>
-    </ScrollView>
-
-    <LinearLayout
-        android:id="@+id/bottom_layout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:background="@drawable/tab_bg"
-        android:baselineAligned="false"
-        android:gravity="bottom"
-        android:orientation="vertical"
-        android:padding="10dp" >
-
-        <Button
-            android:id="@+id/release_btn"
-            android:layout_width="match_parent"
-            android:layout_height="42dp"
-            android:background="@drawable/button_orange_bg"
-            android:text="@string/circle_release"
-            android:textColor="@color/white"
-            android:textSize="16sp" />
-    </LinearLayout>
-
-</RelativeLayout>

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

@@ -9,6 +9,8 @@
         android:id="@+id/image_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:clickable="true"
+        android:focusable="true"
         android:contentDescription="@string/app_name"
         android:scaleType="fitCenter" />
 

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

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent"
-    android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:showIn="@layout/activity_process_msg"
-    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.message.ProcessMsgActivity">
-
-</RelativeLayout>

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

@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:background="@color/item_color2"
-        android:gravity="center"
-        android:textColor="@color/text_main"
-        android:text="没有符合条件的结果" />
-
-    <RelativeLayout
-        android:id="@+id/add_rl"
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:layout_marginTop="20dp"
-        android:background="@color/item_color2"
-        android:padding="10dp">
-
-        <ImageView
-            android:id="@+id/add_tag"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:src="@drawable/oa_next" />
-
-        <TextView
-            android:id="@+id/add_tv"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignParentLeft="true"
-            android:layout_toLeftOf="@id/add_tag"
-            android:gravity="center|left"
-            android:text="aaaaa"
-            android:textColor="@color/text_main" />
-
-
-    </RelativeLayout>
-</LinearLayout>

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

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:id="@+id/add_plan"
-    android:layout_height="wrap_content"
-    android:gravity="center"
-    android:padding="5dp"
-    android:text="@string/add_mission_plan"
-    android:textColor="@color/blue"
-    android:textSize="20sp" />

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

@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/item_line"
-        android:padding="10dp"
-        android:text="目的地"
-        android:textSize="20sp" />
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/item_height"
-        android:padding="5dp">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:gravity="center_vertical"
-            android:text="@string/current_location"
-            android:textColor="@color/text_main"
-            android:textSize="@dimen/text_main" />
-
-        <EditText
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignParentRight="true"
-            android:layout_marginRight="10dp"
-            android:gravity="center_vertical"
-            android:hint="英唐大厦"
-            android:textColor="@color/text_hine"
-            android:textSize="@dimen/text_hine" />
-    </RelativeLayout>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="2px"
-        android:background="@color/item_line" />
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/item_height"
-        android:padding="5dp">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:gravity="center_vertical"
-            android:text="@string/current_location"
-            android:textColor="@color/text_main"
-            android:textSize="@dimen/text_main" />
-
-        <EditText
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignParentRight="true"
-            android:layout_marginRight="10dp"
-            android:gravity="center_vertical"
-            android:hint="英唐大厦"
-            android:textColor="@color/text_hine"
-            android:textSize="@dimen/text_hine" />
-    </RelativeLayout>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="2px"
-        android:background="@color/item_line" />
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/item_height"
-        android:padding="5dp">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:gravity="center_vertical"
-            android:text="@string/current_location"
-            android:textColor="@color/text_main"
-            android:textSize="@dimen/text_main" />
-
-        <EditText
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignParentRight="true"
-            android:layout_marginRight="10dp"
-            android:gravity="center_vertical"
-            android:hint="英唐大厦"
-            android:textColor="@color/text_hine"
-            android:textSize="@dimen/text_hine" />
-    </RelativeLayout>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="2px"
-        android:background="@color/item_line" />
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/item_height"
-        android:padding="5dp">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:gravity="center_vertical"
-            android:text="@string/current_location"
-            android:textColor="@color/text_main"
-            android:textSize="@dimen/text_main" />
-
-        <EditText
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignParentRight="true"
-            android:layout_marginRight="10dp"
-            android:gravity="center_vertical"
-            android:hint="英唐大厦"
-            android:textColor="@color/text_hine"
-            android:textSize="@dimen/text_hine" />
-    </RelativeLayout>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="2px"
-        android:background="@color/item_line" />
-
-</LinearLayout>

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

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <TextView
-        android:id="@+id/tvTime"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
-        android:background="@color/transparent"
-        android:gravity="center_vertical"
-        android:paddingLeft="5dp" />
-
-    <android.support.v7.widget.RecyclerView
-        android:id="@+id/listview"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-      />
-</LinearLayout>

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

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/text_button_rl"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <Button
-        android:id="@+id/text_button_btn"
-        android:layout_width="50dp"
-        android:layout_height="50dp"
-        android:background="@drawable/text_button_stye" />
-
-    <TextView
-        android:id="@+id/text_button_tv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/text_button_btn"
-        android:layout_marginTop="5dp"
-        android:text="aaaaaaa" />
-
-</RelativeLayout>