drew 6 年之前
父節點
當前提交
5f8e6afd6f

+ 1 - 1
app/src/main/assets/mockData/RoomMeetings.json

@@ -30,7 +30,7 @@
                 "beginTime": 1578973500000,
                 "endTime": 1578975300000,
                 "beginTimeStr": "2020-01-14 11:45:00",
-                "endTimeStr": "2020-01-14 12:15:00",
+                "endTimeStr": "2020-01-16 12:15:00",
                 "createUser": {
                     "userId": "002332",
                     "userName": "魏巍"

+ 2 - 2
app/src/main/assets/mockData/投顾.json

@@ -6,7 +6,7 @@
   "certifications": [
     {
       "certiedType": "02",
-      "certificateAcquisitionTime": 1563206400000,
+      "certificateAcquisitionTime": 1263538637000,
       "certificateNumber": "S0570610120372",
       "class": "com.htsc.crm.employee.core.dto.EmpCertificationDTO",
       "id": 209197,
@@ -61,7 +61,7 @@
   ],
   "entryTime": null,
   "gender": "女",
-  "halfBodyPhoto": "http://s3.cn-north-1.amazonaws.com.cn/s3-000045-cfglpic/632fda26-4e7c-4048-af28-1dd078276aea_QQ图片20190730144159.png",
+  "halfBodyPhoto": "https://ticket-exchange.oss-cn-hangzhou.aliyuncs.com/image/2020-01-15-15-06-59TuQwckCq.png",
   "hasExhibitionQua": true,
   "headShot": "http://s3.cn-north-1.amazonaws.com.cn/s3-000045-cfglpic/a7e29ca6-20ca-45dd-9ad1-b0402a96c602_TIM图片20190705181004.png",
   "highLevel": "BACHELOR",

+ 1 - 2
app/src/main/java/com/ht/gate/ApiService.java

@@ -19,9 +19,8 @@ public interface ApiService {
     @POST("meeting/service-api/crmnew/find-room-meetings")
     Call<List<RoomMeetings>> roomMeetings(@Body QueryMeetingBody body);
 
+//    @POST("employee-center/EmpService/queryEmpInfoByEmpId")
     @POST("http://168.63.65.40:8090/employee-center/EmpService/queryEmpInfoByEmpId")
     Call<EmpInfo> getEmpInfo(@Query("empId") String empId);
 
-//    @POST("employee-center/EmpService/queryEmpInfoByEmpId")
-//    Call<EmpInfo> getEmpInfo(@Query("empId") String empId);
 }

+ 1 - 1
app/src/main/java/com/ht/gate/MainActivity.java

@@ -212,7 +212,7 @@ public class MainActivity extends AppCompatActivity {
 
                             @Override
                             public void onFailure(@NonNull Call<EmpInfo> call, @NonNull Throwable t) {
-                                Toasty.error(MainActivity.this, "设备绑定失败,请稍后再试").show();
+                                Toasty.error(MainActivity.this, "投顾信息获取失败,请稍后再试").show();
                             }
                         });
                         b = true;

+ 1 - 1
app/src/main/java/com/ht/gate/MockServer.java

@@ -28,7 +28,7 @@ public class MockServer {
                                 loadAssetTextAsString(context, "mockData/RoomMeetings.json")))
                 .addConnection(MockConnectionFactory.getInstance()
                         .createGeneralConnection(MockConnection.POST,
-                                "/empInfo",
+                                "/employee-center/EmpService/queryEmpInfoByEmpId",
                                 "text/json",
                                 loadAssetTextAsString(context, "mockData/投顾.json")))
                 .start(8080);

+ 1 - 1
app/src/main/java/com/ht/gate/WelcomeActivity.java

@@ -200,7 +200,7 @@ public class WelcomeActivity extends AppCompatActivity {
         } else {
             tvCertNo.setText("执业证书编号:" + empInfo.getCertifications().get(0).getCertificateNumber());
             int year = (int) ((System.currentTimeMillis() - empInfo.getCertifications().get(0).getCertificateAcquisitionTime()) / 1000 / 60 / 60 / 24 / 365);
-            if (year < 1) {
+            if (year < 3) {
                 rlJobYear.setVisibility(View.GONE);
             } else {
                 tvJobYear.setText(year + "年");