no message

.idea/gradle.xml

@@ -4,10 +4,8 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <compositeConfiguration>
-          <compositeBuild compositeDefinitionSource="SCRIPT" />
-        </compositeConfiguration>
         <option name="delegatedBuild" value="false" />
+        <option name="testRunner" value="PLATFORM" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
@@ -21,7 +19,6 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
-        <option name="testRunner" value="PLATFORM" />
       </GradleProjectSettings>
     </option>
   </component>

.idea/jarRepositories.xml

@@ -46,5 +46,10 @@
       <option name="name" value="Google" />
       <option name="url" value="https://dl.google.com/dl/android/maven2/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="BintrayJCenter" />
+      <option name="name" value="BintrayJCenter" />
+      <option name="url" value="https://jcenter.bintray.com/" />
+    </remote-repository>
   </component>
 </project>

app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "com.zy.bvvm"
         minSdkVersion 15
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 101
-        versionName "1.0.2"
+        versionCode 104
+        versionName "1.0.4"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
         multiDexEnabled true

app/src/main/AndroidManifest.xml

@@ -81,6 +81,10 @@
             android:launchMode="singleTop"
             android:screenOrientation="portrait" />
         <activity
+            android:name=".ui.vaccination.ReadingActivity02"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait" /> <!--修改为只传序列号-->
+        <activity
             android:name=".ui.My.ExamineActivity"
             android:screenOrientation="portrait" />
         <activity
@@ -99,6 +103,9 @@
             android:name=".ui.vaccination.VnReportDetailForDoctorActivity"
             android:screenOrientation="portrait" />
         <activity
+            android:name=".ui.vaccination.VnReportDetailForDoctorActivity01"
+            android:screenOrientation="portrait" />
+        <activity
             android:name=".ui.My.InformationActivity"
             android:screenOrientation="portrait" />
         <activity

app/src/main/java/com/zy/bvvm/api/ApiUrl.java

