拆包

e70ce264 · maxiaoliang · dd2b5c30 · e70ce264 · e70ce264 · e70ce264
Commit e70ce264 authored Aug 24, 2022 by maxiaoliang
27 changed files
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
 <?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.zxhl.shop">
+    package="com.zxhl.economize">
    <!-- 权限声明 -->
    <!-- 允许程序打开网络套接字 -->
@@ -35,10 +35,10 @@
    <uses-permission android:name="android.permission.READ_PHONE_STATE" /> <!-- 用于写入缓存数据到扩展存储卡 -->
    <!--必要权限，解决安全风险漏洞，发送和注册广播事件需要调用带有传递权限的接口-->
    <permission
-        android:name="com.zxhl.shop.openadsdk.permission.TT_PANGOLIN"
+        android:name="com.zxhl.economize.openadsdk.permission.TT_PANGOLIN"
        android:protectionLevel="signature" />
-    <uses-permission android:name="com.zxhl.shop.openadsdk.permission.TT_PANGOLIN" />
+    <uses-permission android:name="com.zxhl.economize.openadsdk.permission.TT_PANGOLIN" />
    <uses-sdk tools:overrideLibrary="com.bun.miitmdid" />
@@ -70,7 +70,7 @@
                <category android:name="android.intent.category.DEFAULT" />
                <data
                    android:host="main"
-                    android:scheme="xxsqshop" />
+                    android:scheme="economize" />
            </intent-filter>
        </activity>

--- a/app/src/main/java/com/zxhl/shop/AppFrontBackHelper.java
+++ b/app/src/main/java/com/zxhl/shop/AppFrontBackHelper.java
-package com.zxhl.shop;
+package com.zxhl.economize;

--- a/app/src/main/java/com/zxhl/shop/Appli.kt
+++ b/app/src/main/java/com/zxhl/shop/Appli.kt
-package com.zxhl.shop
+package com.zxhl.economize
 import android.app.Application
 import android.text.TextUtils

--- a/app/src/main/java/com/zxhl/shop/activity/InitActivity.kt
+++ b/app/src/main/java/com/zxhl/shop/activity/InitActivity.kt
-package com.zxhl.shop.activity
+package com.zxhl.economize.activity
 import android.content.Intent
 import android.text.TextUtils
@@ -9,8 +9,8 @@ import com.zxhl.cms.common.base.BaseActivity
 import com.zxhl.cms.net.SettingPreference
 import com.zxhl.cms.utils.Utils
 import com.zxhl.cms.widget.CenterDialog
