1.多域名修改

app/src/main/AndroidManifest.xml

@@ -1838,7 +1838,15 @@
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name=".ui.activity.MainLoginActivity"
+            android:name=".ui.activity.login.MainLoginActivity"
+            android:configChanges="keyboardHidden|orientation"
+            android:label=" "
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            android:theme="@style/Work.Base"
+            android:windowSoftInputMode="adjustPan" />
+        <activity
+            android:name=".ui.activity.login.BatTypeActivity"
             android:configChanges="keyboardHidden|orientation"
             android:label=" "
             android:launchMode="singleTop"

app/src/main/java/com/wd/workoffice/app/WorkApp.java

@@ -47,16 +47,7 @@ public class WorkApp extends BaseApp {
                 .setSupportDP(false)
                 .setSupportSP(false)
                 .setSupportSubunits(Subunits.MM);
-        RtfHelper.getInstance().init(ApiService.DOMAIN, chain -> {
-            Request original = chain.request();
-            Request request = original.newBuilder()
-                    .header("Authorization", "Bearer " + UserKeeper.getInstance().getToken())
-                    .header("userId", UserKeeper.getInstance().getUserId())
-                    .method(original.method(), original.body())
-                    .build();
-
-            return chain.proceed(request);
-        });
+        initBatNetWork();
         cookies = new HashMap<>();
         RtfMesHelper.getInstance().init(MesApiService.DOMAIN, chain -> {
             //获取请求链接
@@ -109,6 +100,19 @@ public class WorkApp extends BaseApp {
         JPushInterface.init(this);
 
     }
+
+    private  void initBatNetWork() {
+        RtfHelper.getInstance().init(ApiService.DOMAIN, chain -> {
+            Request original = chain.request();
+            Request request = original.newBuilder()
+                    .header("Authorization", "Bearer " + UserKeeper.getInstance().getToken())
+                    .header("userId", UserKeeper.getInstance().getUserId())
+                    .method(original.method(), original.body())
+                    .build();
+
+            return chain.proceed(request);
+        });
+    }
 //    private void daoInit() {
 //        daoSession = DaoMaster.newDevSession(this, "workO.db");
 //    }

app/src/main/java/com/wd/workoffice/bean/workEnum/BatLoginType.java

+package com.wd.workoffice.bean.workEnum;
+
+/**
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ **/
+public enum BatLoginType {
+    GT("锆碳","gt"), GK("钢控","gk");
+
+    private String name;
+    private String code;
+
+        BatLoginType(String name, String code) {
+        this.name = name;
+        this.code = code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+}

app/src/main/java/com/wd/workoffice/retrofit/ApiService.java

 package com.wd.workoffice.retrofit;
 
 
+
 import com.alibaba.fastjson.JSONObject;
 import com.wd.workoffice.app.BaseBean;
-import com.wd.workoffice.app.Config;
 import com.wd.workoffice.bean.ProDetail;
+import com.wd.workoffice.util.WorkUtils;
 import java.util.Map;
 import io.reactivex.Observable;
 import okhttp3.MultipartBody;
@@ -27,13 +28,16 @@ import retrofit2.http.QueryMap;
  * github: https://github.com/FlexibleXd
  **/
 public interface ApiService {
-    String DOMAIN = Config.DEBUG ? "http://zwang.bat100.net.cn:8000/" : "http://zwang.bat100.net.cn:8000/";
+    String DOMAIN = WorkUtils.getDomain();
+
+
+//    String DOMAIN = Config.DEBUG ? "http://zwang.bat100.net.cn:8000/" : "http://zwang.bat100.net.cn:8000/";
+
 
 //    String DOMAIN = Config.DEBUG ? "http://121.36.41.111:9001/" : "http://192.168.1.111:9000/";
 
 //String DOMAIN = Config.DEBUG ? "http://192.168.43.20:9003/" : "http://192.168.43.20:9003/";
 
-
     /**
      * 用户注册
      *
@@ -53,12 +57,10 @@ public interface ApiService {
     Call<BaseBean> login(@Query("grant_type") String type, @Body RequestBody requestBody);
 
     /**
-     *
-     *
      * @return
      */
     @POST("/oauth/token?grant_type=refresh_token")
-    Call<JSONObject> refreshToken( @QueryMap Map<String, Object> param);
+    Call<JSONObject> refreshToken(@QueryMap Map<String, Object> param);
 
     /**
      * 退出登录
@@ -139,6 +141,7 @@ public interface ApiService {
      */
     @GET("/open/sys/dept/list")
     Observable<BaseBean> depList();
+
     /**
      * 部门列表
      *
@@ -235,6 +238,7 @@ public interface ApiService {
      */
     @GET("/sys/user/userInfo")
     Observable<BaseBean> userInfo();
+
     /**
      * 订单
      * <p>
@@ -1119,7 +1123,7 @@ public interface ApiService {
      * @return
      */
     @PUT("/finance-tax/cancel/{id}")
-    Observable<BaseBean> storeFinancialCancel(@Path("id")String id);
+    Observable<BaseBean> storeFinancialCancel(@Path("id") String id);
 
     /**
      * 获取财税分页
@@ -1128,13 +1132,14 @@ public interface ApiService {
      */
     @GET("/finance-tax/page/list")
     Observable<BaseBean> storeFinancial(@QueryMap Map<String, Object> param);
+
     /**
      * 获取财税明细
      *
      * @return
      */
     @GET("/finance-tax/detail/{taxId}")
-    Observable<BaseBean> storeFinancialDetail(@Path("taxId")String id);
+    Observable<BaseBean> storeFinancialDetail(@Path("taxId") String id);
 
     /**
      * 获取财税明细
@@ -1150,7 +1155,7 @@ public interface ApiService {
      * @return
      */
     @GET("finance-tax-type/listByDept/{deptId}")
-    Observable<BaseBean> financialType(@Path("deptId")String deptId);
+    Observable<BaseBean> financialType(@Path("deptId") String deptId);
 
     /**
      * 新增财税
@@ -1185,6 +1190,7 @@ public interface ApiService {
 //     */
 //    @GET("/product/search-list")
 //    Observable<BaseBean> tradingProDialog(@QueryMap Map<String, Object> param);
+
     /**
      * 获取产品去向(搜索置换产品)
      *
@@ -1210,50 +1216,47 @@ public interface ApiService {
     Observable<BaseBean> productApplyList(@QueryMap Map<String, Object> param);
 
     /**
-     *
      * @return
      */
     @GET("/saleOrder/oneInfo/{orderId}")
     Observable<BaseBean> saleOrderDetail(@Path("orderId") String orderId, @Query("type") String type);
 
     /**
-     *
      * @return
      */
     @GET("/package-order/oneInfo/{orderId}")
     Observable<BaseBean> productOrderDetail(@Path("orderId") String orderId, @Query("type") String type);
 
     /**
-     *
      * @return
      */
     @GET("/purchaseOrder/oneInfo/{orderId}")
     Observable<BaseBean> purchaseOrderDetail(@Path("orderId") String orderId, @Query("type") String type);
+
     /**
-     *
      * @return
      */
     @GET("/insideOrder/oneInfo/{orderId}")
     Observable<BaseBean> insideOrderDetail(@Path("orderId") String orderId, @Query("type") String type);
+
     /**
-     *
      * @return
      */
     @GET("/crucibleOrder/oneInfo/{orderId}")
     Observable<BaseBean> crucibleOrderDetail(@Path("orderId") String orderId, @Query("type") String type);
+
     /**
-     *
      * @return
      */
     @GET("/crucibleSaleOrder/oneInfo/{orderId}")
     Observable<BaseBean> crucibleSaleOrderDetail(@Path("orderId") String orderId, @Query("type") String type);
 
     /**
-     *
      * @return
      */
     @GET("/supplierOrder/oneInfo/{orderId}")
     Observable<BaseBean> supplierOrderDetail(@Path("orderId") String orderId, @Query("type") String type);
+
     /**
      * 获取供应订单领料申请分页列表
      *
@@ -1261,6 +1264,7 @@ public interface ApiService {
      */
     @GET("/pick-apply/page/list")
     Observable<BaseBean> pickApplyList(@QueryMap Map<String, Object> param);
+
     /**
      * 获取发货申请分页列表
      *
@@ -1268,6 +1272,7 @@ public interface ApiService {
      */
     @GET("/send-out-store-apply/page/list")
     Observable<BaseBean> sendApplyList(@QueryMap Map<String, Object> param);
+
     /**
      * 获取发货申请分页列表
      *
@@ -1275,6 +1280,7 @@ public interface ApiService {
      */
     @GET("send-out-store-apply/po/page/list")
     Observable<BaseBean> sendPoApplyList(@QueryMap Map<String, Object> param);
+
     /**
      * 获取发货申请分页列表
      *
@@ -1290,6 +1296,7 @@ public interface ApiService {
      */
     @PUT("/send-out-store-apply/status")
     Observable<BaseBean> sendApplyCheck(@Body RequestBody requestBody);
+
     /**
      * 审批领料申请
      *
@@ -1297,6 +1304,7 @@ public interface ApiService {
      */
     @PUT("/pick-apply/status")
     Observable<BaseBean> pickApplyCheck(@Body RequestBody requestBody);
+
     /**
      * 审批发货申请
      *
@@ -1304,6 +1312,7 @@ public interface ApiService {
      */
     @PUT("/send-out-store-apply/co/status")
     Observable<BaseBean> sendCoApplyCheck(@Body RequestBody requestBody);
+
     /**
      * 审批发货申请
      *
@@ -1319,6 +1328,7 @@ public interface ApiService {
      */
     @GET("/send-out-store-apply/item/list")
     Observable<BaseBean> sendApplyDetail(@Query("applyId") String applyId);
+
     /**
      * _3获取发货申请详细信息列表
      *
@@ -1328,7 +1338,6 @@ public interface ApiService {
     Observable<BaseBean> sendApplyCrucibleDetail(@QueryMap Map<String, Object> param);
 
 
-
     /**
      * _获取领料申请详细信息列表
      *
@@ -1377,6 +1386,7 @@ public interface ApiService {
      */
     @POST("/procedureStart/po/applyOutStock/{orderId}")
     Observable<BaseBean> sendPoApply(@Path("orderId") String orderId, @Body RequestBody requestBody);
+
     /**
      * _step5_1-发起提前结束申请
      *
@@ -1384,6 +1394,7 @@ public interface ApiService {
      */
     @POST("/procedureStart/so/applyAdvanceFinish/{orderId}")
     Observable<BaseBean> endApply(@Path("orderId") String orderId, @Body RequestBody requestBody);
+
     /**
      * _step5_1-发起提前结束申请
      *
@@ -1415,6 +1426,7 @@ public interface ApiService {
      */
     @POST("/procedureStart/so/applyUse/{orderId}")
     Observable<BaseBean> useApplyAdd(@Path("orderId") String orderId, @Body RequestBody requestBody);
+
     /**
      * step5_32-发送销售订单领用申请
      *
@@ -1446,6 +1458,7 @@ public interface ApiService {
      */
     @GET("/useApply/ao/page/list")
     Observable<BaseBean> useAoApply(@QueryMap Map<String, Object> param);
+
     /**
      * step8_1-领用申请分页查询
      *
@@ -1461,6 +1474,7 @@ public interface ApiService {
      */
     @PUT("/useApply/so/audit/{applyId}")
     Observable<BaseBean> useApplyCheck(@Path("applyId") String applyId, @Body RequestBody requestBody);
+
     /**
      * step8_3-领用申请审核
      *
@@ -1484,6 +1498,7 @@ public interface ApiService {
      */
     @GET("/returnApply/so/page/list")
     Observable<BaseBean> returnApplyList(@QueryMap Map<String, Object> param);
+
     /**
      * step7_7-退货申请流水列表
      *
@@ -1499,6 +1514,7 @@ public interface ApiService {
      */
     @GET("/returnApply/fo/page/list")
     Observable<BaseBean> returnFoApplyList(@QueryMap Map<String, Object> param);
+
     /**
      * 领料退回
      *
@@ -1517,11 +1533,13 @@ public interface ApiService {
 
     /**
      * 领料退回申请
-     *f
+     * f
+     *
      * @return
      */
     @POST("/procedureStart/fo/pickReturn/{id}")
     Observable<BaseBean> pickReturnFoAdd(@Path("id") String id, @Body RequestBody requestBody);
+
     /**
      * step7_6 发送订单退货申请
      *
@@ -1529,6 +1547,7 @@ public interface ApiService {
      */
     @POST("/procedureStart/fo/applyReturn/{id}")
     Observable<BaseBean> returnFoAdd(@Path("id") String id, @Body RequestBody requestBody);
+
     /**
      * step7_6 发送订单退货申请
      *
@@ -1544,6 +1563,7 @@ public interface ApiService {
      */
     @GET("/stock/find/dept")
     Observable<BaseBean> returnDept(@Query("deptId") String id);
+
     /**
      * 审核历史
      *
@@ -1592,6 +1612,7 @@ public interface ApiService {
      */
     @POST("/procedureStart/co/applyStock/{orderItemId}")
     Observable<BaseBean> addStockCoApplyAdd(@Path("orderItemId") String orderItemId, @Body RequestBody requestBody);
+
     /**
      * step4_1-发起入库申请
      *
@@ -1599,6 +1620,7 @@ public interface ApiService {
      */
     @POST("/procedureStart/io/applyStock/{orderItemId}")
     Observable<BaseBean> addStockIoApplyAdd(@Path("orderItemId") String orderItemId, @Body RequestBody requestBody);
+
     /**
      * step4_1-发起入库申请
      *
@@ -1622,6 +1644,7 @@ public interface ApiService {
      */
     @GET("/enterStoreApply/so/app/page/list")
     Observable<BaseBean> addStockApplyList(@QueryMap Map<String, Object> param);
+
     /**
      * s入库申请列表
      *
@@ -1637,6 +1660,7 @@ public interface ApiService {
      */
     @GET("/enterStoreApply/co/app/page/list")
     Observable<BaseBean> addCoStockApplyList(@QueryMap Map<String, Object> param);
+
     /**
      * s入库申请列表
      *
@@ -1644,6 +1668,7 @@ public interface ApiService {
      */
     @GET("/enterStoreApply/io/app/page/list")
     Observable<BaseBean> addIoStockApplyList(@QueryMap Map<String, Object> param);
+
     /**
      * step4_3-入库申请列表
      *
@@ -1659,6 +1684,7 @@ public interface ApiService {
      */
     @PUT("/enterStoreApply/po/audit/{id}")
     Observable<BaseBean> addPoStockApplyCheck(@Path("id") String id, @Body RequestBody requestBody);
+
     /**
      * step4_2-入库申请审核
      *
@@ -1666,6 +1692,7 @@ public interface ApiService {
      */
     @PUT("/enterStoreApply/so/audit/{id}")
     Observable<BaseBean> addStockApplyCheck(@Path("id") String id, @Body RequestBody requestBody);
+
     /**
      * step4_2-入库申请审核
      *
@@ -1673,6 +1700,7 @@ public interface ApiService {
      */
     @PUT("/enterStoreApply/fo/audit/{id}")
     Observable<BaseBean> addFoStockApplyCheck(@Path("id") String id, @Body RequestBody requestBody);
+
     /**
      * step4_2-入库申请审核
      *
@@ -1680,6 +1708,7 @@ public interface ApiService {
      */
     @PUT("/enterStoreApply/co/audit/{id}")
     Observable<BaseBean> addCoStockApplyCheck(@Path("id") String id, @Body RequestBody requestBody);
+
     /**
      * step4_2-入库申请审核
      *
@@ -1703,6 +1732,7 @@ public interface ApiService {
      */
     @PUT("/saleOrder/apply/{orderId}")
     Observable<BaseBean> saleOrderApplyCheck(@Path("orderId") String id, @Body RequestBody requestBody);
+
     /**
      * step3-接单
      *
@@ -1710,6 +1740,7 @@ public interface ApiService {
      */
     @PUT("/supplierOrder/apply/{orderId}")
     Observable<BaseBean> supplierOrderApplyCheck(@Path("orderId") String id, @Body RequestBody requestBody);
+
     /**
      * step3-接单
      *
@@ -1717,6 +1748,7 @@ public interface ApiService {
      */
     @PUT("/crucibleOrder/apply/{orderId}")
     Observable<BaseBean> crucibleApplyCheck(@Path("orderId") String id, @Body RequestBody requestBody);
+
     /**
      * step3-接单
      *
@@ -1743,7 +1775,7 @@ public interface ApiService {
     Observable<BaseBean> enterFoStoreApplyList(@Path("id") String id, @Body RequestBody requestBody);
 
     /**
-     *  部门管理员审核
+     * 部门管理员审核
      *
      * @return
      */
@@ -1751,7 +1783,7 @@ public interface ApiService {
     Observable<BaseBean> soReturnApply(@Path("applyId") String id, @Body RequestBody requestBody);
 
     /**
-     *  业务部审核
+     * 业务部审核
      *
      * @return
      */
@@ -1759,14 +1791,15 @@ public interface ApiService {
     Observable<BaseBean> soBusinessReturnApply(@Path("applyId") String id, @Body RequestBody requestBody);
 
     /**
-     *  业务部审核
+     * 业务部审核
      *
      * @return
      */
     @PUT("/returnApply/so/audit/finance/{applyId}")
     Observable<BaseBean> soFinanceReturnApply(@Path("applyId") String id, @Body RequestBody requestBody);
+
     /**
-     *  集团审核
+     * 集团审核
      *
      * @return
      */
@@ -1774,7 +1807,7 @@ public interface ApiService {
     Observable<BaseBean> soGroupReturnApply(@Path("applyId") String id, @Body RequestBody requestBody);
 
     /**
-     *  集团审核
+     * 集团审核
      *
      * @return
      */
@@ -1782,7 +1815,7 @@ public interface ApiService {
     Observable<BaseBean> poGroupReturnApply(@Path("applyId") String id, @Body RequestBody requestBody);
 
     /**
-     *  退货审核
+     * 退货审核
      *
      * @return
      */
@@ -1790,12 +1823,13 @@ public interface ApiService {
     Observable<BaseBean> foGroupReturnApply(@Path("applyId") String id, @Body RequestBody requestBody);
 
     /**
-     *  集团审核
+     * 集团审核
      *
      * @return
      */
     @PUT("/returnApply/fo/pick-return/audit/group/{applyId}")
     Observable<BaseBean> foGroupPickReturnApply(@Path("applyId") String id, @Body RequestBody requestBody);
+
     /**
      * 获取一个订单子表的全部流水
      *
@@ -1810,7 +1844,7 @@ public interface ApiService {
      * @return
      */
     @PUT("/saleOrder/audit/{orderId}")
-    Observable<BaseBean> saleOrderCheck(@Path("orderId") String orderId,@Body RequestBody requestBody);
+    Observable<BaseBean> saleOrderCheck(@Path("orderId") String orderId, @Body RequestBody requestBody);
 
     /**
      * step2-审核
@@ -1818,7 +1852,7 @@ public interface ApiService {
      * @return
      */
     @PUT("/supplierOrder/audit/{orderId}")
-    Observable<BaseBean> supplierOrderCheck(@Path("orderId") String orderId,@Body RequestBody requestBody);
+    Observable<BaseBean> supplierOrderCheck(@Path("orderId") String orderId, @Body RequestBody requestBody);
 
     /**
      * step2-审核
@@ -1826,21 +1860,23 @@ public interface ApiService {
      * @return
      */
     @PUT("/insideOrder/audit/{orderId}")
-    Observable<BaseBean> insideOrderCheck(@Path("orderId") String orderId,@Body RequestBody requestBody);
+    Observable<BaseBean> insideOrderCheck(@Path("orderId") String orderId, @Body RequestBody requestBody);
+
     /**
      * step2-审核
      *
      * @return
      */
     @PUT("/purchaseOrder/audit/{orderId}")
-    Observable<BaseBean> purchaseOrderCheck(@Path("orderId") String orderId,@Body RequestBody requestBody);
+    Observable<BaseBean> purchaseOrderCheck(@Path("orderId") String orderId, @Body RequestBody requestBody);
+
     /**
      * step2-审核
      *
      * @return
      */
     @PUT("/crucibleOrder/audit/{orderId}")
-    Observable<BaseBean> crucibleOrderCheck(@Path("orderId") String orderId,@Body RequestBody requestBody);
+    Observable<BaseBean> crucibleOrderCheck(@Path("orderId") String orderId, @Body RequestBody requestBody);
 
     /**
      * *获取当前用户某类消息
@@ -1849,6 +1885,7 @@ public interface ApiService {
      */
     @GET("/notice-message-item/page/init")
     Observable<BaseBean> msg(@QueryMap Map<String, Object> param);
+
     /**
      * *把未读标记为已读
      *
@@ -1872,6 +1909,7 @@ public interface ApiService {
      */
     @PUT("/purchaseOrder/enter-stock-type")
     Observable<BaseBean> purchaseOrderStockType(@QueryMap Map<String, Object> param);
+
     /**
      * 2组装来源列表
      *
@@ -1895,6 +1933,7 @@ public interface ApiService {
      */
     @GET("/package-end/item/list")
     Observable<BaseBean> packageEndPro(@Query("applyId") Integer id);
+
     /**
      * 3获取当前客户可组装成品(分页)
      *
@@ -1909,7 +1948,7 @@ public interface ApiService {
      * @return
      */
     @PUT("/packageApply/exam/{applyId}")
-    Observable<BaseBean> packageApply(@Path("applyId") String id,@Body RequestBody requestBody);
+    Observable<BaseBean> packageApply(@Path("applyId") String id, @Body RequestBody requestBody);
 
 
     /**
@@ -1943,6 +1982,7 @@ public interface ApiService {
      */
     @GET("/back/noticeAnnounce/{id}")
     Observable<BaseBean> noticeDetail(@Path("id") String id);
+
     /**
      * 获取设备列表
      *
@@ -1958,6 +1998,7 @@ public interface ApiService {
      */
     @GET("/equipment/list")
     Observable<BaseBean> equipmentNoPageList(@QueryMap Map<String, Object> param);
+
     /**
      * 获取设备列表
      *
@@ -1973,6 +2014,7 @@ public interface ApiService {
      */
     @GET("/equipmentRepair/page/list")
     Observable<BaseBean> equipmentRepairList(@QueryMap Map<String, Object> param);
+
     /**
      * 获取设备采购
      *
@@ -1988,6 +2030,7 @@ public interface ApiService {
      */
     @POST("/equipmentPurchase")
     Observable<BaseBean> addEquipmentPurchase(@Body RequestBody requestBody);
+
     /**
      * 下单设备采购
      *
@@ -1995,6 +2038,7 @@ public interface ApiService {
      */
     @POST("/equipmentRepair")
     Observable<BaseBean> addEquipmentRepair(@Body RequestBody requestBody);
+
     /**
      * 设备采购明细列表（不分页)
      *
@@ -2027,6 +2071,7 @@ public interface ApiService {
      */
     @PUT("/equipmentRepair/audit")
     Observable<BaseBean> equipmentRepairAudit(@Body RequestBody requestBody);
+
     /**
      * 接单
      *
@@ -2069,7 +2114,6 @@ public interface ApiService {
     Observable<BaseBean> productProcess();
 
 
-
     /**
      * 集团账户
      *
@@ -2109,21 +2153,23 @@ public interface ApiService {
      * @return
      */
     @DELETE("/sys/dept/ruler")
-    Observable<BaseBean> deleteDeptRuler(@Query("userId")String userId,@Query("deptId")String deptId);
+    Observable<BaseBean> deleteDeptRuler(@Query("userId") String userId, @Query("deptId") String deptId);
+
     /**
      * 设置部门管理员
      *
      * @return
      */
     @PUT("/sys/dept/ruler")
-    Observable<BaseBean> addDeptRuler(@Query("userId")String userId,@Body RequestBody requestBody);
+    Observable<BaseBean> addDeptRuler(@Query("userId") String userId, @Body RequestBody requestBody);
+
     /**
      * step5_1-发起提前结束申请
      *
      * @return
      */
     @PUT("/advance-finish-apply/so/audit/{applyId}")
-    Observable<BaseBean> endSoCheck(@Path("applyId") String applyId,@Body RequestBody requestBody);
+    Observable<BaseBean> endSoCheck(@Path("applyId") String applyId, @Body RequestBody requestBody);
 
     /**
      * step5_1-发起提前结束申请
@@ -2131,7 +2177,7 @@ public interface ApiService {
      * @return
      */
     @PUT("/advance-finish-apply/po/audit/{applyId}")
-    Observable<BaseBean> endPoCheck(@Path("applyId") String applyId,@Body RequestBody requestBody);
+    Observable<BaseBean> endPoCheck(@Path("applyId") String applyId, @Body RequestBody requestBody);
 
     /**
      * 下单或审核前预检（产品列表）安全库存数量是否超出
@@ -2148,7 +2194,7 @@ public interface ApiService {
      * @return
      */
     @GET("/receive-order/info")
-    Observable<BaseBean> receiveOrderInfo(@QueryMap Map<String,Object> param);
+    Observable<BaseBean> receiveOrderInfo(@QueryMap Map<String, Object> param);
 
 
     /**
@@ -2189,7 +2235,7 @@ public interface ApiService {
      * @return
      */
     @GET("/returnApply/pageByTransitPart")
-    Observable<BaseBean> returnApplyByTransitPart(@QueryMap Map<String,Object> param);
+    Observable<BaseBean> returnApplyByTransitPart(@QueryMap Map<String, Object> param);
 
 
     /**
@@ -2198,12 +2244,13 @@ public interface ApiService {
      * @return
      */
     @GET("/mark/one")
-    Observable<BaseBean> getTemplate(@QueryMap Map<String,Object> param);
+    Observable<BaseBean> getTemplate(@QueryMap Map<String, Object> param);
+
     /**
      * 获取订单产品设置的唛头
      *
      * @return
      */
     @GET("/mark-order-rel/one")
-    Observable<BaseBean> getOrderMark(@QueryMap Map<String,Object> param);
+    Observable<BaseBean> getOrderMark(@QueryMap Map<String, Object> param);
 }

app/src/main/java/com/wd/workoffice/ui/activity/MainActivity.java

@@ -2,26 +2,22 @@ package com.wd.workoffice.ui.activity;
 
 import android.annotation.SuppressLint;
 import android.content.Intent;
-import android.graphics.Color;
-import android.os.Build;
 import android.os.Bundle;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.View;
 import android.widget.RelativeLayout;
 
 import com.ashokvarma.bottomnavigation.BottomNavigationBar;
 import com.ashokvarma.bottomnavigation.BottomNavigationItem;
 import com.ashokvarma.bottomnavigation.ShapeBadgeItem;
-import com.ashokvarma.bottomnavigation.TextBadgeItem;
 import com.qmuiteam.qmui.util.QMUIStatusBarHelper;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.WorkBaseActivity;
-import com.wd.workoffice.bean.event.MesLoginEvent;
 import com.wd.workoffice.bean.event.NotifyEvent;
 import com.wd.workoffice.bean.event.RefreshTokenEvent;
 import com.wd.workoffice.ui.activity.bat.approval.WorkApprovalActivity;
 import com.wd.workoffice.ui.activity.login.LoginActivity;
+import com.wd.workoffice.ui.activity.login.MainLoginActivity;
 import com.wd.workoffice.ui.activity.mes.MesLoginActivity;
 import com.wd.workoffice.ui.adapter.VpMainAdapter;
 import com.wd.workoffice.ui.fg.MainFragment;
@@ -44,10 +40,8 @@ import androidx.fragment.app.FragmentManager;
 import androidx.viewpager.widget.ViewPager;
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import cn.jpush.android.api.JPushInterface;
 import flexible.xd.android_base.base.AppManager;
 import flexible.xd.android_base.model.event.LoginEvent;
-import flexible.xd.android_base.utils.BarUtils;
 import me.jessyan.autosize.internal.CancelAdapt;
 
 public class MainActivity extends WorkBaseActivity implements BottomNavigationBar.OnTabSelectedListener, View.OnClickListener, CancelAdapt {

app/src/main/java/com/wd/workoffice/ui/activity/login/BatTypeActivity.java

+package com.wd.workoffice.ui.activity.login;
+
+import android.os.Bundle;
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.wd.workoffice.R;
+import com.wd.workoffice.app.WorkApp;
+import com.wd.workoffice.app.WorkBaseActivity;
+import com.wd.workoffice.bean.workEnum.BatLoginType;
+import com.wd.workoffice.retrofit.ApiService;
+import com.wd.workoffice.util.DataKeeper;
+import com.wd.workoffice.util.UserKeeper;
+import com.wd.workoffice.util.WorkUtils;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+import flexible.xd.android_base.network.rtfhttp.RtfHelper;
+import okhttp3.Request;
+
+/**
+ * 选择角色
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ **/
+public class BatTypeActivity extends WorkBaseActivity {
+
+
+    @BindView(R.id.tv_first)
+    TextView tvFirst;
+    @BindView(R.id.tv_second)
+    TextView tvSecond;
+    @BindView(R.id.activity_main)
+    LinearLayout activityMain;
+
+    @Override
+    protected void initView() {
+        ButterKnife.bind(this);
+    }
+
+    @Override
+    protected void initData() {
+    }
+
+
+    @Override
+    protected void initEvent() {
+    }
+
+    @Override
+    protected int layoutId() {
+        return R.layout.activity_main_login_type;
+    }
+
+
+
+    @OnClick({R.id.tv_first, R.id.tv_second})
+    public void onViewClicked(View view) {
+        switch (view.getId()) {
+            case R.id.tv_first:
+                DataKeeper.getInstance().keepBatLoginType(BatLoginType.GK.getCode());
+                toast(DataKeeper.getInstance().getBatLoginType());
+
+                RtfHelper.getInstance().init(WorkUtils.getDomain(), chain -> {
+                    Request original = chain.request();
+                    Request request = original.newBuilder()
+                            .header("Authorization", "Bearer " + UserKeeper.getInstance().getToken())
+                            .header("userId", UserKeeper.getInstance().getUserId())
+                            .method(original.method(), original.body())
+                            .build();
+
+                    return chain.proceed(request);
+                });
+                startActivity(LoginActivity.class);
+                break;
+            case R.id.tv_second:
+                DataKeeper.getInstance().keepBatLoginType(BatLoginType.GT.getCode());
+                toast(DataKeeper.getInstance().getBatLoginType());
+
+                RtfHelper.getInstance().init(WorkUtils.getDomain(), chain -> {
+                    Request original = chain.request();
+                    Request request = original.newBuilder()
+                            .header("Authorization", "Bearer " + UserKeeper.getInstance().getToken())
+                            .header("userId", UserKeeper.getInstance().getUserId())
+                            .method(original.method(), original.body())
+                            .build();
+
+                    return chain.proceed(request);
+                });
+                startActivity(LoginActivity.class);
+                break;
+
+        }
+    }
+}

app/src/main/java/com/wd/workoffice/ui/activity/MainLoginActivity.java → app/src/main/java/com/wd/workoffice/ui/activity/login/MainLoginActivity.java

-package com.wd.workoffice.ui.activity;
+package com.wd.workoffice.ui.activity.login;
 
 import android.os.Bundle;
 import android.view.View;
@@ -61,7 +61,7 @@ public class MainLoginActivity extends WorkBaseActivity {
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.tv_bat:
-                startActivity(LoginActivity.class);
+                startActivity(BatTypeActivity.class);
                 break;
             case R.id.tv_mes:
                 startActivity(MesLoginActivity.class);

app/src/main/java/com/wd/workoffice/ui/activity/user/UserSettingActivity.java

 package com.wd.workoffice.ui.activity.user;
 
 import android.content.Intent;
-import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.Button;
@@ -10,15 +9,9 @@ import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
 import com.wd.workoffice.R;
-import com.wd.workoffice.app.BaseBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
-import com.wd.workoffice.bean.PermissionBean;
 import com.wd.workoffice.bean.UserInfoBean;
-import com.wd.workoffice.retrofit.RtfUtils;
-import com.wd.workoffice.retrofit.WorkObserver;
-import com.wd.workoffice.ui.activity.MainActivity;
-import com.wd.workoffice.ui.activity.MainLoginActivity;
-import com.wd.workoffice.ui.activity.login.LoginActivity;
+import com.wd.workoffice.ui.activity.login.MainLoginActivity;
 import com.wd.workoffice.util.DataKeeper;
 import com.wd.workoffice.util.UserKeeper;
 import com.wd.workoffice.util.WorkUtils;
@@ -29,8 +22,6 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import flexible.xd.android_base.model.event.LoginEvent;
-import flexible.xd.android_base.network.rtfhttp.Transformer;
-import io.reactivex.disposables.Disposable;
 
 /**
  * 我的 - 设置

app/src/main/java/com/wd/workoffice/util/DataKeeper.java

 package com.wd.workoffice.util;
 
 
+import com.wd.workoffice.bean.workEnum.BatLoginType;
+
 import flexible.xd.android_base.utils.SPUtils;
 
 /**
@@ -13,6 +15,9 @@ public class DataKeeper {
     private final String MES_MENU_ID = "MES_MENU_ID";
     private final String MES_MENU = "MES_MENU";
     private final String MSG_STATUS = "MSG_STATUS";
+    private final String BAT_LOGIN_TYPE = "BAT_LOGIN_TYPE";
+
+
 
     private DataKeeper() {
     }
@@ -27,7 +32,22 @@ public class DataKeeper {
         }
         return keeper;
     }
+    /**
+     * bat登录选择类型
+     *
+     * @param info
+     */
+    public void keepBatLoginType(String info) {
+        sp.put(BAT_LOGIN_TYPE, info);
+    }
 
+    public String getBatLoginType() {
+        return sp.getString(BAT_LOGIN_TYPE);
+    }
+
+    public void clearBatLoginType() {
+        sp.put(BAT_LOGIN_TYPE, "");
+    }
     /**
      * mes菜单
      *
@@ -83,5 +103,6 @@ public class DataKeeper {
     public void clearAll() {
         clearMenu();
         clearMsgStatus();
+        clearBatLoginType();
     }
 }

app/src/main/java/com/wd/workoffice/util/WorkUtils.java

@@ -28,6 +28,7 @@ import com.wd.workoffice.app.WorkApp;
 import com.wd.workoffice.bean.event.CheckFeedbackEvent;
 import com.wd.workoffice.bean.event.RefreshTokenEvent;
 import com.wd.workoffice.bean.mesBean.MenuBean;
+import com.wd.workoffice.bean.workEnum.BatLoginType;
 import com.wd.workoffice.bean.workEnum.OrderType;
 import com.wd.workoffice.bean.workEnum.PagePermissionType;
 import com.wd.workoffice.bean.workEnum.PermissionType;
@@ -64,6 +65,18 @@ import retrofit2.Response;
  * github: https://github.com/FlexibleXd
  **/
 public class WorkUtils {
+    /**
+     * 处理项目请求地址
+     *
+     * @return
+     */
+    public static String getDomain (){
+        String domain = Config.DEBUG ? "http://zwang.bat100.net.cn:8000/%s/" : "http://zwang.bat100.net.cn:8000/%s/";
+        String loginType =TextUtils.isEmpty(DataKeeper.getInstance().getBatLoginType())? BatLoginType.GK.getCode() :DataKeeper.getInstance().getBatLoginType();
+        return String.format(domain,loginType);
+//        return "http://zwang.bat100.net.cn:8000/gt/";
+    }
+
 
     /**
      * 将map数据转换为 普通的 json RequestBody

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

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/activity_main"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center_horizontal"
+    android:orientation="vertical">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="80mm"
+        android:text="正望"
+        android:textSize="25sp"
+        android:textStyle="bold" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="50mm"
+        android:text="选择一个账套进入"
+        android:textSize="16sp" />
+
+    <TextView
+        android:id="@+id/tv_first"
+        android:layout_width="100mm"
+        android:layout_height="100mm"
+        android:layout_marginTop="20mm"
+        android:background="@drawable/shape_main_login"
+        android:gravity="center"
+        android:text="钢控"
+        android:textSize="17sp" />
+
+    <TextView
+        android:id="@+id/tv_second"
+        android:layout_width="100mm"
+        android:layout_height="100mm"
+        android:layout_marginTop="20mm"
+        android:background="@drawable/shape_main_login"
+        android:gravity="center"
+        android:text="锆碳"
+        android:textSize="17sp" />
+
+</LinearLayout>
\ No newline at end of file