修改token判断，和部分接口

app/build.gradle

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

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

@@ -58,7 +58,8 @@ public interface ApiService {
     /**
      *  刷新token
      */
-    @POST(ApiUrl.ARTICLE_LIST + "validator")
+//    @POST(ApiUrl.ARTICLE_LIST + "validator")
+    @GET(ApiUrl.ARTICLE_LIST + "refresh")
     Observable<LoginBean> refreshToken(@QueryMap Map<String, String> map);
 
     //注册
@@ -111,9 +112,9 @@ public interface ApiService {
     Observable<VnDetailBean> saveChip(@FieldMap Map<String, Object> map);
 
     //医生使用
-    @FormUrlEncoded
+//    @FormUrlEncoded
     @POST(ApiUrl.ARTICLE_CHIP + "uploadChip")
-    Observable<VnDetailBean> uploadChip(@FieldMap Map<String, Object> map);
+    Observable<VnDetailBean> uploadChip(@QueryMap Map<String, Object> map);
 
     //获取全部疫苗品类
     @POST(ApiUrl.ARTICLE_VACCINEMANAGEMENT + "listVaccineManagement")

app/src/main/java/com/zy/bvvm/app/MyApplication.java

@@ -57,6 +57,7 @@ public class MyApplication extends Application {
         // 取消BroadcastReceiver注册
         NetStateChangeReceiver.unregisterReceiver(this);
     }
+
     private void setTGBugly() {
         Context context = getApplicationContext();
 // 获取当前包名
@@ -121,7 +122,12 @@ public class MyApplication extends Application {
                            hashMap.put("uuid", "uuid");//设备唯一码
                            hashMap.put("version", "version");//app版本
                            hashMap.put("apiVersion", "apiVersion");//api版本*/
-                        hashMap.put("Authorization", user_token);
+                        if (token.equals("Bearer")) {
+                            hashMap.put("Authorization", "Bearer " + user_token);
+                            token = "";
+                        } else {
+                            hashMap.put("Authorization", user_token);
+                        }
 //                           if(token.equals("")){
 //                               hashMap.put("Authorization", "Bearer" + user_token);
 //                           }else {

app/src/main/java/com/zy/bvvm/ui/home/uploadChip/UploadChipModel.java

@@ -81,7 +81,7 @@ public class UploadChipModel extends MvpModel<UploadChipOnListener> {
         Log.e("FOR_DOCTOR", map.toString());
         //Log.e("forDoctorinoculators",""+inoculators);
         final String setJsonmap = mapToJson(map);
-        MyApplication.token = "token";
+//        MyApplication.token = "token";
         RxHttpUtils.createApi(ApiService.class)
                 .uploadChip(map)
                 .compose(Transformer.<VnDetailBean>switchSchedulers())

app/src/main/java/com/zy/bvvm/ui/launcher/LauncherActivity.java

@@ -60,7 +60,7 @@ public class LauncherActivity extends MvpActivity<LauncherPresenter> implements
         }
         Log.e("verson", name);
         tvAboutVersonCode.setText("版本号 V" + name);
-        getPresenter().getVersonInfo("2", name);
+//        getPresenter().getVersonInfo("2", name);
     }
 
     @Override

app/src/main/java/com/zy/bvvm/ui/launcher/guide/GuideActivity.java

@@ -131,7 +131,9 @@ public class GuideActivity extends MyActivity {
                 SPUtils.put("GUIDE_OPERA", 1);
                 break;
             default:
-                toast("当前版本不支持本角色登录");
+                startActivityFinish(ReadingActivity02.class);
+                SPUtils.put("GUIDE_DOCTOR", 1);
+//                toast("当前版本不支持本角色登录");
                 break;
         }
     }
@@ -156,6 +158,11 @@ public class GuideActivity extends MyActivity {
             bannerGuideBackground.setData(localImageSize, ImageView.ScaleType.CENTER_CROP,
                     R.drawable.operator01,
                     R.drawable.operator02);
+        }else {
+            bannerGuideBackground.setData(localImageSize, ImageView.ScaleType.CENTER_CROP,
+                    R.drawable.doctor01,
+                    R.drawable.doctor02,
+                    R.drawable.doctor03);
         }
 
      /*   bannerGuideForeground.setData(localImageSize, ImageView.ScaleType.CENTER_CROP,

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

@@ -616,7 +616,7 @@ public class LoginActivity extends MvpActivity<LoginPresenter> implements LoginC
 
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
-        exit();
+//        exit();
         return super.onKeyDown(keyCode, event);
     }
 

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

@@ -1,5 +1,6 @@
 package com.zy.bvvm.ui.login.login;
 
+import android.app.Application;
 import android.util.Log;
 
 import com.allen.library.RxHttpUtils;
@@ -9,6 +10,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import com.zy.bvvm.api.ApiService;
+import com.zy.bvvm.app.MyApplication;
 import com.zy.bvvm.common.MyDataObsever;
 import com.zy.bvvm.helper.Encrypt;
 import com.zy.bvvm.helper.MD5;
@@ -144,6 +146,7 @@ public class LoginModel extends MvpModel<LoginOnListener> {
 
     void refreshToken() {
         Map<String, String> map = new HashMap<>();
+        MyApplication.token = "Bearer";
         RxHttpUtils.createApi(ApiService.class)
                 .refreshToken(map)
                 .compose(Transformer.<LoginBean>switchSchedulers())

base/build/.transforms/721f4ee8be67159c9f08e634a979569a.bin

@@ -0,0 +1 @@
+o/full

base/build/intermediates/consumer_proguard_file/debug/proguard.txt

@@ -0,0 +1,108 @@
+# 指定代码的压缩级别
+-optimizationpasses 5
+
+# 包明不混合大小写
+-dontusemixedcaseclassnames
+
+# 不去忽略非公共的库类
+-dontskipnonpubliclibraryclasses
+
+# 优化  不优化输入的类文件
+-dontoptimize
+
+# 预校验
+-dontpreverify
+
+# 混淆时是否记录日志
+-verbose
+
+# 混淆时所采用的算法
+-optimizations !code/simplification/arithmetic,!field/*,!class/merging/*
+
+# 保护注解
+-keepattributes *Annotation*
+
+# 保持哪些类不被混淆
+-keep public class * extends android.app.Fragment
+-keep public class * extends android.app.Activity
+-keep public class * extends android.app.Application
+-keep public class * extends android.app.Service
+-keep public class * extends android.content.BroadcastReceiver
+-keep public class * extends android.content.ContentProvider
+-keep public class * extends android.app.backup.BackupAgentHelper
+-keep public class * extends android.preference.Preference
+-keep public class com.android.vending.licensing.ILicensingService
+
+######## 记录生成的日志数据,gradle build时在本项目根目录输出 ########
+
+# apk 包内所有 class 的内部结构
+-dump class_files.txt
+# 未混淆的类和成员
+-printseeds seeds.txt
+# 列出从 apk 中删除的代码
+-printusage unused.txt
+# 混淆前后的映射
+-printmapping mapping.txt
+
+######## 记录生成的日志数据，gradle build时 在本项目根目录输出 ########
+
+# 保持 native 方法不被混淆
+-keepclasseswithmembernames class * {
+    native <methods>;
+}
+
+# 保持自定义控件类不被混淆
+-keepclassmembers class * extends android.app.Activity {
+   public void *(android.view.View);
+}
+-keep public class * extends android.view.View {
+    public <init>(android.content.Context);
+    public <init>(android.content.Context, android.util.AttributeSet);
+    public <init>(android.content.Context, android.util.AttributeSet, int);
+    public void set*(...);
+}
+
+# 保持 Parcelable 不被混淆
+-keep class * implements android.os.Parcelable {
+  public static final android.os.Parcelable$Creator *;
+}
+
+# 保持 Serializable 不被混淆
+-keepnames class * implements java.io.Serializable
+
+# 保持 Serializable 不被混淆并且enum 类也不被混淆
+-keepclassmembers class * implements java.io.Serializable {
+    static final long serialVersionUID;
+    private static final java.io.ObjectStreamField[] serialPersistentFields;
+    !static !transient <fields>;
+    !private <fields>;
+    !private <methods>;
+    private void writeObject(java.io.ObjectOutputStream);
+    private void readObject(java.io.ObjectInputStream);
+    java.lang.Object writeReplace();
+    java.lang.Object readResolve();
+}
+
+# 保持枚举 enum 类不被混淆 如果混淆报错，建议直接使用上面的 -keepclassmembers class * implements java.io.Serializable即可
+-keepclassmembers enum * {
+  public static **[] values();
+  public static ** valueOf(java.lang.String);
+}
+
+-keepclassmembers class * {
+    public void *ButtonClicked(android.view.View);
+}
+
+# 不混淆资源类
+-keepclassmembers class **.R$* {
+    public static <fields>;
+}
+
+# 避免混淆泛型 如果混淆报错建议关掉
+-keepattributes Signature
+
+# Android 混淆的误区
+# 网上很多现成并且成熟的混淆规则，大家参考一下即可，但是不要盲目照找，我们现在大家理解每个混淆规则是什么意思，自己参照的时候注意一下。
+# 举个例子，我们现在开发 Android 我们肯定会引用 support-v4 、support-v7 ，但是 support 包里面的功能我们不可能全部都使用到。
+# 而网上有很多博客中写了 keep 掉 v7 v4 包，其实我们是没有必要的。要知道 v7 包足足有 15000 个左右的方法呢！进行混淆是很有必要的。
+# -dontwarn android.support.**

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

@@ -1,4 +1,4 @@
-#Tue Apr 06 11:07:14 CST 2021
+#Thu Apr 08 17:00:10 CST 2021
 F\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\layout_animation_from_bottom.xml=F\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\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\\debug\\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\\debug\\anim\\dialog_right_out.xml

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

@@ -1,4 +1,4 @@
-#Mon Mar 29 13:17:07 CST 2021
+#Thu Apr 08 17:57:06 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

dialog/build/.transforms/698475e059a48b7f6953cfe81f62f442.bin

@@ -0,0 +1 @@
+o/full

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

@@ -1,4 +1,4 @@
-#Tue Apr 06 11:07:14 CST 2021
+#Thu Apr 08 17:00:11 CST 2021
 F\:\\zhongyicommit\\bvvm\\dialog\\src\\main\\res\\mipmap-xxhdpi\\ic_dialog_finish.png=F\:\\zhongyicommit\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\mipmap-xxhdpi-v4\\ic_dialog_finish.png
 F\:\\zhongyicommit\\bvvm\\dialog\\src\\main\\res\\drawable\\dialog_pay_password_item_del_selector.xml=F\:\\zhongyicommit\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\drawable\\dialog_pay_password_item_del_selector.xml
 F\:\\zhongyicommit\\bvvm\\dialog\\src\\main\\res\\layout\\item_dialog_pay_password.xml=F\:\\zhongyicommit\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\layout\\item_dialog_pay_password.xml

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

@@ -1,4 +1,4 @@
-#Mon Mar 29 13:17:07 CST 2021
+#Thu Apr 08 17:57:06 CST 2021
 F\:\\zhongyicommit\\bvvm\\dialog\\src\\main\\res\\mipmap-xxhdpi\\ic_dialog_finish.png=F\:\\zhongyicommit\\bvvm\\dialog\\build\\intermediates\\packaged_res\\release\\mipmap-xxhdpi-v4\\ic_dialog_finish.png
 F\:\\zhongyicommit\\bvvm\\dialog\\src\\main\\res\\drawable\\dialog_pay_password_item_del_selector.xml=F\:\\zhongyicommit\\bvvm\\dialog\\build\\intermediates\\packaged_res\\release\\drawable\\dialog_pay_password_item_del_selector.xml
 F\:\\zhongyicommit\\bvvm\\dialog\\src\\main\\res\\layout\\item_dialog_pay_password.xml=F\:\\zhongyicommit\\bvvm\\dialog\\build\\intermediates\\packaged_res\\release\\layout\\item_dialog_pay_password.xml

image/build/.transforms/807aeaba17f03819884bf4ac548b81c6.bin

@@ -0,0 +1 @@
+o/full

image/build/intermediates/consumer_proguard_file/debug/proguard.txt

@@ -0,0 +1,10 @@
+# Glide
+-keep public class * implements com.bumptech.glide.module.GlideModule
+-keep public class * extends com.bumptech.glide.module.AppGlideModule
+-keep public enum com.bumptech.glide.load.ImageHeaderParser$** {
+  **[] $VALUES;
+  public *;
+}
+
+# for DexGuard only
+# -keepresourcexmlelements manifest/application/meta-data@value=GlideModule

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

@@ -1,4 +1,4 @@
-#Tue Apr 06 11:07:14 CST 2021
+#Thu Apr 08 17:00:12 CST 2021
 F\:\\zhongyicommit\\bvvm\\image\\src\\main\\res\\mipmap-xhdpi\\image_loading.png=F\:\\zhongyicommit\\bvvm\\image\\build\\intermediates\\packaged_res\\debug\\mipmap-xhdpi-v4\\image_loading.png
 F\:\\zhongyicommit\\bvvm\\image\\src\\main\\res\\mipmap-xhdpi\\image_load_err.png=F\:\\zhongyicommit\\bvvm\\image\\build\\intermediates\\packaged_res\\debug\\mipmap-xhdpi-v4\\image_load_err.png
 F\:\\zhongyicommit\\bvvm\\image\\src\\main\\res\\mipmap-hdpi\\image_loading.png=F\:\\zhongyicommit\\bvvm\\image\\build\\intermediates\\packaged_res\\debug\\mipmap-hdpi-v4\\image_loading.png

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

@@ -1,4 +1,4 @@
-#Mon Mar 29 13:17:07 CST 2021
+#Thu Apr 08 17:57:06 CST 2021
 F\:\\zhongyicommit\\bvvm\\image\\src\\main\\res\\mipmap-xhdpi\\image_loading.png=F\:\\zhongyicommit\\bvvm\\image\\build\\intermediates\\packaged_res\\release\\mipmap-xhdpi-v4\\image_loading.png
 F\:\\zhongyicommit\\bvvm\\image\\src\\main\\res\\mipmap-xhdpi\\image_load_err.png=F\:\\zhongyicommit\\bvvm\\image\\build\\intermediates\\packaged_res\\release\\mipmap-xhdpi-v4\\image_load_err.png
 F\:\\zhongyicommit\\bvvm\\image\\src\\main\\res\\mipmap-hdpi\\image_loading.png=F\:\\zhongyicommit\\bvvm\\image\\build\\intermediates\\packaged_res\\release\\mipmap-hdpi-v4\\image_loading.png

widget/build/.transforms/a6c21d48e24c54de30c6f957fa5f24d6.bin

@@ -0,0 +1 @@
+o/full

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

@@ -1,4 +1,4 @@
-#Tue Apr 06 11:07:14 CST 2021
+#Thu Apr 08 17:00:11 CST 2021
 F\:\\zhongyicommit\\bvvm\\widget\\src\\main\\res\\drawable-hdpi\\ic_stat_name.png=F\:\\zhongyicommit\\bvvm\\widget\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\ic_stat_name.png
 F\:\\zhongyicommit\\bvvm\\widget\\src\\main\\res\\drawable-xxhdpi\\ic_stat_name.png=F\:\\zhongyicommit\\bvvm\\widget\\build\\intermediates\\packaged_res\\debug\\drawable-xxhdpi-v4\\ic_stat_name.png
 F\:\\zhongyicommit\\bvvm\\widget\\src\\main\\res\\layout\\widget_hint_layout.xml=F\:\\zhongyicommit\\bvvm\\widget\\build\\intermediates\\packaged_res\\debug\\layout\\widget_hint_layout.xml

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

@@ -1,4 +1,4 @@
-#Mon Mar 29 13:17:07 CST 2021
+#Thu Apr 08 17:57:06 CST 2021
 F\:\\zhongyicommit\\bvvm\\widget\\src\\main\\res\\drawable-hdpi\\ic_stat_name.png=F\:\\zhongyicommit\\bvvm\\widget\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\ic_stat_name.png
 F\:\\zhongyicommit\\bvvm\\widget\\src\\main\\res\\drawable-xxhdpi\\ic_stat_name.png=F\:\\zhongyicommit\\bvvm\\widget\\build\\intermediates\\packaged_res\\release\\drawable-xxhdpi-v4\\ic_stat_name.png
 F\:\\zhongyicommit\\bvvm\\widget\\src\\main\\res\\layout\\widget_hint_layout.xml=F\:\\zhongyicommit\\bvvm\\widget\\build\\intermediates\\packaged_res\\release\\layout\\widget_hint_layout.xml