2025-4-24

问题调整提交

app/build.gradle

@@ -11,8 +11,8 @@ android {
         applicationId "com.yihucha.hbyhc"
         minSdk 21
         targetSdk 33
-        versionCode 1
-        versionName "1.0"
+        versionCode 2001
+        versionName "20.0.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         ndk {

app/src/main/java/com/yihucha/hbyhc/config/HttpUrl.java

@@ -5,7 +5,7 @@ package com.yihucha.hbyhc.config;
  */
 public class HttpUrl {
     // 生产还是测试
-    public static boolean IS_RELEASE = false;
+    public static boolean IS_RELEASE = true;
     //生成·
 //    public static String BASE_URL_RELEASE = "https://app.bjtdba.com/";
     public static String BASE_URL_RELEASE = "https://api.hxxfb.com/";

app/src/main/java/com/yihucha/hbyhc/presentation/pyyx/activity/PyyxProductDetailActivity.kt

@@ -880,7 +880,7 @@ class PyyxProductDetailActivity : ViewBindingBaseActivity<ActivityPyyxProductDet
                 //小程序页面路径
                 umMin.userName = Constants.APPLET_ID
 
-                Config.setMiniPreView();
+//                Config.setMiniPreView();
                 // 小程序原始id,在微信平台查询
                 ShareAction(this@PyyxProductDetailActivity)
                     .withMedia(umMin)

app/src/main/java/com/yihucha/hbyhc/presentation/pyyx/activity/ThirdPartProductDetailActivity.kt

@@ -125,7 +125,7 @@ class ThirdPartProductDetailActivity :
     @SuppressLint("SetTextI18n")
     private fun initData() {
         productDetailsViewModel!!.jdUrlLiveData.observe(this){
-            dialog.dismiss()
+//            dialog.dismiss()
             materialUrl = it
         }
         if (Constants.JINGDONG == merchandiseType) {
@@ -134,7 +134,7 @@ class ThirdPartProductDetailActivity :
             productDetailsViewModel!!.mJdProductDetailsData.observe(
                 this
             ) { jdProductDetailsBean -> //轮播
-//                dialog.dismiss()
+                dialog.dismiss()
                 productDetailsViewModel!!.requestJDUrl(jdProductDetailsBean.discount_link,skuId)
                 val slider_image = mutableListOf<String>()
                 slider_image.add(jdProductDetailsBean.imgUrl)

app/src/main/res/layout/activity_login_home.xml

@@ -49,7 +49,9 @@
         android:gravity="center"
         android:text="@string/phone_login_tes"
         android:textColor="@color/gray_9e9e9e"
-        android:textSize="15sp" />
+        android:textSize="15sp"
+        android:visibility="gone"
+        />
 
     <ImageView
         android:id="@+id/iv_tes"

app/src/main/res/layout/activity_phone_setting.xml

@@ -5,7 +5,37 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:padding="23dp">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/permission_dp_20"
+        android:layout_marginTop="30dp"
+        android:layout_marginEnd="@dimen/permission_dp_20"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
 
+            <EditText
+                android:id="@+id/et_phone_new"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:background="@null"
+                android:hint="@string/input_phone_new"
+                android:inputType="phone"
+                android:textSize="15sp" />
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0.5dp"
+            android:layout_marginTop="11dp"
+            android:background="@color/gray_e5e5e5" />
+    </LinearLayout>
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="54dp"
@@ -53,39 +83,6 @@
             android:layout_marginTop="11dp"
             android:background="@color/gray_e5e5e5" />
     </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/permission_dp_20"
-        android:layout_marginTop="30dp"
-        android:layout_marginEnd="@dimen/permission_dp_20"
-        android:orientation="vertical">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <EditText
-                android:id="@+id/et_phone_new"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:background="@null"
-                android:hint="@string/input_phone"
-                android:inputType="phone"
-                android:textSize="15sp" />
-
-        </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="0.5dp"
-            android:layout_marginTop="11dp"
-            android:background="@color/gray_e5e5e5" />
-    </LinearLayout>
-
     <LinearLayout
         android:id="@+id/linearLayout"
         android:layout_width="match_parent"