Skip to content

石璀亮 / system_info

Go to a project
Commit 216ba637 by 石璀亮
Options

fix(font):change chinese into xml

1 parent 135931ff
Inline Side-by-side
Showing with 21 additions and 10 deletions
.idea/misc.xml
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
<ConfirmationsSetting value="0" id="Add" /> <ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" /> <ConfirmationsSetting value="0" id="Remove" />
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">
......
.idea/vcs.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>
\ No newline at end of file
app/src/main/java/com/nbbsw/cuiliang/systemsetting/ProductModelActivity.java
...@@ -76,7 +76,7 @@ public class ProductModelActivity extends AppCompatActivity { ...@@ -76,7 +76,7 @@ public class ProductModelActivity extends AppCompatActivity {
final String[] arrayFruit = new String[] { "4G", "3G", "2G" }; final String[] arrayFruit = new String[] { "4G", "3G", "2G" };
Dialog alertDialog = new AlertDialog.Builder(this). Dialog alertDialog = new AlertDialog.Builder(this).
setTitle("选择型号"). setTitle(R.string.alert_type).
setIcon(R.drawable.ic_launcher) setIcon(R.drawable.ic_launcher)
.setSingleChoiceItems(arrayFruit, 0, new DialogInterface.OnClickListener() { .setSingleChoiceItems(arrayFruit, 0, new DialogInterface.OnClickListener() {
...@@ -85,14 +85,14 @@ public class ProductModelActivity extends AppCompatActivity { ...@@ -85,14 +85,14 @@ public class ProductModelActivity extends AppCompatActivity {
ProductModelActivity.mSelectedType = which; ProductModelActivity.mSelectedType = which;
} }
}). }).
setPositiveButton("确认", new DialogInterface.OnClickListener() { setPositiveButton(R.string.alert_sure, new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
EditText modelType = (EditText)findViewById(R.id.model_type); EditText modelType = (EditText)findViewById(R.id.model_type);
modelType.setText(arrayFruit[ProductModelActivity.mSelectedType]); modelType.setText(arrayFruit[ProductModelActivity.mSelectedType]);
} }
}). }).
setNegativeButton("取消", new DialogInterface.OnClickListener() { setNegativeButton(R.string.alert_cancel, new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
......
app/src/main/java/com/nbbsw/cuiliang/systemsetting/SettingActivity.java
...@@ -42,17 +42,17 @@ public class SettingActivity extends AppCompatActivity { ...@@ -42,17 +42,17 @@ public class SettingActivity extends AppCompatActivity {
private void settingTrue() { private void settingTrue() {
Dialog alertDialog = new AlertDialog.Builder(this). Dialog alertDialog = new AlertDialog.Builder(this).
setTitle("警告"). setTitle(R.string.alert_warn).
setMessage(R.string.setting_true_introduce). setMessage(R.string.setting_true_introduce).
setIcon(R.drawable.ic_launcher). setIcon(R.drawable.ic_launcher).
setPositiveButton("确定", new DialogInterface.OnClickListener() { setPositiveButton(R.string.alert_sure, new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
SystemSetting.restoreSettingTrue(); SystemSetting.restoreSettingTrue();
} }
}). }).
setNegativeButton("取消", new DialogInterface.OnClickListener() { setNegativeButton(R.string.alert_cancel, new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
...@@ -65,17 +65,17 @@ public class SettingActivity extends AppCompatActivity { ...@@ -65,17 +65,17 @@ public class SettingActivity extends AppCompatActivity {
private void settingReset() { private void settingReset() {
Dialog alertDialog = new AlertDialog.Builder(this). Dialog alertDialog = new AlertDialog.Builder(this).
setTitle("警告"). setTitle(R.string.alert_warn).
setMessage(R.string.setting_reset_introduce). setMessage(R.string.setting_reset_introduce).
setIcon(R.drawable.ic_launcher). setIcon(R.drawable.ic_launcher).
setPositiveButton("确定", new DialogInterface.OnClickListener() { setPositiveButton(R.string.alert_sure, new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
SystemSetting.resetSetting(); SystemSetting.resetSetting();
} }
}). }).
setNegativeButton("取消", new DialogInterface.OnClickListener() { setNegativeButton(R.string.alert_cancel, new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
......
app/src/main/res/values/strings.xml
...@@ -37,5 +37,9 @@ ...@@ -37,5 +37,9 @@
<string name="header_other_model">产品型号</string> <string name="header_other_model">产品型号</string>
<string name="input_tip_num">请输入正确的数值</string> <string name="input_tip_num">请输入正确的数值</string>
<string name="input_tip_type">请输入正确的类型</string> <string name="input_tip_type">请输入正确的类型</string>
<string name="alert_warn">警告</string>
<string name="alert_sure">确定</string>
<string name="alert_cancel">取消</string>
<string name="alert_type">选择型号</string>
</resources> </resources>
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!