Browse Source

新增通知取药

guohang 1 năm trước cách đây
mục cha
commit
6b4577953e

+ 6 - 0
.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

+ 136 - 115
app/proguardMapping.txt

@@ -1,7 +1,7 @@
 # compiler: R8
 # compiler_version: 2.2.64
 # min_api: 21
-# pg_map_id: ee49438
+# pg_map_id: bc56a07
 # common_typos_disable
 android.support.v4.app.INotificationSideChannel$Default -> android.support.v4.app.INotificationSideChannel$Default:
     1:1:void <init>():14:14 -> <init>
@@ -92634,88 +92634,101 @@ com.jiuchen.cloudclinic.DataBinderMapperImpl$InnerLayoutIdLookup -> com.jiuchen.
 com.jiuchen.cloudclinic.DataBindingTriggerClass -> com.jiuchen.cloudclinic.DataBindingTriggerClass:
     1:1:void <init>():4:4 -> <init>
 com.jiuchen.cloudclinic.MainActivity -> com.jiuchen.cloudclinic.MainActivity:
-    1:2:void <clinit>():282:283 -> <clinit>
-    1:1:void <init>():48:48 -> <init>
-    2:2:void <init>():212:212 -> <init>
-    3:3:void <init>():239:239 -> <init>
-    4:4:void <init>():298:298 -> <init>
-    1:1:com.ruochen.common.base.BaseActivity access$000(com.jiuchen.cloudclinic.MainActivity):48:48 -> access$000
-    1:1:com.ruochen.common.base.BaseActivity access$100(com.jiuchen.cloudclinic.MainActivity):48:48 -> access$100
-    1:1:com.ruochen.common.base.BasePresenter access$1000(com.jiuchen.cloudclinic.MainActivity):48:48 -> access$1000
-    1:1:java.lang.String access$1100():48:48 -> access$1100
-    1:1:java.lang.String access$1200():48:48 -> access$1200
-    1:1:androidx.databinding.ViewDataBinding access$1300(com.jiuchen.cloudclinic.MainActivity):48:48 -> access$1300
-    1:1:androidx.databinding.ViewDataBinding access$1400(com.jiuchen.cloudclinic.MainActivity):48:48 -> access$1400
-    1:1:com.ruochen.common.base.BasePresenter access$1500(com.jiuchen.cloudclinic.MainActivity):48:48 -> access$1500
-    1:1:com.ruochen.common.base.BaseActivity access$200(com.jiuchen.cloudclinic.MainActivity):48:48 -> access$200
-    1:1:androidx.databinding.ViewDataBinding access$300(com.jiuchen.cloudclinic.MainActivity):48:48 -> access$300
-    1:1:com.ruochen.common.base.BaseActivity access$400(com.jiuchen.cloudclinic.MainActivity):48:48 -> access$400
-    1:1:androidx.databinding.ViewDataBinding access$500(com.jiuchen.cloudclinic.MainActivity):48:48 -> access$500
-    1:1:com.ruochen.common.base.BasePresenter access$600(com.jiuchen.cloudclinic.MainActivity):48:48 -> access$600
-    1:1:com.ruochen.common.base.BaseActivity access$700(com.jiuchen.cloudclinic.MainActivity):48:48 -> access$700
-    1:1:androidx.databinding.ViewDataBinding access$800(com.jiuchen.cloudclinic.MainActivity):48:48 -> access$800
-    1:1:androidx.databinding.ViewDataBinding access$900(com.jiuchen.cloudclinic.MainActivity):48:48 -> access$900
-    1:4:void lambda$onGetMedicineSuccess$0():181:184 -> c
+    1:2:void <clinit>():306:307 -> <clinit>
+    1:1:void <init>():49:49 -> <init>
+    2:2:void <init>():236:236 -> <init>
+    3:3:void <init>():263:263 -> <init>
+    4:4:void <init>():322:322 -> <init>
+    1:1:com.ruochen.common.base.BaseActivity access$000(com.jiuchen.cloudclinic.MainActivity):49:49 -> access$000
+    1:1:com.ruochen.common.base.BaseActivity access$100(com.jiuchen.cloudclinic.MainActivity):49:49 -> access$100
+    1:1:com.ruochen.common.base.BasePresenter access$1000(com.jiuchen.cloudclinic.MainActivity):49:49 -> access$1000
+    1:1:androidx.databinding.ViewDataBinding access$1100(com.jiuchen.cloudclinic.MainActivity):49:49 -> access$1100
+    1:1:com.ruochen.common.base.BasePresenter access$1200(com.jiuchen.cloudclinic.MainActivity):49:49 -> access$1200
+    1:1:com.ruochen.common.base.BaseActivity access$1300(com.jiuchen.cloudclinic.MainActivity):49:49 -> access$1300
+    1:1:java.lang.String access$1400():49:49 -> access$1400
+    1:1:java.lang.String access$1500():49:49 -> access$1500
+    1:1:androidx.databinding.ViewDataBinding access$1600(com.jiuchen.cloudclinic.MainActivity):49:49 -> access$1600
+    1:1:androidx.databinding.ViewDataBinding access$1700(com.jiuchen.cloudclinic.MainActivity):49:49 -> access$1700
+    1:1:com.ruochen.common.base.BasePresenter access$1800(com.jiuchen.cloudclinic.MainActivity):49:49 -> access$1800
+    1:1:com.ruochen.common.base.BaseActivity access$200(com.jiuchen.cloudclinic.MainActivity):49:49 -> access$200
+    1:1:androidx.databinding.ViewDataBinding access$300(com.jiuchen.cloudclinic.MainActivity):49:49 -> access$300
+    1:1:com.ruochen.common.base.BaseActivity access$400(com.jiuchen.cloudclinic.MainActivity):49:49 -> access$400
+    1:1:androidx.databinding.ViewDataBinding access$500(com.jiuchen.cloudclinic.MainActivity):49:49 -> access$500
+    1:1:com.ruochen.common.base.BasePresenter access$600(com.jiuchen.cloudclinic.MainActivity):49:49 -> access$600
+    1:1:com.ruochen.common.base.BaseActivity access$700(com.jiuchen.cloudclinic.MainActivity):49:49 -> access$700
+    1:1:androidx.databinding.ViewDataBinding access$800(com.jiuchen.cloudclinic.MainActivity):49:49 -> access$800
+    1:1:androidx.databinding.ViewDataBinding access$900(com.jiuchen.cloudclinic.MainActivity):49:49 -> access$900
+    1:4:void lambda$onGetMedicineSuccess$0():198:201 -> c
     1:4:void lambda$onGetMedicineSuccess$0$MainActivity():0 -> c
-    5:9:void lambda$onGetMedicineSuccess$0():186:190 -> c
-    5:9:void lambda$onGetMedicineSuccess$0$MainActivity():0 -> c
-    1:1:com.ruochen.common.base.BasePresenter createPresenter():48:48 -> createPresenter
-    2:2:com.jiuchen.cloudclinic.mvp.MainPresenter createPresenter():133:133 -> createPresenter
-    1:4:java.lang.String getFieldValue(java.lang.String,java.lang.String):289:292 -> getFieldValue
-    1:2:void initView(android.os.Bundle):89:90 -> initView
-    3:3:void initView(android.os.Bundle):93:93 -> initView
-    4:4:void initView(android.os.Bundle):100:100 -> initView
-    5:5:void initView(android.os.Bundle):114:114 -> initView
-    6:8:void initView(android.os.Bundle):126:128 -> initView
-    1:1:void onActivityResult(int,int,android.content.Intent):201:201 -> onActivityResult
-    2:6:void onActivityResult(int,int,android.content.Intent):203:207 -> onActivityResult
-    1:1:void onGetLabelFailure(com.ruochen.common.base.BaseModel):170:170 -> onGetLabelFailure
-    1:12:void onGetLabelSuccess(com.ruochen.common.base.BaseModel):138:149 -> onGetLabelSuccess
-    13:15:void onGetLabelSuccess(com.ruochen.common.base.BaseModel):151:153 -> onGetLabelSuccess
-    16:25:void onGetLabelSuccess(com.ruochen.common.base.BaseModel):155:164 -> onGetLabelSuccess
-    1:1:void onGetMedicineFailure(com.ruochen.common.base.BaseModel):196:196 -> onGetMedicineFailure
-    1:4:void onGetMedicineSuccess(com.ruochen.common.base.BaseModel):175:178 -> onGetMedicineSuccess
-    5:5:void onGetMedicineSuccess(com.ruochen.common.base.BaseModel):180:180 -> onGetMedicineSuccess
-    1:2:void onPause():223:224 -> onPause
-    1:2:void onResume():217:218 -> onResume
-    1:2:void registerReceiver():228:229 -> registerReceiver
-    1:4:void setTitleBar(android.os.Bundle):61:64 -> setTitleBar
-    5:8:void setTitleBar(android.os.Bundle):80:83 -> setTitleBar
-    1:1:void unRegisterReceiver():234:234 -> unRegisterReceiver
+    5:10:void lambda$onGetMedicineSuccess$0():203:208 -> c
+    5:10:void lambda$onGetMedicineSuccess$0$MainActivity():0 -> c
+    1:1:com.ruochen.common.base.BasePresenter createPresenter():49:49 -> createPresenter
+    2:2:com.jiuchen.cloudclinic.mvp.MainPresenter createPresenter():148:148 -> createPresenter
+    1:4:java.lang.String getFieldValue(java.lang.String,java.lang.String):313:316 -> getFieldValue
+    1:2:void initView(android.os.Bundle):90:91 -> initView
+    3:3:void initView(android.os.Bundle):94:94 -> initView
+    4:4:void initView(android.os.Bundle):101:101 -> initView
+    5:5:void initView(android.os.Bundle):115:115 -> initView
+    6:6:void initView(android.os.Bundle):127:127 -> initView
+    7:9:void initView(android.os.Bundle):141:143 -> initView
+    1:1:void onActivityResult(int,int,android.content.Intent):224:224 -> onActivityResult
+    2:7:void onActivityResult(int,int,android.content.Intent):226:231 -> onActivityResult
+    1:1:void onGetLabelFailure(com.ruochen.common.base.BaseModel):187:187 -> onGetLabelFailure
+    1:13:void onGetLabelSuccess(com.ruochen.common.base.BaseModel):153:165 -> onGetLabelSuccess
+    14:16:void onGetLabelSuccess(com.ruochen.common.base.BaseModel):167:169 -> onGetLabelSuccess
+    17:27:void onGetLabelSuccess(com.ruochen.common.base.BaseModel):171:181 -> onGetLabelSuccess
+    1:1:void onGetMedicineFailure(com.ruochen.common.base.BaseModel):214:214 -> onGetMedicineFailure
+    1:4:void onGetMedicineSuccess(com.ruochen.common.base.BaseModel):192:195 -> onGetMedicineSuccess
+    5:5:void onGetMedicineSuccess(com.ruochen.common.base.BaseModel):197:197 -> onGetMedicineSuccess
+    1:1:void onNotifySuccess():219:219 -> onNotifySuccess
+    1:2:void onPause():247:248 -> onPause
+    1:2:void onResume():241:242 -> onResume
+    1:2:void registerReceiver():252:253 -> registerReceiver
+    1:4:void setTitleBar(android.os.Bundle):62:65 -> setTitleBar
+    5:8:void setTitleBar(android.os.Bundle):81:84 -> setTitleBar
+    1:1:void unRegisterReceiver():258:258 -> unRegisterReceiver
 com.jiuchen.cloudclinic.MainActivity$1 -> com.jiuchen.cloudclinic.MainActivity$1:
-    1:1:void <init>(com.jiuchen.cloudclinic.MainActivity):64:64 -> <init>
-    1:3:void onNoDoubleClick(android.view.View):67:69 -> onNoDoubleClick
-    4:4:void onNoDoubleClick(android.view.View):77:77 -> onNoDoubleClick
+    1:1:void <init>(com.jiuchen.cloudclinic.MainActivity):65:65 -> <init>
+    1:3:void onNoDoubleClick(android.view.View):68:70 -> onNoDoubleClick
+    4:4:void onNoDoubleClick(android.view.View):78:78 -> onNoDoubleClick
 com.jiuchen.cloudclinic.MainActivity$1$1 -> com.jiuchen.cloudclinic.MainActivity$1$1:
 # {"id":"sourceFile","fileName":"MainActivity.java"}
-    1:1:void <init>(com.jiuchen.cloudclinic.MainActivity$1):69:69 -> <init>
-    1:3:void onConfirm():72:74 -> onConfirm
+    1:1:void <init>(com.jiuchen.cloudclinic.MainActivity$1):70:70 -> <init>
+    1:3:void onConfirm():73:75 -> onConfirm
 com.jiuchen.cloudclinic.MainActivity$2 -> com.jiuchen.cloudclinic.MainActivity$2:
-    1:1:void <init>(com.jiuchen.cloudclinic.MainActivity):93:93 -> <init>
-    1:3:void onNoDoubleClick(android.view.View):96:96 -> onNoDoubleClick
+    1:1:void <init>(com.jiuchen.cloudclinic.MainActivity):94:94 -> <init>
+    1:3:void onNoDoubleClick(android.view.View):97:97 -> onNoDoubleClick
 com.jiuchen.cloudclinic.MainActivity$3 -> com.jiuchen.cloudclinic.MainActivity$3:
-    1:1:void <init>(com.jiuchen.cloudclinic.MainActivity):100:100 -> <init>
-    1:3:void onNoDoubleClick(android.view.View):103:105 -> onNoDoubleClick
-    4:4:void onNoDoubleClick(android.view.View):111:111 -> onNoDoubleClick
+    1:1:void <init>(com.jiuchen.cloudclinic.MainActivity):101:101 -> <init>
+    1:3:void onNoDoubleClick(android.view.View):104:106 -> onNoDoubleClick
+    4:4:void onNoDoubleClick(android.view.View):112:112 -> onNoDoubleClick
 com.jiuchen.cloudclinic.MainActivity$3$1 -> com.jiuchen.cloudclinic.MainActivity$3$1:
 # {"id":"sourceFile","fileName":"MainActivity.java"}
-    1:1:void <init>(com.jiuchen.cloudclinic.MainActivity$3):105:105 -> <init>
-    1:1:void onConfirm():108:108 -> onConfirm
+    1:1:void <init>(com.jiuchen.cloudclinic.MainActivity$3):106:106 -> <init>
+    1:1:void onConfirm():109:109 -> onConfirm
 com.jiuchen.cloudclinic.MainActivity$4 -> com.jiuchen.cloudclinic.MainActivity$4:
-    1:1:void <init>(com.jiuchen.cloudclinic.MainActivity):114:114 -> <init>
-    1:3:void onNoDoubleClick(android.view.View):117:119 -> onNoDoubleClick
-    4:4:void onNoDoubleClick(android.view.View):122:122 -> onNoDoubleClick
+    1:1:void <init>(com.jiuchen.cloudclinic.MainActivity):115:115 -> <init>
+    1:3:void onNoDoubleClick(android.view.View):118:120 -> onNoDoubleClick
+    4:4:void onNoDoubleClick(android.view.View):123:123 -> onNoDoubleClick
 com.jiuchen.cloudclinic.MainActivity$5 -> com.jiuchen.cloudclinic.MainActivity$5:
-    1:1:void <init>(com.jiuchen.cloudclinic.MainActivity):239:239 -> <init>
-    1:9:void onReceive(android.content.Context,android.content.Intent):243:251 -> onReceive
-    10:10:void onReceive(android.content.Context,android.content.Intent):254:254 -> onReceive
-    11:11:void onReceive(android.content.Context,android.content.Intent):256:256 -> onReceive
-    12:19:void onReceive(android.content.Context,android.content.Intent):260:267 -> onReceive
-    20:20:void onReceive(android.content.Context,android.content.Intent):269:269 -> onReceive
+    1:1:void <init>(com.jiuchen.cloudclinic.MainActivity):127:127 -> <init>
+    1:3:void onNoDoubleClick(android.view.View):130:132 -> onNoDoubleClick
+    4:4:void onNoDoubleClick(android.view.View):137:137 -> onNoDoubleClick
+com.jiuchen.cloudclinic.MainActivity$5$1 -> com.jiuchen.cloudclinic.MainActivity$5$1:
+# {"id":"sourceFile","fileName":"MainActivity.java"}
+    1:1:void <init>(com.jiuchen.cloudclinic.MainActivity$5):132:132 -> <init>
+    1:1:void onConfirm():135:135 -> onConfirm
 com.jiuchen.cloudclinic.MainActivity$6 -> com.jiuchen.cloudclinic.MainActivity$6:
-    1:1:void <init>(com.jiuchen.cloudclinic.MainActivity):298:298 -> <init>
-    1:2:void handleMessage(android.os.Message):302:303 -> handleMessage
-    3:5:void handleMessage(android.os.Message):305:307 -> handleMessage
+    1:1:void <init>(com.jiuchen.cloudclinic.MainActivity):263:263 -> <init>
+    1:9:void onReceive(android.content.Context,android.content.Intent):267:275 -> onReceive
+    10:10:void onReceive(android.content.Context,android.content.Intent):278:278 -> onReceive
+    11:11:void onReceive(android.content.Context,android.content.Intent):280:280 -> onReceive
+    12:19:void onReceive(android.content.Context,android.content.Intent):284:291 -> onReceive
+    20:20:void onReceive(android.content.Context,android.content.Intent):293:293 -> onReceive
+com.jiuchen.cloudclinic.MainActivity$7 -> com.jiuchen.cloudclinic.MainActivity$7:
+    1:1:void <init>(com.jiuchen.cloudclinic.MainActivity):322:322 -> <init>
+    1:2:void handleMessage(android.os.Message):326:327 -> handleMessage
+    3:5:void handleMessage(android.os.Message):329:331 -> handleMessage
 com.jiuchen.cloudclinic.bean.CommonLoginBean -> com.jiuchen.cloudclinic.bean.CommonLoginBean:
     1:1:void <init>():11:11 -> <init>
     1:1:java.lang.String getCode():27:27 -> getCode
@@ -92756,30 +92769,30 @@ com.jiuchen.cloudclinic.databinding.ActivityLoginBindingImpl -> com.jiuchen.clou
     6:6:void invalidateAll():61:61 -> invalidateAll
     1:2:void setLifecycleOwner(androidx.lifecycle.LifecycleOwner):87:88 -> setLifecycleOwner
 com.jiuchen.cloudclinic.databinding.ActivityMainBinding -> com.jiuchen.cloudclinic.databinding.ActivityMainBinding:
-    1:23:void <init>(java.lang.Object,android.view.View,int,com.aries.ui.view.radius.RadiusEditText,com.aries.ui.view.radius.RadiusLinearLayout,com.aries.ui.view.radius.RadiusLinearLayout,com.aries.ui.view.radius.RadiusTextView,com.aries.ui.view.radius.RadiusTextView,com.aries.ui.view.radius.RadiusTextView,com.aries.ui.view.radius.RadiusTextView,com.aries.ui.view.radius.RadiusTextView,android.widget.TextView,android.widget.TextView,android.widget.TextView,android.widget.TextView,android.widget.TextView,android.widget.TextView,android.widget.TextView,android.widget.TextView,android.widget.TextView,android.widget.TextView,android.widget.TextView,android.widget.TextView,android.widget.TextView,android.widget.TextView):94:116 -> <init>
-    1:1:com.jiuchen.cloudclinic.databinding.ActivityMainBinding bind(android.view.View):159:159 -> bind
-    2:2:com.jiuchen.cloudclinic.databinding.ActivityMainBinding bind(android.view.View,java.lang.Object):171:171 -> bind
-    1:1:com.jiuchen.cloudclinic.databinding.ActivityMainBinding inflate(android.view.LayoutInflater,android.view.ViewGroup,boolean):122:122 -> inflate
-    2:2:com.jiuchen.cloudclinic.databinding.ActivityMainBinding inflate(android.view.LayoutInflater,android.view.ViewGroup,boolean,java.lang.Object):136:136 -> inflate
-    3:3:com.jiuchen.cloudclinic.databinding.ActivityMainBinding inflate(android.view.LayoutInflater):141:141 -> inflate
-    4:4:com.jiuchen.cloudclinic.databinding.ActivityMainBinding inflate(android.view.LayoutInflater,java.lang.Object):155:155 -> inflate
+    1:24:void <init>(java.lang.Object,android.view.View,int,com.aries.ui.view.radius.RadiusEditText,com.aries.ui.view.radius.RadiusLinearLayout,com.aries.ui.view.radius.RadiusLinearLayout,com.aries.ui.view.radius.RadiusTextView,com.aries.ui.view.radius.RadiusTextView,com.aries.ui.view.radius.RadiusTextView,com.aries.ui.view.radius.RadiusTextView,com.aries.ui.view.radius.RadiusTextView,com.aries.ui.view.radius.RadiusTextView,android.widget.TextView,android.widget.TextView,android.widget.TextView,android.widget.TextView,android.widget.TextView,android.widget.TextView,android.widget.TextView,android.widget.TextView,android.widget.TextView,android.widget.TextView,android.widget.TextView,android.widget.TextView,android.widget.TextView,android.widget.TextView):97:120 -> <init>
+    1:1:com.jiuchen.cloudclinic.databinding.ActivityMainBinding bind(android.view.View):163:163 -> bind
+    2:2:com.jiuchen.cloudclinic.databinding.ActivityMainBinding bind(android.view.View,java.lang.Object):175:175 -> bind
+    1:1:com.jiuchen.cloudclinic.databinding.ActivityMainBinding inflate(android.view.LayoutInflater,android.view.ViewGroup,boolean):126:126 -> inflate
+    2:2:com.jiuchen.cloudclinic.databinding.ActivityMainBinding inflate(android.view.LayoutInflater,android.view.ViewGroup,boolean,java.lang.Object):140:140 -> inflate
+    3:3:com.jiuchen.cloudclinic.databinding.ActivityMainBinding inflate(android.view.LayoutInflater):145:145 -> inflate
+    4:4:com.jiuchen.cloudclinic.databinding.ActivityMainBinding inflate(android.view.LayoutInflater,java.lang.Object):159:159 -> inflate
 com.jiuchen.cloudclinic.databinding.ActivityMainBindingImpl -> com.jiuchen.cloudclinic.databinding.ActivityMainBindingImpl:
     1:2:void <clinit>():15:16 -> <clinit>
-    3:25:void <clinit>():20:42 -> <clinit>
-    1:1:void <init>(androidx.databinding.DataBindingComponent,android.view.View):55:55 -> <init>
-    2:2:void <init>(androidx.databinding.DataBindingComponent,android.view.View,java.lang.Object[]):58:58 -> <init>
-    3:3:void <init>(androidx.databinding.DataBindingComponent,android.view.View,java.lang.Object[]):145:145 -> <init>
-    4:8:void <init>(androidx.databinding.DataBindingComponent,android.view.View,java.lang.Object[]):82:86 -> <init>
-    9:9:void <init>(androidx.databinding.DataBindingComponent,android.view.View,java.lang.Object[]):88:88 -> <init>
-    1:1:void executeBindings():135:135 -> executeBindings
-    2:3:void executeBindings():137:138 -> executeBindings
-    4:4:void executeBindings():140:140 -> executeBindings
-    5:5:void executeBindings():138:138 -> executeBindings
-    1:3:boolean hasPendingBindings():102:104 -> hasPendingBindings
-    4:6:boolean hasPendingBindings():106:106 -> hasPendingBindings
-    1:5:void invalidateAll():93:97 -> invalidateAll
-    6:6:void invalidateAll():95:95 -> invalidateAll
-    1:2:void setLifecycleOwner(androidx.lifecycle.LifecycleOwner):121:122 -> setLifecycleOwner
+    3:26:void <clinit>():20:43 -> <clinit>
+    1:1:void <init>(androidx.databinding.DataBindingComponent,android.view.View):56:56 -> <init>
+    2:2:void <init>(androidx.databinding.DataBindingComponent,android.view.View,java.lang.Object[]):59:59 -> <init>
+    3:3:void <init>(androidx.databinding.DataBindingComponent,android.view.View,java.lang.Object[]):147:147 -> <init>
+    4:8:void <init>(androidx.databinding.DataBindingComponent,android.view.View,java.lang.Object[]):84:88 -> <init>
+    9:9:void <init>(androidx.databinding.DataBindingComponent,android.view.View,java.lang.Object[]):90:90 -> <init>
+    1:1:void executeBindings():137:137 -> executeBindings
+    2:3:void executeBindings():139:140 -> executeBindings
+    4:4:void executeBindings():142:142 -> executeBindings
+    5:5:void executeBindings():140:140 -> executeBindings
+    1:3:boolean hasPendingBindings():104:106 -> hasPendingBindings
+    4:6:boolean hasPendingBindings():108:108 -> hasPendingBindings
+    1:5:void invalidateAll():95:99 -> invalidateAll
+    6:6:void invalidateAll():97:97 -> invalidateAll
+    1:2:void setLifecycleOwner(androidx.lifecycle.LifecycleOwner):123:124 -> setLifecycleOwner
 com.jiuchen.cloudclinic.databinding.ActivityPutCupboardBinding -> com.jiuchen.cloudclinic.databinding.ActivityPutCupboardBinding:
     1:18:void <init>(java.lang.Object,android.view.View,int,com.aries.ui.view.radius.RadiusEditText,com.aries.ui.view.radius.RadiusLinearLayout,com.aries.ui.view.radius.RadiusTextView,com.aries.ui.view.radius.RadiusTextView,com.aries.ui.view.radius.RadiusTextView,com.aries.ui.view.radius.RadiusTextView,com.aries.ui.view.radius.RadiusTextView,com.aries.ui.view.radius.RadiusTextView,com.aries.ui.view.title.TitleBarView,android.widget.TextView,android.widget.TextView,android.widget.TextView,android.widget.TextView,android.widget.TextView,android.widget.TextView,android.widget.TextView,android.widget.TextView):78:95 -> <init>
     1:1:com.jiuchen.cloudclinic.databinding.ActivityPutCupboardBinding bind(android.view.View):138:138 -> bind