@@ -14,7 +14,8 @@ public class ApiUrl {
     //基本地址(要以“/”结尾)   测试服务器地址 http://evvminterface.lizhongxian.com/
 
     //发布地址
-    public static final String TEST_URL = "http://kxnevvmapi.vandh.org:81/";
+//    public static final String TEST_URL = "http://kxnevvmapi.vandh.org:81/";
+    public static final String TEST_URL = "http://121.229.41.37:8091/";
 
     //基本地址(要以“/”结尾) 自己的服务器地址
     public static final String MY_URL = "http://evvmdatacenter.lizhongxian.com/";

app/src/main/java/com/zy/bvvm/common/MyActivity.java

@@ -184,7 +184,6 @@ public abstract class MyActivity extends UIActivity implements OnTitleBarListene
      */
     public void toast(CharSequence s) {
         // ToastUtils.show(s);
-
         toastList.clear();
         toastList.add(s.toString());
         final BaseDialog show = new MenuDialog.Builder(this)

app/src/main/java/com/zy/bvvm/helper/DoubleClickHelper.java

@@ -5,6 +5,7 @@ import android.os.SystemClock;
 
 public final class DoubleClickHelper {
 
+
     private static final long[] TIME_ARRAY = new long[2]; // 数组的长度为2代表只记录双击操作
 
     /**

app/src/main/java/com/zy/bvvm/helper/NFCTools.java

@@ -0,0 +1,171 @@
+package com.zy.bvvm.helper;
+
+import android.app.Activity;
+import android.app.PendingIntent;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.nfc.NdefMessage;
+import android.nfc.NdefRecord;
+import android.nfc.NfcAdapter;
+import android.nfc.Tag;
+import android.nfc.tech.Ndef;
+import android.os.Build;
+import android.os.Parcelable;
+import android.provider.Settings;
+import android.support.annotation.RequiresApi;
+
+import java.io.UnsupportedEncodingException;
+import java.util.Arrays;
+
+public class NFCTools {
+
+    //nfc
+    public static NfcAdapter mNfcAdapter;
+    public static IntentFilter[] mIntentFilter = null;
+    public static PendingIntent mPendingIntent = null;
+    public static String[][] mTechList = null;
+
+    /**
+     * 构造函数，用于初始化nfc
+     */
+    public NFCTools(Activity activity) {
+        mNfcAdapter = NfcCheck(activity);
+        NfcInit(activity);
+    }
+
+    /**
+     * 检查NFC是否打开
+     */
+    public static NfcAdapter NfcCheck(Activity activity) {
+        NfcAdapter mNfcAdapter = NfcAdapter.getDefaultAdapter(activity);
+        if (mNfcAdapter == null) {
+            return null;
+        } else {
+            if (!mNfcAdapter.isEnabled()) {
+                Intent setNfc = new Intent(Settings.ACTION_NFC_SETTINGS);
+                activity.startActivity(setNfc);
+            }
+        }
+        return mNfcAdapter;
+    }
+
+    /**
+     * 初始化nfc设置
+     */
+    public static void NfcInit(Activity activity) {
+        mPendingIntent = PendingIntent.getActivity(activity, 0, new Intent(activity, activity.getClass()).addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP), 0);
+        IntentFilter filter = new IntentFilter(NfcAdapter.ACTION_NDEF_DISCOVERED);
+        IntentFilter filter2 = new IntentFilter(NfcAdapter.ACTION_TAG_DISCOVERED);
+        try {
+            filter.addDataType("*/*");
+        } catch (IntentFilter.MalformedMimeTypeException e) {
+            e.printStackTrace();
+        }
+        mIntentFilter = new IntentFilter[]{filter, filter2};
+        mTechList = null;
+    }
+
+    /**
+     * 读取NFC标签文本数据
+     */
+    public static String readNfcTag(Intent intent) {
+
+        if (NfcAdapter.ACTION_NDEF_DISCOVERED.equals(intent.getAction())) {
+            Parcelable[] rawMsgs = intent.getParcelableArrayExtra(NfcAdapter.EXTRA_NDEF_MESSAGES);
+            NdefMessage msgs[] = null;
+            if (rawMsgs != null) {
+                msgs = new NdefMessage[rawMsgs.length];
+                for (int i = 0; i < rawMsgs.length; i++) {
+                    msgs[i] = (NdefMessage) rawMsgs[i];
+                }
+            }
+            try {
+                if (msgs != null) {
+                    NdefRecord record = msgs[0].getRecords()[0];
+                    return parseTextRecord(record);
+                }
+            } catch (Exception e) {
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 读取NFC的数据
+     */
+    public static String readNFCFromTag(Intent intent) throws UnsupportedEncodingException {
+        Parcelable[] rawArray = intent.getParcelableArrayExtra(NfcAdapter.EXTRA_NDEF_MESSAGES);
+        if (rawArray != null) {
+            NdefMessage mNdefMsg = (NdefMessage) rawArray[0];
+            NdefRecord mNdefRecord = mNdefMsg.getRecords()[0];
+            if (mNdefRecord != null) {
+                String readResult = new String(mNdefRecord.getPayload(), "UTF-8");
+                return readResult;
+            }
+        }
+        return "";
+    }
+
+    /**
+     * 往nfc写入数据
+     */
+    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
+    public static void writeNFCToTag(String data, Tag tag) throws Exception {
+//        Tag tag = intent.getParcelableExtra(NfcAdapter.EXTRA_TAG);
+        Ndef ndef = Ndef.get(tag);
+        ndef.connect();
+        NdefRecord ndefRecord = NdefRecord.createTextRecord(null, data);
+        NdefRecord[] records = {ndefRecord};
+        NdefMessage ndefMessage = new NdefMessage(records);
+        ndef.writeNdefMessage(ndefMessage);
+    }
+    /**
+     * 读取nfcID
+     */
+    public static String readNFCId(Intent intent) throws UnsupportedEncodingException {
+        Tag tag = intent.getParcelableExtra(NfcAdapter.EXTRA_TAG);
+        String id = ByteArrayToHexString(tag.getId());
+        return id;
+    }
+
+    /**
+     * 将字节数组转换为字符串
+     */
+    private static String ByteArrayToHexString(byte[] inarray) {
+        int i, j, in;
+        String[] hex = {"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "E", "F"};
+        String out = "";
+
+        for (j = 0; j < inarray.length; ++j) {
+            in = (int) inarray[j] & 0xff;
+            i = (in >> 4) & 0x0f;
+            out += hex[i];
+            i = in & 0x0f;
+            out += hex[i];
+        }
+        return out;
+    }
+
+    public static String parseTextRecord(NdefRecord ndefRecord) {
+        if (ndefRecord.getTnf() != NdefRecord.TNF_WELL_KNOWN) {
+            return null;
+        }
+        if (!Arrays.equals(ndefRecord.getType(), NdefRecord.RTD_TEXT)) {
+            return null;
+        }
+        try {
+            byte[] bArray = ndefRecord.getPayload();
+            StringBuffer sb = new StringBuffer(bArray.length);
+            String sTemp;
+            for (int i = 0; i < bArray.length; i++) {
+                sTemp = Integer.toHexString(0xFF & bArray[i]);
+                if (sTemp.length() < 2)
+                    sb.append(0);
+                sb.append(sTemp.toUpperCase());
+            }
+            return sb.toString();
+        } catch (Exception e) {
+            throw new IllegalArgumentException();
+        }
+    }
+}

app/src/main/java/com/zy/bvvm/ui/My/MyFragment.java

@@ -27,6 +27,7 @@ import com.zy.bvvm.ui.My.change.ChangeIFMTActivity;
 import com.zy.bvvm.ui.event.informationEvent;
 import com.zy.bvvm.ui.home.HomeActivity;
 import com.zy.bvvm.ui.login.LoginActivity;
+import com.zy.bvvm.ui.login.LoginPasswordActivity;
 import com.zy.bvvm.ui.vaccination.ReadingActivity;
 import com.zy.bvvm.ui.webview.AgreementActrvity;
 import com.zy.bvvm.ui.webview.WebActivity;
@@ -172,11 +173,12 @@ public class MyFragment extends MyLazyFragment<HomeActivity> {
 
                             @Override
                             public void onConfirm(Dialog dialog) {
-                                startActivity(LoginActivity.class);
+                                startActivity(LoginPasswordActivity.class);
                                 //清除用户信息
 //                                SPUtils.logout();
+                                SPUtils.put("isQuid", "true");
                                 // 进行内存优化，销毁掉所有的界面
-                                ActivityStackManager.getInstance().finishAllActivities(LoginActivity.class);
+                                ActivityStackManager.getInstance().finishAllActivities(LoginPasswordActivity.class);
                             }
 
                             @Override

app/src/main/java/com/zy/bvvm/ui/bean/VnDetailBean.java

@@ -106,9 +106,37 @@ public class VnDetailBean extends BaseDataBean {
         private String beginDate;
         private String reviewId;
         private boolean reviewed;
+        /**
+         * 疫苗管理-有效期
+         * 有效期
+         */
         private String vaccineExpiryDate;
+        /**
+         * 规格
+         */
         private String vaccineCategory;
         private String batch;
+        //新添加字段
+        /**
+         * 疫苗管理-药品通用名称
+         */
+        private String vaccineCommonName;
+        /**
+         * 疫苗管理-接种部位
+         */
+        private String vaccinationSite;
+        /**
+         * 疫苗管理-批准文号
+         */
+        private String approvalNumber;
+        /**
+         *疫苗管理-药品本位码
+         */
+        private String standardCode;
+        /**
+         *  疫苗管理-国家药品标识码
+         */
+        private String identificationCode;
 
         public String getChipNumber() {
             return chipNumber;
@@ -406,46 +434,91 @@ public class VnDetailBean extends BaseDataBean {
             this.batch = batch;
         }
 
+        public String getVaccineCommonName() {
+            return vaccineCommonName;
+        }
+
+        public void setVaccineCommonName(String vaccineCommonName) {
+            this.vaccineCommonName = vaccineCommonName;
+        }
+
+        public String getVaccinationSite() {
+            return vaccinationSite;
+        }
+
+        public void setVaccinationSite(String vaccinationSite) {
+            this.vaccinationSite = vaccinationSite;
+        }
+
+        public String getApprovalNumber() {
+            return approvalNumber;
+        }
+
+        public void setApprovalNumber(String approvalNumber) {
+            this.approvalNumber = approvalNumber;
+        }
+
+        public String getStandardCode() {
+            return standardCode;
+        }
+
+        public void setStandardCode(String standardCode) {
+            this.standardCode = standardCode;
+        }
+
+        public String getIdentificationCode() {
+            return identificationCode;
+        }
+
+        public void setIdentificationCode(String identificationCode) {
+            this.identificationCode = identificationCode;
+        }
+
         @Override
         public String toString() {
             return "DataBean{" +
                     "chipNumber='" + chipNumber + '\'' +
                     ", vaccinationCipher='" + vaccinationCipher + '\'' +
                     ", vaccineName='" + vaccineName + '\'' +
-                    ", vaccineNumber=" + vaccineNumber +
+                    ", vaccineNumber='" + vaccineNumber + '\'' +
                     ", codeX='" + codeX + '\'' +
                     ", datetime='" + datetime + '\'' +
                     ", factoryId=" + factoryId +
                     ", factoryName='" + factoryName + '\'' +
                     ", gmpName='" + gmpName + '\'' +
-                    ", gmpPath=" + gmpPath +
+                    ", gmpPath='" + gmpPath + '\'' +
                     ", hospitalName='" + hospitalName + '\'' +
                     ", doctorName='" + doctorName + '\'' +
                     ", doctorTelephone='" + doctorTelephone + '\'' +
-                    ", doctorEmail=" + doctorEmail +
-                    ", batchCertificate=" + batchCertificate +
-                    ", sameBatchOtherColdChain=" + sameBatchOtherColdChain +
-                    ", sameBatchOtherFlow=" + sameBatchOtherFlow +
-                    ", sameFactoryOtherVaccines=" + sameFactoryOtherVaccines +
+                    ", doctorEmail='" + doctorEmail + '\'' +
+                    ", batchCertificate='" + batchCertificate + '\'' +
+                    ", sameBatchOtherColdChain='" + sameBatchOtherColdChain + '\'' +
+                    ", sameBatchOtherFlow='" + sameBatchOtherFlow + '\'' +
+                    ", sameFactoryOtherVaccines='" + sameFactoryOtherVaccines + '\'' +
                     ", type=" + type +
                     ", status=" + status +
-                    ", hospitalId=" + hospitalId +
-                    ", doctorId=" + doctorId +
-                    ", factoryEmail=" + factoryEmail +
-                    ", vaccinateTime=" + vaccinateTime +
+                    ", hospitalId='" + hospitalId + '\'' +
+                    ", doctorId='" + doctorId + '\'' +
+                    ", factoryEmail='" + factoryEmail + '\'' +
+                    ", vaccinateTime='" + vaccinateTime + '\'' +
                     ", inoculatroUserName='" + inoculatroUserName + '\'' +
-                    ", inoculatroIdCard=" + inoculatroIdCard +
+                    ", inoculatroIdCard='" + inoculatroIdCard + '\'' +
                     ", inoculatroTelePhone='" + inoculatroTelePhone + '\'' +
                     ", inoculatroSex='" + inoculatroSex + '\'' +
                     ", inoculatroBirthdate='" + inoculatroBirthdate + '\'' +
-                    ", inoculatroId=" + inoculatroId +
+                    ", inoculatroId='" + inoculatroId + '\'' +
                     ", chatImageUrl='" + chatImageUrl + '\'' +
                     ", beginDate='" + beginDate + '\'' +
-                    ", reviewId=" + reviewId +
+                    ", reviewId='" + reviewId + '\'' +
                     ", reviewed=" + reviewed +
                     ", vaccineExpiryDate='" + vaccineExpiryDate + '\'' +
                     ", vaccineCategory='" + vaccineCategory + '\'' +
                     ", batch='" + batch + '\'' +
+                    ", vaccineCommonName='" + vaccineCommonName + '\'' +
+                    ", vaccinationSite='" + vaccinationSite + '\'' +
+                    ", approvalNumber='" + approvalNumber + '\'' +
+                    ", standardCode='" + standardCode + '\'' +
+                    ", identificationCode='" + identificationCode + '\'' +
                     '}';
         }
     }

app/src/main/java/com/zy/bvvm/ui/home/FactoryOperatorActivity.java

@@ -231,7 +231,7 @@ public class FactoryOperatorActivity extends BaseNfcActivity implements UploadCh
                         SPUtils.put("isQuid", "true");
 //                        SPUtils.logout();
                         // 进行内存优化，销毁掉所有的界面
-                        ActivityStackManager.getInstance().finishAllActivities(LoginActivity.class);
+                        ActivityStackManager.getInstance().finishAllActivities(LoginPasswordActivity.class);
                     }
 
                     @Override

app/src/main/java/com/zy/bvvm/ui/home/HomeActivity.java

@@ -25,6 +25,7 @@ import com.zy.bvvm.ui.bean.VnDetailBean;
 import com.zy.bvvm.ui.event.informationEvent;
 import com.zy.bvvm.ui.home.uploadChip.UploadChipContract;
 import com.zy.bvvm.ui.login.LoginActivity;
+import com.zy.bvvm.ui.login.LoginPasswordActivity;
 import com.zy.bvvm.ui.toreview.ToreviewFragment;
 import com.zy.bvvm.ui.vaccination.FirstFragment;
 import com.zy.bvvm.widget.EvvmMsgDiago;
@@ -76,9 +77,10 @@ public class HomeActivity extends BaseGPSActivity implements ViewPager.OnPageCha
         mViewPager.setAdapter(mPagerAdapter);
         // 限制页面数量
         mViewPager.setOffscreenPageLimit(mPagerAdapter.getCount());
-        intent = getIntent();
+        intent = getIntent();       //从读取页面跳转过来的
         intent.getStringExtra("pager");
         if (intent != null) {
+            //跳转到我的页面
             mViewPager.setCurrentItem(1);
         }
     }
@@ -115,11 +117,12 @@ public class HomeActivity extends BaseGPSActivity implements ViewPager.OnPageCha
 
                             @Override
                             public void onConfirm(Dialog dialog) {
-                                startActivity(LoginActivity.class);
+                                startActivity(LoginPasswordActivity.class);
                                 //清除用户信息
 //                                SPUtils.logout();
+                                SPUtils.put("isQuid", "true");
                                 // 进行内存优化，销毁掉所有的界面
-                                ActivityStackManager.getInstance().finishAllActivities(LoginActivity.class);
+                                ActivityStackManager.getInstance().finishAllActivities(LoginPasswordActivity.class);
                             }
 
                             @Override

app/src/main/java/com/zy/bvvm/ui/login/LoginActivity.java

@@ -59,6 +59,7 @@ import com.zy.bvvm.ui.login.login.LoginContract;
 import com.zy.bvvm.ui.login.login.LoginPresenter;
 import com.zy.bvvm.ui.login.newPassword.NewPassword;
 import com.zy.bvvm.ui.vaccination.ReadingActivity;
+import com.zy.bvvm.ui.vaccination.ReadingActivity02;
 import com.zy.bvvm.ui.webview.AgreementActrvity;
 
 public class LoginActivity extends MvpActivity<LoginPresenter> implements LoginContract.View {
@@ -474,7 +475,7 @@ public class LoginActivity extends MvpActivity<LoginPresenter> implements LoginC
                         int guide_doctor = (int) SPUtils.get("GUIDE_DOCTOR", 0);
                         if (guide_doctor == 1) {        //判断是否首次登陆
 //                        startActivityFinish(HomeActivity.class);
-                            startActivityFinish(ReadingActivity.class);
+                            startActivityFinish(ReadingActivity02.class);
                         } else {
                             goToGuide(roleId);
                         }
@@ -514,7 +515,7 @@ public class LoginActivity extends MvpActivity<LoginPresenter> implements LoginC
                     int guide_doctor = (int) SPUtils.get("GUIDE_DOCTOR", 0);
                     if (guide_doctor == 1) {        //判断是否首次登陆
 //                        startActivityFinish(HomeActivity.class);
-                        startActivityFinish(ReadingActivity.class);
+                        startActivityFinish(ReadingActivity02.class);
                     } else {
                         goToGuide(roleId);
                     }

app/src/main/java/com/zy/bvvm/ui/vaccination/FirstFragment.java

@@ -72,6 +72,7 @@ public class FirstFragment extends MvpLazyFragment<CategoryTimesPresenter> imple
         return new FirstFragment();
     }
 
+
     @Override
     protected int getLayoutId() {
         return R.layout.first_fragment;

app/src/main/java/com/zy/bvvm/ui/vaccination/ReadingActivity.java

@@ -66,6 +66,7 @@ import com.zy.bvvm.app.MyApplication;
 import com.zy.bvvm.common.MyActivity;
 import com.zy.bvvm.helper.ActivityStackManager;
 import com.zy.bvvm.helper.ConversionUtil;
+import com.zy.bvvm.helper.NFCTools;
 import com.zy.bvvm.helper.SPUChip;
 import com.zy.bvvm.helper.SPUtils;
 import com.zy.bvvm.helper.SoundPoolHelper;
@@ -124,7 +125,7 @@ public class ReadingActivity extends BaseNfcActivity implements UploadChipContra
     private ProgressBar readpb;
     private Map<String, Object> chipMap;
     private boolean new_status;
-    private String textChip1 ;      //测试数据
+    private String textChip1;      //测试数据
     private AnimatorSet animatorSetsuofang;
     private int all_height3;
 
@@ -311,11 +312,14 @@ public class ReadingActivity extends BaseNfcActivity implements UploadChipContra
     @Override
     protected void initData() {
         textChip1 = getResources().getString(R.string.test_nfc);
-
+        //初始化NFC
+        new NFCTools(this);
         //判断是否有新版版
         if (!SPUtils.get("versonInfo", "").equals("") & TextUtils.isEmpty(MyApplication.verson)) {
             MyApplication.verson = "show";
-            showDialogVerson();
+            if (SPUtils.get("versonTips", "show").equals("show")) {
+                showDialogVerson();
+            }
         }
 
         first_title.setOnTitleBarListener(new OnTitleBarListener() {
@@ -1054,7 +1058,7 @@ public class ReadingActivity extends BaseNfcActivity implements UploadChipContra
                         startActivity(LoginPasswordActivity.class);
                         SPUtils.put("isQuid", "true");
                         // 进行内存优化，销毁掉所有的界面
-                        ActivityStackManager.getInstance().finishAllActivities(LoginActivity.class);
+                        ActivityStackManager.getInstance().finishAllActivities(LoginPasswordActivity.class);
                     }
 
                     @Override
@@ -1087,6 +1091,7 @@ public class ReadingActivity extends BaseNfcActivity implements UploadChipContra
             @Override
             public void onClick(View v) {
                 dialog.dismiss();
+                SPUtils.put("versonTips", "close");
             }
         });
     }

app/src/main/java/com/zy/bvvm/ui/vaccination/ReadingActivity02.java

@@ -0,0 +1,1005 @@
+package com.zy.bvvm.ui.vaccination;
+
+
+import android.animation.Animator;
+import android.animation.AnimatorSet;
+import android.animation.ObjectAnimator;
+import android.app.Dialog;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.nfc.NdefMessage;
+import android.nfc.NdefRecord;
+import android.nfc.NfcAdapter;
+import android.os.Handler;
+import android.os.Message;
+import android.os.Parcelable;
+import android.text.SpannableStringBuilder;
+import android.text.TextPaint;
+import android.text.TextUtils;
+import android.text.method.LinkMovementMethod;
+import android.text.style.ClickableSpan;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.view.Gravity;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.view.animation.AlphaAnimation;
+import android.view.animation.Animation;
+import android.view.animation.AnimationUtils;
+import android.view.animation.CycleInterpolator;
+import android.view.animation.DecelerateInterpolator;
+import android.view.animation.ScaleAnimation;
+import android.widget.ImageView;
+import android.widget.ProgressBar;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.hjq.bar.OnTitleBarListener;
+import com.hjq.bar.TitleBar;
+import com.hjq.base.BaseDialog;
+import com.hjq.base.BaseDialogFragment;
+import com.zy.bvvm.R;
+import com.zy.bvvm.app.MyApplication;
+import com.zy.bvvm.helper.ActivityStackManager;
+import com.zy.bvvm.helper.ConversionUtil;
+import com.zy.bvvm.helper.NFCTools;
+import com.zy.bvvm.helper.SPUChip;
+import com.zy.bvvm.helper.SPUtils;
+import com.zy.bvvm.helper.SoundPoolHelper;
+import com.zy.bvvm.ui.bean.VnDetailBean;
+import com.zy.bvvm.ui.event.ReadingErrorEvent;
+import com.zy.bvvm.ui.home.BaseNfcActivity;
+import com.zy.bvvm.ui.home.HomeActivity;
+import com.zy.bvvm.ui.home.uploadChip.UploadChipContract;
+import com.zy.bvvm.ui.login.LoginPasswordActivity;
+import com.zy.bvvm.ui.vaccination.save.ChipModel;
+import com.zy.bvvm.widget.EvvmMsgDiago;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
+import java.io.UnsupportedEncodingException;
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import butterknife.BindView;
+import butterknife.OnClick;
+
+/**
+ * 读取NFC数据
+ * 邦德威只上传读取的nfc序列号
+ */
+
+public class ReadingActivity02 extends BaseNfcActivity implements UploadChipContract.View {
+
+
+    @BindView(value = R.id.iv_first_background)
+    ImageView first_background;
+    @BindView(value = R.id.tv_button_scanning)
+    ImageView button_scanning;
+    @BindView(value = R.id.reading_title)
+    TitleBar first_title;
+    @BindView(value = R.id.tv_read_nfc)
+    TextView read_nfc;
+    /**
+     * 是否警告
+     */
+    private boolean isWarning = false;
+    private ChipModel chipModel;
+    private SoundPoolHelper soundPoolHelper;
+    /**
+     * 从NFC中读取的16进制字符串
+     */
+    private String textRecord = "";
+    /**
+     * 截取后的字符串
+     */
+    private String chipNumber = "";
+
+    @BindView(value = R.id.reading_progress)
+    ProgressBar readingProgress;
+
+    @BindView(value = R.id.fly_phonerl)
+    RelativeLayout flyphonerl;
+    private Animation animation;
+    private AlphaAnimation alp;
+
+
+    private BaseDialog loadDiago;
+    private ProgressBar readpb;
+    private Map<String, Object> chipMap;
+    private boolean new_status;
+    private String textChip1;      //测试数据
+    private AnimatorSet animatorSetsuofang;
+    private int all_height3;
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.activity_reading;
+    }
+
+    @Override
+    protected int getTitleId() {
+        return R.id.reading_title;
+    }
+
+    @Override
+    protected void initView() {
+        getAnimationSao(); //进行雷达扫描动画
+        soundPoolHelper = new SoundPoolHelper(7, SoundPoolHelper.TYPE_MUSIC)
+                .setRingtoneType(SoundPoolHelper.RING_TYPE_MUSIC)
+                .loadDefault(ReadingActivity02.this)
+                .load(ReadingActivity02.this, "factory_operator_success", R.raw.factory_operator_success)
+                .load(ReadingActivity02.this, "factory_operator_error", R.raw.factory_operator_error)
+                .load(ReadingActivity02.this, "xufuhe", R.raw.xufuhe)
+                .load(ReadingActivity02.this, "zhengchang", R.raw.zhengchang)
+                .load(ReadingActivity02.this, "nuliduquzhong", R.raw.shujuduquwanbi)
+                .load(ReadingActivity02.this, "saomiaotishi", R.raw.saomiaotishi)
+                .load(ReadingActivity02.this, "yiduquwanbi", R.raw.yiduquwanbi);
+        setNfcClick();
+
+        //第一次加载才会做飞出动画
+        int flyPhoneType = (int) SPUtils.get("FlyPhoneType", 0);
+        if (flyPhoneType == 0) {
+            getFlyPhone();
+            SPUtils.put("FlyPhoneType", 1);
+        } else {
+            flyphonerl.setVisibility(View.GONE);
+        }
+
+
+//        getFlyPhone();
+    }
+
+    private void getFlyPhone() {
+        flyphonerl.setVisibility(View.VISIBLE);
+        Resources resources = this.getResources();
+        DisplayMetrics dm = resources.getDisplayMetrics();
+        all_height3 = (int) (dm.heightPixels * 0.1);
+        //组合动画
+        animatorSetsuofang = new AnimatorSet();
+        // ObjectAnimator scaleX = ObjectAnimator.ofFloat(scohhh, "translationX", 1.5f, 1f);
+//        ObjectAnimator scaleY = ObjectAnimator.ofFloat(flyphonerl, "translationY", height3, flyphonerl.getY());
+        ObjectAnimator scaleY = ObjectAnimator.ofFloat(flyphonerl, "translationY", 0, -all_height3);
+        animatorSetsuofang.setDuration(1000);
+        animatorSetsuofang.setInterpolator(new DecelerateInterpolator());
+        animatorSetsuofang.play(scaleY);
+        animatorSetsuofang.start();
+        animatorSetsuofang.addListener(new Animator.AnimatorListener() {
+            @Override
+            public void onAnimationStart(Animator animation) {
+
+            }
+
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+
+//                        flyphonerl.setVisibility(View.GONE);
+                        animatorSetsuofang.cancel();
+                        getTwoFlyPhone();
+//                        getFlyGoBack();
+                    }
+                }, 5000);
+            }
+
+            @Override
+            public void onAnimationCancel(Animator animation) {
+
+            }
+
+            @Override
+            public void onAnimationRepeat(Animator animation) {
+
+            }
+        });
+
+    }
+
+    private void getTwoFlyPhone() {
+        Resources resources = this.getResources();
+        DisplayMetrics dm = resources.getDisplayMetrics();
+        int height3 = (int) (dm.heightPixels * 1.5);
+        //组合动画
+        animatorSetsuofang = new AnimatorSet();
+        // ObjectAnimator scaleX = ObjectAnimator.ofFloat(scohhh, "translationX", 1.5f, 1f);
+//        ObjectAnimator scaleY = ObjectAnimator.ofFloat(flyphonerl, "translationY", height3, flyphonerl.getY());
+        ObjectAnimator scaleY = ObjectAnimator.ofFloat(flyphonerl, "translationY", -all_height3, height3);
+        animatorSetsuofang.setDuration(1000);
+        animatorSetsuofang.setInterpolator(new DecelerateInterpolator());
+        animatorSetsuofang.play(scaleY);
+        animatorSetsuofang.start();
+        animatorSetsuofang.addListener(new Animator.AnimatorListener() {
+            @Override
+            public void onAnimationStart(Animator animation) {
+
+            }
+
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                flyphonerl.setVisibility(View.GONE);
+                animatorSetsuofang.cancel();
+//                postDelayed(new Runnable() {
+//                    @Override
+//                    public void run() {
+//                        flyphonerl.setVisibility(View.GONE);
+//                        animatorSetsuofang.cancel();
+////                        getFlyPhone();
+////                        getTwoFlyPhone();
+//                    }
+//                }, 5000);
+            }
+
+            @Override
+            public void onAnimationCancel(Animator animation) {
+
+            }
+
+            @Override
+            public void onAnimationRepeat(Animator animation) {
+
+            }
+        });
+
+    }
+
+
+    private void getAnimationSao() {
+//        animation = new RotateAnimation(360, 0, Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF, 0.5f);
+//        animation.setFillAfter(true);
+//        animation.setDuration(2000);  //两秒转一圈
+//        animation.setInterpolator(new LinearInterpolator());
+//        animation.setRepeatCount(Animation.INFINITE);   //循环执行
+//        imgreadline.startAnimation(animation);
+        //呼吸动画
+        //背景边框动画效果
+        ScaleAnimation animation = (ScaleAnimation) AnimationUtils.loadAnimation(getActivity(), R.anim.scale);
+//        animation.setDuration(2000);
+        //设置持续时间
+        animation.setFillAfter(true);
+        //设置动画结束之后的状态是否是动画的最终状态，true，表示是保持动画结束时的最终状态
+        animation.setRepeatCount(10000);
+        //设置循环次数，0为1次
+        first_background.startAnimation(animation);
+
+
+        int[] antenna = new int[]{R.id.reading_antenna1, R.id.reading_antenna2, R.id.reading_antenna3, R.id.reading_antenna4, R.id.reading_antenna5, R.id.reading_antenna6,
+                R.id.reading_antenna7, R.id.reading_antenna8, R.id.reading_antenna9};
+        int nfcWireIndex = 2;
+        try {
+            nfcWireIndex = Integer.parseInt(String.valueOf(SPUtils.get("PHONE_MODEL", "2")));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        alp = new AlphaAnimation(1, 0.2f);
+        alp.setStartOffset(500);
+        alp.setDuration(1000);
+        alp.setFillAfter(false);
+        alp.setInterpolator(new CycleInterpolator(2));
+        alp.setRepeatCount(Animation.INFINITE);
+        findViewById(antenna[nfcWireIndex - 1]).setAnimation(alp);
+        alp.start();
+    }
+
+    @OnClick(value = {R.id.again_bt})
+    public void onViewClicked(View view) {
+        switch (view.getId()) {
+            case R.id.again_bt:
+                startActivityFinish(QrCodeActivity.class);
+                break;
+        }
+    }
+
+    @Override
+    protected void initData() {
+        textChip1 = getResources().getString(R.string.test_nfc);
+        //初始化NFC
+        new NFCTools(this);
+        //判断是否有新版版
+        if (!SPUtils.get("versonInfo", "").equals("") & TextUtils.isEmpty(MyApplication.verson)) {
+            MyApplication.verson = "show";
+            if (SPUtils.get("versonTips", "show").equals("show")) {
+                showDialogVerson();
+            }
+        }
+
+        first_title.setOnTitleBarListener(new OnTitleBarListener() {
+            @Override
+            public void onLeftClick(View v) {
+                Intent intent = new Intent(ReadingActivity02.this, HomeActivity.class);
+                intent.putExtra("pager", "1");
+                startActivity(HomeActivity.class);
+                //发送粘性事件 在myfragment中进行接收并更新ui
+//                EventBus.getDefault().postSticky(new informationEvent("myFragment"));
+            }
+
+            @Override
+            public void onTitleClick(View v) {
+
+            }
+
+            @Override
+            public void onRightClick(View v) {
+                getExit();
+            }
+        });
+
+
+        mNfcAdapter = NfcAdapter.getDefaultAdapter(this);
+        //扫描动画
+        waithandler.postDelayed(waitRunnable, 1000);
+//        ImageLoader.loadImage(reading_round, R.mipmap.iv_sao_args2);
+
+//        try {
+//            GifDrawable gifFromAssets = new GifDrawable( getAssets(), "anim.gif" );
+//        } catch (IOException e) {
+//            e.printStackTrace();
+//        }
+
+
+    }
+
+    private static class MyHandler extends Handler {
+        private WeakReference<ReadingActivity02> wactivity;
+
+        public MyHandler(ReadingActivity02 activity) {
+            wactivity = new WeakReference<ReadingActivity02>(activity);
+        }
+
+        @Override
+        public void handleMessage(Message msg) {
+            super.handleMessage(msg);
+        }
+    }
+
+    private MyHandler waithandler = new MyHandler(this);
+
+    private Runnable waitRunnable = new Runnable() {
+        @Override
+        public void run() {
+            //5秒没读取到数据
+            // soundPoolHelper.play("nuliduquzhong", false);
+            soundPoolHelper.play("saomiaotishi", false);
+        }
+    };
+
+    /**
+     * 读取NFC标签文本数据
+     */
+    private String readNfcTag(Intent intent) {
+        readingProgress.setProgress(0);
+        if (NfcAdapter.ACTION_NDEF_DISCOVERED.equals(intent.getAction())) {
+            Parcelable[] rawMsgs = intent.getParcelableArrayExtra(NfcAdapter.EXTRA_NDEF_MESSAGES);
+            NdefMessage msgs[] = null;
+            if (rawMsgs != null) {
+                msgs = new NdefMessage[rawMsgs.length];
+                for (int i = 0; i < rawMsgs.length; i++) {
+                    msgs[i] = (NdefMessage) rawMsgs[i];
+                }
+            }
+            try {
+                if (msgs != null) {
+                    NdefRecord record = msgs[0].getRecords()[0];
+                    return parseTextRecord(record);
+                }
+            } catch (Exception e) {
+            }
+        }
+        return null;
+    }
+
+    public String parseTextRecord(NdefRecord ndefRecord) {
+        if (ndefRecord.getTnf() != NdefRecord.TNF_WELL_KNOWN) {
+            return null;
+        }
+        if (!Arrays.equals(ndefRecord.getType(), NdefRecord.RTD_TEXT)) {
+            return null;
+        }
+        try {
+            byte[] bArray = ndefRecord.getPayload();
+            StringBuffer sb = new StringBuffer(bArray.length);
+            String sTemp;
+            for (int i = 0; i < bArray.length; i++) {
+                sTemp = Integer.toHexString(0xFF & bArray[i]);
+                if (sTemp.length() < 2)
+                    sb.append(0);
+                sb.append(sTemp.toUpperCase());
+            }
+            return sb.toString();
+        } catch (Exception e) {
+            throw new IllegalArgumentException();
+        }
+    }
+
+    //记录ProgressBar的完成进度
+    private int status = 0;
+    private int hasDate = 0;
+
+    public int getStatus() {
+        return status;
+    }
+
+
+    public BaseDialog getLoadDiago() {
+        return loadDiago;
+    }
+
+    public ProgressBar getReadpb() {
+        return readpb;
+    }
+
+    //创建一个负责更新进度的Handler
+    final private ProgressHandler mHandler = new ProgressHandler(this);
+
+    private static class ProgressHandler extends Handler {
+        private final WeakReference<ReadingActivity02> readingwrActivity;
+
+        public ProgressHandler(ReadingActivity02 activity) {
+            readingwrActivity = new WeakReference<ReadingActivity02>(activity);
+        }
+
+        @Override
+        public void handleMessage(Message msg) {
+            ReadingActivity02 readingActivity = readingwrActivity.get();
+            if (readingActivity != null) {
+                //表明消息是由该程序发送的
+                if (msg.what == 0x111) {
+                    readingActivity.getReadpb().setProgress(readingActivity.getStatus());
+                    if (readingActivity.getStatus() == 100) {
+                        readingActivity.getLoadDiago().dismiss();
+                    }
+                }
+            }
+
+        }
+    }
+
+    private boolean issao;  //设置一个flag 判断是否正在读取
+    private String noNetMsg = "正常";
+
+    @Override
+    public void onNewIntent(Intent intent) {
+        if (waithandler != null) {
+            waithandler.removeCallbacks(waitRunnable);
+        }
+        try {
+            String id = NFCTools.readNFCId(intent);
+            Double latitude = 0.00;
+            Double longitude = 0.00;
+            if (id != null) {
+                String location[] = SPUtils.get("LOCATION", "").toString().split(",");
+                if (location.length > 1) {
+                    latitude = Double.parseDouble(location[0]);
+                    longitude = Double.parseDouble(location[1]);
+                }
+                String inoculators = (String) SPUtils.get("INOCULATOR_LIST", "");
+                //提交数据到服务器       截取后的字符串、读取的16进制字符串、接种着详细信息(通过注册获取)、经度、纬度、agin、是否警告、标签状态
+                getPresenter().forDoctor(id, "", inoculators, longitude, latitude, false, false, "正常");
+            } else {
+                toast("NFC读取失败");
+            }
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+            toast("设备id读取失败！");
+        }
+    }
+
+    /***
+     * 第四种微电子标签解析方式
+     */
+    public void alarmDetectionFour(String binaryStr) {
+        StringBuilder hexStr = new StringBuilder();
+        int fourCounts = binaryStr.length() / 8;//有多少份
+        for (int i = 0; i < fourCounts; i++) {
+            String eightData = binaryStr.substring(i * 8, (i + 1) * 8);  //截取出8位
+            System.out.println(eightData.substring(2, 8));
+            int repeatCount = ConversionUtil.binToDec(eightData.substring(2, 8));//取出后六位转换成数量
+            hexStr.append(strMultiply(eightData.substring(0, 2), repeatCount));
+        }
+        //System.out.println(hexStr.toString().length());
+        alarmDetection(hexStr.toString(), 4);
+    }
+
+    private String strMultiply(String str, int count) {
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < count; i++) {
+            sb.append(str);
+        }
+        return sb.toString();
+    }
+
+    //进行进度条加载
+    private int doWork() {
+        //为元素赋值
+        hasDate += 10;
+        try {
+            Thread.sleep(300);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+        return hasDate;
+    }
+
+    /**
+     * 判断是否报警
+     */
+
+    public void alarmDetection(String binaryStr, int chipType) {
+
+        if (TextUtils.isEmpty(binaryStr) || binaryStr.length() <= 8) {
+            noNetMsg = "温度记录时间不足";
+            return;
+        }
+
+        binaryStr = binaryStr.substring(4, binaryStr.length() - 8); //减去启用后的一小时和注射前的两小时
+        longE("温度二进制1", "" + textRecord.substring((3 + 40 + 1 + 4 + 8) * 2));
+        longE("binaryStr1", binaryStr);
+        String binaryArr[] = new String[binaryStr.length() / 2];
+
+
+        for (int i = 0; i < binaryArr.length; i++) {
+            binaryArr[i] = String.valueOf(binaryStr.charAt(i * 2)) + binaryStr.charAt(i * 2 + 1);
+        }
+
+        LinkedList<Integer> exceedingIndexs = new LinkedList<Integer>();
+        exceedingIndexs.add(-1);
+        for (int i = 0; i < binaryArr.length; i++) {
+            if (!binaryArr[i].equals("01")) {
+                if (i != 0 && !exceedingIndexs.get(exceedingIndexs.size() - 1).equals(i)) {
+                    exceedingIndexs.add(i);
+                }
+                if (i != binaryArr.length - 1 && !exceedingIndexs.get(exceedingIndexs.size() - 1).equals(i + 1)) {
+                    exceedingIndexs.add(i + 1);
+                }
+            }
+        }
+        int category = 0;
+        if (chipType == 4) { //第四种标签直接取 CATEGORY_TIMES_4
+            int type = ConversionUtil.hexToDec(chipNumber.substring(0, 2));
+            String number = type + "";
+            category = Integer.parseInt(SPUtils.get("CATEGORY_TIMES_" + number.substring(1, 2), 48 + "").toString());
+        } else {
+            category = Integer.parseInt(SPUtils.get("CATEGORY_TIMES_" + 4, 48 + "").toString());
+        }
+
+
+        longE("alarmDetection1", "" + (exceedingIndexs.size()) / 2.f);
+        if ((exceedingIndexs.size()) / 2.f > category) {
+//                toast("报警");
+            isWarning = true;
+            //soundPoolHelper.play("xufuhe", false);
+            //warning();
+        } else {
+            isWarning = false;
+            //soundPoolHelper.play("zhengchang", false);
+        }
+        readingProgress.setProgress(100);
+
+    }
+
+    /***
+     * 第二、第三种微电子解析方式
+     * 判断是否报警
+     */
+    public void alarmDetection(boolean isNew) {
+        String binaryStr = ConversionUtil.hexStr2Str(textRecord.substring((3 + 40 + 1 + 4 + 8) * 2));
+        longE("温度二进制", "" + textRecord.substring((3 + 40 + 1 + 4 + 8) * 2));
+        if (binaryStr.length() <= 36) {
+            noNetMsg = "温度记录时间不足";
+            return;
+        }
+        binaryStr = binaryStr.replaceAll(" ", "");
+        binaryStr = binaryStr.replaceAll("\\+", " +");
+        binaryStr = binaryStr.replaceAll("\\-", " -");
+        longE("binaryStr", binaryStr);
+        String binaryArrTmp[] = binaryStr.trim().split(" ");
+        int errorCount = 0;
+        LinkedList<String> newList = new LinkedList<String>();
+        // String binaryArr[] = binaryStr.split("\\+");
+        for (int i = 2; i < binaryArrTmp.length - 4; i++) {
+            //这里是判断超过100的次数
+            /*if (binaryArrTmp[i].length() != 6) {
+                errorCount++;
+                if (errorCount != 6) {
+                    noNetMsg = "标签异常";
+                    return;
+                }
+            } else {
+                newList.add(binaryArrTmp[i]);
+            }*/
+            newList.add(binaryArrTmp[i]);
+        }
+        String binaryArr[] = new String[newList.size()];
+        for (int i = 0; i < newList.size(); i++) {
+            binaryArr[i] = newList.get(i);
+        }
+
+        int type = ConversionUtil.hexToDec(chipNumber.substring(0, 2));
+        String number = type + "";
+        String code2 = number.substring(1, 2);
+        LinkedList<Integer> exceedingIndexs = new LinkedList<Integer>();
+        exceedingIndexs.add(-1);
+        int ultra = 0;
+        for (int i = 0; i < binaryArr.length; i++) {
+            //number format exception
+            double sz1 = Double.parseDouble(binaryArr[i].replace("\0", ""));
+            if (sz1 >= 100 || sz1 <= -100) {
+                if (ultra > 10) {
+                    noNetMsg = "标签异常";
+                    return;
+                }
+                ultra++;
+            }
+            double up = Double.parseDouble(TextUtils.isEmpty((String) SPUtils.get("CATEGORY_NORMAL_UP" + code2, "0.05")) ? "0.05" : (String) SPUtils.get("CATEGORY_NORMAL_UP" + code2, "0.05"));
+            double down = Double.parseDouble(TextUtils.isEmpty((String) SPUtils.get("CATEGORY_NORMAL_DOWN" + code2, "0.05")) ? "0.05" : (String) SPUtils.get("CATEGORY_NORMAL_DOWN" + code2, "0.05"));
+            if (up != 0.05 && down != 0.05) {
+                if (!(sz1 < up && sz1 >= down)) {           // if(!binaryArr[i].equals(String.valueOf(Integer.parseInt(binaryArr[i])<=+8.0 && Integer.parseInt(binaryArr[i])>=+2.0)))
+                    if (i != 0 && !exceedingIndexs.get(exceedingIndexs.size() - 1).equals(i)) {
+                        exceedingIndexs.add(i);
+                    }
+                    if (i != binaryArr.length - 1 && !exceedingIndexs.get(exceedingIndexs.size() - 1).equals(i + 1)) {
+                        exceedingIndexs.add(i + 1);
+                    }
+                }
+            } else if (up != 0.05 && down == 0.05) {
+                if (!(sz1 < up)) {           // if(!binaryArr[i].equals(String.valueOf(Integer.parseInt(binaryArr[i])<=+8.0 && Integer.parseInt(binaryArr[i])>=+2.0)))
+                    if (i != 0 && !exceedingIndexs.get(exceedingIndexs.size() - 1).equals(i)) {
+                        exceedingIndexs.add(i);
+                    }
+                    if (i != binaryArr.length - 1 && !exceedingIndexs.get(exceedingIndexs.size() - 1).equals(i + 1)) {
+                        exceedingIndexs.add(i + 1);
+                    }
+                }
+            } else {
+                if (!(sz1 >= down)) {         // if(!binaryArr[i].equals(String.valueOf(Integer.parseInt(binaryArr[i])<=+8.0 && Integer.parseInt(binaryArr[i])>=+2.0)))
+                    if (i != 0 && !exceedingIndexs.get(exceedingIndexs.size() - 1).equals(i)) {
+                        exceedingIndexs.add(i);
+                    }
+                    if (i != binaryArr.length - 1 && !exceedingIndexs.get(exceedingIndexs.size() - 1).equals(i + 1)) {
+                        exceedingIndexs.add(i + 1);
+                    }
+                }
+            }
+        }
+
+        int category = Integer.parseInt(SPUtils.get("CATEGORY_TIMES_" + code2, 48 + "").toString());
+        longE("alarmDetection", "" + (exceedingIndexs.size()) / 2.f);
+        if ((exceedingIndexs.size()) / 2.f > category) {
+//                toast("报警");
+            isWarning = true;
+            //soundPoolHelper.play("xufuhe", false);
+            //warning();
+        } else {
+            isWarning = false;
+            //soundPoolHelper.play("zhengchang", false);
+        }
+        readingProgress.setProgress(100);
+
+    }
+
+    /**
+     * 提交数据到服务器
+     *
+     * @param agin
+     */
+    private void uploadChip(boolean agin) {
+
+        if (textRecord != null && textRecord.length() > chipNumberEndIndex) {
+            if (SPUtils.contains("LOCATION")) {
+                Log.e("LOCATION", SPUtils.get("LOCATION", "").toString());
+                String location[] = SPUtils.get("LOCATION", "").toString().split(",");
+                if (location.length > 1) {
+                    Double latitude = Double.parseDouble(location[0]);
+                    Double longitude = Double.parseDouble(location[1]);
+                    String inoculators = (String) SPUtils.get("INOCULATOR_LIST", "");
+                    Log.e("chipNumber", chipNumber);
+                    Log.e("textRecord", textRecord);
+                    //提交数据到服务器       截取后的字符串、读取的16进制字符串、接种着详细信息(通过注册获取)、经度、纬度、agin、是否警告、标签状态
+                    getPresenter().forDoctor(chipNumber, textRecord, inoculators, longitude, latitude, agin, isWarning, noNetMsg);
+                    chipModel = new ChipModel(chipNumber, textRecord, inoculators, longitude, latitude);        //用于存储到本地
+                } else {
+                    toast("位置信息错误");
+                    issao = false;  //读取结束
+                }
+            } else {
+                toast("位置信息获取失败");
+                issao = false;  //读取结束
+            }
+        } else {
+            toast("芯片识别错误");
+            issao = false;  //读取结束
+        }
+
+
+    }
+
+    /***
+     * eventbus回调，判断网络
+     * @param event
+     */
+    @Subscribe(threadMode = ThreadMode.MAIN, sticky = false)
+    public void onEvent(ReadingErrorEvent event) {
+        if (event.getMsg().equals("芯片不存在")) {
+            soundPoolHelper.play("factory_operator_error", false);
+        }
+        //保存未提交信息
+        if (event.getMsg().indexOf("请检查您的网络状态") != -1) {
+
+            if (noNetMsg.equals("正常")) {
+                if (event.isNoNetRepeatFlag()) {
+                    toast("标签重复使用");
+                } else {
+                    chipNumber = textRecord.substring(6, 58);
+                    //判断是否已72180111开头
+                    new_status = chipNumber.startsWith("72180111");
+                    if (new_status == true) {
+                        //新的逻辑
+                        chipMap = Chip7218Util.parse7218Report(textRecord);
+                        List<Double> list_temperature = (List<Double>) chipMap.get("ADCS");
+                        if (list_temperature.size() < 6) {
+                            toast("温度记录时间不足");
+                            return;
+                        } else {
+                            List<Double> error_temperature = new ArrayList<>();
+                            for (int i = 0; i < list_temperature.size(); i++) {
+                                if (list_temperature.get(i) <= 2.0 | list_temperature.get(i) >= 8.0) {
+                                    error_temperature.add(list_temperature.get(i));
+                                }
+                            }
+                            //去掉最前两个和最后两个
+                            List<Double> screen_tiems = new ArrayList<>();
+                            for (int i = 3; i < error_temperature.size() - 2; i++) {
+                                screen_tiems.add(error_temperature.get(i));
+                            }
+                            //用总时长判断
+                            //先获取nfc的标签类别
+                            int category = Integer.parseInt(SPUtils.get("CATEGORY_TIMES_" + 4, 48 + "").toString());
+                            if (screen_tiems.size() / 2 > category) {
+                                isWarning = true;
+                            } else {
+                                isWarning = false;
+                            }
+                            SPUChip.noNetSPUChip(chipNumber);
+                            //跳转到失败显示页面
+                            Intent in = new Intent(this, NoNetReportActivity.class);
+                            in.putExtra("isWarning", isWarning);
+                            startActivity(in);
+                            String user_id = (String) SPUtils.get("USER_ID", "");
+                            if (!user_id.equals("")) {
+                                ArrayList<ChipModel> chipModelList = (ArrayList<ChipModel>) SPUtils.get("CHIP_MODEL_LIST_" + user_id, new ArrayList<ChipModel>());
+                                Log.e("CHIP_MODEL_LIST_", chipModelList.toString());
+                                chipModelList.add(chipModel);
+                                SPUtils.put("CHIP_MODEL_LIST_" + user_id, chipModelList);
+                                SPUtils.remove("INOCULATOR_LIST");
+                                finish();
+                            }
+                        }
+
+                    } else {
+                        //旧的逻辑
+//                        String noNetChipListstr = (String) SPUtils.get("noNetChipList", "");
+//                        List<String> noNetChipList;
+//                        if (TextUtils.isEmpty(noNetChipListstr)) {  //如果为空就创建集合
+//                            noNetChipList = new ArrayList<>();
+//                        } else {
+//                            //反序列化存储到集合中
+//                            noNetChipList = (List<String>) JSONArray.parse(noNetChipListstr);
+//                        }
+//                        //添加新的
+//                        noNetChipList.add(chipNumber + "");
+//                        //存储到本地
+//                        SPUtils.put("noNetChipList", JSONArray.toJSONString(noNetChipList));
+                        SPUChip.noNetSPUChip(chipNumber);
+                        //跳转到失败显示页面
+                        Intent in = new Intent(this, NoNetReportActivity.class);
+                        in.putExtra("isWarning", isWarning);
+                        startActivity(in);
+                        String user_id = (String) SPUtils.get("USER_ID", "");
+                        if (!user_id.equals("")) {
+                            ArrayList<ChipModel> chipModelList = (ArrayList<ChipModel>) SPUtils.get("CHIP_MODEL_LIST_" + user_id, new ArrayList<ChipModel>());
+                            Log.e("CHIP_MODEL_LIST_", chipModelList.toString());
+                            chipModelList.add(chipModel);
+                            SPUtils.put("CHIP_MODEL_LIST_" + user_id, chipModelList);
+                            SPUtils.remove("INOCULATOR_LIST");
+                            finish();
+                        }
+                    }
+
+                }
+
+            } else {
+                //toast("标签异常");
+                toast(noNetMsg);
+            }
+        }
+    }
+
+    @Override
+    public void uploadChipError(String msg, boolean noNetRepeatFlag) {
+        EventBus.getDefault().post(new ReadingErrorEvent(msg, noNetRepeatFlag));
+        if (!msg.contains("请检查您的网络状态")) {
+            toast(msg);
+        } else {
+
+        }
+        issao = false;  //读取结束
+    }
+
+    /**
+     * 跳转到数据显示页面
+     */
+    @Override
+    public void uploadChipSuccess(VnDetailBean data) {
+        VnDetailBean.DataBean dataBean = data.getData();
+        /*   if (!dataBean.isReviewed()) {*/
+        Intent in = new Intent(ReadingActivity02.this, VnReportDetailForDoctorActivity01.class);
+        Log.e("getReviewId", "" + dataBean.getReviewId());
+        in.putExtra("dataBean", dataBean);
+        in.putExtra("isWarning", isWarning);
+        in.putExtra("status", dataBean.getStatus());
+//        startActivityFinish(in);
+        startActivity(in);
+       /* } else { //复核后再次使用
+            warning();
+        }*/
+        issao = false;  //读取结束
+    }
+
+
+    private void warning() {
+        new EvvmMsgDiago.Builder(this)
+                .setTitle("此疫苗已有超温记录,是否继续使用?") // 标题可以不用填写
+                .setConfirm("确定")
+                .setCancel("取消") // 设置 null 表示不显示取消按钮
+                //.setAutoDismiss(false) // 设置点击按钮后不关闭对话框
+                .setListener(new EvvmMsgDiago.OnListener() {
+                    @Override
+                    public void onConfirm(Dialog dialog) {
+                        uploadChip(true);
+                    }
+
+                    @Override
+                    public void onCancel(Dialog dialog) {
+                    }
+                })
+                .show();
+    }
+
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+    }
+
+    @Override
+    protected void onDestroy() {
+//        animation.cancel();
+        alp.cancel();
+        if (mHandler != null) {
+            mHandler.removeCallbacksAndMessages(null);
+        }
+
+        if (waithandler != null) {
+            waithandler.removeCallbacksAndMessages(null);
+        }
+        //  soundPoolHelper.release();
+        super.onDestroy();
+    }
+
+
+    @Override
+    public boolean isSupportSwipeBack() {
+        // 不使用侧滑功能
+        return false;
+    }
+
+    public static void longE(String tag, String msg) {  //信息太长,分段打印
+        //因为String的length是字符数量不是字节数量所以为了防止中文字符过多，
+        //  把4*1024的MAX字节打印长度改为2001字符数
+        int max_str_length = 2001 - tag.length();
+        //大于4000时
+        while (msg.length() > max_str_length) {
+            Log.i(tag, msg.substring(0, max_str_length));
+            msg = msg.substring(max_str_length);
+        }
+        //剩余部分
+        Log.e(tag, msg);
+
+    }
+
+    /**
+     * 设置关键字nfc可点击
+     */
+    private void setNfcClick() {
+        String nfc = read_nfc.getText().toString();
+        SpannableStringBuilder ssb = new SpannableStringBuilder();
+        ssb.append(nfc);
+        final int start = nfc.indexOf("N");//第一个出现的位置
+        ssb.setSpan(new ClickableSpan() {
+            @Override
+            public void onClick(View widget) {
+                getFlyPhone();
+            }
+
+            @Override
+            public void updateDrawState(TextPaint ds) {
+                super.updateDrawState(ds);
+                ds.setColor(getResources().getColor(R.color.text_01));       //设置文件颜色
+//                // 去掉下划线
+                ds.setUnderlineText(false);
+            }
+        }, start, start + 3, 0);
+
+        read_nfc.setMovementMethod(LinkMovementMethod.getInstance());
+        read_nfc.setText(ssb, TextView.BufferType.SPANNABLE);
+
+    }
+
+    private void getExit() {
+        new EvvmMsgDiago.Builder(getActivity())
+                .setTitle("您确定要退出吗?")
+                .setConfirm("确定")
+                .setCancel("取消") // 设置 null 表示不显示取消按钮
+                //.setAutoDismiss(false) // 设置点击按钮后不关闭对话框
+                .setListener(new EvvmMsgDiago.OnListener() {
+
+                    @Override
+                    public void onConfirm(Dialog dialog) {
+                        //退出的操作
+                        startActivity(LoginPasswordActivity.class);
+                        SPUtils.put("isQuid", "true");
+                        // 进行内存优化，销毁掉所有的界面
+                        ActivityStackManager.getInstance().finishAllActivities(LoginPasswordActivity.class);
+                    }
+
+                    @Override
+                    public void onCancel(Dialog dialog) {
+                        //toast("取消了");
+                    }
+                })
+                .show();
+    }
+
+    private void showDialogVerson() {
+        final Dialog dialog = new Dialog(getActivity(), R.style.DialogTheme);
+        //2、设置布局
+        final View view = View.inflate(getActivity(), R.layout.dialog_version, null);
+        TextView text = view.findViewById(R.id.tv_verson_text);
+        TextView btn_false = view.findViewById(R.id.tv_agr_false);
+        text.setText(String.valueOf(SPUtils.get("versonInfo", "")));
+        dialog.setContentView(view);
+        dialog.setCanceledOnTouchOutside(false);
+        Window window = dialog.getWindow();
+        //设置弹出位置
+        window.setGravity(Gravity.CENTER);
+        //设置弹出动画
+        window.setWindowAnimations(R.style.main_menu_animStyle);
+        //设置对话框大小
+        window.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+        dialog.show();
+
+        btn_false.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                dialog.dismiss();
+                SPUtils.put("versonTips", "close");
+            }
+        });
+    }
+}
+
+