-import com.zxhl.shop.Appli
+import com.zxhl.economize.Appli
-import com.zxhl.shop.R
+import com.zxhl.economize.R
 /**
 * @author (wangXuewei)

--- a/app/src/main/java/com/zxhl/shop/activity/MainActivity.java
+++ b/app/src/main/java/com/zxhl/shop/activity/MainActivity.java
-package com.zxhl.shop.activity;
+package com.zxhl.economize.activity;
 import android.annotation.SuppressLint;
 import android.content.Intent;
@@ -19,7 +19,7 @@ import com.zxbw.modulemain.fragment.ShoppingMallFragment;
 import com.zxbw.modulemain.fragment.UserCenterFragment;
 import com.zxbw.modulemain.view.NavigationBottomView;
 import com.zxhl.cms.utils.ClipboardManagerUtil;
-import com.zxhl.shop.R;
+import com.zxhl.economize.R;
 import com.zxhl.cms.AppContext;
 import com.zxhl.cms.common.Constant;
 import com.zxhl.cms.common.base.BaseActivity;

--- a/app/src/main/res/mipmap-hdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png
--- a/app/src/main/res/mipmap-mdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
--- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
 <resources>
-    <string name="app_name">小象省钱</string>
+    <string name="app_name">喜欢省</string>
 </resources>
\ No newline at end of file
--- a/app/src/main/res/xml/file_paths.xml
+++ b/app/src/main/res/xml/file_paths.xml
@@ -2,11 +2,11 @@
 <paths xmlns:android="http://schemas.android.com/apk/res/android">
    <external-path
        name="cache"
-        path="Android/data/com.zxhl.shop/" />
+        path="Android/data/com.zxhl.economize/" />
    <external-path
        name="downloadfile"
-        path="com.zxhl.shop/" />
+        path="com.zxhl.economize/" />
    <!--项目中用到的-->
    <external-path
        name="beta_external_files_path"

--- a/app/src/test/java/com/zxbw/xxsq/ExampleUnitTest.kt
+++ b/app/src/test/java/com/zxbw/xxsq/ExampleUnitTest.kt
-package com.zxhl.shop
-import org.junit.Test
-import org.junit.Assert.*
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-class ExampleUnitTest {
-    @Test
-    fun addition_isCorrect() {
-        assertEquals(4, 2 + 2)
-    }
-}
\ No newline at end of file
--- a/app/version.properties
+++ b/app/version.properties
-PACKAGE_NAME=com.zxhl.shop
+PACKAGE_NAME=com.zxhl.economize
-VERSION_CODE=20
+VERSION_CODE=1
-VERSION_NAME=1.1.9
+VERSION_NAME=1.0.0
\ No newline at end of file
--- a/cms/src/main/AndroidManifest.xml
+++ b/cms/src/main/AndroidManifest.xml
@@ -8,7 +8,7 @@
                <category android:name="android.intent.category.DEFAULT" />
                <data
                    android:host="udesk"
-                    android:scheme="xxsqshop" />
+                    android:scheme="economize" />
            </intent-filter>
        </activity>
@@ -18,7 +18,7 @@
                <category android:name="android.intent.category.DEFAULT" />
                <data
                    android:host="web"
-                    android:scheme="xxsqshop" />
+                    android:scheme="economize" />
            </intent-filter>
        </activity>
@@ -28,7 +28,7 @@
                <category android:name="android.intent.category.DEFAULT" />
                <data
                    android:host="h5"
-                    android:scheme="xxsqshop" />
+                    android:scheme="economize" />
            </intent-filter>
        </activity>
@@ -38,7 +38,7 @@
                <category android:name="android.intent.category.DEFAULT" />
                <data
                    android:host="pay"
-                    android:scheme="xxsqshop" />
+                    android:scheme="economize" />
            </intent-filter>
        </activity>
@@ -50,7 +50,7 @@
        <!-- 友盟配置 -->
        <meta-data
            android:name="UMENG_APPKEY"
-            android:value="5d0dd39b570df3d7c5000d1a" />
+            android:value="5ec64054570df37422000074" />
        <meta-data
            android:name="UMENG_CHANNEL"
            android:value="${UMENG_CHANNEL_VALUE}" /> <!-- QQ配置 -->

--- a/cms/src/main/java/com/zxhl/cms/common/Constant.java
+++ b/cms/src/main/java/com/zxhl/cms/common/Constant.java
@@ -13,7 +13,7 @@ public class Constant {
    String s = "D0EV7FZL45A5DVKD";
-    public static final String scheme = "xxsqshop";
+    public static final String scheme = "economize";
    public static int UPLOADMAXSIZE = 50;
@@ -261,9 +261,9 @@ public class Constant {
    public static class Param {
-        public static final String mPacketName = "com.zxhl.shop";
+        public static final String mPacketName = "com.zxhl.economize";
        public static boolean isLocal = mPacketName.equals("com.zx.localnews");
-        public static String APPLS = "5f758837834488be";
+        public static String APPLS = "beda9bddb0ecc15f";
        public static String androidId = "";
        public static String carrier = "";
        public static String h = "";

--- a/cms/src/main/java/com/zxhl/cms/common/NetConfig.java
+++ b/cms/src/main/java/com/zxhl/cms/common/NetConfig.java
@@ -202,8 +202,8 @@ public class NetConfig {
        public static String WEB_URL_ABOUT_US = "https://newspool.zhangxinhulian.com/sspapiNovel/su/custom/xingyunmohe/aboutMe.html?version=" + Constant.Param.vn + "&appName="+AppContext.get().getResources().getString(R.string.app_name)+"&company=北京掌心互联科技有限公司";
-        public static String WEB_URL_CUSTOMER_SERVICE = "https://1568685.s4.udesk.cn/im_client/?web_plugin_id=35245";
+        public static String WEB_URL_CUSTOMER_SERVICE = "https://1568685.s4.udesk.cn/im_client/?web_plugin_id=43808";
-        public static String WEB_URL_CUSTOMER_SERVICE_ERROR = "https://h5.zhangxinzhixun.com/to_refund";
+        public static String WEB_URL_CUSTOMER_SERVICE_ERROR = "https://h5.zhangxinzhixun.com/to_refund?appName=xihuansheng";
        public static String WEB_URL_ZENGZHI_SERVICE = "https://newspool.zhangxinhulian.com/sspapiNovel/su/custom/xingyunmohe/xxsq_zz_server.html";
        public static String WEB_URL_BUYER_KNOW = "https://newspool.zhangxinhulian.com/sspapiNovel/su/custom/xingyunmohe/buyerKnow.html?version=" + Constant.Param.vn + "&appName="+AppContext.get().getResources().getString(R.string.app_name)+"&company=北京掌心互联科技有限公司";
        public static String WEB_URL_WEEK_RULE = "https://newspool.zhangxinhulian.com/sspapiNovel/su/custom/xingyunmohe/week_activity_rule.html";

--- a/cms/src/main/java/com/zxhl/cms/utils/WeChatPay.kt
+++ b/cms/src/main/java/com/zxhl/cms/utils/WeChatPay.kt
@@ -104,7 +104,7 @@ object WeChatPay {
                        api = getIWXAPI()
                    }
                    Log.d("PAY_GET", "api sendReq")
-                    var path:String="/pages/pay/index?token=" + entity?.token + "&pkg_name=com.zxhl.shop"
+                    var path:String="/pages/pay/index?token=" + entity?.token + "&pkg_name=com.zxhl.economize"
                    val req = WXLaunchMiniProgram.Req()
                    val g = Gson()
                    val obj: JsonObject = g.fromJson(entity?.payload, JsonObject::class.java)

--- a/cms/src/main/res/values/strings.xml
+++ b/cms/src/main/res/values/strings.xml
 <resources>
-    <string name="app_name">小象省钱</string>
+    <string name="app_name">喜欢省</string>
    <string name="login_faild">登录失败</string>
    <string name="login_success">登录成功</string>
    <string name="reset_success">修改成功</string>

--- a/moduleMain/src/main/AndroidManifest.xml
+++ b/moduleMain/src/main/AndroidManifest.xml
@@ -16,7 +16,7 @@
                <data
                    android:host="splash"
-                    android:scheme="xxsqshop" />
+                    android:scheme="economize" />
            </intent-filter>
        </activity>
        <activity android:name=".activity.LoginActivity">
@@ -27,7 +27,7 @@
                <data
                    android:host="login"
-                    android:scheme="xxsqshop" />
+                    android:scheme="economize" />
            </intent-filter>
        </activity>
        <activity android:name=".activity.PhoneVouchersActivity">
@@ -38,7 +38,7 @@
                <data
                    android:host="phone_voucher"
-                    android:scheme="xxsqshop" />
+                    android:scheme="economize" />
            </intent-filter>
        </activity>
        <activity android:name=".activity.CardVoucherActivity">
@@ -49,7 +49,7 @@
                <data
                    android:host="cardvoucher"
-                    android:scheme="xxsqshop" />
+                    android:scheme="economize" />
            </intent-filter>
        </activity>
        <activity android:name=".activity.CardDetailActivity">
@@ -60,7 +60,7 @@
                <data
                    android:host="carddetail"
-                    android:scheme="xxsqshop" />
+                    android:scheme="economize" />
            </intent-filter>
        </activity>
        <activity android:name=".activity.FlashSaleActivity">
@@ -71,7 +71,7 @@
                <data
                    android:host="flashsale"
-                    android:scheme="xxsqshop" />
+                    android:scheme="economize" />
            </intent-filter>
        </activity>
        <activity android:name=".activity.WithDrawalActivity">
@@ -82,7 +82,7 @@
                <data
                    android:host="withdrawal"
-                    android:scheme="xxsqshop" />
+                    android:scheme="economize" />
            </intent-filter>
        </activity>
        <activity android:name=".activity.SkillPayActivity">
@@ -93,7 +93,7 @@
                <data
                    android:host="skillpay"
-                    android:scheme="xxsqshop" />
+                    android:scheme="economize" />
            </intent-filter>
        </activity>
        <activity android:name=".activity.BuyMemberActivity">
@@ -104,7 +104,7 @@
                <data
                    android:host="buymember"
-                    android:scheme="xxsqshop" />
+                    android:scheme="economize" />
            </intent-filter>
        </activity>
        <activity android:name=".activity.CofigBugVipActivity">
@@ -115,7 +115,7 @@
                <data
                    android:host="configbuyvip"
-                    android:scheme="xxsqshop" />
+                    android:scheme="economize" />
            </intent-filter>
        </activity>
        <activity android:name=".activity.AbuoutUsActivity">
@@ -126,7 +126,7 @@
                <data
                    android:host="abuoutus"
-                    android:scheme="xxsqshop" />
+                    android:scheme="economize" />
            </intent-filter>
        </activity>
        <activity
@@ -138,7 +138,7 @@
                <category android:name="android.intent.category.BROWSABLE"/>
                <data
                    android:host="rights_detail"
-                    android:scheme="xxsqshop" />
+                    android:scheme="economize" />
            </intent-filter>
        </activity>
@@ -150,7 +150,7 @@
                <data
                    android:host="zero_buy"
-                    android:scheme="xxsqshop" />
+                    android:scheme="economize" />
            </intent-filter>
        </activity>
@@ -164,7 +164,7 @@
                <data
                    android:host="tb_goods_detail"
-                    android:scheme="xxsqshop" />
+                    android:scheme="economize" />
            </intent-filter>
        </activity>
@@ -176,7 +176,7 @@
                <data
                    android:host="goodsdetail"
-                    android:scheme="xxsqshop" />
+                    android:scheme="economize" />
            </intent-filter>
        </activity>
        <activity android:name=".activity.MyOrderActivity">
@@ -187,7 +187,7 @@
                <data
                    android:host="myorder"
-                    android:scheme="xxsqshop" />
+                    android:scheme="economize" />
            </intent-filter>
        </activity>
        <activity android:name=".box.activity.WareHouseActivity">
@@ -198,7 +198,7 @@
                <data
                    android:host="warehouse"
-                    android:scheme="xxsqshop" />
+                    android:scheme="economize" />
            </intent-filter>
        </activity>
        <activity android:name=".box.activity.ReceiveAddressActivity">
@@ -209,7 +209,7 @@
                <data
                    android:host="receiveaddress"
-                    android:scheme="xxsqshop" />
+                    android:scheme="economize" />
            </intent-filter>
        </activity>
        <activity android:name=".box.activity.OrderDetailActivity">
@@ -221,7 +221,7 @@
                <data
                    android:host="orderdetail"
-                    android:scheme="xxsqshop" />
+                    android:scheme="economize" />
            </intent-filter>
        </activity>
        <activity android:name=".activity.ToPaySkillGoodsActivity">
@@ -233,7 +233,7 @@
                <data
                    android:host="topayskill"
-                    android:scheme="xxsqshop" />
+                    android:scheme="economize" />
            </intent-filter>
        </activity>
        <activity android:name=".activity.SettingActivity">
@@ -244,7 +244,7 @@
                <data
                    android:host="setting"
-                    android:scheme="xxsqshop" />
+                    android:scheme="economize" />
            </intent-filter>
        </activity>
        <activity android:name=".activity.OpenMemberOrderActivity">
@@ -256,7 +256,7 @@
                <data
                    android:host="member_order"
-                    android:scheme="xxsqshop" />
+                    android:scheme="economize" />
            </intent-filter>
        </activity>
        <activity android:name=".activity.OpenMemberActivity">
@@ -267,7 +267,7 @@
                <data
                    android:host="open_member"
-                    android:scheme="xxsqshop" />
+                    android:scheme="economize" />
            </intent-filter>
        </activity>
        <activity android:name=".activity.ShopOrderActivity">
@@ -279,7 +279,7 @@
                <data
                    android:host="shoporder"
-                    android:scheme="xxsqshop" />
+                    android:scheme="economize" />
            </intent-filter>
        </activity>
        <activity android:name=".box.activity.EditAddressActivity">
@@ -290,7 +290,7 @@
                <data
                    android:host="editaddress"
-                    android:scheme="xxsqshop" />
+                    android:scheme="economize" />
            </intent-filter>
        </activity>
        <activity android:name=".box.activity.OrderSuccessActivity">
@@ -301,7 +301,7 @@
                <data
                    android:host="ordersuccess"
-                    android:scheme="xxsqshop" />
+                    android:scheme="economize" />
            </intent-filter>
        </activity>
        <activity android:name=".activity.SkillShopActivity">
@@ -313,7 +313,7 @@
                <data
                    android:host="skillshop"
-                    android:scheme="xxsqshop" />
+                    android:scheme="economize" />
            </intent-filter>
        </activity>
        <activity android:name=".activity.PaySuccessActivity">
@@ -324,7 +324,7 @@
                <data
                    android:host="paysucess"
-                    android:scheme="xxsqshop" />
+                    android:scheme="economize" />
            </intent-filter>
        </activity>
        <activity android:name=".activity.RechargeActivity">
@@ -336,7 +336,7 @@
                <data
                    android:host="recharge"
-                    android:scheme="xxsqshop" />
+                    android:scheme="economize" />
            </intent-filter>
        </activity>
        <activity
@@ -349,7 +349,7 @@
                <data
                    android:host="searchresult"
-                    android:scheme="xxsqshop" />
+                    android:scheme="economize" />
            </intent-filter>
        </activity>
        <activity
@@ -362,7 +362,7 @@
                <data
                    android:host="search"
-                    android:scheme="xxsqshop" />
+                    android:scheme="economize" />
            </intent-filter>
        </activity>
        <activity
@@ -375,7 +375,7 @@
                <data
                    android:host="user_question"
-                    android:scheme="xxsqshop" />
+                    android:scheme="economize" />
            </intent-filter>
        </activity>
        <activity
@@ -388,7 +388,7 @@
                <data
                    android:host="red_envelope"
-                    android:scheme="xxsqshop" />
+                    android:scheme="economize" />
            </intent-filter>
        </activity>
    </application>

--- a/moduleMain/src/main/res/drawable-xhdpi/logo.png
+++ b/moduleMain/src/main/res/drawable-xhdpi/logo.png
--- a/moduleMain/src/main/res/drawable-xhdpi/logo_xiaoxiangshengqian.png
+++ b/moduleMain/src/main/res/drawable-xhdpi/logo_xiaoxiangshengqian.png
--- a/moduleMain/src/main/res/layout/activity_layout_abuout_us.xml
+++ b/moduleMain/src/main/res/layout/activity_layout_abuout_us.xml
@@ -37,7 +37,7 @@
        android:layout_gravity="center_horizontal"
        android:layout_marginTop="50dp"
        android:layout_marginBottom="20dp"
-        android:src="@drawable/logo_xiaoxiangshengqian" />
+        android:src="@drawable/logo" />
    <TextView
        android:id="@+id/id_tv_version"

--- a/moduleMain/src/main/res/layout/activity_layout_skill_pay.xml
+++ b/moduleMain/src/main/res/layout/activity_layout_skill_pay.xml
@@ -213,7 +213,7 @@
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_weight="1"
-            android:text="成为小象省钱会员，立享当前优惠哦"
+            android:text="成为喜欢省会员，立享当前优惠哦"
            android:layout_marginLeft="4dp"
            android:textColor="#F8E8CC"
            android:textSize="12sp" />

--- a/moduleMain/src/main/res/layout/activity_login.xml
+++ b/moduleMain/src/main/res/layout/activity_login.xml
@@ -52,7 +52,7 @@
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_marginTop="10dp"
-            android:text="欢迎打开小象省钱"
+            android:text="欢迎打开喜欢省"
            android:textColor="#F4E9C9"
            android:textSize="16sp" />
    </LinearLayout>
@@ -399,7 +399,7 @@
                android:id="@+id/id_tv_yonghu"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
-                android:text="《小象省钱用户协议》"
+                android:text="《喜欢省用户协议》"
                android:textColor="#B28A17"
                android:textSize="11sp" />
@@ -414,7 +414,7 @@
                android:id="@+id/id_tv_yinsi"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
-                android:text="《小象省钱隐私政策》"
+                android:text="《喜欢省隐私政策》"
                android:textColor="#B28A17"
                android:textSize="11sp" />
        </LinearLayout>

--- a/moduleMain/src/main/res/layout/activity_splash.xml
+++ b/moduleMain/src/main/res/layout/activity_splash.xml
@@ -21,7 +21,7 @@
        <TextView
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
-            android:text="小象省钱黑钻卡"
+            android:text="喜欢省黑钻卡"
            android:textColor="#FFD9C5A7"
            android:layout_marginTop="15dp"
            android:textSize="23sp"

--- a/moduleMain/src/main/res/layout/view_navigation_bottom.xml
+++ b/moduleMain/src/main/res/layout/view_navigation_bottom.xml
@@ -40,7 +40,7 @@
            android:textColor="@color/color_999999"
            android:textSize="14sp"
            android:textStyle="bold"
-            android:visibility="visible" />
+            android:visibility="gone" />
        <TextView
            android:id="@+id/id_view_navigation_bottom_cash"