Browse Source

完成UU助手模块

Bitliker 8 years ago
parent
commit
f80772cd54

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/MessagePresenter.java

@@ -679,7 +679,6 @@ public class MessagePresenter implements OnHttpResultListener {
         if (!ListUtils.isEmpty(uuHelperItems)) {
         if (!ListUtils.isEmpty(uuHelperItems)) {
             Friend friend = new Friend();
             Friend friend = new Friend();
             friend.setNickName("UU 消息助手");
             friend.setNickName("UU 消息助手");
-            friend.setTimeSend((int) (uuHelperItems.get(uuHelperItems.size() - 1).getTimeSend() / 1000));
             friend.setType(XmppMessage.TYPE_UUHELPER);
             friend.setType(XmppMessage.TYPE_UUHELPER);
             friend.set_id(uuHelperItems.get(uuHelperItems.size() - 1).getId());
             friend.set_id(uuHelperItems.get(uuHelperItems.size() - 1).getId());
             friend.setClickNum(uuHelperItems.size());
             friend.setClickNum(uuHelperItems.size());
@@ -689,6 +688,7 @@ public class MessagePresenter implements OnHttpResultListener {
                 friend.setUnReadNum(0);
                 friend.setUnReadNum(0);
                 friends.add(friend);
                 friends.add(friend);
             } else {
             } else {
+                friend.setTimeSend((int) (uuHelperItems.get(uuHelperItems.size() - 1).getTimeSend() / 1000));
                 friend.setContent(uuHelperItems.get(uuHelperItems.size() - 1).getContent());
                 friend.setContent(uuHelperItems.get(uuHelperItems.size() - 1).getContent());
                 uuHelperNum = uuHelperItems.size();
                 uuHelperNum = uuHelperItems.size();
                 friend.setUnReadNum(uuHelperItems.size());
                 friend.setUnReadNum(uuHelperItems.size());

+ 1 - 1
app_core/common/src/main/java/com/core/dao/UUHelperDao.java

@@ -74,7 +74,7 @@ public class UUHelperDao extends Dao<UUHelperModel.UUHelperItem> {
 
 
     public List<UUHelperModel.UUHelperItem> getAllModels() {
     public List<UUHelperModel.UUHelperItem> getAllModels() {
         String orderBy = DatabaseTables.UUHelperTable.Cols.DATE + " asc";
         String orderBy = DatabaseTables.UUHelperTable.Cols.DATE + " asc";
-        String where = DatabaseTables.UUHelperTable.Cols.USER_ID;
+        String where = DatabaseTables.UUHelperTable.Cols.USER_ID+" =?";
         String[] whereArgs = {MyApplication.getInstance().getLoginUserId()};
         String[] whereArgs = {MyApplication.getInstance().getLoginUserId()};
         return query(null, where, whereArgs, orderBy);
         return query(null, where, whereArgs, orderBy);
     }
     }

+ 2 - 1
app_core/common/src/main/java/com/core/utils/IntentUtils.java

@@ -5,11 +5,12 @@ import android.content.Intent;
 
 
 
 
 public class IntentUtils {
 public class IntentUtils {
-    
+
     public static void webLinks(Context ct, String url, String text) {
     public static void webLinks(Context ct, String url, String text) {
         Intent intent_web = new Intent("com.modular.main.WebViewCommActivity");
         Intent intent_web = new Intent("com.modular.main.WebViewCommActivity");
         intent_web.putExtra("url", url);
         intent_web.putExtra("url", url);
         intent_web.putExtra("p", text);
         intent_web.putExtra("p", text);
         ct.startActivity(intent_web);
         ct.startActivity(intent_web);
     }
     }
+
 }
 }

+ 1 - 1
app_modular/appmessages/src/main/java/com/modular/appmessages/activity/UUHelperActivity.java

@@ -103,7 +103,7 @@ public class UUHelperActivity extends BaseActivity implements View.OnClickListen
         int id = v.getId();
         int id = v.getId();
         String url = null;
         String url = null;
         if (id == R.id.successfulTV) {
         if (id == R.id.successfulTV) {
-            url = "http://113.105.74.140:8080/new/";
+            url = "http://192.168.253.199:8099/ERP/";
             IntentUtils.webLinks(ct, url, "关于优软");
             IntentUtils.webLinks(ct, url, "关于优软");
         } else if (id == R.id.experienceTV) {
         } else if (id == R.id.experienceTV) {
             url = "http://113.105.74.140:8080/new/";
             url = "http://113.105.74.140:8080/new/";

+ 0 - 1
app_modular/appmessages/src/main/java/com/modular/appmessages/adapter/UUHelperAdapter.java

@@ -203,7 +203,6 @@ public class UUHelperAdapter extends RecyclerView.Adapter<UUHelperAdapter.ViewHo
     }
     }
 
 
     private void onLongItemClick(final UUHelperModel.UUHelperItem item) {
     private void onLongItemClick(final UUHelperModel.UUHelperItem item) {
-
 //        AlertDialog.Builder builder = new AlertDialog.Builder(ct);
 //        AlertDialog.Builder builder = new AlertDialog.Builder(ct);
 //        builder.setTitle(R.string.prompt_title).setMessage("确定删除该消息吗?").setPositiveButton(R.string.sure, new DialogInterface.OnClickListener() {
 //        builder.setTitle(R.string.prompt_title).setMessage("确定删除该消息吗?").setPositiveButton(R.string.sure, new DialogInterface.OnClickListener() {
 //            @Override
 //            @Override