Merge branch 'master' of http://192.168.40.220/dmc/jz_app into master

app/release/output-metadata.json

@@ -12,7 +12,7 @@
       "filters": [],
       "versionCode": 34,
       "versionName": "1.3.4",
-      "outputFile": "jz_app_v1.3.4_release_0711.apk"
+      "outputFile": "jz_app_v1.3.4_release_0713.apk"
     }
   ]
 }

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/ydplatform/YDPlatformNewlyStep6Activity.java

@@ -16,6 +16,7 @@ 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.sm2.YdSm4Util;
 import com.huntersun.vkyes.etcopencard.project.tool.MyShared;
+import com.huntersun.vkyes.etcopencard.project.tool.Utils;
 import com.huntersun.vkyes.etcopencard.project.ui.activity.ContractActivity;
 import com.huntersun.vkyes.etcopencard.project.ui.activity.ydplatform.ydCode.YdCode;
 import com.huntersun.vkyes.etcopencard.project.utils.AESUtil;
@@ -115,6 +116,35 @@ public class YDPlatformNewlyStep6Activity extends AppActivity {
 
     }
 
+    /**
+     * 支付状态查询
+     */
+    private void payStatusQuery(String wechatSignNo){
+        HashMap<String,String> params = new HashMap<>();
+        params.put("agreementNum",wechatSignNo);
+        params.put("filename",YdCode.YDCODE_PAYSTATUS_QUERY);
+        MyRetrofit.ydNewInstance(this,true, "", params, new MyRetrofit.ReturnResult() {
+            @Override
+            public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
+                LinkedTreeMap<String, Object> linkedTreeMap = JSON.parseObject(resultBean.getBizContent().toString(),LinkedTreeMap.class);
+                if ("0".equals(linkedTreeMap.get("tradeStatus").toString())){
+                    new Utils().showMessDialog(YDPlatformNewlyStep6Activity.this,"该订单未支付");
+                }else if ("1".equals(linkedTreeMap.get("tradeStatus").toString())){
+                    new Utils().showMessDialog(YDPlatformNewlyStep6Activity.this,"该订单正在支付中");
+                }else if ("2".equals(linkedTreeMap.get("tradeStatus").toString())){
+                    Intent intent = new Intent(YDPlatformNewlyStep6Activity.this, YDPlatformNewlySuccessActivity.class);
+                    startActivity(intent);
+                    finish();
+                }else if ("4".equals(linkedTreeMap.get("tradeStatus").toString())){
+                    new Utils().showMessDialog(YDPlatformNewlyStep6Activity.this,"该订单已退款");
+                }else {
+                    new Utils().showMessDialog(YDPlatformNewlyStep6Activity.this,"未查询到支付信息");
+                }
+            }
+        });
+    }
+
+
     private View.OnClickListener imageListener = new View.OnClickListener() {
 
         @Override
@@ -135,9 +165,7 @@ public class YDPlatformNewlyStep6Activity extends AppActivity {
                     LinkedTreeMap<String,Object> linkedTreeMap = JSON.parseObject(resultBean.getBizContent().toString(),LinkedTreeMap.class);
                     if (linkedTreeMap.get("status").toString().equals("1")){//正常
                         //签约检测
-                        Intent intent = new Intent(YDPlatformNewlyStep6Activity.this, YDPlatformNewlySuccessActivity.class);
-                        startActivity(intent);
-                        finish();
+                        payStatusQuery(wechatSignNo);
                     }else if (linkedTreeMap.get("status").toString().equals("2")){//失效
                         toast("签约信息已失效");
                     }else {

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/ydplatform/manager/YDActiveManager.java

@@ -77,7 +77,7 @@ public class YDActiveManager {
      * isTwo false
      */
     public void obuActive(boolean isTwo, ObuOpCallback obuOpCallback) {
-        if ("".equals(obuId)){
+        if ("".equals(obuId)||null==obuId){
             LinkedTreeMap<String, String> obuInfo = JSON.parseObject(JSON.toJSONString(jlBydBleSDK.readObuSystemInfo().getServiceObject()), LinkedTreeMap.class);
             LinkedTreeMap<String, String> cardInfo = JSON.parseObject(JSON.toJSONString(jlBydBleSDK.getJLCardInformation().getServiceObject()), LinkedTreeMap.class);
             this.obuId = obuInfo.get("contractNo");
@@ -96,7 +96,7 @@ public class YDActiveManager {
      * isTwo false
      */
     public void cardActive(boolean isTwo, CardOpCallback obuOpCallback) {
-        if ("".equals(cardId)){
+        if ("".equals(cardId)||null==cardId){
             LinkedTreeMap<String, String> obuInfo = JSON.parseObject(jlBydBleSDK.readObuSystemInfo().getServiceObject().toString(), LinkedTreeMap.class);
             LinkedTreeMap<String, String> cardInfo = JSON.parseObject(jlBydBleSDK.getJLCardInformation().getServiceObject().toString(), LinkedTreeMap.class);
             this.obuId = obuInfo.get("contractNo");

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/ydplatform/ydCode/YdCode.java

@@ -24,6 +24,7 @@ public class YdCode {
     public static String YDCODE_RENEWAL = "UKSS_AFTERSALE_RENEWAL_REQ";//异地续期
     public static String YDCODE_CAR_AUTHCODE_GET = "UKSS_CERTIFY_VEHICLEAUTHCODE_REQ";//车辆授权码获取
     public static String YDCODE_OBUACTIVE = "UKSS_AFTERSALE_OBUACTIVE_REQ";//标签激活
+    public static String YDCODE_PAYSTATUS_QUERY = "UKSS_APP_PAYSTATUS_REQ";//支付状态查询
 
 
     /**

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

@@ -38,10 +38,11 @@
             <EditText
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:background="@color/white"
+                android:background="@color/transparent"
                 android:paddingVertical="@dimen/dp_5"
                 android:inputType="number"
                 android:maxLength="11"
+                android:textColor="@color/black"
                 android:id="@+id/et_phone"
                 android:hint="请输入手机号"
                 android:layout_weight="1"/>
@@ -73,9 +74,10 @@
             <EditText
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:background="@color/white"
+                android:background="@color/transparent"
                 android:paddingVertical="@dimen/dp_5"
                 android:id="@+id/et_code"
+                android:textColor="@color/black"
                 android:hint="请输入图形验证码"
                 android:layout_weight="1"/>
             <Button
@@ -106,9 +108,10 @@
             <EditText
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:background="@color/white"
+                android:background="@color/transparent"
                 android:paddingVertical="@dimen/dp_5"
                 android:id="@+id/et_phone_code"
+                android:textColor="@color/black"
                 android:hint="请输入验证码"
                 android:layout_weight="1"/>
         </LinearLayout>