Merge remote-tracking branch 'origin/master'

app/src/main/java/com/xingdata/zzdpos/ui/login/LoginActivity.java

 package com.xingdata.zzdpos.ui.login;
 
 import android.content.Intent;
+import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
 
@@ -22,6 +23,7 @@ import com.xingdata.zzdpos.ui.login.fragment.bean.StoreTypeJsonBean;
 import com.xingdata.zzdpos.ui.main.MainActivity;
 import com.xingdata.zzdpos.ui.splash.SplashActivity;
 import com.xingdata.zzdpos.util.Global;
+import com.xingdata.zzdpos.util.SystemUtil;
 import com.xingdata.zzdpos.view.PopupWindowDownList;
 
 import java.util.ArrayList;
@@ -349,6 +351,39 @@ public class LoginActivity extends BaseActivity<LoginPresenter, ActivityLoginBin
         return super.dispatchTouchEvent(ev);
     }
 
+    int tempVolumeDown = 0;
+    int tempVolumeUp = 0;
 
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) {
+            if (mViewBinding.svMessage.getVisibility() == View.INVISIBLE) {
+                mViewBinding.svMessage.setVisibility(View.GONE);
+            } else {
+                tempVolumeDown++;
+                if (tempVolumeUp > 5) {
+                    tempVolumeUp = 0;
+                }
+            }
+        } else if (keyCode == KeyEvent.KEYCODE_VOLUME_UP && tempVolumeDown == 5) {
+            tempVolumeUp++;
+            if (tempVolumeUp == 2) {
+                mViewBinding.tvSn.setText(getSyatemMessage());
+                mViewBinding.svMessage.setVisibility(View.VISIBLE);
+                tempVolumeDown = 0;
+                tempVolumeUp = 0;
+            }
+        } else {
+            tempVolumeDown = 0;
+            tempVolumeUp = 0;
+        }
+        return super.onKeyDown(keyCode, event);
+    }
+
+    private String getSyatemMessage() {
+        return "ApplicationName:" + SystemUtil.getApplicationName() + "\n\n" + "设备型号" + SystemUtil
+                .getDeviceModel() + "\n\n" + "设备SN：" + SystemUtil.getDeviceSN() + "\n\n 程序版本号：" +
+                SystemUtil.getVersionName();
+    }
 }
 

app/src/main/java/com/xingdata/zzdpos/ui/login/fragment/SignInFragment.java

@@ -20,6 +20,7 @@ import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
 import com.xingdata.zzdpos.ui.dialog.PromptDialog;
 import com.xingdata.zzdpos.ui.login.LoginPresenter;
 import com.xingdata.zzdpos.util.OnClickListener;
+import com.xingdata.zzdpos.util.SystemUtil;
 import com.xingdata.zzdpos.view.PopupWindowDownList;
 
 
@@ -46,7 +47,6 @@ public class SignInFragment extends BaseFragment<LoginPresenter,
         mViewBinding.etPwd.setInputType(InputType.TYPE_CLASS_NUMBER | InputType
                 .TYPE_NUMBER_VARIATION_PASSWORD);
         mViewBinding.etPwd.setFilters(inputFilter);
-
         if (SPUtils.getInstance().getInt(C.SP_KEY.IS_SHOW_SIGNUP_BTN) != 0) {
             mViewBinding.tvSignUp.setVisibility
                     (View.INVISIBLE);

app/src/main/java/com/xingdata/zzdpos/ui/sendticke/adapter/ReturnTicketAdapter.java

@@ -42,7 +42,7 @@ public class ReturnTicketAdapter extends BaseAdapter<Trule, ItemReturnTicketBind
         mViewBinding.tvRule.setText(mContext.getResources().getString(R.string.tv_rule,
                 ConvertUtil.fenToYuanNoPoint(item.getTruleOrderAmt())));
         mViewBinding.tvDate.setText(mContext.getResources().getString(R.string.tv_date,
-                TimeUtils.millis2String(item.getTruleExp(), new SimpleDateFormat("yyyy-mm-dd"))));
+                TimeUtils.millis2String(item.getTruleExp(), new SimpleDateFormat("yyyy-MM-dd"))));
 
 
     }

app/src/main/java/com/xingdata/zzdpos/util/SystemUtil.java

@@ -28,8 +28,8 @@ public final class SystemUtil {
      * @return 设备型号
      */
     public static String getDeviceModel() {
-//        return DeviceUtils.getModel();
-        return "AECRC10";
+        return DeviceUtils.getModel();
+//        return "AECRC10";
     }
 
 
@@ -57,9 +57,10 @@ public final class SystemUtil {
                 e.printStackTrace();
             }
         }
-//        return deviceSN;
-        return "5484965656";
+        return deviceSN;
+//        return "5484965656";
     }
+
     /**
      * 获取应用名称
      *

app/src/main/res/layout/activity_login.xml

@@ -31,23 +31,47 @@
                   android:background="@color/appBack"
                   android:orientation="vertical">
 
-
-        <FrameLayout
-            android:id="@+id/fra"
+        <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:layout_gravity="center"
-            android:layout_weight="8"
-            android:background="@color/appBack"
-            />
+            android:layout_weight="8">
+
+            <FrameLayout
+                android:id="@+id/fra"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_gravity="center"
+                android:background="@color/appBack"/>
+
+            <ScrollView
+                android:id="@+id/sv_message"
+                android:layout_width="match_parent"
+                android:layout_alignParentBottom="true"
+                android:visibility="gone"
+                android:layout_height="wrap_content">
+
+                <TextView
+                    android:id="@+id/tv_sn"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_alignParentRight="true"
+                    android:layout_marginRight="@dimen/all_margin_left"
+                    android:layout_marginTop="@dimen/margin"
+                    android:gravity="right|bottom"
+                    android:text="忘记密码 ？"
+                    android:textColor="@color/black_baozheng"/>
+            </ScrollView>
+
+
+        </RelativeLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
-            android:visibility="gone"
             android:gravity="center"
-            android:orientation="horizontal">
+            android:orientation="horizontal"
+            android:visibility="gone">
 
             <TextView
                 android:id="@+id/tv_company_info"

app/src/main/res/layout/fragment_sign_in.xml

@@ -119,5 +119,6 @@
                 android:textColor="@color/black_baozheng"/>
         </RelativeLayout>
 
+
     </LinearLayout>
 </layout>
\ No newline at end of file

app/src/main/res/layout/item_vip_group.xml

@@ -13,7 +13,7 @@
 
     <LinearLayout
         android:id="@+id/cl_vip"
-        android:layout_width="90dp"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center"
         android:orientation="vertical">