Browse Source

适配微信小程序跳转问题

nisiyuan 1 năm trước cách đây
mục cha
commit
bb517fa5b7

+ 1 - 1
app/build.gradle

@@ -213,7 +213,7 @@ dependencies {
     implementation 'com.github.lihangleo2:ShadowLayout:3.2.4'
     implementation 'com.google.android:flexbox:1.0.0'
 
-    implementation 'com.tencent.mm.opensdk:wechat-sdk-android:+'
+    implementation 'com.tencent.mm.opensdk:wechat-sdk-android:6.8.0'
     implementation 'com.github.mcxtzhang:SwipeDelMenuLayout:V1.3.0'
     implementation 'com.xw.repo:bubbleseekbar:3.20-lite'
     implementation 'com.github.youlookwhat:WebProgress:1.1.0'

+ 4 - 0
app/src/main/AndroidManifest.xml

@@ -87,6 +87,10 @@
     <!--for 华为 自启动 -->
     <uses-permission android:name="com.huawei.permission.external_app_settings.USE_COMPONENT" />
 
+    <queries>
+        <package android:name="com.tencent.mm" />
+    </queries>
+
     <meta-data
         android:name="DATABASE"
         android:value="syjk.db" />

+ 7 - 5
app/src/main/java/com/syjk/watch/dealer/ui/Fragment/HWWatchHomeFragment.java

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

+ 4 - 1
app/src/main/java/com/syjk/watch/dealer/ui/Fragment/WatchHomeFragment.java

@@ -16,6 +16,7 @@ import android.text.format.DateFormat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.ScrollView;
@@ -570,7 +571,9 @@ public class WatchHomeFragment extends BaseFragment {
         initData();
 
         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)
                 .subscribe(o -> {
 

+ 3 - 2
app/src/main/res/layout/fragment_hw_watch_home_layout.xml

@@ -27,7 +27,7 @@
             app:srlTextRefreshing="正在同步数据..."
             app:srlTextRelease="释放立即同步" />
 
-        <com.syjk.watch.dealer.ui.widget.BounceScrollView
+        <ScrollView
             android:id="@+id/scroll_view"
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
@@ -728,6 +728,7 @@
 
 
                 <com.lihang.ShadowLayout
+                    android:id="@+id/wx_jump"
                     app:hl_cornerRadius="22mm"
                     app:hl_shadowLimit="4dp"
                     app:hl_shadowOffsetY="1.5dp"
@@ -746,6 +747,6 @@
                 </com.lihang.ShadowLayout>
 
             </LinearLayout>
-        </com.syjk.watch.dealer.ui.widget.BounceScrollView>
+        </ScrollView>
     </com.scwang.smartrefresh.layout.SmartRefreshLayout>
 </LinearLayout>

+ 1 - 0
app/src/main/res/layout/fragment_watch_home.xml

@@ -906,6 +906,7 @@
 
 
                 <com.lihang.ShadowLayout
+                    android:id="@+id/wx_jump"
                     app:hl_cornerRadius="10mm"
                     app:hl_shadowLimit="4dp"
                     app:hl_shadowOffsetY="1.5dp"

+ 1 - 1
app/src/main/res/layout/fragment_watch_person.xml

@@ -127,7 +127,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="144mm"
                 android:background="@color/color_ffffff"
-                android:visibility="gone">
+                android:visibility="visible">
 
                 <ImageView
                     android:layout_width="58mm"

+ 3 - 4
app/src/main/res/layout/view_hw_search_device_dialog_layout.xml

@@ -29,17 +29,16 @@
                 android:id="@+id/iv_retry"
                 android:layout_width="62mm"
                 android:layout_height="72mm"
-                android:visibility="gone"
                 android:layout_marginEnd="39mm"
-                android:background="@drawable/iv_hw_retry" />
+                android:background="@drawable/iv_hw_retry"
+                android:visibility="gone" />
 
             <ImageView
                 android:id="@+id/iv_loading"
                 android:layout_width="72mm"
                 android:layout_height="72mm"
                 android:layout_marginEnd="39mm"
-                android:background="@drawable/ic_icon_loding_24"
-                android:visibility="visible" />
+                android:background="@drawable/ic_icon_loding_24" />
         </FrameLayout>
     </RelativeLayout>
 

+ 2 - 2
app/syjk/release/output-metadata.json

@@ -11,10 +11,10 @@
       "type": "SINGLE",
       "filters": [],
       "properties": [],
-      "versionCode": 202309010,
+      "versionCode": 202309051,
       "versionName": "1.0.0",
       "enabled": true,
-      "outputFile": "2023-09-02-15-54-17.apk"
+      "outputFile": "2023-09-05-11-05-35.apk"
     }
   ]
 }

+ 1 - 1
config.gradle

@@ -1,7 +1,7 @@
 ext {
     //version配置
     versions = [
-            "version-code": 202309010,
+            "version-code": 202309051,
             "watch-sdk-version": "1.0.0"
     ]
 }