提交类型 修改需求

提交内容
1.添加消息模块数据库两个字段，将数据库版本提高到89
2.修改采购单详情界面内容，现还有回复接口需要调节一下
3.修改通用单据详情界面，避免一场出现
4.修改消息模块相关内容，针对审批知会消息进行第三层处理

冲突文件 版本文件、ViewUtil  取网络

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

@@ -133,16 +133,6 @@ public class ChatActivity extends ActionBackActivity
         } else if (getIntent() != null) {
             mFriend = (Friend) getIntent().getSerializableExtra(AppConstant.EXTRA_FRIEND);
         }
-        if (mFriend != null && mFriend.getRoomFlag() == 0) {
-            //将这个人的numClick 添加1
-            int i = mFriend.getClickNum();
-            FriendHelper.addGoodFriend(mFriend);
-            if (i < 10 && mFriend.getClickNum() == 10) {
-                Intent intent = new Intent("com.app.home.update");
-                intent.putExtra("isGood", true);
-                sendBroadcast(intent);
-            }
-        }
         mAudioManager = (AudioManager) getSystemService(android.app.Service.AUDIO_SERVICE);
         mChatMessages = new ArrayList<>();
         Downloader.getInstance().init(MyApplication.getInstance().mAppDir + File.separator + mLoginUserId
@@ -525,6 +515,7 @@ public class ChatActivity extends ActionBackActivity
             sendPushTask(mLoginUserId, mFriend.getUserId(), message.getContent());
 
         }
