Commit fb6a86d8 by cuiliang.shi

Model 配置界面更新

1 parent dac8a496
......@@ -324,9 +324,9 @@ public class BirdService extends Service {
mIMSIStr = temp_imsi.substring(0, temp_imsi.length() - 1);
mICCIDStr = temp_iccid.substring(0, temp_iccid.length() - 1);
// String temp_model = Build.MODEL;
// mModel = temp_model.trim().replaceAll(" ", "_");
mModel = "HBA7+";
String temp_model = Build.MODEL;
mModel = temp_model.trim().replaceAll(" ", "");
// mModel = "HBA7+";
}
......
......@@ -24,7 +24,7 @@ public class MainActivity extends Activity implements View.OnClickListener {
private SharedPreferences sp;
private LocationReceiver locationRecevier;
private Context mContext;
private final static String DEFAULTPATH = "http://202.100.179.139:8088/api";
private final static String DEFAULTPATH = "http://202.100.190.58:8090/api/cstmzPosition";
private final static long DEFAULTINTERVAL = 30;
private EditText url_et;
private EditText interval_et;
......@@ -78,6 +78,7 @@ public class MainActivity extends Activity implements View.OnClickListener {
Log.d("qqh","click"+v.getId());
switch (v.getId()) {
case R.id.bt_cancel:
Toast.makeText(mContext, R.string.save_cacel, Toast.LENGTH_SHORT).show();
finish();
break;
case R.id.bt_save:
......@@ -95,6 +96,7 @@ public class MainActivity extends Activity implements View.OnClickListener {
Log.d(TAG,"time---"+t);
DevicePreferences.getInstance(MainActivity.this).putString("bird_location_upload_url",url_temp );
DevicePreferences.getInstance(MainActivity.this).putLong("bird_location_upload_interval",t);
Toast.makeText(mContext, R.string.save_tips, Toast.LENGTH_SHORT).show();
finish();
break;
}
......
......@@ -4,59 +4,59 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="30dp"
android:padding="10dp"
android:orientation="vertical">
<LinearLayout
<TextView
android:id="@+id/interval"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/interval"
android:textSize="18dp"
tools:layout_editor_absoluteX="4dp"
tools:layout_editor_absoluteY="0dp" />
<EditText
android:id="@+id/interval_value"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/interval"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/interval"
android:textSize="18dp"
tools:layout_editor_absoluteX="4dp"
tools:layout_editor_absoluteY="0dp" />
<EditText
android:id="@+id/interval_value"
android:layout_weight="1"
android:layout_width="match_parent"
android:layout_height="50sp"
android:inputType="number"
/>
</LinearLayout>
android:layout_height="wrap_content"
android:hint="@string/time_inter_tips"
android:inputType="number"
/>
<LinearLayout
<TextView
android:id="@+id/url"
android:layout_marginTop="20dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/url"
android:textSize="18dp" />
<EditText
android:hint="@string/server_tips"
android:id="@+id/url_value"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/url"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/url"
android:textSize="18dp" />
<EditText
android:id="@+id/url_value"
android:layout_weight="1"
android:layout_width="match_parent"
android:layout_height="50sp"
/>
</LinearLayout>
android:layout_height="wrap_content"
/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:orientation="horizontal"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_gravity="bottom">
<Button
android:id="@+id/bt_cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/dialog_cancel"
android:textAllCaps="false"
android:textSize="25sp"/>
<Button
android:layout_gravity="center_vertical"
android:focusable="true"
android:id="@+id/bt_cancel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/dialog_cancel"
android:textSize="25sp"/>
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
......@@ -64,11 +64,12 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom">
<Button
android:focusable="true"
android:id="@+id/bt_save"
android:layout_width="wrap_content"
android:layout_gravity="center_vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/dialog_save"
android:textAllCaps="false"
android:textSize="25sp" />
</LinearLayout>
</LinearLayout>
......
......@@ -10,4 +10,8 @@
<string name="error_msg_1">"Latitude and longitude information is invalid"</string>
<string name="error_msg_2">"Invalid MEID"</string>
<string name="error_msg_3">"Internal processing error"</string>
<string name="save_tips">保存成功</string>
<string name="save_cacel">取消</string>
<string name="time_inter_tips">请输入时间间隔</string>
<string name="server_tips">请输入当前服务器接口地址</string>
</resources>
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!