Commit 30e76b1d authored by feihuaduo's avatar feihuaduo

决斗助手房间代码判断修改

parent 0f36966f
...@@ -368,7 +368,10 @@ public class DuelAssistantService extends Service implements OnDuelAssistantList ...@@ -368,7 +368,10 @@ public class DuelAssistantService extends Service implements OnDuelAssistantList
@Override @Override
public void onJoinRoom(String password, int id) { public void onJoinRoom(String password, int id) {
if (id== ClipManagement.ID_CLIP_LISTENER) { if (id== ClipManagement.ID_CLIP_LISTENER) {
joinRoom(password); //如果有悬浮窗权限再显示
if (PermissionUtil.isServicePermission(this)) {
joinRoom(password);
}
} }
} }
......
...@@ -46,8 +46,19 @@ public class ClipManagement implements ClipboardManager.OnPrimaryClipChangedList ...@@ -46,8 +46,19 @@ public class ClipManagement implements ClipboardManager.OnPrimaryClipChangedList
//获取剪贴板内容 //获取剪贴板内容
public String getClipMessage() { public String getClipMessage() {
ClipData clipData = clipboardManager.getPrimaryClip(); ClipData clipData = clipboardManager.getPrimaryClip();
if (clipData == null) if (clipData == null) {
try {
FileLogUtil.writeAndTime("剪贴板为空");
} catch (IOException e) {
e.printStackTrace();
}
return null; return null;
}
try {
FileLogUtil.writeAndTime("剪贴板内容获取:"+clipData.getItemAt(0).getText().toString());
} catch (IOException e) {
e.printStackTrace();
}
return clipData.getItemAt(0).getText().toString(); return clipData.getItemAt(0).getText().toString();
} }
......
...@@ -110,11 +110,8 @@ public class DuelAssistantManagement implements OnClipChangedListener { ...@@ -110,11 +110,8 @@ public class DuelAssistantManagement implements OnClipChangedListener {
if (end - start == passwordPrefixKey.length()) if (end - start == passwordPrefixKey.length())
return false; return false;
} }
//如果有悬浮窗权限再显示
if (PermissionUtil.isServicePermission(context)) {
onJoinRoom(message.substring(start, end), id); onJoinRoom(message.substring(start, end), id);
return true; return true;
}
} }
return false; return false;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment