From 6bfe22bb99b20319c29f98c95bab3f366d429c93 Mon Sep 17 00:00:00 2001 From: limqhz Date: Tue, 28 Jul 2020 01:07:44 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=A1=B5=E9=9D=A2=EF=BC=8C?= =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ydd/sportfaceid/MainActivity.java | 2 -- .../com/ydd/sportfaceid/StartApplication.java | 1 - .../ydd/sportfaceid/config/SDAppConfig.java | 35 ++++++++++++++++++- .../setting/SDSettingActivity.java | 13 ++----- .../ydd/sportfaceid/view/SDGustInfoView.java | 26 -------------- app/src/main/res/layout/activity_main.xml | 2 +- .../main/res/layout/activity_sdsetting.xml | 8 ++--- .../main/res/layout/layout_guest_info_top.xml | 21 ----------- 8 files changed, 41 insertions(+), 67 deletions(-) diff --git a/app/src/main/java/com/ydd/sportfaceid/MainActivity.java b/app/src/main/java/com/ydd/sportfaceid/MainActivity.java index 8aaaee6..0e6f204 100644 --- a/app/src/main/java/com/ydd/sportfaceid/MainActivity.java +++ b/app/src/main/java/com/ydd/sportfaceid/MainActivity.java @@ -1,8 +1,6 @@ package com.ydd.sportfaceid; import android.content.Intent; -import android.content.res.Configuration; -import android.net.Uri; import android.os.CountDownTimer; import android.os.Handler; import android.os.Bundle; diff --git a/app/src/main/java/com/ydd/sportfaceid/StartApplication.java b/app/src/main/java/com/ydd/sportfaceid/StartApplication.java index 2024ec2..f4fd6b4 100644 --- a/app/src/main/java/com/ydd/sportfaceid/StartApplication.java +++ b/app/src/main/java/com/ydd/sportfaceid/StartApplication.java @@ -6,7 +6,6 @@ import com.tencent.bugly.Bugly; import com.ydd.sportfaceid.config.SDAppConfig; import java.util.concurrent.Executor; -import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; diff --git a/app/src/main/java/com/ydd/sportfaceid/config/SDAppConfig.java b/app/src/main/java/com/ydd/sportfaceid/config/SDAppConfig.java index 85102ed..1c81ae1 100644 --- a/app/src/main/java/com/ydd/sportfaceid/config/SDAppConfig.java +++ b/app/src/main/java/com/ydd/sportfaceid/config/SDAppConfig.java @@ -1,12 +1,21 @@ package com.ydd.sportfaceid.config; import android.content.Context; +import android.content.SharedPreferences; +import android.text.TextUtils; import com.ydd.sportfaceid.netty.message.DeviceType; public class SDAppConfig { public static SDAppConfig config = null; private Context mContext; + private SharedPreferences sp; + private SharedPreferences.Editor sp_editor; + + private String KEY_CACHE = "KEY_CACHE"; + + private String STORE_VENUE = "STORE_VENUE"; + private String STORE_DEVICE_TYPE = "STORE_DEVICE_TYPE"; /** * 场馆ID */ @@ -25,10 +34,34 @@ public class SDAppConfig { public void init(Context context){ this.mContext = context; synchronized (SDAppConfig.class){ - // Do SomeThing + if (sp == null){ + sp = this.mContext.getSharedPreferences(KEY_CACHE, Context.MODE_PRIVATE); + sp_editor = sp.edit(); + configData(); + } } } + public void configData(){ + Integer storeVenueId = sp.getInt(STORE_VENUE, 0); + if (storeVenueId != null){ + this.venueId = storeVenueId; + } + String storeType = sp.getString(STORE_DEVICE_TYPE, "ENTER"); + if (!TextUtils.isEmpty(storeType)){ + this.deviceType = DeviceType.valueOf(storeType); + } + configSet(venueId,deviceType); + } + + public void configSet(Integer venueId,DeviceType deviceType){ + this.venueId = venueId; + this.deviceType = deviceType; + sp_editor.putInt(STORE_VENUE,venueId); + sp_editor.putString(STORE_DEVICE_TYPE,deviceType.name()); + sp_editor.commit(); + } + public Integer getVenueId() { return venueId; } diff --git a/app/src/main/java/com/ydd/sportfaceid/setting/SDSettingActivity.java b/app/src/main/java/com/ydd/sportfaceid/setting/SDSettingActivity.java index 437c964..b097970 100644 --- a/app/src/main/java/com/ydd/sportfaceid/setting/SDSettingActivity.java +++ b/app/src/main/java/com/ydd/sportfaceid/setting/SDSettingActivity.java @@ -21,14 +21,6 @@ public class SDSettingActivity extends SDBaseActivity { @BindView(R.id.device_type_cell) TextView device_type_cell; - - private Integer venueId; - /** - * 设备类型 ENTER / OUT - */ - private String deviceType; - - @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -38,15 +30,14 @@ public class SDSettingActivity extends SDBaseActivity { private void setConfig(){ Integer venueId = Integer.parseInt(venue_cell.getText().toString()); DeviceType deviceType = DeviceType.valueOf(device_type_cell.getText().toString()); - SDAppConfig.getInstance().setVenueId(venueId); - SDAppConfig.getInstance().setDeviceType(deviceType); + SDAppConfig.getInstance().configSet(venueId,deviceType); } public void onGoToMainAction(){ finish(); } - @OnClick({R.id.back_button,R.id.confirm_button}) void onCilck(View view){ + @OnClick({R.id.back_button,R.id.confirm_button}) void OnClick(View view){ switch (view.getId()){ case R.id.back_button: this.onGoToMainAction(); diff --git a/app/src/main/java/com/ydd/sportfaceid/view/SDGustInfoView.java b/app/src/main/java/com/ydd/sportfaceid/view/SDGustInfoView.java index 33638e1..cf14e17 100644 --- a/app/src/main/java/com/ydd/sportfaceid/view/SDGustInfoView.java +++ b/app/src/main/java/com/ydd/sportfaceid/view/SDGustInfoView.java @@ -1,14 +1,10 @@ package com.ydd.sportfaceid.view; import android.content.Context; -import android.graphics.Bitmap; -import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import android.text.TextUtils; import android.util.AttributeSet; import android.view.LayoutInflater; import android.widget.ImageView; -import android.widget.LinearLayout; import android.widget.RelativeLayout; import android.widget.TextView; @@ -46,40 +42,18 @@ public class SDGustInfoView extends RelativeLayout { @BindView(R.id.date_label) TextView date_label; - @BindView(R.id.app_member_name_label) - TextView app_member_name_label; - private Timer mTimerOutput; - public void setLogo(String logo) { - this.logo = logo; - - } - - private String logo; - - public void setMemberName(String memberName) { - this.app_member_name_label.setText(memberName); - } - - - public SDGustInfoView(Context context, @Nullable AttributeSet attrs) { super(context, attrs); this.mContext = context; LayoutInflater.from(context).inflate(R.layout.layout_guest_info_top, this); ButterKnife.bind(this); - configView(); sdConfigData(); startRunUpdateTime(); } - public void configView(){ - - this.app_member_name_label.setText(""); - } - public void sdConfigData(){ Date now_date = new Date(); SimpleDateFormat time_format =new SimpleDateFormat("HH:mm"); diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 00d65d4..fb74eff 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -11,7 +11,7 @@ + android:layout_height="65dp"/> @@ -74,15 +74,15 @@ android:layout_height="wrap_content" > diff --git a/app/src/main/res/layout/layout_guest_info_top.xml b/app/src/main/res/layout/layout_guest_info_top.xml index 9676c9b..08c49de 100644 --- a/app/src/main/res/layout/layout_guest_info_top.xml +++ b/app/src/main/res/layout/layout_guest_info_top.xml @@ -16,29 +16,8 @@ android:layout_height="wrap_content" android:src="@mipmap/ico_app_logo" /> - -