今天备份

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

@@ -76,7 +76,7 @@ public class DailyDetailsApprovalFlowAdapter extends BaseAdapter {
     }
 
     @Override
-    public View getView(final int position, View convertView, ViewGroup parent) {
+    public View getView(int position, View convertView, ViewGroup parent) {
         ViewHolder viewHolder = null;
         if (convertView == null) {
             convertView = View.inflate(mContext, R.layout.item_daily_details_approval_flow, null);
@@ -96,6 +96,8 @@ public class DailyDetailsApprovalFlowAdapter extends BaseAdapter {
         //ToDo 日报详情审批流过程显示，逻辑比较繁琐
 
         //获取 已审批节点数量 和总审批节点数
+        int currposition = position;
+        position = getCount() - position-1;
         int nodesnum = mCommonApprovalFlowBean.getNodes().size();
         int datanum = mCommonApprovalFlowBean.getData().size();
         int processnum = mCommonApprovalFlowBean.getProcesss().size();
@@ -144,6 +146,7 @@ public class DailyDetailsApprovalFlowAdapter extends BaseAdapter {
                 viewHolder.AppFlowDescriptionll.setVisibility(View.VISIBLE);
                 viewHolder.AppFlowDescriptiontv.setTextColor(mContext.getResources().getColor(R.color.done_approval));
                 viewHolder.AppFlowDescriptiontv.setText("( " + mCommonApprovalFlowBean.getNodes().get(position).getJn_nodeDescription().toString() + " )");
+                final int finalPosition = position;
                 viewHolder.AppFlowDescriptionll.setOnClickListener(new View.OnClickListener() {
                     //点击查看详细批语
                     @Override
@@ -151,7 +154,7 @@ public class DailyDetailsApprovalFlowAdapter extends BaseAdapter {
                         new AlertDialog
                                 .Builder(mContext)
                                 .setTitle("审批语详情")
-                                .setMessage("\t"+mCommonApprovalFlowBean.getNodes().get(position).getJn_nodeDescription().toString())
+                                .setMessage("\t"+mCommonApprovalFlowBean.getNodes().get(finalPosition).getJn_nodeDescription().toString())
                                 .setPositiveButton("确定", null)
                                 .show();
                     }

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

@@ -43,6 +43,8 @@ import com.xzjmyk.pm.activity.ui.circle.BusinessCircleFragment;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleFragment.ListenerAudioFragment;
 import com.xzjmyk.pm.activity.ui.circle.PMsgDetailActivity;
 import com.xzjmyk.pm.activity.ui.circle.showCEView;
+import com.xzjmyk.pm.activity.ui.erp.activity.oa.WorkDailyAddActivity;
+import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.tool.MultiImagePreviewActivity;
 import com.xzjmyk.pm.activity.ui.tool.SingleImagePreviewActivity;
 import com.xzjmyk.pm.activity.util.HtmlUtils;
@@ -319,6 +321,7 @@ public class PublicMessageAdapter extends BaseAdapter implements BusinessCircleA
             viewHolder.praise_rl = (RelativeLayout) convertView.findViewById(R.id.praise_rl);
             viewHolder.img_praise_top = (ImageView) convertView.findViewById(R.id.img_praise_top);
             viewHolder.img_praise_line = convertView.findViewById(R.id.img_praise_line);
+            viewHolder.daily_share_tv = (TextView) convertView.findViewById(R.id.daily_share_tv);
             if (innerView != null) {
                 viewHolder.content_fl.addView(innerView);
             }
@@ -384,7 +387,15 @@ public class PublicMessageAdapter extends BaseAdapter implements BusinessCircleA
             viewHolder.body_tv.setVisibility(View.GONE);
         } else {
             viewHolder.body_tv.setVisibility(View.VISIBLE);
+            if(finalHolder.body_tv.getText().toString().contains("(我也去分享)")){
+                viewHolder.daily_share_tv.setVisibility(View.VISIBLE);
+                viewHolder.daily_share_tv.setTextColor(mContext.getResources().getColor(R.color.approval));
+                viewHolder.daily_share_tv.setText("[来自:工作日报>工作心得分享]");
+            }else{
+                viewHolder.daily_share_tv.setVisibility(View.GONE);
+            }
             viewHolder.body_tv.setText(body.getText());
+
         }
         viewHolder.body_tv.setOnLongClickListener(new View.OnLongClickListener() {
             @Override
@@ -393,6 +404,15 @@ public class PublicMessageAdapter extends BaseAdapter implements BusinessCircleA
                 return true;
             }
         });
+        viewHolder.daily_share_tv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if(finalHolder.body_tv.getText().toString().contains("(我也去分享)")){
+                    Intent intent = new Intent(mContext, WorkDailyAddActivity.class);
+                    mContext.startActivity(intent);
+                }
+            }
+        });
 
         // 设置发布时间
         viewHolder.time_tv.setText(TimeUtils.getFriendlyTimeDesc(mContext, (int) message.getTime()));
@@ -626,6 +646,7 @@ public class PublicMessageAdapter extends BaseAdapter implements BusinessCircleA
         ImageView img_praise_top;
         View img_praise_line;
         TextView location_tv;//地理位置信息
+        TextView daily_share_tv; //分享
     }
 
     /* 普通的Text */

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

@@ -108,6 +108,8 @@ public class SendShuoshuoActivity extends BaseActivity implements View.OnClickLi
 
 //       ToastUtil.addEditTextNumChanged(SendShuoshuoActivity.this, mTextEdit, 200);//这里复制粘贴过多字数会在有些机型上出现bug
         mGridView.setAdapter(mAdapter);
+
+
         //判是否有从工作日报心得传来数据
         final  Intent intent = getIntent();
         dailyexperience = intent.getStringExtra("Experience");
@@ -235,7 +237,8 @@ public class SendShuoshuoActivity extends BaseActivity implements View.OnClickLi
         params.put("visible", "3");
 
         if(!TextUtils.isEmpty(dailyexperience)){
-            params.put("text", mTextEdit.getText().toString()+"\n\n[来自:工作日报>工作心得分享]");// 消息内容
+//            params.put("text", mTextEdit.getText().toString()+"\n\n[来自:工作日报>工作心得分享]");// 消息内容
+            params.put("text", mTextEdit.getText().toString()+"\t(我也去分享)\n\n");
         }else{
             params.put("text", mTextEdit.getText().toString());// 消息内容
         }
@@ -286,8 +289,6 @@ public class SendShuoshuoActivity extends BaseActivity implements View.OnClickLi
                     setResult(RESULT_OK, intent);
 
                     if(!TextUtils.isEmpty(dailyexperience)){
-                        //Toast.makeText(getApplication(),"工作心得分享成功，稍后可到工作圈查看",Toast.LENGTH_LONG).show();
-                        //ToastMessage("工作心得分享成功，稍后可到工作圈查看");
                        new AlertDialog
                                .Builder(mContext)
                                .setCancelable(false)  //设置点击对话框之外的对话框不消失

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

@@ -264,7 +264,7 @@ public class UserSelectActivity extends BaseActivity {
             if (adapter.getUsers().get(i).isClick())
                 list.add(adapter.getUsers().get(i));
         }
-        if (list.size() > 1){
+        if (list.size() > 0){
             Intent intent = new Intent();
             intent.putExtra("data", list);
             setResult(0x11, intent);

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

@@ -52,6 +52,7 @@ public class WorkDailyAddActivity extends BaseActivity implements View.OnTouchLi
                         setResult(0x22, new Intent());
                         isSbmit = false;
 //                        finish();
+                        CleanAfterSubmmit();
                         startActivity(new Intent(activity, WorkDailyShowActivity.class));
                     }
                     break;
@@ -62,12 +63,14 @@ public class WorkDailyAddActivity extends BaseActivity implements View.OnTouchLi
                             if (JSON.parseObject(message).containsKey("success") && JSON.parseObject(message).getBoolean("success")) {
                                 Toast.makeText(ct, "工作日报提交成功", Toast.LENGTH_SHORT).show();
 //                                finish();
+                                CleanAfterSubmmit();
                                 startActivity(new Intent(activity, WorkDailyShowActivity.class));
                                 erpOk = true;
                                 if (imOk) {
                                     isSbmit = false;
                                     setResult(0x22, new Intent());
 //                                    finish();
+                                    CleanAfterSubmmit();
                                     startActivity(new Intent(activity, WorkDailyShowActivity.class));
                                 }
                             } else {
@@ -86,7 +89,11 @@ public class WorkDailyAddActivity extends BaseActivity implements View.OnTouchLi
             }
         }
     };
-
+    public void CleanAfterSubmmit(){
+        add_summary.setText("");
+        add_plan.setText("");
+        add_experience.setText("");
+    }
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);

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

@@ -47,8 +47,8 @@
                     style="@style/form_relative_right_text2"
                     android:hint="请输入今日工作总结(必填,限500字)"
                     whatever:testType="regexp"
-                    whatever:customRegexp="^[\u4e00-\u9fa5_a-zA-Z0-9_\n]{0,500}$"
-                    whatever:testErrorString="字数超限"
+                    whatever:customRegexp="^[\\s\\S]{0,500}$"
+                    whatever:testErrorString="字数超限500了喔,亲!"
                     />
                 <View
                     android:layout_width="match_parent"

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

@@ -41,6 +41,16 @@
             android:text="ss"
             android:textColor="@color/text_hine"
             android:textSize="@dimen/text_hine" />
+        <TextView
+            android:id="@+id/daily_share_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="5dp"
+            android:background="@drawable/text_click_bg"
+            android:text="分享来自"
+            android:textColor="@color/text_hine"
+            android:textSize="@dimen/text_hine"
+            android:visibility="gone"/>
 
         <FrameLayout
             android:id="@+id/content_fl"
@@ -66,6 +76,7 @@
                 android:textColor="@color/text_hine"
                 android:textSize="@dimen/text_min" />
 
+
             <TextView
                 android:id="@+id/delete_tv"
                 android:layout_width="wrap_content"