From c41c02a52bb12a5724f4d9e9d2e9a33167de88a4 Mon Sep 17 00:00:00 2001 From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674> Date: 星期一, 22 五月 2017 17:02:19 +0800 Subject: [PATCH] --- VisitFace/DemoForBsk/app/src/main/res/layout/load_more.xml | 2 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java | 15 ++++++- VisitFace/DemoForBsk/app/src/main/res/values/strings.xml | 2 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java | 14 ++++++ VisitFace/DemoForBsk/app/src/main/AndroidManifest.xml | 3 + VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/MainActivity.java | 23 +++++++++++ VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/BaseCommonCallBack.java | 9 ++++ VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/TextViewExtension.java | 35 +++++++++++++++++ 8 files changed, 95 insertions(+), 8 deletions(-) diff --git a/VisitFace/DemoForBsk/app/src/main/AndroidManifest.xml b/VisitFace/DemoForBsk/app/src/main/AndroidManifest.xml index 1f45137..ba14d18 100644 --- a/VisitFace/DemoForBsk/app/src/main/AndroidManifest.xml +++ b/VisitFace/DemoForBsk/app/src/main/AndroidManifest.xml @@ -23,7 +23,8 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:supportsRtl="true" - android:theme="@style/AppTheme"> + android:theme="@style/AppTheme" + > <activity android:name="cn.com.basic.face.base.MainActivity" android:screenOrientation="landscape" diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/MainActivity.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/MainActivity.java index 4df3d7f..bb6340e 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/MainActivity.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/MainActivity.java @@ -1,6 +1,7 @@ package cn.com.basic.face.base; import android.content.Context; +import android.os.Handler; import android.support.design.widget.TabLayout; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentManager; @@ -13,6 +14,7 @@ import android.view.WindowManager; import android.widget.ImageView; import android.widget.TextView; +import android.widget.Toast; import com.bsk.zhangbo.demoforbsk.R; import cn.com.basic.face.fragment.SurveillanceFragment; @@ -126,4 +128,25 @@ } + boolean doubleBackToExitPressedOnce = false; + + @Override + public void onBackPressed() { + if (doubleBackToExitPressedOnce) { + super.onBackPressed(); + return; + } + + this.doubleBackToExitPressedOnce = true; + Toast.makeText(this, "璇峰啀娆℃寜杩斿洖閿��鍑�", Toast.LENGTH_SHORT).show(); + + new Handler().postDelayed(new Runnable() { + + @Override + public void run() { + doubleBackToExitPressedOnce=false; + } + }, 2000); + } + } diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/BaseCommonCallBack.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/BaseCommonCallBack.java index 311c670..c5d84c7 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/BaseCommonCallBack.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/BaseCommonCallBack.java @@ -8,6 +8,7 @@ import cn.com.basic.face.base.BaseApplication; import org.xutils.common.Callback; +import org.xutils.ex.HttpException; import java.net.ConnectException; import java.util.List; @@ -58,7 +59,13 @@ @Override public void onError(Throwable ex, boolean isOnCallback) { if (ex instanceof ConnectException) { - Toast.makeText(BaseApplication.getInstance(), "鏈嶅姟鍣ㄩ摼鎺ュけ璐�", Toast.LENGTH_SHORT ).show(); + Toast.makeText(BaseApplication.getInstance(), "鏈嶅姟鍣ㄨ繛鎺ュけ璐�", Toast.LENGTH_SHORT ).show(); + return; + } + System.out.println(ex.getClass().getName()); + if (ex instanceof org.xutils.ex.HttpException) { + org.xutils.ex.HttpException httpException = (org.xutils.ex.HttpException)ex; + Toast.makeText(BaseApplication.getInstance(), "鏈嶅姟鍣ㄨ闂敊璇紝閿欒浠g爜锛�"+httpException.getErrorCode(), Toast.LENGTH_SHORT ).show(); return; } Toast.makeText(BaseApplication.getInstance(), "缃戠粶杩炴帴澶辫触"+ex.getMessage(), Toast.LENGTH_SHORT ).show(); diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java index 8863733..8dbd821 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java @@ -387,15 +387,24 @@ public void resetForm() { selectedCustomPhotoId = -1; selectedSurveillancePhotoId = -1; + fragment_register_name.setValue("寰愪慨婧�"+Math.random()); fragment_register_phone.setValue("13691348767"); - fragment_register_gender.setValue("鐢�"); - fragment_register_id_class.setValue("韬唤璇�"); - fragment_register_country.setValue("涓浗"); fragment_register_id_num.setValue("36041419292222222"); fragment_register_birthday.setValue("1985-08-12"); fragment_register_company.setValue("璐濇�濈"); fragment_register_remark.setValue("澶囨敞"); + + fragment_register_name.setValue(""); + fragment_register_phone.setValue(""); + fragment_register_id_num.setValue(""); + fragment_register_birthday.setValue(""); + fragment_register_company.setValue(""); + fragment_register_remark.setValue(""); + + fragment_register_gender.setValue("鐢�"); + fragment_register_id_class.setValue("韬唤璇�"); + fragment_register_country.setValue("涓浗"); fragment_register_visitor_class.setValue("鏅�氳瀹�"); fragment_register_surveillance_photo_img = null; fragment_register_upload_custom_photo_img = null; diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java index 1052c88..1f50ccf 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java @@ -22,7 +22,7 @@ public class DeviceMng { public static DeviceMng instance = new DeviceMng(); - public static final String authorationId = "101"; + public static String authorationId = null; public static DeviceMng getInstance() { return instance; @@ -50,6 +50,10 @@ public void load () { try { + if (authorationId == null || authorationId.trim().length() <= 1) { + getAuthorationId(); + return; + } RequestParams params = new RequestParams(AppApi.BASE_URL + AppApi.Query.DEVICE_QUERY); params.addBodyParameter(Device.FieldNames.authorizationId, authorationId); x.http().post(params, new BaseCommonCallBack() { @@ -68,6 +72,13 @@ } } + public void getAuthorationId() { + SharedPreferences school = DeviceMng.getInstance().loadSharedPreferences(CommonVariables.DeviceSharedPreferences.SCHOOL); + if (!"".equals(school.getString("fragment_device_right_device_info_sn", ""))) { + authorationId = school.getString("fragment_device_right_device_info_sn", ""); + } + } + public void saveWifiSetting(Map<String, String> fields) { SharedPreferencesUtils.save(CommonVariables.DeviceSharedPreferences.WIFI, fields); } @@ -78,6 +89,7 @@ public void saveSchoolSetting(Map<String, String> fields) { SharedPreferencesUtils.save(CommonVariables.DeviceSharedPreferences.SCHOOL, fields); + getAuthorationId(); } public void saveCamera1Setting(Map<String, String> fields) { diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/TextViewExtension.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/TextViewExtension.java new file mode 100644 index 0000000..abc052d --- /dev/null +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/TextViewExtension.java @@ -0,0 +1,35 @@ +package cn.com.basic.face.widget.checkin; + +import android.content.Context; +import android.widget.TextView; + +public class TextViewExtension extends TextView { + + +protected OnVisibilityChange mChangeListener = null; + + public interface OnVisibilityChange{ + void onChange(TextViewExtension mTextView , int mPrevVisibility , int mNewVisibility); + } + + public TextViewExtension(Context context) { + super(context); + // TODO Auto-generated constructor stub + } + + /* (non-Javadoc) + * @see android.view.View#setVisibility(int) + */ + @Override + public void setVisibility(int visibility) { + // TODO Auto-generated method stub + super.setVisibility(visibility); + if(mChangeListener != null){ + mChangeListener.onChange(this, getVisibility() , visibility); + } + } + + public void setOnVisibilityChange(OnVisibilityChange mChangeListener ){ + this.mChangeListener = mChangeListener; + } +} \ No newline at end of file diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/load_more.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/load_more.xml index 65cff9d..c359182 100644 --- a/VisitFace/DemoForBsk/app/src/main/res/layout/load_more.xml +++ b/VisitFace/DemoForBsk/app/src/main/res/layout/load_more.xml @@ -4,7 +4,7 @@ android:layout_height="wrap_content" xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical"> - <TextView + <cn.com.basic.face.widget.checkin.TextViewExtension android:id="@+id/load_more_text_view" android:paddingTop="@dimen/h20dp" android:paddingBottom="@dimen/h20dp" diff --git a/VisitFace/DemoForBsk/app/src/main/res/values/strings.xml b/VisitFace/DemoForBsk/app/src/main/res/values/strings.xml index 84a09a1..94714f3 100644 --- a/VisitFace/DemoForBsk/app/src/main/res/values/strings.xml +++ b/VisitFace/DemoForBsk/app/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ <resources> - <string name="app_name">DemoForBsk</string> + <string name="app_name">浜鸿劯璇嗗埆璁垮绯荤粺</string> <string name="title_name">濮撳悕锛�</string> <string name="title_sex">鎬у埆锛�</string> <string name="title_nation">鍥界睄锛�</string> -- Gitblit v1.8.0