|
@@ -7,9 +7,11 @@ import android.text.TextUtils;
|
|
import android.view.MotionEvent;
|
|
import android.view.MotionEvent;
|
|
import android.view.View;
|
|
import android.view.View;
|
|
import android.view.ViewGroup;
|
|
import android.view.ViewGroup;
|
|
|
|
+import android.widget.FrameLayout;
|
|
import android.widget.ImageView;
|
|
import android.widget.ImageView;
|
|
import android.widget.LinearLayout;
|
|
import android.widget.LinearLayout;
|
|
import android.widget.RelativeLayout;
|
|
import android.widget.RelativeLayout;
|
|
|
|
+import android.widget.ScrollView;
|
|
import android.widget.TextView;
|
|
import android.widget.TextView;
|
|
|
|
|
|
import androidx.annotation.NonNull;
|
|
import androidx.annotation.NonNull;
|
|
@@ -58,7 +60,6 @@ import com.syjk.watch.dealer.http.DataHttpResultObserver;
|
|
import com.syjk.watch.dealer.http.RetrofitClient;
|
|
import com.syjk.watch.dealer.http.RetrofitClient;
|
|
import com.syjk.watch.dealer.http.SchedulersUtils;
|
|
import com.syjk.watch.dealer.http.SchedulersUtils;
|
|
import com.syjk.watch.dealer.http.WatchApi;
|
|
import com.syjk.watch.dealer.http.WatchApi;
|
|
-import com.syjk.watch.dealer.ui.widget.BounceScrollView;
|
|
|
|
import com.syjk.watch.dealer.ui.widget.HWArcSeekBar;
|
|
import com.syjk.watch.dealer.ui.widget.HWArcSeekBar;
|
|
import com.syjk.watch.dealer.ui.widget.MinuteXAxisValueFormatter;
|
|
import com.syjk.watch.dealer.ui.widget.MinuteXAxisValueFormatter;
|
|
import com.syjk.watch.dealer.util.CommonUtils;
|
|
import com.syjk.watch.dealer.util.CommonUtils;
|
|
@@ -130,7 +131,7 @@ public class HWWatchHomeFragment extends BaseFragment {
|
|
private boolean isConnect = false;
|
|
private boolean isConnect = false;
|
|
private final static String TAG = HWWatchHomeFragment.class.getSimpleName();
|
|
private final static String TAG = HWWatchHomeFragment.class.getSimpleName();
|
|
private SmartRefreshLayout mRefreshLayout;
|
|
private SmartRefreshLayout mRefreshLayout;
|
|
- private BounceScrollView scrollView;
|
|
|
|
|
|
+ private ScrollView scrollView;
|
|
private RelativeLayout rlBONormal, rlEcgNormal, rlBloodNormal;
|
|
private RelativeLayout rlBONormal, rlEcgNormal, rlBloodNormal;
|
|
private TextView tvBODate;
|
|
private TextView tvBODate;
|
|
private TextView tvBO;
|
|
private TextView tvBO;
|
|
@@ -192,7 +193,7 @@ public class HWWatchHomeFragment extends BaseFragment {
|
|
mRefreshLayout.setOnRefreshListener(refreshLayout -> {
|
|
mRefreshLayout.setOnRefreshListener(refreshLayout -> {
|
|
Logger.t(TAG).i("触发下拉同步");
|
|
Logger.t(TAG).i("触发下拉同步");
|
|
isSyncing = true;
|
|
isSyncing = true;
|
|
- scrollView.post(() -> scrollView.fullScroll(scrollView.FOCUS_UP));
|
|
|
|
|
|
+ scrollView.post(() -> scrollView.fullScroll(ScrollView.FOCUS_UP));
|
|
|
|
|
|
if (!TextUtils.isEmpty(hwDeviceId) && isConnect) {
|
|
if (!TextUtils.isEmpty(hwDeviceId) && isConnect) {
|
|
Logger.t(TAG).i("下拉同步开始");
|
|
Logger.t(TAG).i("下拉同步开始");
|
|
@@ -284,10 +285,11 @@ public class HWWatchHomeFragment extends BaseFragment {
|
|
});
|
|
});
|
|
|
|
|
|
ImageView ivJump = view.findViewById(R.id.iv_jump);
|
|
ImageView ivJump = view.findViewById(R.id.iv_jump);
|
|
- RxView.clicks(ivJump)
|
|
|
|
|
|
+
|
|
|
|
+ FrameLayout jump = view.findViewById(R.id.wx_jump);
|
|
|
|
+ RxView.clicks(jump)
|
|
.throttleFirst(1, TimeUnit.SECONDS)
|
|
.throttleFirst(1, TimeUnit.SECONDS)
|
|
.subscribe(o -> {
|
|
.subscribe(o -> {
|
|
-
|
|
|
|
String phone = SPUtils.getString(getContext(), "phone");
|
|
String phone = SPUtils.getString(getContext(), "phone");
|
|
|
|
|
|
// String appId = SDKUtils.wx_appid; // 填移动应用(App)的 AppId,非小程序的 AppID
|
|
// String appId = SDKUtils.wx_appid; // 填移动应用(App)的 AppId,非小程序的 AppID
|