gradle升级前代码备份

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/task/TaskB2BActivity.java

@@ -44,6 +44,7 @@ import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.lidroid.xutils.ViewUtils;
 import com.modular.appmessages.adapter.NewSchedultAdapter;
 import com.modular.appmessages.model.AllProcess;
+import com.modular.apputils.widget.MenuVoiceSearchView;
 import com.uas.appworks.CRM.erp.activity.TaskAddErpActivity;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.activity.WebViewLoadActivity;
@@ -79,7 +80,7 @@ public class TaskB2BActivity extends SupportToolBarActivity implements View.OnCl
     private String login_Name = CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_emname");
     private int tab_type = 1;
     private DivideRadioGroup tabGroup;
-    private VoiceSearchView voiceSearchView;
+    private MenuVoiceSearchView voiceSearchView;
     private int mCurrentPage = 1;
     private int mPosition = -1;
     private Handler handler = new Handler() {
@@ -294,12 +295,12 @@ public class TaskB2BActivity extends SupportToolBarActivity implements View.OnCl
     }
     @Override
     public int getToolBarId() {
-        return com.modular.appmessages.R.id.cycleCountToolBar;
+        return R.id.cycleCountToolBar;
     }
 
     @Override
     public int getLayoutRes() {
-        return com.modular.appmessages.R.layout.acativity_task_list;
+        return R.layout.acativity_task_list;
     }
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -476,30 +477,30 @@ public class TaskB2BActivity extends SupportToolBarActivity implements View.OnCl
     }
 
     private void initHeaderView() {
-        voiceSearchView = findViewById(com.modular.appmessages.R.id.mVoiceSearchView);
-        findViewById(com.modular.appmessages.R.id.backImg).setOnClickListener(this);
-        findViewById(com.modular.appmessages.R.id.addImg).setOnClickListener(this);
-        tabGroup = findViewById(com.modular.appmessages.R.id.tabGroup);
-        final View todoLine = findViewById(com.modular.appmessages.R.id.todoLine);
-        final View doneDealLine = findViewById(com.modular.appmessages.R.id.doneDealLine);
-        final View byMeLine = findViewById(com.modular.appmessages.R.id.byMeLine);
+        voiceSearchView = findViewById(R.id.mVoiceSearchView);
+        findViewById(R.id.backImg).setOnClickListener(this);
+        findViewById(R.id.addImg).setOnClickListener(this);
+        tabGroup = findViewById(R.id.tabGroup);
+        final View todoLine = findViewById(R.id.todoLine);
+        final View doneDealLine = findViewById(R.id.doneDealLine);
+        final View byMeLine = findViewById(R.id.byMeLine);
         tabGroup.setOnCheckedChangeListener(new DivideRadioGroup.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(DivideRadioGroup group, int checkedId) {
                 todoLine.setVisibility(View.GONE);
                 doneDealLine.setVisibility(View.GONE);
                 byMeLine.setVisibility(View.GONE);
-                if (checkedId == com.modular.appmessages.R.id.todoRb) {
+                if (checkedId == R.id.todoRb) {
                     todoLine.setVisibility(View.VISIBLE);
                     tab_type = 1;
                     adapter = new NewSchedultAdapter(ct, waitList);
                     real_List = waitList;
-                } else if (checkedId == com.modular.appmessages.R.id.doneDealRb) {
+                } else if (checkedId == R.id.doneDealRb) {
                     doneDealLine.setVisibility(View.VISIBLE);
                     tab_type = 2;
                     adapter = new NewSchedultAdapter(ct, doneList);
                     real_List = doneList;
-                } else if (checkedId == com.modular.appmessages.R.id.byMeRb) {
+                } else if (checkedId == R.id.byMeRb) {
                     byMeLine.setVisibility(View.VISIBLE);
                     tab_type = 3;
                     adapter = new NewSchedultAdapter(ct, isendList);

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Tue May 19 15:43:11 CST 2020
+#Fri May 22 09:52:19 CST 2020
 debugName=972
-versionName=717
+versionName=718
 debugCode=972
-versionCode=271
+versionCode=272

app_core/common/src/main/java/com/core/utils/WorkHandlerUtil.java

@@ -223,8 +223,8 @@ public class WorkHandlerUtil {
                 bean.setWorkaddr("默认地址");
                 beanList.add(bean);
             }
-            WorkLocationDao.getInstance().clearAndInsert(beanList);
         }
+        WorkLocationDao.getInstance().clearAndInsert(beanList);
         return beanList;
     }
 

app_modular/apputils/src/main/java/com/modular/apputils/utils/SignUtils.java

@@ -275,6 +275,8 @@ public class SignUtils implements OnHttpResultListener {
         param.put("facecard", "1");
         param.put("_noc", "1");
         param.put("emcode", getSharedPreferences(ct, "erp_username"));
+        param.put("sessionId", CommonUtil.getSharedPreferences(ct, "sessionId"));
+        param.put("sessionUser", getSharedPreferences(ct, "erp_username"));
         String url = isB2b ? ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().punch_worksignin_url :
                 "mobile/saveCardLog.action";
         Request request = new Request.Bulider()

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/utils/AutoErpSigninUitl.java

@@ -267,7 +267,7 @@ public class AutoErpSigninUitl implements OnHttpResultListener {
             if (!ListUtils.isEmpty(beanList)) {
                 for (WorkLocationModel bean : beanList) {
                     float dis = LocationDistanceUtils.distanceMeBack(bean.getLocation());
-                    if (dis < bean.getValidrange()) {
+                    if (dis != -1 && dis < bean.getValidrange()) {
                         distance = dis;
                         break;
                     }