wangjk před 4 roky
rodič
revize
4126c6c6c5

binární
home/src/main/res/drawable-hdpi/hu_jiao.png


binární
home/src/main/res/drawable-mdpi/hu_jiao.png


+ 15 - 0
home/src/main/res/layout/watch_activity_call_records.xml

@@ -20,5 +20,20 @@
                 android:layout_height="match_parent"></android.support.v7.widget.RecyclerView>
         </com.scwang.smartrefresh.layout.SmartRefreshLayout>
 
+        <RelativeLayout
+            android:id="@+id/call_relyout"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:background="@drawable/hu_jiao_bg"
+            android:visibility="gone">
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:background="@drawable/hu_jiao" />
+        </RelativeLayout>
     </RelativeLayout>
 </layout>

+ 1 - 1
home/src/main/res/layout/watch_activity_dialing_voice.xml

@@ -36,7 +36,7 @@
         android:layout_marginBottom="11px"
         android:orientation="vertical">
 
-        <TextView
+        <Chronometer
             android:id="@+id/call_duration_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"

+ 2 - 1
home/src/main/res/layout/watch_activity_voice_calls.xml

@@ -36,7 +36,8 @@
         android:layout_above="@+id/call_out_linlyout"
         android:layout_centerHorizontal="true"
         android:text="00:00:12"
-        android:textSize="16px" />
+        android:textSize="16px"
+        android:visibility="gone"/>
 
     <LinearLayout
         android:id="@+id/call_out_linlyout"

+ 1 - 1
middleware/src/main/code/com/wdkl/ncs/android/middleware/logic/presenter/home/WatchCallRecordsFragmentPresenter.kt

@@ -103,7 +103,7 @@ class WatchCallRecordsFragmentPresenter @Inject constructor() :RxPresenter<Watch
                     .subscribe(observer)
         }else{
             //获取指定人的通话记录数据
-            watchInitiatorApi.getInitiatorData(page_no,page_size,customer_id)
+            watchInitiatorApi.getInitiatorData(page_no,page_size,device_id,customer_id)
                     .map {
                         var shop = ArrayList<InteractionVO>()
                         var gson = GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES).create()