提交改动

app/build.gradle

@@ -139,14 +139,14 @@ android.applicationVariants.all { variant ->
             break
         case "vivoRelease":
             androidJunkCode.configMap.put(variant.name, {
-                packageBase = "com.ym.plugin.ui"  //生成 java 类根包名
+                packageBase = "com.zxhl.plugin.hf"  //生成 java 类根包名
                 packageCount = 30 //生成包数量
                 activityCountPerPackage = 3 //每个包下生成 Activity 类数量
                 excludeActivityJavaFile = false
                 //是否排除生成 Activity 的 Java 文件,默认 false(layout 和写入 AndroidManifest.xml 还会执行)，主要用于处理类似神策全埋点编译过慢问题
                 otherCountPerPackage = 50  //每个包下生成其它类的数量
                 methodCountPerClass = 20  //每个类下生成方法数量
-                resPrefix = "junk_"  //生成的 layout、drawable、string 等资源名前缀
+                resPrefix = "abc_"  //生成的 layout、drawable、string 等资源名前缀
                 drawableCount = 300  //生成 drawable 资源数量
                 stringCount = 300  //生成 string 数量
             })

app/src/main/AndroidManifest.xml

@@ -63,7 +63,7 @@
         </activity>
 
         <activity
-            android:name=".activity.MainActivity"
+            android:name=".activity.XymhMainActivity"
             android:launchMode="singleTop">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />

app/src/main/java/com/zxhl/shop/AppFrontBackHelper_BASE_2409.java

+package com.zxhl.shop;
+
+
+
+import android.app.Activity;
+import android.app.Application;
+import android.os.Bundle;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+/**
+ * 应用前后台状态监听帮助类，仅在Application中使用
+ */
+
+public class AppFrontBackHelper {
+
+    private OnAppStatusListener mOnAppStatusListener;
+
+    public AppFrontBackHelper() {
+
+    }
+
+    /**
+     * 注册状态监听，仅在Application中使用
+     */
+    public void register(Application application, OnAppStatusListener listener){
+        mOnAppStatusListener = listener;
+        application.registerActivityLifecycleCallbacks(activityLifecycleCallbacks);
+    }
+
+    public void unRegister(Application application){
+        application.unregisterActivityLifecycleCallbacks(activityLifecycleCallbacks);
+    }
+
+    private Application.ActivityLifecycleCallbacks activityLifecycleCallbacks = new Application.ActivityLifecycleCallbacks() {
+        //打开的Activity数量统计
+        private int activityStartCount = 0;
+
+        @Override
+        public void onActivityCreated(@NonNull Activity activity, @Nullable Bundle savedInstanceState) {
+
+        }
+
+        @Override
+        public void onActivityStarted(@NonNull Activity activity) {
+            activityStartCount++;
+            //数值从0变到1说明是从后台切到前台
+            if (activityStartCount == 1){
+                //从后台切到前台
+                if(mOnAppStatusListener != null){
+                    mOnAppStatusListener.onFront();
+                }
+            }
+        }
+
+        @Override
+        public void onActivityResumed(@NonNull Activity activity) {
+
+        }
+
+        @Override
+        public void onActivityPaused(@NonNull Activity activity) {
+
+        }
+
+        @Override
+        public void onActivityStopped(@NonNull Activity activity) {
+            activityStartCount--;
+            //数值从1到0说明是从前台切到后台
+            if (activityStartCount == 0){
+                //从前台切到后台
+                if(mOnAppStatusListener != null){
+                    mOnAppStatusListener.onBack();
+                }
+            }
+        }
+
+        @Override
+        public void onActivitySaveInstanceState(@NonNull Activity activity, @NonNull Bundle outState) {
+
+        }
+
+        @Override
+        public void onActivityDestroyed(@NonNull Activity activity) {
+
+        }
+    };
+
+    public interface OnAppStatusListener{
+        void onFront();
+        void onBack();
+    }
+
+}
+

app/src/main/java/com/zxhl/xymhhf/AppFrontBackHelper.java

+
 package com.zxhl.xymhhf;
 
 
@@ -93,4 +94,3 @@ public class AppFrontBackHelper {
     }
 
 }
-

app/src/main/java/com/zxhl/xymhhf/Appli.kt

@@ -12,7 +12,7 @@ import com.tencent.bugly.crashreport.CrashReport
 import com.umeng.commonsdk.UMConfigure
 import com.umeng.socialize.PlatformConfig
 import com.zx.ad.modulecommon.AdNetConfig
-import com.zxbw.modulemain.activity.SplashBackgroundActivity
+import com.zxbw.modulemain.activity.XymhSplashBackgroundActivity
 import com.zxhl.cms.AppContext
 import com.zxhl.cms.common.ApplicationAsLibrary
 import com.zxhl.cms.common.Config
@@ -60,9 +60,9 @@ class Appli : Application() {
             initAppConfig()
         }
         registerActivityLifecycleCallbacks(activityLifecycleCallbacks)
-        val helper = AppFrontBackHelper()
+        val helper = XymhAppFrontBackHelper()
 