app/src/main/java/com/zy/bvvm/ui/vaccination/VnReportDetailForDoctorActivity01.java

@@ -0,0 +1,1086 @@
+package com.zy.bvvm.ui.vaccination;
+
+import android.Manifest;
+import android.animation.Animator;
+import android.animation.ObjectAnimator;
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.app.Dialog;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Environment;
+import android.os.Handler;
+import android.os.Message;
+import android.provider.MediaStore;
+import android.support.annotation.RequiresApi;
+import android.text.SpannableString;
+import android.text.SpannableStringBuilder;
+import android.text.Spanned;
+import android.text.TextUtils;
+import android.text.method.LinkMovementMethod;
+import android.text.style.ClickableSpan;
+import android.text.style.SuperscriptSpan;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.view.View;
+import android.view.animation.Animation;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.github.dfqin.grantor.PermissionListener;
+import com.github.dfqin.grantor.PermissionsUtil;
+import com.hjq.base.BaseDialog;
+import com.zy.bvvm.R;
+import com.zy.bvvm.helper.MyClickListener;
+import com.zy.bvvm.helper.SPUtils;
+import com.zy.bvvm.helper.SoundPoolHelper;
+import com.zy.bvvm.mvp.MvpActivity;
+import com.zy.bvvm.ui.bean.ModelListBean;
+import com.zy.bvvm.ui.bean.VerificationCodeBean;
+import com.zy.bvvm.ui.bean.VnDetailBean;
+import com.zy.bvvm.ui.report.vndetail.VnDetailContract;
+import com.zy.bvvm.ui.report.vndetail.VnDetailPresenter;
+import com.zy.bvvm.ui.webview.WebActivity;
+import com.zy.bvvm.widget.EvvmMsgDiago;
+import com.zy.bvvm.widget.ZoomView;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+import io.reactivex.annotations.NonNull;
+
+/**
+ * 显示产品追溯报告
+ */
+public class VnReportDetailForDoctorActivity01 extends MvpActivity<VnDetailPresenter> implements VnDetailContract.View, MyClickListener.MyClickCallBack {
+
+    /**
+     * 药品商品名称
+     */
+    @BindView(R.id.vndetail_tv_vnname)
+    TextView vndetailTvVnname;
+    /**
+     * 药品通用名称
+     */
+    @BindView(R.id.vndetail_tv_vnsc)
+    TextView vndetailTvVnsc;
+    @BindView(R.id.vndetail_tv_vncreatdate)
+    TextView vndetailTvVncreatdate;
+    /**
+     * 有效期
+     */
+    @BindView(R.id.vndetail_tv_vnvalid)
+    TextView vndetailTvVnvalid;
+    @BindView(R.id.renyuan_type)
+    TextView renyuanType;
+    @BindView(R.id.vndetail_tv_szname)
+    TextView vndetailTvSzname;
+    @BindView(R.id.vndetail_tv_szsex)
+    TextView vndetailTvSzsex;
+    @BindView(R.id.vndetail_tv_szbirthday)
+    TextView vndetailTvSzbirthday;
+    @BindView(R.id.vndetail_tv_szid)
+    TextView vndetailTvSzid;
+    @BindView(R.id.vndetail_tv_szguardian)
+    TextView vndetailTvSzguardian;
+    @BindView(R.id.shouzhongrenyuan)
+    LinearLayout shouzhongrenyuan;
+    @BindView(R.id.jiezhognrenyuan)
+    LinearLayout jiezhognrenyuan;
+    @BindView(R.id.vndetail_tv_szTelephone)
+    TextView vndetailTvSzTelephone;
+
+    private boolean isWarning = true;
+    private VnDetailBean.DataBean chipModel = null;
+    private SoundPoolHelper soundPoolHelper;
+
+    @BindView(R.id.vndetail_tv_typemsg)
+    TextView vndetailTvTypemsg;
+    @BindView(R.id.vndetail_tv_vncode)
+    TextView vndetailTvVncode;
+    @BindView(R.id.vndetail_tv_vndate)
+    TextView vndetailTvVndate;
+    /**
+     * 企业名称
+     */
+    @BindView(R.id.vndetail_tv_factoryName)
+    TextView vndetailTvFactoryName;
+    @BindView(R.id.vndetail_tv_gmpName)
+    TextView vndetailTvGmpName;
+    @BindView(R.id.vndetail_tv_gmpPath)
+    TextView vndetailTvGmpPath;
+    @BindView(R.id.vndetail_tv_hospitalName)
+    TextView vndetailTvHospitalName;
+    @BindView(R.id.vndetail_tv_doctorName)
+    TextView vndetailTvDoctorName;
+    @BindView(R.id.vndetail_tv_doctorTelephone)
+    TextView vndetailTvDoctorTelephone;
+    @BindView(R.id.vndetail_tv_chatImage)
+    ImageView vndetailTvChatImage;
+    @BindView(R.id.vndetail_tv_othervn1)
+    TextView vndetailTvOthervn1;
+    @BindView(R.id.vndetail_tv_othervn2)
+    TextView vndetailTvOthervn2;
+    @BindView(R.id.vndetail_tv_othervn3)
+    TextView vndetailTvOthervn3;
+    @BindView(R.id.vndetail_iv_tipsimg)
+    ImageView vndetailIvTipsimg;
+    @BindView(R.id.vndetail_tv_tips)
+    TextView vndetailTvTips;
+    @BindView(R.id.vndetail_tv_disclaimer)
+    TextView vndetailTvDisclaimer;
+    @BindView(R.id.zv_report)
+    ZoomView myzoomview;
+    @BindView(R.id.vndetail_tv_chatImage_title)
+    TextView vndetail_tv_chatImage_title;
+    @BindView(R.id.coverview)
+    TextView coverview;
+    @BindView(R.id.vndetail_tv_tt)
+    TextView vndetailTvTitle;
+    @BindView(R.id.vndetail_tv_title)
+    TextView vndetailTvtt;
+    @BindView(R.id.btn_download_bitmap)
+    Button btnDownloadBitmap;
+    @BindView(R.id.rl_all)
+    RelativeLayout rlAll;
+    //新添加id
+    /**
+     *接种部位
+     */
+    @BindView(R.id.vndetail_tv_vaccinationSite)
+    TextView vndetailTvVaccinationSite;
+    /**
+     * 药品批准文号
+     */
+    @BindView(R.id.vndetail_tv_approvalNumber)
+    TextView vndetailTvApprovalNumber;
+    /**
+     * 药品本位码
+     */
+    @BindView(R.id.vndetail_tv_standardCode)
+    TextView vndetailTvStandardCode;
+    /**
+     * 国家药品标识码
+     */
+    @BindView(R.id.vndetail_tv_identificationCode)
+    TextView vndetailTvIdentificationCode;
+    /**
+     * 规格
+     */
+    @BindView(R.id.vndetail_tv_specifications)
+    TextView ndetailTvSpecifications;
+
+
+
+    static final String[] PERMISSION = new String[]{
+            Manifest.permission.WRITE_EXTERNAL_STORAGE,
+            Manifest.permission.READ_EXTERNAL_STORAGE,
+    };
+
+    private int status;
+
+    private List<TextView> textViews;
+    private List<TextView> yujingList;
+    private List<TextView> vntextviewList;
+    private List<TextView> zcList;
+
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.activity_vn_report_detail_for_doctor;
+    }
+
+    @Override
+    protected int getTitleId() {
+        return R.id.tb_vndetail_title;
+    }
+
+    @Override
+    protected void initView() {
+        myzoomview.setOnTouchListener(new MyClickListener(this));
+        soundPoolHelper = new SoundPoolHelper(4, SoundPoolHelper.TYPE_MUSIC)
+                .setRingtoneType(SoundPoolHelper.RING_TYPE_MUSIC)
+                .loadDefault(VnReportDetailForDoctorActivity01.this)
+                .load(VnReportDetailForDoctorActivity01.this, "rewarning", R.raw.rewarning)
+                .load(VnReportDetailForDoctorActivity01.this, "renormal", R.raw.renormal);
+        //设置上标
+        SpannableStringBuilder spanBuilder = new SpannableStringBuilder(vndetailTvtt.getText());
+        spanBuilder.setSpan(new SuperscriptSpan(), 5, 6, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+        vndetailTvtt.setText(spanBuilder);
+        textViews = new ArrayList<>();
+
+        //左边的
+        vntextviewList = new ArrayList<>();
+        vntextviewList.add(vndetailTvVnname);
+        vntextviewList.add(vndetailTvVnsc);
+        vntextviewList.add(vndetailTvFactoryName);
+        vntextviewList.add(vndetailTvGmpName);
+        vntextviewList.add(vndetailTvGmpPath);
+        vntextviewList.add(vndetailTvVncreatdate);
+        vntextviewList.add(vndetailTvVnvalid);
+
+        //不正常
+        yujingList = new ArrayList<>();
+        yujingList.add(vndetailTvHospitalName);
+        yujingList.add(vndetailTvDoctorName);
+        yujingList.add(vndetailTvDoctorTelephone);
+
+        //正常
+        zcList = new ArrayList<>();
+        zcList.add(vndetailTvSzname);
+        zcList.add(vndetailTvSzsex);
+        zcList.add(vndetailTvSzbirthday);
+        zcList.add(vndetailTvSzid);
+        zcList.add(vndetailTvSzguardian);
+        zcList.add(vndetailTvSzTelephone);
+    }
+
+    @Override
+    public void onLeftClick(View v) {
+        super.onLeftClick(v);
+        if (status == 6 || status == 7) {
+            finish();
+//            startActivityFinish(HomeActivity.class);
+//            ActivityStackManager.getInstance().finishAllActivities(HomeActivity.class);
+        } else {
+
+        }
+    }
+
+    @OnClick({R.id.next_btn_report, R.id.vndetail_bt_magnifier})
+    public void onViewClicked(View view) {
+        switch (view.getId()) {
+            case R.id.next_btn_report:
+                startActivityFinish(ReadingActivity.class);
+//                if (status == 4 || status == 8) {
+//                    startActivityFinish(ReadingActivity.class);
+//                } else {
+//                    if (status == 6 || status == 7) {
+//                        startActivityFinish(HomeActivity.class);
+//                        ActivityStackManager.getInstance().finishAllActivities(HomeActivity.class);
+//                    }
+//                }
+
+                break;
+            case R.id.vndetail_bt_magnifier:
+                //放大
+                myzoomview.magnifier();
+                break;
+        }
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        // TODO: add setContentView(...) invocation
+        ButterKnife.bind(this);
+    }
+
+
+    private static class WarningHandler extends Handler {
+        private WeakReference<VnReportDetailForDoctorActivity01> wactivity;
+
+        public WarningHandler(VnReportDetailForDoctorActivity01 activity) {
+            wactivity = new WeakReference<VnReportDetailForDoctorActivity01>(activity);
+        }
+
+        @Override
+        public void handleMessage(Message msg) {
+            super.handleMessage(msg);
+        }
+    }
+
+    private WarningHandler warninghandler = new WarningHandler(this);
+
+    private static class NormalHandler extends Handler {
+        private WeakReference<VnReportDetailForDoctorActivity01> wactivity;
+
+        public NormalHandler(VnReportDetailForDoctorActivity01 activity) {
+            wactivity = new WeakReference<VnReportDetailForDoctorActivity01>(activity);
+        }
+
+        @Override
+        public void handleMessage(Message msg) {
+            super.handleMessage(msg);
+        }
+    }
+
+    private NormalHandler normalhandler = new NormalHandler(this);
+
+
+    private static class PDFHandler extends Handler {
+        private WeakReference<VnReportDetailForDoctorActivity01> wactivity;
+
+        public PDFHandler(VnReportDetailForDoctorActivity01 activity) {
+            wactivity = new WeakReference<VnReportDetailForDoctorActivity01>(activity);
+        }
+
+        @Override
+        public void handleMessage(Message msg) {
+            super.handleMessage(msg);
+        }
+    }
+
+    private PDFHandler pdfhandler = new PDFHandler(this);
+
+
+    private Runnable warningRunnable = new Runnable() {
+        @Override
+        public void run() {
+            //用户2秒没操作了
+            Log.e("DoctorVnReportActivity", "两秒未操作");
+            //startActivityFinish(ReadingActivity.class);
+        }
+    };
+    private Runnable normalRunnable = new Runnable() {
+        @Override
+        public void run() {
+            //用户2秒没操作了
+            Log.e("DoctorVnReportActivity", "两秒未操作");
+            finish();
+        }
+    };
+    private Runnable pdfRunnable = new Runnable() {
+        @Override
+        public void run() {
+            if (TextUtils.isEmpty((String) SPUtils.get("INOCULATOR_LIST", ""))) {
+                // toast("未获取到受种者信息");
+            } else {
+                getnormalOper();
+            }
+        }
+    };
+
+    private int checki = 1;
+
+    @SuppressLint("WrongConstant")
+    @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR2)
+    @Override
+    protected void initData() {
+        Intent in = getIntent();
+        chipModel = (VnDetailBean.DataBean) in.getSerializableExtra("dataBean");
+        //给页面赋值
+        setViewData(chipModel);
+        isWarning = in.getBooleanExtra("isWarning", true);
+
+        status = in.getIntExtra("status", 0);
+        textViews.clear();
+        if (status == 4) {
+            renyuanType.setText("用户信息");
+            shouzhongrenyuan.setVisibility(View.GONE);
+            jiezhognrenyuan.setVisibility(View.VISIBLE);
+            textViews.addAll(vntextviewList);
+            textViews.addAll(yujingList);
+        } else {
+            if (status == 6 || status == 7) {
+                renyuanType.setText("用户信息");
+                shouzhongrenyuan.setVisibility(View.VISIBLE);
+                jiezhognrenyuan.setVisibility(View.GONE);
+                textViews.addAll(vntextviewList);
+                textViews.addAll(zcList);
+            } else if (status == 8) {
+                renyuanType.setText("接种人员");
+                shouzhongrenyuan.setVisibility(View.GONE);
+                jiezhognrenyuan.setVisibility(View.VISIBLE);
+                textViews.addAll(vntextviewList);
+                textViews.addAll(yujingList);
+            }
+        }
+
+        textJump(textViews); //开始字符跳动
+
+        //设置验证信息
+//        vndetailTvChatImage.setImageResource(R.mipmap.report_check_ico);
+        vndetailTvChatImage.setImageResource(R.mipmap.report_normal_ico);
+        // vndetailTvTypemsg.setText("疫苗企业验证通过");
+        //透明动画
+        ObjectAnimator animator = ObjectAnimator.ofFloat(vndetailTvChatImage, "alpha", 0.1f, 1f);
+        animator.setDuration(300); //一秒闪一次
+        animator.setRepeatCount(10); //总共闪十次
+        animator.setRepeatMode(Animation.REVERSE);
+        //为动画设置监听
+        animator.addListener(new Animator.AnimatorListener() {
+            @Override
+            public void onAnimationStart(Animator animation) {
+
+            }
+
+            @RequiresApi(api = Build.VERSION_CODES.KITKAT)
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                //动画结束
+                animation.resume();
+                /*AlphaAnimation alpha = new AlphaAnimation(0.1F, 1F);
+                alpha.setDuration(0);
+                alpha.setFillAfter(true);
+                vndetailTvChatImage.startAnimation(alpha);*/
+                setPageView(); //设置扫描到的信息
+            }
+
+            @Override
+            public void onAnimationCancel(Animator animation) {
+
+            }
+
+            @Override
+            public void onAnimationRepeat(Animator animation) {
+                //动画重复时  下方进行验证提示
+                //Log.e("onAnimationRepeat","onAnimationRepeat");
+                checki++;
+                vndetailTvTypemsg.setText("产品信息已验证通过，冷链信息未发现异常，请核对产品外包装与本报告所载数据是否一致");
+                // setCheckText(checki);
+            }
+        });
+        animator.start();
+
+    }
+
+    private void setCheckText(int checki) {
+        switch (checki) {
+            case 1:
+                vndetailTvTypemsg.setText("疫苗企业验证通过");
+                break;
+            case 2:
+                vndetailTvTypemsg.setText("疫苗品种验证通过");
+                break;
+            case 3:
+                vndetailTvTypemsg.setText("疫苗规格验证通过");
+                break;
+            case 4:
+                vndetailTvTypemsg.setText("疫苗id验证通过");
+                break;
+            case 5:
+                vndetailTvTypemsg.setText("疫苗冷链验证通过");
+                break;
+            case 6:
+                vndetailTvTypemsg.setText("接种点验证通过");
+                break;
+            case 7:
+                vndetailTvTypemsg.setText("医生验证通过");
+                break;
+            case 8:
+                vndetailTvTypemsg.setText("受种者姓名验证通过");
+                break;
+            case 9:
+                vndetailTvTypemsg.setText("受种者年龄验证通过");
+                break;
+            case 10:
+                vndetailTvTypemsg.setText("受种者性别验证通过");
+                break;
+            default:
+                break;
+        }
+    }
+
+    private void setPageView() {
+//        if (status == 4 || status == 8) {
+//            findViewById(R.id.btn_ll).setVisibility(View.VISIBLE);
+//            vndetailTvTypemsg.setText("此疫苗需要进一步验证，请等待厂家复核");
+//            //vndetailTvTypemsg.setTextColor(Color.RED);
+//            vndetailTvChatImage.setImageResource(R.mipmap.report_warning_ico);
+//            coverview.setText("提示:温度追溯结果显示,该疫苗冷链可能有超温现象,厂家已收到相关信息。请立即停止使用该疫苗,等待复核结果。");
+//            //播放提示语
+//            postDelayed(new Runnable() {
+//                @Override
+//                public void run() {
+//                    soundPoolHelper.play("rewarning", false);
+//                }
+//            }, 500);
+//
+//            getWarningOper();
+//        } else {
+        //   if (status == 6 || status == 7) {
+        findViewById(R.id.btn_ll).setVisibility(View.VISIBLE);
+//                vndetailTvTypemsg.setText(
+//                        "疫苗信息已验证通过,冷链信息未发现异常,请核对疫苗内外包装与本报告所载数据是否一致,并按\"三查七对\"的规定使用");
+        //vndetailTvTypemsg.setTextColor(Color.GREEN);
+        vndetailTvChatImage.setImageResource(R.mipmap.report_normal_ico);
+                /*vndetailTvChatImage.setVisibility(View.GONE);
+                vndetail_tv_chatImage_title.setVisibility(View.GONE);*/
+        coverview.setText("提示:注射疫苗后，请用注射专用创口贴或消毒棉球轻压针眼几分钟，至不出血。请勿揉搓接种部位。接种疫苗后休息30分钟再离开。");
+
+        pdfhandler.postDelayed(pdfRunnable, 1000 * 20);
+        normalhandler.postDelayed(normalRunnable, 1000 * 60);
+        //   }
+            /* else if (status == 8) {
+                vndetailTvTypemsg.setText("此疫苗需要进一步验证，请等待厂家复核");
+                vndetailTvTypemsg.setTextColor(Color.RED);
+                vndetailTvChatImage.setImageResource(R.mipmap.report_warning_ico);
+                coverview.setText("提示:温度追溯结果显示,该疫苗冷链可能有超温现象,厂家已收到相关信息。请立即停止使用该疫苗,等待复核结果。");
+                postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        soundPoolHelper.play("rewarning", false);
+                    }
+                }, 500);
+                normalhandler.postDelayed(normalRunnable, 1000 * 60);
+            }*/
+//        }
+        //*******************************************************************
+        //下载处理
+        btnDownloadBitmap.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                requestCemera();
+            }
+        });
+    }
+
+    /**
+     * 权限处理
+     */
+    private void requestCemera() {
+        if (PermissionsUtil.hasPermission(VnReportDetailForDoctorActivity01.this, PERMISSION)) {
+            //有访问的权限
+            completeDown(rlAll);
+//            ScreenshotUtil.saveScreenshotFromView(rl,MainActivity.this);
+        } else {
+            PermissionsUtil.requestPermission(VnReportDetailForDoctorActivity01.this, new PermissionListener() {
+                @Override
+                public void permissionGranted(@NonNull String[] permissions) {
+                    //用户授予了访问的权限
+//                    ScreenshotUtil.saveScreenshotFromView(rl,MainActivity.this);
+                    completeDown(rlAll);
+                }
+
+
+                @Override
+                public void permissionDenied(@NonNull String[] permissions) {
+                    //用户拒绝了访问的申请
+                }
+            }, PERMISSION);
+        }
+    }
+
+    private void completeDown(View view) {
+        File file = new File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES), System.currentTimeMillis() + ".jpg");
+        //Bitmap bitmap = screenShot(MainActivity.this);
+        Bitmap bitmap = captureView(view);
+        try {
+            if (!file.exists())
+                file.createNewFile();
+            boolean ret = save(bitmap, file, Bitmap.CompressFormat.JPEG, true);
+            if (ret) {
+                //通知相册更新
+                MediaStore.Images.Media.insertImage(getContentResolver(), BitmapFactory.decodeFile(file.getAbsolutePath()), file.getName(), null);
+                Intent intent = new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE);
+                Uri uri = Uri.fromFile(file);
+                intent.setData(uri);
+                Toast.makeText(getApplicationContext(), "截图已保持至 " + file.getAbsolutePath(), Toast.LENGTH_SHORT).show();
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 保存图片到文件File。
+     *
+     * @param src     源图片
+     * @param file    要保存到的文件
+     * @param format  格式
+     * @param recycle 是否回收
+     * @return true 成功 false 失败
+     */
+    public static boolean save(Bitmap src, File file, Bitmap.CompressFormat format, boolean recycle) {
+        if (isEmptyBitmap(src))
+            return false;
+
+        OutputStream os;
+        boolean ret = false;
+        try {
+            os = new BufferedOutputStream(new FileOutputStream(file));
+            ret = src.compress(format, 100, os);
+            if (recycle && !src.isRecycled())
+                src.recycle();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        return ret;
+    }
+
+
+    /**
+     * 获取当前屏幕截图，不包含状态栏（Status Bar）。
+     *
+     * @param activity activity
+     * @return Bitmap
+     */
+    public static Bitmap screenShot(Activity activity) {
+        View view = activity.getWindow().getDecorView();
+        view.setDrawingCacheEnabled(true);
+        view.buildDrawingCache();
+        Bitmap bmp = view.getDrawingCache();
+        int statusBarHeight = getStatusBarHeight(activity);
+        int width = (int) getDeviceDisplaySize(activity)[0];
+        int height = (int) getDeviceDisplaySize(activity)[1];
+        Bitmap ret = Bitmap.createBitmap(bmp, 0, statusBarHeight, width, height - statusBarHeight);
+        view.destroyDrawingCache();
+
+        return ret;
+    }
+
+    public Bitmap captureView(View view) {
+        // 根据View的宽高创建一个空的Bitmap
+        Bitmap bitmap = Bitmap.createBitmap(
+                view.getWidth(),
+                view.getHeight(),
+                Bitmap.Config.RGB_565);
+        // 利用该Bitmap创建一个空的Canvas
+        Canvas canvas = new Canvas(bitmap);
+        // 绘制背景(可选)
+        canvas.drawColor(Color.WHITE);
+        // 将view的内容绘制到我们指定的Canvas上
+        view.draw(canvas);
+        return bitmap;
+    }
+
+    public static float[] getDeviceDisplaySize(Context context) {
+        Resources resources = context.getResources();
+        DisplayMetrics dm = resources.getDisplayMetrics();
+        int width = dm.widthPixels;
+        int height = dm.heightPixels;
+
+        float[] size = new float[2];
+        size[0] = width;
+        size[1] = height;
+
+        return size;
+    }
+
+    public static int getStatusBarHeight(Context context) {
+        int height = 0;
+        int resourceId = context.getResources().getIdentifier("status_bar_height", "dimen", "android");
+        if (resourceId > 0) {
+            height = context.getResources().getDimensionPixelSize(resourceId);
+        }
+
+        return height;
+    }
+
+    /**
+     * Bitmap对象是否为空。
+     */
+    public static boolean isEmptyBitmap(Bitmap src) {
+        return src == null || src.getWidth() == 0 || src.getHeight() == 0;
+    }
+    //*******************************************************************
+
+    private void getnormalOper() {
+        postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                soundPoolHelper.play("renormal", false);
+            }
+        }, 500);
+        final BaseDialog normalDiago = new EvvmMsgDiago.Builder(this)
+                .setTitle("pdf报告已自动保存到你指定的路径，医生已做好“三查七对”，并按规定完成接种，是否推送给受种者(监护人)？") // 标题可以不用填写
+                .setConfirm("发送给家长")
+                .setCancel("取消") // 设置 null 表示不显示取消按钮
+                //.setAutoDismiss(false) // 设置点击按钮后不关闭对话框
+                .setListener(new EvvmMsgDiago.OnListener() {
+
+                    @Override
+                    public void onConfirm(Dialog dialog) {
+                        String emailsOfInoculator = "";
+                        try {
+                            String str = (String) SPUtils.get("INOCULATOR_LIST", "");
+                            if (!str.equals("")) {
+                                JSONArray jsonArr = new JSONArray(str);
+                                for (int i = 0; i < jsonArr.length(); i++) {
+                                    String arr[] = jsonArr.getString(i).split("▇");
+                                    if (!arr[3].trim().equals("")) {
+                                        emailsOfInoculator += arr[3] + ",";
+                                    }
+                                }
+                                if (emailsOfInoculator.lastIndexOf(",") == emailsOfInoculator.length() - 1) {
+                                    emailsOfInoculator = emailsOfInoculator.substring(0, emailsOfInoculator.length() - 1);
+                                }
+                            }
+                        } catch (JSONException e) {
+                            e.printStackTrace();
+                        }
+
+                        getPresenter().sendMailToInoculator(chipModel.getChipNumber(), emailsOfInoculator);
+                    }
+
+                    @Override
+                    public void onCancel(Dialog dialog) {
+                        //toast("取消了");
+                    }
+                })
+                .addOnDismissListener(new BaseDialog.OnDismissListener() {
+                    @Override
+                    public void onDismiss(BaseDialog dialog) {
+                    }
+                })
+                .show();
+
+        postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                if (normalDiago.isShowing()) {
+                    normalDiago.dismiss();
+                }
+            }
+        }, 30000);
+    }
+
+    private void getWarningOper() {
+        final BaseDialog warningDiago = new EvvmMsgDiago.Builder(this)
+                .setTitle("此疫苗需复核，请换支疫苗") // 标题可以不用填写
+                .setConfirm("")
+                .setCancel("") // 设置 null 表示不显示取消按钮
+                //.setAutoDismiss(false) // 设置点击按钮后不关闭对话框
+                .addOnDismissListener(new BaseDialog.OnDismissListener() {
+                    @Override
+                    public void onDismiss(BaseDialog dialog) {
+                        //toast("asfad");
+                        //warninghandler.postDelayed(warningRunnable, 1000 * 10);
+                    }
+                })
+                .show();
+        postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                if (warningDiago.isShowing()) {
+                    warningDiago.dismiss();
+                }
+            }
+        }, 5000);
+    }
+
+    private void setViewData(final VnDetailBean.DataBean dataBean) {
+        vndetailTvTitle.setText(dataBean.getVaccineName() + "" + dataBean.getBatch());
+        Log.i("awgawrgawg", "setViewData: " + dataBean.getVaccineName());
+        vndetailTvSzname.setText(TextUtils.isEmpty(dataBean.getInoculatroUserName()) ? "N/A" : "" + dataBean.getInoculatroUserName());
+        Log.i("awgawrgawg", "setViewData: " + dataBean.getBatch());
+        vndetailTvSzsex.setText(TextUtils.isEmpty(dataBean.getInoculatroSex()) ? "N/A" : "" + dataBean.getInoculatroSex());
+        vndetailTvSzbirthday.setText(TextUtils.isEmpty(dataBean.getInoculatroBirthdate()) ? "N/A" : "" + dataBean.getInoculatroBirthdate());
+        vndetailTvSzid.setText(addZero(dataBean.getInoculatroId()));
+        vndetailTvSzguardian.setText("N/A");
+        vndetailTvSzTelephone.setText(TextUtils.isEmpty(dataBean.getInoculatroTelePhone()) ? "N/A" : "" + dataBean.getInoculatroTelePhone());
+        vndetailTvVncreatdate.setText(TextUtils.isEmpty(dataBean.getBeginDate()) ? "N/A" : dataBean.getBeginDate() + "");
+        //显示更改
+        vndetailTvVnname.setText(TextUtils.isEmpty(dataBean.getVaccineName()) ? "N/A" : dataBean.getVaccineName() + "");
+        vndetailTvVnvalid.setText(TextUtils.isEmpty(dataBean.getVaccineExpiryDate()) ? "N/A" : dataBean.getVaccineExpiryDate() + "个月");
+        vndetailTvVnsc.setText(dataBean.getVaccineCommonName());
+        vndetailTvFactoryName.setText("" + dataBean.getFactoryName());
+        vndetailTvVaccinationSite.setText(dataBean.getVaccinationSite());
+        ndetailTvSpecifications.setText(dataBean.getVaccineCategory());
+        vndetailTvApprovalNumber.setText(dataBean.getApprovalNumber());
+        vndetailTvStandardCode.setText(dataBean.getStandardCode());
+        vndetailTvIdentificationCode.setText( dataBean.getIdentificationCode());
+
+
+
+        //vndetailTvVncode.setText("evvm Code " + dataBean.getCode());
+     /*   String codeStr = "";
+        for (int i = 0; i < dataBean.getCodeX().length(); i++) {
+            codeStr = codeStr + "*";
+        }*/
+       /* SpannableString spancode = new SpannableString("报告编号 " + dataBean.getCodeX());
+        spancode.setSpan(new ClickableSpan() {
+            @Override
+            public void onClick(View view) {
+                //点击的响应事件
+                *//*if (dataBean.getCodeX() == null || TextUtils.isEmpty(dataBean.getCodeX())) {
+                    toast("你没有授权，请进行注册");
+                } else {
+                    gotoWebActivity(dataBean.getCodeX());
+                }*//*
+            }
+        }, 5, 5 + dataBean.getCodeX().length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);*/
+//        vndetailTvVncode.setText("报告编号： " + dataBean.getCodeX());
+        //vndetailTvVncode.setMovementMethod(LinkMovementMethod.getInstance());//开始响应点击事件
+//        vndetailTvVndate.setText("报告日期：" + dataBean.getDatetime());
+//        DateFormat format1 = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+//        vndetailTvVndate.setText("报告日期："+format1.format(new Date()));
+        vndetailTvHospitalName.setText("" + dataBean.getHospitalName());
+        vndetailTvDoctorName.setText("" + dataBean.getDoctorName());
+        vndetailTvDoctorTelephone.setText("" + dataBean.getDoctorTelephone());
+        vndetailTvChatImage.setScaleType(ImageView.ScaleType.CENTER);
+
+       /* SpannableString spanGmpPath = new SpannableString(TextUtils.isEmpty(dataBean.getGmpName()) ? "N/A" : dataBean.getGmpName());
+        spanGmpPath.setSpan(new ClickableSpan() {
+            @Override
+            public void onClick(View view) {
+                //点击的响应事件
+                if (dataBean.getGmpPath() == null || TextUtils.isEmpty(dataBean.getGmpPath())) {
+                    toast("暂时无法提供,需索取");
+                } else {
+                    gotoWebActivity(dataBean.getGmpPath());
+
+                }
+            }
+        }, 0, spanGmpPath.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);*/
+        vndetailTvGmpName.setText(TextUtils.isEmpty(dataBean.getGmpName()) ? "N/A" : dataBean.getGmpName());
+        //vndetailTvGmpName.setMovementMethod(LinkMovementMethod.getInstance());//开始响应点击事件
+
+        SpannableString spanvndetailTvOthervn0 = new SpannableString("点击查看");
+        spanvndetailTvOthervn0.setSpan(new ClickableSpan() {
+            @Override
+            public void onClick(View view) {
+                //点击的响应事件
+                if (dataBean.getBatchCertificate() == null || TextUtils.isEmpty(dataBean.getBatchCertificate())) {
+                    toast("暂时无法提供,需索取");
+                } else {
+                    gotoWebActivity(dataBean.getBatchCertificate());
+                }
+            }
+        }, 0, spanvndetailTvOthervn0.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+        vndetailTvGmpPath.setText(spanvndetailTvOthervn0);
+        vndetailTvGmpPath.setMovementMethod(LinkMovementMethod.getInstance());//开始响应点击事件
+
+        SpannableString spanvndetailTvOthervn1 = new SpannableString("点击查询");
+        spanvndetailTvOthervn1.setSpan(new ClickableSpan() {
+            @Override
+            public void onClick(View view) {
+                //点击的响应事件
+                if (dataBean.getSameBatchOtherColdChain() == null || TextUtils.isEmpty(dataBean.getSameBatchOtherColdChain())) {
+                    toast("暂时无法提供,需索取");
+                } else {
+                    gotoWebActivity(dataBean.getSameBatchOtherColdChain());
+                }
+            }
+        }, 0, spanvndetailTvOthervn1.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+        vndetailTvOthervn1.setText(spanvndetailTvOthervn1);
+        vndetailTvOthervn1.setMovementMethod(LinkMovementMethod.getInstance());//开始响应点击事件
+
+
+        SpannableString spanvndetailTvOthervn2 = new SpannableString("点击查询");
+        spanvndetailTvOthervn2.setSpan(new ClickableSpan() {
+            @Override
+            public void onClick(View view) {
+                //点击的响应事件
+                if (dataBean.getSameBatchOtherFlow() == null || TextUtils.isEmpty(dataBean.getSameBatchOtherFlow())) {
+                    toast("暂时无法提供,需索取");
+                } else {
+                    gotoWebActivity(dataBean.getSameBatchOtherFlow());
+                }
+            }
+        }, 0, spanvndetailTvOthervn2.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+        vndetailTvOthervn2.setText(spanvndetailTvOthervn2);
+        vndetailTvOthervn2.setMovementMethod(LinkMovementMethod.getInstance());//开始响应点击事件
+
+        SpannableString spanvndetailTvOthervn3 = new SpannableString("点击查询");
+        spanvndetailTvOthervn3.setSpan(new ClickableSpan() {
+            @Override
+            public void onClick(View view) {
+                //点击的响应事件
+                if (dataBean.getSameFactoryOtherVaccines() == null || TextUtils.isEmpty(dataBean.getSameFactoryOtherVaccines())) {
+                    toast("暂时无法提供,需索取");
+                } else {
+                    gotoWebActivity(dataBean.getSameFactoryOtherVaccines());
+
+                }
+            }
+        }, 0, spanvndetailTvOthervn3.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+        vndetailTvOthervn3.setText(spanvndetailTvOthervn3);
+        vndetailTvOthervn3.setMovementMethod(LinkMovementMethod.getInstance());//开始响应点击事件
+    }
+
+    private void gotoWebActivity(String path) {
+        if (isWarning) {
+            warninghandler.removeCallbacks(warningRunnable);
+        } else {
+            normalhandler.removeCallbacks(normalRunnable);
+        }
+        Intent in = new Intent(VnReportDetailForDoctorActivity01.this, WebActivity.class);
+        in.putExtra("WebViewUrl", "" + path + "");
+        startActivity(in);
+    }
+
+    @Override
+    protected VnDetailPresenter createPresenter() {
+        return new VnDetailPresenter();
+    }
+
+    @Override
+    public void getSendMailSuccess(VnDetailBean data) {
+        toast("邮件已发送");
+        //finish();
+    }
+
+    @Override
+    public void getmlistError(String msg) {
+        toast("邮件发送失败");
+    }
+
+    @Override
+    public void getmlistSuccess(ModelListBean data) {
+
+    }
+
+    @Override
+    public void getToReviewError(String msg) {
+
+    }
+
+    @Override
+    public void getToReviewSuccess(VerificationCodeBean data) {
+
+    }
+
+    @Override
+    public void getDetailError(String msg) {
+
+    }
+
+    @Override
+    public void getDetailSuccess(VnDetailBean data) {
+
+    }
+
+    @Override
+    public void getSendMailError(String msg) {
+        toast(msg);
+    }
+
+
+    public String addZero(String msg) {
+        //Log.e("addZero1",""+msg + "  "+msg.length());
+        if (TextUtils.isEmpty(msg)) {
+            return "N/A";
+        }
+        if (msg.length() >= 11) {
+            return msg;
+        } else {
+            String remsg = msg;
+            for (int i = 0; i < 11 - msg.length(); i++) {
+                remsg = "0" + remsg;
+            }
+            // Log.e("addZero",""+remsg + "  "+remsg.length());
+            return remsg;
+        }
+    }
+
+    public static void i(String tag, String msg) {  //信息太长,分段打印
+        //因为String的length是字符数量不是字节数量所以为了防止中文字符过多，
+        //  把4*1024的MAX字节打印长度改为2001字符数
+        int max_str_length = 2001 - tag.length();
+        //大于4000时
+        while (msg.length() > max_str_length) {
+            Log.i(tag, msg.substring(0, max_str_length));
+            msg = msg.substring(max_str_length);
+        }
+        //剩余部分
+        Log.i(tag, msg);
+
+    }
+
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        if (isFinishing()) {
+            if (pdfhandler != null) {
+                pdfhandler.removeCallbacks(pdfRunnable);
+            }
+        }
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+
+        if (status == 6 || status == 7 || status == 8) {
+            SPUtils.remove("INOCULATOR_LIST");
+        }
+        // soundPoolHelper.release();
+        if (normalhandler != null) {
+            normalhandler.removeCallbacksAndMessages(null);
+        }
+        if (warninghandler != null) {
+            warninghandler.removeCallbacksAndMessages(null);
+        }
+        if (pdfhandler != null) {
+            pdfhandler.removeCallbacks(pdfRunnable);
+        }
+
+    }
+
+    @Override
+    public void onDown() {
+        Log.e("DoctorVnReportActivity", "down");
+        if (isWarning) {
+            if (warninghandler != null) {
+                warninghandler.removeCallbacks(warningRunnable);
+            }
+        } else {
+            if (normalhandler != null) {
+                normalhandler.removeCallbacks(normalRunnable);
+            }
+        }
+    }
+
+    @Override
+    public void onUp() {
+        Log.e("DoctorVnReportActivity", "up");
+        if (isWarning) {
+            warninghandler.postDelayed(warningRunnable, 1000 * 60);
+        } else {
+            normalhandler.postDelayed(normalRunnable, 1000 * 60);
+        }
+    }
+
+    @Override
+    public void oneClick() {
+
+    }
+
+    @Override
+    public void doubleClick() {
+
+    }
+
+
+    public void textJump(final List<TextView> tvList) {
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                for (int i = 0; i < tvList.size(); i++) {
+                    try {
+                        Thread.sleep(3000 / tvList.size());
+                    } catch (InterruptedException e) {
+                        e.printStackTrace();
+                    }
+                    final int finalI = i;
+                    if (getActivity() != null) {
+                        runOnUiThread(new Runnable() {
+                            @Override
+                            public void run() {
+                                tvList.get(finalI).setVisibility(View.VISIBLE);
+                            }
+                        });
+                    }
+                }
+            }
+        }).start();
+    }
+}

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

