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

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/account/DataDownloadActivity.java

@@ -165,8 +165,9 @@ public class DataDownloadActivity extends BaseActivity {
     private void startDownload() {
         mDataLoadView.showLoading();
         //company_download_status=STATUS_SUCCESS;
-        boolean isB2b= ApiUtils.getApiModel() instanceof ApiPlatform;
-        if (!isB2b&&company_download_status != STATUS_SUCCESS) {
+        boolean isB2b = ApiUtils.getApiModel() instanceof ApiPlatform;
+        if (isB2b) company_download_status = STATUS_NO_RESULT;
+        if (company_download_status != STATUS_SUCCESS) {
             company_download_status = STATUS_NO_RESULT;
             downloadCompanysContact();//下载企业架构数据
         }

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

@@ -167,10 +167,10 @@ public class OAMainActivity extends OABaseActivity implements View.OnClickListen
         listview.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-             OAModel model= (OAModel) parent.getSelectedItem();
-                LogUtil.i("getTitle"+model.getTitle2Remark());
-                LogUtil.i("getAddress2Time"+model.getAddress2Time());
-                LogUtil.i("getHandler"+model.getHandler());
+                OAModel model = mAdapter.getModels().get(position);
+                LogUtil.i("getTitle" + model.getTitle2Remark());
+                LogUtil.i("getAddress2Time" + model.getAddress2Time());
+                LogUtil.i("getHandler" + model.getHandler());
             }
         });
     }

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

@@ -223,7 +223,6 @@ public class AutoErpSigninUitl implements HttpHandler.OnResultListener {
             form.put("emcode", CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "b2b_uu"));
         }
         String formStore = StringUtils.mapToJson(form);
-
         param.put("formStore", formStore);
         param.put("emcode", getSharedPreferences(ct, "erp_username"));
         if (!isB2b)
@@ -305,7 +304,7 @@ public class AutoErpSigninUitl implements HttpHandler.OnResultListener {
                 param, bunder, this);
     }
 
-    //判断是否有
+    //判断是否需要打卡，现在不需要了
     public void loadIsCompany() {
         Map<String, Object> param = new HashMap<>();
         param.put("emcode", CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_username"));
@@ -377,6 +376,8 @@ public class AutoErpSigninUitl implements HttpHandler.OnResultListener {
     public void loadMissionPlan() {
         Map<String, Object> param = new HashMap<>();
         param.put("emcode", CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_username"));
+
+
         if (isB2b) {
             String url = ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getOutPlan;
             HttpHandler.getInstance().loadB2BByNet(LOAD_PLAN, url, param, null, this, "get");
@@ -392,7 +393,6 @@ public class AutoErpSigninUitl implements HttpHandler.OnResultListener {
                 case MAC_VAL://判断mac地址
                     if (isJSON && JSON.parseObject(message).containsKey("success") &&
                             JSON.parseObject(message).getBoolean("success")) {
-                        //TODo 修改接口回调
                         CommonInterface.getInstance().getCodeByNet("CardLog", new CommonInterface.OnResultListener() {
                             @Override
                             public void result(boolean isOk, int result, String message) {

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

@@ -3,7 +3,6 @@ package com.xzjmyk.pm.activity.ui.erp.util.oa;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
-import android.util.Log;
 
 /**
  * 日期改变监听器
@@ -18,7 +17,6 @@ public class DateTimeReceiver extends BroadcastReceiver {
     public void onReceive(Context context, Intent intent) {
         String action = intent.getAction();
         if (ACTION_DATE_CHANGED.equals(action)) {
-            Log.i("gongpengming", "查看日期改变");
             AutoErpSigninUitl signinUitl = new AutoErpSigninUitl();
             signinUitl.loadMissionPlan();
         }

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

@@ -9,7 +9,6 @@ import com.xzjmyk.pm.activity.AppConfig;
 import com.xzjmyk.pm.activity.MyApplication;
 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.JsonValidator;
 import com.xzjmyk.pm.activity.ui.erp.util.OACheckUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.wxapi.ApiConfig;
@@ -25,6 +24,7 @@ import java.util.Map;
  * 请求Handler,未进行内存泄漏测试
  * Created by Bitliker on 2016/12/8.
  */
+@Deprecated
 public class HttpHandler extends Handler {
 
     private static HttpHandler instance;

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

@@ -486,7 +486,6 @@
             android:id="@+id/test_rl"
             style="@style/IMTbleLine_UP_Me"
             android:layout_marginTop="7dp"
-            android:visibility="gone"
             android:background="@drawable/selector_me_menu_item_bg">
 
             <TextView