订阅号修改

MPAndroidChart/src/androidTest/java/com/example/administrator/mpandroidchart/ApplicationTest.java

@@ -1,13 +0,0 @@
-package com.example.administrator.mpandroidchart;
-
-import android.app.Application;
-import android.test.ApplicationTestCase;
-
-/**
- * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
- */
-public class ApplicationTest extends ApplicationTestCase<Application> {
-    public ApplicationTest() {
-        super(Application.class);
-    }
-}

MPAndroidChart/src/test/java/com/example/administrator/mpandroidchart/ExampleUnitTest.java

@@ -1,15 +0,0 @@
-package com.example.administrator.mpandroidchart;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * To work on unit tests, switch the Test Artifact in the Build Variants view.
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() throws Exception {
-        assertEquals(4, 2 + 2);
-    }
-}

WeiChat/build.gradle

@@ -4,10 +4,10 @@ apply plugin: 'com.getkeepsafe.dexcount'
 android {
     signingConfigs {
         config {
-            keyPassword '13237658359'
             storeFile file('D:/config/applicationsignname[20150409]')
             storePassword '13237658359'
             keyAlias 'jie-20150409'
+            keyPassword '13237658359'
         }
     }
     compileSdkVersion 22
@@ -21,6 +21,7 @@ android {
             targetCompatibility JavaVersion.VERSION_1_7
         }
         multiDexEnabled true
+        signingConfig signingConfigs.config
     }
     packagingOptions {
         exclude 'META-INF/LICENSE.txt'
@@ -35,6 +36,8 @@ android {
             signingConfig signingConfigs.config
         }
     }
