Skip to content

Commit

Permalink
fix: 1.修复了后台自动断连的问题。
Browse files Browse the repository at this point in the history 
2.优化了App性能，减少了内存占用。
3.移除了一些不必要的代码。
  • Loading branch information
@Soulter
Soulter committed May 1, 2022
1 parent 8e9495d commit 5f6cdf7
Show file tree
Hide file tree
Showing 3 changed files with 67 additions and 147 deletions.
2 changes: 2 additions & 0 deletions app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.soulter.esndroid">

<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />

<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
Expand Down
190 changes: 65 additions & 125 deletions app/src/main/java/com/soulter/esndroid/ConnService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,33 +74,58 @@ public IBinder onBind(Intent intent) {
return null;
}

@Override
public void onCreate() {
super.onCreate();
showNotification();
}

private void showNotification(){
NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O){
NotificationChannel channel = new NotificationChannel("connService", "connService", NotificationManager.IMPORTANCE_HIGH);
notificationManager.createNotificationChannel(channel);
}
startForeground(1, getAntiKillNotification());
}

private Notification getAntiKillNotification() {
NotificationCompat.Builder builder = new NotificationCompat.Builder(this)
.setSmallIcon(R.drawable.abc_vector_test)
.setContentTitle("ESN正在后台运行")
.setFullScreenIntent( null, true)
.setPriority(Notification.PRIORITY_HIGH);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
builder.setChannelId("connService");
}
Notification notification = builder.build();
return notification;
}

BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
final SharedPreferences spfs = context.getSharedPreferences("spfs", Context.MODE_PRIVATE);
final SharedPreferences.Editor editor = context.getSharedPreferences("spfs", Context.MODE_PRIVATE).edit();
if (intent.getStringExtra(MainActivity.focus_user).equals("") && intent.getStringExtra(MainActivity.feature_type_tag).equals(MainActivity.onPullForRestart)){
new Thread(new Runnable() {
@Override
public void run() {
for(String key:linkedAccountMap.keySet()){
try{
linkedAccountMap.get(key).getEsnSession().requestNotifications(0,100);
}catch (Exception e){
e.printStackTrace();
Looper.prepare();
Toast.makeText(ConnService.this,"后台时网络出现过异常，自动修复异常的代码暂时未编写，建议重启应用",Toast.LENGTH_SHORT).show();
Looper.loop();
new Thread(() -> {
for(String key:linkedAccountMap.keySet()){
try{
linkedAccountMap.get(key).getEsnSession().requestNotifications(0,100);
}catch (Exception e){
e.printStackTrace();
Looper.prepare();
Toast.makeText(ConnService.this,"后台时网络出现过异常，自动修复异常的代码暂时未编写，建议重启应用",Toast.LENGTH_SHORT).show();
Looper.loop();

}
}
receiveLinkedCount(linkedCount);
if (!focusedUser.equals("")){
receivedLinkedUserTypes(focusedUser,linkedAccountMap.get(focusedUser).getTypes().toString(),focusedUser);
}
receiveLinkedCount(linkedCount);
if (!focusedUser.equals("")){
receivedLinkedUserTypes(focusedUser,linkedAccountMap.get(focusedUser).getTypes().toString(),focusedUser);

}
Thread.interrupted();
}
Thread.interrupted();
}).start();
}else{
if (!focusedUser.equals("")){
Expand Down Expand Up @@ -137,11 +162,11 @@ public void run() {
Log.v("lwl","logactivity id:"+idJson);
editor.putString("id_beans",idJson);
editor.apply();
Toast.makeText(ConnService.this,"新建成功",Toast.LENGTH_LONG);
Toast.makeText(ConnService.this,"新建成功",Toast.LENGTH_LONG).show();

}catch (Exception e){
e.printStackTrace();
Toast.makeText(ConnService.this,"新建失败",Toast.LENGTH_LONG);
Toast.makeText(ConnService.this,"新建失败",Toast.LENGTH_LONG).show();
}
} else
Toast.makeText(ConnService.this, "当前未聚焦一个Account类型的账户", Toast.LENGTH_LONG).show();
Expand All @@ -153,7 +178,7 @@ public void run() {
try {
esnBean.esnSession.removeAccount(intent.getStringExtra(MainActivity.RemoveAcUser),true);
} catch (Exception e) {
Toast.makeText(ConnService.this,"删除失败",Toast.LENGTH_LONG);
Toast.makeText(ConnService.this,"删除失败",Toast.LENGTH_LONG).show();
e.printStackTrace();
}
}else
Expand All @@ -168,7 +193,7 @@ public void run() {
try {
esnBean.esnSession.pushNotification(intent.getStringExtra(MainActivity.PushTarget), intent.getStringExtra(MainActivity.PushTitle), intent.getStringExtra(MainActivity.PushContent));
} catch (Exception e) {
Toast.makeText(ConnService.this, "推送失败", Toast.LENGTH_LONG);
Toast.makeText(ConnService.this, "推送失败", Toast.LENGTH_LONG).show();
e.printStackTrace();
}
}else
Expand All @@ -177,8 +202,6 @@ public void run() {
}
if (intent.getStringExtra(MainActivity.feature_type_tag).equals(MainActivity.onAppRunInBG)){
isAppRunInBG = true;
Log.v("lwl","当前在后台");
createNotification("","Esndroid正在实时接收推送","这么做是为了防杀后台","",-1);
}
if (intent.getStringExtra(MainActivity.feature_type_tag).equals(MainActivity.onAppRunInFG)){
isAppRunInBG = false;
Expand All @@ -200,9 +223,6 @@ public void run() {
List<IDBean> idBeans = getStoredID(spfs);
if (idBeans.size()==0){

Looper.prepare();
Toast.makeText(ConnService.this,"服务暂未启动，因为没有添加账号",Toast.LENGTH_SHORT).show();
Looper.loop();
stopSelf();
}
String serverUrl = spfs.getString("server_url","null");
Expand All @@ -215,17 +235,16 @@ public void run() {
@Override
public void notificationReceived(PackRespNotification packRespNotification) {
Log.v("lwl","id"+position);
receivedMsg(idBeans.get(position).userName,packRespNotification.Title,packRespNotification.Content,packRespNotification.Time,packRespNotification.Source,packRespNotification.Id,-1);
receivedMsg(idBeans.get(position).userName,packRespNotification.Title,packRespNotification.Content,packRespNotification.Time,packRespNotification.Source,packRespNotification.Id);
Log.v("lwl","rsaKey:"+packRespNotification.Id+" title:"+packRespNotification.Title);
}
@Override
public void sessionLogout(PackResult packResult) {
if (!isRestartService){
Log.v("lwl","没有重启标志");
receivedMsg(idBeans.get(position).userName,"账户登出,正在重连...","错误:"+packResult.Error,"","",-1,-1);
receivedMsg(idBeans.get(position).userName,"账户登出, 正在重连...","错误:"+packResult.Error,"","",-1);
try{
linkedAccountMap.get(idBeans.get(position).userName).getEsnSession().reConnect("39.100.5.139:3003", idBeans.get(position).userName, idBeans.get(position).getPass());
receivedMsg(idBeans.get(position).userName,"账户重连成功"," ","","",-1,-1);
receivedMsg(idBeans.get(position).userName,"账户重连成功"," ","","",-1);
sendBasicInfo("loading_linked");
linkedCount+=1;
linkedAccountMap.get(idBeans.get(position).userName).getEsnSession().requestNotifications(0,500);
Expand Down Expand Up @@ -259,7 +278,6 @@ public void sessionLogout(PackResult packResult) {
ESNBean esnBean = new ESNBean(idBeans.get(position).userName,esnSession,types);

linkedAccountMap.put(esnBean.username,esnBean);
// Log.v("lwl",linkedAccountMap.toString());
esnSession.requestNotifications(0,500);


Expand All @@ -270,63 +288,6 @@ public void sessionLogout(PackResult packResult) {
}
sendBasicInfo("loading_linked");


while(true){
if (isRestartService){
Log.v("lwl","tttt");
for(IDBean idBeanT:idBeans){
linkedAccountMap.get(idBeanT.getUserName()).getEsnSession().dispose();
linkedCount-=1;
receiveLinkedCount(linkedCount);
}
try{
Thread.sleep(500);
}catch (Exception e){
Log.v("lwl","BUBUBUBUBUBUBUBUBG");
e.printStackTrace();
}

while(true){
boolean isAllLinkDisposed = true;
for(IDBean idBeanT1:idBeans){
if (linkedAccountMap.get(idBeanT1.getUserName()).getEsnSession().isAvailable()){
isAllLinkDisposed = false;
}
}
if (isAllLinkDisposed){
sendBasicInfo("loading_linking");
Log.v("lwl","service restart");
sendBasicInfo("service_restart");
linkedAccountMap.clear();
linkedAccountMap = null;
isRestartService = false;
Thread.interrupted();
stopSelf();
break;

}
try{
Thread.sleep(500);
}catch (Exception e){
Log.v("lwl","BUBUBUBUBUBUBUBUBG");
e.printStackTrace();
}
}

}else{
Log.v("lwl","No Restart Signal Now...");
try{
Thread.sleep(2000);
}catch (Exception e){
Log.v("lwl","BUBUBUBUBUBUBUBUBG");
e.printStackTrace();
break;
}
}

}


}
}).start();

Expand Down Expand Up @@ -355,7 +316,7 @@ public static List<IDBean> getStoredID(SharedPreferences sp){
return arrayList;
}

public void receivedMsg(String username,String title,String content,String time,String fromUser,int msgId,int notifyCode){
public void receivedMsg(String username,String title,String content,String time,String fromUser,int msgId){
MsgBean msgBean= new MsgBean(username,title,content,time,fromUser,msgId);
Bundle bundle = new Bundle();
Log.v("lwl","接收到Msg:"+msgBean.content);
Expand All @@ -367,7 +328,7 @@ public void receivedMsg(String username,String title,String content,String time,
LocalBroadcastManager.getInstance(ConnService.this).sendBroadcast(intent);
if (isAppRunInBG){
Log.v("lwl","发送了通知");
createNotification(username,title,content,fromUser,notifyCode);
createNotification(username, title, content, fromUser);
}

}
Expand All @@ -391,58 +352,37 @@ public void receivedLinkedUserTypes(String username,String types,String focusedU
LocalBroadcastManager.getInstance(ConnService.this).sendBroadcast(intent);
}

public void createNotification(String user,String title,String content,String fromUser,int notyfyCode){
Log.v("lwl","createNotification");
public void createNotification(String user, String title, String content, String fromUser){
NotificationManager notificationManager=(NotificationManager) getSystemService(NOTIFICATION_SERVICE);
NotificationCompat.Builder builder = null;
final SharedPreferences spfs = ConnService.this.getSharedPreferences("spfs", Context.MODE_PRIVATE);
final SharedPreferences.Editor editor = ConnService.this.getSharedPreferences("spfs", Context.MODE_PRIVATE).edit();
if (!spfs.getBoolean("isCreatedNotificationChannel",false)) {
editor.putBoolean("isCreatedNotificationChannel",true);
editor.apply();
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
NotificationChannel notificationChannel = new NotificationChannel("EsnMsgChannel", getString(R.string.app_name),
NotificationManager.IMPORTANCE_HIGH);
notificationManager.createNotificationChannel(notificationChannel);
builder = new NotificationCompat.Builder(this, "EsnMsgChannel");
} else {
builder = new NotificationCompat.Builder(this);
}
}else{
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
builder = new NotificationCompat.Builder(this, "EsnMsgChannel");
} else {
builder = new NotificationCompat.Builder(this);
}
NotificationCompat.Builder builder;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
NotificationChannel notificationChannel = new NotificationChannel("EsnMsgChannel", getString(R.string.app_name),
NotificationManager.IMPORTANCE_HIGH);
notificationManager.createNotificationChannel(notificationChannel);
builder = new NotificationCompat.Builder(this, "EsnMsgChannel");
} else {
builder = new NotificationCompat.Builder(this);
}
builder.setSmallIcon(R.mipmap.ic_launcher)
.setNumber(2)
.setTicker("ESNdroid有新通知")
.setShowWhen(false)
.setTicker("ESN新通知")
.setShowWhen(true)
.setAutoCancel(true)
.setUsesChronometer(true)
.setFullScreenIntent( null, true)
.setDefaults(Notification.DEFAULT_ALL)
.setPriority(NotificationCompat.PRIORITY_HIGH);
builder.setContentText(content);
if (fromUser.equals("")&&user.equals("")&&isAppRunInBG){
if (fromUser.equals("")&&user.equals("") && isAppRunInBG){
builder.setContentTitle(title);
builder.setOngoing(true);
}
else builder.setContentTitle(fromUser+"给"+user+":"+title);
else builder.setContentTitle(fromUser + "->" +user);

Intent intent = new Intent(this, MainActivity.class);
PendingIntent pIntent = PendingIntent.getActivity(this, 1, intent, 0);
//点击跳转的intent
builder.setContentIntent(pIntent);
Notification notification = builder.build();
if(notyfyCode == -1){
notificationManager.notify(-1, notification);
}else{
notifyId+=1;
notificationManager.notify(notifyId, notification);
}

notificationManager.notify(0, notification);

}
@Override
Expand Down
22 changes: 0 additions & 22 deletions app/src/main/java/com/soulter/esndroid/MainActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,6 @@ protected void onCreate(Bundle savedInstanceState) {

final SharedPreferences spfs = getApplicationContext().getSharedPreferences("spfs", Context.MODE_PRIVATE);

Log.v("lwltest",getStoredID(spfs).toString());
if (getStoredID(spfs).size() == 0 || !spfs.getBoolean("is_server_added",false)){
mainAcAddServer.setVisibility(View.VISIBLE);
if (spfs.getBoolean("is_server_added",false)){
Expand Down Expand Up @@ -445,7 +444,6 @@ public void run() {
}
};


public void receivedMsg(MsgBean msgBean){
int msgId = msgBean.getMsgId();
boolean isSameMsg = false;
Expand All @@ -459,26 +457,6 @@ public void receivedMsg(MsgBean msgBean){
}
}

SimpleDateFormat sf = new SimpleDateFormat( "yyyy-MM-dd,hh:mm:ss" );
Collections.sort(msgBeans, new Comparator<MsgBean>() {
@Override
public int compare(MsgBean msgBean, MsgBean t1) {
try {
Date date1 = sf.parse(msgBean.getTime());
Date date2 = sf.parse(t1.getTime());
if (date1.before(date2)){
return -1;
}
if (date1.after(date2)){
return 1;
}
return 0;
} catch (Exception e){
e.printStackTrace( ) ;
}
return 0;
}
});
}else{
for (int i=0;i<msgBeans.size();i++){
if (-1 == msgBeans.get(i).getMsgId() && msgBean.getUsername().equals(msgBeans.get(i).getUsername())){
Expand Down

0 comments on commit 5f6cdf7

Please sign in to comment.