@@ -93168,29 +93181,37 @@ com.jiuchen.cloudclinic.entity.UserAllInfo$UserDTO$RolesDTO$ParamsDTO -> com.jiu
 # {"id":"sourceFile","fileName":"UserAllInfo.java"}
     1:1:void <init>():530:530 -> <init>
 com.jiuchen.cloudclinic.mvp.MainPresenter -> com.jiuchen.cloudclinic.mvp.MainPresenter:
-    1:2:void <init>(com.jiuchen.cloudclinic.mvp.MainCovenant$MvpView):22:23 -> <init>
-    1:1:com.ruochen.common.base.BaseView access$000(com.jiuchen.cloudclinic.mvp.MainPresenter):19:19 -> access$000
-    1:1:com.ruochen.common.base.BaseView access$100(com.jiuchen.cloudclinic.mvp.MainPresenter):19:19 -> access$100
-    1:1:com.ruochen.common.base.BaseView access$200(com.jiuchen.cloudclinic.mvp.MainPresenter):19:19 -> access$200
-    1:1:com.ruochen.common.base.BaseView access$300(com.jiuchen.cloudclinic.mvp.MainPresenter):19:19 -> access$300
-    1:1:com.ruochen.common.base.BaseView access$400(com.jiuchen.cloudclinic.mvp.MainPresenter):19:19 -> access$400
-    1:1:com.ruochen.common.base.BaseView access$500(com.jiuchen.cloudclinic.mvp.MainPresenter):19:19 -> access$500
-    1:1:com.ruochen.common.base.BaseView access$600(com.jiuchen.cloudclinic.mvp.MainPresenter):19:19 -> access$600
-    1:1:com.ruochen.common.base.BaseView access$700(com.jiuchen.cloudclinic.mvp.MainPresenter):19:19 -> access$700
-    1:2:void getLabel(java.lang.String):29:30 -> getLabel
-    1:2:void getMedicine(java.lang.String):52:53 -> getMedicine
+    1:2:void <init>(com.jiuchen.cloudclinic.mvp.MainCovenant$MvpView):23:24 -> <init>
+    1:1:com.ruochen.common.base.BaseView access$000(com.jiuchen.cloudclinic.mvp.MainPresenter):20:20 -> access$000
+    1:1:com.ruochen.common.base.BaseView access$100(com.jiuchen.cloudclinic.mvp.MainPresenter):20:20 -> access$100
+    1:1:com.ruochen.common.base.BaseView access$200(com.jiuchen.cloudclinic.mvp.MainPresenter):20:20 -> access$200
+    1:1:com.ruochen.common.base.BaseView access$300(com.jiuchen.cloudclinic.mvp.MainPresenter):20:20 -> access$300
+    1:1:com.ruochen.common.base.BaseView access$400(com.jiuchen.cloudclinic.mvp.MainPresenter):20:20 -> access$400
+    1:1:com.ruochen.common.base.BaseView access$500(com.jiuchen.cloudclinic.mvp.MainPresenter):20:20 -> access$500
+    1:1:com.ruochen.common.base.BaseView access$600(com.jiuchen.cloudclinic.mvp.MainPresenter):20:20 -> access$600
+    1:1:com.ruochen.common.base.BaseView access$700(com.jiuchen.cloudclinic.mvp.MainPresenter):20:20 -> access$700
+    1:1:com.ruochen.common.base.BaseView access$800(com.jiuchen.cloudclinic.mvp.MainPresenter):20:20 -> access$800
+    1:1:com.ruochen.common.base.BaseView access$900(com.jiuchen.cloudclinic.mvp.MainPresenter):20:20 -> access$900
+    1:2:void getLabel(java.lang.String):30:31 -> getLabel
+    1:2:void getMedicine(java.lang.String):53:54 -> getMedicine
+    1:1:void notify(java.lang.String):76:76 -> notify
 com.jiuchen.cloudclinic.mvp.MainPresenter$1 -> com.jiuchen.cloudclinic.mvp.MainPresenter$1:
-    1:1:void <init>(com.jiuchen.cloudclinic.mvp.MainPresenter,com.ruochen.common.base.BaseView):31:31 -> <init>
-    1:2:void onFailure(int,java.lang.String):44:45 -> onFailure
-    1:1:void onSuccess(java.lang.Object):31:31 -> onSuccess
-    2:4:void onSuccess(com.ruochen.common.base.BaseModel):34:36 -> onSuccess
-    5:5:void onSuccess(com.ruochen.common.base.BaseModel):38:38 -> onSuccess
+    1:1:void <init>(com.jiuchen.cloudclinic.mvp.MainPresenter,com.ruochen.common.base.BaseView):32:32 -> <init>
+    1:2:void onFailure(int,java.lang.String):45:46 -> onFailure
+    1:1:void onSuccess(java.lang.Object):32:32 -> onSuccess
+    2:4:void onSuccess(com.ruochen.common.base.BaseModel):35:37 -> onSuccess
+    5:5:void onSuccess(com.ruochen.common.base.BaseModel):39:39 -> onSuccess
 com.jiuchen.cloudclinic.mvp.MainPresenter$2 -> com.jiuchen.cloudclinic.mvp.MainPresenter$2:
-    1:1:void <init>(com.jiuchen.cloudclinic.mvp.MainPresenter,com.ruochen.common.base.BaseView):54:54 -> <init>
-    1:2:void onFailure(int,java.lang.String):67:68 -> onFailure
-    1:1:void onSuccess(java.lang.Object):54:54 -> onSuccess
-    2:4:void onSuccess(com.ruochen.common.base.BaseModel):57:59 -> onSuccess
-    5:5:void onSuccess(com.ruochen.common.base.BaseModel):61:61 -> onSuccess
+    1:1:void <init>(com.jiuchen.cloudclinic.mvp.MainPresenter,com.ruochen.common.base.BaseView):55:55 -> <init>
+    1:2:void onFailure(int,java.lang.String):68:69 -> onFailure
+    1:1:void onSuccess(java.lang.Object):55:55 -> onSuccess
+    2:4:void onSuccess(com.ruochen.common.base.BaseModel):58:60 -> onSuccess
+    5:5:void onSuccess(com.ruochen.common.base.BaseModel):62:62 -> onSuccess
+com.jiuchen.cloudclinic.mvp.MainPresenter$3 -> com.jiuchen.cloudclinic.mvp.MainPresenter$3:
+    1:1:void <init>(com.jiuchen.cloudclinic.mvp.MainPresenter,com.ruochen.common.base.BaseView):77:77 -> <init>
+    1:1:void onFailure(int,java.lang.String):85:85 -> onFailure
+    1:1:void onSuccess(java.lang.Object):77:77 -> onSuccess
+    2:2:void onSuccess(com.ruochen.common.base.BaseModel):80:80 -> onSuccess
 com.jiuchen.cloudclinic.mvp.cupboard.PutPresenter -> com.jiuchen.cloudclinic.mvp.cupboard.PutPresenter:
     1:2:void <init>(com.jiuchen.cloudclinic.mvp.cupboard.PutCovenant$MvpView):14:15 -> <init>
     1:1:com.ruochen.common.base.BaseView access$000(com.jiuchen.cloudclinic.mvp.cupboard.PutPresenter):11:11 -> access$000

+ 24 - 0
app/src/main/java/com/jiuchen/cloudclinic/MainActivity.java

@@ -29,6 +29,7 @@ import com.jiuchen.cloudclinic.ui.activity.LoginActivity;
 import com.jiuchen.cloudclinic.ui.activity.PutCupboardActivity;
 import com.lxj.xpopup.XPopup;
 import com.lxj.xpopup.core.BasePopupView;
+import com.lxj.xpopup.interfaces.OnConfirmListener;
 import com.ruochen.common.action.HandlerAction;
 import com.ruochen.common.base.BaseActivity;
 import com.ruochen.common.base.BaseModel;
@@ -123,6 +124,20 @@ public class MainActivity extends BaseMvpActivity<ActivityMainBinding, MainPrese
             }
         });
 
+        viewBinding.rtvNotify.setOnClickListener(new NoDoubleClickListener() {
+            @Override
+            public void onNoDoubleClick(View view) {
+                new XPopup.Builder(mContext)
+                        .isDestroyOnDismiss(true)
+                        .asConfirm("提示", "确定通知取药吗!", new OnConfirmListener() {
+                            @Override
+                            public void onConfirm() {
+                                mvpPresenter.notify(viewBinding.retCode.getText().toString());
+                            }
+                        }).show();
+            }
+        });
+
         Intent cfgIntent = new Intent("ACTION_BAR_SCANCFG");
         cfgIntent.putExtra("EXTRA_SCAN_MODE", 3);
         sendBroadcast(cfgIntent);
@@ -141,6 +156,7 @@ public class MainActivity extends BaseMvpActivity<ActivityMainBinding, MainPrese
             viewBinding.rlPanel2.setVisibility(View.VISIBLE);
             viewBinding.rtvPutCupboard.setVisibility(View.GONE);
             viewBinding.rtvGetMedicine.setVisibility(View.VISIBLE);
+            viewBinding.rtvNotify.setVisibility(View.GONE);
             viewBinding.tvPutInfo.setText("患者:" + data.getPatient() + "," + data.getSex() + "," + data.getAge() + "岁");
             viewBinding.tvPutData.setText("出生日期:" + data.getDateOfBirth());
             viewBinding.tvPutType.setText("类型:" + data.getType());
@@ -156,6 +172,7 @@ public class MainActivity extends BaseMvpActivity<ActivityMainBinding, MainPrese
             viewBinding.rlPanel2.setVisibility(View.GONE);
             viewBinding.rtvPutCupboard.setVisibility(View.VISIBLE);
             viewBinding.rtvGetMedicine.setVisibility(View.VISIBLE);
+            viewBinding.rtvNotify.setVisibility(View.VISIBLE);
             viewBinding.tvInfo.setText("患者:" + data.getPatient() + "," + data.getSex() + "," + data.getAge() + "岁");
             viewBinding.tvData.setText("出生日期:" + data.getDateOfBirth());
             viewBinding.tvType.setText("类型:" + data.getType());
@@ -188,6 +205,7 @@ public class MainActivity extends BaseMvpActivity<ActivityMainBinding, MainPrese
             viewBinding.rlPanel2.setVisibility(View.GONE);
             viewBinding.rtvPutCupboard.setVisibility(View.GONE);
             viewBinding.rtvGetMedicine.setVisibility(View.GONE);
+            viewBinding.rtvNotify.setVisibility(View.GONE);
         }, 2000);
     }
 
@@ -196,6 +214,11 @@ public class MainActivity extends BaseMvpActivity<ActivityMainBinding, MainPrese
         showToast(failureResult.getMsg());
     }
 
+    @Override
+    public void onNotifySuccess() {
+        showToast("通知取药成功");
+    }
+
     @Override
     protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
@@ -205,6 +228,7 @@ public class MainActivity extends BaseMvpActivity<ActivityMainBinding, MainPrese
             viewBinding.rlPanel2.setVisibility(View.GONE);
             viewBinding.rtvPutCupboard.setVisibility(View.GONE);
             viewBinding.rtvGetMedicine.setVisibility(View.GONE);
+            viewBinding.rtvNotify.setVisibility(View.GONE);
         }
     }
 

+ 7 - 0
app/src/main/java/com/jiuchen/cloudclinic/mvp/MainCovenant.java

@@ -20,6 +20,8 @@ public interface MainCovenant {
         void onGetMedicineSuccess(BaseModel<Object> successResult);
         void onGetMedicineFailure(BaseModel<Object> failureResult);
 
+        void onNotifySuccess();
+
     }
 
     interface MvpStores {
@@ -31,11 +33,16 @@ public interface MainCovenant {
         @FormUrlEncoded
         @POST("/prescription/medicineChestAPI/getawayVerify")
         Observable<BaseModel<Object>> getMedicine(@Field("preNo") String preNo);
+
+        @FormUrlEncoded
+        @POST("/prescription/medicineChestAPI/callForMedicationCollection")
+        Observable<BaseModel> notify(@Field("preNo") String preNo);
     }
 
     interface Presenter {
         void getLabel(String preNo);
         void getMedicine(String preNo);
+        void notify(String preNo);
     }
 
 }

+ 17 - 0
app/src/main/java/com/jiuchen/cloudclinic/mvp/MainPresenter.java

@@ -1,5 +1,6 @@
 package com.jiuchen.cloudclinic.mvp;
 
+import com.blankj.utilcode.util.RegexUtils;
 import com.blankj.utilcode.util.StringUtils;
 import com.jiuchen.cloudclinic.Constants;
 import com.jiuchen.cloudclinic.entity.LableInfo;
@@ -69,4 +70,20 @@ public class MainPresenter extends BasePresenter<MainCovenant.MvpView, MainCoven
                     }
                 });
     }
+
+    @Override
+    public void notify(String preNo) {
+        addSubscription(appStores.notify(preNo),
+                new ApiCallback<BaseModel>(mvpView) {
+                    @Override
+                    public void onSuccess(BaseModel model) {
+                        mvpView.onNotifySuccess();
+                    }
+
+                    @Override
+                    public void onFailure(int code, String msg) {
+                        mvpView.showToast(msg);
+                    }
+                });
+    }
 }

+ 17 - 0
app/src/main/res/layout/activity_main.xml

@@ -340,5 +340,22 @@
 
         </LinearLayout>
 
+        <com.aries.ui.view.radius.RadiusTextView
+            android:id="@+id/rtvNotify"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp_20"
+            android:layout_marginHorizontal="@dimen/dp_20"
+            android:gravity="center"
+            android:paddingVertical="@dimen/dp_13"
+            android:text="通知取药"
+            android:textSize="@dimen/sp_14"
+            android:visibility="gone"
+            app:rv_backgroundColor="@color/colorAppNormal"
+            app:rv_backgroundPressedColor="@color/colorAppPress"
+            app:rv_radius="@dimen/dp_2"
+            app:rv_textColor="@color/colorWhite"
+            tools:visibility="visible" />
+
     </LinearLayout>
 </layout>

+ 2 - 2
config.gradle

@@ -63,8 +63,8 @@ ext {
             buildToolsVersion: "30.0.3",
             minSdkVersion    : 21,
             targetSdkVersion : 31,
-            versionCode      : 1,
-            versionName      : "1.0.0",
+            versionCode      : 2,
+            versionName      : "1.0.1",
     ]
     version = [
             androidXSdkVersion     : "1.3.0",