+    productFlavors {
+    }
 }
 
 buildscript {

WeiChat/src/main/java/com/xzjmyk/pm/activity/BdLocationHelper.java

@@ -92,7 +92,6 @@ public class BdLocationHelper {
             // 百度定位成功
             mLongitude = location.getLongitude();
             mLatitude = location.getLatitude();
-          //  Log.i("gongpengming", "name==" + location.getPoiList().get(0).getName());
             if (location.getLocType() == BDLocation.TypeNetWorkLocation) {
                 mAddress = location.getAddrStr();
                 mProvinceName = location.getProvince();

WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/WorkLogAdapter.java

@@ -47,7 +47,6 @@ public class WorkLogAdapter extends BaseAdapter {
         @Override
         public void handleMessage(Message msg) {
             String message = msg.getData().getString("result");
-            Log.i("gongpengming", message);
             switch (msg.what) {
                 case PRAISE_WHAT:
                     JSONObject json = JSON.parseObject(message);
@@ -242,7 +241,6 @@ public class WorkLogAdapter extends BaseAdapter {
                 @Override
                 public void onClick(View v) {
                     //点击操作
-                    Log.i("gongpengming", "点击了" + comment.getBody());
 //                    if (comment.getUserId().equals(mLoginUserId)) {// 如果消息是我发的，那么就弹出删除和复制的对话框
 //                        showCommentLongClickDialog(messagePosition, position, CommentAdapter.this);
 //                    } else {// 弹出回复的框

WeiChat/src/main/java/com/xzjmyk/pm/activity/db/dao/SigninDao.java

@@ -46,13 +46,11 @@ public class SigninDao {
         try {
             k = db.insert(titleName, null, values);
         } catch (SQLException e) {
-            Log.i("gongpengming", e.getMessage());
             e.printStackTrace();
         } finally {
             values.clear();
             db.close();
         }
-        Log.i("gongpengming", k + "k=");
         return k;
     }
 
@@ -66,11 +64,9 @@ public class SigninDao {
         long k;
         //判断当天是否有数据
         if (getDateStatus(bean.getCode(), bean.getDate())>0) {
-            Log.i("gongpengming", "如果上午已经打卡过了");
             //如果上午已经打卡过了、就更新数据
             k = updata(bean.getCode(), bean.getDate(), bean.getDtime());
         } else {
-            Log.i("gongpengming", "如果没有打卡过");
             //如果没有打卡过、就插入数据
             k = insert(bean);
         }
@@ -88,7 +84,6 @@ public class SigninDao {
             String[] args = {date, code};
             k = db.update(titleName, values, where, args);
         } catch (SQLException e) {
-            Log.i("gongpengming", e.getMessage());
             e.printStackTrace();
         } finally {
             values.clear();
@@ -137,7 +132,6 @@ public class SigninDao {
                 bean.setDtime(values.getString(4));
             }
         } catch (SQLException e) {
-            Log.i("gongpengming", e.getMessage());
             e.printStackTrace();
         } finally {
             if (values != null)

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

@@ -149,12 +149,6 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
             params.put("latitude", String.valueOf(latitude));
         if (longitude != 0)
             params.put("longitude", String.valueOf(longitude));
-        Log.i("Arison", "LoginActivity:login:159:model=" + DeviceInfoUtil.getModel());
-        Log.i("Arison", "LoginActivity:login:160:osVersion=" + DeviceInfoUtil.getOsVersion());
-        Log.i("Arison", "LoginActivity:login:161:serial=" + DeviceInfoUtil.getDeviceId(mContext));
-        Log.i("Arison", "LoginActivity:login:162:latitude=" + String.valueOf(latitude));
-        Log.i("Arison", "LoginActivity:login:163:longitude=" + String.valueOf(longitude));
-        Log.i("gongpengming11", "phone=" + phoneNumber + "\n" + "password" + password);
         final StringJsonObjectRequest<LoginRegisterResult> request = new StringJsonObjectRequest<LoginRegisterResult>(mConfig.USER_LOGIN,
                 new ErrorListener() {
                     @Override
@@ -182,7 +176,6 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
                     login_manage(phoneNumber, password);//登录管理平台
 //                    startActivity(new Intent(ct, MainActivity.class));
                 } else {// 登录失败
-                    Log.i("gongpengming", result.getResultMsg());
                     String message = TextUtils.isEmpty(result.getResultMsg()) ? getString(R.string.login_failed) : result.getResultMsg();
                     ToastUtil.showToast(mContext, message);
                 }
@@ -235,7 +228,6 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
 				}, String.class, params, true);
 		mRequest.setTag(requestTag);
 		addDefaultRequest(mRequest);*/
-        Log.i("gongpengming", "phone=" + phone + "\n" + "password" + password);
         ViewUtil.LoginTask(phone, password, mContext);
     }
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/calendar/views/TaskMonthView.java

@@ -37,7 +37,7 @@ import java.util.Map;
 /**
  * MonthView
  *
- * @author gongpengming 2015-06-29
+ * @author Bitliker 2015-06-29
  */
 public class TaskMonthView extends View {
     private final Region[][] MONTH_REGIONS_4 = new Region[4][7];

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/cardcast/CardcastActivity.java

@@ -185,7 +185,6 @@ public class CardcastActivity extends BaseActivity implements View.OnClickListen
                 finish();
                 break;
             case R.id.btn_mutual://相互
-                Log.i("gongpengming", "btn_mutual and show the pager attentionFragment");
 //                btnG.setClickable(false);
 //                btnAG.setClickable(true);
 
@@ -193,8 +192,6 @@ public class CardcastActivity extends BaseActivity implements View.OnClickListen
 //                bt.show(attentionFragment);
                 break;
             case R.id.btn_Unilateral://单方
-                Log.i("gongpengming", "btn_guanzu and show the pager friendFragment");
-
 //                btnAG.setClickable(false);
 //                btnG.setClickable(true);
 //                bt.hide(attentionFragment);

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

@@ -53,7 +53,6 @@ public class CompanyActivity extends BaseActivity {
             @Override
             public void onRefresh() {
                 // TODO 刷新
-                Log.i("gongpengming", "正在刷新");
             }
         });
         lv_saff_list.setOnScrollListener(new AbsListView.OnScrollListener() {

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

@@ -101,7 +101,6 @@ public class DetailTaskActivity extends BaseActivity implements OnClickListener
             switch (msg.what) {
                 case Constants.LOAD_SUCCESS:
                     String result = msg.getData().getString("result");
-                    Log.i("gongpengming", result);
                     JSONObject object = JSON.parseObject(result);
                     Boolean falg = object.getBoolean("success");
                     if (falg) {
@@ -138,7 +137,6 @@ public class DetailTaskActivity extends BaseActivity implements OnClickListener
                     break;
                 case LOAD_SUCCESS_MSGTASK:
                     result = msg.getData().getString("result");
-                    Log.i("gongpengming", result);
                     if (adapter == null) {
                         adapter = new SimpleAdapter(ct, JSON.parseObject(result).getJSONArray("taskmsg"));
                         iv_taskMsg.setAdapter(adapter);
@@ -468,7 +466,6 @@ public class DetailTaskActivity extends BaseActivity implements OnClickListener
      */
     public void loadDataMsgTask(String ra_id) {
 //		progressDialog.show();
-        Log.i("gongpengming", "loadDataMsgTask");
         String url = "plm/record/msgTask.action";
         Map<String, Object> param = new HashMap<String, Object>();
         param.put("ra_id", ra_id);

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

@@ -94,7 +94,6 @@ public class NoticeMenuActivity extends BaseActivity {
 
     private int itemClick = 0x00a, setData = 0xaab;
     public void distribute(int i, int type) {
-        Log.i("gongpengming", "i=" + i + ":::" + "type=" + type);
         switch (i) {
             case 0:
                 if (type == itemClick) {

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

@@ -163,7 +163,6 @@ public class SaleDetailActivity extends BaseActivity implements OnClickListener
 		initData();
 	}
 	public void initView() {
-		Log.i("gongpengming","病假详情");
 		setContentView(R.layout.act_sale_detail_list);
 		TAG = "SaleDetailActivity";
 		ct=this;

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

@@ -88,7 +88,6 @@ public class TaskActivity extends BaseActivity {
             }
             if (msg.what == 2) {
                 String result = msg.getData().getString("result");
-                Log.i("gongpengming",result);
                 JSONObject dataroot = JSON.parseObject(result);
                 JSONArray data = dataroot.getJSONArray("data");
                 allList.clear();

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

@@ -127,7 +127,6 @@ public class WebViewCommActivity extends BaseActivity {
             @Override
             public void onReceivedError(WebView view, int errorCode, String description, String failingUrl) {
                 if (isCookie) {
-                    Log.i("gongpengming", "errorCode=" + errorCode + "###" + "=description=" + description + "####failingUrl=" + failingUrl);
                     ViewUtil.ct = WebViewCommActivity.this;
                     ViewUtil.LoginERPTask(WebViewCommActivity.this, hander, reCode);
                 }

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

@@ -251,7 +251,6 @@ public class WorkExtraActivity extends BaseActivity implements OnClickListener {
 
                         initDataFromServer(leaveEntities, items);
                     } catch (Exception e) {
-                        Log.i("gongpengming", e.getMessage());
                         ViewUtil.ShowMessageTitle(ct, "数据解析异常");
                     }
                     break;

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

@@ -24,10 +24,7 @@ public class AddLogActivity extends BaseActivity {
     private Handler handler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
-            String message = msg.getData().getString("result");
-            Log.i("gongpengming", message);
             if (ADD_WHAT == msg.what) {
-                Log.i("gongpengming", "发表成功");
                 setResult(0x22, new Intent());
                 finish();
             }
@@ -56,7 +53,6 @@ public class AddLogActivity extends BaseActivity {
         });
     }
     private void sendAble() {
-        Log.i("gongpengming", "判断是否能发表日志能力");
         StringBuilder builder = new StringBuilder();
         if (sum_tv.getText().toString().length() > 0) {
             builder.append("工作总结:\n" + sum_tv.getText().toString() + "\n");

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

@@ -102,7 +102,6 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
                     }
                     break;
                 case whatAdd:
-                    Log.i("gongpengming", "msg==whatAdd");
                     break;
                 case Constants.HTTP_SUCCESS_INIT:
                     break;
@@ -175,7 +174,6 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
             public void onResponse(ObjectResult<MucRoom> result) {
                 boolean parserResult = Result.defaultParser(ct, result, true);
                 if (parserResult && result.getData() != null) {
-                    Log.i("gongpengming", "创建群组成功" + result.getResultData());
                     sendMucChatMessage();
                 }
             }
@@ -300,7 +298,6 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
 
         @Override
         public void onFailure(String toUserId, ChatMessage message) {
-            Log.i("gongpengming", "发送失败");
         }
     };
 
@@ -445,7 +442,6 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
                 "\"AG_ISMESSAGE\":" + "\"\"" + "," +
                 "\"AG_ISWEEK\":" + "\"\"" +
                 "}";
-        Log.i("gongpengming", formStore);
         String caller = "Agenda";
         param.put("caller", caller);
         param.put("param", "[]");

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

@@ -109,7 +109,6 @@ public class AlarmReceiver extends BroadcastReceiver {
         c.setTimeInMillis(TimeUtils.f_str_2_long(temp));
         time[0] = c.get(Calendar.HOUR_OF_DAY);
         time[1] = c.get(Calendar.MINUTE);
-        Log.i("gongpengming", "time[0]=" + time[0] + "@@ time[1]=" + time[1]);
         return time;
     }
 

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

@@ -98,14 +98,10 @@ public class AlarmaActivity extends BaseActivity implements View.OnClickListener
     private void initArmmanager() {
         //先判断两个（上下班）的提醒那个距离当前时间最近
         //将上下班时间设置为今天时间
-        Log.i("gongpengming", "uDateTime=" + uDateTime);
-        Log.i("gongpengming", "dDateTime=" + dDateTime);
         int[] u = getHourAndM(uDateTime);
         int[] d = getHourAndM(dDateTime);
         uDateTime = getTimeFormat(u[0], u[1]);
         dDateTime = getTimeFormat(d[0], d[1]);
-        Log.i("gongpengming", "uDateTime=" + uDateTime);
-        Log.i("gongpengming", "dDateTime=" + dDateTime);
         //比较两个时间大小
         long uLong = TimeUtils.f_str_2_long(uDateTime);
         long dLong = TimeUtils.f_str_2_long(dDateTime);
@@ -161,7 +157,6 @@ public class AlarmaActivity extends BaseActivity implements View.OnClickListener
         c.setTimeInMillis(TimeUtils.f_str_2_long(temp));
         time[0] = c.get(Calendar.HOUR_OF_DAY);
         time[1] = c.get(Calendar.MINUTE);
-        Log.i("gongpengming", "time[0]=" + time[0] + "@@ time[1]=" + time[1]);
         return time;
     }
 
@@ -169,7 +164,6 @@ public class AlarmaActivity extends BaseActivity implements View.OnClickListener
         String h = (hh < 10 ? "0" : "") + hh;
         String m = (mm < 10 ? "0" : "") + mm;
         String temp = TimeUtils.s_long_2_str(System.currentTimeMillis()) + " " + h + ":" + m + ":" + "00";
-        Log.i("gongpengming", temp);
         return temp;
     }
 

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

@@ -4,8 +4,8 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.util.Log;
 import android.view.View;
+import android.widget.Button;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
@@ -39,6 +39,8 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
     private TextView oa_meeting_end_date;
     @ViewInject(R.id.oa_meeting_end)
     private TextView oa_meeting_end;
+    @ViewInject(R.id.click_btn)
+    private Button click_btn;
     @ViewInject(R.id.oa_meeting_start_date)
     private TextView oa_meeting_start_date;
     @ViewInject(R.id.status_tv)
@@ -56,7 +58,6 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
         public void handleMessage(Message msg) {
             progressDialog.dismiss();
             String message = (String) msg.getData().get("result");
-            Log.i("gongpengming", message);
             switch (msg.what) {
                 case whatLoad:
                     object = JSON.parseObject(message).getJSONObject("panelData");
@@ -65,11 +66,11 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
                 case ENDMEET:
                     ToastUtil.showToast(ct, "会议结束成功");
                     finish();
-                    Log.i("gongpengming", "what==whatLoad");
                     break;
                 case SIGNNIN:
                     ToastUtil.showToast(ct, "会议签到成功");
-                    Log.i("gongpengming", "what==doMeet");
+                    click_btn.setFocusable(false);
+                    click_btn.setClickable(false);
                     break;
                 case 0x14:
                     JSONObject numlist = JSON.parseObject(message).getJSONObject("participants");
@@ -96,8 +97,8 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
             ma_id = entity.getMa_id();
             ma_code = entity.getMa_code();
         }
-        loadNetData(whatLoad);
-        loadNetData(0x14);
+        loadDetailsData();
+        loadNumData();
         initView();
     }
 
@@ -143,18 +144,14 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
     }
 
     //下拉页面数据
-    private void loadNetData(int type) {
+    private void loadDetailsData() {
         progressDialog.show();
         //获取网络数据
         if (baseUrl == null) {
             baseUrl = CommonUtil.getSharedPreferences(this, "erp_baseurl");
         }
         String url = null;
-        if (type == whatLoad) {
-            url = baseUrl + "mobile/crm/getMeetingDetailParticipants.action";
-        } else {
-            url = baseUrl + "mobile/common/getPanel.action";
-        }
+        url = baseUrl + "mobile/common/getPanel.action";
         String em_code = CommonUtil.getSharedPreferences(ct, "erp_username");
         String sessionId = CommonUtil.getSharedPreferences(ct, "sessionId");
         final Map<String, Object> param = new HashMap<>();
@@ -163,15 +160,36 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
         param.put("emcode", em_code);
         param.put("formCondition", "ma_id=" + ma_id);
         param.put("gridCondition", "ma_id=" + ma_id);
-        if (type != whatLoad)
-            param.put("ma_code", ma_code);
         param.put("sessionId", sessionId);
-        Log.i("gongpengming", url + "?emcode=" + em_code + "sessionId=" + sessionId);
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
-        ViewUtil.httpSendRequest(ct, url, param, handler, headers, type, null, null, "post");
+        ViewUtil.httpSendRequest(ct, url, param, handler, headers, whatLoad, null, null, "post");
+    }
+
+    //获取网络数据
+    private void loadNumData() {
+        progressDialog.show();
+        //获取网络数据
+        if (baseUrl == null) {
+            baseUrl = CommonUtil.getSharedPreferences(this, "erp_baseurl");
+        }
+        String url = baseUrl + "mobile/crm/getMeetingDetailParticipants.action";
+        String em_code = CommonUtil.getSharedPreferences(ct, "erp_username");
+        String sessionId = CommonUtil.getSharedPreferences(ct, "sessionId");
+        final Map<String, Object> param = new HashMap<>();
+        String caller = "Meetingroomapply";
+        param.put("caller", caller);
+        param.put("emcode", em_code);
+        param.put("formCondition", "ma_id=" + ma_code);
+        param.put("gridCondition", "ma_id=" + ma_code);
+        param.put("ma_code", ma_code);
+        param.put("sessionId", sessionId);
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        ViewUtil.httpSendRequest(ct, url, param, handler, headers, 0x14, null, null, "post");
     }
 
+
     /**
      * 提交接口（结束会议、会议签到、为与会成员加 日程）
      *

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

@@ -48,7 +48,6 @@ public class MeetingActivity extends BaseActivity {
             progressDialog.dismiss();
             listView.setRefreshing(false);
             String message = (String) msg.getData().get("result");
-            Log.i("gongpengming", message);
             switch (msg.what) {
                 case whatLoad:
                     try {

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

@@ -120,7 +120,6 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Ad
                     }
                     break;
                 case whatSchedule:
-                    Log.i("gongpengming", "日程回调");
                     try {
                         JSONObject json = new JSONObject(message);
                         if (json.isNull("success") || !json.getBoolean("success")) {
@@ -331,7 +330,6 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Ad
                 }
                 loadNetData(status);
             case R.id.type:
-                Log.i("gongpengming", typeItems[i]);
                 switch (i) {
                     case 0:
                         state.setVisibility(View.GONE);

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

@@ -8,7 +8,6 @@ import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentPagerAdapter;
 import android.support.v4.view.ViewPager;
-import android.util.Log;
 
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
@@ -36,30 +35,16 @@ public class OARegisterActivity extends BaseActivity {
         public void handleMessage(Message msg) {
             progressDialog.dismiss();
             String message = (String) msg.getData().get("result");
-            Log.i("gongpengming", message);
             if (msg.what == 0x11) {
                 try {
                     JSONObject json = new JSONObject(message);
                     if (json.isNull("success") || !json.getBoolean("success")) return;
                     confirmed = json.getJSONObject("participants").getJSONArray("confirmed");
                     unconfirmed = json.getJSONObject("participants").getJSONArray("unconfirmed");
-//                    String[] strcon = new String[confirmed.length()];
-//                    String[] struncon = new String[unconfirmed.length()];
-//                    for (int i = 0; i < confirmed.length(); i++) {
-//                        strcon[i] = confirmed.getJSONObject(i).getString("EM_NAME");
-//                        Log.i("gongpengming", "strcon[]=" + strcon[i]);
-//                    }
-//                    for (int i = 0; i < unconfirmed.length(); i++) {
-//                        struncon[i] = unconfirmed.getJSONObject(i).getString("EM_NAME");
-//                        Log.i("gongpengming", "struncon[]=" + struncon[i]);
-//                    }
-//                    Log.i("gongpengming", "unconfirmed=" + unconfirmed.length() + "@@confirmed=" + confirmed.length());
                     updataUI();
                 } catch (JSONException e) {
-                    Log.i("gongpengming", "错误" + e.getMessage());
                     e.printStackTrace();
                 }
-                Log.i("gongpengming", "msg.what==0x11");
             }
         }
     };
@@ -107,7 +92,6 @@ public class OARegisterActivity extends BaseActivity {
         param.put("gridCondition", "ma_id=" + ma_code);
         param.put("ma_code", ma_code);
         param.put("sessionId", sessionId);
-        Log.i("gongpengming", url + "?emcode=" + em_code + "sessionId=" + sessionId);
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
         ViewUtil.httpSendRequest(ct, url, param, handler, headers, 0x11, null, null, "post");

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

@@ -39,7 +39,6 @@ public class VisitActivity extends BaseActivity {
         @Override
         public void handleMessage(Message msg) {
             String message = (String) msg.getData().get("result");
-            Log.i("gongpengming", message);
             switch (msg.what) {
                 case updataWhat:
                     break;
@@ -109,7 +108,6 @@ public class VisitActivity extends BaseActivity {
         param.put("formCondition", "vp_id=" + vp_id);
         param.put("gridCondition", "vp_id=" + vp_id);
         param.put("sessionId", sessionId);
-        Log.i("gongpengming", url + "?emcode=" + em_code + "sessionId=" + sessionId);
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
         ViewUtil.httpSendRequest(ct, url, param, handler, headers, loadWhat, null, null, "post");

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

@@ -7,9 +7,10 @@ import android.os.Message;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
-import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.View;
+import android.widget.AbsListView;
 import android.widget.ListView;
 
 import com.alibaba.fastjson.JSON;
@@ -98,7 +99,6 @@ public class WorkLogsActivity extends BaseActivity {
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        Log.i("gongpengming", "onContextItemSelected");
         switch (item.getItemId()) {
             case R.id.add_item:
                 startActivityForResult(new Intent(ct, AddLogActivity.class), requestCode);
@@ -132,20 +132,24 @@ public class WorkLogsActivity extends BaseActivity {
     private static boolean getResult(String text, String str) {
         Pattern p = Pattern.compile(str);
         Matcher m = p.matcher(text);
-//        ArrayList<String> strs = new ArrayList<String>();
         return m.find();
-//        while (m.find()) {
-//            strs.add(m.group(1));
-//        }
-//        for (String s : strs) {
-//            Log.i("gongepngming", s);
-//        }
     }
 
     private void initView() {
         bottom_view = (PMsgBottomView) findViewById(R.id.bottom_view);
         search_edit = (ClearEditText) findViewById(R.id.search_edit);
         context_rv = (PullToRefreshListView) findViewById(R.id.context_rv);
+        context_rv.setOnScrollListener(new AbsListView.OnScrollListener() {
+            @Override
+            public void onScrollStateChanged(AbsListView absListView, int i) {
+                if (bottom_view.getVisibility() == View.VISIBLE)
+                    bottom_view.hide();
+            }
+
+            @Override
+            public void onScroll(AbsListView absListView, int i, int i1, int i2) {
+            }
+        });
         context_rv.setMode(PullToRefreshBase.Mode.BOTH);
         bottom_view.setPMsgBottomListener(new PMsgBottomView.PMsgBottomListener() {
             @Override

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/db/DBManager.java

@@ -102,7 +102,6 @@ public class DBManager {
             sta.bindString(9, entity.getOr_headmanname() == null ? "" : entity.getOr_headmanname());
             sta.bindString(10, entity.getOr_headmancode() == null ? "" : entity.getOr_headmancode());
             sta.bindLong(11, entity.getOr_remark());
-//            Log.i("gongpengming")
             sta.executeInsert();
         }
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/SigninFragment.java

@@ -245,7 +245,6 @@ public class SigninFragment extends EasyFragment {
     private void sendHandle(long distance) {
         Message message = handler.obtainMessage();
         message.what = thrad;
-
         int d = (int) distance / 1000;
         int h = d / 3600;
         int m = (d % 3600) / 60;

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

@@ -35,11 +35,9 @@ public class CodeUtil {
         public void handleMessage(Message msg) {
             String message = msg.getData().getString("result");
             String code = null;
-            Log.i("gongpengming", message);
             if (msg.what == 0x11) {
                 JSONObject json = JSON.parseObject(message);
                 code = json.getString("code");
-                Log.i("gongpengming", "message=" + code);
                 if (linstener != null) {
                     linstener.callBack(code);
                     return;

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

@@ -344,7 +344,6 @@ public class CommonUtil {
 
     public static int getSharedPreferencesInt(Context ct, String key) {
         if (key == null) {
-            Log.i("gongpengming", "key==null");
             return 0;
         }
         SharedPreferences sPreferences = ct.getSharedPreferences(AppShareName, Context.MODE_PRIVATE);

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

@@ -5,7 +5,6 @@ import android.content.Context;
 import android.content.ServiceConnection;
 import android.os.IBinder;
 import android.text.TextUtils;
-import android.util.Log;
 
 import com.alibaba.fastjson.JSON;
 import com.android.volley.Response;
@@ -87,7 +86,6 @@ public class CreateRoomUtil {
 
         @Override
         public void onFailure(String toUserId, ChatMessage message) {
-            Log.i("gongpengming", "发送失败");
         }
     };
 
@@ -147,7 +145,6 @@ public class CreateRoomUtil {
             public void onResponse(ObjectResult<MucRoom> result) {
                 boolean parserResult = Result.defaultParser(context, result, true);
                 if (parserResult && result.getData() != null) {
-                    Log.i("gongpengming", "创建群组成功" + result.getResultData());
                     list.add(0, MyApplication.getInstance().mLoginUser.getUserId());
                     RoomImageUtil.getInstance().uploadAvatar(context, list, roomJid);//上传头像
                     result(true);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/groupchat/GroupChatFragment.java

@@ -284,7 +284,6 @@ public class GroupChatFragment extends EasyFragment {
                     List<MucRoom> datas = result.getData();
                     if (datas != null && datas.size() > 0) {
                         for (int i = 0; i < datas.size(); i++) {
-                            Log.i("gongpengming",datas.get(i).getName());
                             if (datas.get(i).getCategory() == 1) {
 
                             } else {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/groupchat/SelectContactsActivity.java

@@ -403,7 +403,6 @@ public class SelectContactsActivity extends BaseActivity {
                 continue;
             }
             String userId = mFriendList.get(mSelectPositions.get(i)).getUserId();
-            Log.i("gongpengming", userId);
             inviteUsers.add(userId);
         }
         //开启线程处理合成群头像操作

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

@@ -138,10 +138,6 @@ public class ChatActivity extends ActionBackActivity
         }
         mAudioManager = (AudioManager) getSystemService(android.app.Service.AUDIO_SERVICE);
         mChatMessages = new ArrayList<ChatMessage>();
-        Log.i("gongpengming",mFriend.getUserId());
-        Log.i("gongpengming",mFriend.getOwnerId());
-        Log.i("gongpengming",mFriend.get_id()+"");
-        Log.i("gongpengming",mFriend.getCompanyId()+"");
         Downloader.getInstance().init(MyApplication.getInstance().mAppDir + File.separator + mLoginUserId
                 + File.separator + Environment.DIRECTORY_MUSIC);
         initView();
@@ -162,7 +158,6 @@ public class ChatActivity extends ActionBackActivity
 
         @Override
         public void onReceive(Context context, Intent intent) {
-            Log.d("wang", "接收到广播");
             if (intent.getIntExtra(Constants.CHAT_REMOVE_MESSAGE_FALG, 10000) == 1) {//当广播为删除一个信息时候
                 if (mChatContentView != null) {
                     int position = intent.getIntExtra(Constants.CHAT_REMOVE_MESSAGE_POSITION, 10000);
@@ -181,7 +176,6 @@ public class ChatActivity extends ActionBackActivity
                     }
                 }
             } else {//当广播为删除一个信息时候
-                Log.i("gongpengming", "点击更多时候接受到广播");
                 if (botton_ll != null) {
                     botton_ll.setVisibility(View.VISIBLE);
                 }
@@ -269,7 +263,6 @@ public class ChatActivity extends ActionBackActivity
         List<Integer> ints = mChatContentView.getInts();
         ArrayList<ChatMessage> messages = new ArrayList<>();
         for (int i = 0; i < ints.size(); i++) {
-            Log.i("gongpengming", "当前i=" + i);
             messages.add(mChatMessages.get(ints.get(i)));
         }
         boolean isSuccess = ChatMessageDao.getInstance().deleteSingleChatMessage(mLoginUserId, mFriend.getUserId(), messages);

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

@@ -375,7 +375,7 @@ public class MessageFragment extends EasyFragment {
 
     public void setFriendName(List<Friend> friends, String id) {
         List<Friend> f = FriendDao.getInstance().getFriends(id);
-        if (friends==null)return;
+        if (friends == null) return;
         for (int i = 0; i < friends.size(); i++) {
             for (int j = 0; j < f.size(); j++) {
                 if (friends.get(i).get_id() == f.get(j).get_id()) {
@@ -915,10 +915,8 @@ public class MessageFragment extends EasyFragment {
                 for (int i = 0; i < allProcesses.size(); i++) {
                     if (allProcesses.get(i).getTypecode().contains("task")) {//我的任务
                         task_num++;
-                    } else if (allProcesses.get(i).getTypecode()
-                            .contains("dingyue")) {
-                        if (allProcesses.get(i).getStatus() == "0") {
-
+                    } else if (allProcesses.get(i).getTypecode().contains("dingyue")) {//订阅
+                        if ("0".equals(allProcesses.get(i).getStatus().trim())) {
                             pagin_num++;
                         }
                     } else {

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

@@ -1184,7 +1184,6 @@ public class RoomInfoActivity extends BaseActivity {
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         if (requestCode == 1 && resultCode == RESULT_OK) {
-            Log.i("gongpengming", "回来更新数据");
             loadMembers();
         }
     }

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

@@ -3,7 +3,6 @@ package com.xzjmyk.pm.activity.ui.message;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -83,7 +82,6 @@ public class SubscripSetActivity extends BaseActivity {
         @Override
         public void handleMessage(Message msg) {
             String message = (String) msg.getData().get("result");
-            Log.i("gongpengming", message);
             if (msg.what == 2) {
                 JSONObject object = null;
                 try {
@@ -117,7 +115,6 @@ public class SubscripSetActivity extends BaseActivity {
     private void saveData() {
         if (entities != null && entities.size() > 0)
             for (int i = 0; i < entities.size(); i++) {
-                Log.i("gongpengming", entities.get(i).isClicked() + "");
                 if (entities.get(i).isClicked()) {//被选中
                     if (addBuffer.length() > 0) {
                         addBuffer.append("," + entities.get(i).getId());
@@ -145,8 +142,6 @@ public class SubscripSetActivity extends BaseActivity {
                     }
                 }
             }
-        Log.i("gongpengming", "addBuffer=" + addBuffer.toString());
-        Log.i("gongpengming", "removeBuffer=" + removeBuffer.toString());
         if (addBuffer.length() > 0) {
             upSubdate(addType);
         }
@@ -172,7 +167,6 @@ public class SubscripSetActivity extends BaseActivity {
         //获取网络数据
         String empId = CommonUtil.getSharedPreferences(this, "erp_username");
         String url = baseUrl + urlsub;
-        Log.i("gongpengming", url + "\n" + Ids + "\n" + empId);
         final Map<String, Object> param = new HashMap<>();
         param.put("numIds", Ids);
         param.put("empId", empId);

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

@@ -6,7 +6,6 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -80,7 +79,6 @@ public class SubscriptionActivity extends BaseActivity {
             if (msg.what == 2) {
                 try {
                     JSONObject object = new JSONObject(message);
-                    Log.i("gongpengming", message);
                     JSONArray array = object.getJSONArray("data");
                     SubscriptionMessages = (ArrayList<SubscriptionMessage>) JSON.parseArray(array.toString(), SubscriptionMessage.class);
                     setData();

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/nearby/UserListActivity.java

@@ -3,7 +3,6 @@ package com.xzjmyk.pm.activity.ui.nearby;
 import android.content.Intent;
 import android.os.Bundle;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.AdapterView;
@@ -15,16 +14,16 @@ import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.xzjmyk.pm.activity.AppConfig;
 import com.xzjmyk.pm.activity.AppConstant;
-import com.xzjmyk.pm.activity.adapter.UserAdapter;
-import com.xzjmyk.pm.activity.bean.User;
-import com.xzjmyk.pm.activity.ui.circle.BasicInfoActivity;
-import com.xzjmyk.pm.activity.volley.ArrayResult;
-import com.xzjmyk.pm.activity.volley.StringJsonArrayRequest;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.adapter.UserAdapter;
+import com.xzjmyk.pm.activity.bean.User;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.circle.BasicInfoActivity;
 import com.xzjmyk.pm.activity.util.ToastUtil;
+import com.xzjmyk.pm.activity.volley.ArrayResult;
 import com.xzjmyk.pm.activity.volley.Result;
+import com.xzjmyk.pm.activity.volley.StringJsonArrayRequest;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -55,7 +54,6 @@ public class UserListActivity extends BaseActivity {
             mMaxAge = getIntent().getIntExtra("max_age", 0);
             mShowTime = getIntent().getIntExtra("show_time", 0);
         }
-        Log.i("gongpengmign", "sex=" + mSex);
         mUsers = new ArrayList<User>();
         mAdapter = new UserAdapter(mUsers, this);
         setContentView(R.layout.layout_pullrefresh_list);
@@ -137,7 +135,6 @@ public class UserListActivity extends BaseActivity {
                         mUsers.clear();
                     }
                     List<User> datas = result.getData();
-                    Log.i("gongpengming","datas.size="+datas.size()+""+result.toString());
                     if (datas != null && datas.size() > 0) {
 //                        addDatas(datas, mSex);
                         mUsers.addAll(datas);
@@ -155,7 +152,6 @@ public class UserListActivity extends BaseActivity {
             case 0:
                 for (int i = 0; i < datas.size(); i++) {
                     if (datas.get(i).getSex() != 0) {
-                        Log.i("gongpengming","错了"+datas.get(i).getNickName()+"=="+datas.size());
                         datas.remove(i);
                         i--;
                     }

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/AutoCreateRoomUtil.java

@@ -1,258 +0,0 @@
-package com.xzjmyk.pm.activity.util;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.ServiceConnection;
-import android.os.IBinder;
-import android.text.TextUtils;
-import android.util.Log;
-
-import com.alibaba.fastjson.JSON;
-import com.android.volley.Response;
-import com.android.volley.VolleyError;
-import com.xzjmyk.pm.activity.MyApplication;
-import com.xzjmyk.pm.activity.bean.Area;
-import com.xzjmyk.pm.activity.bean.message.MucRoom;
-import com.xzjmyk.pm.activity.volley.ObjectResult;
-import com.xzjmyk.pm.activity.volley.Result;
-import com.xzjmyk.pm.activity.volley.StringJsonObjectRequest;
-import com.xzjmyk.pm.activity.xmpp.CoreService;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 自动创建群工具类
- * Created by gongpm on 2016/7/26.
- */
-public class AutoCreateRoomUtil {
-    private static AutoCreateRoomUtil instence = null;
-
-    public AutoCreateRoomUtil() {
-
-    }
-
-    public static AutoCreateRoomUtil getInstence() {
-        if (instence == null) {
-            synchronized (AutoCreateRoomUtil.class) {
-                instence = new AutoCreateRoomUtil();
-            }
-        }
-        return instence;
-    }
-
-    private ServiceConnection mServiceConnection = new ServiceConnection() {
-        @Override
-        public void onServiceDisconnected(ComponentName name) {
-            mXmppService = null;
-        }
-
-        @Override
-        public void onServiceConnected(ComponentName name, IBinder service) {
-            mXmppService = ((CoreService.CoreServiceBinder) service).getService();
-            create();
-        }
-    };
-
-    private CoreService mXmppService;
-
-
-    private void createGroupChat(String nickName, String roomName, String roomSubject, String roomDesc,
-                                 List<String> inviteUsers, final int or_id) {
-//        AppConfig mConfig = MyApplication.getInstance().getConfig();
-//        String roomJid;
-//
-//        //创建群组
-//        try {
-//            roomJid = mXmppService.createMucRoom(nickName, roomName, roomSubject, roomDesc);
-//        } catch (NullPointerException e) {
-//            roomJid = mXmppService.createMucRoom(nickName, roomName, "", roomDesc);
-//        }
-//        if (TextUtils.isEmpty(roomJid)) {
-//            ToastUtil.showToast(context, R.string.create_room_failed);
-//            return;
-//        }
-//
-//        Map<String, String> params = new HashMap<String, String>();
-//        params.put("access_token", MyApplication.getInstance().mAccessToken);
-//        params.put("jid", roomJid);
-//        params.put("name", roomName);
-//        params.put("category", "1");
-//        params.put("desc", roomDesc);
-//        params.put("countryId", String.valueOf(Area.getDefaultCountyId()));// 国家Id
-//        Area area = Area.getDefaultProvince();
-//        if (area != null) {
-//            params.put("provinceId", String.valueOf(area.getId()));// 省份Id
-//        }
-//        area = Area.getDefaultCity();
-//        if (area != null) {
-//            params.put("cityId", String.valueOf(area.getId()));// 城市Id
-//            area = Area.getDefaultDistrict(area.getId());
-//            if (area != null) {
-//                params.put("areaId", String.valueOf(area.getId()));// 城市Id
-//            }
-//        }
-//
-//        double latitude = MyApplication.getInstance().getBdLocationHelper().getLatitude();
-//        double longitude = MyApplication.getInstance().getBdLocationHelper().getLongitude();
-//        if (latitude != 0)
-//            params.put("latitude", String.valueOf(latitude));
-//        if (longitude != 0)
-//            params.put("longitude", String.valueOf(longitude));
-//        params.put("text", JSON.toJSONString(inviteUsers));
-//        StringJsonObjectRequest<MucRoom> request = new StringJsonObjectRequest<MucRoom>(mConfig.ROOM_ADD,
-//                new Response.ErrorListener() {
-//                    @Override
-//                    public void onErrorResponse(VolleyError arg0) {
-//
-//                    }
-//                }, new StringJsonObjectRequest.Listener<MucRoom>() {
-//            @Override
-//            public void onResponse(ObjectResult<MucRoom> result) {
-//                boolean parserResult = Result.defaultParser(context, result, true);
-//                if (parserResult && result.getData() != null) {
-//                    Log.i("gongpengming", "创建群组成功");
-//                }
-//            }
-//        }, MucRoom.class, params);
-//        String HASHCODE = Integer.toHexString(this.hashCode()) + "@";
-//        MyApplication.getInstance().getFastVolley().addDefaultRequest(HASHCODE, request);
-    }
-
-    private String roomName;
-    private String roomDesc;
-    private List<String> inviteUsers;
-    private Context context;
-
-
-    public void create() {
-        String nickName = MyApplication.getInstance().mLoginUser.getNickName();
-        Log.i("gongpengming", "mXmppService==" + (mXmppService == null));
-        String roomJid;
-        try {
-            roomJid = mXmppService.createMucRoom(nickName, roomName, "", roomDesc);
-        } catch (NullPointerException e) {
-            roomJid = mXmppService.createMucRoom(nickName, roomName, "", roomDesc);
-        }
-        if (TextUtils.isEmpty(roomJid)) {
-            Log.i("gongpengming", "roomJid==null");
-            return;
-        }
-        Map<String, String> params = new HashMap<String, String>();
-        params.put("access_token", MyApplication.getInstance().mAccessToken);
-        params.put("jid", roomJid);
-        params.put("name", roomName);
-        params.put("desc", roomDesc);
-        params.put("countryId", String.valueOf(Area.getDefaultCountyId()));// 国家Id
-
-        Area area = Area.getDefaultProvince();
-        if (area != null) {
-            params.put("provinceId", String.valueOf(area.getId()));// 省份Id
-        }
-        area = Area.getDefaultCity();
-        if (area != null) {
-            params.put("cityId", String.valueOf(area.getId()));// 城市Id
-            area = Area.getDefaultDistrict(area.getId());
-            if (area != null) {
-                params.put("areaId", String.valueOf(area.getId()));// 城市Id
-            }
-        }
-
-        double latitude = MyApplication.getInstance().getBdLocationHelper().getLatitude();
-        double longitude = MyApplication.getInstance().getBdLocationHelper().getLongitude();
-        if (latitude != 0)
-            params.put("latitude", String.valueOf(latitude));
-        if (longitude != 0)
-            params.put("longitude", String.valueOf(longitude));
-        //TODO 开启线程处理合成群头像操作
-        params.put("text", JSON.toJSONString(inviteUsers));
-        StringJsonObjectRequest<MucRoom> request = new StringJsonObjectRequest<MucRoom>(MyApplication.getInstance().getConfig().ROOM_ADD,
-                new Response.ErrorListener() {
-                    @Override
-                    public void onErrorResponse(VolleyError arg0) {
-                        Log.i("gongpengming", "网络错误");
-                    }
-                }, new StringJsonObjectRequest.Listener<MucRoom>() {
-            @Override
-            public void onResponse(ObjectResult<MucRoom> result) {
-                boolean parserResult = Result.defaultParser(context, result, true);
-                if (parserResult && result.getData() != null) {
-                    Log.i("gongpengming", "创建成功" + result.toString());
-                }
-            }
-        }, MucRoom.class, params);
-        MyApplication.getInstance().getFastVolley().addDefaultRequest("", request);
-    }
-
-    /**
-     * @param roomName    群名字
-     * @param inviteUsers 群成员
-     * @param roomDesc    群说明
-     */
-    public void createGroupChat(final Context context, final String roomName, final String roomDesc, List<String> inviteUsers) {
-        String nickName = MyApplication.getInstance().mLoginUser.getNickName();
-        boolean mBind = context.bindService(CoreService.getIntent(), mServiceConnection, Context.BIND_AUTO_CREATE);
-        this.context = context;
-        this.roomName = roomName;
-        this.roomDesc = roomDesc;
-        this.inviteUsers = inviteUsers;
-
-//        Log.i("gongpengming", "mBind==" + mBind);
-//        Log.i("gongpengming", "mXmppService==" + (mXmppService == null));
-//        String roomJid;
-//        try {
-//            roomJid = mXmppService.createMucRoom(nickName, roomName, "", roomDesc);
-//        } catch (NullPointerException e) {
-//            roomJid = mXmppService.createMucRoom(nickName, roomName, "", roomDesc);
-//        }
-//        if (TextUtils.isEmpty(roomJid)) {
-//            Log.i("gongpengming", "roomJid==null");
-//            return;
-//        }
-//        Map<String, String> params = new HashMap<String, String>();
-//        params.put("access_token", MyApplication.getInstance().mAccessToken);
-//        params.put("jid", roomJid);
-//        params.put("name", roomName);
-//        params.put("desc", roomDesc);
-//        params.put("countryId", String.valueOf(Area.getDefaultCountyId()));// 国家Id
-//
-//        Area area = Area.getDefaultProvince();
-//        if (area != null) {
-//            params.put("provinceId", String.valueOf(area.getId()));// 省份Id
-//        }
-//        area = Area.getDefaultCity();
-//        if (area != null) {
-//            params.put("cityId", String.valueOf(area.getId()));// 城市Id
-//            area = Area.getDefaultDistrict(area.getId());
-//            if (area != null) {
-//                params.put("areaId", String.valueOf(area.getId()));// 城市Id
-//            }
-//        }
-//
-//        double latitude = MyApplication.getInstance().getBdLocationHelper().getLatitude();
-//        double longitude = MyApplication.getInstance().getBdLocationHelper().getLongitude();
-//        if (latitude != 0)
-//            params.put("latitude", String.valueOf(latitude));
-//        if (longitude != 0)
-//            params.put("longitude", String.valueOf(longitude));
-//        //TODO 开启线程处理合成群头像操作
-//        params.put("text", JSON.toJSONString(inviteUsers));
-//        StringJsonObjectRequest<MucRoom> request = new StringJsonObjectRequest<MucRoom>(MyApplication.getInstance().getConfig().ROOM_ADD,
-//                new Response.ErrorListener() {
-//                    @Override
-//                    public void onErrorResponse(VolleyError arg0) {
-//                        Log.i("gongpengming", "网络错误");
-//                    }
-//                }, new StringJsonObjectRequest.Listener<MucRoom>() {
-//            @Override
-//            public void onResponse(ObjectResult<MucRoom> result) {
-//                boolean parserResult = Result.defaultParser(context, result, true);
-//                if (parserResult && result.getData() != null) {
-//                    Log.i("gongpengming", "创建成功" + result.toString());
-//                }
-//            }
-//        }, MucRoom.class, params);
-//        MyApplication.getInstance().getFastVolley().addDefaultRequest("", request);
-    }
-}

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/CameraUtil.java

@@ -91,7 +91,6 @@ public final class CameraUtil {
 	 */
 	public static void cropImage(Activity activity, Uri originalFileUri, Uri outputFileUri, int requestCode, int aspectX, int aspectY, int outputX,
 			int outputY) {
-		Log.i("gongpengming",outputFileUri.toString());
 		if (originalFileUri == null) {
 			return;
 		}

WeiChat/src/main/java/com/xzjmyk/pm/activity/view/CalendarView.java

@@ -17,7 +17,7 @@ import java.util.Set;
 
 /**
  * 日历控件 功能：获得点选的日期区间
- * update by:gongpengming 2016/07/11
+ * update by:Bitliker 2016/07/11
  */
 public class CalendarView extends View implements View.OnTouchListener {
     private final static String TAG = "anCalendar";
@@ -61,7 +61,6 @@ public class CalendarView extends View implements View.OnTouchListener {
 
     public void setTaskDay(Set<Integer> taskDay) {
         this.taskDay = taskDay;
-        Log.i("gongpengming", taskDay.size() + "大小");
         invalidate();
     }
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/view/ChatContentView.java

@@ -134,7 +134,6 @@ public class ChatContentView extends PullDownListView implements OnMediaStateCha
     public ArrayList<Integer> getInts() {
         isShowCB = false;
         if (deleInts != null && deleInts.size() > 0) {
-            Log.i("gongpengming", deleInts.toString());
             ints.removeAll(deleInts);
         }
         return ints;
@@ -1271,7 +1270,6 @@ public class ChatContentView extends PullDownListView implements OnMediaStateCha
                     Intent broadcast1 = new Intent(Constants.CHAT_MESSAGE_DELETE_ACTION);//发送广播去界面更新
                     broadcast1.putExtra(Constants.CHAT_REMOVE_MESSAGE_FALG, 2);
                     mContext.sendBroadcast(broadcast1);
-                    Log.i("gongpengming", "点击更多");
                     break;
                 default:
                     break;

WeiChat/src/main/java/com/xzjmyk/pm/activity/volley/Result.java

@@ -59,7 +59,6 @@ public class Result {
             return true;
         } else if (result.resultCode == CODE_NO_TOKEN) {// 缺少参数Token
             //TODO 发出异常登录的广播
-            Log.i("gongpengming", "发出异常登录的广播1");
 //			LoginHelper.broadcastToken(context);
 //			LoginHelper.broadcastConflict(context);
             if (showToast)
@@ -67,7 +66,6 @@ public class Result {
             return false;
         } else if (result.resultCode == CODE_TOKEN_ERROR) {// Token过期或错误
             //TODO 发出异常登录的广播
-            Log.i("gongpengming", "发出异常登录的广播2");
             loginIM(context);
 //			LoginHelper.broadcastToken(context);
 //			LoginHelper.broadcastConflict(context);
@@ -77,7 +75,6 @@ public class Result {
         } else {
             if (showToast) {
                 //TODO 返回错误
-                Log.i("gongpengming", "返回错误"+result);
                 showResultToast(context, result);
             }
             return false;

WeiChat/src/main/java/com/xzjmyk/pm/activity/xmpp/XReconnectionManager.java

@@ -191,8 +191,6 @@ public class XReconnectionManager extends AbstractConnectionListener {
 			Log.d("wang", "开始重新登陆前的 Token 状态检查");
 			String requestUrl = MyApplication.getInstance().getConfig().USER_LOGIN_AUTO;
 			if (requestUrl == null) {
-				Log.i("gongpengming", "requestUrl 为空");
-
 				return 1;
 			}
 			HttpURLConnection httpConn = null;

WeiChat/src/main/res/drawable/bg_btn.xml

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-    <selector xmlns:android="http://schemas.android.com/apk/res/android">
-        <item android:state_pressed="true">
-            <shape>
-                <solid android:color="@color/btn_login_press" />
-                <corners android:radius="8dp" />
-                <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
-            </shape>
-        </item>
-        <item>
-            <shape>
-                <solid android:color="@color/btn_login_nomarl" />
-                <corners android:radius="8dp" />
-                <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
-            </shape>
-        </item>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <shape>
+            <solid android:color="@color/btn_login_press" />
+            <corners android:radius="8dp" />
+            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <solid android:color="@color/btn_login_nomarl" />
+            <corners android:radius="8dp" />
+            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+        </shape>
+    </item>
 </selector>

WeiChat/src/main/res/drawable/bg_btn_pass.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <shape>
+        <solid android:color="@color/btn_login_press" />
+        <corners android:radius="8dp" />
+        <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+    </shape>
+</selector>

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

@@ -173,10 +173,8 @@
                 android:layout_height="wrap_content"
                 android:layout_below="@id/sub"
                 android:layout_marginTop="5dp"
-                android:text="产品部、技术部门一起讨论crm、oa的研发"
+                android:text="无"
                 android:textColor="@color/text_hine" />
-
-
             <TextView
                 android:id="@+id/user"
                 android:layout_width="wrap_content"

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

@@ -202,14 +202,13 @@
                 android:layout_height="wrap_content"
                 android:text="打卡"
                 android:textColor="@color/white"
-                android:textSize="@dimen/text_main" />
+                android:textSize="30dp" />
 
             <TextView
                 android:id="@+id/newtime_tv"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="10dp"
-                android:text="2016-11-11 hh:hh:hh"
                 android:textColor="@color/white"
                 android:textSize="@dimen/text_min" />
         </LinearLayout>

libedittextformlibrary/src/androidTest/java/com/example/administrator/libedittextformlibrary/ApplicationTest.java

@@ -1,13 +0,0 @@
-package com.example.administrator.libedittextformlibrary;
-
-import android.app.Application;
-import android.test.ApplicationTestCase;
-
-/**
- * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
- */
-public class ApplicationTest extends ApplicationTestCase<Application> {
-    public ApplicationTest() {
-        super(Application.class);
-    }
-}

libedittextformlibrary/src/test/java/com/example/administrator/libedittextformlibrary/ExampleUnitTest.java

@@ -1,15 +0,0 @@
-package com.example.administrator.libedittextformlibrary;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * To work on unit tests, switch the Test Artifact in the Build Variants view.
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() throws Exception {
-        assertEquals(4, 2 + 2);
-    }
-}

libfloatingactionbutton/src/androidTest/java/com/github/clans/fab/ApplicationTest.java

@@ -1,13 +0,0 @@
-package com.github.clans.fab;
-
-import android.app.Application;
-import android.test.ApplicationTestCase;
-
-/**
- * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
- */
-public class ApplicationTest extends ApplicationTestCase<Application> {
-    public ApplicationTest() {
-        super(Application.class);
-    }
-}

libfloatingactionbutton/src/test/java/com/github/clans/fab/ExampleUnitTest.java

@@ -1,15 +0,0 @@
-package com.github.clans.fab;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * To work on unit tests, switch the Test Artifact in the Build Variants view.
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() throws Exception {
-        assertEquals(4, 2 + 2);
-    }
-}

libpsectionlistview/src/androidTest/java/com/hb/views/pinnedsection/ApplicationTest.java

@@ -1,13 +0,0 @@
-package com.hb.views.pinnedsection;
-
-import android.app.Application;
-import android.test.ApplicationTestCase;
-
-/**
- * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
- */
-public class ApplicationTest extends ApplicationTestCase<Application> {
-    public ApplicationTest() {
-        super(Application.class);
-    }
-}

libpsectionlistview/src/test/java/com/hb/views/pinnedsection/ExampleUnitTest.java

@@ -1,15 +0,0 @@
-package com.hb.views.pinnedsection;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * To work on unit tests, switch the Test Artifact in the Build Variants view.
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() throws Exception {
-        assertEquals(4, 2 + 2);
-    }
-}

librarymenudrawer/src/androidTest/java/net/simonvt/menudrawer/ApplicationTest.java

@@ -1,13 +0,0 @@
-package net.simonvt.menudrawer;
-
-import android.app.Application;
-import android.test.ApplicationTestCase;
-
-/**
- * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
- */
-public class ApplicationTest extends ApplicationTestCase<Application> {
-    public ApplicationTest() {
-        super(Application.class);
-    }
-}

librarymenudrawer/src/test/java/net/simonvt/menudrawer/ExampleUnitTest.java

@@ -1,15 +0,0 @@
-package net.simonvt.menudrawer;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * To work on unit tests, switch the Test Artifact in the Build Variants view.
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() throws Exception {
-        assertEquals(4, 2 + 2);
-    }
-}

materialdialogs/src/androidTest/java/com/example/administrator/materialdialogs/ApplicationTest.java

@@ -1,13 +0,0 @@
-package com.example.administrator.materialdialogs;
-
-import android.app.Application;
-import android.test.ApplicationTestCase;
-
-/**
- * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
- */
-public class ApplicationTest extends ApplicationTestCase<Application> {
-    public ApplicationTest() {
-        super(Application.class);
-    }
-}

materialdialogs/src/test/java/com/example/administrator/materialdialogs/ExampleUnitTest.java

@@ -1,15 +0,0 @@
-package com.example.administrator.materialdialogs;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * To work on unit tests, switch the Test Artifact in the Build Variants view.
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() throws Exception {
-        assertEquals(4, 2 + 2);
-    }
-}

pullToRefershLibraryMy/build.gradle

@@ -2,7 +2,6 @@ apply plugin: 'com.android.library'
 android {
     compileSdkVersion 22
     buildToolsVersion "22.0.1"
-
     defaultConfig {
         minSdkVersion 8
         targetSdkVersion 22