@@ -110,6 +110,8 @@
 
                 <!--标签-->
                 <include layout="@layout/layout_lable_local"/>
+                <!--标签样式2-->
+                <include layout="@layout/laytout_lable_local_01"/>
                 <!--报警图片-->
                 <RelativeLayout
                     android:layout_width="match_parent"

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

@@ -0,0 +1,930 @@
+<?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"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/white">
+
+    <RelativeLayout
+        android:id="@+id/rl_all"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <FrameLayout
+            android:id="@+id/frame"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+                <!--标题-->
+<!--                <com.hjq.bar.TitleBar-->
+<!--                    android:id="@+id/tb_vndetail_title"-->
+<!--                    android:layout_width="match_parent"-->
+<!--                    android:layout_height="wrap_content"-->
+<!--                    android:visibility="gone"-->
+<!--                    app:lineColor="@color/black"-->
+<!--                    app:title="@string/report_zhuishu" />-->
+                <RelativeLayout
+                    android:id="@+id/tb_vndetail_title"
+                    android:layout_width="match_parent"
+                    android:layout_height="55dp">
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@mipmap/title_return"
+                        android:layout_marginLeft="15dp"
+                        android:layout_marginBottom="14dp"
+                        android:layout_alignParentBottom="true"/>
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginBottom="13dp"
+                        android:text="@string/report_zhuishu"
+                        android:layout_alignParentBottom="true"
+                        android:layout_centerInParent="true"
+                        android:textSize="17sp"/>
+                </RelativeLayout>
+                <!--报告编号和日期-->
+                <RelativeLayout
+                    android:id="@+id/rl_number_layout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="10dp"
+                    android:paddingRight="10dp"
+                    android:layout_below="@id/tb_vndetail_title">
+                    <TextView
+                        android:id="@+id/vndetail_tv_vncode"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="报告编号"
+                        android:textColor="@color/gray"
+                        android:textSize="8sp"
+                        />
+
+                    <TextView
+                        android:id="@+id/vndetail_tv_vndate"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentRight="true"
+                        android:text="报告日期"
+                        android:textColor="@color/gray"
+                        android:textSize="8sp" />
+                </RelativeLayout>
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_marginTop="2dp"
+                    android:layout_below="@id/rl_number_layout"
+                    android:background="@color/colorLine"/>
+            </RelativeLayout>
+
+        </FrameLayout>
+
+        <com.zy.bvvm.widget.ZoomView
+            android:id="@+id/zv_report"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_below="@+id/frame"
+            android:layout_marginTop="0dp">
+
+            <LinearLayout
+                android:id="@+id/ll_all"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginBottom="2dp"
+                android:orientation="vertical"
+                android:paddingLeft="10dp"
+                android:paddingRight="10dp"
+                android:paddingBottom="40dp">
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="5dp">
+
+                    <ImageView
+                        android:id="@+id/iv_report_top"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@mipmap/iv_report_top"
+                        android:visibility="gone" />
+
+                    <TextView
+                        android:id="@+id/vndetail_tv_tt"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentRight="true"
+                        android:layout_marginLeft="25dp"
+                        android:layout_marginBottom="3dp"
+                        android:layout_toRightOf="@id/iv_report_top"
+                        android:gravity="center"
+                        android:text="产品追溯报告"
+                        android:textSize="10sp"
+                        android:visibility="gone" />
+
+                    <TextView
+                        android:id="@+id/vndetail_tv_line"
+                        android:layout_width="match_parent"
+                        android:layout_height="15dp"
+                        android:layout_below="@id/vndetail_tv_tt"
+                        android:layout_alignParentRight="true"
+                        android:layout_toRightOf="@id/iv_report_top"
+                        android:background="#a8996e"
+                        android:text="" />
+
+                    <TextView
+                        android:id="@+id/vndetail_tv_title"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@id/vndetail_tv_tt"
+                        android:layout_centerHorizontal="true"
+                        android:layout_marginRight="10dp"
+                        android:background="#a8996e"
+                        android:text="eVVM®TRACK REPORT"
+                        android:textColor="#ffffff"
+                        android:textSize="11sp"
+                        android:textStyle="bold" />
+
+
+                </RelativeLayout>
+
+                <!--产品具体字段-->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+                    <!--左边-->
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="6"
+                        android:orientation="vertical">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="5dp"
+                            android:text="产品详情"
+                            android:textSize="8dp"
+                            android:textStyle="bold" />
+
+                        <!--药品商品名称-->
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="4dp"
+                            android:orientation="horizontal">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="药品商品名称........."
+                                android:textSize="8sp" />
+
+                            <TextView
+                                android:id="@+id/vndetail_tv_vnname"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:ellipsize="end"
+                                android:maxLines="1"
+                                android:textSize="8dp" />
+                        </LinearLayout>
+                        <!--药品通用名称-->
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="2dp"
+                            android:orientation="horizontal">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="药品通用名称........."
+                                android:textSize="8sp" />
+
+                            <TextView
+                                android:id="@+id/vndetail_tv_vnsc"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:ellipsize="end"
+                                android:maxLines="1"
+                                android:textSize="8dp" />
+                        </LinearLayout>
+                        <!--企业名称-->
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="2dp"
+                            android:orientation="horizontal">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="生产企业名称........."
+                                android:textSize="8sp" />
+
+                            <TextView
+                                android:id="@+id/vndetail_tv_factoryName"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:ellipsize="end"
+                                android:maxLines="1"
+                                android:textSize="8dp" />
+                        </LinearLayout>
+                        <!--有效期-->
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="2dp"
+                            android:orientation="horizontal">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="有效期....................."
+                                android:textSize="8sp" />
+
+                            <TextView
+                                android:id="@+id/vndetail_tv_vnvalid"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:ellipsize="end"
+                                android:maxLines="1"
+                                android:textSize="8dp" />
+                        </LinearLayout>
+                        <!--GMP编号-->
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="2dp"
+                            android:orientation="horizontal"
+                            android:visibility="gone">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="GMP 编号........"
+                                android:textSize="8sp" />
+
+                            <TextView
+                                android:id="@+id/vndetail_tv_gmpName"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:textSize="8sp" />
+                        </LinearLayout>
+                        <!--签发证书-->
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="2dp"
+                            android:orientation="horizontal"
+                            android:visibility="gone">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="批签发证书....."
+                                android:textSize="8sp" />
+
+                            <TextView
+                                android:id="@+id/vndetail_tv_gmpPath"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:autoLink="all"
+                                android:text="点击查看"
+                                android:textColor="@color/blue"
+                                android:textSize="8sp" />
+                        </LinearLayout>
+
+
+                    </LinearLayout>
+                    <!--右边-->
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="5"
+                        android:layout_marginLeft="5dp"
+                        android:orientation="vertical">
+
+                        <TextView
+                            android:id="@+id/renyuan_type"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="5dp"
+                            android:text="用户信息"
+                            android:textSize="8sp"
+                            android:textStyle="bold"
+                            android:visibility="invisible" />
+
+                        <LinearLayout
+                            android:id="@+id/shouzhongrenyuan"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:orientation="vertical"
+                            android:visibility="visible">
+                            <!--接种部位-->
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="2dp"
+                                android:orientation="horizontal"
+                                android:visibility="gone">
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="接种部位....................."
+                                    android:textSize="8sp" />
+
+                                <TextView
+                                    android:id="@+id/vndetail_tv_vaccinationSite"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:ellipsize="end"
+                                    android:maxLines="1"
+                                    android:textSize="8dp" />
+                            </LinearLayout>
+                            <!--规格-->
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="2dp"
+                                android:orientation="horizontal">
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="规格............................."
+                                    android:textSize="8sp" />
+
+                                <TextView
+                                    android:id="@+id/vndetail_tv_specifications"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:ellipsize="end"
+                                    android:maxLines="1"
+                                    android:textSize="8dp" />
+                            </LinearLayout>
+
+                            <!--药品本位码-->
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="2dp"
+                                android:orientation="horizontal">
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="药品本位码................."
+                                    android:textSize="8sp" />
+
+                                <TextView
+                                    android:id="@+id/vndetail_tv_standardCode"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:ellipsize="end"
+                                    android:maxLines="1"
+                                    android:textSize="8dp" />
+                            </LinearLayout>
+                            <!--药品批准文号-->
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="2dp"
+                                android:orientation="horizontal">
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="药品批准文号............."
+                                    android:textSize="8sp" />
+
+                                <TextView
+                                    android:id="@+id/vndetail_tv_approvalNumber"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:ellipsize="end"
+                                    android:maxLines="1"
+                                    android:textSize="8dp" />
+                            </LinearLayout>
+                            <!--国家药品标识码-->
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="2dp"
+                                android:orientation="horizontal">
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="国家药品标识码........."
+                                    android:textSize="8sp" />
+
+                                <TextView
+                                    android:id="@+id/vndetail_tv_identificationCode"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:ellipsize="end"
+                                    android:maxLines="1"
+                                    android:text=""
+                                    android:textSize="8dp" />
+                            </LinearLayout>
+
+
+                            <!--生产日期-->
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="2dp"
+                                android:orientation="horizontal"
+                                android:visibility="gone">
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="生产日期........."
+                                    android:textSize="8sp" />
+
+                                <TextView
+                                    android:id="@+id/vndetail_tv_vncreatdate"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:textSize="8dp" />
+                            </LinearLayout>
+                            <!--联系方式-->
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="4dp"
+                                android:orientation="horizontal"
+                                android:visibility="gone">
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="联系方式......."
+                                    android:textSize="8sp" />
+
+                                <TextView
+                                    android:id="@+id/vndetail_tv_szname"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:textSize="8sp"
+                                    android:visibility="invisible" />
+                            </LinearLayout>
+                            <!--性别-->
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="2dp"
+                                android:orientation="horizontal"
+                                android:visibility="gone">
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="性别..................."
+                                    android:textSize="8sp" />
+
+                                <TextView
+                                    android:id="@+id/vndetail_tv_szsex"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:textSize="8sp"
+                                    android:visibility="invisible" />
+                            </LinearLayout>
+                            <!--出生日期-->
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="2dp"
+                                android:orientation="horizontal"
+                                android:visibility="gone">
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="出生日期..........."
+                                    android:textSize="8sp" />
+
+                                <TextView
+                                    android:id="@+id/vndetail_tv_szbirthday"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:textSize="8sp"
+                                    android:visibility="invisible" />
+                            </LinearLayout>
+                            <!--二维码编号-->
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="2dp"
+                                android:orientation="horizontal"
+                                android:visibility="gone">
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="二维码编号......."
+                                    android:textSize="8sp" />
+
+                                <TextView
+                                    android:id="@+id/vndetail_tv_szid"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:textSize="8sp"
+                                    android:visibility="invisible" />
+                            </LinearLayout>
+                            <!--受种着监护人-->
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="2dp"
+                                android:orientation="horizontal"
+                                android:visibility="gone">
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="受种者监护人..."
+                                    android:textSize="8sp" />
+
+                                <TextView
+                                    android:id="@+id/vndetail_tv_szguardian"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:textSize="8sp"
+                                    android:visibility="invisible" />
+                            </LinearLayout>
+                            <!--联系方式-->
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="4dp"
+                                android:orientation="horizontal"
+                                android:visibility="gone">
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="联系方式............"
+                                    android:textSize="8sp" />
+
+                                <TextView
+                                    android:id="@+id/vndetail_tv_szTelephone"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:textSize="8sp"
+                                    android:visibility="invisible" />
+                            </LinearLayout>
+
+
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:id="@+id/jiezhognrenyuan"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:orientation="vertical"
+                            android:visibility="gone">
+
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="4dp"
+                                android:orientation="horizontal"
+                                android:visibility="gone">
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="接种单位........"
+                                    android:textSize="8sp" />
+
+                                <TextView
+                                    android:id="@+id/vndetail_tv_hospitalName"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:textSize="8sp"
+                                    android:visibility="invisible" />
+                            </LinearLayout>
+
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="4dp"
+                                android:orientation="horizontal"
+                                android:visibility="gone">
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="医生姓名........"
+                                    android:textSize="8sp" />
+
+                                <TextView
+                                    android:id="@+id/vndetail_tv_doctorName"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:textSize="8sp"
+                                    android:visibility="invisible" />
+                            </LinearLayout>
+
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="4dp"
+                                android:orientation="horizontal">
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="联系方式........"
+                                    android:textSize="8sp" />
+
+                                <TextView
+                                    android:id="@+id/vndetail_tv_doctorTelephone"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:textSize="8sp"
+                                    android:visibility="invisible" />
+                            </LinearLayout>
+                        </LinearLayout>
+
+
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1">
+
+                    <ImageView
+                        android:id="@+id/vndetail_tv_chatImage"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_centerInParent="true"
+                        android:layout_marginTop="5dp"
+                        android:src="@mipmap/report_normal_ico" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="5dp"
+                        android:text="追溯结果"
+                        android:textSize="10sp"
+                        android:textStyle="bold"
+                        android:visibility="gone" />
+                </RelativeLayout>
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <TextView
+                        android:id="@+id/vndetail_tv_typemsg"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="5dp"
+                        android:layout_toRightOf="@+id/vndetail_tv_chatImage_title"
+                        android:text="没发现报告"
+                        android:textSize="9sp"
+                        android:textStyle="bold"
+                        android:visibility="gone" />
+
+                    <TextView
+                        android:id="@+id/vndetail_tv_chatImage_title"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="5dp"
+                        android:text="可用性分析："
+                        android:textSize="9sp"
+                        android:textStyle="bold"
+                        android:visibility="gone" />
+                </RelativeLayout>
+
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="2dp"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:id="@+id/coverview"
+                        android:layout_width="0dp"
+                        android:layout_height="55dp"
+                        android:layout_marginTop="3dp"
+                        android:layout_weight="5"
+                        android:paddingRight="4dp"
+                        android:text="提示："
+                        android:textSize="4sp"
+                        android:visibility="gone" />
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="6"
+                        android:orientation="vertical"
+                        android:visibility="gone">
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:orientation="horizontal">
+
+                            <TextView
+                                android:id="@+id/vndetail_tv_othervn1"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="点击查询......"
+                                android:textSize="8sp" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="同批次其他疫苗冷链"
+                                android:textSize="8sp" />
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="4dp"
+                            android:orientation="horizontal">
+
+                            <TextView
+                                android:id="@+id/vndetail_tv_othervn2"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="点击查询......"
+                                android:textSize="8sp" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="同批次其他疫苗流向"
+                                android:textSize="8sp" />
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="4dp"
+                            android:orientation="horizontal">
+
+                            <TextView
+                                android:id="@+id/vndetail_tv_othervn3"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="点击查询......"
+                                android:textSize="8sp" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="同企业其他疫苗"
+                                android:textSize="8sp" />
+                        </LinearLayout>
+                    </LinearLayout>
+                    <!--疫苗详情提示-->
+                    <RelativeLayout
+                        android:layout_width="0dp"
+                        android:layout_height="55dp"
+                        android:layout_weight="12"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:id="@+id/vndetail_tv_tips"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerVertical="true"
+                            android:layout_marginRight="3dp"
+                            android:layout_toLeftOf="@+id/vndetail_iv_tipsimg"
+                            android:text="@string/vndeatil_tips"
+                            android:textColor="@color/gray"
+                            android:textSize="8sp" />
+
+                        <ImageView
+                            android:id="@+id/vndetail_iv_tipsimg"
+                            android:layout_width="50dp"
+                            android:layout_height="50dp"
+                            android:layout_alignParentRight="true"
+                            android:src="@mipmap/qrcode" />
+                    </RelativeLayout>
+                </LinearLayout>
+                <!--免责声明-->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="4dp"
+                    android:orientation="horizontal">
+
+                    <RelativeLayout
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_marginRight="-2dp"
+                        android:layout_weight="1"
+                        android:background="@drawable/border_report"
+                        android:orientation="vertical"
+                        android:padding="10dp">
+
+                        <ImageView
+                            android:layout_width="20dp"
+                            android:layout_height="wrap_content"
+                            android:layout_centerInParent="true"
+                            android:src="@mipmap/dun" />
+                    </RelativeLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="6"
+                        android:background="@drawable/border_report"
+                        android:orientation="vertical"
+                        android:padding="5dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="免责声明:"
+                            android:textColor="#97885c"
+                            android:textSize="8sp"
+                            android:textStyle="bold" />
+
+                        <ScrollView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content">
+
+                            <TextView
+                                android:id="@+id/vndetail_tv_disclaimer"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="@string/vndeatil_disclaimer"
+                                android:textColor="#97885c"
+                                android:textSize="7sp" />
+                        </ScrollView>
+
+                    </LinearLayout>
+                </LinearLayout>
+
+
+            </LinearLayout>
+
+        </com.zy.bvvm.widget.ZoomView>
+
+    </RelativeLayout>
+
+    <!--下载确认-->
+    <RelativeLayout
+        android:id="@+id/btn_ll"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:background="@color/white"
+        android:paddingTop="5dp"
+        android:paddingBottom="5dp"
+        android:visibility="visible">
+
+        <Button
+            android:id="@+id/btn_download_bitmap"
+            android:layout_width="55dp"
+            android:layout_height="35dp"
+            android:layout_alignParentLeft="true"
+            android:layout_marginLeft="5dp"
+            android:background="@drawable/small_btn"
+            android:text="@string/report_download"
+            android:textColor="@color/white"
+            android:textSize="15.3sp" />
+
+        <Button
+            android:id="@+id/next_btn_report"
+            android:layout_width="140dp"
+            android:layout_height="35dp"
+            android:layout_marginLeft="130dp"
+            android:background="@drawable/small_btn"
+            android:paddingLeft="20dp"
+            android:paddingRight="20dp"
+            android:text="@string/report_confirm"
+            android:textColor="@color/white"
+            android:textSize="15.3sp" />
+    </RelativeLayout>
+
+    <ImageButton
+        android:id="@+id/vndetail_bt_magnifier"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentBottom="true"
+        android:layout_marginRight="10dp"
+        android:layout_marginBottom="5dp"
+        android:background="@color/transparent"
+        android:src="@mipmap/magnifier" />
+
+</RelativeLayout>

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

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.zhy.android.percent.support.PercentLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:visibility="gone">
 
     <LinearLayout
         android:layout_width="match_parent"

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

