添加月卡功能

app/build.gradle

@@ -9,8 +9,8 @@ android {
         applicationId "cn.runworld.mctower.visitor"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 3
-        versionName "1.0.2"
+        versionCode 4
+        versionName "1.0.3"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         ndk {
             // 设置支持的SO库架构

app/src/main/AndroidManifest.xml

@@ -13,18 +13,16 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         tools:ignore="GoogleAppIndexingWarning">
-
-        <activity android:name=".HomePageActivity"
+        <activity
+            android:name=".HomePageActivity"
             android:theme="@style/Theme.MyAppCompatTheme"
-            android:windowSoftInputMode="adjustPan" >
-
+            android:windowSoftInputMode="adjustPan">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
         <activity
             android:name=".PassThroughDetailActivity"
             android:theme="@style/Theme.MyAppCompatTheme"
@@ -41,6 +39,15 @@
             android:name=".DetailActivity"
             android:theme="@style/Theme.MyAppCompatTheme"
             android:windowSoftInputMode="adjustPan" />
+        <activity
+            android:name=".QRCodeActivity"
+            android:theme="@style/Theme.MyAppCompatTheme"
+            android:windowSoftInputMode="adjustPan" />
+        <activity
+            android:name=".MonthCardDetailActivity"
+            android:theme="@style/Theme.MyAppCompatTheme"
+            android:windowSoftInputMode="adjustPan" />
+
 
         <service android:name="com.brilliants.idcardlib.IDCardService" />
     </application>

app/src/main/java/cn/dankal/base/http/HttpPostHelper.java

@@ -95,7 +95,8 @@ public class HttpPostHelper {
         RequestParams params = new RequestParams();
         params.setContentType("application/json");
         try {
-            params.setBodyEntity(new StringEntity(json, "UTF-8"));
+            if(!TextUtils.isEmpty(json))
+                params.setBodyEntity(new StringEntity(json, "UTF-8"));
             HttpUtils http = new HttpUtils();
             http.send(HttpRequest.HttpMethod.PUT, url, params,
                     new RequestCallBack<String>() {

app/src/main/java/cn/mctower/visitor/Constant.java

@@ -14,8 +14,8 @@ public class Constant {
 
     public static String BaseImagesDir = Utils.getRootFilePath() + "/image/";
 
-//    public static String Host = "https://api-mircrosoft-building.dankal.cn/v1/"; //测试
-    public static String Host = "https://api.mctower.dankal.cn/v1/"; //正式
+    public static String Host = "https://api-mircrosoft-building.dankal.cn/v1/"; //测试
+//    public static String Host = "https://api.mctower.dankal.cn/v1/"; //正式
     public static final String API_VISIT_RECORD_LIST = Host + "mini/visit/users";
     public static final String API_VISIT_DETAIL = Host + "mini/visit/user/detail/";
     public static final String API_GET_QINIU_TOKEN = Host + "cms/property/common/ignore/qiniu";
@@ -25,6 +25,9 @@ public class Constant {
     public static final String API_PASS_USER_LIST = Host + "mini/pass/users";
     public static final String API_PASS_USER_DETAIL = Host + "mini/pass/user/detail/";
     public static final String API_PASS_USER_BIND = Host + "mini/pass/user/binding";
+    public static final String API_MONTH_CARD_CODE_PIC = Host + "/mini/nocard/qr-code";
+    public static final String API_MONTH_CARD_CHECK = Host + "mini/nocard/qr-code/";
+    public static final String API_MONTH_CARD_DETAIL = Host + "mini/nocard/qr-code/submitter/";
 
 
 }

app/src/main/java/cn/mctower/visitor/HomePageActivity.java

@@ -26,7 +26,7 @@ public class HomePageActivity extends NetBaseAppCompatActivity {
         titleTv.setText("首页");
     }
 
-    @OnClick({R.id.backBtn,R.id.passCode, R.id.visitor})
+    @OnClick({R.id.backBtn,R.id.passCode, R.id.visitor, R.id.monthCard})
     public void click(View view){
         switch (view.getId()){
             case R.id.backBtn:
@@ -38,6 +38,9 @@ public class HomePageActivity extends NetBaseAppCompatActivity {
             case R.id.visitor:
                 jumpActivity(MainActivity.class,false);
                 break;
+            case R.id.monthCard:
+                jumpActivity(QRCodeActivity.class,false);
+                break;
         }
     }
 }

app/src/main/java/cn/mctower/visitor/MonthCardDetailActivity.java

+package cn.mctower.visitor;
+
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.google.gson.Gson;
+import com.lidroid.xutils.ViewUtils;
+import com.lidroid.xutils.view.annotation.ViewInject;
+import com.lidroid.xutils.view.annotation.event.OnClick;
+
+import cn.dankal.base.activity.NetBaseAppCompatActivity;
+import cn.dankal.base.http.DialogHttpCallBack;
+import cn.dankal.base.http.HttpPostHelper;
+import cn.dankal.base.http.NOToastHttpCallBack;
+import cn.dankal.base.utils.LogUtils;
+import cn.dankal.base.utils.NetPicUtil;
+import cn.mctower.visitor.model.MonthCardDetailBean;
+import cn.mctower.visitor.model.MonthCardRqCodeBean;
+import cn.mctower.visitor.model.QiNiuTokenBean;
+
+public class MonthCardDetailActivity extends NetBaseAppCompatActivity {
+
+    @ViewInject(R.id.titleTv)
+    TextView titleTv;
+    @ViewInject(R.id.frame1)
+    RoundLayout frame1;
+    @ViewInject(R.id.frame2)
+    RoundLayout frame2;
+    @ViewInject(R.id.picsFrame)
+    RoundLayout picsFrame;
+    @ViewInject(R.id.openTime)
+    TextView openTime;
+    @ViewInject(R.id.availableTime)
+    TextView availableTime;
+    @ViewInject(R.id.carCardNum)
+    TextView carCardNum;
+    @ViewInject(R.id.carNum)
+    TextView carNum;
+    @ViewInject(R.id.applyReason)
+    TextView applyReason;
+    @ViewInject(R.id.pic1)
+    ImageView pic1;
+    @ViewInject(R.id.pic2)
+    ImageView pic2;
+    @ViewInject(R.id.pic3)
+    ImageView pic3;
+    @ViewInject(R.id.bigPicFrame)
+    LinearLayout bigPicFrame;
+    @ViewInject(R.id.bigPic)
+    ImageView bigPic;
+    @ViewInject(R.id.bindSuccessFrame)
+    LinearLayout bindSuccessFrame;
+
+
+    private MonthCardDetailBean bean;
+    private NetPicUtil netPicUtil;
+    private QiNiuTokenBean qiNiuTokenBean;
+
+    private String uuid;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_month_card_detail);
+        setAndroidNativeLightStatusBar(this,true);
+        setStatusBarColor(this,android.R.color.white);
+        ViewUtils.inject(this);
+        uuid = getIntent().getStringExtra("uuid");
+        titleTv.setText("月卡信息");
+        netPicUtil = new NetPicUtil();
+        frame1.setRoundLayoutRadius(20f);
+        frame2.setRoundLayoutRadius(20f);
+        picsFrame.setRoundLayoutRadius(20f);
+
+        loadData();
+    }
+
+    @OnClick({R.id.backBtn,R.id.pic1,R.id.pic2,R.id.pic3,R.id.bigPicFrame,R.id.bigPic,R.id.successBtn,R.id.bindBtn})
+    public void click(View view) {
+        switch (view.getId()) {
+            case R.id.backBtn:
+                onBackPressed();
+                break;
+            case R.id.pic1:
+            case R.id.pic2:
+            case R.id.pic3:
+                showBigPic(view.getId());
+                break;
+            case R.id.bigPicFrame:
+                break;
+            case R.id.bigPic:
+                bigPicFrame.setVisibility(View.GONE);
+                break;
+            case R.id.successBtn:
+                finish();
+                break;
+            case R.id.bindBtn:
+                submit();
+                break;
+        }
+    }
+
+    @Override
+    public void onBackPressed() {
+        if(bigPicFrame.getVisibility() == View.VISIBLE || bindSuccessFrame.getVisibility() == View.VISIBLE){
+            bigPicFrame.setVisibility(View.GONE);
+        }else
+            super.onBackPressed();
+    }
+
+    private void loadData(){
+        HttpPostHelper.httpGet(this, Constant.API_MONTH_CARD_DETAIL+uuid,new DialogHttpCallBack(this){
+            @Override
+            public void successCallBack(String result) {
+                super.successCallBack(result);
+                bean = new Gson().fromJson(result, MonthCardDetailBean.class);
+                setViews();
+            }
+        },null);
+    }
+
+    private void submit(){
+        HttpPostHelper.httpPutJson(this, Constant.API_MONTH_CARD_DETAIL+uuid,new DialogHttpCallBack(this){
+            @Override
+            public void successCallBack(String result) {
+                super.successCallBack(result);
+                bindSuccessFrame.setVisibility(View.VISIBLE);
+            }
+        },null);
+    }
+
+    private void setViews(){
+        if(bean != null){
+            if(bean.monthCard != null) {
+                openTime.setText(bean.monthCard.startTime);
+                availableTime.setText(bean.monthCard.endTime);
+                carCardNum.setText(bean.monthCard.useCardNo);
+                carNum.setText(bean.cardNo);
+                applyReason.setText(bean.description);
+            }
+            initQiNiuToken();
+        }
+    }
+
+    private void initQiNiuToken(){
+        HttpPostHelper.httpGet(this, Constant.API_GET_QINIU_TOKEN, new NOToastHttpCallBack() {
+            @Override
+            public void successCallBack(String result) {
+                super.successCallBack(result);
+                LogUtils.e("aaaa","json == ====" +result);
+                qiNiuTokenBean = new Gson().fromJson(result, QiNiuTokenBean.class);
+                //设置身份证图片
+                if(qiNiuTokenBean != null && !TextUtils.isEmpty(qiNiuTokenBean.url)){
+                    if(bean.vehicleImgArray != null){
+                        int i = 0 ;
+                        for(String url : bean.vehicleImgArray){
+                            if(i == 0) {
+                                pic1.setVisibility(View.VISIBLE);
+                                netPicUtil.display(pic1,qiNiuTokenBean.url + url);
+                            }
+                            else if(i == 1) {
+                                pic2.setVisibility(View.VISIBLE);
+                                netPicUtil.display(pic2,qiNiuTokenBean.url + url);
+                            }
+                            else if(i == 2) {
+                                pic3.setVisibility(View.VISIBLE);
+                                netPicUtil.display(pic3,qiNiuTokenBean.url + url);
+                            }
+                            i++;
+                            if(i > 3)
+                                break;
+                        }
+                    }else{
+                        pic1.setVisibility(View.GONE);
+                        pic2.setVisibility(View.GONE);
+                        pic3.setVisibility(View.GONE);
+                    }
+                }
+            }
+        }, null);
+    }
+
+
+    private void showBigPic(int id){
+        if(bean.vehicleImgArray != null && bean.vehicleImgArray.size() > 0) {
+            switch (id) {
+                case R.id.pic1:
+                    if(bean.vehicleImgArray.size() > 0)
+                        netPicUtil.display(bigPic,bean.vehicleImgArray.get(0));
+                    break;
+                case R.id.pic2:
+                    if(bean.vehicleImgArray.size() > 1)
+                        netPicUtil.display(bigPic,bean.vehicleImgArray.get(1));
+                    break;
+                case R.id.pic3:
+                    if(bean.vehicleImgArray.size() > 2)
+                        netPicUtil.display(bigPic,bean.vehicleImgArray.get(2));
+                    break;
+            }
+            bigPicFrame.setVisibility(View.VISIBLE);
+        }
+    }
+}

app/src/main/java/cn/mctower/visitor/QRCodeActivity.java

+package cn.mctower.visitor;
+
+import android.os.Bundle;
+import android.os.CountDownTimer;
+import android.view.View;
+import android.widget.ImageView;
+
+import com.google.gson.Gson;
+import com.lidroid.xutils.ViewUtils;
+import com.lidroid.xutils.view.annotation.ViewInject;
+import com.lidroid.xutils.view.annotation.event.OnClick;
+
+import java.util.HashMap;
+
+import cn.dankal.base.activity.NetBaseAppCompatActivity;
+import cn.dankal.base.http.DialogHttpCallBack;
+import cn.dankal.base.http.HttpPostHelper;
+import cn.dankal.base.http.NOToastHttpCallBack;
+import cn.dankal.base.utils.NetPicUtil;
+import cn.mctower.visitor.model.MonthCardCheckBean;
+import cn.mctower.visitor.model.MonthCardRqCodeBean;
+
+public class QRCodeActivity extends NetBaseAppCompatActivity {
+
+    @ViewInject(R.id.codePic)
+    private ImageView codePic;
+
+    private MonthCardRqCodeBean bean;
+    private NetPicUtil netPicUtil;
+    private CountDownTimer countDownTimer;
+    private boolean isChecking = false;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_qrcode);
+        ViewUtils.inject(this);
+        netPicUtil = new NetPicUtil();
+        getCodPic();
+    }
+
+    @OnClick(R.id.backBtn)
+    public void click(View view){
+        switch (view.getId()){
+            case R.id.backBtn:
+                onBackPressed();
+                break;
+        }
+    }
+
+    private void getCodPic(){
+        HttpPostHelper.httpGet(this, Constant.API_MONTH_CARD_CODE_PIC,new DialogHttpCallBack(this){
+            @Override
+            public void successCallBack(String result) {
+                super.successCallBack(result);
+                bean = new Gson().fromJson(result, MonthCardRqCodeBean.class);
+                setViews();
+            }
+        },null);
+
+    }
+
+    private void setViews(){
+        if(bean != null) {
+            netPicUtil.display(codePic, bean.url);
+            countDownTimer = new CountDownTimer(60 * 60 * 1000, 3000) {
+                @Override
+                public void onTick(long l) {
+                    checkStatus();
+                }
+
+                @Override
+                public void onFinish() {
+
+                }
+            }.start();
+        }
+    }
+
+    private void checkStatus(){
+        if(!isChecking) {
+            isChecking = true;
+            HttpPostHelper.httpGet(this, Constant.API_MONTH_CARD_CHECK+bean.uuid,new NOToastHttpCallBack() {
+                @Override
+                public void successCallBack(String result) {
+                    super.successCallBack(result);
+                    MonthCardCheckBean resultBean = new Gson().fromJson(result,MonthCardCheckBean.class);
+                    if(resultBean != null){
+                        if(resultBean.submitStatus.equals("1")){
+                            Bundle data = new Bundle();
+                            data.putString("uuid",bean.uuid);
+                            jumpActivity(MonthCardDetailActivity.class,data,false);
+                            finish();
+                        }
+                    }
+                }
+
+                @Override
+                public void requestFinish() {
+                    super.requestFinish();
+                    isChecking = false;
+                }
+            },null);
+        }
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        if(countDownTimer != null){
+            countDownTimer.cancel();
+            countDownTimer = null;
+        }
+    }
+}

app/src/main/java/cn/mctower/visitor/model/MonthCardCheckBean.java

+package cn.mctower.visitor.model;
+
+/**
+ * Author：Alex tang
+ * Date：2020-11-30
+ * Time：15:47
+ * Description：
+ */
+public class MonthCardCheckBean {
+
+    public String cardNo;
+    public String submitStatus;
+    public String userUuid;
+    public String uuid;
+    public String vehicleImgList;
+}

app/src/main/java/cn/mctower/visitor/model/MonthCardDetailBean.java

+package cn.mctower.visitor.model;
+
+import java.util.List;
+
+/**
+ * Author：Alex tang
+ * Date：2020-11-30
+ * Time：15:47
+ * Description：
+ */
+public class MonthCardDetailBean {
+
+
+    public String cardNo;
+    public int isSubmit;
+    public MonthCardBean monthCard;
+    public String userUuid;
+    public String uuid;
+    public String description;
+    public List<String> vehicleImgArray;
+
+    public static class MonthCardBean {
+        /**
+         * cardApplyUuid : month_card_apply表
+         * cardId : 科拓月卡id
+         * cardNo : 主卡
+         * cardNoSecond : 副卡
+         * companyName : 飞速
+         * companyUuid : 1627227881919xxxxx
+         * createTime : 创建时间
+         * disableTime : 0
+         * endTime : 月卡结束时间
+         * groupName : 月卡组名
+         * isApplyCancel : 是否申请过取消：0-未申请；1-已申请
+         * isCancel : 0-未取消；1-取消
+         * isDisable : 0
+         * isRenewal : 切换主副卡次数
+         * monthCardStatus : 0-进行中；1-即将过期；2-已过期；3-已作废；4-未生效
+         * monthMoney : 月卡金额
+         * name : sueno
+         * phone : 137xxxxxxx
+         * renewalNumber : 切换主副卡次数
+         * staffUuid : staffUuid
+         * startTime : 月卡开始时间
+         * useCardNo : 当前使用的车牌
+         * uuid : 用户月卡uuid
+         * vehicleImgList : 车辆副卡图片数组
+         * vehicleImgSedList : 车辆副卡图片数组
+         * vehicleImgSedListStr : 车辆副卡图片数组
+         */
+
+        public String cardApplyUuid;
+        public String cardId;
+        public String cardNo;
+        public String cardNoSecond;
+        public String companyName;
+        public String companyUuid;
+        public String createTime;
+        public String disableTime;
+        public String endTime;
+        public String groupName;
+        public String isApplyCancel;
+        public String isCancel;
+        public String isDisable;
+        public String isRenewal;
+        public String monthCardStatus;
+        public String monthMoney;
+        public String name;
+        public String phone;
+        public String renewalNumber;
+        public String staffUuid;
+        public String startTime;
+        public String useCardNo;
+        public String uuid;
+        public String vehicleImgList;
+        public String vehicleImgSedList;
+        public String vehicleImgSedListStr;
+
+
+    }
+}

app/src/main/java/cn/mctower/visitor/model/MonthCardRqCodeBean.java

+package cn.mctower.visitor.model;
+
+/**
+ * Author：Alex tang
+ * Date：2020-11-30
+ * Time：15:47
+ * Description：
+ */
+public class MonthCardRqCodeBean {
+
+    public String uuid;
+    public String url;
+}

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

@@ -67,4 +67,61 @@
         </LinearLayout>
     </LinearLayout>
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:gravity="center"
+        android:layout_marginTop="25dp">
+
+
+        <LinearLayout
+            android:id="@+id/monthCard"
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            android:orientation="vertical"
+            android:gravity="center"
+            android:background="#ffffff">
+
+            <ImageView
+                android:layout_width="34dp"
+                android:layout_height="33dp"
+                android:adjustViewBounds="true"
+                android:src="@mipmap/ic_yueka"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="#333333"
+                android:layout_marginTop="12dp"
+                android:textSize="12sp"
+                android:text="月卡绑定"/>
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/empty"
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            android:orientation="vertical"
+            android:gravity="center"
+            android:background="#ffffff"
+            android:layout_marginLeft="25dp"
+            android:visibility="invisible">
+
+            <ImageView
+                android:layout_width="33dp"
+                android:layout_height="33dp"
+                android:scaleType="fitXY"
+                android:src="@mipmap/ic_visitors"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="#333333"
+                android:layout_marginTop="12dp"
+                android:textSize="12sp"
+                android:text="访客"/>
+        </LinearLayout>
+    </LinearLayout>
+
 </LinearLayout>

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

+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="cn.mctower.visitor.QRCodeActivity"
+    android:background="@android:color/white">
+
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:adjustViewBounds="true"
+        android:src="@mipmap/pic_qrcode_top_bg"/>
+
+    <RelativeLayout
+        android:id="@+id/titleBar"
+        android:layout_width="match_parent"
+        android:layout_height="48dp">
+
+        <TextView
+            android:id="@+id/titleTv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:text="二维码"
+            android:textSize="20sp"
+            android:textColor="#ffffff"
+            android:textStyle="bold"/>
+
+        <ImageView
+            android:id="@+id/backBtn"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:padding="5dp"
+            android:layout_centerVertical="true"
+            android:src="@mipmap/ic_back_white"
+            android:layout_marginLeft="10dp"/>
+
+    </RelativeLayout>
+
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/roundrectangle_white_bg"
+        android:translationZ="10dp"
+        android:layout_below="@id/titleBar"
+        android:layout_marginLeft="24dp"
+        android:layout_marginRight="24dp"
+        android:layout_marginTop="30dp">
+
+
+        <ImageView
+            android:id="@+id/codePic"
+            android:layout_width="158dp"
+            android:layout_height="178dp"
+            android:layout_centerHorizontal="true"
+            android:scaleType="fitXY"
+            android:background="#eeeeee"
+            android:layout_marginTop="40dp"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:layout_below="@id/codePic"
+            android:layout_marginTop="33dp"
+            android:layout_marginBottom="33dp"
+            android:textColor="#2D506B"
+            android:textSize="16sp"
+            android:text="请扫描二维码进行月卡绑定" />
+
+    </RelativeLayout>
+
+</RelativeLayout>