Просмотр исходного кода

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

Bitliker 9 лет назад
Родитель
Сommit
06cf49cdda

+ 0 - 3
WeiChat/src/main/AndroidManifest.xml

@@ -860,9 +860,6 @@
         <activity
             android:name=".ui.erp.activity.oa.DepartmentActivity"
             android:label="选择部门" />
-        <activity
-            android:name=".ui.erp.activity.oa.SignStatisticalActivity"
-            android:label="考勤统计" />
         <activity
             android:name=".ui.erp.activity.oa.SearchLocationActivity"
             android:windowSoftInputMode="stateUnspecified|adjustNothing" />

+ 3 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/CustomCrashActivity.java

@@ -12,6 +12,7 @@ import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.Toast;
 
+import com.afollestad.materialdialogs.MaterialDialog;
 import com.alibaba.fastjson.JSON;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
@@ -68,8 +69,8 @@ public class CustomCrashActivity extends Activity {
         if (stackTraceString != null){
             //Toast.makeText(this, stackTraceString, Toast.LENGTH_LONG).show();
             //TODO 发布版本隐藏
-//            new MaterialDialog.Builder(this).content(stackTraceString)
-//                    .build().show();
+            new MaterialDialog.Builder(this).content(stackTraceString)
+                    .build().show();
             try {
                 getCode();
             } catch (Exception e) {

+ 27 - 6
WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/oa/SecondMsgsBean.java

@@ -7,11 +7,12 @@ import java.util.List;
  * function:
  */
 public class SecondMsgsBean {
+
     /**
-     * allCount : 1
+     * allCount : 4
      * success : true
-     * sessionId : 8DACA35696F128979E9FF77F26D6A724
-     * listdata : [{"releaser":"龙晓兰","createTime":"2017-02-13 10:42:46","subTitle":"有新的会议纪要,请注意查收!"}]
+     * sessionId : 4FE799E3C9CE9160FBE14AB1445A98BE
+     * listdata : [{"id":1462206,"releaser":"徐健","createTime":"2017-02-13 00:00:00","subTitle":"会议通知&nbsp;[02-13 10:01]<a href=\"javascript:openUrl('jsps/oa/meeting/meetingroomapply.jsp?formCondition=ma_id=30447&gridCondition=md_maid=30447')\" style=\"font-size:18px; color:red;\">查看会议详情<\/a><\/br>","title":"会议提醒"},{"id":1463907,"releaser":"陈萍","createTime":"2017-02-13 00:00:00","subTitle":"会议通知&nbsp;[02-13 16:54]<a href=\"javascript:openUrl('jsps/oa/meeting/meetingroomapply.jsp?formCondition=ma_id=30451&gridCondition=md_maid=30451')\" style=\"font-size:18px; color:red;\">会议已取消,查看会议详情<\/a><\/br>","title":"会议提醒"},{"id":1463150,"releaser":"徐健","createTime":"2017-02-13 00:00:00","subTitle":"会议通知&nbsp;[02-13 10:56]<a href=\"javascript:openUrl('jsps/oa/meeting/meetingroomapply.jsp?formCondition=ma_id=30451&gridCondition=md_maid=30451')\" style=\"font-size:18px; color:red;\">查看会议详情<\/a><\/br>","title":"会议提醒"},{"id":1462698,"releaser":"徐健","createTime":"2017-02-13 00:00:00","subTitle":"会议通知&nbsp;[02-13 10:12]<a href=\"javascript:openUrl('jsps/oa/meeting/meetingroomapply.jsp?formCondition=ma_id=30447&gridCondition=md_maid=30447')\" style=\"font-size:18px; color:red;\">会议变更,查看会议详情<\/a><\/br>","title":"会议提醒"}]
      */
 
     private int allCount;
@@ -53,14 +54,26 @@ public class SecondMsgsBean {
 
     public static class ListdataBean {
         /**
-         * releaser : 龙晓兰
-         * createTime : 2017-02-13 10:42:46
-         * subTitle : 有新的会议纪要,请注意查收!
+         * id : 1462206
+         * releaser : 徐健
+         * createTime : 2017-02-13 00:00:00
+         * subTitle : 会议通知&nbsp;[02-13 10:01]<a href="javascript:openUrl('jsps/oa/meeting/meetingroomapply.jsp?formCondition=ma_id=30447&gridCondition=md_maid=30447')" style="font-size:18px; color:red;">查看会议详情</a></br>
+         * title : 会议提醒
          */
 
+        private int id;
         private String releaser;
         private String createTime;
         private String subTitle;
+        private String title;
+
+        public int getId() {
+            return id;
+        }
+
+        public void setId(int id) {
+            this.id = id;
+        }
 
         public String getReleaser() {
             return releaser;
@@ -85,5 +98,13 @@ public class SecondMsgsBean {
         public void setSubTitle(String subTitle) {
             this.subTitle = subTitle;
         }
+
+        public String getTitle() {
+            return title;
+        }
+
+        public void setTitle(String title) {
+            this.title = title;
+        }
     }
 }

+ 21 - 5
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/MsgsSecondCommonActivity.java

@@ -26,6 +26,7 @@ import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.oa.SecondMsgsBean;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.activity.WebViewCommActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
@@ -58,8 +59,10 @@ public class MsgsSecondCommonActivity extends BaseActivity implements View.OnCli
     private int mPosition;
     private EmptyLayout mEmptyLayout;
     private List<Integer> mark_position;
-
+    private String baseUrl;//网址
     private SecondMsgsBean msecondMsgsBean;
+    private int msg_id;
+    private static final int REQUEST_MSGS_DETAIL = 17030201;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -176,10 +179,9 @@ public class MsgsSecondCommonActivity extends BaseActivity implements View.OnCli
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                 mPosition = (int) parent.getItemIdAtPosition(position);
+                msg_id = msecondMsgsBean.getListdata().get(mPosition).getId();
                 ToastMessage("点击position = " + mPosition);
-                mark_position.add(mPosition);
-                msgAdapter.setMark_position(mark_position);
-                msgAdapter.notifyDataSetChanged();
+                doClickEvent(mPosition,msg_id);
             }
         });
 
@@ -194,6 +196,20 @@ public class MsgsSecondCommonActivity extends BaseActivity implements View.OnCli
         });
     }
 
