|
|
@ -163,7 +163,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter { |
|
|
|
* alphafine |
|
|
|
* alphafine |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
private AlphaFineConfigManager alphaFineConfigManager = AlphaFineConfigManager.getInstance(); |
|
|
|
private AlphaFineConfigManager alphaFineConfigManager = AlphaFineConfigManager.getInstance(); |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* 阅后即焚的配置项 |
|
|
|
* 阅后即焚的配置项 |
|
|
|
*/ |
|
|
|
*/ |
|
|
@ -1424,6 +1424,10 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter { |
|
|
|
* @return |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
private Locale checkLocale(Locale locale) { |
|
|
|
private Locale checkLocale(Locale locale) { |
|
|
|
|
|
|
|
// Yvan: REPORT-39341,有一些情况下,获取到的是zh-Hans-CN,转成zh_CN
|
|
|
|
|
|
|
|
if (locale != null) { |
|
|
|
|
|
|
|
locale = new Locale(locale.getLanguage(), locale.getCountry()); |
|
|
|
|
|
|
|
} |
|
|
|
return SupportLocale.getInstance().isSupport(locale) ? locale : Locale.US; |
|
|
|
return SupportLocale.getInstance().isSupport(locale) ? locale : Locale.US; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -1578,7 +1582,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter { |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private void readSnapChatConfig(XMLableReader reader) { |
|
|
|
private void readSnapChatConfig(XMLableReader reader) { |
|
|
|
reader.readXMLObject(this.snapChatConfig = SnapChatConfig.getInstance()); |
|
|
|
reader.readXMLObject(this.snapChatConfig = SnapChatConfig.getInstance()); |
|
|
|
} |
|
|
|
} |
|
|
@ -1801,14 +1805,14 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter { |
|
|
|
writeSnapChatConfig(writer); |
|
|
|
writeSnapChatConfig(writer); |
|
|
|
writer.end(); |
|
|
|
writer.end(); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private void writeSnapChatConfig(XMLPrintWriter writer) { |
|
|
|
private void writeSnapChatConfig(XMLPrintWriter writer) { |
|
|
|
|
|
|
|
|
|
|
|
if (this.snapChatConfig != null) { |
|
|
|
if (this.snapChatConfig != null) { |
|
|
|
this.snapChatConfig.writeXML(writer); |
|
|
|
this.snapChatConfig.writeXML(writer); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private void writeAlphaFineAttr(XMLPrintWriter writer) { |
|
|
|
private void writeAlphaFineAttr(XMLPrintWriter writer) { |
|
|
|
if (this.alphaFineConfigManager != null) { |
|
|
|
if (this.alphaFineConfigManager != null) { |
|
|
|
this.alphaFineConfigManager.writeXML(writer); |
|
|
|
this.alphaFineConfigManager.writeXML(writer); |
|
|
|