+        FriendHelper.addGoodFriend(this,mFriend);
     }
 
     private UploadEngine.ImFileUploadResponse mUploadResponse = new UploadEngine.ImFileUploadResponse() {

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Sat Jan 20 14:12:48 CST 2018
-debugName=495
+#Mon Jan 22 15:40:16 CST 2018
+debugName=498
 versionName=625
-debugCode=495
+debugCode=498
 versionCode=164

app_core/common/src/main/java/com/core/app/Constants.java

@@ -16,7 +16,7 @@ public class Constants {
     public static String IM_BASE_URL() {
         String url = "";
         if (BaseConfig.isDebug()) {
-            url = IM_BASE_URL_TEST;
+            url = IM_BASE_URL;
         } else {
             url = IM_BASE_URL;
         }

app_core/common/src/main/java/com/core/xmpp/FriendHelper.java

@@ -1,6 +1,7 @@
 package com.core.xmpp;
 
 import android.content.Context;
+import android.content.Intent;
 
 import com.android.volley.Response.ErrorListener;
 import com.android.volley.VolleyError;
@@ -123,12 +124,20 @@ public class FriendHelper {
     /**
      * 添加常用
      */
-    public static void addGoodFriend(Friend friend) {
-//        if (friend.getClickNum() < 10) {
-            friend.setClickNum(friend.getClickNum() + 1);
-            boolean b = FriendDao.getInstance().createOrUpdateFriend(friend);
-            LogUtil.i("b="+b);
-//        }
+    public static void addGoodFriend(Context context,Friend friend) {
+        if (friend != null && friend.getClickNum() < 10) {
+            int lastMagSend = friend.getTimeSend();
+            int defTime = ((int) System.currentTimeMillis() / 1000) - lastMagSend;
+            if (defTime<86400){
+                friend.setClickNum(10);
+                boolean b=FriendDao.getInstance().createOrUpdateFriend(friend);
+                if (b&&context!=null){
+                    Intent intent = new Intent("com.app.home.update");
+                    intent.putExtra("isGood", true);
+                    context.sendBroadcast(intent);
+                }
+            }
+        }
     }
 
     /**

app_modular/appcontact/src/main/java/com/uas/appcontact/adapter/FriendSortAdapter.java

@@ -16,6 +16,7 @@ import com.core.model.Friend;
 import com.core.utils.helper.AvatarHelper;
 import com.core.utils.sortlist.BaseSortModel;
 import com.core.widget.crouton.Crouton;
+import com.core.xmpp.FriendHelper;
 import com.uas.appcontact.R;
 import com.uas.appcontact.ui.widget.stickylistheaders.StickyListHeadersAdapter;
 
@@ -96,7 +97,7 @@ public class FriendSortAdapter extends BaseAdapter implements SectionIndexer,Sti
 //        } else {
 //            holder.tag_tv.setVisibility(View.GONE);
 //        }
-        Friend friend = mSortFriends.get(position).getBean();
+       final Friend friend = mSortFriends.get(position).getBean();
         final String phone = friend.getPhone();
         if (!StringUtil.isEmpty(phone)) {
             String check = "^((13[0-9])|(15[^4,\\D])|(18[0,5-9]))\\d{8}$";
@@ -151,6 +152,7 @@ public class FriendSortAdapter extends BaseAdapter implements SectionIndexer,Sti
                     if (matcher.matches()) {
 //                        selectByPhone(phone, finalConvertView);
                         SystemUtil.phoneAction(mContext,phone);
+                        FriendHelper.addGoodFriend(mContext,friend);
                     } else {
                         Crouton.makeText(mContext, R.string.not_format_phone);
                     }

app_modular/appcontact/src/main/java/com/uas/appcontact/ui/activity/MyFriendActivity.java

@@ -244,11 +244,11 @@ public class MyFriendActivity extends BaseActivity {
                 long startTime = System.currentTimeMillis();
                 if (mLoginUserId == null)
                     mLoginUserId = MyApplication.getInstance().mLoginUser.getUserId();
-//                if (isPeculiar) {
-//                    friends = FriendDao.getInstance().getFriends(mLoginUserId, "clickNum", 10);
-//                } else {
+                if (isPeculiar) {
+                    friends = FriendDao.getInstance().getFriends(mLoginUserId, "clickNum", 10);
+                } else {
                     friends = FriendDao.getInstance().getFriends(mLoginUserId);// 取所有好友
-//                }
+                }
                 if (friends != null)
                     Log.i("wang", "friends size()=" + friends.size());
                 long delayTime = 200 - (startTime - System.currentTimeMillis());// 保证至少200ms的刷新过程

app_modular/appme/src/main/java/com/uas/appme/other/activity/BasicInfoActivity.java

@@ -539,6 +539,7 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
                     } else {
                         ViewUtil.ShowMessageTitle(BasicInfoActivity.this, getString(R.string.error_phone));
                     }
+                    FriendHelper.addGoodFriend(ct,mFriend);
                 }
             }
         });

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/presenter/WorkPresenter.java

@@ -436,11 +436,11 @@ public class WorkPresenter implements OnHttpResultListener, IWorkPresenter {
      * @return
      */
     private boolean isSubmitAble(ArrayList<WorkModel> models) {
-        if (ListUtils.isEmpty(models) && !isFree) {
-            if (iWorkView != null)
-                iWorkView.showToast(R.string.not_work_message, R.color.load_warning);
-            return false;
-        }
+//        if (ListUtils.isEmpty(models) && !isFree) {
+//            if (iWorkView != null)
+//                iWorkView.showToast(R.string.not_work_message, R.color.load_warning);
+//            return false;
+//        }
         if (isSubmiting) {
             if (iWorkView != null)
                 iWorkView.showToast(R.string.not_signin_agin, R.color.load_warning);

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/activity/PurchaseDetailsActivity.java

@@ -9,25 +9,13 @@ import android.support.v7.widget.RecyclerView;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.view.KeyEvent;
-import android.view.LayoutInflater;
 import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.EditText;
 import android.widget.LinearLayout;
-import android.widget.ListView;
-import android.widget.TextView;
 import android.widget.Toast;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.baidu.cyberplayer.utils.G;
-import com.baidu.platform.comapi.map.E;
-import com.chad.library.adapter.base.BaseViewHolder;
-import com.common.LogUtil;
-import com.common.data.CalendarUtil;
 import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
@@ -36,11 +24,7 @@ import com.common.thread.ThreadPool;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.net.http.http.OAHttpHelper;
-import com.core.utils.CommonUtil;
 import com.core.utils.ToastUtil;
-import com.core.utils.time.wheel.DateTimePicker;
-import com.core.widget.listener.EditChangeListener;
-import com.me.network.app.http.HttpClient;
 import com.me.network.app.http.Method;
 import com.modular.apputils.activity.BaseNetActivity;
 import com.modular.apputils.listener.OnSmartHttpListener;
@@ -161,7 +145,7 @@ public class PurchaseDetailsActivity extends BaseNetActivity implements OnSmartH
             String json = JSONUtil.map2JSON(mapList);
             reply(json);
         } else {
-            LogUtil.i("没有可以提交的明细表单");
+            ToastUtil.showToast(ct,"没有可以提交的明细表单");
         }
     }
 
@@ -170,7 +154,6 @@ public class PurchaseDetailsActivity extends BaseNetActivity implements OnSmartH
         int enuu = 10041559;
         String phone = "15671616315";
         Parameter.Builder builder = new Parameter.Builder();
-        LogUtil.i("json=" + json);
         builder.mode(Method.POST)
                 .url("mobile/sale/orders/reply")
                 .addParams("en_uu", enuu)
@@ -197,7 +180,6 @@ public class PurchaseDetailsActivity extends BaseNetActivity implements OnSmartH
 
     @Override
     public void onSuccess(int what, String message, Tags tag) throws Exception {
-        LogUtil.i("message=" + message);
         switch (what) {
             case 0x11:
                 handleMessage(message);
@@ -206,7 +188,7 @@ public class PurchaseDetailsActivity extends BaseNetActivity implements OnSmartH
                 replyNumber--;
                 if (replyNumber == 0) {
                     Toast.makeText(MyApplication.getInstance(), "回复成功", Toast.LENGTH_SHORT).show();
-                    if (this != null) {
+                    if (!this.isFinishing()) {
                         loadData();
                     }
                 }
@@ -220,8 +202,6 @@ public class PurchaseDetailsActivity extends BaseNetActivity implements OnSmartH
         if (0x12 == what && StringUtil.isEmpty(message) && this != null) {
             loadData();
         }
-
-
     }