+    private void doClickEvent(int mPosition,int msg_id) {
+        baseUrl = CommonUtil.getSharedPreferences(mContext, "erp_baseurl");
+        String url = baseUrl + "mobile/message/getDetail.action";
+        Intent intent_web = new Intent(mContext, WebViewCommActivity.class);
+        intent_web.putExtra("url",url);
+        intent_web.putExtra("id",msg_id);
+        startActivity(intent_web);
+        //TODO 点击保存本地为已读操作
+
+        mark_position.add(mPosition);
+        msgAdapter.setMark_position(mark_position);
+        msgAdapter.notifyDataSetChanged();
+    }
+
     private void showPopupWindow() {
         if (setWindow == null) initPopupWindow();
         setWindow.showAtLocation(getWindow().getDecorView().
@@ -334,7 +350,7 @@ public class MsgsSecondCommonActivity extends BaseActivity implements View.OnCli
             }
 
             viewHolder.msgs_img.setImageResource(imageurl);
-            viewHolder.msgs_title_tv.setText(msecondMsgsBean.getListdata().get(position).getReleaser());
+            viewHolder.msgs_title_tv.setText(msecondMsgsBean.getListdata().get(position).getTitle());
             viewHolder.msgs_time_tv.setText(msecondMsgsBean.getListdata().get(position).getCreateTime());
             viewHolder.msgs_content_tv.setText(Html.fromHtml(msecondMsgsBean.getListdata().get(position).getSubTitle()));
             if (mark_position != null){

+ 0 - 175
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/SignStatisticalActivity.java

@@ -1,175 +0,0 @@
-package com.xzjmyk.pm.activity.ui.erp.activity.oa;
-
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.view.View;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import com.lidroid.xutils.view.annotation.ViewInject;
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.fragment.CalendarFragmet;
-import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
-import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
-import com.xzjmyk.pm.activity.util.TimeUtils;
-
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-/**
- * Created by FANGlh on 2017/1/18.
- * function:
- */
-public class SignStatisticalActivity extends BaseActivity  implements View.OnClickListener{
-    @ViewInject(R.id.yeas_tv)
-    private TextView yeas_tv;
-    @ViewInject(R.id.day_tv)
-    private TextView day_tv;
-    @ViewInject(R.id.week_tv)
-    private TextView week_tv;
-    @ViewInject(R.id.viewPager)
-    private ViewPager viewPager;
-    private int posItem;           //当前为滑动到的哪个Viewpager
-    private int MAX_PAGER = 30;
-    private Date curDate;    //当前显示的日期  包含年月日信息
-    private Date[] date = new Date[MAX_PAGER];
-    private PagerAdapter pagerAdapter;//当前Viewpager适配
-    private Handler handler = new Handler() {
-        @Override
-        public void handleMessage(Message msg) {
-            try {
-                try {
-                    if (progressDialog.isShowing())
-                        progressDialog.dismiss();
-                } catch (Exception e) {
-
-                }
-                String message = (String) msg.getData().get("result");
-                switch (msg.what) {
-                    case 0x11:
-                        break;
-                }
-            } catch (Exception e) {
-            }
-        }
-    };
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.sign_statistical);
-        initView();
-        initData();
-//        initEvent();
-    }
-
-    private void initView() {
-        posItem = MAX_PAGER / 2;
-        curDate = new Date(System.currentTimeMillis());
-        LinearLayout.LayoutParams linearParams = (LinearLayout.LayoutParams) viewPager.getLayoutParams(); // 取控件mGrid当前的布局参数   搜索
-        linearParams.height = (getResources().getDisplayMetrics().heightPixels * 1 / 3);// 当控件的高强制设成50象素
-        viewPager.setLayoutParams(linearParams); // 使设置好的布局参数应用到控件myGrid
-        pagerAdapter = new PagerAdapter(getSupportFragmentManager());
-        viewPager.setAdapter(pagerAdapter);
-        viewPager.setCurrentItem(MAX_PAGER / 2);
-    }
-
-    private void initData() {
-
-    }
-    private void initEvent() {
-
-        viewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
-            @Override
-            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
-            }
-
-            @Override
-            public void onPageSelected(int position) {
-                if (CommonUtil.isNetWorkConnected(getApplication())) {
-                    posItem = position;
-                    curDate = date[position];
-                    Calendar c = Calendar.getInstance();
-                    c.setTime(curDate);
-                    setDateTag(curDate);
-                    loadNetData(TimeUtils.ym_format.format(curDate));
-                }
-
-            }
-
-            @Override
-            public void onPageScrollStateChanged(int state) {
-            }
-        });
-    }
-    @Override
-    public void onClick(View v) {
-
-    }
-
-
-    /*当点击了指定日期(点击日期、滑动时候触发)*/
-    public void setClickDay(Date date) {
-        if (this.date != null && this.date.length > posItem) {
-            this.date[posItem] = date;
-            Calendar c = Calendar.getInstance();
-            c.setTime(this.date[posItem]);
-        }
-        curDate = date;
-        setDateTag(date);
-    }
-
-    private void setDateTag(Date date) {
-        Calendar c = Calendar.getInstance();
-        c.setTime(date);
-        int yeas = c.get(Calendar.YEAR);
-        int month = c.get(Calendar.MONTH) + 1;
-        int day = c.get(Calendar.DAY_OF_MONTH);
-        yeas_tv.setText(yeas + "年" + month + "月");
-        day_tv.setText(day + "日");
-        week_tv.setText(TimeUtils.getWeek(TimeUtils.s_format.format(date)));
-    }
-    /**
-     * 获取数据
-     *
-     * @param date 月份 yyyyMM
-     */
-    public void loadNetData(String date) {
-        progressDialog.show();
-        String url = CommonUtil.getSharedPreferences(ct, "erp_baseurl") + "mobile/crm/gettaskscheduleandvisitplanmsg.action";
-        //获取网络数据
-        final Map<String, Object> param = new HashMap<>();
-        param.put("emcode", CommonUtil.getSharedPreferences(this, "erp_username"));
-        param.put("date", date);
-        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
-        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
-        ViewUtil.httpSendRequest(this, url, param, handler, headers, 0x11, null, null, "get");
-    }
-
-    class PagerAdapter extends FragmentPagerAdapter {
-
-        public PagerAdapter(FragmentManager fm) {
-            super(fm);
-        }
-
-        @Override
-        public Fragment getItem(int position) {
-            return CalendarFragmet.getInstance(date[position]);
-        }
-
-        @Override
-        public int getCount() {
-            return MAX_PAGER;
-        }
-    }
-
-}

