合并代码

WeiChat/build.gradle

@@ -13,7 +13,7 @@ android {
     }
     signingConfigs {
         config {
-            storeFile file('E:/CompanyProject/applicationsignname[20150409]')
+            storeFile file('D:/config/applicationsignname[20150409]')
             storePassword '13237658359'
             keyAlias 'jie-20150409'
             keyPassword '13237658359'

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

@@ -4,6 +4,7 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -494,6 +495,7 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
                     JSONObject object = JSON.parseObject(json);
                     if (object == null) return;
                     mr_code = object.containsKey("mr_code") ? object.getString("mr_code") : "";
+                    Log.i("gongpengming", "object=" + object);
                 }
             }
         }

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

@@ -65,7 +65,7 @@ public class SelectActivity extends BaseActivity {
     private int type = -1;//1 网络  2.本地
     private String title = "";//标题
     private boolean isSingle = true;//是否单选
-   
+
     //location
     private List<SelectBean> formBeaan;//数据来源
     private Object object;
@@ -92,7 +92,7 @@ public class SelectActivity extends BaseActivity {
                     if ("common/dbfind.action".equals(action)) {
                         LogUtil.d("单选模式和单选接口");
                         dispalayMuliSelect(message);
-                    }else{
+                    } else {
                         LogUtil.d("单选模式和单选接口");
                         if (!StringUtils.isEmpty(key)) {
                             if (StringUtils.isEmpty(showKey)) return;
@@ -132,7 +132,7 @@ public class SelectActivity extends BaseActivity {
                         } else {//当返回的没有不需要key值时候
                         }
                     }
-                  
+
                 } else {
                     //多选解析
                     LogUtil.d("多选模式和多选接口");
@@ -288,7 +288,8 @@ public class SelectActivity extends BaseActivity {
                     putDownInput();
                     SelectBean bean = formBeaan.get(i);
                     bean.setId(id);
-                    bean.setJson(JSON.toJSONString(object));
+                    //TODO 出错 先删除  如果要修改  bean.setJson 的返回  联系负责人 Bitliker
+//                    bean.setJson(JSON.toJSONString(object));
                     Intent intent = new Intent();
                     intent.putExtra("data", bean);
                     setResult(0x20, intent);
@@ -317,7 +318,7 @@ public class SelectActivity extends BaseActivity {
         type = intent.getIntExtra("type", -1);
         title = intent.getStringExtra("title");
         id = intent.getIntExtra("id", 0);
-        object=intent.getParcelableExtra("object");
+        object = intent.getParcelableExtra("object");
         LogUtil.d(JSON.toJSONString(object));
         isSingle = intent.getBooleanExtra("isSingle", true);
         int reid = intent.getIntExtra("reid", -1);

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

@@ -15,7 +15,7 @@ import java.util.Map;
 import static com.xzjmyk.pm.activity.ui.erp.net.ViewUtil.ct;
 
 /**
- * 因为没有处理好内存，该类会引起内存溢出
+ * 因为没有处理好内存，该类会引起内存泄露
  * Created by gongpm on 2016/8/5.
  */
 @Deprecated

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/alarm/AlarmUtil.java

@@ -1,13 +0,0 @@
-package com.xzjmyk.pm.activity.ui.erp.util.alarm;
-
-/**
- * Created by Bitliker on 2016/11/18.
- */
-
-public class AlarmUtil {
-
-
-
-
-
-}

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/alarm/NotificationManage.java

@@ -11,6 +11,7 @@ import android.support.v7.app.NotificationCompat;
 
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 
 /**
  * 通知工具类
@@ -29,6 +30,10 @@ public class NotificationManage {
      * @param clazz   点击跳转的界面
      */
     private void sendNotification(Context context, int icon, String title, String content, Class<? extends Activity> clazz) {
+        sendNotification(context, icon, title, null, content, clazz);
+    }
+
+    private void sendNotification(Context context, int icon, String title, String group, String content, Class<? extends Activity> clazz) {
         NotificationManager mNotificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
         NotificationCompat.Builder builder = new NotificationCompat.Builder(context.getApplicationContext());
         builder.setSmallIcon(icon);
@@ -36,6 +41,8 @@ public class NotificationManage {
         builder.setAutoCancel(true);
         builder.setContentTitle(title);
         builder.setContentText(content);
+        if (!StringUtils.isEmpty(group))
+            builder.setGroup(group);
         Intent intent = new Intent(context, clazz);
         PendingIntent pendingIntent = PendingIntent.getActivity(context.getApplicationContext(), 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
         builder.setContentIntent(pendingIntent);
@@ -45,6 +52,7 @@ public class NotificationManage {
     public void sendNotification(Context context, Class<? extends Activity> clazz) {
         sendNotification(context, R.drawable.uuu, "提醒", "提醒", clazz);
     }
+
     public void sendNotification(Context context, int action, Class<? extends Activity> clazz) {
         SharedPreferences sharePrefer = MyApplication.getInstance().getSharedPreferences("SIGNIN", Context.MODE_APPEND);
         long oldTime = sharePrefer.getLong("SIGNIN_TIME", -1);
@@ -55,6 +63,7 @@ public class NotificationManage {
             //无效
         }
     }
+
     public void sendNotification(Context context, String action, Class<? extends Activity> clazz) {
         SharedPreferences sharePrefer = MyApplication.getInstance().getSharedPreferences("SIGNIN", Context.MODE_APPEND);
         long oldTime = sharePrefer.getLong("SIGNIN_TIME", -1);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/alarm/SigninPresenter.java

@@ -0,0 +1,61 @@
+package com.xzjmyk.pm.activity.ui.erp.util.alarm;
+
+import android.os.Handler;
+import android.os.Message;
+
+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.util.TimeUtils;
+
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import static com.xzjmyk.pm.activity.ui.erp.util.CommonUtil.getSharedPreferences;
+
+/**
+ * 针对打卡签到的数据存储和页面显示转接口
+ * Created by Bitliker on 2016/11/18.
+ */
+public class SigninPresenter {
+
+    private Handler handler = new Handler() {
+        @Override
+        public void handleMessage(Message msg) {
+
+        }
+    };
+
+
+    //获取
+    public void loadSigninAndLogs() {
+
+    }
+
+    //获取打卡记录
+    private void loadLog() {
+        String date = TimeUtils.s_long_2_str(System.currentTimeMillis());
+        //获取网络数据
+        Map<String, Object> param = new HashMap<>();
+        String code = getSharedPreferences(MyApplication.getInstance(), "erp_username");
+        param.put("currentMaster", getSharedPreferences(MyApplication.getInstance(), "erp_master"));
+        param.put("page", 1);
+        param.put("pageSize", 100);
+        param.put("condition", "cl_emcode='" + code + "' and to_char(cl_time,'yyyy-MM-dd')='" + date + "'");
+        param.put("caller", "CardLog");
+        param.put("emcode", code);
+        param.put("master", getSharedPreferences(MyApplication.getInstance(), "erp_master"));
+        net("mobile/oa/workdata.action", param, 0x12);
+    }
+
+
+    private void net(String action, Map<String, Object> param, int what) {
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(MyApplication.getInstance(), "sessionId"));
+        String url = CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_baseurl") + action;
+        ViewUtil.httpSendRequest(MyApplication.getInstance(), url, param, handler, headers, what, null, null, "post");
+    }
+
+
+}