qiubinghui
/
zhywpt-app
Прати 1
Волим 0
Креирај огранак 0
Код Дискусије 0 Захтеви за спајање 0 Издања 0 Вики Activity
Преглед изворни кода

Merge branch 'master' of https://gitee.com/dmc_qq/ywy_app2

master
lujin пре 2 година
родитељ
29073a6a43 6dab7828a5
комит
2370f25e9b
21 измењених фајлова са 163 додато и 163 уклоњено
Подељен поглед Покажи статистику Diff
  1. 7
    6
      app/src/main/java/com/huntersun/vkyes/etcopencard/project/api/MyRetrofit.java
  2. 1
    0
      app/src/main/java/com/huntersun/vkyes/etcopencard/project/api/bean/IFCode.java
  3. 9
    0
      app/src/main/java/com/huntersun/vkyes/etcopencard/project/api/bean/ResultBean.java
  4. 0
    1
      app/src/main/java/com/huntersun/vkyes/etcopencard/project/copapply/ObuActivateRequester.java
  5. 29
    32
      app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/ContractActivity.java
  6. 9
    4
      app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/HomeListInfo.java
  7. 4
    1
      app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/IdentityInformationUploadActivity.java
  8. 0
    1
      app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/fragment/FragmentHomeTow.java
  9. 4
    1
      app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/fragment/FragmentSonOne.java
  10. 2
    26
      app/src/main/java/com/huntersun/vkyes/etcopencard/src/ui/activity/LoginActivity.java
  11. 0
    5
      app/src/main/java/com/huntersun/vkyes/etcopencard/src/ui/activity/SplashActivity.java
  12. 9
    0
      app/src/main/res/drawable-v1/edit_bg.xml
  13. 2
    2
      app/src/main/res/layout-v2/fragment_home_two.xml
  14. 2
    1
      app/src/main/res/layout-v3/item_list_content.xml
  15. 11
    10
      app/src/main/res/layout/activity_identity_information_upload.xml
  16. 74
    60
      app/src/main/res/layout/login_activity.xml
  17. 0
    13
      app/src/main/res/layout/splash_activity.xml
  18. BIN
      app/src/main/res/mipmap-xhdpi/login_bg.png
  19. BIN
      app/src/main/res/mipmap-xhdpi/logos.png
  20. BIN
      app/src/main/res/mipmap-xhdpi/password.png
  21. BIN
      app/src/main/res/mipmap-xhdpi/phone.png

+ 7
- 6
app/src/main/java/com/huntersun/vkyes/etcopencard/project/api/MyRetrofit.java Прегледај датотеку

