huting пре 2 година
родитељ
комит
419959ca38

BIN
app/debug/KyushuETC1.0_v1.0.4_debug.apk Прегледај датотеку


+ 18
- 0
app/debug/output-metadata.json Прегледај датотеку

@@ -0,0 +1,18 @@
{
"version": 2,
"artifactType": {
"type": "APK",
"kind": "Directory"
},
"applicationId": "com.huntersun.vkyes.etcopencard",
"variantName": "processDebugResources",
"elements": [
{
"type": "SINGLE",
"filters": [],
"versionCode": 10,
"versionName": "1.0.4",
"outputFile": "KyushuETC1.0_v1.0.4_debug.apk"
}
]
}

+ 7
- 0
app/src/main/AndroidManifest.xml Прегледај датотеку

@@ -592,7 +592,10 @@
android:launchMode="singleTop"
android:screenOrientation="portrait" />

<<<<<<< HEAD
=======
<!--解除车牌占用-->
>>>>>>> ea3fbcd9fd029e789c3050032e53a5316c907094
<activity
android:name=".project.ui.activity.my.RemoveLicensePlateOccupation"
android:launchMode="singleTop"
@@ -601,6 +604,10 @@
android:name=".project.ui.activity.my.SuccessfulApplication"
android:launchMode="singleTop"
android:screenOrientation="portrait" />
<<<<<<< HEAD

=======
>>>>>>> ea3fbcd9fd029e789c3050032e53a5316c907094
<!--设备升级-->
<activity
android:name=".project.ui.activity.after.EquipmentUpgradeActivity"

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

