Browse Source

去除http后打包

Shangyp 8 months ago
parent
commit
1bafd7db3e

+ 6 - 4
app/src/main/java/com/telpo/facenormal/activity/MainActivity.java

@@ -991,7 +991,8 @@ import static com.telpo.facenormal.utile.Config.CheckList;
         if (alipayUserInfoBean.getErrcode().equals("0")) {
             SetFederatedPlatformsBean setFederatedPlatformsBean = Config.setFederatedPlatformsBeans(
                     Config.SN, 1, 2, alipayUserInfoBean.getData().getCertNo(),
-                    alipayUserInfoBean.getData().getUserName(), alipayUserInfoBean.getData().getMobile());
+                    alipayUserInfoBean.getData().getUserName(), alipayUserInfoBean.getData().getMobile(),
+                    alipayUserInfoBean.getData().getPhotoBase64());
             setMyFederatedPlatforms(setFederatedPlatformsBean, alipayUserInfoBean.getData().getUserName(),
                     alipayUserInfoBean.getData().getCertNo(), alipayUserInfoBean.getData().getMobile());
             if (!Config.IsStringNull(alipayUserInfoBean.getData().getPhotoBase64())) {
@@ -1348,7 +1349,7 @@ import static com.telpo.facenormal.utile.Config.CheckList;
                         if (Config.taskStatus.equals("wait")) {
                             SetFederatedPlatformsBean setFederatedPlatformsBean = Config.setFederatedPlatformsBeans(
                                     Config.SN, 1, 3, Config.QrData,
-                                    "", "");
+                                    "", "","");
                             // data.replace("\\r","");
                             invokeQrCode(Config.mSessionId, data);//刷码服务
                             //推送刷脸刷卡记录
@@ -1563,7 +1564,8 @@ import static com.telpo.facenormal.utile.Config.CheckList;
                                             if (alipayUserInfoBean.getErrcode().equals("0")) {
                                                 Config.setFederatedPlatformsBeans(
                                                         Config.SN, 1, 2, alipayUserInfoBean.getData().getCertNo(),
-                                                        alipayUserInfoBean.getData().getUserName(), alipayUserInfoBean.getData().getMobile());
+                                                        alipayUserInfoBean.getData().getUserName(), alipayUserInfoBean.getData().getMobile(),
+                                                        alipayUserInfoBean.getData().getPhotoBase64());
 
                                                 //推送刷脸刷卡记录
                                                 setEventRecords("face", alipayUserInfoBean.getData().getUserName(),
@@ -3817,7 +3819,7 @@ import static com.telpo.facenormal.utile.Config.CheckList;
                     .isUseQrcode()) {
                 Config.setFederatedPlatformsBeans(
                         Config.SN, 1, 3, Config.QrData,
-                        "", "");
+                        "", "","");
                 //    data.replace("/r","");
                 invokeQrCode(Config.mSessionId, Config.QrData);//刷码服务
                 //推送刷脸刷卡记录

+ 1 - 1
app/src/main/java/com/telpo/facenormal/activity/setup/LinkagePlatformActivity.java

@@ -163,6 +163,6 @@ public class LinkagePlatformActivity extends BaseActivity implements ContractInt
         String linkageAds=LinkagePlatformActivity_linkageAdsEdit.getText().toString();
         Config.getAuthenticationBean().getData().get(0).setLinkageAds(linkageAds);
         Config.FederatedPlatformsUrl1=linkageAds;
-        Config.FederatedPlatformsUrl = "http://"+Config.FederatedPlatformsUrl1+"/";
+        Config.FederatedPlatformsUrl = Config.FederatedPlatformsUrl1+"/";
     }
 }

+ 10 - 0
app/src/main/java/com/telpo/facenormal/bean/SetFederatedPlatformsBean.java

@@ -67,6 +67,16 @@ public class SetFederatedPlatformsBean {
         private String time;
         @SerializedName("verifytype")
         private int verifytype;
+        @SerializedName("photo")
+        private String photo;
+
+        public String getPhoto() {
+            return photo;
+        }
+
+        public void setPhoto(String photo) {
+            this.photo = photo;
+        }
 
         public String getExtend2() {
             return extend2;

+ 4 - 3
app/src/main/java/com/telpo/facenormal/utile/Config.java

@@ -190,7 +190,7 @@ public class Config {
     //根据三要素返回最终结果url   http://115.227.34.58:1832/       http://192.168.11.3:1832/
     public static String FederatedPlatformsUrl1 = "";//115.227.34.58:1832
     //    public static String FederatedPlatformsUrl = "http://"+FederatedPlatformsUrl1+"/";
-    public static String FederatedPlatformsUrl = "http://"+FederatedPlatformsUrl1+"/";
+    public static String FederatedPlatformsUrl = FederatedPlatformsUrl1+"/";
     //通用
     public static String DeviceStateReportUrl = "https://tx.hz-hanghui.com:8088/";
     //设备定时上报
@@ -489,7 +489,7 @@ public class Config {
     }
 
     public static SetFederatedPlatformsBean setFederatedPlatformsBeans(String sn, int Action, int Verifytype, String Cardid,
-                                                  String Name, String Phone) {
+                                                  String Name, String Phone,String photo) {
         SetFederatedPlatformsBean setFederatedPlatformsBean = new SetFederatedPlatformsBean();
         setFederatedPlatformsBean.setSN(sn);
         setFederatedPlatformsBean.setAction(Action);
@@ -502,6 +502,7 @@ public class Config {
         dataDTO.setJkmType("0");
         dataDTO.setVerifytype(Verifytype);
         dataDTO.setCardid(Cardid);
+        dataDTO.setPhoto(photo);
         dataDTO.setName(Name);
         dataDTO.setPhone(Phone);
         dataDTO.setTime(DateUtil.getTime("yyyy年MM月dd日 HH:mm:ss"));
@@ -639,7 +640,7 @@ public class Config {
         Config.trackingUrl=o.getData().get(0).getHeartTrackingUrl() ;
         Config.EventRecordsUrl=o.getData().get(0).getTransitPushUrl()+"/";
         Config.FederatedPlatformsUrl1=o.getData().get(0).getLinkageAds();
-        Config.FederatedPlatformsUrl = "http://"+Config.FederatedPlatformsUrl1+"/";
+        Config.FederatedPlatformsUrl = Config.FederatedPlatformsUrl1+"/";
         Config.passWay=o.getData().get(0).getPassWay()+"";
         if (Config.passWay.equals("")||Config.passWay.equals("null")){
             Config.passWay="normal";