Commit 1a1592bb authored by 王海's avatar 王海

修改 N多UI

parent b960f2c5
...@@ -70,7 +70,7 @@ public class App extends Application { ...@@ -70,7 +70,7 @@ public class App extends Application {
.start(); .start();
// 初始化异常处理 // 初始化异常处理
// initEx(); initEx();
//初始化Fragment框架 //初始化Fragment框架
initFragment(); initFragment();
...@@ -118,7 +118,7 @@ public class App extends Application { ...@@ -118,7 +118,7 @@ public class App extends Application {
*/ */
private void initFragment() { private void initFragment() {
Fragmentation.builder().stackViewMode(Fragmentation.BUBBLE).debug(BuildConfig.DEBUG) Fragmentation.builder().stackViewMode(Fragmentation.BUBBLE)
.handleException(e -> { .handleException(e -> {
}).install(); }).install();
} }
......
...@@ -8,11 +8,6 @@ import com.blankj.utilcode.util.KeyboardUtils; ...@@ -8,11 +8,6 @@ import com.blankj.utilcode.util.KeyboardUtils;
import com.blankj.utilcode.util.LogUtils; import com.blankj.utilcode.util.LogUtils;
import com.blankj.utilcode.util.SPUtils; import com.blankj.utilcode.util.SPUtils;
import com.blankj.utilcode.util.ToastUtils; import com.blankj.utilcode.util.ToastUtils;
import java.util.ArrayList;
import java.util.List;
import com.xingdata.zzdpos.ui.main.MainActivity;
import com.xingdata.zzdpos.R; import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity; import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.databinding.ActivityLoginBinding; import com.xingdata.zzdpos.databinding.ActivityLoginBinding;
...@@ -22,12 +17,13 @@ import com.xingdata.zzdpos.ui.login.fragment.SignInFragment; ...@@ -22,12 +17,13 @@ import com.xingdata.zzdpos.ui.login.fragment.SignInFragment;
import com.xingdata.zzdpos.ui.login.fragment.bean.LoginReturnBean; import com.xingdata.zzdpos.ui.login.fragment.bean.LoginReturnBean;
import com.xingdata.zzdpos.ui.login.fragment.bean.StoreAddressJsonBean; import com.xingdata.zzdpos.ui.login.fragment.bean.StoreAddressJsonBean;
import com.xingdata.zzdpos.ui.login.fragment.bean.StoreTypeJsonBean; import com.xingdata.zzdpos.ui.login.fragment.bean.StoreTypeJsonBean;
import com.xingdata.zzdpos.ui.marketing.integral.IntegralActivity; import com.xingdata.zzdpos.ui.main.MainActivity;
import com.xingdata.zzdpos.ui.marketing.ticket.ReturnTicketActivity;
import com.xingdata.zzdpos.ui.payment.PaymentActivity;
import com.xingdata.zzdpos.ui.splash.SplashActivity; import com.xingdata.zzdpos.ui.splash.SplashActivity;
import com.xingdata.zzdpos.view.PopupWindowDownList; import com.xingdata.zzdpos.view.PopupWindowDownList;
import java.util.ArrayList;
import java.util.List;
public class LoginActivity extends BaseActivity<LoginPresenter, ActivityLoginBinding> implements public class LoginActivity extends BaseActivity<LoginPresenter, ActivityLoginBinding> implements
LoginContract.View { LoginContract.View {
private long mExitTime; private long mExitTime;
......
...@@ -146,7 +146,7 @@ ...@@ -146,7 +146,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="2" android:layout_weight="2"
android:text=" 个积分等于1元" android:text=" 个积分=1元"
android:textColor="@color/black_baozheng" android:textColor="@color/black_baozheng"
android:textSize="@dimen/et_textsize"/> android:textSize="@dimen/et_textsize"/>
</LinearLayout> </LinearLayout>
......
...@@ -235,13 +235,6 @@ ...@@ -235,13 +235,6 @@
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_marginLeft="@dimen/all_padding"
android:layout_marginRight="@dimen/all_padding"
android:background="@color/gray1"
android:visibility="gone"></View>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -327,12 +320,6 @@ ...@@ -327,12 +320,6 @@
android:visibility="gone"/> android:visibility="gone"/>
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_marginLeft="@dimen/all_padding"
android:layout_marginRight="@dimen/all_padding"
android:background="@color/gray1"></View>
<LinearLayout <LinearLayout
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment