项目接手初始点

.idea/.name

@@ -1 +0,0 @@
-CloudClinic

app/proguardMapping.txt

@@ -1,7 +1,7 @@
 # compiler: R8
 # compiler_version: 2.2.64
 # min_api: 21
-# pg_map_id: b26e0cd
+# pg_map_id: f720176
 # common_typos_disable
 android.support.v4.app.INotificationSideChannel$Default -> android.support.v4.app.INotificationSideChannel$Default:
     1:1:void <init>():14:14 -> <init>
@@ -76929,9 +76929,8 @@ com.cloudclinic.decoct.mvp.decoct.BoilingPresenter -> com.cloudclinic.decoct.mvp
     1:1:com.ruochen.common.base.BaseView access$900(com.cloudclinic.decoct.mvp.decoct.BoilingPresenter):32:32 -> access$900
     1:2:void getPrescription(java.lang.String):41:42 -> getPrescription
     1:2:void save():110:111 -> save
-    3:4:void save():114:115 -> save
-    5:6:void save():118:119 -> save
-    7:16:void save():122:131 -> save
+    3:4:void save():118:119 -> save
+    5:14:void save():122:131 -> save
     1:2:void upload(java.lang.String):84:85 -> upload
     3:3:void upload(java.lang.String):87:87 -> upload
     4:4:void upload(java.lang.String):86:86 -> upload
@@ -76982,9 +76981,8 @@ com.cloudclinic.decoct.mvp.decoct.PackPresenter -> com.cloudclinic.decoct.mvp.de
     1:1:com.ruochen.common.base.BaseView access$900(com.cloudclinic.decoct.mvp.decoct.PackPresenter):31:31 -> access$900
     1:2:void getPrescription(java.lang.String):40:41 -> getPrescription
     1:2:void save():109:110 -> save
-    3:4:void save():113:114 -> save
-    5:6:void save():117:118 -> save
-    7:14:void save():121:128 -> save
+    3:4:void save():117:118 -> save
+    5:12:void save():121:128 -> save
     1:2:void upload(java.lang.String):83:84 -> upload
     3:3:void upload(java.lang.String):86:86 -> upload
     4:4:void upload(java.lang.String):85:85 -> upload
@@ -77033,9 +77031,8 @@ com.cloudclinic.decoct.mvp.decoct.SoakingPresenter -> com.cloudclinic.decoct.mvp
     1:1:com.ruochen.common.base.BaseView access$900(com.cloudclinic.decoct.mvp.decoct.SoakingPresenter):31:31 -> access$900
     1:2:void getPrescription(java.lang.String):41:42 -> getPrescription
     1:2:void save():109:110 -> save
-    3:4:void save():113:114 -> save
-    5:6:void save():117:118 -> save
-    7:14:void save():121:128 -> save
+    3:4:void save():117:118 -> save
+    5:12:void save():121:128 -> save
     1:2:void upload(java.lang.String):83:84 -> upload
     3:3:void upload(java.lang.String):86:86 -> upload
     4:4:void upload(java.lang.String):85:85 -> upload

app/src/main/java/com/cloudclinic/decoct/mvp/MainCovenant.java

@@ -18,15 +18,15 @@ public interface MainCovenant {
     interface MvpStores {
 
         @FormUrlEncoded
-        @POST("/prescription/medicineChestAPI/scanLabel")
+        @POST("/prod-api/yfc-admin/prescription/medicineChestAPI/scanLabel")
         Observable<BaseModel<LableInfo>> getLabel(@Field("preNo") String preNo);
 
         @FormUrlEncoded
-        @POST("/prescription/medicineChestAPI/getawayVerify")
+        @POST("/prod-api/yfc-admin/prescription/medicineChestAPI/getawayVerify")
         Observable<BaseModel<Object>> getMedicine(@Field("preNo") String preNo);
 
         @FormUrlEncoded
-        @POST("/prescription/medicineChestAPI/callForMedicationCollection")
+        @POST("/prod-api/yfc-admin/prescription/medicineChestAPI/callForMedicationCollection")
         Observable<BaseModel> notify(@Field("preNo") String preNo);
     }
 

app/src/main/java/com/cloudclinic/decoct/mvp/decoct/BoilingCovenant.java

@@ -45,17 +45,17 @@ public interface BoilingCovenant {
     }
 
     interface MvpStores {
-        @GET("/web/pda/detailInfo")
+        @GET("/prod-api/yfc-admin/web/pda/detailInfo")
         Call<BaseModel<PrescriptionInfo>> getPrescription(@Query("preNo") String preNo);
 
-        @GET("/web/pda/decoct/{prescriptionId}")
+        @GET("/prod-api/yfc-admin/web/pda/decoct/{prescriptionId}")
         Call<BaseModel<BoilingInfo>> getBoilingInfo(@Path("prescriptionId") int prescriptionId);
 
-        @POST("/common/uploadPad")
+        @POST("/prod-api/yfc-admin/common/uploadPad")
         @Multipart
         Observable<BaseModel<FileModel>> upload(@Part MultipartBody.Part file);
 
-        @PUT("/web/pda/decoct/edit")
+        @PUT("/prod-api/yfc-admin/web/pda/decoct/edit")
         Observable<BaseModel> save(@Body RequestBody requestBody);
 
     }

app/src/main/java/com/cloudclinic/decoct/mvp/decoct/BoilingPresenter.java

@@ -111,10 +111,10 @@ public class BoilingPresenter extends BasePresenter<BoilingCovenant.MvpView, Boi
             mvpView.showToast("请先扫码");
             return;
         }
-        if (ObjectUtils.isEmpty(mvpView.getScanCode())) {
+        /*if (ObjectUtils.isEmpty(mvpView.getScanCode())) {
             mvpView.showToast("请扫描设备");
             return;
-        }
+        }*/
         if (ObjectUtils.isEmpty(mvpView.getImages())) {
             mvpView.showToast("请上传图片");
             return;

app/src/main/java/com/cloudclinic/decoct/mvp/decoct/PackCovenant.java

@@ -44,17 +44,17 @@ public interface PackCovenant {
 
     interface MvpStores {
 
-        @GET("/web/pda/detailInfo")
+        @GET("/prod-api/yfc-admin/web/pda/detailInfo")
         Call<BaseModel<PrescriptionInfo>> getPrescription(@Query("preNo") String preNo);
 
-        @GET("/web/pda/Pack/{prescriptionId}")
+        @GET("/prod-api/yfc-admin/web/pda/Pack/{prescriptionId}")
         Call<BaseModel<PackInfo>> getPackInfo(@Path("prescriptionId") int prescriptionId);
 
-        @POST("/common/uploadPad")
+        @POST("/prod-api/yfc-admin/common/uploadPad")
         @Multipart
         Observable<BaseModel<FileModel>> upload(@Part MultipartBody.Part file);
 
-        @PUT("/web/pda/Pack/edit")
+        @PUT("/prod-api/yfc-admin/web/pda/Pack/edit")
         Observable<BaseModel> save(@Body RequestBody requestBody);
     }
 

app/src/main/java/com/cloudclinic/decoct/mvp/decoct/PackPresenter.java

@@ -110,10 +110,10 @@ public class PackPresenter extends BasePresenter<PackCovenant.MvpView, PackCoven
             mvpView.showToast("请先扫码");
             return;
         }
-        if (ObjectUtils.isEmpty(mvpView.getScanCode())) {
+        /*if (ObjectUtils.isEmpty(mvpView.getScanCode())) {
             mvpView.showToast("请扫描设备");
             return;
-        }
+        }*/
         if (ObjectUtils.isEmpty(mvpView.getImages())) {
             mvpView.showToast("请上传图片");
             return;

app/src/main/java/com/cloudclinic/decoct/mvp/decoct/SoakingCovenant.java

@@ -43,17 +43,17 @@ public interface SoakingCovenant {
     }
 
     interface MvpStores {
-        @GET("/web/pda/detailInfo")
+        @GET("/prod-api/yfc-admin/web/pda/detailInfo")
         Call<BaseModel<PrescriptionInfo>> getPrescription(@Query("preNo") String preNo);
 
-        @GET("/web/pda/steep/{prescriptionId}")
+        @GET("/prod-api/yfc-admin/web/pda/steep/{prescriptionId}")
         Call<BaseModel<SoakingInfo>> getSoakingInfo(@Path("prescriptionId") int prescriptionId);
 
-        @POST("/common/uploadPad")
+        @POST("/prod-api/yfc-admin/common/uploadPad")
         @Multipart
         Observable<BaseModel<FileModel>> upload(@Part MultipartBody.Part file);
 
-        @PUT("/web/pda/steep/edit")
+        @PUT("/prod-api/yfc-admin/web/pda/steep/edit")
         Observable<BaseModel> save(@Body RequestBody requestBody);
     }
 

app/src/main/java/com/cloudclinic/decoct/mvp/decoct/SoakingPresenter.java

@@ -110,10 +110,10 @@ public class SoakingPresenter extends BasePresenter<SoakingCovenant.MvpView, Soa
             mvpView.showToast("请先扫码");
             return;
         }
-        if (ObjectUtils.isEmpty(mvpView.getScanCode())) {
+        /*if (ObjectUtils.isEmpty(mvpView.getScanCode())) {
             mvpView.showToast("请扫描设备");
             return;
-        }
+        }*/
         if (ObjectUtils.isEmpty(mvpView.getImages())) {
             mvpView.showToast("请上传图片");
             return;

app/src/main/java/com/cloudclinic/decoct/mvp/login/LoginCovenant.java

@@ -26,10 +26,10 @@ public interface LoginCovenant {
     interface MvpStores {
 
         //        @POST("/login")
-        @POST("/login/v2")
+        @POST("/prod-api/yfc-admin/login/v2")
         Observable<BaseModel<LoginInfo>> getLogin(@Body RequestBody requestBody);
 
-        @GET("/getInfo")
+        @GET("/prod-api/yfc-admin/getInfo")
         Observable<BaseModel<UserAllInfo>> getUserInfo();
 
     }

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

@@ -485,7 +485,8 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="vertical"
-                    android:visibility="gone">
+                    android:visibility="gone"
+                    tools:visibility="visible">
 
                     <LinearLayout
                         android:layout_width="match_parent"

app/src/main/res/values/strings.xml

@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">共享中药房管理系统</string>
+    <string name="app_name">煎煮间</string>
 
     <string-array name="right_title_name">
         <item>药品名称</item>

config.gradle

@@ -35,15 +35,15 @@ ext {
             LOG_DEBUG = true
             BUGLY_ID = "c27876500b"
             if (serverType == SERVER_TYPE_PREVIEW) {
-                SERVER_HOST = "http://10.250.11.48:2020"
+                SERVER_HOST = "http://8.139.252.178:8001"
             } else {
-                SERVER_HOST = "http://192.168.5.80:2020"
+                SERVER_HOST = "http://8.139.252.178:8001"
             }
             break
         case SERVER_TYPE_PRODUCT:
             LOG_DEBUG = false
             BUGLY_ID = "c27876500b"
-            SERVER_HOST = "http://10.250.11.48:2020"
+            SERVER_HOST = "http://8.139.252.178:8001"
             break
     }
 

settings.gradle

@@ -1,3 +1,3 @@
-rootProject.name = "CloudClinic"
+rootProject.name = "CloudClinicDecoct"
 include ':app'
 include ':common'