Merge remote-tracking branch 'origin/master'

app/src/main/java/com/xingdata/zzdpos/C.java

@@ -58,8 +58,11 @@ public class C {
     }
 
     public static final class URL {
-        public static final String BASE_URL = "http://demo.51zzd.cn:8080/";
-        public static final String TEMP_PAY_URL = "http://demo.51zzd.cn/";
+//        public static final String BASE_URL = "http://demo.51zzd.cn:8080/";
+//        public static final String TEMP_PAY_URL = "http://demo.51zzd.cn/";
+
+        public static final String BASE_URL = "http://121.40.56.52:8080/";
+        public static final String TEMP_PAY_URL = "http://121.40.56.52:8081/";
 
         private static final String PKG = "/tk/";
 

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

@@ -50,7 +50,7 @@ public class LoginActivity extends BaseActivity<LoginPresenter, ActivityLoginBin
 //                    ("errMsg"));
 //
 //        }
-
+        getSyatemMessage();
         LogUtils.e("LoginActivity + initView");
         loadRootFragment(R.id.fra, mPresenter.signInFragment);
         mViewBinding.setText1(": 400 - 800 - 9406");
@@ -368,7 +368,6 @@ public class LoginActivity extends BaseActivity<LoginPresenter, ActivityLoginBin
         } 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;
@@ -380,10 +379,13 @@ public class LoginActivity extends BaseActivity<LoginPresenter, ActivityLoginBin
         return super.onKeyDown(keyCode, event);
     }
 
-    private String getSyatemMessage() {
-        return "ApplicationName:" + SystemUtil.getApplicationName() + "\n\n" + "设备型号" + SystemUtil
-                .getDeviceModel() + "\n\n" + "设备SN：" + SystemUtil.getDeviceSN() + "\n\n 程序版本号：" +
+    private void getSyatemMessage() {
+        String str = "ApplicationName:" + SystemUtil.getApplicationName() + "\n\n" + "设备型号" +
+                SystemUtil
+                        .getDeviceModel() + "\n\n" + "设备SN：" + SystemUtil.getDeviceSN() + "\n\n " +
+                "程序版本号：" +
                 SystemUtil.getVersionName();
+        mViewBinding.tvSn.setText(str);
     }
 }
 

app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipListFragment.java

@@ -179,6 +179,11 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
         if (mViewBinding.vipLevelR.getChildCount() != 0) {
             mViewBinding.vipLevelR.removeAllViews();
         }
+
+        if (levelPager.getList()==null||levelPager.getList().size()==0){
+            ToastUtils.showShort("没有开通会员功能！");
+            return;
+        }
         LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT);
         Level allLevel = new Level();
         allLevel.setVipLevelName("全部会员");

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

@@ -45,10 +45,12 @@
 
             <ScrollView
                 android:id="@+id/sv_message"
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
+                android:layout_height="30dp"
                 android:layout_alignParentBottom="true"
-                android:visibility="gone"
-                android:layout_height="wrap_content">
+                android:layout_alignParentRight="true"
+                android:focusable="false"
+                android:visibility="visible">
 
                 <TextView
                     android:id="@+id/tv_sn"
@@ -56,7 +58,7 @@
                     android:layout_height="match_parent"
                     android:layout_alignParentRight="true"
                     android:layout_marginRight="@dimen/all_margin_left"
-                    android:layout_marginTop="@dimen/margin"
+                    android:focusable="false"
                     android:gravity="right|bottom"
                     android:text="忘记密码 ？"
                     android:textColor="@color/black_baozheng"/>

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

@@ -36,6 +36,7 @@
             android:layout_width="match_parent"
             android:layout_height="0.5dp"
             android:background="@color/gray_huanggai" />
+      <include layout="@layout/line_layout"></include>
 
         <LinearLayout
             android:layout_width="match_parent"