Commit 993feac0 authored by fallenstardust's avatar fallenstardust

修正判断:是否已存在相同服务器信息

改为只判断host和port
parent a7c8a321
...@@ -92,8 +92,6 @@ public class HomeFragment extends BaseFragemnt implements OnDuelAssistantListene ...@@ -92,8 +92,6 @@ public class HomeFragment extends BaseFragemnt implements OnDuelAssistantListene
public static final int TYPE_GET_DATA_VER_OK = 3; public static final int TYPE_GET_DATA_VER_OK = 3;
private static final String ARG_MC_NEWS_LIST = "mcNewsList"; private static final String ARG_MC_NEWS_LIST = "mcNewsList";
private boolean isMcNewsLoadException = false; private boolean isMcNewsLoadException = false;
long lastClickTime = 0;
private LinearLayout ll_back; private LinearLayout ll_back;
ShimmerTextView tv; ShimmerTextView tv;
ShimmerTextView tv2; ShimmerTextView tv2;
......
...@@ -193,24 +193,23 @@ public class ServerUtil { ...@@ -193,24 +193,23 @@ public class ServerUtil {
} }
return fileList; return fileList;
}).done((list) -> { }).done((list) -> {
boolean hasServer = false;
if (list != null) { if (list != null) {
serverInfos.clear(); serverInfos.clear();
serverInfos.addAll(list.getServerInfoList()); serverInfos.addAll(list.getServerInfoList());
boolean hasServer = false; for (int i = 0; i < serverInfos.size(); i++) {
for (int i = 0; i < list.getServerInfoList().size(); i++) { if (mServerInfo.getServerAddr().equals(serverInfos.get(i).getServerAddr()) && mServerInfo.getPort() == serverInfos.get(i).getPort()) {//域名端口相同则视为已存在相同的服务器入口
if (mServerInfo.getName() != serverInfos.get(i).getName() && mServerInfo.getServerAddr() != serverInfos.get(i).getServerAddr()) {//判断服务器名称、域名IP不同则视为不存在
continue;
} else {
hasServer = true; hasServer = true;
break; break;
} else {
hasServer = false;
} }
} }
if (!hasServer && !serverInfos.contains(mServerInfo)) { if (!hasServer && !serverInfos.contains(mServerInfo)) {
serverInfos.add(mServerInfo); serverInfos.add(mServerInfo);
} }
saveItems(context, xmlFile, serverInfos);
} }
saveItems(context, xmlFile, serverInfos);
}); });
} }
......
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