Skip to content

石璀亮 / agenew_a16_sos

Go to a project
Commit 0e55d7e9 by cuiliang.shi
Options

底部菜单ui更新

1 parent 4801cc15
Inline Side-by-side
Showing with 357 additions and 304 deletions
app/build.gradle
......@@ -6,8 +6,8 @@ android {
applicationId "com.toscl.location.hengfeng"
minSdkVersion 23
targetSdkVersion 28
versionCode 4
versionName "0.4"
versionCode 5
versionName "0.5"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
buildTypes {
......@@ -21,7 +21,7 @@ android {
android.applicationVariants.all { variant ->
variant.outputs.all {
// _${defaultConfig.versionName}
outputFileName = "LocationService.apk"
outputFileName = "LocationService_${defaultConfig.versionName}.apk"
}
}
compileOptions {
......
app/src/main/java/com/toscl/location/hengfeng/activity/ServiceApplyActivity.java
......@@ -8,6 +8,7 @@ import android.content.Intent;
import android.os.Bundle;
import android.telephony.SubscriptionManager;
import android.util.Log;
import android.view.KeyEvent;
import android.view.View;
import android.widget.EditText;
import android.widget.Toast;
......@@ -61,6 +62,16 @@ public class ServiceApplyActivity extends Activity implements View.OnClickListen
}
}
@Override
public boolean onKeyDown(int keyCode, KeyEvent event) {
if (keyCode == KeyEvent.KEYCODE_MENU){
String phoneNumber = mPhoneNumber.getText().toString();
apiPostServiceApply(phoneNumber);
return true;
}
return super.onKeyDown(keyCode, event);
}
private void apiPostServiceApply(String phoneNumber) {
JSONObject jsonBody = new JSONObject();
try {
......
app/src/main/java/com/toscl/location/hengfeng/activity/ServiceSettingActivity.java
......@@ -8,6 +8,7 @@ import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.util.Log;
import android.view.KeyEvent;
import android.view.View;
import android.widget.ArrayAdapter;
import android.widget.EditText;
......@@ -103,6 +104,15 @@ public class ServiceSettingActivity extends Activity implements View.OnClickList
}
}
@Override
public boolean onKeyDown(int keyCode, KeyEvent event) {
if (keyCode == KeyEvent.KEYCODE_MENU){
saveSetting();
return true;
}
return super.onKeyDown(keyCode, event);
}
private void saveSetting() {
int startIndex = mSpinnerForStartDate.getSelectedItemPosition();
int endIndex = mSpinnerForEndDate.getSelectedItemPosition();
......
app/src/main/java/com/toscl/location/hengfeng/activity/ServiceStopActivity.java
......@@ -7,6 +7,7 @@ import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.util.Log;
import android.view.KeyEvent;
import android.view.View;
import android.widget.EditText;
import android.widget.TextView;
......@@ -62,6 +63,20 @@ public class ServiceStopActivity extends Activity implements View.OnClickListene
}
}
@Override
public boolean onKeyDown(int keyCode, KeyEvent event) {
if (keyCode == KeyEvent.KEYCODE_MENU){
if (mEtPhoneNumber.getText().toString()
.equals(PreferencesUtil.getInstance(this).getString(PreferencesUtil.HENG_FENG_PHONE, ""))) {
apiStopService();
}else{
Toast.makeText(this, getResources().getString(R.string.tips_phone_unvalid), Toast.LENGTH_SHORT).show();
}
return true;
}
return super.onKeyDown(keyCode, event);
}
private void apiStopService() {
JSONObject jsonBody = new JSONObject();
try {
......
app/src/main/res/layout/service_apply.xml
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<TextView
android:layout_gravity="center"
android:textSize="24px"
android:padding="10px"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="请输入在营业厅申请的套餐手机号"
tools:ignore="MissingConstraints" />
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
style="@style/InputBoxStyle"
android:layout_marginTop="20px"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1">
<EditText
android:id="@+id/phone_number"
android:cursorVisible="true"
android:hint="输入手机号码"
android:textCursorDrawable="@color/colorPrimary"
android:text="0"
android:focusable="true"
android:focusableInTouchMode="true"
android:minWidth="330px"
android:textSize="28px"
style="@style/EditTextStyle"
android:inputType="number"
<TextView
android:layout_gravity="center"
android:textSize="24px"
android:padding="10px"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
<LinearLayout
android:layout_marginTop="50dp"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_gravity="bottom">
<Button
android:focusable="true"
android:id="@+id/bt_save"
android:layout_gravity="center_vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/dialog_save"
android:textSize="25sp" />
</LinearLayout>
android:text="请输入在营业厅申请的套餐手机号" />
<LinearLayout
android:orientation="horizontal"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_gravity="bottom">
<Button
android:layout_gravity="center_vertical"
style="@style/InputBoxStyle"
android:layout_marginTop="20px"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<EditText
android:id="@+id/phone_number"
android:cursorVisible="true"
android:hint="输入手机号码"
android:textCursorDrawable="@color/colorPrimary"
android:text="0"
android:focusable="true"
android:id="@+id/bt_cancel"
android:focusableInTouchMode="true"
android:minWidth="330px"
android:textSize="28px"
style="@style/EditTextStyle"
android:inputType="number"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/dialog_cancel"
android:textSize="25sp"/>
android:layout_height="wrap_content" />
</LinearLayout>
</LinearLayout>
<RelativeLayout
android:id="@+id/bottom"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="50px"
android:background="#ffffff"
android:layout_alignParentBottom="true">
<View android:background="#ffd3d3d3" android:layout_width="match_parent" android:layout_height="1dp"
android:layout_alignParentTop="true"/>
<TextView
android:id="@+id/bt_save"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="申请"
android:textColor="#000000"
android:textSize="30sp"
android:layout_centerVertical="true"
android:layout_alignParentLeft="true"
android:layout_marginLeft="20dp"
style="@style/TextStyleLsk"/>
<TextView
android:id="@+id/bt_cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="返回"
android:textColor="#090808"
android:textSize="30sp"
android:layout_centerVertical="true"
android:layout_alignParentRight="true"
android:layout_marginRight="20dp"
style="@style/TextStyleRsk"/>
</RelativeLayout>
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/service_settting.xml
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:padding="10dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<ScrollView
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="套餐手机号："
android:textSize="18px" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText
android:id="@+id/phone_number"
android:text="17895507717"
android:focusable="false"
android:focusableInTouchMode="false"
android:minWidth="330px"
android:textSize="18px"
style="@style/EditTextStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
<TextView
android:layout_marginTop="10px"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/interval"
android:textSize="18px" />
android:layout_height="0dp"
android:layout_weight="1">
<LinearLayout
style="@style/InputBoxStyle"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText
android:id="@+id/service_frequency"
android:cursorVisible="true"
android:hint="@string/time_inter_tips"
android:textCursorDrawable="@color/colorPrimary"
android:text="0"
android:focusable="true"
android:focusableInTouchMode="true"
android:minWidth="330px"
android:textSize="14px"
style="@style/EditTextStyle"
android:inputType="number"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
android:layout_height="0dp"
android:layout_weight="1">
<TextView
android:layout_marginTop="10px"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="每天上传时间："
android:textSize="18px" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="18px"
android:text="从 "/>
<Spinner
android:focusable="true"
android:nextFocusRight="@id/service_upload_end"
android:nextFocusDown="@id/service_upload_end"
android:id="@+id/service_upload_start"
android:layout_width="wrap_content"
android:textSize="25px"
android:layout_height="wrap_content"/>
android:text="套餐手机号："
android:textSize="18px" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="18px"
android:text=" 到 "/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText
android:id="@+id/phone_number"
android:text="17895507717"
android:focusable="false"
android:focusableInTouchMode="false"
android:minWidth="330px"
android:textSize="18px"
style="@style/EditTextStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
<Spinner
android:nextFocusLeft="@id/service_upload_start"
android:nextFocusUp="@id/service_upload_start"
android:id="@+id/service_upload_end"
<TextView
android:layout_marginTop="10px"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="25px"/>
</LinearLayout>
android:text="@string/interval"
android:textSize="18px" />
<TextView
android:layout_marginTop="10px"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="状态:"
android:textSize="18px" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText
android:id="@+id/service_available_status"
android:cursorVisible="true"
android:hint="@string/time_inter_tips"
android:textCursorDrawable="@color/colorPrimary"
android:text="开通"
android:textStyle="bold"
android:focusable="false"
android:focusableInTouchMode="false"
android:minWidth="330px"
android:textSize="18px"
style="@style/EditTextStyle"
android:inputType="number"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
<TextView
android:layout_marginTop="10px"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="有效日期:"
android:textSize="18px" />
<LinearLayout
android:layout_marginLeft="5px"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText
android:id="@+id/service_available_date"
android:textCursorDrawable="@color/colorPrimary"
android:text=""
android:textStyle="bold"
android:focusable="false"
android:focusableInTouchMode="false"
android:minWidth="330px"
android:textSize="14px"
style="@style/EditTextStyle"
android:inputType="number"
<LinearLayout
style="@style/InputBoxStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
android:layout_height="wrap_content">
<EditText
android:id="@+id/service_frequency"
android:cursorVisible="true"
android:hint="@string/time_inter_tips"
android:textCursorDrawable="@color/colorPrimary"
android:text="0"
android:focusable="true"
android:focusableInTouchMode="true"
android:minWidth="330px"
android:textSize="14px"
style="@style/EditTextStyle"
android:inputType="number"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15px">
<TextView
android:layout_marginTop="10px"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="每天上传时间："
android:textSize="18px" />
<LinearLayout
android:layout_width="0dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:layout_weight="1">
<Button
android:id="@+id/bt_save"
android:layout_width="match_parent"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:textSize="18px"
android:text="从 "/>
<Spinner
android:focusable="true"
android:text="@string/dialog_save"
android:textSize="25sp" />
android:nextFocusRight="@id/service_upload_end"
android:nextFocusDown="@id/service_upload_end"
android:id="@+id/service_upload_start"
android:layout_width="wrap_content"
android:textSize="25px"
android:layout_height="wrap_content"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="18px"
android:text=" 到 "/>
<Spinner
android:nextFocusLeft="@id/service_upload_start"
android:nextFocusUp="@id/service_upload_start"
android:id="@+id/service_upload_end"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="25px"/>
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
<TextView
android:layout_marginTop="10px"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:layout_weight="1"
android:orientation="horizontal">
android:text="状态:"
android:textSize="18px" />
<Button
android:id="@+id/bt_cancel"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText
android:id="@+id/service_available_status"
android:cursorVisible="true"
android:hint="@string/time_inter_tips"
android:textCursorDrawable="@color/colorPrimary"
android:text="开通"
android:textStyle="bold"
android:focusable="false"
android:focusableInTouchMode="false"
android:minWidth="330px"
android:textSize="18px"
style="@style/EditTextStyle"
android:inputType="number"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:focusable="true"
android:text="@string/dialog_cancel"
android:textSize="25sp" />
android:layout_height="wrap_content" />
</LinearLayout>
<TextView
android:layout_marginTop="10px"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="有效日期:"
android:textSize="18px" />
<LinearLayout
android:layout_marginLeft="5px"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText
android:id="@+id/service_available_date"
android:textCursorDrawable="@color/colorPrimary"
android:text=""
android:textStyle="bold"
android:focusable="false"
android:focusableInTouchMode="false"
android:minWidth="330px"
android:textSize="14px"
style="@style/EditTextStyle"
android:inputType="number"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</ScrollView>
\ No newline at end of file
</ScrollView>
<RelativeLayout
android:id="@+id/bottom"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="50px"
android:background="#ffffff"
android:layout_alignParentBottom="true">
<View android:background="#ffd3d3d3" android:layout_width="match_parent" android:layout_height="1dp"
android:layout_alignParentTop="true"/>
<TextView
android:id="@+id/bt_save"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="设置"
android:textColor="#000000"
android:textSize="30sp"
android:layout_centerVertical="true"
android:layout_alignParentLeft="true"
android:layout_marginLeft="20dp"
style="@style/TextStyleLsk"/>
<TextView
android:id="@+id/bt_cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="返回"
android:textColor="#090808"
android:textSize="30sp"
android:layout_centerVertical="true"
android:layout_alignParentRight="true"
android:layout_marginRight="20dp"
style="@style/TextStyleRsk"/>
</RelativeLayout>
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/service_stop.xml
<?xml version="1.0" encoding="utf-8"?>
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
android:layout_height="match_parent">
<ScrollView
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<TextView
android:id="@+id/service_stop_tips"
android:layout_gravity="center"
android:textSize="22px"
android:padding="10px"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="您在营业厅申请的套餐手机号为0，请再次输入该号码以确认停止定位服务"
tools:ignore="MissingConstraints" />
<LinearLayout
style="@style/InputBoxStyle"
android:layout_marginTop="5px"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<EditText
android:id="@+id/phone_number"
android:cursorVisible="true"
android:hint="输入手机号码"
android:textCursorDrawable="@color/colorPrimary"
android:text=""
android:focusable="true"
android:focusableInTouchMode="true"
android:minWidth="330px"
android:textSize="28px"
style="@style/EditTextStyle"
android:inputType="number"
android:layout_height="0dp"
android:layout_weight="1">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<TextView
android:id="@+id/service_stop_tips"
android:layout_gravity="center"
android:textSize="22px"
android:padding="10px"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
<LinearLayout
android:layout_marginTop="20dp"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_gravity="bottom">
<Button
android:focusable="true"
android:id="@+id/bt_save"
android:layout_gravity="center_vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/dialog_save"
android:textSize="25sp" />
</LinearLayout>
android:text="您在营业厅申请的套餐手机号为0，请再次输入该号码以确认停止定位服务" />
<LinearLayout
android:orientation="horizontal"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_gravity="bottom">
<Button
android:layout_gravity="center_vertical"
style="@style/InputBoxStyle"
android:layout_marginTop="5px"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<EditText
android:id="@+id/phone_number"
android:cursorVisible="true"
android:hint="输入手机号码"
android:textCursorDrawable="@color/colorPrimary"
android:text=""
android:focusable="true"
android:id="@+id/bt_cancel"
android:focusableInTouchMode="true"
android:minWidth="330px"
android:textSize="28px"
style="@style/EditTextStyle"
android:inputType="number"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/dialog_cancel"
android:textSize="25sp"/>
android:layout_height="wrap_content" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>
</ScrollView>
<RelativeLayout
android:id="@+id/bottom"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="50px"
android:background="#ffffff"
android:layout_alignParentBottom="true">
<View android:background="#ffd3d3d3" android:layout_width="match_parent" android:layout_height="1dp"
android:layout_alignParentTop="true"/>
<TextView
android:id="@+id/bt_save"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="停止"
android:textColor="#000000"
android:textSize="30sp"
android:layout_centerVertical="true"
android:layout_alignParentLeft="true"
android:layout_marginLeft="20dp"
style="@style/TextStyleLsk"/>
<TextView
android:id="@+id/bt_cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="返回"
android:textColor="#090808"
android:textSize="30sp"
android:layout_centerVertical="true"
android:layout_alignParentRight="true"
android:layout_marginRight="20dp"
style="@style/TextStyleRsk"/>
</ScrollView>
\ No newline at end of file
</RelativeLayout>
</LinearLayout>
\ No newline at end of file
app/src/main/res/values/styles.xml
......@@ -23,5 +23,14 @@
<item name="android:layout_marginLeft">10dp</item>
<item name="android:background">@null</item>
</style>
<style name="TextStyleRsk">
<item name="android:focusable">false</item>
<item name="android:clickable">true</item>
<item name="android:focusableInTouchMode">false</item>
</style>
<style name="TextStyleLsk">
<item name="android:focusable">false</item>
<item name="android:clickable">false</item>
<item name="android:focusableInTouchMode">false</item>
</style>
</resources>
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!