全局替换文字

baseSDK/src/main/java/com/dayu/common/Constants.java

@@ -123,15 +123,15 @@ public class Constants {
      */
     public final static int MANAGER = 1;
     /**
-     * 工程师.
+     * 师傅.
      */
     public final static int ENGINEER = 2;
     /**
-     * 店长和工程师.
+     * 店长和师傅.
      */
     public final static int MANAGER_ENGINEER = 3;
     /**
-     * 店长和没有加入站点的工程师.
+     * 店长和没有加入站点的师傅.
      */
     public final static int MANAGER_NOSITE_ENGINEER = 4;
     public final static String BUNDLE = "bundle";
@@ -142,7 +142,7 @@ public class Constants {
     public final static int FAILED = -1;
     //相册选择照片删除时传递的key
     public final static String BUNDLE_KEY_ID = "BUNDLE_KEY_ID";
-    //工程师的账户余额
+    //师傅的账户余额
     public final static String ACCOUNT_BALANCE = "account_balance";
     public final static String ACCOUNT_ID = "accountId";
     public final static String ORDER_ID = "orderId";

baseSDK/src/main/java/com/dayu/event/UserInfo.java

@@ -11,7 +11,7 @@ import java.util.List;
 
 public class UserInfo {
     /**
-     * 工程师账户id
+     * 师傅账户id
      */
     private String accountId;
 

baseSDK/src/main/res/layout/dialog_licence.xml

@@ -49,7 +49,7 @@
             android:layout_marginBottom="12sp"
             android:maxEms="10"
             android:maxLines="1"
-            android:text="智能门锁初级工程师"
+            android:text="智能门锁初级师傅"
             android:textColor="@color/default_text_color"
             android:textSize="22sp"
             android:textStyle="bold" />

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

 <resources>
     <string name="app_name">BaseLibrary</string>
-    <string name="tv_dayu">大鱼工程师</string>
+    <string name="tv_dayu">大鱼师傅</string>
     <string name="tv_start_page_text">©&#160;2017&#160;大鱼智能&#160;版权所有</string>
     <string name="tv_fonts">fonts/DIN Alternate Bold.ttf</string>
     <string name="tv_login_register_text">暂不接受个人用户注册</string>
@@ -188,7 +188,7 @@
     <string name="out_of_date">已过期</string>
     <string name="other_get">他人承接</string>
     <string name="grab_time">还剩余%1$d天%2$d小时%3$d分%4$d秒"</string>
-    <string name="designate_success">工程师指派成功</string>
+    <string name="designate_success">师傅指派成功</string>
     <string name="engineer">工&#160;&#160;程&#160;&#160;师</string>
     <string name="change">改派</string>
     <string name="bargain_notice">如果您的报价得到“%1$s”同意，该任务将由您承接。点击“提交报价”等待处理吧。注：提交报价需要等待，可能会被其他人抢单哦</string>
@@ -419,9 +419,9 @@
     <string name="designate">指派</string>
     <string name="order_price">授权单价</string>
     <string name="refuse">拒绝</string>
-    <string name="change_engineer">改派工程师</string>
-    <string name="change_engineer_name">改派工程师(%1$s)</string>
-    <string name="designate_engineer">指派工程师</string>
+    <string name="change_engineer">改派师傅</string>
+    <string name="change_engineer_name">改派师傅(%1$s)</string>
+    <string name="designate_engineer">指派师傅</string>
     <string name="comform_receive_order">确定接单</string>
     <string name="send_order_price">发&#160;&#160;单&#160;&#160;价</string>
     <string name="send_order_price_trim">发单价</string>
@@ -606,7 +606,7 @@
     <string name="engineer_identity_auditing">您的身份认证正在审核中，请耐心等待</string>
     <string name="engineer_identity_not_audite">您还没有进行身份认证</string>
     <string name="engineer_not_have_site">您未加入服务站,请联系站点</string>
-    <string name="engineer_or_manager_not_exite">工程师账号或店长账号不存在</string>
+    <string name="engineer_or_manager_not_exite">师傅账号或店长账号不存在</string>
     <string name="audite_tip">资料已经提交审核\n审核结果会通过短信通知您</string>
     <string name="audite_tip_title">提交成功</string>
     <string name="audite_tip_submite_title">重新提交</string>
@@ -614,9 +614,9 @@
     <string name="think_again">我再想想</string>
     <string name="identity_not_audite">审核未通过</string>
     <string name="certification">认证</string>
-    <string name="engineer_acount_notavialibe">工程师账号不存在</string>
+    <string name="engineer_acount_notavialibe">师傅账号不存在</string>
     <string name="user_on_blackilst">用户被列入黑名单</string>
-    <string name="not_engineer">该账号尚不是工程师</string>
+    <string name="not_engineer">该账号尚不是师傅</string>
     <string name="account_frozen">该账号冻结</string>
     <string name="sms_code_error">验证码错误</string>
     <string name="sms_code_unsend_or_expire">验证码未发送或已过期</string>
@@ -628,7 +628,7 @@
     <string name="order_receive_already">已被接单，请选择其他工单</string>
     <string name="perameter_is_null">参数为空</string>
     <string name="identity_is_error">身份证号不合法</string>
-    <string name="not_audite_aviliable">该工程师不处于审核拒绝状态</string>
+    <string name="not_audite_aviliable">该师傅不处于审核拒绝状态</string>
     <string name="error_verison_code">解析版本号失败</string>
     <string name="old_pwd_error">旧密码错误</string>
 
@@ -660,9 +660,9 @@
 欢迎您注册使用大鱼U服（以下简称“大鱼平台”），您在申请注册流程中点击同意本协议之前，应当认真阅读本协议。请您务必审慎阅读、充分理解各条款内容，特别是免除或者限制责任的条款、法律适用和争议解决条款。免除或者限制责任的条款将以粗体以及下划线标识，您应重点阅读。如您对本协议有任何疑问，请与kf@kf.ai联系。当您按照注册页面提示填写信息、阅读并同意本协议且完成全部注册程序后，即表示您已充分阅读、理解并接受本协议的全部内容，并与北京大鱼创想网络科技有限公司达成一致，双方同意使用互联网信息技术以数据电文形式订立本用户协议并认同其效力。\n
 您的下载、注册、登录、使用及连接大鱼平台服务等行为均将被视为您已经完全了解、接受并同意遵守本协议项下的全部内容。本协议可由本公司根据需要不时的修改，并以网站或应用程序公示的方式进行公告，不再单独通知您。修改后的协议一经公布即替代原来的协议，构成您与本公司之间就本协议主题事由的全部、最新协议。您有义务不时关注并阅读最新版的协议以及网站或应用程序的公告。如您不同意更新后的协议，可以且应立即停止接受本公司依据本协议提供的服务；如您继续使用大鱼平台的服务的,即视为您同意更新后的协议。\n
 第一条 定义\n
-1.	大鱼平台：大鱼平台是由北京大鱼创想科技有限公司（以下简称“本公司”或者“乙方”）开发的提供服务的互联网产品，包含大鱼U服SAAS平台和大鱼工程师app。\n
+1.	大鱼平台：大鱼平台是由北京大鱼创想科技有限公司（以下简称“本公司”或者“乙方”）开发的提供服务的互联网产品，包含大鱼U服SAAS平台和大鱼师傅app。\n
 2.	大客户：是指服务需求的提供方，通过派遣服务单的方式提供服务需求给服务商，并对其服务进行验收的企业或个人。\n
-3.	平台用户(以下简称“甲方”)：平台用户是指签署本协议并有权使用大鱼平台服务人员账户的个人，包括且不限于服务工程师，店长和服务商管理员。\n
+3.	平台用户(以下简称“甲方”)：平台用户是指签署本协议并有权使用大鱼平台服务人员账户的个人，包括且不限于服务师傅，店长和服务商管理员。\n
 4.	最终用户：用户是指通过大鱼平台完成全部注册程序后，提出服务申请并享受相关服务的个人。\n
 5.	服务单：是指用户向特定大客户提出服务申请后生成的服务任务订单。\n
 第二条 协议的范围\n

managercenter/src/main/java/com/dayu/managercenter/api/ManagerService.java

@@ -109,7 +109,7 @@ public interface ManagerService {
 
 
     /**
-     * 获取工程师列表.
+     * 获取师傅列表.
      *
      * @param siteId
      * @return
@@ -118,7 +118,7 @@ public interface ManagerService {
     Observable<BaseResponse<List<Engineer>>> getEngineers(@Query("siteId") int siteId);
 
     /**
-     * 获取工程师列表.
+     * 获取师傅列表.
      *
      * @param siteId
      * @return
@@ -130,7 +130,7 @@ public interface ManagerService {
             , @Query("siteId") int siteId);
 
     /**
-     * 指派工程师.
+     * 指派师傅.
      *
      * @param id
      * @param engineerId
@@ -203,7 +203,7 @@ public interface ManagerService {
     Observable<BaseResponse<BasePageBean<Order>>> getDesignateList(@Query("siteId") int siteId, @Query("changeEngineerStatus") int changeEngineerStatus, @Query("page") int page, @Query("pageSize") int pageSize);
 
     /**
-     * 改派工程师.
+     * 改派师傅.
      *
      * @param id
      * @param reason

managercenter/src/main/java/com/dayu/managercenter/common/ManagerConstant.java

@@ -69,7 +69,7 @@ public class ManagerConstant {
     public final static String EU_ORDER = "api-order/" + "euOrders/provider";
 
     /**
-     * 获取工程师列表.
+     * 获取师傅列表.
      */
     public final static String ENGINEER_LIST = "api-user/" + "engineerInfo/selectEngineerListByCategoryIdAndServiceType";
 
@@ -85,7 +85,7 @@ public class ManagerConstant {
     public static final String KA_ORDER_DETAILS = "/api-ka-order/" + "kaFlashOrder/orderDetail/id/{orderId}";
 
     /**
-     * 指派工程师.
+     * 指派师傅.
      */
     public static final String DESIGNATE = "/api-order/" + "orders/assign";
 
@@ -115,7 +115,7 @@ public class ManagerConstant {
     public static final String DESIGNATE_LIST = "/api-order/" + "orders/provider";
 
     /**
-     * 改派工程师.
+     * 改派师傅.
      */
     public static final String CHANGE_ENGINEER = "/api-order/" + "orders/reassignment";
 

managercenter/src/main/java/com/dayu/managercenter/data/OrderDetail.java

@@ -711,7 +711,7 @@ public class OrderDetail implements Serializable {
          * orderId : 48
          * createTime : 2017-10-13 15:16:41
          * operation : 工单创建
-         * operationComment : 大鱼鱼头 通过 新建工单 创建了工单工程师大鱼冬师傅 (18062907260) 接单
+         * operationComment : 大鱼鱼头 通过 新建工单 创建了工单师傅大鱼冬师傅 (18062907260) 接单
          * serviceProgessTime : T2
          * serviceProgessTimeNum : 2
          * commentName : 工单备注

managercenter/src/main/java/com/dayu/managercenter/presenter/allorder/AllOrderContract.java

@@ -29,12 +29,12 @@ public interface AllOrderContract {
         public abstract void getOrders();
 
         /**
-         * 指派工程师.
+         * 指派师傅.
          */
         public abstract void designate(int accountId,int id);
 
         /**
-         * 获取工程师列表.
+         * 获取师傅列表.
          */
         public abstract void getEngineers(Order order);
 

managercenter/src/main/java/com/dayu/managercenter/presenter/bargainorder/BargainContract.java

@@ -32,7 +32,7 @@ public interface BargainContract {
         public abstract void receive(int id);
 
         /**
-         * 获取工程师列表.
+         * 获取师傅列表.
          */
         public abstract void getEngineers();
     }

managercenter/src/main/java/com/dayu/managercenter/presenter/base/IBaseManagerPresenter.java

@@ -8,12 +8,12 @@ import com.dayu.base.ui.presenter.BaseListPresenter;
  */
 public abstract class IBaseManagerPresenter<V> extends BaseListPresenter<V> {
     /**
-     * 指派工程师.
+     * 指派师傅.
      */
     public abstract void designate(int accountId, int id);
 
     /**
-     * 获取工程师列表.
+     * 获取师傅列表.
      */
     public abstract void getEngineers(int id);
 

managercenter/src/main/java/com/dayu/managercenter/presenter/createorder/CreateOrderContract.java

@@ -66,7 +66,7 @@ public interface CreateOrderContract {
         public abstract void getEngineers();
 
         /**
-         * 选择工程师.
+         * 选择师傅.
          */
         public abstract void selectEngineer(List<Engineer> engineers);
 

managercenter/src/main/java/com/dayu/managercenter/presenter/graborder/GrabContract.java

@@ -41,7 +41,7 @@ public interface GrabContract {
         public abstract void receive(GrabOrder order);
 
         /**
-         * 获取工程师列表.
+         * 获取师傅列表.
          */
         public abstract void getEngineers();
     }

managercenter/src/main/java/com/dayu/managercenter/presenter/sendorder/SendOrderContract.java

@@ -23,12 +23,12 @@ public interface SendOrderContract {
         public abstract void getSendOrder();
 
         /**
-         * 指派工程师.
+         * 指派师傅.
          */
         public abstract void designate(int accountId,int id);
 
         /**
-         * 获取工程师列表.
+         * 获取师傅列表.
          */
         public abstract void getEngineers(int id);
 

managercenter/src/main/java/com/dayu/managercenter/presenter/subcribeorder/SubcribeOrderContract.java

@@ -26,7 +26,7 @@ public interface SubcribeOrderContract {
         public abstract void designate(int id, int accountId);
 
         /**
-         * 获取工程师列表.
+         * 获取师傅列表.
          */
         public abstract void getEngineers(int id);
     }

orderCenter/src/main/java/com/dayu/order/api/OrderService.java

@@ -82,7 +82,7 @@ interface OrderService {
     Observable<BaseResponse<List<ErrorOrder>>> getErrorOrders(@Query("engineerId") int userId, @Query("siteId") int siteId);
 
     /**
-     * 工程师接单
+     * 师傅接单
      *
      * @param orderId
      * @param engineerId

orderCenter/src/main/java/com/dayu/order/api/protocol/OrderDetail.java

@@ -666,7 +666,7 @@ public class OrderDetail implements Serializable {
          * orderId : 48
          * createTime : 2017-10-13 15:16:41
          * operation : 工单创建
-         * operationComment : 大鱼鱼头 通过 新建工单 创建了工单工程师大鱼冬师傅 (18062907260) 接单
+         * operationComment : 大鱼鱼头 通过 新建工单 创建了工单师傅大鱼冬师傅 (18062907260) 接单
          * serviceProgessTime : T2
          * serviceProgessTimeNum : 2
          * commentName : 工单备注

orderCenter/src/main/java/com/dayu/order/common/OrderConstant.java

@@ -27,7 +27,7 @@ public class OrderConstant {
      */
     public static final String ERROR_ORDER = "/api-order/" + "orders/findExceptionSimpleOrderVO";
     /**
-     * 工程师接单.
+     * 师傅接单.
      */
     public static final String ORDER_RECEIVING = "/api-order/" + "orders/{orderId}/engineer/{engineerId}";
     /**

orderCenter/src/main/java/com/dayu/order/presenter/receivingorder/ReceivingContract.java

@@ -15,10 +15,10 @@ public interface ReceivingContract {
 
     abstract class Presenter extends BaseOrderPresenter<View> {
         /**
-         * 工程师接单.
+         * 师傅接单.
          *
          * @param orders
-         * @param engineer 工程师id.
+         * @param engineer 师傅id.
          */
         public abstract void receiveOrder(int orders, int engineer);
 

userCenter/src/main/java/com/dayu/usercenter/api/UserService.java

@@ -56,7 +56,7 @@ public interface UserService {
     Observable<BaseResponse<Boolean>> sendCode(@Path("telephone") String telephone, @Path("type") int type);
 
     /**
-     * 获取工程师信息.
+     * 获取师傅信息.
      *
      * @param accountId
      * @return
@@ -95,7 +95,7 @@ public interface UserService {
                                                               @Path("engineerId") int engineerId);
 
     /**
-     * 获取工程师工单记录，评分.
+     * 获取师傅工单记录，评分.
      *
      * @param siteIdHome
      * @param engineerId

userCenter/src/main/java/com/dayu/usercenter/common/UserConstant.java

@@ -35,16 +35,16 @@ public class UserConstant {
     public static final String MODIFY_USER_HEADER = "/api-user/" + "/account/modifyHeadURL";
 
     /**
-     * 获取工程师信息.
+     * 获取师傅信息.
      */
 //    public static final String PERSONAL_CENTER = "/api-user/" + "engineerInfo/accountId/{accountId}";
     public static final String PERSONAL_CENTER = "/api-user/" + "/engineerInfo/mobile/accountId/{accountId}";
     /**
-     * 工程师今日收益.
+     * 师傅今日收益.
      */
     public static final String PERSONAL_ACOUNT_BALANCE = "/api-settlement/" + "payAccount/queryAccountBalanceAndtodayIncrease/accountId/{accountId}";
     /**
-     * 工程师账户余额.
+     * 师傅账户余额.
      */
     public static final String PERSONAL_ACCOUT_LIST = "/api-settlement/" + "payStream/queryPayStream/";
     /**
@@ -61,11 +61,11 @@ public class UserConstant {
     public static final String PERSONAL_ALIPAY_MODIFY = "/api-settlement/" + "alipay/modifyAlipay";
 
     /**
-     * 根据工程师id和工程师id获取今日业绩(今日收益).
+     * 根据师傅id和师傅id获取今日业绩(今日收益).
      */
     public final static String USER_ORDER_REVENUE = "/api-count/" + "ordersStatistics/income/siteId/{siteId}/engineerId/{engineerId}";
     /**
-     * 服务记录、工程师评价.
+     * 服务记录、师傅评价.
      */
     public final static String USER_REVENUE = "/api-count/" + "ordersStatistics/total/siteId/{siteId}/engineerId/{engineerId}";
 
@@ -110,7 +110,7 @@ public class UserConstant {
     public final static String MODIFY_PWD = "/api-user/" + "account/modifyPwd";
 
     /**
-     * 获取工程师siteid.
+     * 获取师傅siteid.
      */
     public final static String GET_SITEID = "/api-user/" + "serviceProviderSite/findSiteIdByAccountId/{accountId}";
 

userCenter/src/main/java/com/dayu/usercenter/presenter/homefourtab/HomeFourContract.java

@@ -47,7 +47,7 @@ public interface HomeFourContract {
     }
 
     abstract class Presenter extends BasePresenter<View> {
-        //获取工程师的alipayAcccount
+        //获取师傅的alipayAcccount
         public abstract void getAlipayAccount(int accountId);
 
         public abstract void getAllData(int userId, int siteId);

userCenter/src/main/java/com/dayu/usercenter/presenter/pwlogin/PwLoginPresenter.java

@@ -103,7 +103,7 @@ public class PwLoginPresenter extends PwLoginContract.Presenter {
                     dealSiteId(info, integer);
                 }, error -> {
                     switch (error.subCode) {
-                        case "USER0024": //工程师不属于任何服务站
+                        case "USER0024": //师傅不属于任何服务站
                             String message = BaseApplication.getContext().getString(com.dayu.baselibrary.R.string.engineer_not_have_site);
                             if (UserManager.getInstance().getRole() == Constants.MANAGER_ENGINEER) {
                                 info.setSiteId(-1);

userCenter/src/main/java/com/dayu/usercenter/presenter/smslogin/SmsLoginPresenter.java

@@ -170,7 +170,7 @@ public class SmsLoginPresenter extends SmsLoginContract.Presenter {
                     dealSiteId(info, integer);
                 }, error -> {
                     switch (error.subCode) {
-                        case "USER0024": //工程师不属于任何服务站
+                        case "USER0024": //师傅不属于任何服务站
                             String message = BaseApplication.getContext().getString(com.dayu.baselibrary.R.string.engineer_not_have_site);
                             if (UserManager.getInstance().getRole() == Constants.ENGINEER) {
                                 mView.setError(message);

userCenter/src/main/java/com/dayu/usercenter/ui/activity/LoginActivity.java

@@ -16,7 +16,7 @@ import com.umeng.analytics.MobclickAgent;
 
 
 /**
- * 工程师登录页面
+ * 师傅登录页面
  * 2017/11/08.
  */