@@ -0,0 +1,507 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal">
+    <!--左边-->
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="6"
+        android:orientation="vertical">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dp"
+            android:text="产品详情"
+            android:textSize="8dp"
+            android:textStyle="bold" />
+
+        <!--药品商品名称-->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="药品商品名称........."
+                android:textSize="8sp" />
+
+            <TextView
+                android:id="@+id/vndetail_tv_vnname"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:textSize="8dp" />
+        </LinearLayout>
+        <!--药品通用名称-->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="药品通用名称........."
+                android:textSize="8sp" />
+
+            <TextView
+                android:id="@+id/vndetail_tv_vnsc"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:textSize="8dp" />
+        </LinearLayout>
+        <!--企业名称-->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="生产企业名称........."
+                android:textSize="8sp" />
+
+            <TextView
+                android:id="@+id/vndetail_tv_factoryName"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:textSize="8dp" />
+        </LinearLayout>
+        <!--有效期-->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="有效期....................."
+                android:textSize="8sp" />
+
+            <TextView
+                android:id="@+id/vndetail_tv_vnvalid"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:textSize="8dp" />
+        </LinearLayout>
+        <!--GMP编号-->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2dp"
+            android:orientation="horizontal"
+            android:visibility="gone">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="GMP 编号........"
+                android:textSize="8sp" />
+
+            <TextView
+                android:id="@+id/vndetail_tv_gmpName"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="8sp" />
+        </LinearLayout>
+        <!--签发证书-->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2dp"
+            android:orientation="horizontal"
+            android:visibility="gone">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="批签发证书....."
+                android:textSize="8sp" />
+
+            <TextView
+                android:id="@+id/vndetail_tv_gmpPath"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:autoLink="all"
+                android:text="点击查看"
+                android:textColor="@color/blue"
+                android:textSize="8sp" />
+        </LinearLayout>
+
+
+    </LinearLayout>
+    <!--右边-->
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="5"
+        android:layout_marginLeft="5dp"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/renyuan_type"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dp"
+            android:text="用户信息"
+            android:textSize="8sp"
+            android:textStyle="bold"
+            android:visibility="invisible" />
+
+        <LinearLayout
+            android:id="@+id/shouzhongrenyuan"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:visibility="visible">
+            <!--接种部位-->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
+                android:orientation="horizontal"
+                android:visibility="gone">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="接种部位....................."
+                    android:textSize="8sp" />
+
+                <TextView
+                    android:id="@+id/vndetail_tv_vaccinationSite"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:ellipsize="end"
+                    android:maxLines="1"
+                    android:textSize="8dp" />
+            </LinearLayout>
+            <!--规格-->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="规格............................."
+                    android:textSize="8sp" />
+
+                <TextView
+                    android:id="@+id/vndetail_tv_specifications"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:ellipsize="end"
+                    android:maxLines="1"
+                    android:textSize="8dp" />
+            </LinearLayout>
+
+            <!--药品本位码-->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="药品本位码................."
+                    android:textSize="8sp" />
+
+                <TextView
+                    android:id="@+id/vndetail_tv_standardCode"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:ellipsize="end"
+                    android:maxLines="1"
+                    android:textSize="8dp" />
+            </LinearLayout>
+            <!--药品批准文号-->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="药品批准文号............."
+                    android:textSize="8sp" />
+
+                <TextView
+                    android:id="@+id/vndetail_tv_approvalNumber"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:ellipsize="end"
+                    android:maxLines="1"
+                    android:textSize="8dp" />
+            </LinearLayout>
+            <!--国家药品标识码-->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="国家药品标识码........."
+                    android:textSize="8sp" />
+
+                <TextView
+                    android:id="@+id/vndetail_tv_identificationCode"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:ellipsize="end"
+                    android:maxLines="1"
+                    android:text=""
+                    android:textSize="8dp" />
+            </LinearLayout>
+
+
+            <!--生产日期-->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
+                android:orientation="horizontal"
+                android:visibility="gone">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="生产日期........."
+                    android:textSize="8sp" />
+
+                <TextView
+                    android:id="@+id/vndetail_tv_vncreatdate"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textSize="8dp" />
+            </LinearLayout>
+            <!--联系方式-->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dp"
+                android:orientation="horizontal"
+                android:visibility="gone">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="联系方式......."
+                    android:textSize="8sp" />
+
+                <TextView
+                    android:id="@+id/vndetail_tv_szname"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textSize="8sp"
+                    android:visibility="invisible" />
+            </LinearLayout>
+            <!--性别-->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
+                android:orientation="horizontal"
+                android:visibility="gone">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="性别..................."
+                    android:textSize="8sp" />
+
+                <TextView
+                    android:id="@+id/vndetail_tv_szsex"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textSize="8sp"
+                    android:visibility="invisible" />
+            </LinearLayout>
+            <!--出生日期-->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
+                android:orientation="horizontal"
+                android:visibility="gone">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="出生日期..........."
+                    android:textSize="8sp" />
+
+                <TextView
+                    android:id="@+id/vndetail_tv_szbirthday"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textSize="8sp"
+                    android:visibility="invisible" />
+            </LinearLayout>
+            <!--二维码编号-->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
+                android:orientation="horizontal"
+                android:visibility="gone">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="二维码编号......."
+                    android:textSize="8sp" />
+
+                <TextView
+                    android:id="@+id/vndetail_tv_szid"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textSize="8sp"
+                    android:visibility="invisible" />
+            </LinearLayout>
+            <!--受种着监护人-->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
+                android:orientation="horizontal"
+                android:visibility="gone">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="受种者监护人..."
+                    android:textSize="8sp" />
+
+                <TextView
+                    android:id="@+id/vndetail_tv_szguardian"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textSize="8sp"
+                    android:visibility="invisible" />
+            </LinearLayout>
+            <!--联系方式-->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dp"
+                android:orientation="horizontal"
+                android:visibility="gone">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="联系方式............"
+                    android:textSize="8sp" />
+
+                <TextView
+                    android:id="@+id/vndetail_tv_szTelephone"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textSize="8sp"
+                    android:visibility="invisible" />
+            </LinearLayout>
+
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/jiezhognrenyuan"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:visibility="gone">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dp"
+                android:orientation="horizontal"
+                android:visibility="gone">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="接种单位........"
+                    android:textSize="8sp" />
+
+                <TextView
+                    android:id="@+id/vndetail_tv_hospitalName"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textSize="8sp"
+                    android:visibility="invisible" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dp"
+                android:orientation="horizontal"
+                android:visibility="gone">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="医生姓名........"
+                    android:textSize="8sp" />
+
+                <TextView
+                    android:id="@+id/vndetail_tv_doctorName"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textSize="8sp"
+                    android:visibility="invisible" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dp"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="联系方式........"
+                    android:textSize="8sp" />
+
+                <TextView
+                    android:id="@+id/vndetail_tv_doctorTelephone"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textSize="8sp"
+                    android:visibility="invisible" />
+            </LinearLayout>
+        </LinearLayout>
+
+
+    </LinearLayout>
+</LinearLayout>

