|
|
@@ -45,6 +45,7 @@ public class ChannelContent {
|
|
|
private static final String CHANNEL_FILE_MARK = "pl_channel_";
|
|
|
private String channel_name = "";
|
|
|
private String gameId;
|
|
|
+ private String fromGameId;
|
|
|
private static ChannelContent instance;
|
|
|
private Properties properties;
|
|
|
private boolean hasChannelFile = false;
|
|
|
@@ -118,10 +119,16 @@ public class ChannelContent {
|
|
|
String comment = ZipChannelUtil.readQUA(new File(packageInfo.applicationInfo.sourceDir));
|
|
|
if (!TextUtils.isEmpty(comment)) {
|
|
|
hasChannelFile = true;
|
|
|
- if (comment.contains(";")) {
|
|
|
- String[] items = comment.split(";");
|
|
|
+ if (comment.contains(";") || comment.contains("_")) {
|
|
|
+ String[] items = comment.split("[;|_]");
|
|
|
+ int length =items.length;
|
|
|
channel_name = items[0];
|
|
|
- gameId = items[1];
|
|
|
+ if(length > 1) {
|
|
|
+ gameId = items[1];
|
|
|
+ }
|
|
|
+ if(length > 2) {
|
|
|
+ fromGameId = items[1];
|
|
|
+ }
|
|
|
} else {
|
|
|
channel_name = comment;
|
|
|
}
|
|
|
@@ -166,4 +173,8 @@ public class ChannelContent {
|
|
|
public String getGameId() {
|
|
|
return gameId;
|
|
|
}
|
|
|
+
|
|
|
+ public String getFromGameId() {
|
|
|
+ return fromGameId;
|
|
|
+ }
|
|
|
}
|