+ 2 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/uas/NewMessageFragment.java

@@ -425,7 +425,7 @@ public class NewMessageFragment extends EasyFragment implements RecognizerDialog
         time_tv = (TextView) view.findViewById(R.id.time_tv);
 
         view.findViewById(R.id.schedule_rl).setOnClickListener(listener);
-        view.findViewById(R.id._rl).setOnClickListener(listener);
+        view.findViewById(R.id.subscribe_rl).setOnClickListener(listener);
         view.findViewById(R.id.waitting_work_rl).setOnClickListener(listener);
         return view;
     }
@@ -442,7 +442,7 @@ public class NewMessageFragment extends EasyFragment implements RecognizerDialog
                     waitting_work_num_tv.setVisibility(View.INVISIBLE);
                     startActivity(new Intent(mActivity, WaittingWorksActivity.class));
                     break;
-                case R.id._rl:
+                case R.id.subscribe_rl:
 //                    startActivity(new Intent(mActivity, SubscriptionActivity.class));
                     startActivity(new Intent(mActivity, Subscription2Activity.class));
                     break;

+ 0 - 1
WeiChat/src/main/res/layout/fragment_me.xml

@@ -481,7 +481,6 @@
             android:layout_marginLeft="10dp"
             android:layout_marginRight="10dp"
             android:background="@color/item_line" />
-
         <RelativeLayout
             android:id="@+id/test_rl"
             style="@style/IMTbleLine_UP_Me"