base/build/generated/source/buildConfig/androidTest/debug/com/hjq/base/test/BuildConfig.java

@@ -1,13 +0,0 @@
-/**
- * Automatically generated file. DO NOT MODIFY
- */
-package com.hjq.base.test;
-
-public final class BuildConfig {
-  public static final boolean DEBUG = Boolean.parseBoolean("true");
-  public static final String APPLICATION_ID = "com.hjq.base.test";
-  public static final String BUILD_TYPE = "debug";
-  public static final String FLAVOR = "";
-  public static final int VERSION_CODE = -1;
-  public static final String VERSION_NAME = "";
-}

base/build/generated/source/buildConfig/debug/com/hjq/base/BuildConfig.java

@@ -1,18 +0,0 @@
-/**
- * Automatically generated file. DO NOT MODIFY
- */
-package com.hjq.base;
-
-public final class BuildConfig {
-  public static final boolean DEBUG = Boolean.parseBoolean("true");
-  public static final String LIBRARY_PACKAGE_NAME = "com.hjq.base";
-  /**
-   * @deprecated APPLICATION_ID is misleading in libraries. For the library package name use LIBRARY_PACKAGE_NAME
-   */
-  @Deprecated
-  public static final String APPLICATION_ID = "com.hjq.base";
-  public static final String BUILD_TYPE = "debug";
-  public static final String FLAVOR = "";
-  public static final int VERSION_CODE = -1;
-  public static final String VERSION_NAME = "";
-}

base/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.hjq.base" >
-
-    <uses-sdk
-        android:minSdkVersion="15"
-        android:targetSdkVersion="28" />
-
-</manifest>

base/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output.json

