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

WeiChat/build.gradle

@@ -4,7 +4,7 @@ apply plugin: 'com.getkeepsafe.dexcount'
 android {
     signingConfigs {
         config {
-            storeFile file('C:/Users/Arison/Desktop/applicationsignname[20150409]')
+            storeFile file('C:/CompanyProject/applicationsignname[20150409]')
             storePassword '13237658359'
             keyAlias 'jie-20150409'
             keyPassword '13237658359'

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

@@ -388,7 +388,9 @@ public class BusinessDetailActivty extends BaseActivity {
                     Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
                     progressDialog.dismiss();
                     ToastMessage("抢商机成功！");
-                    startActivity(new Intent(ct, BusinessActivity.class));
+                    sendHttpResquest(Constants.HTTP_SUCCESS_INIT, page = 1);
+//                    startActivity(new Intent(ct, BusinessActivity.class));
+//                    finish();
                     break;
                 case BUSINESS_FENPEI:
                     progressDialog.dismiss();
@@ -427,8 +429,8 @@ public class BusinessDetailActivty extends BaseActivity {
                 params.put("condition", "nvl(bc_status,' ')<>'已失效' and nvl(bc_doman,' ')=' ' and bc_nichehouse in (select bd_name from BusinessDataBase where bd_admincode=" +
                         "'" + CommonUtil.getSharedPreferences(ct, "erp_username") + "')");
             } else if (type == 3) {//商机列表
-                params.put("condition", "bc_currentprocess='" + business_steps + "' and bc_domancode='"+
-                CommonUtil.getSharedPreferences(ct,"erp_username")+"'");
+                params.put("condition", "bc_currentprocess='" + business_steps + "' and bc_domancode='" +
+                        CommonUtil.getSharedPreferences(ct, "erp_username") + "'");
             } else {//跟进
                 params.put("condition", "(bc_type='公有' or nvl(bc_type,' ')=' ')");
             }

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

@@ -35,7 +35,6 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 public class AddMeetingActivity extends BaseActivity implements View.OnClickListener {
-
     @ViewInject(R.id.start_tv)
     private TextView start_tv;
     @ViewInject(R.id.create_ric_sv)
@@ -118,6 +117,7 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     progressDialog.dismiss();
+                    ToastUtil.showToast(ct, message == null ? "" : message);
                     break;
             }
         }

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

@@ -111,6 +111,7 @@ public class MeetingActivity extends BaseActivity {
     }
 
     private void listener() {
+        list_business.setEmptyView(R.layout.view_empty);
         list_business.setMode(PullToRefreshBase.Mode.BOTH);
         list_business.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener2<ListView>() {
             @Override

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

@@ -472,7 +472,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
     private void chaneTAG(boolean isMy) {
         if (isMy) {
             if (!my_client_log.getText().toString().trim().equals("下属工作日志")) {
-                my_client_log.setText("下属工作日志");
+                my_client_log.setText("下属工作日历");
             }
             tag = 1;
             ok_scale.setVisibility(View.GONE);

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

@@ -124,7 +124,6 @@ public class OutSigninOKActivity extends BaseActivity {
             switch (msg.what) {
                 case whatSignin:
                     JSONObject json = JSON.parseObject(message);
-
                     if (json.containsKey("success") && json.getBoolean("success")) {
                         ToastUtil.showToast(ct, "签到成功");
                         Intent intent = new Intent();
@@ -139,7 +138,7 @@ public class OutSigninOKActivity extends BaseActivity {
 //                    listview.setAdapter(new SigninAdapter(JSON.parseObject(message).getJSONArray("listdata")));
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
-                    ToastUtil.showToast(ct, "签到失败");
+                    ToastUtil.showToast(ct, message == null ? "" : message);
                     break;
             }
         }

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

@@ -6,7 +6,6 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.support.v7.app.ActionBar;
 import android.support.v7.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -142,7 +141,6 @@ public class SigninClickFragment extends EasyFragment implements View.OnClickLis
     protected void onCreateView(Bundle savedInstanceState, boolean createView) {
         ViewUtils.inject(getmRootView());
         setHasOptionsMenu(true);
-        ActionBar bar = ct.getSupportActionBar();
         init();
         initView();
     }
@@ -438,8 +436,15 @@ public class SigninClickFragment extends EasyFragment implements View.OnClickLis
             //判断是否在上班打卡和下班打卡范围内
             //比较大小（在上班打卡时间和下班打卡时间之内）
             if (!StringUtils.isEmpty(b.startSignin) && !StringUtils.isEmpty(b.startSignin2) && str.compareTo(b.startSignin) > 0 && str.compareTo(b.startSignin2) < 0) {
-                ok = true;
-                break;
+                //在该班次时间范围之内
+//                ok = true;
+//                break;
+                if (StringUtils.isEmpty(b.time2) && str.compareTo(b.time2) > 0 && !(StringUtils.isEmpty(b.signin) || b.signin.length() <= 4)) {
+                    //当前时间大于下班时间而且上班没有打过卡已经打卡过了，不能打卡
+                } else {
+                    ok = true;
+                    break;
+                }
             }
         }
         return ok;
@@ -518,32 +523,26 @@ public class SigninClickFragment extends EasyFragment implements View.OnClickLis
         Bean b = null;
         switch (num) {
             case 3:
-                chche.clear();
                 b = new Bean();//上班
                 b.time = object.containsKey("wd_ondutythree") ? object.getString("wd_ondutythree") : "08:30";
                 b.startSignin = object.containsKey("wd_onbeg3") ? object.getString("wd_onbeg3") : "07:00";
                 b.time2 = object.containsKey("wd_offdutythree") ? object.getString("wd_offdutythree") : "11:30";
                 b.startSignin2 = object.containsKey("wd_offend3") ? object.getString("wd_offend3") : "12:00";
-                chche.add(b);
-                beans.addAll(0, chche);
+                beans.add(0, b);
             case 2:
-                chche.clear();
                 b = new Bean();
                 b.time = object.containsKey("wd_ondutytwo") ? object.getString("wd_ondutytwo") : "--:--";
                 b.startSignin = object.containsKey("wd_onbeg2") ? object.getString("wd_onbeg2") : "07:00";
                 b.time2 = object.containsKey("wd_offdutytwo") ? object.getString("wd_offdutytwo") : "--:--";
                 b.startSignin2 = object.containsKey("wd_offend2") ? object.getString("wd_offend2") : "07:00";
-                chche.add(b);
-                beans.addAll(0, chche);
+                beans.add(0, b);
             case 1:
-                chche.clear();
                 b = new Bean();
                 b.time = object.containsKey("wd_ondutyone") ? object.getString("wd_ondutyone") : "--:--";
                 b.startSignin = object.containsKey("wd_onbeg1") ? object.getString("wd_onbeg1") : "07:00";
                 b.time2 = object.containsKey("wd_offdutyone") ? object.getString("wd_offdutyone") : "--:--";
                 b.startSignin2 = object.containsKey("wd_offend1") ? object.getString("wd_offend1") : "07:00";
-                chche.add(b);
-                beans.addAll(0, chche);
+                beans.add(0, b);
                 break;
         }//添加上班签到时间完成
         endLoadData(beans);

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

@@ -169,6 +169,7 @@ public class MessageFragment extends EasyFragment {
     }
 
     public void setListener(int num) {
+        Log.i("gongpengming", num + "num=");
         if (refreshRedUIListener == null) return;
         refreshRedUIListener.updata(num);
     }
@@ -276,13 +277,10 @@ public class MessageFragment extends EasyFragment {
         num_tv = (TextView) view.findViewById(R.id.num_tv);
         content_tv = (TextView) view.findViewById(R.id.content_tv);
         time_tv = (TextView) view.findViewById(R.id.time_tv);
-
         b2b_num_tv = (TextView) view.findViewById(R.id.b2b_num_tv);
         b2b_content_tv = (TextView) view.findViewById(R.id.b2b_content_tv);
         b2b_time_tv = (TextView) view.findViewById(R.id.b2b_time_tv);
-
         rl_b2b = (RelativeLayout) view.findViewById(R.id.rl_b2b_business);
-
         view.findViewById(R.id.schedule_rl).setOnClickListener(listener);
         view.findViewById(R.id.task_rl).setOnClickListener(listener);
         view.findViewById(R.id.notice_rl).setOnClickListener(listener);
@@ -645,6 +643,21 @@ public class MessageFragment extends EasyFragment {
         ViewUtil.httpSendRequest(ct, url, param, handler, headers, Constants.LOAD_SUCCESS, null, null, "get");
     }
 
+    //获取任务
+    public void loadTaskByNet(int handlerWhat) {
+        String url = Constants.getAppBaseUrl(getActivity()) + "common/datalist/data.action";
+        Map<String, Object> mparams = new HashMap<String, Object>();
+        mparams.put("sessionId", CommonUtil.getSharedPreferences(mActivity, "sessionId"));
+        mparams.put("caller", "ResourceAssignment");
+        mparams.put("page", "1");
+        mparams.put("pageSize", "100");
+        mparams.put("_noc", "1");
+        String em_code = CommonUtil.getSharedPreferences(mActivity, "erp_username");
+        mparams.put("condition", "ra_resourcecode='" + em_code + "' and ra_statuscode='" + "START" + "'");
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(mActivity, "sessionId"));
+        ViewUtil.httpSendRequest(mActivity, url, mparams, handler, headers, handlerWhat, null, null, "get");
+    }
 
     public void loadGongGaoCount(Context ct) {
         String url = Constants.getAppBaseUrl(ct) + "common/desktop/note/notice.action";
@@ -710,6 +723,7 @@ public class MessageFragment extends EasyFragment {
             b2b_num_tv.setVisibility(View.VISIBLE);
             b2b_content_tv.setText("您有" + bMsgs.size() + "条商务消息未读");
             rl_b2b.setVisibility(View.VISIBLE);
+            Log.i("gongpengming", "bMsgs.size=" + bMsgs.size());
             setListener(bMsgs.size() + GONGGAO_count + NOTICE_count + NES_count + TASK_count + DAIBAN_count + SUBRICE_count);
         } else {
             rl_b2b.setVisibility(View.GONE);
@@ -733,6 +747,7 @@ public class MessageFragment extends EasyFragment {
                                 num += 1;
                         }
                     }
+                    Log.i("gongpengming", "num.size=" + num);
                     setListener(GONGGAO_count + NOTICE_count + NES_count + TASK_count + DAIBAN_count + num);
                     if (num > 0) {
                         num_tv.setText(num + "");
@@ -767,6 +782,7 @@ public class MessageFragment extends EasyFragment {
                     setNOTICE_count(GONGGAO_count + NOTICE_count + NES_count);
                     break;
                 case TASK_MSG:
+                    Log.i("gonpengming", "TASK_MSG=" + TASK_count);
                     setListener(GONGGAO_count + NOTICE_count + NES_count + TASK_count + DAIBAN_count + SUBRICE_count);
                     if (TASK_count > 0) {
                         task_num_tv.setText(TASK_count + "");
@@ -808,6 +824,7 @@ public class MessageFragment extends EasyFragment {
 
 
     private void setNOTICE_count(int count) {
+        Log.i("gongpengming","setNOTICE_count="+count);
         setListener(GONGGAO_count + NOTICE_count + NES_count + TASK_count + DAIBAN_count + SUBRICE_count);
         if (count > 0) {
             notice_num_tv.setText(count + "");

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

@@ -1,8 +1,8 @@
 package com.xzjmyk.pm.activity.ui.message;
 
 import android.app.AlertDialog;
+import android.content.Context;
 import android.content.DialogInterface;
-import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
@@ -11,11 +11,16 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowManager;
 import android.widget.BaseAdapter;
+import android.widget.Button;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.ListView;
+import android.widget.PopupWindow;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.alibaba.fastjson.JSON;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
@@ -29,6 +34,7 @@ import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.tool.ThreadPool;
+import com.xzjmyk.pm.activity.util.DisplayUtil;
 import com.xzjmyk.pm.activity.util.LoadLocalImageUtil;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
@@ -41,7 +47,9 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-
+/**
+ * 订阅号页面
+ */
 public class SubscriptionActivity extends BaseActivity {
     private static final int LOAD_NET = 0x15;
     private int requestCode = 0x01;
@@ -103,23 +111,76 @@ public class SubscriptionActivity extends BaseActivity {
         }
     };
 
+    private PopupWindow mSubscribeWindow;
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-//        getMenuInflater().inflate(R.menu.menu_subscription, menu);
+        getMenuInflater().inflate(R.menu.menu_subscribe, menu);
         return super.onCreateOptionsMenu(menu);
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
-            case R.id.dingyue_select:
-                startActivityForResult(new Intent(activity, SubscripSetActivity.class), requestCode);
+            case R.id.subscribe_add:
+                WindowManager windowManager = (WindowManager) getSystemService(Context.WINDOW_SERVICE);
+
+                View view = View.inflate(SubscriptionActivity.this, R.layout.popupwindow_subscribe_menu, null);
+                View parentView = View.inflate(SubscriptionActivity.this, R.layout.activity_subscription, null);
+                Button mySubscribeBtn = (Button) view.findViewById(R.id.subscribe_menu_my);
+                Button addSubscribeBtn = (Button) view.findViewById(R.id.subscribe_menu_add);
+
+                mySubscribeBtn.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        Toast.makeText(SubscriptionActivity.this, "我的订阅", Toast.LENGTH_SHORT).show();
+                        closeListPopupWindow();
+                    }
+                });
+
+                addSubscribeBtn.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        Toast.makeText(SubscriptionActivity.this, "新增订阅", Toast.LENGTH_SHORT).show();
+                        closeListPopupWindow();
+                    }
+                });
+
+                mSubscribeWindow = new PopupWindow(view, LinearLayout.LayoutParams.WRAP_CONTENT,LinearLayout.LayoutParams.WRAP_CONTENT,true);
+                mSubscribeWindow.showAsDropDown(getWindow().findViewById(item.getItemId()),windowManager.getDefaultDisplay().getWidth(),0);
+                DisplayUtil.backgroundAlpha(SubscriptionActivity.this, 0.5f);
+
+                mSubscribeWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
+                    @Override
+                    public void onDismiss() {
+                        closeListPopupWindow();
+                    }
+                });
+
+                break;
+            case android.R.id.home:
+                onBackPressed();
                 break;
         }
         return super.onOptionsItemSelected(item);
     }
 
+    @Override
+    public void onBackPressed() {
+        super.onBackPressed();
+        finish();
+    }
+
+    private void closeListPopupWindow() {
+        if (mSubscribeWindow != null) {
+            mSubscribeWindow.dismiss();
+            mSubscribeWindow = null;
+            DisplayUtil.backgroundAlpha(SubscriptionActivity.this, 1f);
+
+        }
+
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);

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

@@ -45,7 +45,7 @@
             android:layout_height="wrap_content"
             android:layout_alignLeft="@+id/name_tv"
             android:layout_below="@+id/line"
-            android:layout_marginTop="10dp"
+            android:layout_marginTop="15dp"
             android:text="你今天完成签到"
             android:textSize="20dp" />
 
@@ -53,11 +53,9 @@
             android:id="@+id/num_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignBaseline="@+id/tv"
-            android:layout_alignBottom="@+id/name_tv"
+            android:layout_alignBottom="@+id/tv"
             android:layout_marginLeft="5dp"
             android:layout_toRightOf="@+id/tv"
-            android:paddingBottom="5dp"
             android:text="0 "
             android:textColor="@color/mainList2"
             android:textSize="25dp" />

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

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:background="@color/oa_main"
-    android:layout_height="match_parent">
-
+    android:layout_height="match_parent"
+    android:background="@color/oa_main">
     <RelativeLayout
         android:id="@+id/top"
         android:layout_width="match_parent"
@@ -34,7 +33,6 @@
             android:padding="8dp"
             android:src="@drawable/setting" />
     </RelativeLayout>
-
     <LinearLayout
         android:id="@+id/oa_range_addr_rl"
         android:layout_width="match_parent"
@@ -58,7 +56,6 @@
             android:text="地点微调"
             android:textColor="@color/cadetblue" />
     </LinearLayout>
-
     <ImageView
         android:id="@+id/signin_btn"
         android:layout_width="wrap_content"
@@ -82,4 +79,12 @@
         android:focusable="false"
         android:longClickable="false"
         android:minHeight="100dp" />
+
+    <View
+        android:layout_width="2px"
+        android:layout_height="match_parent"
+        android:layout_above="@+id/signin_btn"
+        android:layout_below="@+id/top"
+        android:layout_centerHorizontal="true"
+        android:background="@color/item_line" />
 </RelativeLayout>

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

@@ -11,7 +11,7 @@
         android:background="@drawable/signin_point" />
 
     <View
-        android:layout_width="6px"
+        android:layout_width="2px"
         android:layout_height="180dp"
         android:layout_below="@+id/point"
         android:layout_centerHorizontal="true"

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

@@ -0,0 +1,31 @@
+<?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="wrap_content"
+    android:background="@color/white"
+    android:gravity="center"
+    android:orientation="vertical">
+
+    <Button
+        android:id="@+id/subscribe_menu_my"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/transparent"
+        android:text="我的订阅"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:padding="10dp"
+        android:textSize="15sp" />
+
+    <Button
+        android:id="@+id/subscribe_menu_add"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/transparent"
+        android:text="新增订阅"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:padding="10dp"
+        android:textSize="15sp" />
+
+</LinearLayout>

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

@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent">
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="horizontal">
 
     <TextView
         android:id="@+id/emptyView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal|top"
-        android:drawableBottom="@drawable/icon_not_found"
+        android:layout_centerInParent="true"
         android:drawablePadding="5dp"
+        android:drawableTop="@drawable/ic_empty"
         android:gravity="center"
         android:padding="10dp"
         android:text="今天暂时没有数据 \n向上拉取前一天数据"
         android:textColor="@color/black"
-        android:textSize="@dimen/SmallerTextSize"
-          />
-</LinearLayout>
+        android:textSize="@dimen/SmallerTextSize" />
+</RelativeLayout>

WeiChat/src/main/res/menu/menu_subscribe.xml

@@ -0,0 +1,34 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="com.xzjmyk.pm.activity.MainActivity">
+    <!--<item
+        android:id="@+id/qrcode"
+        android:icon="@drawable/icon_crm_qrcode"
+        android:title="@string/search"
+        app:showAsAction="ifRoom" />-->
+    <item
+        android:id="@+id/subscribe_add"
+        android:icon="@drawable/fab_add"
+        android:title="@string/search"
+        app:showAsAction="ifRoom" />
+
+    <!--    <item
+            android:icon="@drawable/icon_crm_add"
+            android:title="@string/search"
+            app:showAsAction="ifRoom" />
+        <item
+
+            android:icon="@drawable/icon_crm_add"
+            android:title="@string/search"
+            app:showAsAction="ifRoom" />
+        <item
+
+            android:icon="@drawable/icon_crm_add"
+            android:title="@string/search"
+            app:showAsAction="ifRoom" />
+        <item
+            android:icon="@drawable/icon_crm_add"
+            android:title="@string/search"
+            app:showAsAction="ifRoom" />-->
+</menu>