@@ -40,9 +40,9 @@ import retrofit2.converter.scalars.ScalarsConverterFactory;
public class MyRetrofit {
//是否设置缓存
private static final boolean Cache = false;
// private final String BaseUrl = "http://192.168.100.63:8087/ifzt/api/";
private final String BaseUrl = "http://192.168.100.63:8087/ifzt/api/";
// private final String BaseUrl = "http://58.16.58.161:19002/ifzt/api/";
private final String BaseUrl = "http://222.85.144.89:19002/ifzt/api/";
// private final String BaseUrl = "http://222.85.144.89:19002/ifzt/api/";
private final String appId = "admin001";
private final String IFCODE = "";
private final String bizContent = "";
@@ -61,7 +61,8 @@ public class MyRetrofit {

public static void newInstance(String code, Object bean, ReturnResult result) {
RequestParameters parameters = new RequestParameters(code, new Gson().toJson(bean));
new MyRetrofit().getRetrofit().create(Api.class).message2(parameters)
new MyRetrofit().getRetrofit().create(Api.class)
.message2(parameters)
.enqueue(new Converter<Result>(null, "加载中...") {
@Override
protected void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
@@ -148,9 +149,9 @@ public class MyRetrofit {
client = new OkHttpClient.Builder()
.addInterceptor(headerInterceptor) /*添加请求头*/
.addInterceptor(logging) //添加拦截器
.connectTimeout(10, TimeUnit.SECONDS) //链接超时
.readTimeout(10, TimeUnit.SECONDS) //设置读取超时
.writeTimeout(10, TimeUnit.SECONDS) //写超时
.connectTimeout(200, TimeUnit.SECONDS) //链接超时
.readTimeout(200, TimeUnit.SECONDS) //设置读取超时
.writeTimeout(200, TimeUnit.SECONDS) //写超时
.retryOnConnectionFailure(true) //链接失败时重试
.build();
return client;

+ 1
- 0
app/src/main/java/com/huntersun/vkyes/etcopencard/project/api/bean/IFCode.java Прегледај датотеку

@@ -79,6 +79,7 @@ public class IFCode {
public static final String IFCODE7 = "7"; //取消订单
public static final String IFCODE21 = "21"; //变更个人用户信息
public static final String IFCODE22 = "22"; //提交个人用户信息
public static final String IFCODE23 = "23"; //签约检测接口
public static final String IFCODE15 = "15"; //OCR识别身份证
public static final String IFCODE16 = "16"; //OCR识别行驶证
public static final String IFCODE17 = "17"; //文件上传接口

+ 9
- 0
app/src/main/java/com/huntersun/vkyes/etcopencard/project/api/bean/ResultBean.java Прегледај датотеку

@@ -296,6 +296,7 @@ public class ResultBean<T> {
private String vehicleMaintenaceMass;
private String vehiclePermittedTwoWeight;
private String useUserType;
private String userType;
private String version;
private Boolean isUpLevel;
private String message;
@@ -339,6 +340,14 @@ public class ResultBean<T> {
private ObuDetailInfoBean.UserPromiseCBBean userPromiseCBBean;
private ObuDetailInfoBean.QueryCarInfoCBBean queryCarInfoCBBean;

public String getUserType() {
return userType;
}

public void setUserType(String userType) {
this.userType = userType;
}

public Long getRechargeMoney() {
return rechargeMoney;
}

+ 0
- 1
app/src/main/java/com/huntersun/vkyes/etcopencard/project/copapply/ObuActivateRequester.java Прегледај датотеку

@@ -118,7 +118,6 @@ public class ObuActivateRequester implements ToastAction {
protected void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
ResultBean.BizRemarks data =
Gson().fromJson(resultBean.getBizContent() + "", ResultBean.BizRemarks.class);
//OBU通知
sendApduEsam(data.getData());
}
});

+ 29
- 32
app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/ContractActivity.java Прегледај датотеку

@@ -17,6 +17,7 @@ import com.huntersun.vkyes.etcopencard.project.api.Converter;
import com.huntersun.vkyes.etcopencard.project.api.FatherBean;
import com.huntersun.vkyes.etcopencard.project.api.MyRetrofit;
import com.huntersun.vkyes.etcopencard.project.api.Result;
import com.huntersun.vkyes.etcopencard.project.api.bean.IFCode;
import com.huntersun.vkyes.etcopencard.project.api.bean.ResultBean;
import com.huntersun.vkyes.etcopencard.project.api.bean.SendTheVerificationCodeBean;
import com.huntersun.vkyes.etcopencard.project.tool.QRCode;
@@ -46,7 +47,7 @@ public class ContractActivity extends AppActivity {
protected void initView() {
setTitle("签约");
binding.nextStep.setOnClickListener(this);
Bitmap bitmap = QRCode.createQRCodeBitmap("https://file.etcjz.cn/file/web/mini.html?orderId="
Bitmap bitmap = QRCode.createQRCodeBitmap("https://file.etcjz.cn/file/web/app.html?orderId="
+ getIntent().getStringExtra("orderId"), 800, 800,
"UTF-8", "H", "1", Color.BLACK, Color.WHITE);

@@ -74,40 +75,36 @@ public class ContractActivity extends AppActivity {
// //签约检测
// FatherBean<SendTheVerificationCodeBean> fatherBean = new FatherBean<>();
// fatherBean.bizContent = new SendTheVerificationCodeBean();
// fatherBean.setFilename("CSMSN_ORDER_USERSIGNQUERY_REQ_");
// fatherBean.bizContent.setOrderId(getIntent().getStringExtra("orderId"));
// Log.e("okhttp", "打印标题:" + new Gson().toJson(fatherBean));
// binding.nextStep.setEnabled(false);
// new MyRetrofit().getRetrofit("IF01001202208160800")
// .create(Api.class)
// .message(new Gson().toJson(fatherBean))
// .enqueue(new Converter<Result>(getActivity()) {
// @Override
// protected void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent1) {
// binding.nextStep.setEnabled(true);
// if ("NORMAL".equals(bizContent1.getUserState())) {
// LiveEventBus.get("homeUpdateData").post("更新首页信息内容");
// LiveEventBus.get("homeOneUpdateData").post("更新首页列表信息内容");
// Intent intent = new Intent();
// intent.putExtra("orderId", getIntent().getStringExtra("orderId"));
// intent.setClass(ContractActivity.this, ETCHandleActivity.class);
// startActivity(intent);
// finish();
// } else if ("OVERDUE".equals(bizContent1.getUserState())) {
// showDilog("用户已开通车主服务，但存在欠费，请用户于微信车主服务补缴费用后再次办理。");
// } else if ("PAUSED".equals(bizContent1.getUserState())) {
// showDilog("用户已暂停车主服务，请用户扫码恢复车主服务后再次办理。");
// } else if ("UNAUTHORIZED".equals(bizContent1.getUserState())) {
// showDilog("用户未开通车主服务，请用户扫码办理。");
// }
// }
// MyRetrofit.newInstance(IFCode.IFCODE23, fatherBean, new MyRetrofit.ReturnResult() {
// @Override
// public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent1) {
// binding.nextStep.setEnabled(true);
// if ("NORMAL".equals(bizContent1.getUserState())) {
// LiveEventBus.get("homeUpdateData").post("更新首页信息内容");
// LiveEventBus.get("homeOneUpdateData").post("更新首页列表信息内容");
// Intent intent = new Intent();
// intent.putExtra("orderId", getIntent().getStringExtra("orderId"));
// intent.setClass(ContractActivity.this, ETCHandleActivity.class);
// startActivity(intent);
// finish();
// } else if ("OVERDUE".equals(bizContent1.getUserState())) {
// showDilog("用户已开通车主服务，但存在欠费，请用户于微信车主服务补缴费用后再次办理。");
// } else if ("PAUSED".equals(bizContent1.getUserState())) {
// showDilog("用户已暂停车主服务，请用户扫码恢复车主服务后再次办理。");
// } else if ("UNAUTHORIZED".equals(bizContent1.getUserState())) {
// showDilog("用户未开通车主服务，请用户扫码办理。");
// }
// }
//
// @Override
// public void onError(String err, Response<Result> resp) {
// super.onError(err, resp);
// binding.nextStep.setEnabled(true);
// }
// });
// @Override
// public void onError() {
// MyRetrofit.ReturnResult.super.onError();
// binding.nextStep.setEnabled(true);
// }
// });
// binding.nextStep.setEnabled(false);
}

public void showDilog(String msg) {

+ 9
- 4
app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/HomeListInfo.java Прегледај датотеку

@@ -298,9 +298,8 @@ public class HomeListInfo extends AppActivity implements StatusAction {
openingApplication(bizContent1);
} else if (!cardId && !obuId && ("1".equals(obuStatus) || "11".equals(obuStatus) ||
"0".equals(obuStatus))) {
Log.e("okhttp","============" );
//走发行申请
deviceActivation();
deviceActivation(bizContent1);
} else {
cardOpeningApplication(bizContent1);
}
@@ -341,16 +340,22 @@ public class HomeListInfo extends AppActivity implements StatusAction {
//开签完以后走激活
new OBURequest(BoxManagers.mDecryptVehicleApduBean, bizContent1,
getActivity())
.obuPublishRequest(this::deviceActivation);
.obuPublishRequest(new OBURequest.CallBack() {
@Override
public void onSuccess() {
deviceActivation(bizContent1);
}
});
}

/**
* 设备激活
*/
public void deviceActivation() {
public void deviceActivation(ResultBean.BizContent content) {
//设备激活
new ObuActivation(BoxManagers.mDecryptVehicleApduBean,
getActivity()).start(bizContent -> {
bizContent.setOrderId(content.getOrderId());
//激活步骤
new ObuActivateRequester().start(bizContent, getActivity());
});

+ 4
- 1
app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/IdentityInformationUploadActivity.java Прегледај датотеку

@@ -141,7 +141,9 @@ public class IdentityInformationUploadActivity extends AppActivity {
binding.text5.setOnClickListener(this);
binding.text8.setOnClickListener(this);
binding.image1.setOnClickListener(this::onImage);
// binding.choice1.setOnClickListener(this::onImage);
binding.image2.setOnClickListener(this::onImage);
// binding.choice2.setOnClickListener(this::onImage);
binding.image3.setOnClickListener(this::onImage);
binding.image4.setOnClickListener(this::onImage);
binding.image5.setOnClickListener(this::onImage);
@@ -297,7 +299,8 @@ public class IdentityInformationUploadActivity extends AppActivity {
public void onSuccess(File file) {
// TODO 压缩成功后调用，返回压缩后的图片文件
android.util.Log.e("压缩后:", "onStart: =============" + FileSizeUtil.getFileOrFilesSize(file.getPath(), 2));
postDelayed(() -> OCRspot(QRCode.imageToBase64(file.getPath()), (ImageView) view, file.getPath(), file), 200);
postDelayed(() -> OCRspot(QRCode.imageToBase64(file.getPath()),
(ImageView) view, file.getPath(), file), 200);
}

@Override

+ 0
- 1
app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/fragment/FragmentHomeTow.java Прегледај датотеку

@@ -41,7 +41,6 @@ public class FragmentHomeTow extends TitleBarFragment<MainActivity> {
@Override
protected View getLayoutView(LayoutInflater inflater, ViewGroup container) {
binding = FragmentHomeFiveBinding.inflate(inflater, container, false);
// binding = FragmentHomeFiveBinding.inflate(getLayoutInflater());
return binding.getRoot();
}


+ 4
- 1
app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/fragment/FragmentSonOne.java Прегледај датотеку

@@ -190,7 +190,10 @@ public class FragmentSonOne extends TitleBarFragment<MainActivity>
helper.setText(R.id.text1, EnumBean.backValue(item.getOrderStep(), EnumBean.OrderStage));
helper.setText(R.id.text2, item.getVehiclePlate());
helper.setText(R.id.text3, EnumBean.backValue(item.getVehiclePlateColor(), EnumBean.VehicleColorArray));
helper.setText(R.id.text4, item.getOrederType());
helper.setText(R.id.text4, "PERSONAL_USER".equals(item.getUserType()) ? "个人用户" : "单位用户");
helper.setText(R.id.text6, "0".equals(item.getType()) ? "客车办理" : "货车办理");
helper.setText(R.id.text7, "0".equals(item.getType()) ? "客车" : "货车");
helper.setText(R.id.text8, item.getAmount() == null ? "0.00元" : Integer.parseInt(item.getAmount()) * 0.01 + "元");
helper.setOnClickListener(R.id.layout, new View.OnClickListener() {
@Override
@SingleClick

+ 2
- 26
app/src/main/java/com/huntersun/vkyes/etcopencard/src/ui/activity/LoginActivity.java Прегледај датотеку

@@ -106,8 +106,6 @@ public final class LoginActivity extends AppActivity
private LinearLayout mLayoutCode;

private View mOtherView;
private View mQQView;
private View mWeChatView;

private Boolean loginStart = true; //true 账号密码 false 手机号

@@ -134,15 +132,13 @@ public final class LoginActivity extends AppActivity
mForgetView = findViewById(R.id.tv_login_forget);
mCommitView = findViewById(R.id.btn_login_commit);
mOtherView = findViewById(R.id.ll_login_other);
mQQView = findViewById(R.id.iv_login_qq);
mWeChatView = findViewById(R.id.iv_login_wechat);
//发送验证码
mCountdownView = findViewById(R.id.cv_phone_reset_countdown);
mCodeView = findViewById(R.id.et_phone_reset_code);
mTvLoginCode = findViewById(R.id.tv_login_code);
mLayoutCode = findViewById(R.id.layout_code);

setOnClickListener(mForgetView, mCountdownView, mTvLoginCode, mCodeView, mCommitView, mQQView, mWeChatView);
setOnClickListener(mForgetView, mCountdownView, mTvLoginCode, mCodeView, mCommitView);

mPasswordView.setOnEditorActionListener(this);
}
@@ -153,22 +149,6 @@ public final class LoginActivity extends AppActivity
KeyboardWatcher.with(LoginActivity.this)
.setListener(LoginActivity.this);
}, 500);

// 判断用户当前有没有安装 QQ
if (!UmengClient.isAppInstalled(this, Platform.QQ)) {
mQQView.setVisibility(View.GONE);
}

// 判断用户当前有没有安装微信
if (!UmengClient.isAppInstalled(this, Platform.WECHAT)) {
mWeChatView.setVisibility(View.GONE);
}

// 如果这两个都没有安装就隐藏提示
if (mQQView.getVisibility() == View.GONE && mWeChatView.getVisibility() == View.GONE) {
mOtherView.setVisibility(View.GONE);
}

// 自动填充手机号和密码
// mPhoneView.setText(getString(INTENT_KEY_IN_PHONE));
// mPasswordView.setText(getString(INTENT_KEY_IN_PASSWORD));
@@ -253,7 +233,7 @@ public final class LoginActivity extends AppActivity
Map<String, String> params = new HashMap<>();
params.put("mobile", mPhoneView.getText() + "");
params.put("password", value);
params.put("appId", "52030131");
params.put("appId", "52030131"); //综合业务支撑平台使用：52030131
MyRetrofit.newInstance(IFCode.IFCODE4, params, new MyRetrofit.ReturnResult() {
@Override
public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
@@ -290,10 +270,6 @@ public final class LoginActivity extends AppActivity
UmengClient.onActivityResult(this, requestCode, resultCode, data);
}

/**
* {@link KeyboardWatcher.SoftKeyboardStateListener}
*/

@Override
public void onSoftKeyboardOpened(int keyboardHeight) {
// 执行位移动画

+ 0
- 5
app/src/main/java/com/huntersun/vkyes/etcopencard/src/ui/activity/SplashActivity.java Прегледај датотеку

@@ -25,7 +25,6 @@ import com.hjq.widget.view.SlantedTextView;
public final class SplashActivity extends AppActivity {

private LottieAnimationView mLottieView;
private SlantedTextView mDebugView;
private ImageView imageView;

@Override
@@ -36,7 +35,6 @@ public final class SplashActivity extends AppActivity {
@Override
protected void initView() {
mLottieView = findViewById(R.id.lav_splash_lottie);
mDebugView = findViewById(R.id.iv_splash_debug);
imageView = findViewById(R.id.image);
// 设置动画监听
mLottieView.addAnimatorListener(new AnimatorListenerAdapter() {
@@ -44,10 +42,7 @@ public final class SplashActivity extends AppActivity {
@Override
public void onAnimationEnd(Animator animation) {
mLottieView.removeAnimatorListener(this);
// MainActivity.start(getContext());

startActivity(LoginActivity.class);
// HomeActivity.start(getContext());
finish();
}
});

+ 9
- 0
app/src/main/res/drawable-v1/edit_bg.xml Прегледај датотеку

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#ffffffff" />
<corners
android:bottomLeftRadius="20dp"
android:bottomRightRadius="20dp"
android:topLeftRadius="20dp"
android:topRightRadius="20dp" />
</shape>

+ 2
- 2
app/src/main/res/layout-v2/fragment_home_two.xml Прегледај датотеку

@@ -217,7 +217,8 @@
android:animateLayoutChanges="true"
android:animationCache="true"
android:orientation="vertical"
android:padding="@dimen/dp_15">
android:paddingHorizontal="@dimen/dp_15"
android:paddingBottom="@dimen/dp_15">

<com.huntersun.vkyes.etcopencard.project.view.CustomViewPager
android:id="@+id/vp_home_pager"
@@ -225,7 +226,6 @@
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />


</LinearLayout>

</LinearLayout>

+ 2
- 1
app/src/main/res/layout-v3/item_list_content.xml Прегледај датотеку

@@ -192,7 +192,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="@dimen/dp_10">
android:padding="@dimen/dp_10"
android:visibility="gone">

<Button
android:layout_width="@dimen/dp_70"

+ 11
- 10
app/src/main/res/layout/activity_identity_information_upload.xml Прегледај датотеку

@@ -390,6 +390,7 @@
tools:ignore="NestedWeights" />

<TextView
android:id="@+id/choice1"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_30"
android:background="@drawable/home_unm_bg3"
@@ -422,6 +423,7 @@
tools:ignore="NestedWeights" />

<TextView
android:id="@+id/choice2"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_30"
android:background="@drawable/home_unm_bg3"
@@ -635,8 +637,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="@dimen/dp_45"
android:background="#FFFFFF">
android:background="#FFFFFF"
android:minHeight="@dimen/dp_45">

<TextView
android:layout_width="@dimen/dp_110"
@@ -924,12 +926,12 @@
</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_12"
android:background="@drawable/home_unm_bg2"
android:paddingHorizontal="@dimen/dp_15"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:paddingHorizontal="@dimen/dp_15">


<LinearLayout
@@ -1021,12 +1023,11 @@
<TextView
android:id="@+id/text8"
style="@style/EditTextStyle"
android:layout_width="0dp"
android:layout_weight="1"
android:gravity="center_vertical"
android:layout_height="match_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@color/white"
android:drawablePadding="@dimen/dp_15"
android:gravity="center_vertical"
android:hint="请选择证件有效日期"
android:minHeight="@dimen/dp_45"
android:paddingHorizontal="@dimen/dp_20" />
@@ -1042,10 +1043,10 @@
</LinearLayout>

<LinearLayout
android:gravity="center_vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_12"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingHorizontal="@dimen/dp_5"
tools:ignore="UseCompoundDrawables">

+ 74
- 60
app/src/main/res/layout/login_activity.xml Прегледај датотеку

@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:background="@mipmap/login_bg"
android:gravity="center_horizontal"
android:layoutAnimation="@anim/layout_from_bottom"
android:orientation="vertical"
@@ -21,12 +21,27 @@
app:rightTitleSize="@dimen/sp_14"
app:title="" />

<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_login_logo"
android:layout_width="@dimen/dp_240"
android:layout_height="@dimen/dp_120"
android:layout_marginVertical="@dimen/dp_10"
app:srcCompat="@mipmap/qtzl_logo" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="vertical"
android:paddingVertical="@dimen/dp_40">

<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_login_logo"
android:layout_width="@dimen/dp_40"
android:layout_height="@dimen/dp_40"
android:layout_marginVertical="@dimen/dp_15"
app:srcCompat="@mipmap/logos" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="欢迎使用业务员App"
android:textColor="@color/white" />

</LinearLayout>

<LinearLayout
android:id="@+id/ll_login_body"
@@ -34,35 +49,63 @@
android:layout_height="wrap_content"
android:orientation="vertical">

<com.hjq.widget.view.ClearEditText
android:id="@+id/et_login_phone"
style="@style/EditTextStyle"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="@dimen/dp_40"
android:layout_marginHorizontal="@dimen/dp_40"
android:layout_marginTop="@dimen/dp_10"
android:hint="@string/common_phone_input_hint"
android:inputType="textVisiblePassword"
android:singleLine="true"
android:text="15764350434"
app:regexType="mobile" />
android:background="@drawable/edit_bg"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingHorizontal="@dimen/dp_15">

<View
style="@style/HorizontalLineStyle"
android:layout_marginHorizontal="@dimen/dp_40" />
<ImageView
android:layout_width="13dp"
android:layout_height="@dimen/dp_20"
android:src="@mipmap/phone" />

<com.hjq.widget.view.ClearEditText
android:id="@+id/et_login_phone"
style="@style/EditTextStyle"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_40"
android:background="@null"
android:hint="@string/common_phone_input_hint"
android:inputType="textVisiblePassword"
android:text="15764350434"
app:regexType="mobile" />

</LinearLayout>

<com.hjq.widget.view.PasswordEditText
android:id="@+id/et_login_password"
style="@style/EditTextStyle"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="@dimen/dp_40"
android:layout_marginHorizontal="@dimen/dp_40"
android:layout_marginTop="@dimen/dp_15"
android:hint="@string/common_password_input_error"
android:imeOptions="actionDone"
android:maxLength="20"
android:singleLine="true"
android:text="6517@Qwer" />
android:layout_marginTop="@dimen/dp_20"
android:background="@drawable/edit_bg"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingHorizontal="@dimen/dp_15">

<ImageView
android:layout_width="13dp"
android:layout_height="@dimen/dp_20"
android:src="@mipmap/password" />

<com.hjq.widget.view.PasswordEditText
android:id="@+id/et_login_password"
style="@style/EditTextStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
android:hint="@string/common_password_input_error"
android:imeOptions="actionDone"
android:maxLength="20"
android:singleLine="true"
android:text="6517@Qwer" />

</LinearLayout>


<LinearLayout
android:id="@+id/layout_code"
@@ -72,7 +115,7 @@
android:background="@color/white"
android:orientation="horizontal"
android:visibility="gone"
tools:visibility="visible">
tools:visibility="gone">

<androidx.appcompat.widget.AppCompatEditText
android:id="@+id/et_phone_reset_code"
@@ -96,9 +139,7 @@

</LinearLayout>

<View
style="@style/HorizontalLineStyle"
android:layout_marginHorizontal="@dimen/dp_40" />


<LinearLayout
android:layout_width="match_parent"
@@ -128,7 +169,6 @@

</LinearLayout>


<com.hjq.widget.view.SubmitButton
android:id="@+id/btn_login_commit"
style="@style/ButtonStyle"
@@ -172,31 +212,5 @@
android:layout_weight="1" />
</LinearLayout>

<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:visibility="gone">

<com.hjq.widget.view.ScaleImageView
android:id="@+id/iv_login_qq"
android:layout_width="@dimen/dp_35"
android:layout_height="@dimen/dp_35"
android:layout_marginHorizontal="@dimen/dp_30"
android:layout_marginVertical="@dimen/dp_20"
android:layout_weight="1"
app:scaleRatio="1.2"
app:srcCompat="@drawable/login_qq_ic" />

<com.hjq.widget.view.ScaleImageView
android:id="@+id/iv_login_wechat"
android:layout_width="@dimen/dp_35"
android:layout_height="@dimen/dp_35"
android:layout_marginHorizontal="@dimen/dp_30"
android:layout_marginVertical="@dimen/dp_20"
android:layout_weight="1"
app:scaleRatio="1.2"
app:srcCompat="@drawable/login_wechat_ic" />
</LinearLayout>

</LinearLayout>

+ 0
- 13
app/src/main/res/layout/splash_activity.xml Прегледај датотеку

@@ -4,7 +4,6 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:orientation="vertical"
tools:context=".src.ui.activity.SplashActivity">

@@ -39,16 +38,4 @@
android:visibility="gone"
tools:text="DEBUG" />

<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/iv_splash_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal|bottom"
android:layout_marginTop="@dimen/dp_50"
android:layout_marginBottom="@dimen/dp_30"
android:text="@string/app_name"
android:textColor="@color/black60"
android:textSize="@dimen/sp_18"
android:textStyle="bold" />

</FrameLayout>

BIN
app/src/main/res/mipmap-xhdpi/login_bg.png Прегледај датотеку


BIN
app/src/main/res/mipmap-xhdpi/logos.png Прегледај датотеку


BIN
app/src/main/res/mipmap-xhdpi/password.png Прегледај датотеку


BIN
app/src/main/res/mipmap-xhdpi/phone.png Прегледај датотеку


Write Preview
Loading…
Откажи
Сачувај