Skip to content
This repository has been archived by the owner on Sep 3, 2019. It is now read-only.

Commit

Permalink
some bugfix for v1.5.1, release again
Browse files Browse the repository at this point in the history
  • Loading branch information
mcxiaoke committed Mar 11, 2016
1 parent d944222 commit 7ccd29a
Show file tree
Hide file tree
Showing 8 changed files with 61 additions and 46 deletions.
2 changes: 1 addition & 1 deletion app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ android {
minSdkVersion 15
targetSdkVersion 22
versionName "1.5.1"
versionCode 2016031101
versionCode 2016031102
applicationId "com.mcxiaoke.minicat2"
}

Expand Down
13 changes: 3 additions & 10 deletions app/src/main/java/com/mcxiaoke/minicat/api/FanFouApi.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import java.io.PrintStream;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.net.UnknownHostException;
import java.util.BitSet;
import java.util.List;
import java.util.concurrent.TimeUnit;
Expand Down Expand Up @@ -993,8 +992,8 @@ private String utf8Encode(String text) {
*/
private String fetch(final RequestBuilder builder) throws ApiException {
OAuthRequest request = builder.build();
request.setConnectTimeout(5, TimeUnit.SECONDS);
request.setReadTimeout(10, TimeUnit.SECONDS);
request.setConnectTimeout(30, TimeUnit.SECONDS);
request.setReadTimeout(30, TimeUnit.SECONDS);
try {

if (mOAuthService != null && mAccessToken != null) {
Expand All @@ -1008,16 +1007,10 @@ private String fetch(final RequestBuilder builder) throws ApiException {
// debug("fetch() statusCode=" + statusCode + " builder info="
// + builder + " builder=" + builder);
// }
if (statusCode == 200) {
if (statusCode >= 200 && statusCode < 300) {
return body;
}
throw new ApiException(statusCode, FanFouParser.error(body));
} catch (UnknownHostException e) {
if (DEBUG) {
Log.e(TAG, e.toString());
}
throw new ApiException(ApiException.IO_ERROR, e.getMessage(),
e);
} catch (IOException e) {
if (DEBUG) {
Log.e(TAG, e.toString());
Expand Down
28 changes: 0 additions & 28 deletions app/src/main/java/com/mcxiaoke/minicat/app/UIHome.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
import com.mcxiaoke.minicat.push.PushService;
import com.mcxiaoke.minicat.push.PushStatusEvent;
import com.mcxiaoke.minicat.service.AutoCompleteService;
import com.mcxiaoke.minicat.service.Constants;
import com.mcxiaoke.minicat.util.LogUtil;
import com.mcxiaoke.minicat.util.Utils;
import com.nostra13.universalimageloader.core.ImageLoader;
Expand Down Expand Up @@ -83,7 +82,6 @@ public class UIHome extends UIBaseSupport implements MenuCallback,
private DownloadManager mDownloadManager;
private int mCurrentIndex;
private int mCurrentPage;
private BroadcastReceiver mReceiver;
private AbstractFragment mCurrentFragment;
private Handler mHandler;

Expand All @@ -101,7 +99,6 @@ public void onCreate(Bundle savedInstanceState) {
}
setLayout();
setUmengUpdate();
registerReceiver();
setUp();
Bus.getDefault().register(this);
}
Expand Down Expand Up @@ -141,7 +138,6 @@ protected void onDestroy() {
AppContext.homeVisible = false;
Bus.getDefault().unregister(this);
mHandler.removeCallbacks(mCheckRunnable);
unregisterReceiver();
PushService.check(this);
AutoCompleteService.check(this);
Cache.clear();
Expand Down Expand Up @@ -560,30 +556,6 @@ private void setHomeTitle(int page) {
}
}

private void registerReceiver() {
if (mReceiver == null) {
final IntentFilter filter = new IntentFilter();
filter.addAction(Constants.ACTION_STATUS_SENT);
mReceiver = new BroadcastReceiver() {
@Override
public void onReceive(final Context context, final Intent intent) {
if (Constants.ACTION_STATUS_SENT.equals(intent.getAction())) {
if (mCurrentFragment != null) {
mCurrentFragment.startRefresh();
}
}
}
};
registerReceiver(mReceiver, filter);
}
}

private void unregisterReceiver() {
if (mReceiver != null) {
unregisterReceiver(mReceiver);
}
}

@BusReceiver
public void onEvent(final PushStatusEvent event) {
final StatusModel model = event.getStatus();
Expand Down
24 changes: 24 additions & 0 deletions app/src/main/java/com/mcxiaoke/minicat/fragment/HomeTimelineFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,13 @@
import android.database.Cursor;
import android.os.Bundle;
import android.util.Log;
import com.mcxiaoke.bus.Bus;
import com.mcxiaoke.bus.annotation.BusReceiver;
import com.mcxiaoke.minicat.AppContext;
import com.mcxiaoke.minicat.api.Paging;
import com.mcxiaoke.minicat.controller.DataController;
import com.mcxiaoke.minicat.dao.model.StatusModel;
import com.mcxiaoke.minicat.service.StatusUpdateEvent;
import com.mcxiaoke.minicat.service.SyncService;
import com.mcxiaoke.minicat.util.Utils;

Expand Down Expand Up @@ -35,6 +38,18 @@ public static HomeTimelineFragment newInstance(boolean refresh) {
return fragment;
}

@Override
public void onCreate(final Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Bus.getDefault().register(this);
}

@Override
public void onDestroy() {
super.onDestroy();
Bus.getDefault().unregister(this);
}

@Override
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
Expand Down Expand Up @@ -75,6 +90,15 @@ public String getTitle() {
return "主页";
}

@BusReceiver
public void onEvent(StatusUpdateEvent event) {
if (AppContext.DEBUG) {
Log.d(TAG, "onEvent StatusUpdateEvent ");
}
Utils.notify(getActivity(), "消息发送成功");
startRefresh();

}


}
20 changes: 20 additions & 0 deletions app/src/main/java/com/mcxiaoke/minicat/service/StatusUpdateEvent.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package com.mcxiaoke.minicat.service;

import com.mcxiaoke.minicat.dao.model.StatusModel;

/**
* User: mcxiaoke
* Date: 16/3/11
* Time: 11:29
*/
public class StatusUpdateEvent {
private StatusModel model;

public StatusUpdateEvent(final StatusModel m) {
this.model = m;
}

public StatusModel getModel() {
return model;
}
}
14 changes: 10 additions & 4 deletions app/src/main/java/com/mcxiaoke/minicat/service/SyncService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import android.os.RemoteException;
import android.support.v4.app.NotificationCompat;
import android.util.Log;
import com.mcxiaoke.bus.Bus;
import com.mcxiaoke.minicat.AppContext;
import com.mcxiaoke.minicat.R;
import com.mcxiaoke.minicat.api.Api;
Expand All @@ -45,6 +46,7 @@
import com.mcxiaoke.minicat.util.NetworkHelper;
import com.mcxiaoke.minicat.util.StringHelper;
import com.mcxiaoke.minicat.util.UmengHelper;
import com.mcxiaoke.minicat.util.Utils;

import java.io.File;
import java.util.ArrayList;
Expand Down Expand Up @@ -878,23 +880,30 @@ private boolean doStatusUpdate(final StatusUpdateInfo info, boolean needDeleteDr
UmengHelper.onStatusUpdateEvent(this, AppContext.getAccount(), result.getId());
}
res = true;
} else {
Utils.notify(this, "消息未发送成功，已保存到草稿箱");
showFailedNotification(info, "消息未发送，已保存到草稿箱",
getString(R.string.msg_server_error));
}
} catch (ApiException e) {
if (DEBUG) {
debug(e.toString());
e.printStackTrace();
}
if (e.statusCode >= 500) {
Utils.notify(this, "消息未发送成功，已保存到草稿箱");
showFailedNotification(info, "消息未发送，已保存到草稿箱",
getString(R.string.msg_server_error));
} else {
Utils.notify(this, "消息未发送成功，已保存到草稿箱");
showFailedNotification(info, "消息未发送，已保存到草稿箱", e.getMessage());
}

UmengHelper.onStatusUpdateError(this, AppContext.getAccount(), e.statusCode, e.errorMessage, e.getCause() + "");

} catch (Exception e) {
debug(e.toString());
Utils.notify(this, "消息未发送成功，已保存到草稿箱");
showFailedNotification(info, "消息未发送，已保存到草稿箱",
getString(R.string.msg_unkonow_error));
UmengHelper.onStatusUpdateError(this, AppContext.getAccount(), 0, e.getMessage(), e.getCause() + "");
Expand Down Expand Up @@ -1362,10 +1371,7 @@ private void doSaveRecords(StatusUpdateInfo info) {
}

private void sendSuccessBroadcast(StatusModel status) {
Intent intent = new Intent(Constants.ACTION_STATUS_SENT);
intent.putExtra("data", status);
intent.setPackage(getPackageName());
sendOrderedBroadcast(intent, null);
Bus.getDefault().post(new StatusUpdateEvent(status));
}

private void doClose() {
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/com/mcxiaoke/minicat/util/ImageHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@
* @version 3.2 2011.12.26
*/
final public class ImageHelper {
public static final int IMAGE_QUALITY_HIGH = 95;
public static final int IMAGE_QUALITY_HIGH = 90;
public static final int IMAGE_QUALITY_MEDIUM = 85;
public static final int IMAGE_QUALITY_LOW = 70;
public static final int IMAGE_MAX_WIDTH = 1600;// 640 596
public static final int IMAGE_MAX_WIDTH_2 = 1000;// 640 596
public static final int IMAGE_MAX_WIDTH = 2400;// 640 596
public static final int IMAGE_MAX_WIDTH_2 = 1200;// 640 596
public static final int IMAGE_MAX_SIZE = 1024 * 1024 * 2;
public static final int OUTPUT_BUFFER_SIZE = 8196;
private static final String TAG = ImageHelper.class.getSimpleName();
Expand Down
Binary file modified release/minicat-1.5.1.apk
View file
Binary file not shown.

0 comments on commit 7ccd29a

Please sign in to comment.