@@ -1 +0,0 @@
-[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":-1,"enabled":true,"outputFile":"base-debug.aar","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.hjq.base","split":""}}]

base/build/intermediates/annotation_processor_list/debug/annotationProcessors.json

@@ -1 +0,0 @@
-{}

base/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\zhongyicommit\bvvm\base\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\zhongyicommit\bvvm\base\src\debug\jniLibs"/></dataSet></merger>

base/build/intermediates/incremental/mergeDebugShaders/merger.xml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\zhongyicommit\bvvm\base\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\zhongyicommit\bvvm\base\src\debug\shaders"/></dataSet></merger>

base/build/intermediates/incremental/mergeReleaseJniLibFolders/merger.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\zhongyicommit\new\bvvm\base\src\main\jniLibs"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\zhongyicommit\new\bvvm\base\src\release\jniLibs"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\zhongyicommit\bvvm\base\src\main\jniLibs"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\zhongyicommit\bvvm\base\src\release\jniLibs"/></dataSet></merger>

base/build/intermediates/incremental/mergeReleaseShaders/merger.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\zhongyicommit\new\bvvm\base\src\main\shaders"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\zhongyicommit\new\bvvm\base\src\release\shaders"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\zhongyicommit\bvvm\base\src\main\shaders"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\zhongyicommit\bvvm\base\src\release\shaders"/></dataSet></merger>

base/build/intermediates/incremental/packageDebugAssets/merger.xml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\zhongyicommit\bvvm\base\src\main\assets"/><source path="D:\zhongyicommit\bvvm\base\build\intermediates\shader_assets\debug\compileDebugShaders\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\zhongyicommit\bvvm\base\src\debug\assets"/></dataSet></merger>

base/build/intermediates/incremental/packageDebugResources/compile-file-map.properties

@@ -1,19 +0,0 @@
-#Wed Nov 18 15:24:21 CST 2020
-D\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\layout_animation_fall_down.xml=D\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\layout_animation_fall_down.xml
-D\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\dialog_top_out.xml=D\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\dialog_top_out.xml
-D\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\dialog_top_in.xml=D\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\dialog_top_in.xml
-D\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\item_animation_from_bottom.xml=D\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\item_animation_from_bottom.xml
-D\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\dialog_ios_in.xml=D\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\dialog_ios_in.xml
-D\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\dialog_bottom_in.xml=D\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\dialog_bottom_in.xml
-D\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\dialog_scale_out.xml=D\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\dialog_scale_out.xml
-D\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\item_animation_from_right.xml=D\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\item_animation_from_right.xml
-D\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\dialog_right_in.xml=D\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\dialog_right_in.xml
-D\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\layout_animation_from_right.xml=D\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\layout_animation_from_right.xml
-D\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\dialog_bottom_out.xml=D\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\dialog_bottom_out.xml
-D\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\dialog_left_in.xml=D\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\dialog_left_in.xml
-D\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\dialog_ios_out.xml=D\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\dialog_ios_out.xml
-D\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\dialog_left_out.xml=D\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\dialog_left_out.xml
-D\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\dialog_right_out.xml=D\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\dialog_right_out.xml
-D\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\item_animation_fall_down.xml=D\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\item_animation_fall_down.xml
-D\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\layout_animation_from_bottom.xml=D\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\layout_animation_from_bottom.xml
-D\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\dialog_scale_in.xml=D\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\dialog_scale_in.xml

base/build/intermediates/incremental/packageDebugResources/merged.dir/values/values.xml

@@ -1,595 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="black">#FF000000</color>
-    <color name="black10">#22000000</color>
-    <color name="black20">#33000000</color>
-    <color name="black30">#44000000</color>
-    <color name="black40">#66000000</color>
-    <color name="black5">#0c000000</color>
-    <color name="black50">#88000000</color>
-    <color name="black60">#99000000</color>
-    <color name="black70">#BB000000</color>
-    <color name="black80">#CC000000</color>
-    <color name="black90">#EE000000</color>
-    <color name="blue">#0000FF</color>
-    <color name="gold">#FFD700</color>
-    <color name="gray">#808080</color>
-    <color name="green">#008000</color>
-    <color name="orange">#FFA500</color>
-    <color name="pink">#FFC0CB</color>
-    <color name="purple">#800080</color>
-    <color name="red">#FF0000</color>
-    <color name="transparent">#00000000</color>
-    <color name="white">#FFFFFFFF</color>
-    <color name="white10">#22FFFFFF</color>
-    <color name="white20">#33FFFFFF</color>
-    <color name="white30">#44FFFFFF</color>
-    <color name="white40">#66FFFFFF</color>
-    <color name="white5">#0cFFFFFF</color>
-    <color name="white50">#88FFFFFF</color>
-    <color name="white60">#99FFFFFF</color>
-    <color name="white70">#BBFFFFFF</color>
-    <color name="white80">#CCFFFFFF</color>
-    <color name="white90">#EEFFFFFF</color>
-    <color name="yellow">#FFFF00</color>
-    <dimen name="font_size_100px">50sp</dimen>
-    <dimen name="font_size_102px">51sp</dimen>
-    <dimen name="font_size_104px">52sp</dimen>
-    <dimen name="font_size_106px">53sp</dimen>
-    <dimen name="font_size_108px">54sp</dimen>
-    <dimen name="font_size_10px">5sp</dimen>
-    <dimen name="font_size_110px">55sp</dimen>
-    <dimen name="font_size_112px">56sp</dimen>
-    <dimen name="font_size_114px">57sp</dimen>
-    <dimen name="font_size_116px">58sp</dimen>
-    <dimen name="font_size_118px">59sp</dimen>
-    <dimen name="font_size_120px">60sp</dimen>
-    <dimen name="font_size_122px">61sp</dimen>
-    <dimen name="font_size_124px">62sp</dimen>
-    <dimen name="font_size_126px">63sp</dimen>
-    <dimen name="font_size_128px">64sp</dimen>
-    <dimen name="font_size_12px">6sp</dimen>
-    <dimen name="font_size_130px">65sp</dimen>
-    <dimen name="font_size_132px">66sp</dimen>
-    <dimen name="font_size_134px">67sp</dimen>
-    <dimen name="font_size_136px">68sp</dimen>
-    <dimen name="font_size_138px">69sp</dimen>
-    <dimen name="font_size_140px">70sp</dimen>
-    <dimen name="font_size_142px">71sp</dimen>
-    <dimen name="font_size_144px">72sp</dimen>
-    <dimen name="font_size_146px">73sp</dimen>
-    <dimen name="font_size_148px">74sp</dimen>
-    <dimen name="font_size_14px">7sp</dimen>
-    <dimen name="font_size_150px">75sp</dimen>
-    <dimen name="font_size_152px">76sp</dimen>
-    <dimen name="font_size_154px">77sp</dimen>
-    <dimen name="font_size_156px">78sp</dimen>
-    <dimen name="font_size_158px">79sp</dimen>
-    <dimen name="font_size_160px">80sp</dimen>
-    <dimen name="font_size_162px">81sp</dimen>
-    <dimen name="font_size_164px">82sp</dimen>
-    <dimen name="font_size_166px">83sp</dimen>
-    <dimen name="font_size_168px">84sp</dimen>
-    <dimen name="font_size_16px">8sp</dimen>
-    <dimen name="font_size_170px">85sp</dimen>
-    <dimen name="font_size_172px">86sp</dimen>
-    <dimen name="font_size_174px">87sp</dimen>
-    <dimen name="font_size_176px">88sp</dimen>
-    <dimen name="font_size_178px">89sp</dimen>
-    <dimen name="font_size_180px">90sp</dimen>
-    <dimen name="font_size_182px">91sp</dimen>
-    <dimen name="font_size_184px">92sp</dimen>
-    <dimen name="font_size_186px">93sp</dimen>
-    <dimen name="font_size_188px">94sp</dimen>
-    <dimen name="font_size_18px">9sp</dimen>
-    <dimen name="font_size_190px">95sp</dimen>
-    <dimen name="font_size_192px">96sp</dimen>
-    <dimen name="font_size_194px">97sp</dimen>
-    <dimen name="font_size_196px">98sp</dimen>
-    <dimen name="font_size_198px">99sp</dimen>
-    <dimen name="font_size_200px">100sp</dimen>
-    <dimen name="font_size_20px">10sp</dimen>
-    <dimen name="font_size_22px">11sp</dimen>
-    <dimen name="font_size_24px">12sp</dimen>
-    <dimen name="font_size_26px">13sp</dimen>
-    <dimen name="font_size_28px">14sp</dimen>
-    <dimen name="font_size_2px">1sp</dimen>
-    <dimen name="font_size_30px">15sp</dimen>
-    <dimen name="font_size_32px">16sp</dimen>
-    <dimen name="font_size_34px">17sp</dimen>
-    <dimen name="font_size_36px">18sp</dimen>
-    <dimen name="font_size_38px">19sp</dimen>
-    <dimen name="font_size_40px">20sp</dimen>
-    <dimen name="font_size_42px">21sp</dimen>
-    <dimen name="font_size_44px">22sp</dimen>
-    <dimen name="font_size_46px">23sp</dimen>
-    <dimen name="font_size_48px">24sp</dimen>
-    <dimen name="font_size_4px">2sp</dimen>
-    <dimen name="font_size_50px">25sp</dimen>
-    <dimen name="font_size_52px">26sp</dimen>
-    <dimen name="font_size_54px">27sp</dimen>
-    <dimen name="font_size_56px">28sp</dimen>
-    <dimen name="font_size_58px">29sp</dimen>
-    <dimen name="font_size_60px">30sp</dimen>
-    <dimen name="font_size_62px">31sp</dimen>
-    <dimen name="font_size_64px">32sp</dimen>
-    <dimen name="font_size_66px">33sp</dimen>
-    <dimen name="font_size_68px">34sp</dimen>
-    <dimen name="font_size_6px">3sp</dimen>
-    <dimen name="font_size_70px">35sp</dimen>
-    <dimen name="font_size_72px">36sp</dimen>
-    <dimen name="font_size_74px">37sp</dimen>
-    <dimen name="font_size_76px">38sp</dimen>
-    <dimen name="font_size_78px">39sp</dimen>
-    <dimen name="font_size_80px">40sp</dimen>
-    <dimen name="font_size_82px">41sp</dimen>
-    <dimen name="font_size_84px">42sp</dimen>
-    <dimen name="font_size_86px">43sp</dimen>
-    <dimen name="font_size_88px">44sp</dimen>
-    <dimen name="font_size_8px">4sp</dimen>
-    <dimen name="font_size_90px">45sp</dimen>
-    <dimen name="font_size_92px">46sp</dimen>
-    <dimen name="font_size_94px">47sp</dimen>
-    <dimen name="font_size_96px">48sp</dimen>
-    <dimen name="font_size_98px">49sp</dimen>
-    <dimen name="space_10">5dp</dimen>
-    <dimen name="space_100">50dp</dimen>
-    <dimen name="space_102">51dp</dimen>
-    <dimen name="space_104">52dp</dimen>
-    <dimen name="space_106">53dp</dimen>
-    <dimen name="space_108">54dp</dimen>
-    <dimen name="space_110">55dp</dimen>
-    <dimen name="space_112">56dp</dimen>
-    <dimen name="space_114">57dp</dimen>
-    <dimen name="space_116">58dp</dimen>
-    <dimen name="space_118">59dp</dimen>
-    <dimen name="space_12">6dp</dimen>
-    <dimen name="space_120">60dp</dimen>
-    <dimen name="space_122">61dp</dimen>
-    <dimen name="space_124">62dp</dimen>
-    <dimen name="space_126">63dp</dimen>
-    <dimen name="space_128">64dp</dimen>
-    <dimen name="space_130">65dp</dimen>
-    <dimen name="space_132">66dp</dimen>
-    <dimen name="space_134">67dp</dimen>
-    <dimen name="space_136">68dp</dimen>
-    <dimen name="space_138">69dp</dimen>
-    <dimen name="space_14">7dp</dimen>
-    <dimen name="space_140">70dp</dimen>
-    <dimen name="space_142">71dp</dimen>
-    <dimen name="space_144">72dp</dimen>
-    <dimen name="space_146">73dp</dimen>
-    <dimen name="space_148">74dp</dimen>
-    <dimen name="space_150">75dp</dimen>
-    <dimen name="space_152">76dp</dimen>
-    <dimen name="space_154">77dp</dimen>
-    <dimen name="space_156">78dp</dimen>
-    <dimen name="space_158">79dp</dimen>
-    <dimen name="space_16">8dp</dimen>
-    <dimen name="space_160">80dp</dimen>
-    <dimen name="space_162">81dp</dimen>
-    <dimen name="space_164">82dp</dimen>
-    <dimen name="space_166">83dp</dimen>
-    <dimen name="space_168">84dp</dimen>
-    <dimen name="space_170">85dp</dimen>
-    <dimen name="space_172">86dp</dimen>
-    <dimen name="space_174">87dp</dimen>
-    <dimen name="space_176">88dp</dimen>
-    <dimen name="space_178">89dp</dimen>
-    <dimen name="space_18">9dp</dimen>
-    <dimen name="space_180">90dp</dimen>
-    <dimen name="space_182">91dp</dimen>
-    <dimen name="space_184">92dp</dimen>
-    <dimen name="space_186">93dp</dimen>
-    <dimen name="space_188">94dp</dimen>
-    <dimen name="space_190">95dp</dimen>
-    <dimen name="space_192">96dp</dimen>
-    <dimen name="space_194">97dp</dimen>
-    <dimen name="space_196">98dp</dimen>
-    <dimen name="space_198">99dp</dimen>
-    <dimen name="space_2">1dp</dimen>
-    <dimen name="space_20">10dp</dimen>
-    <dimen name="space_200">100dp</dimen>
-    <dimen name="space_202">101dp</dimen>
-    <dimen name="space_204">102dp</dimen>
-    <dimen name="space_206">103dp</dimen>
-    <dimen name="space_208">104dp</dimen>
-    <dimen name="space_210">105dp</dimen>
-    <dimen name="space_212">106dp</dimen>
-    <dimen name="space_214">107dp</dimen>
-    <dimen name="space_216">108dp</dimen>
-    <dimen name="space_218">109dp</dimen>
-    <dimen name="space_22">11dp</dimen>
-    <dimen name="space_220">110dp</dimen>
-    <dimen name="space_222">111dp</dimen>
-    <dimen name="space_224">112dp</dimen>
-    <dimen name="space_226">113dp</dimen>
-    <dimen name="space_228">114dp</dimen>
-    <dimen name="space_230">115dp</dimen>
-    <dimen name="space_232">116dp</dimen>
-    <dimen name="space_234">117dp</dimen>
-    <dimen name="space_236">118dp</dimen>
-    <dimen name="space_238">119dp</dimen>
-    <dimen name="space_24">12dp</dimen>
-    <dimen name="space_240">120dp</dimen>
-    <dimen name="space_242">121dp</dimen>
-    <dimen name="space_244">122dp</dimen>
-    <dimen name="space_246">123dp</dimen>
-    <dimen name="space_248">124dp</dimen>
-    <dimen name="space_250">125dp</dimen>
-    <dimen name="space_252">126dp</dimen>
-    <dimen name="space_254">127dp</dimen>
-    <dimen name="space_256">128dp</dimen>
-    <dimen name="space_258">129dp</dimen>
-    <dimen name="space_26">13dp</dimen>
-    <dimen name="space_260">130dp</dimen>
-    <dimen name="space_262">131dp</dimen>
-    <dimen name="space_264">132dp</dimen>
-    <dimen name="space_266">133dp</dimen>
-    <dimen name="space_268">134dp</dimen>
-    <dimen name="space_270">135dp</dimen>
-    <dimen name="space_272">136dp</dimen>
-    <dimen name="space_274">137dp</dimen>
-    <dimen name="space_276">138dp</dimen>
-    <dimen name="space_278">139dp</dimen>
-    <dimen name="space_28">14dp</dimen>
-    <dimen name="space_280">140dp</dimen>
-    <dimen name="space_282">141dp</dimen>
-    <dimen name="space_284">142dp</dimen>
-    <dimen name="space_286">143dp</dimen>
-    <dimen name="space_288">144dp</dimen>
-    <dimen name="space_290">145dp</dimen>
-    <dimen name="space_292">146dp</dimen>
-    <dimen name="space_294">147dp</dimen>
-    <dimen name="space_296">148dp</dimen>
-    <dimen name="space_298">149dp</dimen>
-    <dimen name="space_30">15dp</dimen>
-    <dimen name="space_300">150dp</dimen>
-    <dimen name="space_302">151dp</dimen>
-    <dimen name="space_304">152dp</dimen>
-    <dimen name="space_306">153dp</dimen>
-    <dimen name="space_308">154dp</dimen>
-    <dimen name="space_310">155dp</dimen>
-    <dimen name="space_312">156dp</dimen>
-    <dimen name="space_314">157dp</dimen>
-    <dimen name="space_316">158dp</dimen>
-    <dimen name="space_318">159dp</dimen>
-    <dimen name="space_32">16dp</dimen>
-    <dimen name="space_320">160dp</dimen>
-    <dimen name="space_322">161dp</dimen>
-    <dimen name="space_324">162dp</dimen>
-    <dimen name="space_326">163dp</dimen>
-    <dimen name="space_328">164dp</dimen>
-    <dimen name="space_330">165dp</dimen>
-    <dimen name="space_332">166dp</dimen>
-    <dimen name="space_334">167dp</dimen>
-    <dimen name="space_336">168dp</dimen>
-    <dimen name="space_338">169dp</dimen>
-    <dimen name="space_34">17dp</dimen>
-    <dimen name="space_340">170dp</dimen>
-    <dimen name="space_342">171dp</dimen>
-    <dimen name="space_344">172dp</dimen>
-    <dimen name="space_346">173dp</dimen>
-    <dimen name="space_348">174dp</dimen>
-    <dimen name="space_350">175dp</dimen>
-    <dimen name="space_352">176dp</dimen>
-    <dimen name="space_354">177dp</dimen>
-    <dimen name="space_356">178dp</dimen>
-    <dimen name="space_358">179dp</dimen>
-    <dimen name="space_36">18dp</dimen>
-    <dimen name="space_360">180dp</dimen>
-    <dimen name="space_362">181dp</dimen>
-    <dimen name="space_364">182dp</dimen>
-    <dimen name="space_366">183dp</dimen>
-    <dimen name="space_368">184dp</dimen>
-    <dimen name="space_370">185dp</dimen>
-    <dimen name="space_372">186dp</dimen>
-    <dimen name="space_374">187dp</dimen>
-    <dimen name="space_376">188dp</dimen>
-    <dimen name="space_378">189dp</dimen>
-    <dimen name="space_38">19dp</dimen>
-    <dimen name="space_380">190dp</dimen>
-    <dimen name="space_382">191dp</dimen>
-    <dimen name="space_384">192dp</dimen>
-    <dimen name="space_386">193dp</dimen>
-    <dimen name="space_388">194dp</dimen>
-    <dimen name="space_390">195dp</dimen>
-    <dimen name="space_392">196dp</dimen>
-    <dimen name="space_394">197dp</dimen>
-    <dimen name="space_396">198dp</dimen>
-    <dimen name="space_398">199dp</dimen>
-    <dimen name="space_4">2dp</dimen>
-    <dimen name="space_40">20dp</dimen>
-    <dimen name="space_400">200dp</dimen>
-    <dimen name="space_402">201dp</dimen>
-    <dimen name="space_404">202dp</dimen>
-    <dimen name="space_406">203dp</dimen>
-    <dimen name="space_408">204dp</dimen>
-    <dimen name="space_410">205dp</dimen>
-    <dimen name="space_412">206dp</dimen>
-    <dimen name="space_414">207dp</dimen>
-    <dimen name="space_416">208dp</dimen>
-    <dimen name="space_418">209dp</dimen>
-    <dimen name="space_42">21dp</dimen>
-    <dimen name="space_420">210dp</dimen>
-    <dimen name="space_422">211dp</dimen>
-    <dimen name="space_424">212dp</dimen>
-    <dimen name="space_426">213dp</dimen>
-    <dimen name="space_428">214dp</dimen>
-    <dimen name="space_430">215dp</dimen>
-    <dimen name="space_432">216dp</dimen>
-    <dimen name="space_434">217dp</dimen>
-    <dimen name="space_436">218dp</dimen>
-    <dimen name="space_438">219dp</dimen>
-    <dimen name="space_44">22dp</dimen>
-    <dimen name="space_440">220dp</dimen>
-    <dimen name="space_442">221dp</dimen>
-    <dimen name="space_444">222dp</dimen>
-    <dimen name="space_446">223dp</dimen>
-    <dimen name="space_448">224dp</dimen>
-    <dimen name="space_450">225dp</dimen>
-    <dimen name="space_452">226dp</dimen>
-    <dimen name="space_454">227dp</dimen>
-    <dimen name="space_456">228dp</dimen>
-    <dimen name="space_458">229dp</dimen>
-    <dimen name="space_46">23dp</dimen>
-    <dimen name="space_460">230dp</dimen>
-    <dimen name="space_462">231dp</dimen>
-    <dimen name="space_464">232dp</dimen>
-    <dimen name="space_466">233dp</dimen>
-    <dimen name="space_468">234dp</dimen>
-    <dimen name="space_470">235dp</dimen>
-    <dimen name="space_472">236dp</dimen>
-    <dimen name="space_474">237dp</dimen>
-    <dimen name="space_476">238dp</dimen>
-    <dimen name="space_478">239dp</dimen>
-    <dimen name="space_48">24dp</dimen>
-    <dimen name="space_480">240dp</dimen>
-    <dimen name="space_482">241dp</dimen>
-    <dimen name="space_484">242dp</dimen>
-    <dimen name="space_486">243dp</dimen>
-    <dimen name="space_488">244dp</dimen>
-    <dimen name="space_490">245dp</dimen>
-    <dimen name="space_492">246dp</dimen>
-    <dimen name="space_494">247dp</dimen>
-    <dimen name="space_496">248dp</dimen>
-    <dimen name="space_498">249dp</dimen>
-    <dimen name="space_50">25dp</dimen>
-    <dimen name="space_500">250dp</dimen>
-    <dimen name="space_502">251dp</dimen>
-    <dimen name="space_504">252dp</dimen>
-    <dimen name="space_506">253dp</dimen>
-    <dimen name="space_508">254dp</dimen>
-    <dimen name="space_510">255dp</dimen>
-    <dimen name="space_512">256dp</dimen>
-    <dimen name="space_514">257dp</dimen>
-    <dimen name="space_516">258dp</dimen>
-    <dimen name="space_518">259dp</dimen>
-    <dimen name="space_52">26dp</dimen>
-    <dimen name="space_520">260dp</dimen>
-    <dimen name="space_522">261dp</dimen>
-    <dimen name="space_524">262dp</dimen>
-    <dimen name="space_526">263dp</dimen>
-    <dimen name="space_528">264dp</dimen>
-    <dimen name="space_530">265dp</dimen>
-    <dimen name="space_532">266dp</dimen>
-    <dimen name="space_534">267dp</dimen>
-    <dimen name="space_536">268dp</dimen>
-    <dimen name="space_538">269dp</dimen>
-    <dimen name="space_54">27dp</dimen>
-    <dimen name="space_540">270dp</dimen>
-    <dimen name="space_542">271dp</dimen>
-    <dimen name="space_544">272dp</dimen>
-    <dimen name="space_546">273dp</dimen>
-    <dimen name="space_548">274dp</dimen>
-    <dimen name="space_550">275dp</dimen>
-    <dimen name="space_552">276dp</dimen>
-    <dimen name="space_554">277dp</dimen>
-    <dimen name="space_556">278dp</dimen>
-    <dimen name="space_558">279dp</dimen>
-    <dimen name="space_56">28dp</dimen>
-    <dimen name="space_560">280dp</dimen>
-    <dimen name="space_562">281dp</dimen>
-    <dimen name="space_564">282dp</dimen>
-    <dimen name="space_566">283dp</dimen>
-    <dimen name="space_568">284dp</dimen>
-    <dimen name="space_570">285dp</dimen>
-    <dimen name="space_572">286dp</dimen>
-    <dimen name="space_574">287dp</dimen>
-    <dimen name="space_576">288dp</dimen>
-    <dimen name="space_578">289dp</dimen>
-    <dimen name="space_58">29dp</dimen>
-    <dimen name="space_580">290dp</dimen>
-    <dimen name="space_582">291dp</dimen>
-    <dimen name="space_584">292dp</dimen>
-    <dimen name="space_586">293dp</dimen>
-    <dimen name="space_588">294dp</dimen>
-    <dimen name="space_590">295dp</dimen>
-    <dimen name="space_592">296dp</dimen>
-    <dimen name="space_594">297dp</dimen>
-    <dimen name="space_596">298dp</dimen>
-    <dimen name="space_598">299dp</dimen>
-    <dimen name="space_6">3dp</dimen>
-    <dimen name="space_60">30dp</dimen>
-    <dimen name="space_600">300dp</dimen>
-    <dimen name="space_602">301dp</dimen>
-    <dimen name="space_604">302dp</dimen>
-    <dimen name="space_606">303dp</dimen>
-    <dimen name="space_608">304dp</dimen>
-    <dimen name="space_610">305dp</dimen>
-    <dimen name="space_612">306dp</dimen>
-    <dimen name="space_614">307dp</dimen>
-    <dimen name="space_616">308dp</dimen>
-    <dimen name="space_618">309dp</dimen>
-    <dimen name="space_62">31dp</dimen>
-    <dimen name="space_620">310dp</dimen>
-    <dimen name="space_622">311dp</dimen>
-    <dimen name="space_624">312dp</dimen>
-    <dimen name="space_626">313dp</dimen>
-    <dimen name="space_628">314dp</dimen>
-    <dimen name="space_630">315dp</dimen>
-    <dimen name="space_632">316dp</dimen>
-    <dimen name="space_634">317dp</dimen>
-    <dimen name="space_636">318dp</dimen>
-    <dimen name="space_638">319dp</dimen>
-    <dimen name="space_64">32dp</dimen>
-    <dimen name="space_640">320dp</dimen>
-    <dimen name="space_642">321dp</dimen>
-    <dimen name="space_644">322dp</dimen>
-    <dimen name="space_646">323dp</dimen>
-    <dimen name="space_648">324dp</dimen>
-    <dimen name="space_650">325dp</dimen>
-    <dimen name="space_652">326dp</dimen>
-    <dimen name="space_654">327dp</dimen>
-    <dimen name="space_656">328dp</dimen>
-    <dimen name="space_658">329dp</dimen>
-    <dimen name="space_66">33dp</dimen>
-    <dimen name="space_660">330dp</dimen>
-    <dimen name="space_662">331dp</dimen>
-    <dimen name="space_664">332dp</dimen>
-    <dimen name="space_666">333dp</dimen>
-    <dimen name="space_668">334dp</dimen>
-    <dimen name="space_670">335dp</dimen>
-    <dimen name="space_672">336dp</dimen>
-    <dimen name="space_674">337dp</dimen>
-    <dimen name="space_676">338dp</dimen>
-    <dimen name="space_678">339dp</dimen>
-    <dimen name="space_68">34dp</dimen>
-    <dimen name="space_680">340dp</dimen>
-    <dimen name="space_682">341dp</dimen>
-    <dimen name="space_684">342dp</dimen>
-    <dimen name="space_686">343dp</dimen>
-    <dimen name="space_688">344dp</dimen>
-    <dimen name="space_690">345dp</dimen>
-    <dimen name="space_692">346dp</dimen>
-    <dimen name="space_694">347dp</dimen>
-    <dimen name="space_696">348dp</dimen>
-    <dimen name="space_698">349dp</dimen>
-    <dimen name="space_70">35dp</dimen>
-    <dimen name="space_700">350dp</dimen>
-    <dimen name="space_702">351dp</dimen>
-    <dimen name="space_704">352dp</dimen>
-    <dimen name="space_706">353dp</dimen>
-    <dimen name="space_708">354dp</dimen>
-    <dimen name="space_710">355dp</dimen>
-    <dimen name="space_712">356dp</dimen>
-    <dimen name="space_714">357dp</dimen>
-    <dimen name="space_716">358dp</dimen>
-    <dimen name="space_718">359dp</dimen>
-    <dimen name="space_72">36dp</dimen>
-    <dimen name="space_720">360dp</dimen>
-    <dimen name="space_722">361dp</dimen>
-    <dimen name="space_724">362dp</dimen>
-    <dimen name="space_726">363dp</dimen>
-    <dimen name="space_728">364dp</dimen>
-    <dimen name="space_730">365dp</dimen>
-    <dimen name="space_732">366dp</dimen>
-    <dimen name="space_734">367dp</dimen>
-    <dimen name="space_736">368dp</dimen>
-    <dimen name="space_738">369dp</dimen>
-    <dimen name="space_74">37dp</dimen>
-    <dimen name="space_740">370dp</dimen>
-    <dimen name="space_742">371dp</dimen>
-    <dimen name="space_744">372dp</dimen>
-    <dimen name="space_746">373dp</dimen>
-    <dimen name="space_748">374dp</dimen>
-    <dimen name="space_750">375dp</dimen>
-    <dimen name="space_752">376dp</dimen>
-    <dimen name="space_754">377dp</dimen>
-    <dimen name="space_756">378dp</dimen>
-    <dimen name="space_758">379dp</dimen>
-    <dimen name="space_76">38dp</dimen>
-    <dimen name="space_760">380dp</dimen>
-    <dimen name="space_762">381dp</dimen>
-    <dimen name="space_764">382dp</dimen>
-    <dimen name="space_766">383dp</dimen>
-    <dimen name="space_768">384dp</dimen>
-    <dimen name="space_770">385dp</dimen>
-    <dimen name="space_772">386dp</dimen>
-    <dimen name="space_774">387dp</dimen>
-    <dimen name="space_776">388dp</dimen>
-    <dimen name="space_778">389dp</dimen>
-    <dimen name="space_78">39dp</dimen>
-    <dimen name="space_780">390dp</dimen>
-    <dimen name="space_782">391dp</dimen>
-    <dimen name="space_784">392dp</dimen>
-    <dimen name="space_786">393dp</dimen>
-    <dimen name="space_788">394dp</dimen>
-    <dimen name="space_790">395dp</dimen>
-    <dimen name="space_792">396dp</dimen>
-    <dimen name="space_794">397dp</dimen>
-    <dimen name="space_796">398dp</dimen>
-    <dimen name="space_798">399dp</dimen>
-    <dimen name="space_8">4dp</dimen>
-    <dimen name="space_80">40dp</dimen>
-    <dimen name="space_800">400dp</dimen>
-    <dimen name="space_82">41dp</dimen>
-    <dimen name="space_84">42dp</dimen>
-    <dimen name="space_86">43dp</dimen>
-    <dimen name="space_88">44dp</dimen>
-    <dimen name="space_90">45dp</dimen>
-    <dimen name="space_92">46dp</dimen>
-    <dimen name="space_94">47dp</dimen>
-    <dimen name="space_96">48dp</dimen>
-    <dimen name="space_98">49dp</dimen>
-    <item name="dialog_id_click_listener" type="id"/>
-    <item name="dialog_id_this" type="id"/>
-    <integer name="anim_duration_long">400</integer>
-    <integer name="anim_duration_medium">300</integer>
-    <style name="BaseDialogStyle" parent="Theme.AppCompat.DayNight.Dialog.Alert"><!-- @android:style/Theme.Dialog -->
-        <!-- 无边框 -->
-        <item name="android:windowFrame">@null</item>
-        <!-- 浮在 Activity 之上 -->
-        <item name="android:windowIsFloating">true</item>
-        <!-- 半透明 -->
-        <item name="android:windowIsTranslucent">true</item>
-        <!-- 背景透明 -->
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <!-- 遮盖层 -->
-        <item name="android:backgroundDimEnabled">true</item>
-        <!-- 无标题 -->
-        <item name="android:windowNoTitle">true</item>
-        <!-- 动画效果 -->
-        <item name="android:windowEnterAnimation">@anim/dialog_scale_in</item>
-        <item name="android:windowExitAnimation">@anim/dialog_scale_out</item>
-        <!-- Base.Theme.AppCompat.Light.Dialog.Alert 特有的属性，用于指定默认宽度，这里需要禁用 -->
-        <item name="android:windowMinWidthMajor">0dp</item>
-        <item name="android:windowMinWidthMinor">0dp</item>
-        <!-- 解决 ActionBar 占位导致 Dialog 无法全屏显示的问题 -->
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-        <!-- ActionMode覆盖Actionbar，不顶下来 -->
-        <item name="windowActionModeOverlay">true</item>
-        <item name="android:windowContentOverlay">@null</item>
-        <!-- Dialog 全屏显示 -->
-        <!--<item name="android:windowFullscreen">true</item>-->
-    </style>
-    <style name="BottomAnimStyle" parent="android:Animation">
-        <item name="android:windowEnterAnimation">@anim/dialog_bottom_in</item>
-        <item name="android:windowExitAnimation">@anim/dialog_bottom_out</item>
-    </style>
-    <style name="IOSAnimStyle" parent="android:Animation">
-        <item name="android:windowEnterAnimation">@anim/dialog_ios_in</item>
-        <item name="android:windowExitAnimation">@anim/dialog_ios_out</item>
-    </style>
-    <style name="LeftAnimStyle" parent="android:Animation">
-        <item name="android:windowEnterAnimation">@anim/dialog_left_in</item>
-        <item name="android:windowExitAnimation">@anim/dialog_left_out</item>
-    </style>
-    <style name="RightAnimStyle" parent="android:Animation">
-        <item name="android:windowEnterAnimation">@anim/dialog_right_in</item>
-        <item name="android:windowExitAnimation">@anim/dialog_right_out</item>
-    </style>
-    <style name="ScaleAnimStyle" parent="android:Animation">
-        <item name="android:windowEnterAnimation">@anim/dialog_scale_in</item>
-        <item name="android:windowExitAnimation">@anim/dialog_scale_out</item>
-    </style>
-    <style name="TopAnimStyle" parent="android:Animation">
-        <item name="android:windowEnterAnimation">@anim/dialog_top_in</item>
-        <item name="android:windowExitAnimation">@anim/dialog_top_out</item>
-    </style>
-    <style name="TransparentDialogStyle" parent="BaseDialogStyle">
-        <!-- 遮盖层 -->
-        <item name="android:backgroundDimEnabled">false</item>
-    </style>
-</resources>

base/build/intermediates/incremental/packageReleaseAssets/merger.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\zhongyicommit\new\bvvm\base\src\main\assets"/><source path="D:\zhongyicommit\new\bvvm\base\build\intermediates\shader_assets\release\compileReleaseShaders\out"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\zhongyicommit\new\bvvm\base\src\release\assets"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\zhongyicommit\bvvm\base\src\main\assets"/><source path="F:\zhongyicommit\bvvm\base\build\intermediates\shader_assets\release\compileReleaseShaders\out"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\zhongyicommit\bvvm\base\src\release\assets"/></dataSet></merger>

base/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties

@@ -1,19 +1,19 @@
-#Fri Nov 13 16:48:18 CST 2020
-D\:\\zhongyicommit\\new\\bvvm\\base\\src\\main\\res\\anim\\dialog_right_out.xml=D\:\\zhongyicommit\\new\\bvvm\\base\\build\\intermediates\\packaged_res\\release\\anim\\dialog_right_out.xml
-D\:\\zhongyicommit\\new\\bvvm\\base\\src\\main\\res\\anim\\dialog_bottom_out.xml=D\:\\zhongyicommit\\new\\bvvm\\base\\build\\intermediates\\packaged_res\\release\\anim\\dialog_bottom_out.xml
-D\:\\zhongyicommit\\new\\bvvm\\base\\src\\main\\res\\anim\\dialog_scale_in.xml=D\:\\zhongyicommit\\new\\bvvm\\base\\build\\intermediates\\packaged_res\\release\\anim\\dialog_scale_in.xml
-D\:\\zhongyicommit\\new\\bvvm\\base\\src\\main\\res\\anim\\dialog_left_in.xml=D\:\\zhongyicommit\\new\\bvvm\\base\\build\\intermediates\\packaged_res\\release\\anim\\dialog_left_in.xml
-D\:\\zhongyicommit\\new\\bvvm\\base\\src\\main\\res\\anim\\item_animation_fall_down.xml=D\:\\zhongyicommit\\new\\bvvm\\base\\build\\intermediates\\packaged_res\\release\\anim\\item_animation_fall_down.xml
-D\:\\zhongyicommit\\new\\bvvm\\base\\src\\main\\res\\anim\\dialog_bottom_in.xml=D\:\\zhongyicommit\\new\\bvvm\\base\\build\\intermediates\\packaged_res\\release\\anim\\dialog_bottom_in.xml
-D\:\\zhongyicommit\\new\\bvvm\\base\\src\\main\\res\\anim\\layout_animation_from_bottom.xml=D\:\\zhongyicommit\\new\\bvvm\\base\\build\\intermediates\\packaged_res\\release\\anim\\layout_animation_from_bottom.xml
-D\:\\zhongyicommit\\new\\bvvm\\base\\src\\main\\res\\anim\\layout_animation_fall_down.xml=D\:\\zhongyicommit\\new\\bvvm\\base\\build\\intermediates\\packaged_res\\release\\anim\\layout_animation_fall_down.xml
-D\:\\zhongyicommit\\new\\bvvm\\base\\src\\main\\res\\anim\\item_animation_from_bottom.xml=D\:\\zhongyicommit\\new\\bvvm\\base\\build\\intermediates\\packaged_res\\release\\anim\\item_animation_from_bottom.xml
-D\:\\zhongyicommit\\new\\bvvm\\base\\src\\main\\res\\anim\\dialog_scale_out.xml=D\:\\zhongyicommit\\new\\bvvm\\base\\build\\intermediates\\packaged_res\\release\\anim\\dialog_scale_out.xml
-D\:\\zhongyicommit\\new\\bvvm\\base\\src\\main\\res\\anim\\dialog_left_out.xml=D\:\\zhongyicommit\\new\\bvvm\\base\\build\\intermediates\\packaged_res\\release\\anim\\dialog_left_out.xml
-D\:\\zhongyicommit\\new\\bvvm\\base\\src\\main\\res\\anim\\dialog_right_in.xml=D\:\\zhongyicommit\\new\\bvvm\\base\\build\\intermediates\\packaged_res\\release\\anim\\dialog_right_in.xml
-D\:\\zhongyicommit\\new\\bvvm\\base\\src\\main\\res\\anim\\item_animation_from_right.xml=D\:\\zhongyicommit\\new\\bvvm\\base\\build\\intermediates\\packaged_res\\release\\anim\\item_animation_from_right.xml
-D\:\\zhongyicommit\\new\\bvvm\\base\\src\\main\\res\\anim\\layout_animation_from_right.xml=D\:\\zhongyicommit\\new\\bvvm\\base\\build\\intermediates\\packaged_res\\release\\anim\\layout_animation_from_right.xml
-D\:\\zhongyicommit\\new\\bvvm\\base\\src\\main\\res\\anim\\dialog_ios_out.xml=D\:\\zhongyicommit\\new\\bvvm\\base\\build\\intermediates\\packaged_res\\release\\anim\\dialog_ios_out.xml
-D\:\\zhongyicommit\\new\\bvvm\\base\\src\\main\\res\\anim\\dialog_top_out.xml=D\:\\zhongyicommit\\new\\bvvm\\base\\build\\intermediates\\packaged_res\\release\\anim\\dialog_top_out.xml
-D\:\\zhongyicommit\\new\\bvvm\\base\\src\\main\\res\\anim\\dialog_top_in.xml=D\:\\zhongyicommit\\new\\bvvm\\base\\build\\intermediates\\packaged_res\\release\\anim\\dialog_top_in.xml
-D\:\\zhongyicommit\\new\\bvvm\\base\\src\\main\\res\\anim\\dialog_ios_in.xml=D\:\\zhongyicommit\\new\\bvvm\\base\\build\\intermediates\\packaged_res\\release\\anim\\dialog_ios_in.xml
+#Mon Mar 29 13:17:07 CST 2021
+F\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\layout_animation_from_bottom.xml=F\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\release\\anim\\layout_animation_from_bottom.xml
+F\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\dialog_right_in.xml=F\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\release\\anim\\dialog_right_in.xml
+F\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\dialog_right_out.xml=F\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\release\\anim\\dialog_right_out.xml
+F\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\layout_animation_fall_down.xml=F\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\release\\anim\\layout_animation_fall_down.xml
+F\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\item_animation_from_bottom.xml=F\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\release\\anim\\item_animation_from_bottom.xml
+F\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\item_animation_fall_down.xml=F\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\release\\anim\\item_animation_fall_down.xml
+F\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\dialog_left_in.xml=F\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\release\\anim\\dialog_left_in.xml
+F\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\dialog_ios_in.xml=F\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\release\\anim\\dialog_ios_in.xml
+F\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\dialog_left_out.xml=F\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\release\\anim\\dialog_left_out.xml
+F\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\dialog_ios_out.xml=F\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\release\\anim\\dialog_ios_out.xml
+F\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\dialog_bottom_in.xml=F\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\release\\anim\\dialog_bottom_in.xml
+F\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\layout_animation_from_right.xml=F\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\release\\anim\\layout_animation_from_right.xml
+F\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\dialog_top_out.xml=F\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\release\\anim\\dialog_top_out.xml
+F\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\dialog_bottom_out.xml=F\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\release\\anim\\dialog_bottom_out.xml
+F\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\dialog_scale_out.xml=F\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\release\\anim\\dialog_scale_out.xml
+F\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\dialog_scale_in.xml=F\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\release\\anim\\dialog_scale_in.xml
+F\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\item_animation_from_right.xml=F\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\release\\anim\\item_animation_from_right.xml
+F\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\dialog_top_in.xml=F\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\release\\anim\\dialog_top_in.xml

base/build/intermediates/library_manifest/debug/AndroidManifest.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.hjq.base" >
-
-    <uses-sdk
-        android:minSdkVersion="15"
-        android:targetSdkVersion="28" />
-
-</manifest>

base/build/intermediates/local_only_symbol_list/debug/parseDebugLibraryResources/R-def.txt

@@ -1,564 +0,0 @@
-R_DEF: Internal format may change without notice
-local
-anim dialog_bottom_in
-anim dialog_bottom_out
-anim dialog_ios_in
-anim dialog_ios_out
-anim dialog_left_in
-anim dialog_left_out
-anim dialog_right_in
-anim dialog_right_out
-anim dialog_scale_in
-anim dialog_scale_out
-anim dialog_top_in
-anim dialog_top_out
-anim item_animation_fall_down
-anim item_animation_from_bottom
-anim item_animation_from_right
-anim layout_animation_fall_down
-anim layout_animation_from_bottom
-anim layout_animation_from_right
-color black
-color black10
-color black20
-color black30
-color black40
-color black5
-color black50
-color black60
-color black70
-color black80
-color black90
-color blue
-color gold
-color gray
-color green
-color orange
-color pink
-color purple
-color red
-color transparent
-color white
-color white10
-color white20
-color white30
-color white40
-color white5
-color white50
-color white60
-color white70
-color white80
-color white90
-color yellow
-dimen font_size_100px
-dimen font_size_102px
-dimen font_size_104px
-dimen font_size_106px
-dimen font_size_108px
-dimen font_size_10px
-dimen font_size_110px
-dimen font_size_112px
-dimen font_size_114px
-dimen font_size_116px
-dimen font_size_118px
-dimen font_size_120px
-dimen font_size_122px
-dimen font_size_124px
-dimen font_size_126px
-dimen font_size_128px
-dimen font_size_12px
-dimen font_size_130px
-dimen font_size_132px
-dimen font_size_134px
-dimen font_size_136px
-dimen font_size_138px
-dimen font_size_140px
-dimen font_size_142px
-dimen font_size_144px
-dimen font_size_146px
-dimen font_size_148px
-dimen font_size_14px
-dimen font_size_150px
-dimen font_size_152px
-dimen font_size_154px
-dimen font_size_156px
-dimen font_size_158px
-dimen font_size_160px
-dimen font_size_162px
-dimen font_size_164px
-dimen font_size_166px
-dimen font_size_168px
-dimen font_size_16px
-dimen font_size_170px
-dimen font_size_172px
-dimen font_size_174px
-dimen font_size_176px
-dimen font_size_178px
-dimen font_size_180px
-dimen font_size_182px
-dimen font_size_184px
-dimen font_size_186px
-dimen font_size_188px
-dimen font_size_18px
-dimen font_size_190px
-dimen font_size_192px
-dimen font_size_194px
-dimen font_size_196px
-dimen font_size_198px
-dimen font_size_200px
-dimen font_size_20px
-dimen font_size_22px
-dimen font_size_24px
-dimen font_size_26px
-dimen font_size_28px
-dimen font_size_2px
-dimen font_size_30px
-dimen font_size_32px
-dimen font_size_34px
-dimen font_size_36px
-dimen font_size_38px
-dimen font_size_40px
-dimen font_size_42px
-dimen font_size_44px
-dimen font_size_46px
-dimen font_size_48px
-dimen font_size_4px
-dimen font_size_50px
-dimen font_size_52px
-dimen font_size_54px
-dimen font_size_56px
-dimen font_size_58px
-dimen font_size_60px
-dimen font_size_62px
-dimen font_size_64px
-dimen font_size_66px
-dimen font_size_68px
-dimen font_size_6px
-dimen font_size_70px
-dimen font_size_72px
-dimen font_size_74px
-dimen font_size_76px
-dimen font_size_78px
-dimen font_size_80px
-dimen font_size_82px
-dimen font_size_84px
-dimen font_size_86px
-dimen font_size_88px
-dimen font_size_8px
-dimen font_size_90px
-dimen font_size_92px
-dimen font_size_94px
-dimen font_size_96px
-dimen font_size_98px
-dimen space_10
-dimen space_100
-dimen space_102
-dimen space_104
-dimen space_106
-dimen space_108
-dimen space_110
-dimen space_112
-dimen space_114
-dimen space_116
-dimen space_118
-dimen space_12
-dimen space_120
-dimen space_122
-dimen space_124
-dimen space_126
-dimen space_128
-dimen space_130
-dimen space_132
-dimen space_134
-dimen space_136
-dimen space_138
-dimen space_14
-dimen space_140
-dimen space_142
-dimen space_144
-dimen space_146
-dimen space_148
-dimen space_150
-dimen space_152
-dimen space_154
-dimen space_156
-dimen space_158
-dimen space_16
-dimen space_160
-dimen space_162
-dimen space_164
-dimen space_166
-dimen space_168
-dimen space_170
-dimen space_172
-dimen space_174
-dimen space_176
-dimen space_178
-dimen space_18
-dimen space_180
-dimen space_182
-dimen space_184
-dimen space_186
-dimen space_188
-dimen space_190
-dimen space_192
-dimen space_194
-dimen space_196
-dimen space_198
-dimen space_2
-dimen space_20
-dimen space_200
-dimen space_202
-dimen space_204
-dimen space_206
-dimen space_208
-dimen space_210
-dimen space_212
-dimen space_214
-dimen space_216
-dimen space_218
-dimen space_22
-dimen space_220
-dimen space_222
-dimen space_224
-dimen space_226
-dimen space_228
-dimen space_230
-dimen space_232
-dimen space_234
-dimen space_236
-dimen space_238
-dimen space_24
-dimen space_240
-dimen space_242
-dimen space_244
-dimen space_246
-dimen space_248
-dimen space_250
-dimen space_252
-dimen space_254
-dimen space_256
-dimen space_258
-dimen space_26
-dimen space_260
-dimen space_262
-dimen space_264
-dimen space_266
-dimen space_268
-dimen space_270
-dimen space_272
-dimen space_274
-dimen space_276
-dimen space_278
-dimen space_28
-dimen space_280
-dimen space_282
-dimen space_284
-dimen space_286
-dimen space_288
-dimen space_290
-dimen space_292
-dimen space_294
-dimen space_296
-dimen space_298
-dimen space_30
-dimen space_300
-dimen space_302
-dimen space_304
-dimen space_306
-dimen space_308
-dimen space_310
-dimen space_312
-dimen space_314
-dimen space_316
-dimen space_318
-dimen space_32
-dimen space_320
-dimen space_322
-dimen space_324
-dimen space_326
-dimen space_328
-dimen space_330
-dimen space_332
-dimen space_334
-dimen space_336
-dimen space_338
-dimen space_34
-dimen space_340
-dimen space_342
-dimen space_344
-dimen space_346
-dimen space_348
-dimen space_350
-dimen space_352
-dimen space_354
-dimen space_356
-dimen space_358
-dimen space_36
-dimen space_360
-dimen space_362
-dimen space_364
-dimen space_366
-dimen space_368
-dimen space_370
-dimen space_372
-dimen space_374
-dimen space_376
-dimen space_378
-dimen space_38
-dimen space_380
-dimen space_382
-dimen space_384
-dimen space_386
-dimen space_388
-dimen space_390
-dimen space_392
-dimen space_394
-dimen space_396
-dimen space_398
-dimen space_4
-dimen space_40
-dimen space_400
-dimen space_402
-dimen space_404
-dimen space_406
-dimen space_408
-dimen space_410
-dimen space_412
-dimen space_414
-dimen space_416
-dimen space_418
-dimen space_42
-dimen space_420
-dimen space_422
-dimen space_424
-dimen space_426
-dimen space_428
-dimen space_430
-dimen space_432
-dimen space_434
-dimen space_436
-dimen space_438
-dimen space_44
-dimen space_440
-dimen space_442
-dimen space_444
-dimen space_446
-dimen space_448
-dimen space_450
-dimen space_452
-dimen space_454
-dimen space_456
-dimen space_458
-dimen space_46
-dimen space_460
-dimen space_462
-dimen space_464
-dimen space_466
-dimen space_468
-dimen space_470
-dimen space_472
-dimen space_474
-dimen space_476
-dimen space_478
-dimen space_48
-dimen space_480
-dimen space_482
-dimen space_484
-dimen space_486
-dimen space_488
-dimen space_490
-dimen space_492
-dimen space_494
-dimen space_496
-dimen space_498
-dimen space_50
-dimen space_500
-dimen space_502
-dimen space_504
-dimen space_506
-dimen space_508
-dimen space_510
-dimen space_512
-dimen space_514
-dimen space_516
-dimen space_518
-dimen space_52
-dimen space_520
-dimen space_522
-dimen space_524
-dimen space_526
-dimen space_528
-dimen space_530
-dimen space_532
-dimen space_534
-dimen space_536
-dimen space_538
-dimen space_54
-dimen space_540
-dimen space_542
-dimen space_544
-dimen space_546
-dimen space_548
-dimen space_550
-dimen space_552
-dimen space_554
-dimen space_556
-dimen space_558
-dimen space_56
-dimen space_560
-dimen space_562
-dimen space_564
-dimen space_566
-dimen space_568
-dimen space_570
-dimen space_572
-dimen space_574
-dimen space_576
-dimen space_578
-dimen space_58
-dimen space_580
-dimen space_582
-dimen space_584
-dimen space_586
-dimen space_588
-dimen space_590
-dimen space_592
-dimen space_594
-dimen space_596
-dimen space_598
-dimen space_6
-dimen space_60
-dimen space_600
-dimen space_602
-dimen space_604
-dimen space_606
-dimen space_608
-dimen space_610
-dimen space_612
-dimen space_614
-dimen space_616
-dimen space_618
-dimen space_62
-dimen space_620
-dimen space_622
-dimen space_624
-dimen space_626
-dimen space_628
-dimen space_630
-dimen space_632
-dimen space_634
-dimen space_636
-dimen space_638
-dimen space_64
-dimen space_640
-dimen space_642
-dimen space_644
-dimen space_646
-dimen space_648
-dimen space_650
-dimen space_652
-dimen space_654
-dimen space_656
-dimen space_658
-dimen space_66
-dimen space_660
-dimen space_662
-dimen space_664
-dimen space_666
-dimen space_668
-dimen space_670
-dimen space_672
-dimen space_674
-dimen space_676
-dimen space_678
-dimen space_68
-dimen space_680
-dimen space_682
-dimen space_684
-dimen space_686
-dimen space_688
-dimen space_690
-dimen space_692
-dimen space_694
-dimen space_696
-dimen space_698
-dimen space_70
-dimen space_700
-dimen space_702
-dimen space_704
-dimen space_706
-dimen space_708
-dimen space_710
-dimen space_712
-dimen space_714
-dimen space_716
-dimen space_718
-dimen space_72
-dimen space_720
-dimen space_722
-dimen space_724
-dimen space_726
-dimen space_728
-dimen space_730
-dimen space_732
-dimen space_734
-dimen space_736
-dimen space_738
-dimen space_74
-dimen space_740
-dimen space_742
-dimen space_744
-dimen space_746
-dimen space_748
-dimen space_750
-dimen space_752
-dimen space_754
-dimen space_756
-dimen space_758
-dimen space_76
-dimen space_760
-dimen space_762
-dimen space_764
-dimen space_766
-dimen space_768
-dimen space_770
-dimen space_772
-dimen space_774
-dimen space_776
-dimen space_778
-dimen space_78
-dimen space_780
-dimen space_782
-dimen space_784
-dimen space_786
-dimen space_788
-dimen space_790
-dimen space_792
-dimen space_794
-dimen space_796
-dimen space_798
-dimen space_8
-dimen space_80
-dimen space_800
-dimen space_82
-dimen space_84
-dimen space_86
-dimen space_88
-dimen space_90
-dimen space_92
-dimen space_94
-dimen space_96
-dimen space_98
-id dialog_id_click_listener
-id dialog_id_this
-integer anim_duration_long
-integer anim_duration_medium
-style BaseDialogStyle
-style BottomAnimStyle
-style IOSAnimStyle
-style LeftAnimStyle
-style RightAnimStyle
-style ScaleAnimStyle
-style TopAnimStyle
-style TransparentDialogStyle

base/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt

@@ -1,11 +0,0 @@
-1<?xml version="1.0" encoding="utf-8"?>
-2<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-3    package="com.hjq.base" >
-4
-5    <uses-sdk
-6        android:minSdkVersion="15"
-6-->D:\zhongyicommit\bvvm\base\src\main\AndroidManifest.xml
-7        android:targetSdkVersion="28" />
-7-->D:\zhongyicommit\bvvm\base\src\main\AndroidManifest.xml
-8
-9</manifest>

base/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt

@@ -1,36 +0,0 @@
-1<?xml version="1.0" encoding="utf-8"?>
-2<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-3    package="com.hjq.base.test" >
-4
-5    <uses-sdk
-5-->D:\zhongyicommit\bvvm\base\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger7787260107242283803.xml:5:5-74
-6        android:minSdkVersion="15"
-6-->D:\zhongyicommit\bvvm\base\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger7787260107242283803.xml:5:15-41
-7        android:targetSdkVersion="28" />
-7-->D:\zhongyicommit\bvvm\base\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger7787260107242283803.xml:5:42-71
-8
-9    <instrumentation
-9-->D:\zhongyicommit\bvvm\base\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger7787260107242283803.xml:11:5-15:67
-10        android:name="android.test.InstrumentationTestRunner"
-10-->D:\zhongyicommit\bvvm\base\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger7787260107242283803.xml:11:22-75
-11        android:functionalTest="false"
-11-->D:\zhongyicommit\bvvm\base\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger7787260107242283803.xml:14:22-52
-12        android:handleProfiling="false"
-12-->D:\zhongyicommit\bvvm\base\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger7787260107242283803.xml:13:22-53
-13        android:label="Tests for com.hjq.base.test"
-13-->D:\zhongyicommit\bvvm\base\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger7787260107242283803.xml:15:22-65
-14        android:targetPackage="com.hjq.base.test" />
-14-->D:\zhongyicommit\bvvm\base\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger7787260107242283803.xml:12:22-63
-15
-16    <application
-16-->D:\zhongyicommit\bvvm\base\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger7787260107242283803.xml:7:5-9:19
-17        android:appComponentFactory="android.support.v4.app.CoreComponentFactory"
-17-->[com.android.support:support-compat:28.0.0] C:\Users\Administrator\.gradle\caches\transforms-2\files-2.1\e63d8f2ee6b637112952f2d1c00d8add\support-compat-28.0.0\AndroidManifest.xml:22:18-91
-18        android:debuggable="true" >
-18-->D:\zhongyicommit\bvvm\base\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger7787260107242283803.xml:7:18-43
-19        <uses-library android:name="android.test.runner" />
-19-->D:\zhongyicommit\bvvm\base\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger7787260107242283803.xml:8:9-60
-19-->D:\zhongyicommit\bvvm\base\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger7787260107242283803.xml:8:23-57
-20    </application>
-21
-22</manifest>

base/build/intermediates/manifest_merge_blame_file/release/manifest-merger-blame-release-report.txt

@@ -4,8 +4,8 @@
 4
 5    <uses-sdk
 6        android:minSdkVersion="15"
-6-->D:\zhongyicommit\new\bvvm\base\src\main\AndroidManifest.xml
+6-->F:\zhongyicommit\bvvm\base\src\main\AndroidManifest.xml
 7        android:targetSdkVersion="28" />
-7-->D:\zhongyicommit\new\bvvm\base\src\main\AndroidManifest.xml
+7-->F:\zhongyicommit\bvvm\base\src\main\AndroidManifest.xml
 8
 9</manifest>

base/build/intermediates/merged_manifests/debug/output.json

@@ -1 +0,0 @@
-[{"outputType":{"type":"MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":-1,"enabled":true,"outputFile":"base-debug.aar","fullName":"debug","baseName":"debug"},"path":"..\\..\\library_manifest\\debug\\AndroidManifest.xml","properties":{"packageId":"com.hjq.base","split":""}}]

base/build/intermediates/merged_manifests/debugAndroidTest/AndroidManifest.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.hjq.base.test" >
-
-    <uses-sdk
-        android:minSdkVersion="15"
-        android:targetSdkVersion="28" />
-
-    <instrumentation
-        android:name="android.test.InstrumentationTestRunner"
-        android:functionalTest="false"
-        android:handleProfiling="false"
-        android:label="Tests for com.hjq.base.test"
-        android:targetPackage="com.hjq.base.test" />
-
-    <application
-        android:appComponentFactory="android.support.v4.app.CoreComponentFactory"
-        android:debuggable="true" >
-        <uses-library android:name="android.test.runner" />
-    </application>
-
-</manifest>

base/build/intermediates/merged_manifests/debugAndroidTest/output.json

@@ -1 +0,0 @@
-[{"outputType":{"type":"MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":-1,"enabled":true,"outputFile":"base-debug-androidTest.apk","fullName":"debugAndroidTest","baseName":"debug-androidTest"},"path":"AndroidManifest.xml","properties":{}}]

base/build/intermediates/packaged_res/debug/anim/dialog_bottom_in.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate
-        android:duration="400"
-        android:fromYDelta="100%p" />
-</set>

base/build/intermediates/packaged_res/debug/anim/dialog_bottom_out.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate
-        android:duration="400"
-        android:toYDelta="100%p" />
-</set>

base/build/intermediates/packaged_res/debug/anim/dialog_ios_in.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <scale
-        android:duration="300"
-        android:fromXScale="1.1"
-        android:fromYScale="1.1"
-        android:pivotX="50%"
-        android:pivotY="50%"
-        android:toXScale="1.0"
-        android:toYScale="1.0" />
-
-    <alpha
-        android:duration="300"
-        android:fromAlpha="0.0"
-        android:toAlpha="1.0" />
-</set>

base/build/intermediates/packaged_res/debug/anim/dialog_ios_out.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <scale
-        android:duration="300"
-        android:fromXScale="1.0"
-        android:fromYScale="1.0"
-        android:pivotX="50%"
-        android:pivotY="50%"
-        android:toXScale="1.1"
-        android:toYScale="1.1" />
-
-    <alpha
-        android:duration="300"
-        android:fromAlpha="1.0"
-        android:toAlpha="0.0" />
-
-</set>

base/build/intermediates/packaged_res/debug/anim/dialog_left_in.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate
-        android:duration="400"
-        android:fromXDelta="-100%p" />
-</set>

base/build/intermediates/packaged_res/debug/anim/dialog_left_out.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate
-        android:duration="400"
-        android:toXDelta="-100%p" />
-</set>

base/build/intermediates/packaged_res/debug/anim/dialog_right_in.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate
-        android:duration="400"
-        android:fromXDelta="100%p" />
-</set>

base/build/intermediates/packaged_res/debug/anim/dialog_right_out.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate
-        android:duration="400"
-        android:toXDelta="100%p" />
-</set>

base/build/intermediates/packaged_res/debug/anim/dialog_scale_in.xml

@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <scale
-        android:duration="135"
-        android:fromXScale="0.8"
-        android:fromYScale="0.8"
-        android:pivotX="50%"
-        android:pivotY="50%"
-        android:toXScale="1.05"
-        android:toYScale="1.05" />
-    
-    <scale
-        android:duration="105"
-        android:fromXScale="1.05"
-        android:fromYScale="1.05"
-        android:pivotX="50%"
-        android:pivotY="50%"
-        android:startOffset="135"
-        android:toXScale="0.95"
-        android:toYScale="0.95" />
-    
-    <scale
-        android:duration="60"
-        android:fromXScale="0.95"
-        android:fromYScale="0.95"
-        android:pivotX="50%"
-        android:pivotY="50%"
-        android:startOffset="240"
-        android:toXScale="1.0"
-        android:toYScale="1.0" />
-    
-    <alpha
-        android:duration="90"
-        android:fromAlpha="0.0"
-        android:interpolator="@android:anim/accelerate_interpolator"
-        android:toAlpha="1.0" />
-
-</set>

base/build/intermediates/packaged_res/debug/anim/dialog_scale_out.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <scale
-        android:duration="150"
-        android:fromXScale="1.0"
-        android:fromYScale="1.0"
-        android:pivotX="50%"
-        android:pivotY="50%"
-        android:toXScale="0.6"
-        android:toYScale="0.6" />
-
-    <alpha
-        android:duration="150"
-        android:fromAlpha="1.0"
-        android:interpolator="@android:anim/accelerate_interpolator"
-        android:toAlpha="0.0" /> 
-
-</set>

base/build/intermediates/packaged_res/debug/anim/dialog_top_in.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate
-        android:duration="400"
-        android:fromYDelta="-100%p" />
-</set>

base/build/intermediates/packaged_res/debug/anim/dialog_top_out.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate
-        android:duration="400"
-        android:toYDelta="-100%p" />
-</set>

base/build/intermediates/packaged_res/debug/anim/item_animation_fall_down.xml

@@ -1,23 +0,0 @@
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="@integer/anim_duration_medium">
-
-    <translate
-        android:fromYDelta="-20%"
-        android:interpolator="@android:anim/decelerate_interpolator"
-        android:toYDelta="0" />
-
-    <alpha
-        android:fromAlpha="0"
-        android:interpolator="@android:anim/decelerate_interpolator"
-        android:toAlpha="1" />
-
-    <scale
-        android:fromXScale="105%"
-        android:fromYScale="105%"
-        android:interpolator="@android:anim/decelerate_interpolator"
-        android:pivotX="50%"
-        android:pivotY="50%"
-        android:toXScale="100%"
-        android:toYScale="100%" />
-
-</set>