@@ -49,8 +49,8 @@ public class MyRetrofit {
* 回显地址:222.85.144.89:19002/xxxxxx
*/
// 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://192.168.100.63:8087/ifzt/api/"; //VPN访问请求地址
// private final String BaseUrl = "http://222.85.144.89:19002/ifzt/api/"; //接口地址
private final String BaseUrl = "http://192.168.100.63:8087/ifzt/api/"; //VPN访问请求地址

private final String FileUrl = "http://222.85.144.89:19003/ifzt/api/"; //文件服务
private final String appId = "admin001";

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

@@ -12,13 +12,13 @@ import java.util.Date;
*/
public class RequestParameters {
private final String IFCODE;
private final String AppId = "admin001";
private final String appId = "admin001";
private final String encryptType = "NONE";
private final String signType = "MD5";
private final String sign;
@SuppressLint("SimpleDateFormat")
private final String timestamp = new SimpleDateFormat("yyyy-MM-dd'T'hh:mm:ss").format(new Date());
private final String ReqId = "12345";
private final String reqId = "12345";
private final String bizContent;

public RequestParameters(String IFCODE, String bizContent) {
@@ -32,7 +32,7 @@ public class RequestParameters {
"&signType=" + "MD5" +
"&encryptType=" + "NONE" +
"&timestamp=" + timestamp +
"&IFCODE=" + this.IFCODE;
"&ifCode=" + this.IFCODE;
return MD5SignUtil.MD5Encode(var2, "UTF-8", false);
}


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

@@ -381,6 +381,9 @@ public class ResultBean<T> {
private String negativeImageUrl;
private String agentName;
private String agentIdnum;
private String aentTel;
private String agentTel;
private String agentIdVld;
private String agentPosImgUrl;
private String proxyUrl;
private String ownerName;
@@ -440,6 +443,126 @@ public class ResultBean<T> {
private ObuDetailInfoBean.UserPromiseCBBean userPromiseCBBean;
private ObuDetailInfoBean.QueryCarInfoCBBean queryCarInfoCBBean;

public String getAgentTel() {
return agentTel;
}

public void setAgentTel(String agentTel) {
this.agentTel = agentTel;
}

public String getAgentIdVld() {
return agentIdVld;
}

public void setAgentIdVld(String agentIdVld) {
this.agentIdVld = agentIdVld;
}

public String getPinType() {
return pinType;
}

public void setPinType(String pinType) {
this.pinType = pinType;
}

public String getCardBalance() {
return cardBalance;
}

public void setCardBalance(String cardBalance) {
this.cardBalance = cardBalance;
}

public String getRefundType() {
return refundType;
}

public void setRefundType(String refundType) {
this.refundType = refundType;
}

public String getSuppleType() {
return suppleType;
}

public void setSuppleType(String suppleType) {
this.suppleType = suppleType;
}

public String getListNo() {
return listNo;
}

public void setListNo(String listNo) {
this.listNo = listNo;
}

public String getSuppleStatus() {
return suppleStatus;
}

public void setSuppleStatus(String suppleStatus) {
this.suppleStatus = suppleStatus;
}

public String getSuppleNo() {
return suppleNo;
}

public void setSuppleNo(String suppleNo) {
this.suppleNo = suppleNo;
}

public Long getServiceFee() {
return serviceFee;
}

public void setServiceFee(Long serviceFee) {
this.serviceFee = serviceFee;
}

public String getEntolllaneName() {
return entolllaneName;
}

public void setEntolllaneName(String entolllaneName) {
this.entolllaneName = entolllaneName;
}

public String getEnTime() {
return enTime;
}

public void setEnTime(String enTime) {
this.enTime = enTime;
}

public String getExtolllaneName() {
return extolllaneName;
}

public void setExtolllaneName(String extolllaneName) {
this.extolllaneName = extolllaneName;
}

public String getExTime() {
return exTime;
}

public void setExTime(String exTime) {
this.exTime = exTime;
}

public String getAentTel() {
return aentTel;
}

public void setAentTel(String aentTel) {
this.aentTel = aentTel;
}

public String getOpenid() {
return openid;
}

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

@@ -50,7 +50,9 @@ public class SendTheVerificationCodeBean {
private String userNegImgUrl;
private String address;
private String agentName;
private String agentIdVld;
private String agentIdType;
private String agentTel;
private String agentIdNum;
private String agentPosImgUrl;
private String agentNegImgUrl;
@@ -149,6 +151,22 @@ public class SendTheVerificationCodeBean {
private String opId = (String) MyShared.getInstance().get(MyShared.OPENID, "");
private String openId = (String) MyShared.getInstance().get(MyShared.OPENID, "");

public String getAgentTel() {
return agentTel;
}

public void setAgentTel(String agentTel) {
this.agentTel = agentTel;
}

public String getAgentIdVld() {
return agentIdVld;
}

public void setAgentIdVld(String agentIdVld) {
this.agentIdVld = agentIdVld;
}

public int getHasCard() {
return hasCard;
}

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

@@ -133,7 +133,8 @@ public class IdentityInformationUploadActivity extends AppActivity {
}
binding.text6.setText(bizContent1.getAgentName()); //经办人姓名
binding.text7.setText(bizContent1.getAgentIdnum()); //证件号
binding.text8.setText(""); //有效日期
binding.text9.setText(bizContent1.getAgentTel()); //经办人电话
binding.text8.setText(bizContent1.getAgentIdVld()); //经办人证件有效期); //有效日期
}
}
});
@@ -166,6 +167,7 @@ public class IdentityInformationUploadActivity extends AppActivity {
if (isSky(imgUrl3, "经办人身份证正面", binding.image3) || isSky(imgUrl4, "经办人身份证反面", binding.image4) ||
isSky(imgUrl4, "委托书图片", binding.image5) ||
isSky(binding.text6.getText() + "", "经办人姓名", binding.text6) ||
isSky(binding.text9.getText() + "", "经办人电话", binding.text9) ||
isSky(binding.text7.getText() + "", "经办人证件号", binding.text7) ||
isSky(binding.text8.getText() + "", "经办人身份证过期时间", binding.text8)) {
return;
@@ -198,8 +200,12 @@ public class IdentityInformationUploadActivity extends AppActivity {
fatherBean.bizContent.setUserNegImgUrl(imgUrl2); //反面图片地址
fatherBean.bizContent.setTel(binding.text2.getText() + ""); //开户人手机号码
fatherBean.bizContent.setAddress(binding.text4.getText() + ""); //开户人地址

fatherBean.bizContent.setAgentIdType("101"); //经办人证件类型
fatherBean.bizContent.setAgentIdNum(binding.text7.getText() + ""); //经办人证件号码
fatherBean.bizContent.setAgentName(binding.text6.getText() + ""); //经办人姓名
fatherBean.bizContent.setAgentTel(binding.text9.getText() + ""); //经办人电话
fatherBean.bizContent.setAgentIdVld(binding.text8.getText() + ""); //经办人证件有效期
fatherBean.bizContent.setAgentPosImgUrl(imgUrl3); //经办人正面图片地址
fatherBean.bizContent.setAgentNegImgUrl(imgUrl4); //经办人反面图片地址
fatherBean.bizContent.setProxyUrl(imgUrl5); //委托书图片地址

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

@@ -145,6 +145,7 @@ public class VehicleInformationActivity extends AppActivity {
fatherBean.bizContent.setMaintenaceMass(binding.text6.getText() + ""); //整备质量
fatherBean.bizContent.setVehicleDimensions(binding.text7.getText() + ""); //车辆尺寸
fatherBean.bizContent.setIssueDate(binding.text14.getText() + ""); //发证日期
fatherBean.bizContent.setOwnerName(binding.text3.getText() + ""); // 所有人 getOwnerName
//货车专属
fatherBean.bizContent.setPermittedWeight(binding.text11.getText() + ""); //核定载质量
fatherBean.bizContent.setPermittedTowWeight(TextUtils.isEmpty(binding.text12.getText() + "")

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

@@ -199,12 +199,17 @@ public class FragmentHomeTow extends TitleBarFragment<MainActivity> {
break;
case "解除车牌占用":
jumpToPage(RemoveLicensePlateOccupation.class);
<<<<<<< HEAD
=======
break;
>>>>>>> ea3fbcd9fd029e789c3050032e53a5316c907094
case "设备升级":
jumpToPage(EquipmentUpgradeActivity.class);
break;
case "卡Pin码解锁":
jumpToPage(CardUnlockPinActivity.class);
<<<<<<< HEAD
=======
break;
case "满意度评价":
startActivity(UserEvaluateActivity.class);
@@ -214,6 +219,7 @@ public class FragmentHomeTow extends TitleBarFragment<MainActivity> {
break;
case "ETC过户":
jumpToPage(TransferOwnershipStep1Activity.class);
>>>>>>> ea3fbcd9fd029e789c3050032e53a5316c907094
break;
case "补卡额申请":
jumpToPage(ExtraCreditStep1Activity.class);

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

@@ -963,6 +963,39 @@

</LinearLayout>

<View
style="@style/VerticalLineStyle"
android:layout_width="wrap_content"
android:layout_height="1dp"
android:layout_marginHorizontal="@dimen/dp_10" /> <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#FFFFFF"
android:gravity="center_vertical"
android:minHeight="@dimen/dp_45">

<TextView
android:layout_width="@dimen/dp_110"
android:layout_height="match_parent"
android:drawableLeft="@mipmap/must"
android:gravity="center_vertical"
android:text="经办人电话"
android:textSize="@dimen/sp_14"
tools:ignore="UseCompatTextViewDrawableXml" />

<com.hjq.widget.view.ClearEditText
android:id="@+id/text9"
style="@style/EditTextStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:drawablePadding="@dimen/dp_15"
android:hint="请输入经办人电话"
android:minHeight="@dimen/dp_45"
android:paddingHorizontal="@dimen/dp_20" />

</LinearLayout>

<View
style="@style/VerticalLineStyle"
android:layout_width="wrap_content"

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