1.积分商城相关UI

app/build.gradle

@@ -27,10 +27,10 @@ android {
     signingConfigs {
 
         release {
-            keyAlias "creativity"
-            keyPassword "creativity@###121"
-            storeFile file("../creativity.jks")
-            storePassword "creativity@###121"
+            keyAlias "xianglian"
+            keyPassword "xianglian@###121"
+            storeFile file("../xianglian.jks")
+            storePassword "xianglian@###121"
             v2SigningEnabled true
         }
     }

app/proguard-rules.pro

@@ -390,7 +390,7 @@
 -keep public class com.google.gson.** {public private protected *;}
 -keep public class com.project.mocha_patient.login.SignResponseData { private *; }
 # Application classes that will be serialized/deserialized over Gson
--keep class com.zswc.creativity.model.** { *; }
+-keep class com.hdl.xl.model.** { *; }
 -keep class com.ysnows.base.model.** { *; }
 -keep class com.ysnows.base.route.** { *; }
 

app/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.zswc.creativity" >
+    package="com.hdl.xl" >
 
     <!-- 如果有视频相关的广告且使用textureView播放，请务必添加，否则黑屏 -->
     <uses-permission android:name="android.permission.WAKE_LOCK" />
@@ -37,7 +37,7 @@
         <package android:name="com.tencent.mm" />
     </queries >
     <application
-        android:name="com.zswc.creativity.App"
+        android:name="com.hdl.xl.App"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
@@ -62,7 +62,7 @@
 
 <!--    HomeActivity    MainActivity-->
         <activity
-            android:name="com.zswc.creativity.activity.MainActivity"
+            android:name="com.hdl.xl.activity.MainActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustResize|adjustPan"
             android:theme="@style/FullScreenTheme" >
@@ -72,52 +72,52 @@
             </intent-filter >
         </activity >
 
-        <activity android:name="com.zswc.creativity.activity.LoginActivity"/>
+        <activity android:name="com.hdl.xl.activity.LoginActivity"/>
 
         <activity
-            android:name="com.zswc.creativity.activity.OneLoginActivity"
+            android:name="com.hdl.xl.activity.OneLoginActivity"
             android:launchMode="singleTask" />
 
 
 <!--        <activity android:name=".activity.LoginActivity" />-->
-        <activity android:name="com.zswc.creativity.activity.RegisterActivity" />
-        <activity android:name="com.zswc.creativity.activity.WebViewActivity" />
-        <activity android:name="com.zswc.creativity.activity.CustomErrorActivity"/>
-        <activity android:name="com.zswc.creativity.activity.TestMainActivity"/>
-        <activity android:name="com.zswc.creativity.activity.SettingActivity"/>
-        <activity android:name="com.zswc.creativity.activity.SpreadActivity"/>
-        <activity android:name="com.zswc.creativity.activity.MyInfoActivity"/>
-        <activity android:name="com.zswc.creativity.activity.AccountSafeActivity"/>
-        <activity android:name="com.zswc.creativity.activity.ChangePasswordActivity"/>
-        <activity android:name="com.zswc.creativity.activity.BindBankActivity"/>
-        <activity android:name=".activity.BoundBankActivity"/>
-        <activity android:name="com.zswc.creativity.activity.MyWalletActivity"/>
-        <activity android:name="com.zswc.creativity.activity.WithdrawActivity"/>
-        <activity android:name="com.zswc.creativity.activity.PaySuessActivity"/>
-        <activity android:name=".activity.ConvetSuessActivity"/>
-        <activity android:name="com.zswc.creativity.activity.TibOrderActivity"/>
-        <activity android:name="com.zswc.creativity.activity.GiftOrderActivity"/>
-        <activity android:name="com.zswc.creativity.activity.WithdrawSuessActivity"/>
-        <activity android:name=".activity.AuthenActivity"/>
-        <activity android:name=".activity.MyCollectActivity"/>
-        <activity android:name=".activity.CollectDetailsActivity"/>
-        <activity android:name=".activity.TrannsferActivity"/>
-        <activity android:name=".activity.IntegralDetailsActivity"/>
-        <activity android:name=".activity.SureOrderActivity"/>
-        <activity android:name=".activity.MallActivity"/>
-        <activity android:name=".activity.MallOrderActivity"/>
-        <activity android:name=".activity.AddressActivity"/>
-        <activity android:name=".activity.AddAddressActivity"/>
-        <activity android:name=".activity.AllCollectDetailsActivity"/>
+        <activity android:name="com.hdl.xl.activity.RegisterActivity" />
+        <activity android:name="com.hdl.xl.activity.WebViewActivity" />
+        <activity android:name="com.hdl.xl.activity.CustomErrorActivity"/>
+        <activity android:name="com.hdl.xl.activity.TestMainActivity"/>
+        <activity android:name="com.hdl.xl.activity.SettingActivity"/>
+        <activity android:name="com.hdl.xl.activity.SpreadActivity"/>
+        <activity android:name="com.hdl.xl.activity.MyInfoActivity"/>
+        <activity android:name="com.hdl.xl.activity.AccountSafeActivity"/>
+        <activity android:name="com.hdl.xl.activity.ChangePasswordActivity"/>
+        <activity android:name="com.hdl.xl.activity.BindBankActivity"/>
+        <activity android:name="com.hdl.xl.activity.BoundBankActivity"/>
+        <activity android:name="com.hdl.xl.activity.MyWalletActivity"/>
+        <activity android:name="com.hdl.xl.activity.WithdrawActivity"/>
+        <activity android:name="com.hdl.xl.activity.PaySuessActivity"/>
+        <activity android:name="com.hdl.xl.activity.ConvetSuessActivity"/>
+        <activity android:name="com.hdl.xl.activity.TibOrderActivity"/>
+        <activity android:name="com.hdl.xl.activity.GiftOrderActivity"/>
+        <activity android:name="com.hdl.xl.activity.WithdrawSuessActivity"/>
+        <activity android:name="com.hdl.xl.activity.AuthenActivity"/>
+        <activity android:name="com.hdl.xl.activity.MyCollectActivity"/>
+        <activity android:name="com.hdl.xl.activity.CollectDetailsActivity"/>
+        <activity android:name="com.hdl.xl.activity.TrannsferActivity"/>
+        <activity android:name="com.hdl.xl.activity.IntegralDetailsActivity"/>
+        <activity android:name="com.hdl.xl.activity.SureOrderActivity"/>
+        <activity android:name="com.hdl.xl.activity.MallActivity"/>
+        <activity android:name="com.hdl.xl.activity.MallOrderActivity"/>
+        <activity android:name="com.hdl.xl.activity.AddressActivity"/>
+        <activity android:name="com.hdl.xl.activity.AddAddressActivity"/>
+        <activity android:name="com.hdl.xl.activity.AllCollectDetailsActivity"/>
 
 
         <activity
-            android:name="com.zswc.creativity.wxapi.WXEntryActivity"
+            android:name="com.hdl.xl.wxapi.WXEntryActivity"
             android:exported="true"
             android:launchMode="singleTask"
             android:taskAffinity="com.quansu.heifengwuliu" />
         <activity
-            android:name="com.zswc.creativity.wxapi.WXPayEntryActivity"
+            android:name="com.hdl.xl.wxapi.WXPayEntryActivity"
             android:exported="true"
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
@@ -132,31 +132,32 @@
             </intent-filter >
         </activity >
 
-        <activity android:name="com.zswc.creativity.activity.MsgActivity" >
+        <activity android:name="com.hdl.xl.activity.MsgActivity" >
             <intent-filter>
                 <action android:name="jpush.testAction" />
                 <category android:name="jpush.testCategory" />
             </intent-filter>
         </activity>
-        <activity android:name="com.zswc.creativity.activity.AccountActivity" />
+        <activity android:name="com.hdl.xl.activity.AccountActivity" />
 
-        <activity android:name="com.zswc.creativity.activity.AreaSelectActivity"/>
+        <activity android:name="com.hdl.xl.activity.AreaSelectActivity"/>
+        <activity android:name="com.hdl.xl.activity.GivenActivity"/>
 
 
-        <activity android:name="com.zswc.creativity.activity.PasswordActivity"/>
+        <activity android:name="com.hdl.xl.activity.PasswordActivity"/>
 
-        <activity android:name="com.zswc.creativity.activity.BankActivity"/>
-        <activity android:name="com.zswc.creativity.activity.WithdrawalActivity"/>
+        <activity android:name="com.hdl.xl.activity.BankActivity"/>
+        <activity android:name="com.hdl.xl.activity.WithdrawalActivity"/>
 
-        <activity android:name="com.zswc.creativity.activity.RechargeActivity"/>
-        <activity android:name="com.zswc.creativity.activity.OpinionActivity"/>
-        <activity android:name="com.zswc.creativity.activity.ForgetPasswordActivity"/>
-        <activity android:name="com.zswc.creativity.activity.ArticleDetailActivity"/>
-        <activity android:name="com.zswc.creativity.activity.MyOrderActivity"/>
-        <activity android:name=".activity.RecordActivity"/>
-        <activity android:name="com.zswc.creativity.activity.ConsignmentOrderActivity"/>
-        <activity android:name="com.zswc.creativity.activity.CertificationActivity"/>
-        <activity android:name="com.zswc.creativity.activity.TibetanDetailsActivity"
+        <activity android:name="com.hdl.xl.activity.RechargeActivity"/>
+        <activity android:name="com.hdl.xl.activity.OpinionActivity"/>
+        <activity android:name="com.hdl.xl.activity.ForgetPasswordActivity"/>
+        <activity android:name="com.hdl.xl.activity.ArticleDetailActivity"/>
+        <activity android:name="com.hdl.xl.activity.MyOrderActivity"/>
+        <activity android:name="com.hdl.xl.activity.RecordActivity"/>
+        <activity android:name="com.hdl.xl.activity.ConsignmentOrderActivity"/>
+        <activity android:name="com.hdl.xl.activity.CertificationActivity"/>
+        <activity android:name="com.hdl.xl.activity.TibetanDetailsActivity"
                android:hardwareAccelerated="false"
             />
 

app/src/main/java/com/zswc/creativity/App.kt → app/src/main/java/com/hdl/xl/App.kt

@@ -1,4 +1,4 @@
-package com.zswc.creativity
+package com.hdl.xl
 
 import android.speech.tts.TextToSpeech
 import cat.ereza.customactivityoncrash.config.CaocConfig
@@ -6,8 +6,8 @@ import com.uuzuche.lib_zxing.activity.ZXingLibrary
 import com.ysnows.base.base.BApp
 import com.ysnows.base.config.IConfig
 import com.ysnows.update.component.UpdateUtils
-import com.zswc.creativity.activity.CustomErrorActivity
-import com.zswc.creativity.config.Config
+import com.hdl.xl.activity.CustomErrorActivity
+import com.hdl.xl.config.Config
 import java.util.*
 
 
@@ -19,10 +19,10 @@ class App : BApp(){
     override fun init() {
         config = Config
 
-        instance = this
+        com.hdl.xl.App.Companion.instance = this
 
-        tts = TextToSpeech(applicationContext) { status ->
-            if (status == TextToSpeech.SUCCESS) tts?.language = Locale.CHINESE
+        com.hdl.xl.App.Companion.tts = TextToSpeech(applicationContext) { status ->
+            if (status == TextToSpeech.SUCCESS) com.hdl.xl.App.Companion.tts?.language = Locale.CHINESE
         }
 
         UpdateUtils.init(this)
@@ -64,7 +64,7 @@ class App : BApp(){
         var tts: TextToSpeech? = null
 
 
-        lateinit var instance: App
+        lateinit var instance: com.hdl.xl.App
 
 
     }

app/src/main/java/com/zswc/creativity/activity/AccountActivity.kt → app/src/main/java/com/hdl/xl/activity/AccountActivity.kt

@@ -1,13 +1,13 @@
-package com.zswc.creativity.activity
+package com.hdl.xl.activity
 
 import androidx.fragment.app.Fragment
 import com.qmuiteam.qmui.widget.tab.QMUITab
 import com.qmuiteam.qmui.widget.tab.QMUITabBuilder
-import com.zswc.creativity.R
-import com.zswc.creativity.base.MBTabActivity
-import com.zswc.creativity.databinding.ActivityAccountBinding
-import com.zswc.creativity.fragment.AccountAnalysisFragment
-import com.zswc.creativity.fragment.AccountBillFragment
+import com.hdl.xl.R
+import com.hdl.xl.base.MBTabActivity
+import com.hdl.xl.databinding.ActivityAccountBinding
+import com.hdl.xl.fragment.AccountAnalysisFragment
+import com.hdl.xl.fragment.AccountBillFragment
 import com.ysnows.base.base.BRepository
 import com.ysnows.base.base.BViewModel
 

app/src/main/java/com/zswc/creativity/activity/AccountSafeActivity.kt → app/src/main/java/com/hdl/xl/activity/AccountSafeActivity.kt

@@ -1,13 +1,9 @@
-package com.zswc.creativity.activity
+package com.hdl.xl.activity
 
 import android.os.Bundle
-import com.zswc.creativity.base.MBActivity
-import com.zswc.creativity.databinding.ActivityAccountSafeBinding
-import com.zswc.creativity.databinding.ActivityMyInfoBinding
-import com.zswc.creativity.databinding.ActivitySpreadBinding
-import com.zswc.creativity.vmodel.AccountSafeVModel
-import com.zswc.creativity.vmodel.MyInfoVModel
-import com.zswc.creativity.vmodel.SpreadVModel
+import com.hdl.xl.base.MBActivity
+import com.hdl.xl.databinding.ActivityAccountSafeBinding
+import com.hdl.xl.vmodel.AccountSafeVModel
 
 /**
  * 我的账户信息

app/src/main/java/com/zswc/creativity/activity/AddAddressActivity.kt → app/src/main/java/com/hdl/xl/activity/AddAddressActivity.kt

@@ -1,8 +1,8 @@
-package com.zswc.creativity.activity
+package com.hdl.xl.activity
 
-import com.zswc.creativity.base.MBActivity
-import com.zswc.creativity.databinding.ActivityAddAddressBinding
-import com.zswc.creativity.vmodel.AddAddressVModel
+import com.hdl.xl.base.MBActivity
+import com.hdl.xl.databinding.ActivityAddAddressBinding
+import com.hdl.xl.vmodel.AddAddressVModel
 
 /**
  *on 2022/7/29

app/src/main/java/com/zswc/creativity/activity/AddressActivity.kt → app/src/main/java/com/hdl/xl/activity/AddressActivity.kt

@@ -1,8 +1,8 @@
-package com.zswc.creativity.activity
+package com.hdl.xl.activity
 
-import com.zswc.creativity.base.MBActivity
-import com.zswc.creativity.databinding.ActivityAddressBinding
-import com.zswc.creativity.vmodel.AddressVModel
+import com.hdl.xl.base.MBActivity
+import com.hdl.xl.databinding.ActivityAddressBinding
+import com.hdl.xl.vmodel.AddressVModel
 
 /**
  *on 2022/7/29

app/src/main/java/com/zswc/creativity/activity/AllCollectDetailsActivity.kt → app/src/main/java/com/hdl/xl/activity/AllCollectDetailsActivity.kt

@@ -1,30 +1,20 @@
-package com.zswc.creativity.activity
+package com.hdl.xl.activity
 
 import android.graphics.Color
 import android.os.Build
-import android.os.Build.VERSION.SDK_INT
 import android.os.Bundle
 import android.text.TextUtils
 import android.view.KeyEvent
 import android.view.View
-import coil.ImageLoader
-import coil.decode.GifDecoder
-import coil.decode.ImageDecoderDecoder
-import coil.load
 import coil.request.Disposable
-import coil.transform.RoundedCornersTransformation
 import com.githang.statusbar.StatusBarCompat
 import com.qmuiteam.qmui.kotlin.onClick
 import com.ysnows.base.utils.UiUtils
-import com.zswc.creativity.R
-import com.zswc.creativity.base.MBActivity
-import com.zswc.creativity.databinding.ActivityAllCollectDetailsBinding
-import com.zswc.creativity.databinding.ActivityCollectDetailsBinding
-import com.zswc.creativity.utils.ColorUtils
-import com.zswc.creativity.utils.glide.GlideUtils
-import com.zswc.creativity.view.MyScrollView
-import com.zswc.creativity.vmodel.AllCollectDetailsVModel
-import com.zswc.creativity.vmodel.CollectDetailsVModel
+import com.hdl.xl.R
+import com.hdl.xl.base.MBActivity
+import com.hdl.xl.databinding.ActivityAllCollectDetailsBinding
+import com.hdl.xl.utils.glide.GlideUtils
+import com.hdl.xl.vmodel.AllCollectDetailsVModel
 import java.text.DecimalFormat
 
 /**
@@ -196,7 +186,7 @@ class AllCollectDetailsActivity : MBActivity<AllCollectDetailsVModel, ActivityAl
 
                 // float a = y / height;//0~1
                 val ratio = 255 - (255 * a).toFloat() //255-(0~255)=255~0
-                val bgColor: Int = ColorUtils.getColorWithAlpha(Color.parseColor("#FFFFFF"), ratio)
+                val bgColor: Int = com.hdl.xl.utils.ColorUtils.getColorWithAlpha(Color.parseColor("#FFFFFF"), ratio)
                 binding.llShowTwo.setBackgroundColor(bgColor)
                 binding.tvShowTitle.alpha = a
 

app/src/main/java/com/zswc/creativity/activity/AreaSelectActivity.kt → app/src/main/java/com/hdl/xl/activity/AreaSelectActivity.kt

@@ -1,21 +1,19 @@
-package com.zswc.creativity.activity
+package com.hdl.xl.activity
 
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
 import android.text.TextUtils
 import com.qmuiteam.qmui.kotlin.onClick
-import com.zswc.creativity.R
-import com.zswc.creativity.adapter.AreaSelectAdapter
-import com.zswc.creativity.base.MBRActivity
-import com.zswc.creativity.databinding.ActivityAreaselectBinding
-import com.zswc.creativity.model.AreaBean
-import com.zswc.creativity.vmodel.AreaSelectVModel
+import com.hdl.xl.R
+import com.hdl.xl.base.MBRActivity
+import com.hdl.xl.databinding.ActivityAreaselectBinding
+import com.hdl.xl.vmodel.AreaSelectVModel
 import com.ysnows.base.net.IResp
 import java.lang.Exception
 
 //城市选择
-class AreaSelectActivity : MBRActivity<AreaSelectVModel, AreaSelectAdapter, ActivityAreaselectBinding>() {
+class AreaSelectActivity : MBRActivity<AreaSelectVModel, com.hdl.xl.adapter.AreaSelectAdapter, ActivityAreaselectBinding>() {
 
     var type = 1
     var name = ""
@@ -68,7 +66,7 @@ class AreaSelectActivity : MBRActivity<AreaSelectVModel, AreaSelectAdapter, Acti
         }
 
         adapter().setOnItemClickListener { adapter, view, position ->
-            var bean = adapter.getItem(position) as AreaBean
+            var bean = adapter.getItem(position) as com.hdl.xl.model.AreaBean
 
             if (type == 1) {
                 vm.code = bean.code
@@ -114,7 +112,7 @@ class AreaSelectActivity : MBRActivity<AreaSelectVModel, AreaSelectAdapter, Acti
         return getStr(R.string.chose_city)!!
     }
 
-    override fun initAdapter(): AreaSelectAdapter = AreaSelectAdapter(vm)
+    override fun initAdapter(): com.hdl.xl.adapter.AreaSelectAdapter = com.hdl.xl.adapter.AreaSelectAdapter(vm)
 
 
     override fun binding(): ActivityAreaselectBinding {

app/src/main/java/com/zswc/creativity/activity/ArticleDetailActivity.kt → app/src/main/java/com/hdl/xl/activity/ArticleDetailActivity.kt

@@ -1,4 +1,4 @@
-package com.zswc.creativity.activity
+package com.hdl.xl.activity
 
 import android.annotation.SuppressLint
 import android.graphics.Color
@@ -11,12 +11,11 @@ import android.webkit.WebView.HitTestResult
 import androidx.lifecycle.Observer
 import com.google.gson.Gson
 import com.hwangjr.rxbus.RxBus
-import com.zswc.creativity.base.MBActivity
-import com.zswc.creativity.config.ConfigRx
-import com.zswc.creativity.databinding.ActivityArticleDetailBinding
-import com.zswc.creativity.model.MsgList
-import com.zswc.creativity.utils.WebViewUtils
-import com.zswc.creativity.vmodel.ArticleDetailVModel
+import com.hdl.xl.base.MBActivity
+import com.hdl.xl.config.ConfigRx
+import com.hdl.xl.databinding.ActivityArticleDetailBinding
+import com.hdl.xl.model.MsgList
+import com.hdl.xl.vmodel.ArticleDetailVModel
 import java.util.*
 
 
@@ -87,7 +86,7 @@ class ArticleDetailActivity: MBActivity<ArticleDetailVModel, ActivityArticleDeta
 
     fun inData(content:String){
 
-        binding.webContent.loadDataWithBaseURL(null, WebViewUtils.getHtmlData2(content), "text/html", "utf-8", null)
+        binding.webContent.loadDataWithBaseURL(null, com.hdl.xl.utils.WebViewUtils.getHtmlData2(content), "text/html", "utf-8", null)
 
     }
 

app/src/main/java/com/zswc/creativity/activity/AuthenActivity.kt → app/src/main/java/com/hdl/xl/activity/AuthenActivity.kt

@@ -1,16 +1,10 @@
-package com.zswc.creativity.activity
+package com.hdl.xl.activity
 
 import android.os.Bundle
 import android.text.TextUtils
-import com.zswc.creativity.base.MBActivity
-import com.zswc.creativity.databinding.ActivityAuthenBinding
-import com.zswc.creativity.databinding.ActivityPaySuessBinding
-import com.zswc.creativity.databinding.ActivityWithdrawBinding
-import com.zswc.creativity.databinding.ActivityWithdrawSuessBinding
-import com.zswc.creativity.model.User
-import com.zswc.creativity.vmodel.AuthenVModel
-import com.zswc.creativity.vmodel.PaySuessVModel
-import com.zswc.creativity.vmodel.WithdrawSuessVModel
+import com.hdl.xl.base.MBActivity
+import com.hdl.xl.databinding.ActivityAuthenBinding
+import com.hdl.xl.vmodel.AuthenVModel
 
 /**
  * 认证成功界面
@@ -22,7 +16,7 @@ class AuthenActivity : MBActivity<AuthenVModel, ActivityAuthenBinding>() {
     override fun init(savedInstanceState: Bundle?) {
         super.init(savedInstanceState)
 
-        var user=User.get()
+        var user= com.hdl.xl.model.User.get()
         var name=user?.true_name
         var id_card=user?.id_card
         if(!TextUtils.isEmpty(name)) {

app/src/main/java/com/zswc/creativity/activity/BankActivity.kt → app/src/main/java/com/hdl/xl/activity/BankActivity.kt

@@ -1,4 +1,4 @@
-package com.zswc.creativity.activity
+package com.hdl.xl.activity
 
 import android.app.Activity
 import android.content.Intent
@@ -6,13 +6,12 @@ import android.os.Bundle
 import android.util.Log
 import androidx.core.net.toUri
 import com.luck.picture.lib.PictureSelector
-import com.zswc.creativity.base.MBActivity
-import com.zswc.creativity.config.MIntentAction
-import com.zswc.creativity.databinding.ActivityBankBinding
-import com.zswc.creativity.inte.OnUploadCallback
-import com.zswc.creativity.utils.FileUtils
-import com.zswc.creativity.utils.OssUtils
-import com.zswc.creativity.vmodel.BankVModel
+import com.hdl.xl.base.MBActivity
+import com.hdl.xl.config.MIntentAction
+import com.hdl.xl.databinding.ActivityBankBinding
+import com.hdl.xl.inte.OnUploadCallback
+import com.hdl.xl.utils.OssUtils
+import com.hdl.xl.vmodel.BankVModel
 import java.util.ArrayList
 
 /**
@@ -52,7 +51,7 @@ class BankActivity : MBActivity<BankVModel, ActivityBankBinding>(), OnUploadCall
 
                     val cr = this.contentResolver
 
-                    list.add( FileUtils.getFilePathFromContentUri(selectList[0].path.toUri(),cr))
+                    list.add( com.hdl.xl.utils.FileUtils.getFilePathFromContentUri(selectList[0].path.toUri(),cr))
 
                 }else{
                     list.add(selectList[0].path)
@@ -73,7 +72,7 @@ class BankActivity : MBActivity<BankVModel, ActivityBankBinding>(), OnUploadCall
             if(selectList[0].path.contains("content://")){
 
                 val cr = this.contentResolver
-                list.add( FileUtils.getFilePathFromContentUri(selectList[0].path.toUri(),cr))
+                list.add( com.hdl.xl.utils.FileUtils.getFilePathFromContentUri(selectList[0].path.toUri(),cr))
 
             }else{
                 list.add(selectList[0].path)

app/src/main/java/com/zswc/creativity/activity/BindBankActivity.kt → app/src/main/java/com/hdl/xl/activity/BindBankActivity.kt

@@ -1,9 +1,9 @@
-package com.zswc.creativity.activity
+package com.hdl.xl.activity
 
 import android.os.Bundle
-import com.zswc.creativity.base.MBActivity
-import com.zswc.creativity.databinding.*
-import com.zswc.creativity.vmodel.*
+import com.hdl.xl.base.MBActivity
+import com.hdl.xl.databinding.*
+import com.hdl.xl.vmodel.*
 
 /**
  * 绑定银行卡

app/src/main/java/com/zswc/creativity/activity/BoundBankActivity.kt → app/src/main/java/com/hdl/xl/activity/BoundBankActivity.kt

@@ -1,9 +1,9 @@
-package com.zswc.creativity.activity
+package com.hdl.xl.activity
 
 import android.os.Bundle
-import com.zswc.creativity.base.MBActivity
-import com.zswc.creativity.databinding.*
-import com.zswc.creativity.vmodel.*
+import com.hdl.xl.base.MBActivity
+import com.hdl.xl.databinding.*
+import com.hdl.xl.vmodel.*
 
 /**
  * 绑定银行卡

app/src/main/java/com/zswc/creativity/activity/CertificationActivity.kt → app/src/main/java/com/hdl/xl/activity/CertificationActivity.kt

@@ -1,13 +1,10 @@
-package com.zswc.creativity.activity
+package com.hdl.xl.activity
 
 import android.os.Bundle
 import android.text.TextUtils
-import com.zswc.creativity.base.MBActivity
-import com.zswc.creativity.databinding.ActivityCertificationBinding
-import com.zswc.creativity.databinding.ActivitySettingBinding
-import com.zswc.creativity.model.User
-import com.zswc.creativity.vmodel.CertificationVModel
-import com.zswc.creativity.vmodel.SettingVModel
+import com.hdl.xl.base.MBActivity
+import com.hdl.xl.databinding.ActivityCertificationBinding
+import com.hdl.xl.vmodel.CertificationVModel
 
 /**
  * 实名认证
@@ -18,7 +15,7 @@ class CertificationActivity : MBActivity<CertificationVModel, ActivityCertificat
 
     override fun init(savedInstanceState: Bundle?) {
         super.init(savedInstanceState)
-        var user=User.get()
+        var user= com.hdl.xl.model.User.get()
         if(null!=user){
             var phone=user.phone
             vm.realPhone.value=user.phone

app/src/main/java/com/zswc/creativity/activity/ChangePasswordActivity.kt → app/src/main/java/com/hdl/xl/activity/ChangePasswordActivity.kt

@@ -1,16 +1,9 @@
-package com.zswc.creativity.activity
+package com.hdl.xl.activity
 
 import android.os.Bundle
-import com.zswc.creativity.base.MBActivity
-import com.zswc.creativity.databinding.ActivityAccountSafeBinding
-import com.zswc.creativity.databinding.ActivityChangePasswordBinding
-import com.zswc.creativity.databinding.ActivityMyInfoBinding
-import com.zswc.creativity.databinding.ActivitySpreadBinding
-import com.zswc.creativity.model.User
-import com.zswc.creativity.vmodel.AccountSafeVModel
-import com.zswc.creativity.vmodel.ChangePageVModel
-import com.zswc.creativity.vmodel.MyInfoVModel
-import com.zswc.creativity.vmodel.SpreadVModel
+import com.hdl.xl.base.MBActivity
+import com.hdl.xl.databinding.ActivityChangePasswordBinding
+import com.hdl.xl.vmodel.ChangePageVModel
 
 /**
  * 修改密码
@@ -20,7 +13,7 @@ class ChangePasswordActivity : MBActivity<ChangePageVModel, ActivityChangePasswo
 
     override fun init(savedInstanceState: Bundle?) {
         super.init(savedInstanceState)
-        var user=User.get()
+        var user= com.hdl.xl.model.User.get()
         vm.phone.value=user?.phone
 
     }

app/src/main/java/com/zswc/creativity/activity/CollectDetailsActivity.kt → app/src/main/java/com/hdl/xl/activity/CollectDetailsActivity.kt

@@ -1,28 +1,20 @@
-package com.zswc.creativity.activity
+package com.hdl.xl.activity
 
 import android.graphics.Color
 import android.os.Build
-import android.os.Build.VERSION.SDK_INT
 import android.os.Bundle
 import android.text.TextUtils
 import android.view.KeyEvent
 import android.view.View
-import coil.ImageLoader
-import coil.decode.GifDecoder
-import coil.decode.ImageDecoderDecoder
-import coil.load
 import coil.request.Disposable
-import coil.transform.RoundedCornersTransformation
 import com.githang.statusbar.StatusBarCompat
 import com.qmuiteam.qmui.kotlin.onClick
 import com.ysnows.base.utils.UiUtils
-import com.zswc.creativity.R
-import com.zswc.creativity.base.MBActivity
-import com.zswc.creativity.databinding.ActivityCollectDetailsBinding
-import com.zswc.creativity.utils.ColorUtils
-import com.zswc.creativity.utils.glide.GlideUtils
-import com.zswc.creativity.view.MyScrollView
-import com.zswc.creativity.vmodel.CollectDetailsVModel
+import com.hdl.xl.R
+import com.hdl.xl.base.MBActivity
+import com.hdl.xl.databinding.ActivityCollectDetailsBinding
+import com.hdl.xl.utils.glide.GlideUtils
+import com.hdl.xl.vmodel.CollectDetailsVModel
 import java.text.DecimalFormat
 
 /**
@@ -196,7 +188,7 @@ class CollectDetailsActivity : MBActivity<CollectDetailsVModel, ActivityCollectD
 
             // float a = y / height;//0~1
             val ratio = 255 - (255 * a).toFloat() //255-(0~255)=255~0
-            val bgColor: Int = ColorUtils.getColorWithAlpha(Color.parseColor("#FFFFFF"), ratio)
+            val bgColor: Int = com.hdl.xl.utils.ColorUtils.getColorWithAlpha(Color.parseColor("#FFFFFF"), ratio)
             binding.llShowTwo.setBackgroundColor(bgColor)
             binding.tvShowTitle.alpha = a
 

app/src/main/java/com/zswc/creativity/activity/ConsignmentOrderActivity.kt → app/src/main/java/com/hdl/xl/activity/ConsignmentOrderActivity.kt

@@ -1,15 +1,14 @@
-package com.zswc.creativity.activity
+package com.hdl.xl.activity
 
 import android.os.Bundle
 import androidx.fragment.app.Fragment
 import com.qmuiteam.qmui.widget.tab.QMUITab
 import com.qmuiteam.qmui.widget.tab.QMUITabBuilder
 import com.ysnows.base.utils.B
-import com.zswc.creativity.base.MBTabActivity
-import com.zswc.creativity.databinding.ActivityConsignorderListBinding
-import com.zswc.creativity.fragment.ConsignOrderListFragment
-import com.zswc.creativity.fragment.OrderListFragment
-import com.zswc.creativity.vmodel.ConsignOrderVModel
+import com.hdl.xl.base.MBTabActivity
+import com.hdl.xl.databinding.ActivityConsignorderListBinding
+import com.hdl.xl.fragment.ConsignOrderListFragment
+import com.hdl.xl.vmodel.ConsignOrderVModel
 
 /**
  *寄售订单

app/src/main/java/com/zswc/creativity/activity/ConvetSuessActivity.kt → app/src/main/java/com/hdl/xl/activity/ConvetSuessActivity.kt

@@ -1,9 +1,9 @@
-package com.zswc.creativity.activity
+package com.hdl.xl.activity
 
 import android.os.Bundle
-import com.zswc.creativity.base.MBActivity
-import com.zswc.creativity.databinding.ActivityConvetSuessBinding
-import com.zswc.creativity.vmodel.ConvetSuessVModel
+import com.hdl.xl.base.MBActivity
+import com.hdl.xl.databinding.ActivityConvetSuessBinding
+import com.hdl.xl.vmodel.ConvetSuessVModel
 
 /**
  * 兑换成功界面

app/src/main/java/com/zswc/creativity/activity/CustomErrorActivity.kt → app/src/main/java/com/hdl/xl/activity/CustomErrorActivity.kt

@@ -1,4 +1,4 @@
-package com.zswc.creativity.activity
+package com.hdl.xl.activity
 
 import android.content.ClipData
 import android.content.ClipboardManager
@@ -6,9 +6,9 @@ import android.content.Context
 import android.os.Bundle
 import cat.ereza.customactivityoncrash.CustomActivityOnCrash
 import cat.ereza.customactivityoncrash.config.CaocConfig
+import com.hdl.xl.base.MBActivity
+import com.hdl.xl.databinding.ActivityErrorBinding
 import com.qmuiteam.qmui.kotlin.onClick
-import com.zswc.creativity.base.MBActivity
-import com.zswc.creativity.databinding.ActivityErrorBinding
 import com.ysnows.base.base.BRepository
 import com.ysnows.base.base.BViewModel
 

app/src/main/java/com/hdl/xl/activity/ForgetPasswordActivity.kt

@@ -0,0 +1,59 @@
+package com.hdl.xl.activity
+
+import android.graphics.Color
+import android.graphics.LinearGradient
+import android.graphics.Shader
+import android.os.Bundle
+import com.hdl.xl.base.MBActivity
+import com.hdl.xl.databinding.ActivityForgetPasswordBinding
+import com.hdl.xl.vmodel.ForgetPasswordVModel
+
+/**
+ *Created by shihuiyun
+ *on 2020/9/25
+ */
+class ForgetPasswordActivity : MBActivity<ForgetPasswordVModel, ActivityForgetPasswordBinding>(){
+
+
+    override fun init(savedInstanceState: Bundle?) {
+        super.init(savedInstanceState)
+        setTextColor()
+        var user= com.hdl.xl.model.User.get()
+        if(null!=user){
+            vm.phone=user.phone
+        }
+
+
+    }
+
+    fun setTextColor(){
+
+        val colors = intArrayOf(Color.parseColor("#FFDA4E"), Color.parseColor("#59FFF1"), Color.parseColor("#2BA3FF"))
+        val position = floatArrayOf(0f, 1.0f,2.0f)
+        val mLinearGradient = LinearGradient(
+                0f,
+                0f,
+                binding.btnGetCode?.length()?.let { binding.btnGetCode?.paint?.textSize?.times(it) }!!,
+                0f,
+                colors,
+                position,
+                Shader.TileMode.CLAMP
+        )
+        binding.btnGetCode?.paint?.shader = mLinearGradient
+        binding.btnGetCode?.invalidate()
+
+    }
+
+    override fun binding(): ActivityForgetPasswordBinding {
+       return ActivityForgetPasswordBinding.inflate(layoutInflater)
+    }
+
+    override fun vmClass(): Class<ForgetPasswordVModel> {
+        return ForgetPasswordVModel::class.java
+    }
+
+    override fun title(): String? {
+        return ""
+    }
+
+}

app/src/main/java/com/zswc/creativity/activity/GiftOrderActivity.kt → app/src/main/java/com/hdl/xl/activity/GiftOrderActivity.kt

@@ -1,9 +1,9 @@
-package com.zswc.creativity.activity
+package com.hdl.xl.activity
 
 import android.os.Bundle
-import com.zswc.creativity.base.MBActivity
-import com.zswc.creativity.databinding.*
-import com.zswc.creativity.vmodel.*
+import com.hdl.xl.base.MBActivity
+import com.hdl.xl.databinding.*
+import com.hdl.xl.vmodel.*
 
 /**
  * 订单详情/已转赠

app/src/main/java/com/hdl/xl/activity/GivenActivity.kt

@@ -0,0 +1,31 @@
+package com.hdl.xl.activity
+
+import com.hdl.xl.adapter.GivenAdapter
+import com.hdl.xl.base.MBRActivity
+import com.hdl.xl.databinding.ActivityGivenBinding
+import com.hdl.xl.vmodel.GivenVModel
+
+class GivenActivity : MBRActivity<GivenVModel, GivenAdapter, ActivityGivenBinding>() {
+
+
+
+    override fun vmClass(): Class<GivenVModel> {
+        return GivenVModel::class.java
+    }
+    override fun binding(): ActivityGivenBinding {
+        return ActivityGivenBinding.inflate(layoutInflater)
+    }
+
+    override fun initAdapter(): GivenAdapter {
+        return GivenAdapter()
+    }
+
+
+    override fun title(): String? {
+        return "转赠"
+    }
+
+    override val isRxbus: Boolean
+        get() = true
+
+}

app/src/main/java/com/zswc/creativity/activity/IntegralDetailsActivity.kt → app/src/main/java/com/hdl/xl/activity/IntegralDetailsActivity.kt

@@ -1,9 +1,7 @@
-package com.zswc.creativity.activity
+package com.hdl.xl.activity
 
-import android.app.Activity
 import android.graphics.Color
 import android.os.Build
-import android.os.Build.VERSION.SDK_INT
 import android.os.Bundle
 import android.os.Handler
 import android.os.Message
@@ -12,33 +10,22 @@ import android.util.Log
 import android.view.KeyEvent
 import android.view.View
 import androidx.lifecycle.lifecycleScope
-import coil.ImageLoader
-import coil.decode.GifDecoder
-import coil.decode.ImageDecoderDecoder
-import coil.load
 import coil.request.Disposable
-import coil.transform.RoundedCornersTransformation
 import com.githang.statusbar.StatusBarCompat
 import com.hwangjr.rxbus.annotation.Subscribe
 import com.hwangjr.rxbus.annotation.Tag
 import com.qmuiteam.qmui.kotlin.onClick
-import com.quansu.alipay.componnent.CpAlipay
 import com.ysnows.base.utils.B
 import com.ysnows.base.utils.UiSwitch
 import com.ysnows.base.utils.UiUtils
-import com.zswc.creativity.R
-import com.zswc.creativity.base.MBActivity
-import com.zswc.creativity.config.ConfigRx
-import com.zswc.creativity.databinding.ActivityIntegralDetailsBinding
-import com.zswc.creativity.databinding.ActivityTibetanDetailsBinding
-import com.zswc.creativity.model.bean.PayTypeBen
-import com.zswc.creativity.utils.ColorUtils
-import com.zswc.creativity.utils.WeChatUtil
-import com.zswc.creativity.utils.glide.GlideUtils
-import com.zswc.creativity.utils.net.NetEngine
-import com.zswc.creativity.view.MyScrollView
-import com.zswc.creativity.vmodel.IntegralDetailsVModel
-import com.zswc.creativity.vmodel.TibetanDetailsVModel
+import com.hdl.xl.R
+import com.hdl.xl.base.MBActivity
+import com.hdl.xl.config.ConfigRx
+import com.hdl.xl.databinding.ActivityIntegralDetailsBinding
+import com.hdl.xl.model.bean.PayTypeBen
+import com.hdl.xl.utils.glide.GlideUtils
+import com.hdl.xl.utils.net.NetEngine
+import com.hdl.xl.vmodel.IntegralDetailsVModel
 import kotlinx.coroutines.launch
 import java.text.DecimalFormat
 
@@ -154,7 +141,7 @@ class IntegralDetailsActivity : MBActivity<IntegralDetailsVModel, ActivityIntegr
 
 
 
-        binding.scroll.setOnScrollListener(object : MyScrollView.OnScrollChangedListener {
+        binding.scroll.setOnScrollListener(object : com.hdl.xl.view.MyScrollView.OnScrollChangedListener {
 
 
             override fun onScrollChanged(x: Int, y: Int, oldX: Int, oldY: Int) {
@@ -240,7 +227,7 @@ class IntegralDetailsActivity : MBActivity<IntegralDetailsVModel, ActivityIntegr
 
             // float a = y / height;//0~1
             val ratio = 255 - (255 * a).toFloat() //255-(0~255)=255~0
-            val bgColor: Int = ColorUtils.getColorWithAlpha(Color.parseColor("#FFFFFF"), ratio)
+            val bgColor: Int = com.hdl.xl.utils.ColorUtils.getColorWithAlpha(Color.parseColor("#FFFFFF"), ratio)
             binding.llShowTwo.setBackgroundColor(bgColor)
             binding.tvShowTitle.alpha = a
 

app/src/main/java/com/zswc/creativity/activity/LoginActivity.kt → app/src/main/java/com/hdl/xl/activity/LoginActivity.kt

@@ -1,13 +1,17 @@
-package com.zswc.creativity.activity
+package com.hdl.xl.activity
 
+import android.graphics.Color
+import android.graphics.LinearGradient
+import android.graphics.Shader
 import android.graphics.Typeface
+import android.os.Bundle
 import android.text.method.HideReturnsTransformationMethod
 import android.text.method.PasswordTransformationMethod
+import com.hdl.xl.R
+import com.hdl.xl.base.MBActivity
+import com.hdl.xl.databinding.ActivityLoginBinding
+import com.hdl.xl.vmodel.LoginVModel
 import com.qmuiteam.qmui.kotlin.onClick
-import com.zswc.creativity.R
-import com.zswc.creativity.base.MBActivity
-import com.zswc.creativity.databinding.ActivityLoginBinding
-import com.zswc.creativity.vmodel.LoginVModel
 
 
 class LoginActivity : MBActivity<LoginVModel, ActivityLoginBinding>() {
@@ -15,6 +19,31 @@ class LoginActivity : MBActivity<LoginVModel, ActivityLoginBinding>() {
     //测试 15801075991 密码 123456
     //15666879195 密码 123456
 
+    override fun init(savedInstanceState: Bundle?) {
+        super.init(savedInstanceState)
+        setTextColor()
+
+
+    }
+
+    fun setTextColor(){
+
+        val colors = intArrayOf(Color.parseColor("#FFDA4E"), Color.parseColor("#59FFF1"), Color.parseColor("#2BA3FF"))
+        val position = floatArrayOf(0f, 1.0f,2.0f)
+        val mLinearGradient = LinearGradient(
+                0f,
+                0f,
+                binding.tvRegister?.length()?.let { binding.tvRegister?.paint?.textSize?.times(it) }!!,
+                0f,
+                colors,
+                position,
+                Shader.TileMode.CLAMP
+        )
+        binding.tvRegister?.paint?.shader = mLinearGradient
+        binding.tvRegister?.invalidate()
+
+    }
+
     override fun title(): String? {
         return null
     }
@@ -56,16 +85,7 @@ class LoginActivity : MBActivity<LoginVModel, ActivityLoginBinding>() {
             }
         }
 
-        binding.imgSure.onClick {
-            if (vm.isRead.value == 0) {//去勾选
-                binding.imgSure.setImageResource(R.drawable.ct_select_on)
-                vm.isRead.value = 1
-            } else {
-                binding.imgSure.setImageResource(R.drawable.ct_select_off)
-                vm.isRead.value = 0
 
-            }
-        }
     }
 
 

app/src/main/java/com/zswc/creativity/activity/MainActivity.kt → app/src/main/java/com/hdl/xl/activity/MainActivity.kt

@@ -1,20 +1,21 @@
-package com.zswc.creativity.activity
+package com.hdl.xl.activity
 
 import android.graphics.Color
 import android.os.Bundle
 import android.view.KeyEvent
 import androidx.core.content.ContextCompat
 import com.githang.statusbar.StatusBarCompat
-import com.zswc.creativity.R
-import com.zswc.creativity.base.MBActivity
-import com.zswc.creativity.databinding.ActivityMainBinding
-import com.zswc.creativity.fragment.HomeFirstFragment
-import com.zswc.creativity.fragment.HomeMyFragment
-import com.zswc.creativity.vmodel.MainVModel
+import com.hdl.xl.R
+import com.hdl.xl.base.MBActivity
+import com.hdl.xl.databinding.ActivityMainBinding
+import com.hdl.xl.fragment.HomeFirstFragment
+import com.hdl.xl.fragment.HomeMyFragment
+import com.hdl.xl.vmodel.MainVModel
 import com.ysnows.base.utils.KeySimulateUtils
 import com.ysnows.update.component.UpdateUtils
-import com.zswc.creativity.fragment.ConSaleFragmet
-import com.zswc.creativity.fragment.ShopListFragmet
+import com.hdl.xl.fragment.ConSaleFragmet
+import com.hdl.xl.fragment.ShopListFragmet
+import com.ysnows.base.utils.UiSwitch
 import java.util.*
 
 /**
@@ -47,8 +48,8 @@ class MainActivity : MBActivity<MainVModel, ActivityMainBinding>(){
         }
 
         val menuTabBuilder = binding.mainMenu.tabBuilder()
-                .setSelectColor(Color.parseColor("#3AD3D5"))
-                .setNormalColor(Color.parseColor("#222222"))
+                .setSelectColor(Color.parseColor("#59FFF1"))
+                .setNormalColor(Color.parseColor("#ffffff"))
 
 
         val oneFragment = HomeFirstFragment()
@@ -155,6 +156,11 @@ class MainActivity : MBActivity<MainVModel, ActivityMainBinding>(){
         }
     }
 
+    override fun toLogin() {
+        UiSwitch.single(context(), LoginActivity::class.java)
+        finishActivity()
+    }
+
 
 
 }

app/src/main/java/com/zswc/creativity/activity/MallActivity.kt → app/src/main/java/com/hdl/xl/activity/MallActivity.kt

@@ -1,17 +1,14 @@
-package com.zswc.creativity.activity
+package com.hdl.xl.activity
 
 import android.os.Bundle
 import androidx.fragment.app.Fragment
 import com.qmuiteam.qmui.widget.tab.QMUITab
 import com.qmuiteam.qmui.widget.tab.QMUITabBuilder
 import com.ysnows.base.utils.B
-import com.zswc.creativity.base.MBTabActivity
-import com.zswc.creativity.databinding.ActivityMallBinding
-import com.zswc.creativity.databinding.ActivityOrderListBinding
-import com.zswc.creativity.fragment.MallListFragment
-import com.zswc.creativity.fragment.OrderListFragment
-import com.zswc.creativity.vmodel.MallVModel
-import com.zswc.creativity.vmodel.OrderVModel
+import com.hdl.xl.base.MBTabActivity
+import com.hdl.xl.databinding.ActivityMallBinding
+import com.hdl.xl.fragment.MallListFragment
+import com.hdl.xl.vmodel.MallVModel
 
 /**
  *商城订单

app/src/main/java/com/zswc/creativity/activity/MallOrderActivity.kt → app/src/main/java/com/hdl/xl/activity/MallOrderActivity.kt

@@ -1,9 +1,9 @@
-package com.zswc.creativity.activity
+package com.hdl.xl.activity
 
 import android.os.Bundle
-import com.zswc.creativity.base.MBActivity
-import com.zswc.creativity.databinding.*
-import com.zswc.creativity.vmodel.*
+import com.hdl.xl.base.MBActivity
+import com.hdl.xl.databinding.*
+import com.hdl.xl.vmodel.*
 
 /**
  * 商城订单详情

app/src/main/java/com/zswc/creativity/activity/MsgActivity.kt → app/src/main/java/com/hdl/xl/activity/MsgActivity.kt

@@ -1,15 +1,14 @@
-package com.zswc.creativity.activity
+package com.hdl.xl.activity
 
-import com.zswc.creativity.R
-import com.zswc.creativity.adapter.MsgAdapter
-import com.zswc.creativity.base.MBRActivity
-import com.zswc.creativity.databinding.ActivityMsgBinding
-import com.zswc.creativity.vmodel.MsgVModel
+import com.hdl.xl.R
+import com.hdl.xl.adapter.MsgAdapter
+import com.hdl.xl.base.MBRActivity
+import com.hdl.xl.databinding.ActivityMsgBinding
+import com.hdl.xl.vmodel.MsgVModel
 
 class MsgActivity : MBRActivity<MsgVModel, MsgAdapter, ActivityMsgBinding>() {
 
 
-
     override fun vmClass(): Class<MsgVModel> {
         return MsgVModel::class.java
     }

app/src/main/java/com/zswc/creativity/activity/MyCollectActivity.kt → app/src/main/java/com/hdl/xl/activity/MyCollectActivity.kt

@@ -1,20 +1,13 @@
-package com.zswc.creativity.activity
+package com.hdl.xl.activity
 
 import android.os.Bundle
 import com.ysnows.base.utils.B
 import com.ysnows.base.utils.UiSwitch
-import com.ysnows.base.utils.UiUtils
-import com.zswc.creativity.R
-import com.zswc.creativity.adapter.MsgAdapter
-import com.zswc.creativity.adapter.MyCollectAdapter
-import com.zswc.creativity.base.MBActivity
-import com.zswc.creativity.base.MBRActivity
-import com.zswc.creativity.databinding.ActivityMsgBinding
-import com.zswc.creativity.databinding.ActivityMyCollectBinding
-import com.zswc.creativity.model.MyCollectionList
-import com.zswc.creativity.utils.GridSpaceItemToDecoration
-import com.zswc.creativity.vmodel.MsgVModel
-import com.zswc.creativity.vmodel.MyCollectVModel
+import com.hdl.xl.adapter.MyCollectAdapter
+import com.hdl.xl.base.MBActivity
+import com.hdl.xl.databinding.ActivityMyCollectBinding
+import com.hdl.xl.model.MyCollectionList
+import com.hdl.xl.vmodel.MyCollectVModel
 
 //MyCollectAdapter
 class MyCollectActivity : MBActivity<MyCollectVModel,  ActivityMyCollectBinding>() {

app/src/main/java/com/zswc/creativity/activity/MyInfoActivity.kt → app/src/main/java/com/hdl/xl/activity/MyInfoActivity.kt

@@ -1,32 +1,20 @@
-package com.zswc.creativity.activity
+package com.hdl.xl.activity
 
 import android.Manifest
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
-import android.util.Log
 import androidx.core.net.toUri
 import androidx.lifecycle.lifecycleScope
 import com.eazypermissions.common.model.PermissionResult
 import com.eazypermissions.coroutinespermission.PermissionManager
 import com.luck.picture.lib.PictureSelector
+import com.hdl.xl.base.MBActivity
+import com.hdl.xl.config.MIntentAction
+import com.hdl.xl.databinding.ActivityMyInfoBinding
+import com.hdl.xl.vmodel.MyInfoVModel
 import com.qmuiteam.qmui.kotlin.onClick
-import com.zswc.creativity.base.MBActivity
-import com.zswc.creativity.config.MIntentAction
-import com.zswc.creativity.databinding.ActivityMyInfoBinding
-import com.zswc.creativity.databinding.ActivitySpreadBinding
-import com.zswc.creativity.inte.OnUploadCallback
-import com.zswc.creativity.model.User
-import com.zswc.creativity.utils.ChosePhotoUtils
-import com.zswc.creativity.utils.FileUtils
-import com.zswc.creativity.utils.OssUtils
-import com.zswc.creativity.vmodel.MyInfoVModel
-import com.zswc.creativity.vmodel.SpreadVModel
 import kotlinx.coroutines.launch
-import okhttp3.MediaType
-import okhttp3.MultipartBody
-import okhttp3.RequestBody
-import java.io.File
 import java.util.ArrayList
 
 /**
@@ -37,7 +25,7 @@ class MyInfoActivity : MBActivity<MyInfoVModel, ActivityMyInfoBinding>() {
 
     override fun init(savedInstanceState: Bundle?) {
         super.init(savedInstanceState)
-        var user= User.get()
+        var user= com.hdl.xl.model.User.get()
         vm.user.value=user
         vm.imagUrl.value=user?.headimg
         vm.name=user?.name
@@ -56,7 +44,7 @@ class MyInfoActivity : MBActivity<MyInfoVModel, ActivityMyInfoBinding>() {
                         ) is PermissionResult.PermissionGranted
                 ) {
 
-                    ChosePhotoUtils.getChosePhoto(view()!!.context(), 1)
+                    com.hdl.xl.utils.ChosePhotoUtils.getChosePhoto(view()!!.context(), 1)
                 }
 
             }
@@ -89,7 +77,7 @@ class MyInfoActivity : MBActivity<MyInfoVModel, ActivityMyInfoBinding>() {
 
                     val cr = this.contentResolver
 
-                    list.add( FileUtils.getFilePathFromContentUri(selectList[0].path.toUri(),cr))
+                    list.add( com.hdl.xl.utils.FileUtils.getFilePathFromContentUri(selectList[0].path.toUri(),cr))
 
                 }else{
                     list.add(selectList[0].path)
@@ -109,7 +97,7 @@ class MyInfoActivity : MBActivity<MyInfoVModel, ActivityMyInfoBinding>() {
             if(selectList[0].path.contains("content://")){
 
                 val cr = this.contentResolver
-                list.add( FileUtils.getFilePathFromContentUri(selectList[0].path.toUri(),cr))
+                list.add( com.hdl.xl.utils.FileUtils.getFilePathFromContentUri(selectList[0].path.toUri(),cr))
 
             }else{
                 list.add(selectList[0].path)

app/src/main/java/com/zswc/creativity/activity/MyOrderActivity.kt → app/src/main/java/com/hdl/xl/activity/MyOrderActivity.kt

@@ -1,14 +1,14 @@
-package com.zswc.creativity.activity
+package com.hdl.xl.activity
 
 import android.os.Bundle
 import androidx.fragment.app.Fragment
 import com.qmuiteam.qmui.widget.tab.QMUITab
 import com.qmuiteam.qmui.widget.tab.QMUITabBuilder
 import com.ysnows.base.utils.B
-import com.zswc.creativity.base.MBTabActivity
-import com.zswc.creativity.databinding.ActivityOrderListBinding
-import com.zswc.creativity.fragment.OrderListFragment
-import com.zswc.creativity.vmodel.OrderVModel
+import com.hdl.xl.base.MBTabActivity
+import com.hdl.xl.databinding.ActivityOrderListBinding
+import com.hdl.xl.fragment.OrderListFragment
+import com.hdl.xl.vmodel.OrderVModel
 
 /**
  *我的订单

app/src/main/java/com/zswc/creativity/activity/MyWalletActivity.kt → app/src/main/java/com/hdl/xl/activity/MyWalletActivity.kt

@@ -1,16 +1,14 @@
-package com.zswc.creativity.activity
+package com.hdl.xl.activity
 
-import android.app.Activity
 import android.graphics.Color
 import android.os.Bundle
 import com.githang.statusbar.StatusBarCompat
+import com.hdl.xl.R
+import com.hdl.xl.adapter.MyWalletAdapter
+import com.hdl.xl.base.MBRActivity
+import com.hdl.xl.databinding.ActivityMyWalletBinding
+import com.hdl.xl.vmodel.MyWalletVModel
 import com.qmuiteam.qmui.kotlin.onClick
-import com.zswc.creativity.R
-import com.zswc.creativity.adapter.MyWalletAdapter
-import com.zswc.creativity.base.MBRActivity
-import com.zswc.creativity.databinding.ActivityMyWalletBinding
-import com.zswc.creativity.model.User
-import com.zswc.creativity.vmodel.MyWalletVModel
 
 class MyWalletActivity : MBRActivity<MyWalletVModel, MyWalletAdapter, ActivityMyWalletBinding>() {
 
@@ -22,7 +20,7 @@ class MyWalletActivity : MBRActivity<MyWalletVModel, MyWalletAdapter, ActivityMy
         StatusBarCompat.setStatusBarColor(this, Color.parseColor("#00ffffff"))
 
 
-        vm.money.value = User.get()?.money
+        vm.money.value = com.hdl.xl.model.User.get()?.money
 
     }
 

app/src/main/java/com/zswc/creativity/activity/OneLoginActivity.kt → app/src/main/java/com/hdl/xl/activity/OneLoginActivity.kt

@@ -1,13 +1,13 @@
-package com.zswc.creativity.activity
+package com.hdl.xl.activity
 
 import android.os.Bundle
 import android.view.KeyEvent
 import com.hwangjr.rxbus.annotation.Subscribe
 import com.hwangjr.rxbus.annotation.Tag
-import com.zswc.creativity.base.MBActivity
-import com.zswc.creativity.config.ConfigRx
-import com.zswc.creativity.databinding.ActivityOneloginBinding
-import com.zswc.creativity.vmodel.OneLoginVModel
+import com.hdl.xl.base.MBActivity
+import com.hdl.xl.config.ConfigRx
+import com.hdl.xl.databinding.ActivityOneloginBinding
+import com.hdl.xl.vmodel.OneLoginVModel
 import com.ysnows.base.utils.KeySimulateUtils
 
 /**

app/src/main/java/com/zswc/creativity/activity/OpinionActivity.kt → app/src/main/java/com/hdl/xl/activity/OpinionActivity.kt

@@ -1,17 +1,16 @@
-package com.zswc.creativity.activity
+package com.hdl.xl.activity
 
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
 import androidx.core.net.toUri
 import com.luck.picture.lib.PictureSelector
-import com.zswc.creativity.base.MBActivity
-import com.zswc.creativity.config.MIntentAction
-import com.zswc.creativity.databinding.ActivityOpinionBinding
-import com.zswc.creativity.inte.OnUploadCallback
-import com.zswc.creativity.utils.FileUtils
-import com.zswc.creativity.utils.OssUtils
-import com.zswc.creativity.vmodel.OpinionVModel
+import com.hdl.xl.base.MBActivity
+import com.hdl.xl.config.MIntentAction
+import com.hdl.xl.databinding.ActivityOpinionBinding
+import com.hdl.xl.inte.OnUploadCallback
+import com.hdl.xl.utils.OssUtils
+import com.hdl.xl.vmodel.OpinionVModel
 import java.util.*
 
 /**
@@ -71,7 +70,7 @@ class OpinionActivity : MBActivity<OpinionVModel, ActivityOpinionBinding>(), OnU
                 if(selectList[0].path.contains("content://")){
 
                     val cr = this.contentResolver
-                    list.add( FileUtils.getFilePathFromContentUri(selectList[0].path.toUri(),cr))
+                    list.add( com.hdl.xl.utils.FileUtils.getFilePathFromContentUri(selectList[0].path.toUri(),cr))
 
                 }else{
                     list.add(selectList[0].path)
@@ -91,7 +90,7 @@ class OpinionActivity : MBActivity<OpinionVModel, ActivityOpinionBinding>(), OnU
             if(selectList[0].path.contains("content://")){
 
                 val cr = this.contentResolver
-                list.add( FileUtils.getFilePathFromContentUri(selectList[0].path.toUri(),cr))
+                list.add( com.hdl.xl.utils.FileUtils.getFilePathFromContentUri(selectList[0].path.toUri(),cr))
 
             }else{
                 list.add(selectList[0].path)

app/src/main/java/com/zswc/creativity/activity/PasswordActivity.kt → app/src/main/java/com/hdl/xl/activity/PasswordActivity.kt

@@ -1,18 +1,17 @@
-package com.zswc.creativity.activity
+package com.hdl.xl.activity
 
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
 import androidx.core.net.toUri
 import com.luck.picture.lib.PictureSelector
-import com.zswc.creativity.base.MBActivity
-import com.zswc.creativity.config.MIntentAction
-import com.zswc.creativity.databinding.ActivityPasswordBinding
-import com.zswc.creativity.inte.OnUploadCallback
-import com.zswc.creativity.utils.FileUtils
-import com.zswc.creativity.utils.OssUtils
-import com.zswc.creativity.view.PasswordView.PasswordListener
-import com.zswc.creativity.vmodel.PasswordVModel
+import com.hdl.xl.base.MBActivity
+import com.hdl.xl.config.MIntentAction
+import com.hdl.xl.databinding.ActivityPasswordBinding
+import com.hdl.xl.inte.OnUploadCallback
+import com.hdl.xl.utils.OssUtils
+import com.hdl.xl.view.PasswordView.PasswordListener
+import com.hdl.xl.vmodel.PasswordVModel
 import java.util.*
 
 class PasswordActivity : MBActivity<PasswordVModel, ActivityPasswordBinding>(), OnUploadCallback<String> {
@@ -133,7 +132,7 @@ class PasswordActivity : MBActivity<PasswordVModel, ActivityPasswordBinding>(),
                 if(selectList[0].path.contains("content://")){
 
                     val cr = this.contentResolver
-                    list.add( FileUtils.getFilePathFromContentUri(selectList[0].path.toUri(),cr))
+                    list.add( com.hdl.xl.utils.FileUtils.getFilePathFromContentUri(selectList[0].path.toUri(),cr))
 
                 }else{
                     list.add(selectList[0].path)
@@ -154,7 +153,7 @@ class PasswordActivity : MBActivity<PasswordVModel, ActivityPasswordBinding>(),
             if(selectList[0].path.contains("content://")){
 
                 val cr = this.contentResolver
-                list.add( FileUtils.getFilePathFromContentUri(selectList[0].path.toUri(),cr))
+                list.add( com.hdl.xl.utils.FileUtils.getFilePathFromContentUri(selectList[0].path.toUri(),cr))
 
             }else{
                 list.add(selectList[0].path)

app/src/main/java/com/zswc/creativity/activity/PaySuessActivity.kt → app/src/main/java/com/hdl/xl/activity/PaySuessActivity.kt

@@ -1,9 +1,9 @@
-package com.zswc.creativity.activity
+package com.hdl.xl.activity
 
 import android.os.Bundle
-import com.zswc.creativity.base.MBActivity
-import com.zswc.creativity.databinding.ActivityPaySuessBinding
-import com.zswc.creativity.vmodel.PaySuessVModel
+import com.hdl.xl.base.MBActivity
+import com.hdl.xl.databinding.ActivityPaySuessBinding
+import com.hdl.xl.vmodel.PaySuessVModel
 
 /**
  * 支付成功界面

app/src/main/java/com/zswc/creativity/activity/RechargeActivity.kt → app/src/main/java/com/hdl/xl/activity/RechargeActivity.kt

@@ -1,17 +1,16 @@
-package com.zswc.creativity.activity
+package com.hdl.xl.activity
 
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
 import androidx.core.net.toUri
 import com.luck.picture.lib.PictureSelector
-import com.zswc.creativity.base.MBActivity
-import com.zswc.creativity.config.MIntentAction
-import com.zswc.creativity.databinding.ActivityRechargeBinding
-import com.zswc.creativity.inte.OnUploadCallback
-import com.zswc.creativity.utils.FileUtils
-import com.zswc.creativity.utils.OssUtils
-import com.zswc.creativity.vmodel.RechargeVModel
+import com.hdl.xl.base.MBActivity
+import com.hdl.xl.config.MIntentAction
+import com.hdl.xl.databinding.ActivityRechargeBinding
+import com.hdl.xl.inte.OnUploadCallback
+import com.hdl.xl.utils.OssUtils
+import com.hdl.xl.vmodel.RechargeVModel
 import java.util.ArrayList
 
 /**
@@ -54,7 +53,7 @@ class RechargeActivity: MBActivity<RechargeVModel, ActivityRechargeBinding>(), O
                 if(selectList[0].path.contains("content://")){
 
                     val cr = this.contentResolver
-                    list.add( FileUtils.getFilePathFromContentUri(selectList[0].path.toUri(),cr))
+                    list.add( com.hdl.xl.utils.FileUtils.getFilePathFromContentUri(selectList[0].path.toUri(),cr))
 
                 }else{
                     list.add(selectList[0].path)
@@ -75,7 +74,7 @@ class RechargeActivity: MBActivity<RechargeVModel, ActivityRechargeBinding>(), O
             if(selectList[0].path.contains("content://")){
 
                 val cr = this.contentResolver
-                list.add( FileUtils.getFilePathFromContentUri(selectList[0].path.toUri(),cr))
+                list.add( com.hdl.xl.utils.FileUtils.getFilePathFromContentUri(selectList[0].path.toUri(),cr))
 
             }else{
                 list.add(selectList[0].path)

app/src/main/java/com/zswc/creativity/activity/RecordActivity.kt → app/src/main/java/com/hdl/xl/activity/RecordActivity.kt

@@ -1,18 +1,14 @@
-package com.zswc.creativity.activity
+package com.hdl.xl.activity
 
 import android.os.Bundle
 import androidx.fragment.app.Fragment
 import com.qmuiteam.qmui.widget.tab.QMUITab
 import com.qmuiteam.qmui.widget.tab.QMUITabBuilder
-import com.ysnows.base.utils.B
-import com.zswc.creativity.base.MBTabActivity
-import com.zswc.creativity.databinding.ActivityOrderListBinding
-import com.zswc.creativity.databinding.ActivityRecordBinding
-import com.zswc.creativity.fragment.OrderListFragment
-import com.zswc.creativity.fragment.RecorRankFragment
-import com.zswc.creativity.fragment.RecordListFragment
-import com.zswc.creativity.vmodel.OrderVModel
-import com.zswc.creativity.vmodel.RecordVModel
+import com.hdl.xl.base.MBTabActivity
+import com.hdl.xl.databinding.ActivityRecordBinding
+import com.hdl.xl.fragment.RecorRankFragment
+import com.hdl.xl.fragment.RecordListFragment
+import com.hdl.xl.vmodel.RecordVModel
 
 /**
  *邀请记录

app/src/main/java/com/zswc/creativity/activity/RegisterActivity.kt → app/src/main/java/com/hdl/xl/activity/RegisterActivity.kt

@@ -1,23 +1,71 @@
-package com.zswc.creativity.activity
+package com.hdl.xl.activity
 
+import android.graphics.Color
+import android.graphics.LinearGradient
+import android.graphics.Shader
 import android.os.Bundle
 import android.text.TextUtils
+import com.hdl.xl.R
+import com.hdl.xl.base.MBActivity
+import com.hdl.xl.databinding.ActivityRegisterBinding
+import com.hdl.xl.inte.ChoiceData
+import com.hdl.xl.utils.PopuTipsUtils
+import com.hdl.xl.vmodel.RegisterVModel
 import com.qmuiteam.qmui.kotlin.onClick
-import com.zswc.creativity.R
-import com.zswc.creativity.base.MBActivity
-import com.zswc.creativity.databinding.ActivityRegisterBinding
-import com.zswc.creativity.inte.ChoiceData
-import com.zswc.creativity.utils.PopuTipsUtils
-import com.zswc.creativity.vmodel.RegisterVModel
 
 class RegisterActivity : MBActivity<RegisterVModel, ActivityRegisterBinding>() {
 
     override fun init(savedInstanceState: Bundle?) {
         super.init(savedInstanceState)
 
+        setTextColor()
+    }
+    fun setTextColor(){
+
+        val colors = intArrayOf(Color.parseColor("#FFDA4E"), Color.parseColor("#59FFF1"), Color.parseColor("#2BA3FF"))
+        val position = floatArrayOf(0f, 1.0f,2.0f)
+        val mLinearGradient = LinearGradient(
+                0f,
+                0f,
+                binding.tvOne?.length()?.let { binding.tvOne?.paint?.textSize?.times(it) }!!,
+                0f,
+                colors,
+                position,
+                Shader.TileMode.CLAMP
+        )
+        binding.tvOne?.paint?.shader = mLinearGradient
+        binding.tvOne?.invalidate()
+
+        val mLinearGradient1 = LinearGradient(
+                0f,
+                0f,
+                binding.tvTwo?.length()?.let { binding.tvTwo?.paint?.textSize?.times(it) }!!,
+                0f,
+                colors,
+                position,
+                Shader.TileMode.CLAMP
+        )
+        binding.tvTwo?.paint?.shader = mLinearGradient1
+        binding.tvTwo?.invalidate()
+
+
+        val mLinearGradient2 = LinearGradient(
+                0f,
+                0f,
+                binding.btnGetCode?.length()?.let { binding.btnGetCode?.paint?.textSize?.times(it) }!!,
+                0f,
+                colors,
+                position,
+                Shader.TileMode.CLAMP
+        )
+        binding.btnGetCode?.paint?.shader = mLinearGradient2
+        binding.btnGetCode?.invalidate()
 
     }
 
+
+
+
     override fun listeners() {
         super.listeners()
 

app/src/main/java/com/zswc/creativity/activity/SettingActivity.kt → app/src/main/java/com/hdl/xl/activity/SettingActivity.kt

@@ -1,14 +1,13 @@
-package com.zswc.creativity.activity
+package com.hdl.xl.activity
 
 import android.os.Bundle
-import androidx.lifecycle.MutableLiveData
-import com.qmuiteam.qmui.kotlin.onClick
 import com.ysnows.update.component.UpdateUtils
-import com.zswc.creativity.base.MBActivity
-import com.zswc.creativity.databinding.ActivitySettingBinding
-import com.zswc.creativity.utils.CleanDataUtils.clearAllCache
-import com.zswc.creativity.utils.CleanDataUtils.getTotalCacheSize
-import com.zswc.creativity.vmodel.SettingVModel
+import com.hdl.xl.base.MBActivity
+import com.hdl.xl.databinding.ActivitySettingBinding
+import com.hdl.xl.utils.CleanDataUtils.clearAllCache
+import com.hdl.xl.utils.CleanDataUtils.getTotalCacheSize
+import com.hdl.xl.vmodel.SettingVModel
+import com.qmuiteam.qmui.kotlin.onClick
 import java.util.*
 
 /**

app/src/main/java/com/zswc/creativity/activity/SpreadActivity.kt → app/src/main/java/com/hdl/xl/activity/SpreadActivity.kt

@@ -1,12 +1,11 @@
-package com.zswc.creativity.activity
+package com.hdl.xl.activity
 
 import android.os.Bundle
+import com.hdl.xl.base.MBActivity
+import com.hdl.xl.databinding.ActivitySpreadBinding
+import com.hdl.xl.utils.PopuExtenSionUtils
+import com.hdl.xl.vmodel.SpreadVModel
 import com.qmuiteam.qmui.kotlin.onClick
-import com.zswc.creativity.base.MBActivity
-import com.zswc.creativity.databinding.ActivitySpreadBinding
-import com.zswc.creativity.inte.ChoiceData
-import com.zswc.creativity.utils.PopuExtenSionUtils
-import com.zswc.creativity.vmodel.SpreadVModel
 
 /**
  * 推广

app/src/main/java/com/zswc/creativity/activity/SureOrderActivity.kt → app/src/main/java/com/hdl/xl/activity/SureOrderActivity.kt

@@ -1,12 +1,12 @@
-package com.zswc.creativity.activity
+package com.hdl.xl.activity
 
 import android.os.Bundle
 import com.hwangjr.rxbus.annotation.Subscribe
 import com.hwangjr.rxbus.annotation.Tag
-import com.zswc.creativity.base.MBActivity
-import com.zswc.creativity.config.ConfigRx
-import com.zswc.creativity.databinding.*
-import com.zswc.creativity.vmodel.*
+import com.hdl.xl.base.MBActivity
+import com.hdl.xl.config.ConfigRx
+import com.hdl.xl.databinding.*
+import com.hdl.xl.vmodel.*
 
 /**
  * 确认订单

app/src/main/java/com/zswc/creativity/activity/TestMainActivity.kt → app/src/main/java/com/hdl/xl/activity/TestMainActivity.kt

@@ -1,10 +1,10 @@
-package com.zswc.creativity.activity
+package com.hdl.xl.activity
 
 import android.os.Bundle
+import com.hdl.xl.base.MBActivity
+import com.hdl.xl.databinding.ActivityTextMainBinding
+import com.hdl.xl.vmodel.TextMainVModel
 import com.qmuiteam.qmui.kotlin.onClick
-import com.zswc.creativity.base.MBActivity
-import com.zswc.creativity.databinding.ActivityTextMainBinding
-import com.zswc.creativity.vmodel.TextMainVModel
 
 class TestMainActivity : MBActivity<TextMainVModel, ActivityTextMainBinding>() {
 

app/src/main/java/com/zswc/creativity/activity/TibOrderActivity.kt → app/src/main/java/com/hdl/xl/activity/TibOrderActivity.kt

@@ -1,15 +1,9 @@
-package com.zswc.creativity.activity
+package com.hdl.xl.activity
 
 import android.os.Bundle
-import com.zswc.creativity.base.MBActivity
-import com.zswc.creativity.databinding.ActivityMyInfoBinding
-import com.zswc.creativity.databinding.ActivitySpreadBinding
-import com.zswc.creativity.databinding.ActivityTibOrderBinding
-import com.zswc.creativity.databinding.ActivityWithdrawBinding
-import com.zswc.creativity.vmodel.MyInfoVModel
-import com.zswc.creativity.vmodel.SpreadVModel
-import com.zswc.creativity.vmodel.TibOrderVModel
-import com.zswc.creativity.vmodel.WithdrawVModel
+import com.hdl.xl.base.MBActivity
+import com.hdl.xl.databinding.ActivityTibOrderBinding
+import com.hdl.xl.vmodel.TibOrderVModel
 
 /**
  * 订单详情

app/src/main/java/com/zswc/creativity/activity/TibetanDetailsActivity.kt → app/src/main/java/com/hdl/xl/activity/TibetanDetailsActivity.kt

@@ -1,9 +1,7 @@
-package com.zswc.creativity.activity
+package com.hdl.xl.activity
 
-import android.app.Activity
 import android.graphics.Color
 import android.os.Build
-import android.os.Build.VERSION.SDK_INT
 import android.os.Bundle
 import android.os.Handler
 import android.os.Message
@@ -12,31 +10,22 @@ import android.util.Log
 import android.view.KeyEvent
 import android.view.View
 import androidx.lifecycle.lifecycleScope
-import coil.ImageLoader
-import coil.decode.GifDecoder
-import coil.decode.ImageDecoderDecoder
-import coil.load
 import coil.request.Disposable
-import coil.transform.RoundedCornersTransformation
 import com.githang.statusbar.StatusBarCompat
 import com.hwangjr.rxbus.annotation.Subscribe
 import com.hwangjr.rxbus.annotation.Tag
 import com.qmuiteam.qmui.kotlin.onClick
-import com.quansu.alipay.componnent.CpAlipay
 import com.ysnows.base.utils.B
 import com.ysnows.base.utils.UiSwitch
 import com.ysnows.base.utils.UiUtils
-import com.zswc.creativity.R
-import com.zswc.creativity.base.MBActivity
-import com.zswc.creativity.config.ConfigRx
-import com.zswc.creativity.databinding.ActivityTibetanDetailsBinding
-import com.zswc.creativity.model.bean.PayTypeBen
-import com.zswc.creativity.utils.ColorUtils
-import com.zswc.creativity.utils.WeChatUtil
-import com.zswc.creativity.utils.glide.GlideUtils
-import com.zswc.creativity.utils.net.NetEngine
-import com.zswc.creativity.view.MyScrollView
-import com.zswc.creativity.vmodel.TibetanDetailsVModel
+import com.hdl.xl.R
+import com.hdl.xl.base.MBActivity
+import com.hdl.xl.config.ConfigRx
+import com.hdl.xl.databinding.ActivityTibetanDetailsBinding
+import com.hdl.xl.model.bean.PayTypeBen
+import com.hdl.xl.utils.glide.GlideUtils
+import com.hdl.xl.utils.net.NetEngine
+import com.hdl.xl.vmodel.TibetanDetailsVModel
 import kotlinx.coroutines.launch
 import java.text.DecimalFormat
 
@@ -153,7 +142,7 @@ class TibetanDetailsActivity : MBActivity<TibetanDetailsVModel, ActivityTibetanD
 
 
 
-        binding.scroll.setOnScrollListener(object : MyScrollView.OnScrollChangedListener {
+        binding.scroll.setOnScrollListener(object : com.hdl.xl.view.MyScrollView.OnScrollChangedListener {
 
 
             override fun onScrollChanged(x: Int, y: Int, oldX: Int, oldY: Int) {
@@ -242,7 +231,7 @@ class TibetanDetailsActivity : MBActivity<TibetanDetailsVModel, ActivityTibetanD
 
             // float a = y / height;//0~1
             val ratio = 255 - (255 * a).toFloat() //255-(0~255)=255~0
-            val bgColor: Int = ColorUtils.getColorWithAlpha(Color.parseColor("#FFFFFF"), ratio)
+            val bgColor: Int = com.hdl.xl.utils.ColorUtils.getColorWithAlpha(Color.parseColor("#FFFFFF"), ratio)
             binding.llShowTwo.setBackgroundColor(bgColor)
             binding.tvShowTitle.alpha = a
 

app/src/main/java/com/zswc/creativity/activity/TrannsferActivity.kt → app/src/main/java/com/hdl/xl/activity/TrannsferActivity.kt

@@ -1,22 +1,16 @@
-package com.zswc.creativity.activity
+package com.hdl.xl.activity
 
 import android.os.Bundle
 import android.text.TextUtils
 import coil.load
 import coil.transform.RoundedCornersTransformation
-import com.hwangjr.rxbus.RxBus
+import com.hdl.xl.base.MBActivity
+import com.hdl.xl.databinding.ActivityTrannsferBinding
+import com.hdl.xl.inte.ChoiceData
+import com.hdl.xl.utils.PopuGivenUtils
+import com.hdl.xl.utils.PopuSureUtils
+import com.hdl.xl.vmodel.TrannsferVModel
 import com.qmuiteam.qmui.kotlin.onClick
-import com.zswc.creativity.base.MBActivity
-import com.zswc.creativity.config.ConfigRx
-import com.zswc.creativity.databinding.ActivitySpreadBinding
-import com.zswc.creativity.databinding.ActivityTrannsferBinding
-import com.zswc.creativity.inte.ChoiceData
-import com.zswc.creativity.model.bean.PayTypeBen
-import com.zswc.creativity.utils.PopuGivenUtils
-import com.zswc.creativity.utils.PopuSureUtils
-import com.zswc.creativity.utils.PopuTipsUtils
-import com.zswc.creativity.vmodel.SpreadVModel
-import com.zswc.creativity.vmodel.TrannsferVModel
 
 /**
  * 转赠

app/src/main/java/com/zswc/creativity/activity/WebViewActivity.kt → app/src/main/java/com/hdl/xl/activity/WebViewActivity.kt

@@ -1,10 +1,10 @@
-package com.zswc.creativity.activity
+package com.hdl.xl.activity
 
 import android.os.Bundle
 import android.webkit.WebView
 import com.qmuiteam.qmui.widget.webview.QMUIWebViewClient
-import com.zswc.creativity.base.MBActivity
-import com.zswc.creativity.databinding.ActivityWebviewBinding
+import com.hdl.xl.base.MBActivity
+import com.hdl.xl.databinding.ActivityWebviewBinding
 import com.ysnows.base.base.BRepository
 import com.ysnows.base.base.BViewModel
 

app/src/main/java/com/zswc/creativity/activity/WithdrawActivity.kt → app/src/main/java/com/hdl/xl/activity/WithdrawActivity.kt

@@ -1,13 +1,9 @@
-package com.zswc.creativity.activity
+package com.hdl.xl.activity
 
 import android.os.Bundle
-import com.zswc.creativity.base.MBActivity
-import com.zswc.creativity.databinding.ActivityMyInfoBinding
-import com.zswc.creativity.databinding.ActivitySpreadBinding
-import com.zswc.creativity.databinding.ActivityWithdrawBinding
-import com.zswc.creativity.vmodel.MyInfoVModel
-import com.zswc.creativity.vmodel.SpreadVModel
-import com.zswc.creativity.vmodel.WithdrawVModel
+import com.hdl.xl.base.MBActivity
+import com.hdl.xl.databinding.ActivityWithdrawBinding
+import com.hdl.xl.vmodel.WithdrawVModel
 
 /**
  * 提现

app/src/main/java/com/zswc/creativity/activity/WithdrawSuessActivity.kt → app/src/main/java/com/hdl/xl/activity/WithdrawSuessActivity.kt

@@ -1,12 +1,9 @@
-package com.zswc.creativity.activity
+package com.hdl.xl.activity
 
 import android.os.Bundle
-import com.zswc.creativity.base.MBActivity
-import com.zswc.creativity.databinding.ActivityPaySuessBinding
-import com.zswc.creativity.databinding.ActivityWithdrawBinding
-import com.zswc.creativity.databinding.ActivityWithdrawSuessBinding
-import com.zswc.creativity.vmodel.PaySuessVModel
-import com.zswc.creativity.vmodel.WithdrawSuessVModel
+import com.hdl.xl.base.MBActivity
+import com.hdl.xl.databinding.ActivityWithdrawSuessBinding
+import com.hdl.xl.vmodel.WithdrawSuessVModel
 
 /**
  * 提现成功界面

app/src/main/java/com/zswc/creativity/activity/WithdrawalActivity.kt → app/src/main/java/com/hdl/xl/activity/WithdrawalActivity.kt

@@ -1,12 +1,12 @@
-package com.zswc.creativity.activity
+package com.hdl.xl.activity
 
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
-import com.zswc.creativity.base.MBActivity
-import com.zswc.creativity.config.MIntentAction
-import com.zswc.creativity.databinding.ActivityWithdrawalBinding
-import com.zswc.creativity.vmodel.WithdrawalVModel
+import com.hdl.xl.base.MBActivity
+import com.hdl.xl.config.MIntentAction
+import com.hdl.xl.databinding.ActivityWithdrawalBinding
+import com.hdl.xl.vmodel.WithdrawalVModel
 
 /**
  *Created by shihuiyun

app/src/main/java/com/zswc/creativity/adapter/AllCarAdapter.kt → app/src/main/java/com/hdl/xl/adapter/AllCarAdapter.kt

@@ -1,10 +1,10 @@
-package com.zswc.creativity.adapter
+package com.hdl.xl.adapter
 
 import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder
-import com.zswc.creativity.R
-import com.zswc.creativity.databinding.ItemTypeBinding
-import com.zswc.creativity.inte.ChoiceData
-import com.zswc.creativity.model.DataInfoBean
+import com.hdl.xl.R
+import com.hdl.xl.databinding.ItemTypeBinding
+import com.hdl.xl.inte.ChoiceData
+import com.hdl.xl.model.DataInfoBean
 import com.ysnows.base.base.BAdapter
 
 class AllCarAdapter(val chose: ChoiceData) : BAdapter<DataInfoBean.CarTypeBean,

app/src/main/java/com/zswc/creativity/adapter/AreaSelectAdapter.java → app/src/main/java/com/hdl/xl/adapter/AreaSelectAdapter.java

@@ -1,10 +1,10 @@
-package com.zswc.creativity.adapter;
+package com.hdl.xl.adapter;
 
 import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder;
-import com.zswc.creativity.R;
-import com.zswc.creativity.databinding.ItemAreaselectBinding;
-import com.zswc.creativity.model.AreaBean;
-import com.zswc.creativity.vmodel.AreaSelectVModel;
+import com.hdl.xl.model.AreaBean;
+import com.hdl.xl.R;
+import com.hdl.xl.databinding.ItemAreaselectBinding;
+import com.hdl.xl.vmodel.AreaSelectVModel;
 import com.ysnows.base.base.BAdapter;
 
 import org.jetbrains.annotations.NotNull;

app/src/main/java/com/zswc/creativity/adapter/BaseFragmentPagerAdapter.java → app/src/main/java/com/hdl/xl/adapter/BaseFragmentPagerAdapter.java

@@ -1,4 +1,4 @@
-package com.zswc.creativity.adapter;
+package com.hdl.xl.adapter;
 
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;

app/src/main/java/com/zswc/creativity/adapter/BillAdapter.kt → app/src/main/java/com/hdl/xl/adapter/BillAdapter.kt

@@ -1,9 +1,9 @@
-package com.zswc.creativity.adapter
+package com.hdl.xl.adapter
 
 import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder
-import com.zswc.creativity.R
-import com.zswc.creativity.databinding.ItemBillBinding
-import com.zswc.creativity.model.AmountList
+import com.hdl.xl.R
+import com.hdl.xl.databinding.ItemBillBinding
+import com.hdl.xl.model.AmountList
 import com.ysnows.base.base.BAdapter
 
 class BillAdapter : BAdapter<AmountList, BaseDataBindingHolder<ItemBillBinding>>(R.layout.item_bill) {

app/src/main/java/com/zswc/creativity/adapter/CollectAdapter.kt → app/src/main/java/com/hdl/xl/adapter/CollectAdapter.kt

@@ -1,21 +1,17 @@
-package com.zswc.creativity.adapter
+package com.hdl.xl.adapter
 
 import android.content.Context
-import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory
-import coil.load
-import coil.transform.RoundedCornersTransformation
 import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder
-import com.qmuiteam.qmui.kotlin.onClick
-import com.zswc.creativity.R
+import com.hdl.xl.R
 import com.ysnows.base.base.BAdapter
 import com.ysnows.base.utils.B
 import com.ysnows.base.utils.UiSwitch
-import com.zswc.creativity.activity.ArticleDetailActivity
-import com.zswc.creativity.activity.CollectDetailsActivity
-import com.zswc.creativity.activity.MyCollectActivity
-import com.zswc.creativity.databinding.ItemMyBoxBinding
-import com.zswc.creativity.model.MyCollection
-import com.zswc.creativity.utils.glide.GlideUtils
+import com.hdl.xl.activity.CollectDetailsActivity
+import com.hdl.xl.activity.MyCollectActivity
+import com.hdl.xl.databinding.ItemMyBoxBinding
+import com.hdl.xl.model.MyCollection
+import com.hdl.xl.utils.glide.GlideUtils
+import com.qmuiteam.qmui.kotlin.onClick
 
 class CollectAdapter(context:Context) : BAdapter<MyCollection,
         BaseDataBindingHolder<ItemMyBoxBinding>>(R.layout.item_my_box) {

app/src/main/java/com/zswc/creativity/adapter/ConsignOrderListFragmentAdapter.kt → app/src/main/java/com/hdl/xl/adapter/ConsignOrderListFragmentAdapter.kt

@@ -1,14 +1,11 @@
-package com.zswc.creativity.adapter
+package com.hdl.xl.adapter
 
 import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder
 import com.ysnows.base.base.BAdapter
-import com.zswc.creativity.R
-import com.zswc.creativity.databinding.ItemConsignorderListBinding
-import com.zswc.creativity.databinding.ItemOrderListBinding
-import com.zswc.creativity.model.MyOrderInfo
-import com.zswc.creativity.model.SecondList
-import com.zswc.creativity.vmodel.ConsignOrderListFragmentVModel
-import com.zswc.creativity.vmodel.OrderListFragmentVModel
+import com.hdl.xl.R
+import com.hdl.xl.databinding.ItemConsignorderListBinding
+import com.hdl.xl.model.SecondList
+import com.hdl.xl.vmodel.ConsignOrderListFragmentVModel
 
 class ConsignOrderListFragmentAdapter(val vm: ConsignOrderListFragmentVModel) : BAdapter<SecondList, BaseDataBindingHolder<ItemConsignorderListBinding>>(R.layout.item_consignorder_list) {
     override fun convert(holder: BaseDataBindingHolder<ItemConsignorderListBinding>, item:SecondList) {

app/src/main/java/com/zswc/creativity/adapter/FragAdapter.java → app/src/main/java/com/hdl/xl/adapter/FragAdapter.java

@@ -1,4 +1,4 @@
-package com.zswc.creativity.adapter;
+package com.hdl.xl.adapter;
 
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;

app/src/main/java/com/zswc/creativity/adapter/FragmentAdapter.java → app/src/main/java/com/hdl/xl/adapter/FragmentAdapter.java

@@ -1,4 +1,4 @@
-package com.zswc.creativity.adapter;
+package com.hdl.xl.adapter;
 
 
 
@@ -7,7 +7,7 @@ import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentPagerAdapter;
 
 
-import com.zswc.creativity.utils.TAB;
+import com.hdl.xl.utils.TAB;
 
 import java.util.ArrayList;
 

app/src/main/java/com/hdl/xl/adapter/GivenAdapter.kt

@@ -0,0 +1,28 @@
+package com.hdl.xl.adapter
+
+import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder
+import com.hdl.xl.R
+import com.hdl.xl.model.MsgList
+import com.ysnows.base.base.BAdapter
+import com.hdl.xl.databinding.ItemGivenBinding
+import com.qmuiteam.qmui.kotlin.onClick
+
+class GivenAdapter() : BAdapter<MsgList, BaseDataBindingHolder<ItemGivenBinding>>(R.layout.item_given) {
+
+    override fun convert(holder: BaseDataBindingHolder<ItemGivenBinding>, item: MsgList) {
+        holder.dataBinding?.item = item
+
+        holder.dataBinding?.ll!!.onClick {
+            item.is_read = true
+
+//            UiSwitch.bundle(context, ArticleDetailActivity::class.java, Bundle().apply {
+//                putString("type", "-1")
+//                putString("content", Gson().toJson(item))
+//            })
+
+
+        }
+
+
+    }
+}

app/src/main/java/com/zswc/creativity/adapter/HomeDriverAdapter.kt → app/src/main/java/com/hdl/xl/adapter/HomeDriverAdapter.kt

@@ -1,10 +1,10 @@
-package com.zswc.creativity.adapter
+package com.hdl.xl.adapter
 
 import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder
-import com.zswc.creativity.R
-import com.zswc.creativity.databinding.ItemHomeDriverBinding
-import com.zswc.creativity.model.InfoListBean
-import com.zswc.creativity.vmodel.HomeDriverVModel
+import com.hdl.xl.R
+import com.hdl.xl.databinding.ItemHomeDriverBinding
+import com.hdl.xl.model.InfoListBean
+import com.hdl.xl.vmodel.HomeDriverVModel
 import com.ysnows.base.base.BAdapter
 
 class HomeDriverAdapter(val vm: HomeDriverVModel) : BAdapter<InfoListBean, BaseDataBindingHolder<ItemHomeDriverBinding>>(R.layout.item_home_driver) {

app/src/main/java/com/zswc/creativity/adapter/MallListAdapter.kt → app/src/main/java/com/hdl/xl/adapter/MallListAdapter.kt

@@ -1,19 +1,15 @@
-package com.zswc.creativity.adapter
+package com.hdl.xl.adapter
 
 import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder
-import com.qmuiteam.qmui.kotlin.onClick
 import com.ysnows.base.base.BAdapter
 import com.ysnows.base.utils.B
 import com.ysnows.base.utils.UiSwitch
-import com.zswc.creativity.R
-import com.zswc.creativity.activity.GiftOrderActivity
-import com.zswc.creativity.activity.MallOrderActivity
-import com.zswc.creativity.activity.TibOrderActivity
-import com.zswc.creativity.databinding.ItemMallListBinding
-import com.zswc.creativity.databinding.ItemOrderListBinding
-import com.zswc.creativity.model.MyOrderInfo
-import com.zswc.creativity.vmodel.MallListVModel
-import com.zswc.creativity.vmodel.OrderListFragmentVModel
+import com.hdl.xl.R
+import com.hdl.xl.activity.MallOrderActivity
+import com.hdl.xl.databinding.ItemMallListBinding
+import com.hdl.xl.model.MyOrderInfo
+import com.hdl.xl.vmodel.MallListVModel
+import com.qmuiteam.qmui.kotlin.onClick
 
 class MallListAdapter(val vm: MallListVModel) : BAdapter<MyOrderInfo, BaseDataBindingHolder<ItemMallListBinding>>(R.layout.item_mall_list) {
     override fun convert(holder: BaseDataBindingHolder<ItemMallListBinding>, item: MyOrderInfo) {

app/src/main/java/com/zswc/creativity/adapter/ModelAdapter.kt → app/src/main/java/com/hdl/xl/adapter/ModelAdapter.kt

@@ -1,9 +1,9 @@
-package com.zswc.creativity.adapter
+package com.hdl.xl.adapter
 
 import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder
+import com.hdl.xl.R
+import com.hdl.xl.databinding.ItemModelBinding
 import com.qmuiteam.qmui.kotlin.onClick
-import com.zswc.creativity.R
-import com.zswc.creativity.databinding.ItemModelBinding
 import com.yanzhenjie.permission.AndPermission
 import com.yanzhenjie.permission.runtime.Permission
 import com.ysnows.base.base.BAdapter

app/src/main/java/com/zswc/creativity/adapter/MsgAdapter.kt → app/src/main/java/com/hdl/xl/adapter/MsgAdapter.kt

@@ -1,4 +1,4 @@
-package com.zswc.creativity.adapter
+package com.hdl.xl.adapter
 
 import android.graphics.Color
 import android.graphics.Typeface
@@ -6,20 +6,17 @@ import android.os.Bundle
 import android.text.Spannable
 import android.text.SpannableStringBuilder
 import android.text.Spanned
-import android.text.TextUtils
 import android.text.style.AbsoluteSizeSpan
 import android.text.style.ForegroundColorSpan
 import android.text.style.StyleSpan
-import android.view.View
 import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder
 import com.google.gson.Gson
+import com.hdl.xl.R
+import com.hdl.xl.activity.ArticleDetailActivity
+import com.hdl.xl.databinding.ItemMsgBinding
+import com.hdl.xl.model.MsgList
+import com.hdl.xl.vmodel.MsgVModel
 import com.qmuiteam.qmui.kotlin.onClick
-import com.zswc.creativity.R
-import com.zswc.creativity.activity.ArticleDetailActivity
-import com.zswc.creativity.databinding.ItemMsgBinding
-import com.zswc.creativity.model.MsgList
-import com.zswc.creativity.utils.VerifyUtils
-import com.zswc.creativity.vmodel.MsgVModel
 import com.ysnows.base.base.BAdapter
 import com.ysnows.base.utils.UiSwitch
 

app/src/main/java/com/zswc/creativity/adapter/MyCollectAdapter.kt → app/src/main/java/com/hdl/xl/adapter/MyCollectAdapter.kt

@@ -1,11 +1,11 @@
-package com.zswc.creativity.adapter
+package com.hdl.xl.adapter
 
 import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder
-import com.zswc.creativity.R
+import com.hdl.xl.R
 import com.ysnows.base.base.BAdapter
-import com.zswc.creativity.databinding.ItemMyCollectBinding
-import com.zswc.creativity.model.MyCollectionList
-import com.zswc.creativity.utils.glide.GlideUtils
+import com.hdl.xl.databinding.ItemMyCollectBinding
+import com.hdl.xl.model.MyCollectionList
+import com.hdl.xl.utils.glide.GlideUtils
 
 class MyCollectAdapter() : BAdapter<MyCollectionList, BaseDataBindingHolder<ItemMyCollectBinding>>(R.layout.item_my_collect) {
 

app/src/main/java/com/hdl/xl/adapter/MyWalletAdapter.kt

@@ -0,0 +1,17 @@
+package com.hdl.xl.adapter
+
+import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder
+import com.hdl.xl.R
+import com.ysnows.base.base.BAdapter
+import com.hdl.xl.databinding.ItemMyWalletBinding
+import com.hdl.xl.model.MoneyList
+import com.hdl.xl.vmodel.MyWalletVModel
+
+class MyWalletAdapter(var vm: MyWalletVModel) : BAdapter<MoneyList, BaseDataBindingHolder<ItemMyWalletBinding>>(R.layout.item_my_wallet) {
+
+    override fun convert(holder: BaseDataBindingHolder<ItemMyWalletBinding>, item: MoneyList) {
+        holder.dataBinding?.vm=vm
+        holder.dataBinding?.item = item
+
+    }
+}

app/src/main/java/com/zswc/creativity/adapter/OrderInfoInadapter.kt → app/src/main/java/com/hdl/xl/adapter/OrderInfoInadapter.kt

@@ -1,4 +1,4 @@
-package com.zswc.creativity.adapter
+package com.hdl.xl.adapter
 
 import android.Manifest
 import android.annotation.SuppressLint
@@ -6,10 +6,10 @@ import android.content.Intent
 import android.net.Uri
 import android.text.TextUtils
 import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder
+import com.hdl.xl.R
+import com.hdl.xl.databinding.ItemEnterinfoBinding
+import com.hdl.xl.model.DataInfoBean
 import com.qmuiteam.qmui.kotlin.onClick
-import com.zswc.creativity.R
-import com.zswc.creativity.databinding.ItemEnterinfoBinding
-import com.zswc.creativity.model.DataInfoBean
 import com.yanzhenjie.permission.Action
 import com.yanzhenjie.permission.AndPermission
 import com.ysnows.base.base.BAdapter

app/src/main/java/com/zswc/creativity/adapter/OrderInfoadapter.kt → app/src/main/java/com/hdl/xl/adapter/OrderInfoadapter.kt

@@ -1,4 +1,4 @@
-package com.zswc.creativity.adapter
+package com.hdl.xl.adapter
 
 import android.Manifest
 import android.annotation.SuppressLint
@@ -6,10 +6,10 @@ import android.content.Intent
 import android.net.Uri
 import android.text.TextUtils
 import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder
+import com.hdl.xl.R
+import com.hdl.xl.databinding.ItemPeopleinfoBinding
+import com.hdl.xl.model.DataInfoBean
 import com.qmuiteam.qmui.kotlin.onClick
-import com.zswc.creativity.R
-import com.zswc.creativity.databinding.ItemPeopleinfoBinding
-import com.zswc.creativity.model.DataInfoBean
 import com.yanzhenjie.permission.Action
 import com.yanzhenjie.permission.AndPermission
 import com.ysnows.base.base.BAdapter

app/src/main/java/com/zswc/creativity/adapter/OrderListFragmentAdapter.kt → app/src/main/java/com/hdl/xl/adapter/OrderListFragmentAdapter.kt

@@ -1,16 +1,16 @@
-package com.zswc.creativity.adapter
+package com.hdl.xl.adapter
 
 import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder
-import com.qmuiteam.qmui.kotlin.onClick
 import com.ysnows.base.base.BAdapter
 import com.ysnows.base.utils.B
 import com.ysnows.base.utils.UiSwitch
-import com.zswc.creativity.R
-import com.zswc.creativity.activity.GiftOrderActivity
-import com.zswc.creativity.activity.TibOrderActivity
-import com.zswc.creativity.databinding.ItemOrderListBinding
-import com.zswc.creativity.model.MyOrderInfo
-import com.zswc.creativity.vmodel.OrderListFragmentVModel
+import com.hdl.xl.R
+import com.hdl.xl.activity.GiftOrderActivity
+import com.hdl.xl.activity.TibOrderActivity
+import com.hdl.xl.databinding.ItemOrderListBinding
+import com.hdl.xl.model.MyOrderInfo
+import com.hdl.xl.vmodel.OrderListFragmentVModel
+import com.qmuiteam.qmui.kotlin.onClick
 
 class OrderListFragmentAdapter(val vm: OrderListFragmentVModel) : BAdapter<MyOrderInfo, BaseDataBindingHolder<ItemOrderListBinding>>(R.layout.item_order_list) {
     override fun convert(holder: BaseDataBindingHolder<ItemOrderListBinding>, item:MyOrderInfo) {

app/src/main/java/com/zswc/creativity/adapter/RecommedAdapter.kt → app/src/main/java/com/hdl/xl/adapter/RecommedAdapter.kt

@@ -1,14 +1,12 @@
-package com.zswc.creativity.adapter
+package com.hdl.xl.adapter
 
 import android.graphics.Color
-import com.bumptech.glide.Glide
 import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder
 import com.ysnows.base.base.BAdapter
-import com.zswc.creativity.R
-import com.zswc.creativity.databinding.ItemRecommedBinding
-import com.zswc.creativity.model.CollectionList
-import com.zswc.creativity.utils.glide.GlideUtils
-import com.zswc.creativity.utils.glide.GlideUtilsTo
+import com.hdl.xl.R
+import com.hdl.xl.databinding.ItemRecommedBinding
+import com.hdl.xl.model.CollectionList
+import com.hdl.xl.utils.glide.GlideUtils
 
 
 class RecommedAdapter() : BAdapter<CollectionList,

app/src/main/java/com/hdl/xl/adapter/RecordListAdapter.kt

@@ -0,0 +1,15 @@
+package com.hdl.xl.adapter
+
+import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder
+import com.ysnows.base.base.BAdapter
+import com.hdl.xl.R
+import com.hdl.xl.databinding.ItemRecordListBinding
+import com.hdl.xl.model.InvitedRecord
+
+class RecordListAdapter() : BAdapter<InvitedRecord, BaseDataBindingHolder<ItemRecordListBinding>>(R.layout.item_record_list) {
+    override fun convert(holder: BaseDataBindingHolder<ItemRecordListBinding>, item: InvitedRecord) {
+        holder.dataBinding?.item = item
+
+
+    }
+}

app/src/main/java/com/zswc/creativity/adapter/RecordRankAdapter.kt → app/src/main/java/com/hdl/xl/adapter/RecordRankAdapter.kt

@@ -1,20 +1,11 @@
-package com.zswc.creativity.adapter
+package com.hdl.xl.adapter
 
 import android.view.View
 import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder
-import com.qmuiteam.qmui.kotlin.onClick
 import com.ysnows.base.base.BAdapter
-import com.ysnows.base.utils.B
-import com.ysnows.base.utils.UiSwitch
-import com.zswc.creativity.R
-import com.zswc.creativity.activity.GiftOrderActivity
-import com.zswc.creativity.activity.TibOrderActivity
-import com.zswc.creativity.databinding.ItemOrderListBinding
-import com.zswc.creativity.databinding.ItemRecorRankBinding
-import com.zswc.creativity.databinding.ItemRecordListBinding
-import com.zswc.creativity.model.InvitedList
-import com.zswc.creativity.model.MyOrderInfo
-import com.zswc.creativity.vmodel.OrderListFragmentVModel
+import com.hdl.xl.R
+import com.hdl.xl.databinding.ItemRecorRankBinding
+import com.hdl.xl.model.InvitedList
 
 class RecordRankAdapter() : BAdapter<InvitedList, BaseDataBindingHolder<ItemRecorRankBinding>>(R.layout.item_recor_rank) {
     override fun convert(holder: BaseDataBindingHolder<ItemRecorRankBinding>, item: InvitedList) {

app/src/main/java/com/zswc/creativity/adapter/SaleListFragmentAdapter.kt → app/src/main/java/com/hdl/xl/adapter/SaleListFragmentAdapter.kt

@@ -1,17 +1,15 @@
-package com.zswc.creativity.adapter
+package com.hdl.xl.adapter
 
 import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder
-import com.qmuiteam.qmui.kotlin.onClick
 import com.ysnows.base.base.BAdapter
 import com.ysnows.base.utils.B
 import com.ysnows.base.utils.UiSwitch
-import com.zswc.creativity.R
-import com.zswc.creativity.activity.AllCollectDetailsActivity
-import com.zswc.creativity.activity.CollectDetailsActivity
-import com.zswc.creativity.databinding.ItemOrderListBinding
-import com.zswc.creativity.databinding.ItemSaleListBinding
-import com.zswc.creativity.model.MyOrderInfo
-import com.zswc.creativity.vmodel.SaleListFragmentVModel
+import com.hdl.xl.R
+import com.hdl.xl.activity.AllCollectDetailsActivity
+import com.hdl.xl.databinding.ItemSaleListBinding
+import com.hdl.xl.model.MyOrderInfo
+import com.hdl.xl.vmodel.SaleListFragmentVModel
+import com.qmuiteam.qmui.kotlin.onClick
 
 class SaleListFragmentAdapter(val vm: SaleListFragmentVModel) : BAdapter<MyOrderInfo, BaseDataBindingHolder<ItemSaleListBinding>>(R.layout.item_sale_list) {
     override fun convert(holder: BaseDataBindingHolder<ItemSaleListBinding>, item:MyOrderInfo) {

app/src/main/java/com/zswc/creativity/adapter/ShopListFragmentAdapter.kt → app/src/main/java/com/hdl/xl/adapter/ShopListFragmentAdapter.kt

@@ -1,14 +1,11 @@
-package com.zswc.creativity.adapter
+package com.hdl.xl.adapter
 
 import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder
 import com.ysnows.base.base.BAdapter
-import com.zswc.creativity.R
-import com.zswc.creativity.databinding.ItemOrderListBinding
-import com.zswc.creativity.databinding.ItemSaleGoodBinding
-import com.zswc.creativity.databinding.ItemSaleListBinding
-import com.zswc.creativity.model.MyOrderInfo
-import com.zswc.creativity.vmodel.SaleListFragmentVModel
-import com.zswc.creativity.vmodel.ShopListFragmentVModel
+import com.hdl.xl.R
+import com.hdl.xl.databinding.ItemSaleGoodBinding
+import com.hdl.xl.model.MyOrderInfo
+import com.hdl.xl.vmodel.ShopListFragmentVModel
 
 class ShopListFragmentAdapter(val vm: ShopListFragmentVModel) : BAdapter<MyOrderInfo, BaseDataBindingHolder<ItemSaleGoodBinding>>(R.layout.item_sale_good) {
     override fun convert(holder: BaseDataBindingHolder<ItemSaleGoodBinding>, item:MyOrderInfo) {

app/src/main/java/com/zswc/creativity/base/MBActivity.kt → app/src/main/java/com/hdl/xl/base/MBActivity.kt

@@ -1,4 +1,4 @@
-package com.zswc.creativity.base
+package com.hdl.xl.base
 
 import android.content.Context
 import android.os.IBinder
@@ -7,9 +7,9 @@ import android.view.View
 import android.view.inputmethod.InputMethodManager
 import android.widget.EditText
 import androidx.databinding.ViewDataBinding
-import com.zswc.creativity.R
-import com.zswc.creativity.activity.OneLoginActivity
-import com.zswc.creativity.model.User
+import com.hdl.xl.R
+import com.hdl.xl.activity.LoginActivity
+import com.hdl.xl.activity.OneLoginActivity
 import com.ysnows.base.base.BActivity
 import com.ysnows.base.base.BViewModel
 import com.ysnows.base.inter.IUser
@@ -25,11 +25,11 @@ abstract class MBActivity<VM : BViewModel<*>, B : ViewDataBinding> : BActivity<V
     override fun toLogin() {
         super.toLogin()
 //        toast(R.string.please_login)
-        UiSwitch.single(context(), OneLoginActivity::class.java)
+        UiSwitch.single(context(), LoginActivity::class.java)
     }
 
     override fun user(): IUser? {
-        return User.get()
+        return com.hdl.xl.model.User.get()
     }
 
     override fun bgColor(): Int {

app/src/main/java/com/zswc/creativity/base/MBFragment.kt → app/src/main/java/com/hdl/xl/base/MBFragment.kt

@@ -1,9 +1,9 @@
-package com.zswc.creativity.base
+package com.hdl.xl.base
 
 import androidx.databinding.ViewDataBinding
-import com.zswc.creativity.R
-import com.zswc.creativity.activity.OneLoginActivity
-import com.zswc.creativity.model.User
+import com.hdl.xl.R
+import com.hdl.xl.activity.LoginActivity
+import com.hdl.xl.activity.OneLoginActivity
 import com.ysnows.base.base.BFragment
 import com.ysnows.base.base.BViewModel
 import com.ysnows.base.inter.IUser
@@ -18,13 +18,13 @@ import com.ysnows.base.utils.UiSwitch
 abstract class MBFragment<VM : BViewModel<*>, B : ViewDataBinding> : BFragment<VM, B>() {
     override fun toLogin() {
         super.toLogin()
-        UiSwitch.single(context(), OneLoginActivity::class.java)
+        UiSwitch.single(context(), LoginActivity::class.java)
 //        toast(R.string.please_login)
 
     }
 
     override fun user(): IUser? {
-        return User.get()
+        return com.hdl.xl.model.User.get()
     }
 
 

app/src/main/java/com/zswc/creativity/base/MBRActivity.kt → app/src/main/java/com/hdl/xl/base/MBRActivity.kt

@@ -1,4 +1,4 @@
-package com.zswc.creativity.base
+package com.hdl.xl.base
 
 import android.content.Context
 import android.os.IBinder
@@ -9,9 +9,9 @@ import android.widget.EditText
 import androidx.databinding.ViewDataBinding
 import com.chad.library.adapter.base.BaseQuickAdapter
 import com.chad.library.adapter.base.viewholder.BaseViewHolder
-import com.zswc.creativity.R
-import com.zswc.creativity.activity.OneLoginActivity
-import com.zswc.creativity.model.User
+import com.hdl.xl.R
+import com.hdl.xl.activity.LoginActivity
+import com.hdl.xl.activity.OneLoginActivity
 import com.ysnows.base.base.BRActivity
 import com.ysnows.base.base.BRViewModel
 import com.ysnows.base.inter.IUser
@@ -27,12 +27,12 @@ import com.ysnows.base.utils.UiSwitch
 abstract class MBRActivity<VM : BRViewModel<*>, A : BaseQuickAdapter<*, out BaseViewHolder>, B : ViewDataBinding> : BRActivity<VM, A, B>() {
     override fun toLogin() {
         super.toLogin()
-        UiSwitch.single(context(), OneLoginActivity::class.java)
+        UiSwitch.single(context(), LoginActivity::class.java)
 //     toast(R.string.please_login)
     }
 
     override fun user(): IUser? {
-        return User.get()
+        return com.hdl.xl.model.User.get()
     }
 
     override fun bgColor(): Int {

app/src/main/java/com/zswc/creativity/base/MBRFragment.kt → app/src/main/java/com/hdl/xl/base/MBRFragment.kt

@@ -1,11 +1,11 @@
-package com.zswc.creativity.base
+package com.hdl.xl.base
 
 import androidx.databinding.ViewDataBinding
 import com.chad.library.adapter.base.BaseQuickAdapter
 import com.chad.library.adapter.base.viewholder.BaseViewHolder
-import com.zswc.creativity.R
-import com.zswc.creativity.activity.OneLoginActivity
-import com.zswc.creativity.model.User
+import com.hdl.xl.R
+import com.hdl.xl.activity.LoginActivity
+import com.hdl.xl.activity.OneLoginActivity
 import com.ysnows.base.base.BRFragment
 import com.ysnows.base.base.BRViewModel
 import com.ysnows.base.inter.IUser
@@ -22,12 +22,12 @@ abstract class MBRFragment<VM : BRViewModel<*>, A : BaseQuickAdapter<*, out Base
 
     override fun toLogin() {
         super.toLogin()
-        UiSwitch.single(context(), OneLoginActivity::class.java)
+        UiSwitch.single(context(), LoginActivity::class.java)
 //        toast(R.string.please_login)
     }
 
     override fun user(): IUser? {
-        return User.get()
+        return com.hdl.xl.model.User.get()
     }
 
 

app/src/main/java/com/zswc/creativity/base/MBTabActivity.kt → app/src/main/java/com/hdl/xl/base/MBTabActivity.kt

@@ -1,9 +1,9 @@
-package com.zswc.creativity.base
+package com.hdl.xl.base
 
 import androidx.databinding.ViewDataBinding
-import com.zswc.creativity.R
-import com.zswc.creativity.activity.OneLoginActivity
-import com.zswc.creativity.model.User
+import com.hdl.xl.R
+import com.hdl.xl.activity.LoginActivity
+import com.hdl.xl.activity.OneLoginActivity
 import com.ysnows.base.base.BTabActivity
 import com.ysnows.base.base.BViewModel
 import com.ysnows.base.inter.IUser
@@ -19,11 +19,11 @@ abstract class MBTabActivity<VM : BViewModel<*>, B : ViewDataBinding> : BTabActi
     override fun toLogin() {
         super.toLogin()
 //        toast(R.string.please_login)
-        UiSwitch.single(context(), OneLoginActivity::class.java)
+        UiSwitch.single(context(), LoginActivity::class.java)
     }
 
     override fun user(): IUser? {
-        return User.get()
+        return com.hdl.xl.model.User.get()
     }
 
     override fun bgColor(): Int {

app/src/main/java/com/zswc/creativity/base/MBTabFragment.kt → app/src/main/java/com/hdl/xl/base/MBTabFragment.kt

@@ -1,9 +1,9 @@
-package com.zswc.creativity.base
+package com.hdl.xl.base
 
 import androidx.databinding.ViewDataBinding
-import com.zswc.creativity.R
-import com.zswc.creativity.activity.OneLoginActivity
-import com.zswc.creativity.model.User
+import com.hdl.xl.R
+import com.hdl.xl.activity.LoginActivity
+import com.hdl.xl.activity.OneLoginActivity
 import com.ysnows.base.base.BTabFragment
 import com.ysnows.base.base.BViewModel
 import com.ysnows.base.inter.IUser
@@ -18,13 +18,13 @@ import com.ysnows.base.utils.UiSwitch
 abstract class MBTabFragment<VM : BViewModel<*>, B : ViewDataBinding> : BTabFragment<VM, B>() {
     override fun toLogin() {
         super.toLogin()
-        UiSwitch.single(context(), OneLoginActivity::class.java)
+        UiSwitch.single(context(), LoginActivity::class.java)
 //        toast(R.string.please_login)
 
     }
 
     override fun user(): IUser? {
-        return User.get()
+        return com.hdl.xl.model.User.get()
     }
 
 

app/src/main/java/com/zswc/creativity/binding/SearchViewBindingAdapter.java → app/src/main/java/com/hdl/xl/binding/SearchViewBindingAdapter.java

@@ -1,7 +1,7 @@
-package com.zswc.creativity.binding;
+package com.hdl.xl.binding;
 
-import com.zswc.creativity.vmodel.SearchVModel;
-import com.zswc.creativity.widget.SearchView;
+import com.hdl.xl.vmodel.SearchVModel;
+import com.hdl.xl.widget.SearchView;
 
 import androidx.databinding.BindingAdapter;
 

app/src/main/java/com/zswc/creativity/component/CpApp.kt → app/src/main/java/com/hdl/xl/component/CpApp.kt

@@ -1,11 +1,11 @@
-package com.zswc.creativity.component
+package com.hdl.xl.component
 
 import com.billy.cc.core.component.CC
 import com.billy.cc.core.component.CCResult
 import com.billy.cc.core.component.IComponent
 import com.hwangjr.rxbus.RxBus
-import com.zswc.creativity.config.ConfigRx
-import com.zswc.creativity.utils.VerifyUtils
+import com.hdl.xl.config.ConfigRx
+import com.hdl.xl.utils.VerifyUtils
 import com.ysnows.base.ccextension.BIComponent
 import com.ysnows.base.model.PositionBean
 

app/src/main/java/com/zswc/creativity/config/Config.kt → app/src/main/java/com/hdl/xl/config/Config.kt

@@ -1,6 +1,6 @@
-package com.zswc.creativity.config
+package com.hdl.xl.config
 
-import com.zswc.creativity.BuildConfig
+import com.hdl.xl.BuildConfig
 import com.ysnows.base.config.IConfig
 
 object  Config : IConfig {
@@ -10,7 +10,7 @@ object  Config : IConfig {
 
      // return "https://xinyunbida.qs110.com/"
 
-        return "https://cc.chuangchi.vip/index.php/api/"
+        return "https://xlapi.xiangliannft.com/api/"
    //  return "https://xinyunbidadev.qs110.com/"//注意：切换的时候注意切换buggly
 
     }

app/src/main/java/com/zswc/creativity/config/ConfigFuncType.kt → app/src/main/java/com/hdl/xl/config/ConfigFuncType.kt

@@ -1,4 +1,4 @@
-package com.zswc.creativity.config
+package com.hdl.xl.config
 
 object ConfigFuncType {
 

app/src/main/java/com/zswc/creativity/config/ConfigMMKV.kt → app/src/main/java/com/hdl/xl/config/ConfigMMKV.kt

@@ -1,4 +1,4 @@
-package com.zswc.creativity.config
+package com.hdl.xl.config
 
 object ConfigMMKV {
 

app/src/main/java/com/zswc/creativity/config/ConfigPayWay.kt → app/src/main/java/com/hdl/xl/config/ConfigPayWay.kt

@@ -1,4 +1,4 @@
-package com.zswc.creativity.config
+package com.hdl.xl.config
 
 object ConfigPayWay {
 

app/src/main/java/com/zswc/creativity/config/ConfigRx.kt → app/src/main/java/com/hdl/xl/config/ConfigRx.kt

@@ -1,4 +1,4 @@
-package com.zswc.creativity.config
+package com.hdl.xl.config
 
 object ConfigRx {
 

app/src/main/java/com/zswc/creativity/config/ConfigVipType.kt → app/src/main/java/com/hdl/xl/config/ConfigVipType.kt

@@ -1,4 +1,4 @@
-package com.zswc.creativity.config
+package com.hdl.xl.config
 
 object ConfigVipType {
 

app/src/main/java/com/zswc/creativity/config/IConfigBugly.java → app/src/main/java/com/hdl/xl/config/IConfigBugly.java

@@ -1,4 +1,4 @@
-package com.zswc.creativity.config;
+package com.hdl.xl.config;
 
 public interface IConfigBugly {
 

app/src/main/java/com/zswc/creativity/config/MIntentAction.kt → app/src/main/java/com/hdl/xl/config/MIntentAction.kt

@@ -1,4 +1,4 @@
-package com.zswc.creativity.config
+package com.hdl.xl.config
 
 object MIntentAction {
     const val ACTION_UPDATE_APP_WIDGET: String = "action_update_app_widget"

app/src/main/java/com/zswc/creativity/fragment/AccountAnalysisFragment.kt → app/src/main/java/com/hdl/xl/fragment/AccountAnalysisFragment.kt

@@ -1,4 +1,4 @@
-package com.zswc.creativity.fragment
+package com.hdl.xl.fragment
 
 import android.os.Bundle
 import android.util.Log
@@ -9,23 +9,20 @@ import com.github.mikephil.charting.data.Entry
 import com.github.mikephil.charting.formatter.IndexAxisValueFormatter
 import com.github.mikephil.charting.highlight.Highlight
 import com.github.mikephil.charting.listener.OnChartValueSelectedListener
-import com.zswc.creativity.R
-import com.zswc.creativity.base.MBFragment
-import com.zswc.creativity.databinding.FragmentAccountAnalysisBinding
-import com.zswc.creativity.model.IconData
-import com.zswc.creativity.mp.LineChartManager
-import com.zswc.creativity.mp.MyFofChartBean
-import com.zswc.creativity.mp.MyMarkerView
-import com.zswc.creativity.vmodel.AccountAnalysisVModel
+import com.hdl.xl.R
+import com.hdl.xl.base.MBFragment
+import com.hdl.xl.databinding.FragmentAccountAnalysisBinding
+import com.hdl.xl.model.IconData
+import com.hdl.xl.vmodel.AccountAnalysisVModel
 import java.util.*
 
 class AccountAnalysisFragment : MBFragment<AccountAnalysisVModel, FragmentAccountAnalysisBinding>() {
 
 
     private val mXData = ArrayList<String>()
-    private var mMarkerView: MyMarkerView? = null
+    private var mMarkerView: com.hdl.xl.mp.MyMarkerView? = null
 
-    private var mChartManager: LineChartManager? = null
+    private var mChartManager: com.hdl.xl.mp.LineChartManager? = null
 
 
     override fun init(savedInstanceState: Bundle?) {
@@ -33,8 +30,8 @@ class AccountAnalysisFragment : MBFragment<AccountAnalysisVModel, FragmentAccoun
 
         vm.getInfo()
         // 初始化表格manager
-        mChartManager = LineChartManager(binding.chart)
-        mMarkerView = MyMarkerView(context, R.layout.chart_marker_view)
+        mChartManager = com.hdl.xl.mp.LineChartManager(binding.chart)
+        mMarkerView = com.hdl.xl.mp.MyMarkerView(context, R.layout.chart_marker_view)
         mChartManager!!.setMarkView(mMarkerView)
 
         vm.info.observe(this, androidx.lifecycle.Observer {
@@ -47,10 +44,10 @@ class AccountAnalysisFragment : MBFragment<AccountAnalysisVModel, FragmentAccoun
     }
 
    private fun  initData(bean: IconData){//给折线图数据
-       val list: ArrayList<MyFofChartBean> = ArrayList<MyFofChartBean>()
+       val list: ArrayList<com.hdl.xl.mp.MyFofChartBean> = ArrayList<com.hdl.xl.mp.MyFofChartBean>()
 
        for((index,item)in bean!!.x.withIndex()){
-           val item = MyFofChartBean(item, bean.y[index].toFloat())
+           val item = com.hdl.xl.mp.MyFofChartBean(item, bean.y[index].toFloat())
            list.add(item)
        }
        binding.chart.setOnChartValueSelectedListener(object : OnChartValueSelectedListener {
@@ -71,7 +68,7 @@ class AccountAnalysisFragment : MBFragment<AccountAnalysisVModel, FragmentAccoun
    }
 
 
-    private fun setLineChartData(list: List<MyFofChartBean>?) {
+    private fun setLineChartData(list: List<com.hdl.xl.mp.MyFofChartBean>?) {
         if (list != null && !list.isEmpty()) {
             mXData.clear()
             val size = list.size

app/src/main/java/com/zswc/creativity/fragment/AccountBillFragment.kt → app/src/main/java/com/hdl/xl/fragment/AccountBillFragment.kt

@@ -1,4 +1,4 @@
-package com.zswc.creativity.fragment
+package com.hdl.xl.fragment
 
 import android.app.Activity
 import android.content.Intent
@@ -8,13 +8,13 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.databinding.DataBindingUtil
 import androidx.lifecycle.Observer
-import com.zswc.creativity.R
-import com.zswc.creativity.adapter.BillAdapter
-import com.zswc.creativity.base.MBRFragment
-import com.zswc.creativity.config.MIntentAction
-import com.zswc.creativity.databinding.FragmentAccountBillBinding
-import com.zswc.creativity.databinding.ItemAccountHeadBinding
-import com.zswc.creativity.vmodel.AccountBillVModel
+import com.hdl.xl.R
+import com.hdl.xl.adapter.BillAdapter
+import com.hdl.xl.base.MBRFragment
+import com.hdl.xl.config.MIntentAction
+import com.hdl.xl.databinding.FragmentAccountBillBinding
+import com.hdl.xl.databinding.ItemAccountHeadBinding
+import com.hdl.xl.vmodel.AccountBillVModel
 
 class AccountBillFragment : MBRFragment<AccountBillVModel, BillAdapter, FragmentAccountBillBinding>() {
 

app/src/main/java/com/zswc/creativity/fragment/BlindBoxFragment.kt → app/src/main/java/com/hdl/xl/fragment/BlindBoxFragment.kt

@@ -1,17 +1,12 @@
-package com.zswc.creativity.fragment
+package com.hdl.xl.fragment
 
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import com.zswc.creativity.adapter.RecommedAdapter
-import com.zswc.creativity.base.MBFragment
-import com.zswc.creativity.databinding.FragmentRecommendBinding
-import com.zswc.creativity.model.CollectionList
-import com.zswc.creativity.vmodel.RecommendVModel
-import com.tencent.mmkv.MMKV
-import com.zswc.creativity.databinding.FragmentBlidboxBinding
-import com.zswc.creativity.vmodel.BlindBoxVModel
+import com.hdl.xl.base.MBFragment
+import com.hdl.xl.databinding.FragmentBlidboxBinding
+import com.hdl.xl.vmodel.BlindBoxVModel
 
 /**
  * 全部

app/src/main/java/com/zswc/creativity/fragment/ConSaleFragmet.kt → app/src/main/java/com/hdl/xl/fragment/ConSaleFragmet.kt

@@ -1,4 +1,4 @@
-package com.zswc.creativity.fragment
+package com.hdl.xl.fragment
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
@@ -6,9 +6,9 @@ import androidx.fragment.app.Fragment
 import com.qmuiteam.qmui.widget.tab.QMUITab
 import com.qmuiteam.qmui.widget.tab.QMUITabBuilder
 import com.ysnows.base.utils.B
-import com.zswc.creativity.base.MBTabFragment
-import com.zswc.creativity.databinding.FragmentConSaleBinding
-import com.zswc.creativity.vmodel.CoSaleVModel
+import com.hdl.xl.base.MBTabFragment
+import com.hdl.xl.databinding.FragmentConSaleBinding
+import com.hdl.xl.vmodel.CoSaleVModel
 
 /**
  *on 2022/7/25

app/src/main/java/com/zswc/creativity/fragment/ConsignOrderListFragment.kt → app/src/main/java/com/hdl/xl/fragment/ConsignOrderListFragment.kt

@@ -1,21 +1,15 @@
-package com.zswc.creativity.fragment
+package com.hdl.xl.fragment
 
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.ViewGroup
-import com.hwangjr.rxbus.annotation.Subscribe
-import com.hwangjr.rxbus.annotation.Tag
-import com.zswc.creativity.adapter.ConsignOrderListFragmentAdapter
-import com.zswc.creativity.adapter.OrderListFragmentAdapter
-import com.zswc.creativity.base.MBRFragment
-import com.zswc.creativity.config.ConfigRx
-import com.zswc.creativity.config.MIntentAction
-import com.zswc.creativity.databinding.FragmentConsignorderListBinding
-import com.zswc.creativity.databinding.FragmentOrderListBinding
-import com.zswc.creativity.vmodel.ConsignOrderListFragmentVModel
-import com.zswc.creativity.vmodel.OrderListFragmentVModel
+import com.hdl.xl.adapter.ConsignOrderListFragmentAdapter
+import com.hdl.xl.base.MBRFragment
+import com.hdl.xl.config.MIntentAction
+import com.hdl.xl.databinding.FragmentConsignorderListBinding
+import com.hdl.xl.vmodel.ConsignOrderListFragmentVModel
 
 /**
  *

app/src/main/java/com/zswc/creativity/fragment/HomeDriverFragment.kt → app/src/main/java/com/hdl/xl/fragment/HomeDriverFragment.kt

@@ -1,11 +1,11 @@
-package com.zswc.creativity.fragment
+package com.hdl.xl.fragment
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
-import com.zswc.creativity.adapter.HomeDriverAdapter
-import com.zswc.creativity.base.MBRFragment
-import com.zswc.creativity.databinding.FragmentHomeDriverBinding
-import com.zswc.creativity.vmodel.HomeDriverVModel
+import com.hdl.xl.adapter.HomeDriverAdapter
+import com.hdl.xl.base.MBRFragment
+import com.hdl.xl.databinding.FragmentHomeDriverBinding
+import com.hdl.xl.vmodel.HomeDriverVModel
 
 /**
  * 司机端-首页

app/src/main/java/com/zswc/creativity/fragment/HomeFirstFragment.kt → app/src/main/java/com/hdl/xl/fragment/HomeFirstFragment.kt

@@ -1,30 +1,25 @@
-package com.zswc.creativity.fragment
+package com.hdl.xl.fragment
 
 import android.graphics.Color
-import android.graphics.Typeface
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
-import androidx.appcompat.widget.AppCompatImageView
 import androidx.cardview.widget.CardView
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
-import androidx.viewpager.widget.ViewPager
 import cn.bingoogolapple.bgabanner.BGABanner
-import coil.load
 import com.hwangjr.rxbus.annotation.Subscribe
 import com.hwangjr.rxbus.annotation.Tag
-import com.zswc.creativity.R
-import com.zswc.creativity.adapter.FragAdapter
-import com.zswc.creativity.base.MBFragment
-import com.zswc.creativity.databinding.FragmentHomeFirstBinding
-import com.zswc.creativity.model.HomeBanner
-import com.zswc.creativity.vmodel.HomeFirstVModel
+import com.hdl.xl.R
+import com.hdl.xl.base.MBFragment
+import com.hdl.xl.databinding.FragmentHomeFirstBinding
+import com.hdl.xl.model.HomeBanner
+import com.hdl.xl.vmodel.HomeFirstVModel
 import com.tencent.mmkv.MMKV
-import com.zswc.creativity.config.ConfigRx
-import com.zswc.creativity.utils.glide.GlideUtils
+import com.hdl.xl.config.ConfigRx
+import com.hdl.xl.utils.glide.GlideUtils
 import java.util.ArrayList
 
 /**
@@ -35,7 +30,7 @@ import java.util.ArrayList
 class HomeFirstFragment : MBFragment<HomeFirstVModel, FragmentHomeFirstBinding>() {
 
     var fragments = emptyArray<Fragment>()
-    private var adapter: FragAdapter? = null
+    private var adapter: com.hdl.xl.adapter.FragAdapter? = null
     var type = 1//1精选 2预约
 
 
@@ -43,13 +38,13 @@ class HomeFirstFragment : MBFragment<HomeFirstVModel, FragmentHomeFirstBinding>(
         super.init(savedInstanceState)
 
         vm.toGetBanner()
+        vm.getUserInfo()
         //获取登录状态
         var token= MMKV.defaultMMKV().decodeString("token", "")
         if(token.equals("")){
             vm.isLogin.value=false
         }else{
             //登录之后访问的接口
-            vm.getUserInfo()
             vm.getMessageList()
         }
 
@@ -108,14 +103,14 @@ class HomeFirstFragment : MBFragment<HomeFirstVModel, FragmentHomeFirstBinding>(
         super.listeners()
         binding.tvMyChose.setOnClickListener(View.OnClickListener { view: View? ->
             switchContent(0)
-            binding.tvMyChose.setTextColor(Color.parseColor("#222222"))
+            binding.tvMyChose.setTextColor(Color.parseColor("#ffffff"))
             binding.tvMyAppointment.setTextColor(Color.parseColor("#888888"))
 
         })
         binding.tvMyAppointment.setOnClickListener(View.OnClickListener { view: View? ->
             switchContent(1)
             binding.tvMyChose.setTextColor(Color.parseColor("#888888"))
-            binding.tvMyAppointment.setTextColor(Color.parseColor("#222222"))
+            binding.tvMyAppointment.setTextColor(Color.parseColor("#ffffff"))
         })
 
     }

app/src/main/java/com/zswc/creativity/fragment/HomeMyFragment.kt → app/src/main/java/com/hdl/xl/fragment/HomeMyFragment.kt

@@ -1,22 +1,19 @@
-package com.zswc.creativity.fragment
+package com.hdl.xl.fragment
 
 import android.os.Bundle
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import com.hwangjr.rxbus.annotation.Subscribe
 import com.hwangjr.rxbus.annotation.Tag
-import com.qmuiteam.qmui.kotlin.onClick
 import com.tencent.mmkv.MMKV
-import com.ysnows.base.utils.UiUtils
-import com.zswc.creativity.R
-import com.zswc.creativity.adapter.CollectAdapter
-import com.zswc.creativity.base.MBFragment
-import com.zswc.creativity.config.ConfigRx
-import com.zswc.creativity.databinding.FragmentHomeMyBinding
-import com.zswc.creativity.model.MyCollection
-import com.zswc.creativity.utils.GridSpaceItemToDecoration
-import com.zswc.creativity.vmodel.HomeMyVModel
+import com.hdl.xl.R
+import com.hdl.xl.adapter.CollectAdapter
+import com.hdl.xl.base.MBFragment
+import com.hdl.xl.config.ConfigRx
+import com.hdl.xl.databinding.FragmentHomeMyBinding
+import com.hdl.xl.model.MyCollection
+import com.hdl.xl.vmodel.HomeMyVModel
+import com.qmuiteam.qmui.kotlin.onClick
 
 
 /**

app/src/main/java/com/zswc/creativity/fragment/MallListFragment.kt → app/src/main/java/com/hdl/xl/fragment/MallListFragment.kt

@@ -1,21 +1,15 @@
-package com.zswc.creativity.fragment
+package com.hdl.xl.fragment
 
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.ViewGroup
-import com.hwangjr.rxbus.annotation.Subscribe
-import com.hwangjr.rxbus.annotation.Tag
-import com.zswc.creativity.adapter.MallListAdapter
-import com.zswc.creativity.adapter.OrderListFragmentAdapter
-import com.zswc.creativity.base.MBRFragment
-import com.zswc.creativity.config.ConfigRx
-import com.zswc.creativity.config.MIntentAction
-import com.zswc.creativity.databinding.FragmentMallListBinding
-import com.zswc.creativity.databinding.FragmentOrderListBinding
-import com.zswc.creativity.vmodel.MallListVModel
-import com.zswc.creativity.vmodel.OrderListFragmentVModel
+import com.hdl.xl.adapter.MallListAdapter
+import com.hdl.xl.base.MBRFragment
+import com.hdl.xl.config.MIntentAction
+import com.hdl.xl.databinding.FragmentMallListBinding
+import com.hdl.xl.vmodel.MallListVModel
 
 /**
  *