Browse Source

1.更换地址

shihuiyun 2 years ago
parent
commit
6a22d84b26

+ 2 - 1
app/src/main/java/com/hdl/xl/activity/InviteActivity.kt

@@ -15,6 +15,7 @@ import com.hdl.xl.vmodel.InviteVModel
 import com.hdl.xl.vmodel.MsgVModel
 import com.qmuiteam.qmui.kotlin.onClick
 import com.uuzuche.lib_zxing.activity.CodeUtils
+import com.ysnows.base.base.BApp
 import com.ysnows.base.utils.UiSwitch
 
 class InviteActivity : MBRActivity<InviteVModel, InviteAdapter, ActivityInviteBinding>() {
@@ -28,7 +29,7 @@ class InviteActivity : MBRActivity<InviteVModel, InviteAdapter, ActivityInviteBi
         //设置二维码
 
         var code= User.get()?.invite_code
-        var url="https://xlapi.xiangliannft.com/h5/pages/mine/zhuce?invite_code=$code"
+        var url= BApp.instance()!!.config()!!.searchUrl()+"h5/pages/mine/zhuce?invite_code=$code"
 
         Log.e("--", "url=: "+url )
         //生成二维码

+ 6 - 5
app/src/main/java/com/hdl/xl/config/Config.kt

@@ -6,20 +6,21 @@ import com.ysnows.base.config.IConfig
 object  Config : IConfig {
     override fun baseUrl(): String {
 
-
-
       // return "https://xlapi.xiangliannft.com/api/" //正式地址
         return "https://xianglian-api.hdlkeji.com/api/"//测试地址
 
     }
 
+    override fun searchUrl(): String? {
+        return "https://xianglian-api.hdlkeji.com/"//测试地址
+        // return "https://xlapi.xiangliannft.com/" //正式地址
+    }
+
+
     override fun BBDCUrl(): String? {
         return "https://1tyy.cn/"
     }
 
-    override fun searchUrl(): String? {
-        return null
-    }
 
     override fun imageUrl(): String? {
         return null

+ 1 - 0
app/src/main/java/com/hdl/xl/utils/PopuDownWxUtils.kt

@@ -96,6 +96,7 @@ object PopuDownWxUtils {
         tvName.text = User.get()?.name
         //生成二维码
 
+        //shareUrl:https://xlapi.xiangliannft.com/h5/pages/index/goodsinfo
         var z_shareurl = shareUrl + "?id=$id" + "&invite_code=" + User.get()?.invite_code
         var mBitmap = CodeUtils.createImage(z_shareurl, 400, 400, null)
         imgCode.setImageBitmap(mBitmap)

+ 2 - 1
app/src/main/java/com/hdl/xl/vmodel/CollectDetailsVModel.kt

@@ -23,6 +23,7 @@ import com.hdl.xl.utils.PopuDownWxUtils
 import com.hdl.xl.utils.PopuTipsUtils
 import com.hdl.xl.utils.net.NetEngine
 import com.hwangjr.rxbus.RxBus
+import com.ysnows.base.base.BApp
 import com.ysnows.base.base.BRepository
 import com.ysnows.base.base.BViewModel
 import com.ysnows.base.utils.B
@@ -118,7 +119,7 @@ class CollectDetailsVModel(application: Application) : BViewModel<BRepository>(a
 
         PopuDownWxUtils.show(repository().context!!,
                 shareUrl!!, data.value?.name, data.value?.id,
-                "https://xlapi.xiangliannft.com/h5/pages/index/goodsinfo",
+                BApp.instance()!!.config()!!.searchUrl()+"h5/pages/index/goodsinfo",
                 ll!!, repository().context!!.contentResolver)
 
         // PopuShareWxUtils.show(repository().context!!, shareUrl!!, ll!!,repository().context!!.contentResolver)

+ 2 - 1
app/src/main/java/com/hdl/xl/vmodel/LotsDetailsVModel.kt

@@ -24,6 +24,7 @@ import com.hdl.xl.utils.PopuBuyUtils
 import com.hdl.xl.utils.PopuDownWxUtils
 import com.hdl.xl.utils.TimeUtils
 import com.hdl.xl.utils.net.NetEngine
+import com.ysnows.base.base.BApp
 import com.ysnows.base.utils.B
 import com.ysnows.base.utils.UiSwitch
 import kotlinx.coroutines.launch
@@ -316,7 +317,7 @@ class LotsDetailsVModel(application: Application) : BViewModel<BRepository>(appl
         }
         PopuDownWxUtils.show(repository().context!!,
                 shareUrl!!,data.value?.name,data.value?.id,
-                "https://xlapi.xiangliannft.com/h5/pages/index/goodsinfo",
+                BApp.instance()!!.config()!!.searchUrl()+"h5/pages/index/goodsinfo",
                 ll!!,repository().context!!.contentResolver)
 
        // PopuShareWxUtils.show(repository().context!!, shareUrl!!, ll!!,repository().context!!.contentResolver)

+ 2 - 1
app/src/main/java/com/hdl/xl/vmodel/SellDetailsVModel.kt

@@ -25,6 +25,7 @@ import com.hdl.xl.utils.PopuDownWxUtils
 import com.hdl.xl.utils.PopuTipsUtils
 import com.hdl.xl.utils.net.NetEngine
 import com.hwangjr.rxbus.RxBus
+import com.ysnows.base.base.BApp
 import kotlinx.coroutines.launch
 
 class SellDetailsVModel(application: Application) : BViewModel<BRepository>(application)  {
@@ -92,7 +93,7 @@ class SellDetailsVModel(application: Application) : BViewModel<BRepository>(appl
 
         PopuDownWxUtils.show(repository().context!!,
                 shareUrl!!,data.value?.name,data.value?.id,
-                "https://xlapi.xiangliannft.com/h5/pages/index/goodsinfo",
+                BApp.instance()!!.config()!!.searchUrl()+"h5/pages/index/goodsinfo",
                 ll!!,repository().context!!.contentResolver)
 
         // PopuShareWxUtils.show(repository().context!!, shareUrl!!, ll!!,repository().context!!.contentResolver)

+ 2 - 1
app/src/main/java/com/hdl/xl/vmodel/TibetanDetailsVModel.kt

@@ -18,6 +18,7 @@ import com.hdl.xl.model.TibetaDetails
 import com.hdl.xl.utils.PopuBuyUtils
 import com.hdl.xl.utils.PopuDownWxUtils
 import com.hdl.xl.utils.net.NetEngine
+import com.ysnows.base.base.BApp
 import kotlinx.coroutines.launch
 
 class TibetanDetailsVModel(application: Application) : BViewModel<BRepository>(application)  {
@@ -110,7 +111,7 @@ class TibetanDetailsVModel(application: Application) : BViewModel<BRepository>(a
 
         PopuDownWxUtils.show(repository().context!!,
                 shareUrl!!,data.value?.name,data.value?.id,
-                "https://xlapi.xiangliannft.com/h5/pages/index/goodsinfo",
+                BApp.instance()!!.config()!!.searchUrl()+"h5/pages/index/goodsinfo",
                 ll!!,repository().context!!.contentResolver)
 
        // PopuShareWxUtils.show(repository().context!!, shareUrl!!, ll!!,repository().context!!.contentResolver)