-        helper.register(this, object : AppFrontBackHelper.OnAppStatusListener {
+        helper.register(this, object : XymhAppFrontBackHelper.OnAppStatusListener {
             override fun onFront() {
                 //应用切到前台处理
                 Log.e("MXL", "应用切到前台处理")
@@ -140,7 +140,7 @@ class Appli : Application() {
                     if(canShowAd()){
                         Log.e("MXL","加载开屏")
                         var intent = Intent()
-                        intent.setClass(applicationContext, SplashBackgroundActivity::class.java)
+                        intent.setClass(applicationContext, XymhSplashBackgroundActivity::class.java)
                         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
                         AppContext.get().startActivity(intent)
                     }

app/src/main/java/com/zxhl/xymhhf/XymhAppFrontBackHelper.java

+package com.zxhl.xymhhf;
+
+
+
+import android.app.Activity;
+import android.app.Application;
+import android.os.Bundle;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+/**
+ * 应用前后台状态监听帮助类，仅在Application中使用
+ */
+
+public class XymhAppFrontBackHelper {
+
+    private OnAppStatusListener mOnAppStatusListener;
+
+    public XymhAppFrontBackHelper() {
+
+    }
+
+    /**
+     * 注册状态监听，仅在Application中使用
+     */
+    public void register(Application application, OnAppStatusListener listener){
+        mOnAppStatusListener = listener;
+        application.registerActivityLifecycleCallbacks(activityLifecycleCallbacks);
+    }
+
+    public void unRegister(Application application){
+        application.unregisterActivityLifecycleCallbacks(activityLifecycleCallbacks);
+    }
+
+    private Application.ActivityLifecycleCallbacks activityLifecycleCallbacks = new Application.ActivityLifecycleCallbacks() {
+        //打开的Activity数量统计
+        private int activityStartCount = 0;
+
+        @Override
+        public void onActivityCreated(@NonNull Activity activity, @Nullable Bundle savedInstanceState) {
+
+        }
+
+        @Override
+        public void onActivityStarted(@NonNull Activity activity) {
+            activityStartCount++;
+            //数值从0变到1说明是从后台切到前台
+            if (activityStartCount == 1){
+                //从后台切到前台
+                if(mOnAppStatusListener != null){
+                    mOnAppStatusListener.onFront();
+                }
+            }
+        }
+
+        @Override
+        public void onActivityResumed(@NonNull Activity activity) {
+
+        }
+
+        @Override
+        public void onActivityPaused(@NonNull Activity activity) {
+
+        }
+
+        @Override
+        public void onActivityStopped(@NonNull Activity activity) {
+            activityStartCount--;
+            //数值从1到0说明是从前台切到后台
+            if (activityStartCount == 0){
+                //从前台切到后台
+                if(mOnAppStatusListener != null){
+                    mOnAppStatusListener.onBack();
+                }
+            }
+        }
+
+        @Override
+        public void onActivitySaveInstanceState(@NonNull Activity activity, @NonNull Bundle outState) {
+
+        }
+
+        @Override
+        public void onActivityDestroyed(@NonNull Activity activity) {
+
+        }
+    };
+
+    public interface OnAppStatusListener{
+        void onFront();
+        void onBack();
+    }
+
+}
+

app/src/main/java/com/zxhl/xymhhf/activity/InitActivity.kt

@@ -3,7 +3,7 @@ package com.zxhl.xymhhf.activity
 import android.content.Intent
 import android.text.TextUtils
 import android.view.View
-import com.zxbw.modulemain.activity.SplashActivity
+import com.zxbw.modulemain.activity.XymhSplashActivity
 import com.zxhl.cms.AppContext
 import com.zxhl.cms.common.base.BaseActivity
 import com.zxhl.cms.net.SettingPreference
@@ -34,13 +34,13 @@ class InitActivity :BaseActivity() {
             CenterDialog.showPrivacyProtocol(this, {
                 Appli().initAppConfig()
                 SettingPreference.setFirstApp()
-                startActivity(Intent(this@InitActivity, SplashActivity::class.java))
+                startActivity(Intent(this@InitActivity, XymhSplashActivity::class.java))
                 finish()
             }, {
                 finish()
             })
         } else {
-            startActivity(Intent(this@InitActivity, SplashActivity::class.java))
+            startActivity(Intent(this@InitActivity, XymhSplashActivity::class.java))
             finish()
         }
     }

app/src/main/java/com/zxhl/xymhhf/activity/MainActivity.java → app/src/main/java/com/zxhl/xymhhf/activity/XymhMainActivity.java

@@ -50,7 +50,7 @@ import io.reactivex.functions.Consumer;
  * @author: fuxin
  * @date: 2019/3/15 下午2:19
  */
-public class MainActivity extends BaseActivity implements NavigationBottomView.NavifationCallback/*, IDialogCloseCallback, MemberContract.View*/ {
+public class XymhMainActivity extends BaseActivity implements NavigationBottomView.NavifationCallback/*, IDialogCloseCallback, MemberContract.View*/ {
 
     private List<Fragment> fragments = new ArrayList<>();
     private NavigationBottomView navigationView;

cms/src/main/AndroidManifest.xml

@@ -54,5 +54,5 @@
         <meta-data
             android:name="UMENG_CHANNEL"
             android:value="${UMENG_CHANNEL_VALUE}" /> <!-- QQ配置 -->
-    </application>
+    </application> 
 </manifest>

moduleMain/src/main/AndroidManifest.xml

@@ -5,7 +5,7 @@
 
 
         <activity
-            android:name=".activity.SplashActivity"
+            android:name=".activity.XymhSplashActivity"
             android:screenOrientation="portrait"
             android:theme="@style/Theme">
             <intent-filter>
@@ -19,7 +19,7 @@
                     android:scheme="xymhhf" />
             </intent-filter>
         </activity>
-        <activity android:name=".activity.LoginActivity">
+        <activity android:name=".activity.XymhLoginActivity">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -30,7 +30,7 @@
                     android:scheme="xymhhf" />
             </intent-filter>
         </activity>
-        <activity android:name=".activity.PhoneVouchersActivity">
+        <activity android:name=".activity.XymhPhoneVouchersActivity">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -41,7 +41,7 @@
                     android:scheme="xymhhf" />
             </intent-filter>
         </activity>
-        <activity android:name=".activity.CardVoucherActivity">
+        <activity android:name=".activity.XymhCardVoucherActivity">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -52,7 +52,7 @@
                     android:scheme="xymhhf" />
             </intent-filter>
         </activity>
-        <activity android:name=".activity.CardDetailActivity">
+        <activity android:name=".activity.XymhCardDetailActivity">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -64,7 +64,7 @@
                     android:scheme="xymhhf" />
             </intent-filter>
         </activity>
-        <activity android:name=".activity.FlashSaleActivity">
+        <activity android:name=".activity.XymhFlashSaleActivity">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -75,7 +75,7 @@
                     android:scheme="xymhhf" />
             </intent-filter>
         </activity>
-        <activity android:name=".activity.WithDrawalActivity">
+        <activity android:name=".activity.XymhWithDrawalActivity">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -86,7 +86,7 @@
                     android:scheme="xymhhf" />
             </intent-filter>
         </activity>
-        <activity android:name=".activity.SkillPayActivity">
+        <activity android:name=".activity.XymhSkillPayActivity">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -97,7 +97,7 @@
                     android:scheme="xymhhf" />
             </intent-filter>
         </activity>
-        <activity android:name=".activity.BuyMemberActivity">
+        <activity android:name=".activity.XymhBuyMemberActivity">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -108,7 +108,7 @@
                     android:scheme="xymhhf" />
             </intent-filter>
         </activity>
-        <activity android:name=".activity.CofigBugVipActivity">
+        <activity android:name=".activity.XymhCofigBugVipActivity">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -119,7 +119,7 @@
                     android:scheme="xymhhf" />
             </intent-filter>
         </activity>
-        <activity android:name=".activity.AbuoutUsActivity">
+        <activity android:name=".activity.XymhAbuoutUsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -131,7 +131,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".activity.RightsDetailActivity"
+            android:name=".activity.XymhRightsDetailActivity"
             android:launchMode="singleTop">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
@@ -145,7 +145,7 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".activity.ZeroBuyListActivity">
+        <activity android:name=".activity.XymhZeroBuyListActivity">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -158,7 +158,7 @@
         </activity>
 
         <activity
-            android:name=".activity.TbGoodsDetailActivity"
+            android:name=".activity.XymhTbGoodsDetailActivity"
             android:launchMode="singleTop">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
@@ -183,7 +183,7 @@
                     android:scheme="xymhhf" />
             </intent-filter>
         </activity>
-        <activity android:name=".activity.MyOrderActivity">
+        <activity android:name=".activity.XymhMyOrderActivity">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -228,7 +228,7 @@
                     android:scheme="xymhhf" />
             </intent-filter>
         </activity>
-        <activity android:name=".activity.ToPaySkillGoodsActivity">
+        <activity android:name=".activity.XymhToPaySkillGoodsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -240,7 +240,7 @@
                     android:scheme="xymhhf" />
             </intent-filter>
         </activity>
-        <activity android:name=".activity.SettingActivity">
+        <activity android:name=".activity.XymhSettingActivity">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -251,7 +251,7 @@
                     android:scheme="xymhhf" />
             </intent-filter>
         </activity>
-        <activity android:name=".activity.OpenMemberOrderActivity">
+        <activity android:name=".activity.XymhOpenMemberOrderActivity">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -263,7 +263,7 @@
                     android:scheme="xymhhf" />
             </intent-filter>
         </activity>
-        <activity android:name=".activity.OpenMemberActivity">
+        <activity android:name=".activity.XymhOpenMemberActivity">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -274,7 +274,7 @@
                     android:scheme="xymhhf" />
             </intent-filter>
         </activity>
-        <activity android:name=".activity.ShopOrderActivity">
+        <activity android:name=".activity.XymhShopOrderActivity">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -308,7 +308,7 @@
                     android:scheme="xymhhf" />
             </intent-filter>
         </activity>
-        <activity android:name=".activity.SkillShopActivity">
+        <activity android:name=".activity.XymhSkillShopActivity">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -320,7 +320,7 @@
                     android:scheme="xymhhf" />
             </intent-filter>
         </activity>
-        <activity android:name=".activity.PaySuccessActivity">
+        <activity android:name=".activity.XymhPaySuccessActivity">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -331,7 +331,7 @@
                     android:scheme="xymhhf" />
             </intent-filter>
         </activity>
-        <activity android:name=".activity.RechargeActivity">
+        <activity android:name=".activity.XymhRechargeActivity">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -344,7 +344,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".activity.SearchResultActivity"
+            android:name=".activity.XymhSearchResultActivity"
             android:launchMode="singleTop">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
@@ -357,7 +357,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".activity.SearchActivity"
+            android:name=".activity.XymhSearchActivity"
             android:launchMode="singleTop">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
@@ -370,7 +370,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".activity.UserQuestionActivity"
+            android:name=".activity.XymhUserQuestionActivity"
             android:launchMode="singleTop">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
@@ -383,7 +383,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".activity.GrabRedEnvelopeActivity"
+            android:name=".activity.XymhGrabRedEnvelopeActivity"
             android:launchMode="singleTop">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
@@ -396,7 +396,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".activity.SplashBackgroundActivity"
+            android:name=".activity.XymhSplashBackgroundActivity"
             android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />

moduleMain/src/main/java/com/zxbw/modulemain/activity/AbuoutUsActivity.kt → moduleMain/src/main/java/com/zxbw/modulemain/activity/XymhAbuoutUsActivity.kt

@@ -7,7 +7,7 @@ import com.zxhl.cms.common.Constant
 import com.zxhl.cms.common.base.BaseActivity
 import kotlinx.android.synthetic.main.activity_layout_abuout_us.*
 
-class AbuoutUsActivity:BaseActivity() {
+class XymhAbuoutUsActivity:BaseActivity() {
     override fun onClick(v: View?) {
 
     }

moduleMain/src/main/java/com/zxbw/modulemain/activity/BuyMemberActivity.kt → moduleMain/src/main/java/com/zxbw/modulemain/activity/XymhBuyMemberActivity.kt

@@ -7,7 +7,7 @@ import com.zxhl.cms.common.base.BaseActivity
 import com.zxhl.cms.utils.JumpUtils
 import kotlinx.android.synthetic.main.activity_layout_buy_vip.*
 
-class BuyMemberActivity : BaseActivity() {
+class XymhBuyMemberActivity : BaseActivity() {
     override fun onClick(v: View?) {
 
     }

moduleMain/src/main/java/com/zxbw/modulemain/activity/CardDetailActivity.kt → moduleMain/src/main/java/com/zxbw/modulemain/activity/XymhCardDetailActivity.kt

@@ -39,7 +39,7 @@ import kotlinx.android.synthetic.main.activity_layout_card_detail.id_img_close_p
 import kotlinx.android.synthetic.main.activity_layout_card_detail.id_rights_pay_web_view
 import kotlinx.android.synthetic.main.activity_layout_card_detail.id_rl_h5_pay_view
 
-class CardDetailActivity : BaseActivity(), CardDetailContract.View {
+class XymhCardDetailActivity : BaseActivity(), CardDetailContract.View {
     private var mPayPresenter: CardDetailPresenter? = null
     private var mLoading: LoadingDialog? = null
     private var pay_type: Int? = PaymentConfig.H5_PAY

moduleMain/src/main/java/com/zxbw/modulemain/activity/CardVoucherActivity.kt → moduleMain/src/main/java/com/zxbw/modulemain/activity/XymhCardVoucherActivity.kt

@@ -4,20 +4,18 @@ import android.content.Intent
 import android.view.View
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.zxbw.modulemain.R
-import com.zxbw.modulemain.adapter.CardAdapter
+import com.zxbw.modulemain.adapter.XymhCardAdapter
 import com.zxbw.modulemain.contract.CardVoucherContract
 import com.zxbw.modulemain.presenter.CardVoucherPresenter
 import com.zxhl.cms.AppContext
 import com.zxhl.cms.common.base.BaseActivity
-import com.zxhl.cms.net.model.qy.JgqQyEntity
 import com.zxhl.cms.net.model.qy.RightsDetailEntity
-import com.zxhl.cms.utils.JumpUtils
 import com.zxhl.cms.utils.OnRecycleItemClickListener
 import kotlinx.android.synthetic.main.activity_layout_card_voucher.*
 
-class CardVoucherActivity:BaseActivity(),CardVoucherContract.View ,OnRecycleItemClickListener<RightsDetailEntity>{
+class XymhCardVoucherActivity:BaseActivity(),CardVoucherContract.View ,OnRecycleItemClickListener<RightsDetailEntity>{
     private var mPresenter:CardVoucherPresenter?=null
-    private var mAdapter:CardAdapter?=null
+    private var mAdapter:XymhCardAdapter?=null
     private var brand:String=""
     override fun onClick(v: View?) {
 
@@ -36,7 +34,7 @@ class CardVoucherActivity:BaseActivity(),CardVoucherContract.View ,OnRecycleItem
             finish()
         }
         mPresenter= CardVoucherPresenter(this)
-        mAdapter= CardAdapter(this,this)
+        mAdapter= XymhCardAdapter(this,this)
         id_rl_card_voucher?.layoutManager= LinearLayoutManager(mActivity)
         id_rl_card_voucher?.adapter=mAdapter
         id_refresh_layout?.setOnRefreshListener {
@@ -57,7 +55,7 @@ class CardVoucherActivity:BaseActivity(),CardVoucherContract.View ,OnRecycleItem
 
     override fun onItemClick(view: View?, position: Int, data: RightsDetailEntity?) {
       //  showToast(""+position)
-        val intent = Intent(mActivity, CardDetailActivity::class.java)
+        val intent = Intent(mActivity, XymhCardDetailActivity::class.java)
         intent.putExtra("cardbean", data)
         startActivity(intent)
 

moduleMain/src/main/java/com/zxbw/modulemain/activity/CofigBugVipActivity.kt → moduleMain/src/main/java/com/zxbw/modulemain/activity/XymhCofigBugVipActivity.kt

@@ -5,7 +5,7 @@ import com.zxbw.modulemain.R
 import com.zxhl.cms.AppContext
 import com.zxhl.cms.common.base.BaseActivity
 
-class CofigBugVipActivity:BaseActivity() {
+class XymhCofigBugVipActivity:BaseActivity() {
     override fun onClick(v: View?) {
 
     }

moduleMain/src/main/java/com/zxbw/modulemain/activity/FlashSaleActivity.kt → moduleMain/src/main/java/com/zxbw/modulemain/activity/XymhFlashSaleActivity.kt

@@ -7,7 +7,7 @@ import androidx.recyclerview.widget.GridLayoutManager
 import com.zxbw.modulemain.R
 import com.zxbw.modulemain.adapter.FlashSaleAdapter
 import com.zxbw.modulemain.adapter.MoreDiscountAdapter
-import com.zxbw.modulemain.adapter.TimeAdapter
+import com.zxbw.modulemain.adapter.XymhTimeAdapter
 import com.zxbw.modulemain.contract.FlashSaleContract
 import com.zxbw.modulemain.presenter.FlashSalePresenter
 import com.zxbw.modulemain.view.DialogUtils
@@ -21,12 +21,12 @@ import com.zxhl.cms.utils.JumpUtils
 import com.zxhl.cms.utils.OnRecycleItemClickListener
 import kotlinx.android.synthetic.main.activity_layout_flash_sale.*
 
-class FlashSaleActivity : BaseActivity(), FlashSaleContract.View,
+class XymhFlashSaleActivity : BaseActivity(), FlashSaleContract.View,
     OnRecycleItemClickListener<SkillEntity> {
     private var mPresenter: FlashSalePresenter? = null
     private var mAdapter: FlashSaleAdapter? = null
     private var mDiscountAdapter: MoreDiscountAdapter? = null
-    private var mTimeAdapter: TimeAdapter? = null
+    private var mXymhTimeAdapter: XymhTimeAdapter? = null
     private var durationId: String? = ""
     private var skillGoodsEntity: SkillGoodsEntity? = null
     var mChoosList: MutableList<String> = ArrayList()
@@ -66,10 +66,10 @@ class FlashSaleActivity : BaseActivity(), FlashSaleContract.View,
 
 
             })
-        mTimeAdapter = TimeAdapter(this, this)
+        mXymhTimeAdapter = XymhTimeAdapter(this, this)
         mDiscountAdapter = MoreDiscountAdapter(this)
         id_rl_time?.layoutManager = GridLayoutManager(this, 5)
-        id_rl_time?.adapter = mTimeAdapter
+        id_rl_time?.adapter = mXymhTimeAdapter
         id_rl_more_discount?.layoutManager = GridLayoutManager(this, 3)
         id_rl_more_discount?.adapter = mDiscountAdapter
         id_rl_flash_sale_top?.layoutManager = GridLayoutManager(this, 3)
@@ -82,13 +82,13 @@ class FlashSaleActivity : BaseActivity(), FlashSaleContract.View,
 
 
     override fun setData(result: List<SkillEntity>?) {
-        mTimeAdapter?.clear()
-        mTimeAdapter?.appendToList(result)
-        mTimeAdapter?.notifyDataSetChanged()
+        mXymhTimeAdapter?.clear()
+        mXymhTimeAdapter?.appendToList(result)
+        mXymhTimeAdapter?.notifyDataSetChanged()
         if (!result.isNullOrEmpty()) {
             for (i in result.indices) {
                 if (result[i].defaultSelect == 1) {
-                    mTimeAdapter?.setPosition(i)
+                    mXymhTimeAdapter?.setPosition(i)
                     durationId = result.get(i)?.id
                     getGoodsList()
                 }
@@ -124,7 +124,7 @@ class FlashSaleActivity : BaseActivity(), FlashSaleContract.View,
             val user = SettingPreference.getUserInfoData()
             if (user.member) {
                 if (TextUtils.equals(skillGoodsEntity?.goodsType, "50")) {
-                    val intent = Intent(this, ToPaySkillGoodsActivity::class.java)
+                    val intent = Intent(this, XymhToPaySkillGoodsActivity::class.java)
                     intent.putExtra("skillgoods", skillGoodsEntity)
                     intent.putExtra("type", "1")
                     intent.putExtra("skill",true)
@@ -132,7 +132,7 @@ class FlashSaleActivity : BaseActivity(), FlashSaleContract.View,
                     startActivity(intent)
                 } else if (TextUtils.equals(skillGoodsEntity?.goodsType, "51")) {
                     //卡券商品
-                    val intent = Intent(mActivity, CardDetailActivity::class.java)
+                    val intent = Intent(mActivity, XymhCardDetailActivity::class.java)
                     intent.putExtra("cardbean", skillGoodsEntity?.card)
                     intent.putExtra("type", "1")
                     intent.putExtra("skill",true)
@@ -142,7 +142,7 @@ class FlashSaleActivity : BaseActivity(), FlashSaleContract.View,
 //                    //实物商品
 //                    mChoosList.clear()
 //                    mChoosList.add(skillGoodsEntity?.goods?.id.toString())
-                    val intent = Intent(mActivity, SkillShopActivity::class.java)
+                    val intent = Intent(mActivity, XymhSkillShopActivity::class.java)
                     intent.putExtra("goodsbean", skillGoodsEntity?.goods)
                     intent.putExtra("type", "1")
                     intent.putExtra("skill",true)

moduleMain/src/main/java/com/zxbw/modulemain/activity/GrabRedEnvelopeActivity.kt → moduleMain/src/main/java/com/zxbw/modulemain/activity/XymhGrabRedEnvelopeActivity.kt

@@ -4,7 +4,7 @@ import android.view.View
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.zxbw.modulemain.R
-import com.zxbw.modulemain.adapter.RedEnvelopeListAdapter
+import com.zxbw.modulemain.adapter.XymhRedEnvelopeListAdapter
 import com.zxbw.modulemain.adapter.RedEnvelopeTopListAdapter
 import com.zxhl.cms.common.base.BaseActivity
 import com.zxhl.cms.utils.OnRecycleItemClickListener
@@ -15,9 +15,9 @@ import kotlinx.android.synthetic.main.activity_layout_grab_red_envelope.*
  * @datetime 2022-06-28 15:01 GMT+8
  * @detail :
  */
-class GrabRedEnvelopeActivity : BaseActivity(),OnRecycleItemClickListener<Any> {
+class XymhGrabRedEnvelopeActivity : BaseActivity(),OnRecycleItemClickListener<Any> {
 
-    private var mRedEnvelopeAdapter: RedEnvelopeListAdapter? = null
+    private var mXymhRedEnvelopeAdapter: XymhRedEnvelopeListAdapter? = null
     private var mRedEnvelopeTopAdapter: RedEnvelopeTopListAdapter? = null
 
     override fun layoutID(): Int = R.layout.activity_layout_grab_red_envelope
@@ -27,9 +27,9 @@ class GrabRedEnvelopeActivity : BaseActivity(),OnRecycleItemClickListener<Any> {
     }
 
     override fun init() {
-        mRedEnvelopeAdapter = RedEnvelopeListAdapter(this,this)
+        mXymhRedEnvelopeAdapter = XymhRedEnvelopeListAdapter(this,this)
         id_rcl_red_envelope_list.layoutManager = GridLayoutManager(this, 4)
-        id_rcl_red_envelope_list.adapter = mRedEnvelopeAdapter
+        id_rcl_red_envelope_list.adapter = mXymhRedEnvelopeAdapter
 
         mRedEnvelopeTopAdapter = RedEnvelopeTopListAdapter(this)
         id_rcl_today_top_list.layoutManager = LinearLayoutManager(this)

moduleMain/src/main/java/com/zxbw/modulemain/activity/LoginActivity.kt → moduleMain/src/main/java/com/zxbw/modulemain/activity/XymhLoginActivity.kt

@@ -26,7 +26,7 @@ import java.util.concurrent.TimeUnit
  * Created by gaoleichao on 2018/12/28
  */
 
-class LoginActivity : WxImpl(), LoginContract.View {
+class XymhLoginActivity : WxImpl(), LoginContract.View {
 
     private var TYPE: Int = 0
     private val CODE = 1001

moduleMain/src/main/java/com/zxbw/modulemain/activity/MyOrderActivity.kt → moduleMain/src/main/java/com/zxbw/modulemain/activity/XymhMyOrderActivity.kt

@@ -14,7 +14,7 @@ import kotlinx.android.synthetic.main.activity_layout_my_order.*
 
 
 //我的订单
-class MyOrderActivity : BaseActivity() {
+class XymhMyOrderActivity : BaseActivity() {
     var type:String?=""
     val createTitles = ArrayList<String>().apply {
         //add(AppContext.get().getString(R.string.shop_order))

moduleMain/src/main/java/com/zxbw/modulemain/activity/OpenMemberActivity.kt → moduleMain/src/main/java/com/zxbw/modulemain/activity/XymhOpenMemberActivity.kt

@@ -15,7 +15,7 @@ import kotlinx.android.synthetic.main.activity_layout_open_member.*
  * @datetime 2022-05-30 14:12 GMT+8
  * @detail :
  */
-class OpenMemberActivity : BaseActivity() {
+class XymhOpenMemberActivity : BaseActivity() {
 
     override fun before() {
         super.before()

moduleMain/src/main/java/com/zxbw/modulemain/activity/OpenMemberOrderActivity.kt → moduleMain/src/main/java/com/zxbw/modulemain/activity/XymhOpenMemberOrderActivity.kt

@@ -30,7 +30,7 @@ import java.util.*
  * @datetime 2022-05-30 14:12 GMT+8
  * @detail :
  */
-class OpenMemberOrderActivity : BaseActivity(), PayContract.View {
+class XymhOpenMemberOrderActivity : BaseActivity(), PayContract.View {
     private var mPresenter: PayContract.Presenter? = null
     private var payResultObservable: Observable<PayResultEntity>? = null
     private var mPayFunAdapter: PaymentFunAdapter? = null;

moduleMain/src/main/java/com/zxbw/modulemain/activity/PaySuccessActivity.kt → moduleMain/src/main/java/com/zxbw/modulemain/activity/XymhPaySuccessActivity.kt

@@ -7,7 +7,7 @@ import com.zxhl.cms.common.base.BaseActivity
 import com.zxhl.cms.utils.JumpUtils
 import kotlinx.android.synthetic.main.layout_pay_suc.*
 
-class PaySuccessActivity : BaseActivity() {
+class XymhPaySuccessActivity : BaseActivity() {
     var type = ""
     override fun onClick(v: View?) {
 

moduleMain/src/main/java/com/zxbw/modulemain/activity/PhoneVouchersActivity.kt → moduleMain/src/main/java/com/zxbw/modulemain/activity/XymhPhoneVouchersActivity.kt

@@ -18,7 +18,7 @@ import kotlinx.android.synthetic.main.activity_layout_phone_vouchers.id_img_back
  * @datetime 2022-06-14 18:09 GMT+8
  * @detail :话费券列表
  */
-class PhoneVouchersActivity : BaseActivity() {
+class XymhPhoneVouchersActivity : BaseActivity() {
 
     private var mAdapter: PhoneVouchersAdapter? = null
 

moduleMain/src/main/java/com/zxbw/modulemain/activity/RechargeActivity.kt → moduleMain/src/main/java/com/zxbw/modulemain/activity/XymhRechargeActivity.kt

@@ -47,7 +47,7 @@ import kotlinx.android.synthetic.main.activity_layout_recharge.id_rights_pay_web
 import kotlinx.android.synthetic.main.activity_layout_recharge.id_rl_h5_pay_view
 
 //话费充值页面
-class RechargeActivity : BaseActivity(), OnRecycleItemClickListener<MemberEntity.ProductDetail>,
+class XymhRechargeActivity : BaseActivity(), OnRecycleItemClickListener<MemberEntity.ProductDetail>,
     RechargeContract.View {
     private var mPayFunAdapter: PaymentFunAdapter? = null;
     private var mAdapter: RechargeAdapter? = null

moduleMain/src/main/java/com/zxbw/modulemain/activity/RightsDetailActivity.kt → moduleMain/src/main/java/com/zxbw/modulemain/activity/XymhRightsDetailActivity.kt

@@ -15,7 +15,7 @@ import com.pay.paytypelibrary.base.PayUtil
 import com.zx.ad.AdManager
 import com.zx.ad.callback.InterertionAdListener
 import com.zxbw.modulemain.R
-import com.zxbw.modulemain.adapter.RightsDetailListAdapter
+import com.zxbw.modulemain.adapter.XymhRightsDetailListAdapter
 import com.zxbw.modulemain.contract.RightsDetailContract
 import com.zxbw.modulemain.contract.RightsPayContract
 import com.zxbw.modulemain.presenter.RightsDetailPresenter
@@ -45,12 +45,12 @@ import java.text.DecimalFormat
  * @author (wangXuewei)
  * @detail :权益详情
  */
-class RightsDetailActivity : BaseActivity(), RightsDetailContract.View, RightsPayContract.View,
+class XymhRightsDetailActivity : BaseActivity(), RightsDetailContract.View, RightsPayContract.View,
     OnRecycleItemClickListener<RightsDetailEntity> {
 
     private var mPayPresenter: RightsPayPresenter? = null
     private var mPresenter: RightsDetailPresenter? = null
-    private var mAdapter: RightsDetailListAdapter? = null
+    private var mAdapterXymh: XymhRightsDetailListAdapter? = null
     private var brandName: String = "";
     private var mRightsData: RightsDetailEntity? = null
     private var mLoading: LoadingDialog? = null
@@ -95,9 +95,9 @@ class RightsDetailActivity : BaseActivity(), RightsDetailContract.View, RightsPa
             id_tv_rights_instructions.text = Html.fromHtml(mAppConfig.card_desc)
         }
 
-        mAdapter = RightsDetailListAdapter(this, this)
+        mAdapterXymh = XymhRightsDetailListAdapter(this, this)
         id_rcl_vip_package_list.layoutManager = GridLayoutManager(this, 3)
-        id_rcl_vip_package_list.adapter = mAdapter
+        id_rcl_vip_package_list.adapter = mAdapterXymh
 
         mPresenter?.geRightsDetail(brandName)
     }
@@ -140,9 +140,9 @@ class RightsDetailActivity : BaseActivity(), RightsDetailContract.View, RightsPa
     }
 
     override fun setRightsDetail(result: List<RightsDetailEntity>) {
-        mAdapter?.clear()
-        mAdapter?.appendToList(result)
-        mAdapter?.setSelectPos(0)
+        mAdapterXymh?.clear()
+        mAdapterXymh?.appendToList(result)
+        mAdapterXymh?.setSelectPos(0)
         mRightsData = result[0]
         id_tv_bread_price.text = "¥ ${mRightsData?.salePrice}"
         var oldPrice = mRightsData?.originPrice?.toFloatOrNull() ?: 0f
@@ -152,7 +152,7 @@ class RightsDetailActivity : BaseActivity(), RightsDetailContract.View, RightsPa
     }
 
     override fun onItemClick(view: View?, position: Int, data: RightsDetailEntity?) {
-        mAdapter?.setSelectPos(position)
+        mAdapterXymh?.setSelectPos(position)
         mRightsData = data
         id_tv_bread_price.text = "¥ ${mRightsData?.salePrice}"
         var oldPrice = mRightsData?.originPrice?.toFloatOrNull() ?: 0f

moduleMain/src/main/java/com/zxbw/modulemain/activity/SearchActivity.kt → moduleMain/src/main/java/com/zxbw/modulemain/activity/XymhSearchActivity.kt

@@ -9,7 +9,7 @@ import android.widget.ImageView
 import android.widget.TextView
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.zxbw.modulemain.R
-import com.zxbw.modulemain.adapter.SearchReslutAdapter
+import com.zxbw.modulemain.adapter.XymhSearchReslutAdapter
 import com.zxbw.modulemain.contract.SearchContract
 import com.zxbw.modulemain.presenter.SearchPresenter
 import com.zxbw.modulemain.uitls.SPUtils
@@ -27,10 +27,10 @@ import me.jessyan.autosize.utils.ScreenUtils
  * @datetime 2022-06-06 14:20 GMT+8
  * @detail :搜索
  */
-class SearchActivity : BaseActivity(), SearchContract.View,
+class XymhSearchActivity : BaseActivity(), SearchContract.View,
     OnRecycleItemClickListener<TbGoodsItemEntity> {
     private var mPresenter: SearchPresenter? = null
-    var mGoodsAdapter: SearchReslutAdapter? = null
+    var mGoodsAdapterXymh: XymhSearchReslutAdapter? = null
     override fun before() {
         super.before()
         setStatusBarBackground(resources.getColor(com.zxhl.cms.R.color.transparent))
@@ -74,9 +74,9 @@ class SearchActivity : BaseActivity(), SearchContract.View,
         id_search_btn2.setOnClickListener(this)
         id_img_clean_history.setOnClickListener(this)
 
-        mGoodsAdapter = SearchReslutAdapter(this, this)
+        mGoodsAdapterXymh = XymhSearchReslutAdapter(this, this)
         id_rck_goods_list.layoutManager = LinearLayoutManager(this)
-        id_rck_goods_list.adapter = mGoodsAdapter
+        id_rck_goods_list.adapter = mGoodsAdapterXymh
 
 
         mPresenter = SearchPresenter(this)
@@ -118,8 +118,8 @@ class SearchActivity : BaseActivity(), SearchContract.View,
         } else {
             id_tv_title2.visibility = View.VISIBLE
             id_rck_goods_list.visibility = View.VISIBLE
-            mGoodsAdapter?.clear()
-            mGoodsAdapter?.appendToList(result)
+            mGoodsAdapterXymh?.clear()
+            mGoodsAdapterXymh?.appendToList(result)
         }
     }
 
@@ -239,7 +239,7 @@ class SearchActivity : BaseActivity(), SearchContract.View,
             var intent = Intent();
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
             intent.putExtra("goods", data)
-            intent.setClass(this, TbGoodsDetailActivity().javaClass)
+            intent.setClass(this, XymhTbGoodsDetailActivity().javaClass)
             startActivity(intent)
         }
     }

moduleMain/src/main/java/com/zxbw/modulemain/activity/SearchResultActivity.kt → moduleMain/src/main/java/com/zxbw/modulemain/activity/XymhSearchResultActivity.kt

@@ -6,7 +6,7 @@ import android.text.TextWatcher
 import android.view.View
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.zxbw.modulemain.R
-import com.zxbw.modulemain.adapter.SearchReslutAdapter
+import com.zxbw.modulemain.adapter.XymhSearchReslutAdapter
 import com.zxbw.modulemain.contract.SearchReslutContract
 import com.zxbw.modulemain.presenter.SearchResultPresenter
 import com.zxhl.cms.AppContext
@@ -19,10 +19,10 @@ import kotlinx.android.synthetic.main.activity_layout_search_reslut.*
 import kotlinx.android.synthetic.main.layout_search_reslut_empty_view.*
 
 
-class SearchResultActivity : BaseActivity(), SearchReslutContract.View,
+class XymhSearchResultActivity : BaseActivity(), SearchReslutContract.View,
     OnRecycleItemClickListener<TbGoodsItemEntity> {
     private var mPresenter: SearchResultPresenter? = null
-    private var mAdapter: SearchReslutAdapter? = null
+    private var mAdapterXymh: XymhSearchReslutAdapter? = null
     private var keyword: String? = ""
 
     override fun onClick(v: View?) {
@@ -45,13 +45,13 @@ class SearchResultActivity : BaseActivity(), SearchReslutContract.View,
             finish()
         }
         mPresenter = SearchResultPresenter(this)
-        mAdapter = SearchReslutAdapter(this, this)
+        mAdapterXymh = XymhSearchReslutAdapter(this, this)
         id_rl_seach_reslut?.layoutManager = LinearLayoutManager(this)
-        id_rl_seach_reslut?.adapter = mAdapter
+        id_rl_seach_reslut?.adapter = mAdapterXymh
         id_rl_seach_reslut?.addOnScrollListener(object : RecyclerViewScrollListener() {
             override fun onScrollToBottom() {
                 super.onScrollToBottom()
-                if ((mAdapter?.list?.size ?: 0) > 0) {
+                if ((mAdapterXymh?.list?.size ?: 0) > 0) {
                     mPresenter?.getShopSearchList(false, keyword)
                 }
             }
@@ -94,21 +94,21 @@ class SearchResultActivity : BaseActivity(), SearchReslutContract.View,
     override fun setData(isRefresh: Boolean, result: TbGoodsEntity?) {
         id_ll_empty?.visibility = View.GONE
         if (isRefresh) {
-            mAdapter?.clear()
+            mAdapterXymh?.clear()
         }
         id_refresh_layout?.isRefreshing = false
-        val start = mAdapter?.getItemCount() ?: 0
-        mAdapter?.appendToList(result?.result_list)
+        val start = mAdapterXymh?.getItemCount() ?: 0
+        mAdapterXymh?.appendToList(result?.result_list)
         if (isRefresh) {
-            mAdapter?.notifyDataSetChanged()
+            mAdapterXymh?.notifyDataSetChanged()
         } else {
-            val end = mAdapter?.getItemCount() ?: 0
-            mAdapter?.notifyItemRangeChanged(start, end)
+            val end = mAdapterXymh?.getItemCount() ?: 0
+            mAdapterXymh?.notifyItemRangeChanged(start, end)
         }
     }
 
     override fun setEmptyView() {
-        mAdapter?.clear()
+        mAdapterXymh?.clear()
         id_ll_empty?.visibility = View.VISIBLE
     }
 
@@ -127,7 +127,7 @@ class SearchResultActivity : BaseActivity(), SearchReslutContract.View,
             var intent = Intent();
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
             intent.putExtra("goods", data)
-            intent.setClass(this, TbGoodsDetailActivity().javaClass)
+            intent.setClass(this, XymhTbGoodsDetailActivity().javaClass)
             startActivity(intent)
         }
     }

moduleMain/src/main/java/com/zxbw/modulemain/activity/SettingActivity.kt → moduleMain/src/main/java/com/zxbw/modulemain/activity/XymhSettingActivity.kt

@@ -13,7 +13,7 @@ import com.zxhl.cms.net.SettingPreference
 import com.zxhl.cms.utils.JumpUtils
 import kotlinx.android.synthetic.main.activity_layout_setting.*
 
-class SettingActivity : BaseActivity() {
+class XymhSettingActivity : BaseActivity() {
     override fun onClick(v: View?) {
 
     }

moduleMain/src/main/java/com/zxbw/modulemain/activity/ShopOrderActivity.kt → moduleMain/src/main/java/com/zxbw/modulemain/activity/XymhShopOrderActivity.kt

@@ -34,7 +34,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.functions.Consumer
 import kotlinx.android.synthetic.main.activity_layout_shop_order.*
 
-class ShopOrderActivity : BaseActivity(), ShopOrderContract.View, PayContract.View {
+class XymhShopOrderActivity : BaseActivity(), ShopOrderContract.View, PayContract.View {
     private var mPresenter: ShopOrderPresenter? = null
     private var mAdapter: OrderAdapter? = null
     private var addressId: String? = ""

moduleMain/src/main/java/com/zxbw/modulemain/activity/SkillPayActivity.kt → moduleMain/src/main/java/com/zxbw/modulemain/activity/XymhSkillPayActivity.kt

@@ -10,7 +10,7 @@ import com.zxhl.cms.utils.JumpUtils
 import kotlinx.android.synthetic.main.activity_layout_skill_pay.*
 
 //秒杀商品去支付
-class SkillPayActivity : BaseActivity() {
+class XymhSkillPayActivity : BaseActivity() {
     override fun onClick(v: View?) {
 
     }

moduleMain/src/main/java/com/zxbw/modulemain/activity/SkillShopActivity.kt → moduleMain/src/main/java/com/zxbw/modulemain/activity/XymhSkillShopActivity.kt

@@ -53,7 +53,7 @@ import kotlinx.android.synthetic.main.activity_layout_skill_shop.id_tv_user_addr
 import kotlinx.android.synthetic.main.activity_layout_skill_shop.id_tv_user_name_phone
 import kotlinx.android.synthetic.main.activity_layout_to_pay_skill_goods.*
 
-class SkillShopActivity : BaseActivity(), CardDetailContract.View {
+class XymhSkillShopActivity : BaseActivity(), CardDetailContract.View {
     private var mPayPresenter: CardDetailPresenter? = null
     private var mLoading: LoadingDialog? = null
     private var pay_type: Int? = PaymentConfig.H5_PAY

moduleMain/src/main/java/com/zxbw/modulemain/activity/SplashActivity.kt → moduleMain/src/main/java/com/zxbw/modulemain/activity/XymhSplashActivity.kt

 package com.zxbw.modulemain.activity
 
-import android.content.Intent
-import android.os.Handler
 import android.text.TextUtils
 import android.util.Log
 import android.view.View
-import androidx.core.app.ActivityCompat
 import com.umeng.analytics.MobclickAgent
 import com.zx.ad.AdManager
 import com.zx.ad.callback.SplashAdListener
 import com.zxbw.modulemain.R
 import com.zxbw.modulemain.contract.SplashContract
 import com.zxbw.modulemain.presenter.SplashPresenter
-import com.zxhl.cms.common.Config
 import com.zxhl.cms.common.Constant
 import com.zxhl.cms.common.NetConfig
 import com.zxhl.cms.common.base.BaseActivity
@@ -25,14 +21,13 @@ import com.zxhl.cms.router.RounterApi
 import com.zxhl.cms.router.RounterBus
 import com.zxhl.cms.utils.EventUtils
 import com.zxhl.cms.utils.JumpUtils
-import com.zxhl.cms.utils.Utils
 import com.zxhl.cms.widget.CenterDialog
 import kotlinx.android.synthetic.main.activity_splash.*
 
 /**
  * Created by gaoleichao on 2018/12/26
  */
-class SplashActivity : BaseActivity(), SplashContract.View {
+class XymhSplashActivity : BaseActivity(), SplashContract.View {
 
     override fun onClick(v: View?) {
     }
@@ -52,7 +47,7 @@ class SplashActivity : BaseActivity(), SplashContract.View {
 
             CenterDialog.showPrivacyProtocol(this, View.OnClickListener {
                 SettingPreference.setFirstApp()
-                mPresenter = SplashPresenter(this@SplashActivity, this@SplashActivity)
+                mPresenter = SplashPresenter(this@XymhSplashActivity, this@XymhSplashActivity)
                 initListener()
             }, View.OnClickListener {
                 finish()
@@ -60,7 +55,7 @@ class SplashActivity : BaseActivity(), SplashContract.View {
 
 
         } else {
-            mPresenter = SplashPresenter(this@SplashActivity, this@SplashActivity)
+            mPresenter = SplashPresenter(this@XymhSplashActivity, this@XymhSplashActivity)
             initListener()
         }
 

moduleMain/src/main/java/com/zxbw/modulemain/activity/SplashBackgroundActivity.kt → moduleMain/src/main/java/com/zxbw/modulemain/activity/XymhSplashBackgroundActivity.kt

@@ -15,7 +15,7 @@ import com.zxhl.cms.router.RounterBus
 import com.zxhl.cms.utils.JumpUtils
 import kotlinx.android.synthetic.main.activity_splash.*
 
-class SplashBackgroundActivity: BaseActivity() {
+class XymhSplashBackgroundActivity: BaseActivity() {
 
     override fun onClick(v: View?) {
     }

moduleMain/src/main/java/com/zxbw/modulemain/activity/TbGoodsDetailActivity.kt → moduleMain/src/main/java/com/zxbw/modulemain/activity/XymhTbGoodsDetailActivity.kt

@@ -8,7 +8,6 @@ import android.view.View
 import android.webkit.*
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.viewpager.widget.ViewPager
-import androidx.viewpager2.widget.ViewPager2
 import com.zxbw.modulemain.R
 import com.zxbw.modulemain.adapter.DetailBannerAdapter
 import com.zxbw.modulemain.adapter.GoodsListAdapter
@@ -32,7 +31,7 @@ import me.jessyan.autosize.utils.ScreenUtils
  * @datetime 2022-05-24 17:12 GMT+8
  * @detail : 淘宝商品详情
  */
-class TbGoodsDetailActivity : BaseActivity(), TbGoodsDetailContract.View,
+class XymhTbGoodsDetailActivity : BaseActivity(), TbGoodsDetailContract.View,
     OnRecycleItemClickListener<TbGoodsItemEntity> {
     private var mLoading: LoadingDialog? = null
     private var mGoodsAdapter: GoodsListAdapter? = null;
@@ -291,7 +290,7 @@ class TbGoodsDetailActivity : BaseActivity(), TbGoodsDetailContract.View,
         var intent = Intent();
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
         intent.putExtra("goods", data)
-        intent.setClass(this, TbGoodsDetailActivity().javaClass)
+        intent.setClass(this, XymhTbGoodsDetailActivity().javaClass)
         startActivity(intent)
     }
 

moduleMain/src/main/java/com/zxbw/modulemain/activity/ToPaySkillGoodsActivity.kt → moduleMain/src/main/java/com/zxbw/modulemain/activity/XymhToPaySkillGoodsActivity.kt

@@ -38,7 +38,7 @@ import kotlinx.android.synthetic.main.activity_layout_to_pay_skill_goods.id_img_
 import kotlinx.android.synthetic.main.activity_layout_to_pay_skill_goods.id_rights_pay_web_view
 import kotlinx.android.synthetic.main.activity_layout_to_pay_skill_goods.id_rl_h5_pay_view
 
-class ToPaySkillGoodsActivity : BaseActivity(), CardDetailContract.View {
+class XymhToPaySkillGoodsActivity : BaseActivity(), CardDetailContract.View {
     private var mPayPresenter: CardDetailPresenter? = null
     private var mLoading: LoadingDialog? = null
     private var pay_type: Int? = PaymentConfig.H5_PAY

moduleMain/src/main/java/com/zxbw/modulemain/activity/UserQuestionActivity.kt → moduleMain/src/main/java/com/zxbw/modulemain/activity/XymhUserQuestionActivity.kt

@@ -18,7 +18,7 @@ import me.jessyan.autosize.utils.ScreenUtils
  * @datetime 2022-06-21 15:40 GMT+8
  * @detail :
  */
-class UserQuestionActivity : BaseActivity() {
+class XymhUserQuestionActivity : BaseActivity() {
 
     override fun layoutID(): Int {
         return R.layout.activity_layout_user_question

moduleMain/src/main/java/com/zxbw/modulemain/activity/WithDrawalActivity.kt → moduleMain/src/main/java/com/zxbw/modulemain/activity/XymhWithDrawalActivity.kt

@@ -5,7 +5,7 @@ import com.zxbw.modulemain.R
 import com.zxhl.cms.AppContext
 import com.zxhl.cms.common.base.BaseActivity
 
-class WithDrawalActivity:BaseActivity() {
+class XymhWithDrawalActivity:BaseActivity() {
     override fun onClick(v: View?) {
 
     }

moduleMain/src/main/java/com/zxbw/modulemain/activity/ZeroBuyListActivity.kt → moduleMain/src/main/java/com/zxbw/modulemain/activity/XymhZeroBuyListActivity.kt

@@ -17,7 +17,7 @@ import kotlinx.android.synthetic.main.activity_layout_zero_buy_list.*
  * @datetime 2022-05-24 14:08 GMT+8
  * @detail :零元购列表
  */
-class ZeroBuyListActivity : BaseActivity(), ZeroBuyListContract.View,
+class XymhZeroBuyListActivity : BaseActivity(), ZeroBuyListContract.View,
     OnRecycleItemClickListener<TbGoodsItemEntity> {
 
     private var mPresenter: ZeroBuyListPresenter? = null

moduleMain/src/main/java/com/zxbw/modulemain/adapter/FlashSaleAdapter.kt

 package com.zxbw.modulemain.adapter
 
 import android.app.Activity
-import android.content.Intent
 import android.graphics.Paint
 import android.text.TextUtils
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.ProgressBar
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.zxbw.modulemain.R
-import com.zxbw.modulemain.activity.CardDetailActivity
-import com.zxbw.modulemain.activity.SkillPayActivity
 import com.zxhl.cms.AppContext
 import com.zxhl.cms.common.base.BaseRecyclerAdapter
-import com.zxhl.cms.net.model.qy.RightsDetailEntity
 import com.zxhl.cms.net.model.qy.SkillGoodsEntity
 import com.zxhl.cms.utils.OnRecycleItemClickListener
 import com.zxhl.cms.widget.RecycleImageView

moduleMain/src/main/java/com/zxbw/modulemain/adapter/MoreDiscountAdapter.kt

@@ -10,8 +10,8 @@ import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.zxbw.modulemain.R
-import com.zxbw.modulemain.activity.CardDetailActivity
-import com.zxbw.modulemain.activity.ShopOrderActivity
+import com.zxbw.modulemain.activity.XymhCardDetailActivity
+import com.zxbw.modulemain.activity.XymhShopOrderActivity
 import com.zxhl.cms.AppContext
 import com.zxhl.cms.common.base.BaseRecyclerAdapter
 import com.zxhl.cms.net.model.qy.SkillGoodsEntity
@@ -47,7 +47,7 @@ class MoreDiscountAdapter : BaseRecyclerAdapter<SkillGoodsEntity, MoreDiscountAd
             if (TextUtils.equals(bean.goodsType, "50")) {
                 JumpUtils.RightsDetailJump(bean.card?.brand, bean.card?.icon)
             } else if (TextUtils.equals(bean.goodsType, "51")) {
-                val intent = Intent(mContext, CardDetailActivity::class.java)
+                val intent = Intent(mContext, XymhCardDetailActivity::class.java)
                 intent.putExtra("cardbean", bean.card)
                 mContext?.startActivity(intent)
             } else if (TextUtils.equals(bean.goodsType, "99")) {
@@ -55,7 +55,7 @@ class MoreDiscountAdapter : BaseRecyclerAdapter<SkillGoodsEntity, MoreDiscountAd
                 var mChoosList: MutableList<String> = ArrayList()
                 mChoosList.clear()
                 mChoosList.add(bean.goods?.id.toString())
-                val intent = Intent(mContext, ShopOrderActivity::class.java)
+                val intent = Intent(mContext, XymhShopOrderActivity::class.java)
                 intent.putStringArrayListExtra(
                     "stringList",
                     mChoosList as java.util.ArrayList<String>?

moduleMain/src/main/java/com/zxbw/modulemain/adapter/CardAdapter.kt → moduleMain/src/main/java/com/zxbw/modulemain/adapter/XymhCardAdapter.kt

@@ -11,12 +11,11 @@ import androidx.recyclerview.widget.RecyclerView
 import com.zxbw.modulemain.R
 import com.zxhl.cms.AppContext
 import com.zxhl.cms.common.base.BaseRecyclerAdapter
-import com.zxhl.cms.net.model.qy.JgqQyEntity
 import com.zxhl.cms.net.model.qy.RightsDetailEntity
 import com.zxhl.cms.utils.OnRecycleItemClickListener
 import com.zxhl.cms.widget.RecycleImageView
 
-class CardAdapter : BaseRecyclerAdapter<RightsDetailEntity, CardAdapter.ViewHolder> {
+class XymhCardAdapter : BaseRecyclerAdapter<RightsDetailEntity, XymhCardAdapter.ViewHolder> {
     private var mContext: Activity? = null
     private val listener: OnRecycleItemClickListener<RightsDetailEntity>
 

moduleMain/src/main/java/com/zxbw/modulemain/adapter/RedEnvelopeListAdapter.kt → moduleMain/src/main/java/com/zxbw/modulemain/adapter/XymhRedEnvelopeListAdapter.kt

@@ -12,7 +12,7 @@ import com.zxhl.cms.common.base.BaseRecyclerAdapter
 import com.zxhl.cms.utils.OnRecycleItemClickListener
 
 
-class RedEnvelopeListAdapter : BaseRecyclerAdapter<Any, RedEnvelopeListAdapter.ViewHolder> {
+class XymhRedEnvelopeListAdapter : BaseRecyclerAdapter<Any, XymhRedEnvelopeListAdapter.ViewHolder> {
     private var mContext: Activity? = null
     private val listener: OnRecycleItemClickListener<Any>
 

moduleMain/src/main/java/com/zxbw/modulemain/adapter/RightsDetailListAdapter.kt → moduleMain/src/main/java/com/zxbw/modulemain/adapter/XymhRightsDetailListAdapter.kt

 package com.zxbw.modulemain.adapter
 
 import android.app.Activity
-import android.content.Context
 import android.graphics.Color
 import android.graphics.Paint
-import android.text.TextUtils
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
-import com.bumptech.glide.Glide
 import com.zxbw.modulemain.R
 import com.zxhl.cms.AppContext
 import com.zxhl.cms.common.base.BaseRecyclerAdapter
-import com.zxhl.cms.net.model.qy.JgqQyEntity
 import com.zxhl.cms.net.model.qy.RightsDetailEntity
 import com.zxhl.cms.utils.OnRecycleItemClickListener
 
 
-class RightsDetailListAdapter :
-    BaseRecyclerAdapter<RightsDetailEntity, RightsDetailListAdapter.ViewHolder> {
+class XymhRightsDetailListAdapter :
+    BaseRecyclerAdapter<RightsDetailEntity, XymhRightsDetailListAdapter.ViewHolder> {
     private var mContext: Activity? = null
     private val listener: OnRecycleItemClickListener<RightsDetailEntity>
     private var mSelectPos: Int = -1;

moduleMain/src/main/java/com/zxbw/modulemain/adapter/SearchGoodsTopAdapter.kt → moduleMain/src/main/java/com/zxbw/modulemain/adapter/XymhSearchGoodsTopAdapter.kt

@@ -18,8 +18,8 @@ import com.zxhl.cms.utils.Utils
 import com.zxhl.cms.widget.RecycleImageView
 
 //搜索商品排行榜
-class SearchGoodsTopAdapter :
-    BaseRecyclerAdapter<TbGoodsItemEntity, SearchGoodsTopAdapter.ViewHolder> {
+class XymhSearchGoodsTopAdapter :
+    BaseRecyclerAdapter<TbGoodsItemEntity, XymhSearchGoodsTopAdapter.ViewHolder> {
     private var mContext: Context? = null
     private val listener: OnRecycleItemClickListener<TbGoodsItemEntity>
 

moduleMain/src/main/java/com/zxbw/modulemain/adapter/SearchReslutAdapter.kt → moduleMain/src/main/java/com/zxbw/modulemain/adapter/XymhSearchReslutAdapter.kt

@@ -15,7 +15,7 @@ import com.zxhl.cms.utils.OnRecycleItemClickListener
 import com.zxhl.cms.utils.Utils
 import com.zxhl.cms.widget.RecycleImageView
 
-class SearchReslutAdapter : BaseRecyclerAdapter<TbGoodsItemEntity, SearchReslutAdapter.ViewHolder> {
+class XymhSearchReslutAdapter : BaseRecyclerAdapter<TbGoodsItemEntity, XymhSearchReslutAdapter.ViewHolder> {
     private var mContext: Activity? = null
     private val listener: OnRecycleItemClickListener<TbGoodsItemEntity>
 

moduleMain/src/main/java/com/zxbw/modulemain/adapter/ShopRecommendAdapter.kt → moduleMain/src/main/java/com/zxbw/modulemain/adapter/XymhShopRecommendAdapter.kt

@@ -27,7 +27,7 @@ import com.zxhl.cms.widget.RecycleImageView
  * @datetime 2022-05-26 21:05 GMT+8
  * @detail :
  */
-class ShopRecommendAdapter : BaseRecyclerAdapter<TbGoodsItemEntity, RecyclerView.ViewHolder> {
+class XymhShopRecommendAdapter : BaseRecyclerAdapter<TbGoodsItemEntity, RecyclerView.ViewHolder> {
     private var mContext: Activity? = null
     private val listener: OnRecycleItemClickListener<TbGoodsItemEntity>
 

moduleMain/src/main/java/com/zxbw/modulemain/adapter/TimeAdapter.kt → moduleMain/src/main/java/com/zxbw/modulemain/adapter/XymhTimeAdapter.kt

 package com.zxbw.modulemain.adapter
 
 import android.app.Activity
-import android.graphics.Color
-import android.text.TextUtils
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
@@ -16,7 +14,7 @@ import com.zxhl.cms.common.base.BaseRecyclerAdapter
 import com.zxhl.cms.net.model.qy.SkillEntity
 import com.zxhl.cms.utils.OnRecycleItemClickListener
 
-class TimeAdapter : BaseRecyclerAdapter<SkillEntity, TimeAdapter.ViewHolder> {
+class XymhTimeAdapter : BaseRecyclerAdapter<SkillEntity, XymhTimeAdapter.ViewHolder> {
     private var mContext: Activity? = null
     private var pos = -1
     private val listener: OnRecycleItemClickListener<SkillEntity>

moduleMain/src/main/java/com/zxbw/modulemain/adapter/ZeroBuyGoodsListAdapter.kt → moduleMain/src/main/java/com/zxbw/modulemain/adapter/XymhZeroBuyGoodsListAdapter.kt

@@ -5,7 +5,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.LinearLayout
-import android.widget.RelativeLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.zxbw.modulemain.R
@@ -15,7 +14,7 @@ import com.zxhl.cms.utils.OnRecycleItemClickListener
 import com.zxhl.cms.widget.RecycleImageView
 
 
-class ZeroBuyGoodsListAdapter : BaseRecyclerAdapter<Any, ZeroBuyGoodsListAdapter.ViewHolder> {
+class XymhZeroBuyGoodsListAdapter : BaseRecyclerAdapter<Any, XymhZeroBuyGoodsListAdapter.ViewHolder> {
     private var mContext: Activity? = null
     private val listener: OnRecycleItemClickListener<Any>
 

moduleMain/src/main/java/com/zxbw/modulemain/box/activity/OrderDetailActivity.kt

 package com.zxbw.modulemain.box.activity
 
 import android.content.Intent
-import android.net.Uri
-import android.net.http.SslError
 import android.os.Handler
 import android.text.TextUtils
 import android.util.Log
 import android.view.View
-import android.webkit.*
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.zxbw.modulemain.R
-import com.zxbw.modulemain.activity.OpenMemberOrderActivity
 import com.zxbw.modulemain.box.adapter.OrderAdapter
 import com.zxbw.modulemain.box.contract.OrderDetailContract
 import com.zxbw.modulemain.box.presenter.OrderDetailPresenter
 import com.zxhl.cms.AppContext
 import com.zxhl.cms.common.Constant
-import com.zxhl.cms.common.NetConfig
 import com.zxhl.cms.common.base.BaseActivity
 import com.zxhl.cms.net.SettingPreference
 import com.zxhl.cms.net.model.box.AddressEntity
@@ -30,7 +25,6 @@ import com.zxhl.cms.pay.*
 import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.functions.Consumer
-import kotlinx.android.synthetic.main.activity_layout_member_order.*
 import kotlinx.android.synthetic.main.activity_layout_order_detail.*
 import kotlinx.android.synthetic.main.activity_layout_order_detail.id_img_back
 import kotlinx.android.synthetic.main.activity_layout_order_detail.id_img_close_pay_web

moduleMain/src/main/java/com/zxbw/modulemain/fragment/RecommendFragment.kt

@@ -2,16 +2,12 @@ package com.zxbw.modulemain.fragment
 
 import android.content.Intent
 import android.view.View
-import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.scwang.smart.refresh.footer.ClassicsFooter
 import com.scwang.smart.refresh.header.ClassicsHeader
 import com.zxbw.modulemain.R
-import com.zxbw.modulemain.activity.TbGoodsDetailActivity
-import com.zxbw.modulemain.adapter.GoodsListAdapter
+import com.zxbw.modulemain.activity.XymhTbGoodsDetailActivity
 import com.zxbw.modulemain.adapter.HomeRecommendAdapter
-import com.zxbw.modulemain.adapter.JgqQyAdapter
-import com.zxbw.modulemain.adapter.ZeroBuyGoodsListAdapter
 import com.zxbw.modulemain.contract.HomeRecommendContract
 import com.zxbw.modulemain.presenter.HomeRecommendPresenter
 import com.zxhl.cms.common.Constant
@@ -125,7 +121,7 @@ class RecommendFragment : BaseFragment, HomeRecommendContract.View,
             var intent = Intent();
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
             intent.putExtra("goods", data)
-            intent.setClass(activity!!, TbGoodsDetailActivity().javaClass)
+            intent.setClass(activity!!, XymhTbGoodsDetailActivity().javaClass)
             activity?.startActivity(intent)
         }
 

moduleMain/src/main/java/com/zxbw/modulemain/fragment/ShopRecommendFragment.kt

@@ -3,15 +3,12 @@ package com.zxbw.modulemain.fragment
 import android.content.Intent
 import android.view.View
 import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.LinearLayoutManager
 import com.scwang.smart.refresh.footer.ClassicsFooter
 import com.scwang.smart.refresh.header.ClassicsHeader
 import com.zxbw.modulemain.R
-import com.zxbw.modulemain.activity.TbGoodsDetailActivity
+import com.zxbw.modulemain.activity.XymhTbGoodsDetailActivity
 import com.zxbw.modulemain.adapter.*
-import com.zxbw.modulemain.contract.HomeRecommendContract
 import com.zxbw.modulemain.contract.ShopRecommendContract
-import com.zxbw.modulemain.presenter.HomeRecommendPresenter
 import com.zxbw.modulemain.presenter.ShopRecommendPresenter
 import com.zxhl.cms.common.Constant
 import com.zxhl.cms.common.base.BaseFragment
@@ -33,7 +30,7 @@ class ShopRecommendFragment : BaseFragment, ShopRecommendContract.View,
 
     private val tabEntity: TabEntity
     private var mPresenter: ShopRecommendPresenter? = null
-    private var mGoodsAdapter: ShopRecommendAdapter? = null;
+    private var mGoodsAdapterXymh: XymhShopRecommendAdapter? = null;
 
     override fun layoutID(): Int {
         return R.layout.fragment_layout_recommend
@@ -43,7 +40,7 @@ class ShopRecommendFragment : BaseFragment, ShopRecommendContract.View,
         mPresenter = ShopRecommendPresenter(this)
 
 
-        mGoodsAdapter = ShopRecommendAdapter(activity, this)
+        mGoodsAdapterXymh = XymhShopRecommendAdapter(activity, this)
         //底部商品列表
         val gridLayoutManager = GridLayoutManager(activity, 2)
         gridLayoutManager.spanSizeLookup = object : GridLayoutManager.SpanSizeLookup() {
@@ -56,7 +53,7 @@ class ShopRecommendFragment : BaseFragment, ShopRecommendContract.View,
         }
         id_rcl_goods_list?.layoutManager = gridLayoutManager
         id_rcl_goods_list?.addItemDecoration(RecyclerViewSpacesItemDecoration2())
-        id_rcl_goods_list.adapter = mGoodsAdapter
+        id_rcl_goods_list.adapter = mGoodsAdapterXymh
 
         id_refresh_view.setRefreshHeader(ClassicsHeader(activity))
         id_refresh_view.setRefreshFooter(ClassicsFooter(activity))
@@ -98,7 +95,7 @@ class ShopRecommendFragment : BaseFragment, ShopRecommendContract.View,
             var intent = Intent();
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
             intent.putExtra("goods", data)
-            intent.setClass(activity!!, TbGoodsDetailActivity().javaClass)
+            intent.setClass(activity!!, XymhTbGoodsDetailActivity().javaClass)
             activity?.startActivity(intent)
         }
 
@@ -106,7 +103,7 @@ class ShopRecommendFragment : BaseFragment, ShopRecommendContract.View,
 
     override fun setCategoryList(result: List<JgqQyEntity>?) {
         if (!result.isNullOrEmpty()) {
-            mGoodsAdapter?.updateShopCategoryData(result)
+            mGoodsAdapterXymh?.updateShopCategoryData(result)
         }
     }
 
@@ -118,10 +115,10 @@ class ShopRecommendFragment : BaseFragment, ShopRecommendContract.View,
         }
 
         if (isRefresh && !result.isNullOrEmpty()) {
-            mGoodsAdapter?.clear()
+            mGoodsAdapterXymh?.clear()
         }
         if (!result.isNullOrEmpty()) {
-            mGoodsAdapter?.appendToList(result)
+            mGoodsAdapterXymh?.appendToList(result)
         }
     }