Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Sign in / Register
Toggle navigation
X
xxsq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
王雪伟
xxsq
Commits
c963e72d
Commit
c963e72d
authored
Oct 10, 2022
by
maxiaoliang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
多多星球换皮
parent
b2766fea
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
28 additions
and
29 deletions
+28
-29
AndroidManifest.xml
app/src/main/AndroidManifest.xml
+3
-3
AppFrontBackHelper.java
app/src/main/java/com/ym/ddxq/AppFrontBackHelper.java
+1
-1
Appli.kt
app/src/main/java/com/ym/ddxq/Appli.kt
+1
-2
InitActivity.kt
app/src/main/java/com/ym/ddxq/activity/InitActivity.kt
+3
-3
MainActivity.java
app/src/main/java/com/ym/ddxq/activity/MainActivity.java
+2
-2
strings.xml
app/src/main/res/values/strings.xml
+1
-1
file_paths.xml
app/src/main/res/xml/file_paths.xml
+2
-2
version.properties
app/version.properties
+3
-3
AndroidManifest.xml
cms/src/main/AndroidManifest.xml
+1
-1
Constant.java
cms/src/main/java/com/zxhl/cms/common/Constant.java
+3
-3
WeChatPay.kt
cms/src/main/java/com/zxhl/cms/utils/WeChatPay.kt
+1
-1
strings.xml
cms/src/main/res/values/strings.xml
+1
-1
activity_layout_skill_pay.xml
moduleMain/src/main/res/layout/activity_layout_skill_pay.xml
+1
-1
activity_layout_splash_backound.xml
...n/src/main/res/layout/activity_layout_splash_backound.xml
+1
-1
activity_login.xml
moduleMain/src/main/res/layout/activity_login.xml
+3
-3
activity_splash.xml
moduleMain/src/main/res/layout/activity_splash.xml
+1
-1
No files found.
app/src/main/AndroidManifest.xml
View file @
c963e72d
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<manifest
xmlns:android=
"http://schemas.android.com/apk/res/android"
<manifest
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:tools=
"http://schemas.android.com/tools"
xmlns:tools=
"http://schemas.android.com/tools"
package=
"com.
zxhl.shop
"
>
package=
"com.
ym.ddxq
"
>
<!-- 权限声明 -->
<!-- 权限声明 -->
<!-- 允许程序打开网络套接字 -->
<!-- 允许程序打开网络套接字 -->
...
@@ -35,10 +35,10 @@
...
@@ -35,10 +35,10 @@
<uses-permission
android:name=
"android.permission.READ_PHONE_STATE"
/>
<!-- 用于写入缓存数据到扩展存储卡 -->
<uses-permission
android:name=
"android.permission.READ_PHONE_STATE"
/>
<!-- 用于写入缓存数据到扩展存储卡 -->
<!--必要权限,解决安全风险漏洞,发送和注册广播事件需要调用带有传递权限的接口-->
<!--必要权限,解决安全风险漏洞,发送和注册广播事件需要调用带有传递权限的接口-->
<permission
<permission
android:name=
"com.
zxhl.shop
.openadsdk.permission.TT_PANGOLIN"
android:name=
"com.
ym.ddxq
.openadsdk.permission.TT_PANGOLIN"
android:protectionLevel=
"signature"
/>
android:protectionLevel=
"signature"
/>
<uses-permission
android:name=
"com.
zxhl.shop
.openadsdk.permission.TT_PANGOLIN"
/>
<uses-permission
android:name=
"com.
ym.ddxq
.openadsdk.permission.TT_PANGOLIN"
/>
<uses-sdk
tools:overrideLibrary=
"com.bun.miitmdid"
/>
<uses-sdk
tools:overrideLibrary=
"com.bun.miitmdid"
/>
...
...
app/src/main/java/com/
zxhl/shop
/AppFrontBackHelper.java
→
app/src/main/java/com/
ym/ddxq
/AppFrontBackHelper.java
View file @
c963e72d
package
com
.
zxhl
.
shop
;
package
com
.
ym
.
ddxq
;
...
...
app/src/main/java/com/
zxhl/shop
/Appli.kt
→
app/src/main/java/com/
ym/ddxq
/Appli.kt
View file @
c963e72d
package
com.
zxhl.shop
package
com.
ym.ddxq
import
android.app.Activity
import
android.app.Activity
import
android.app.ActivityManager
import
android.app.ActivityManager
...
@@ -19,7 +19,6 @@ import com.zxhl.cms.common.Config
...
@@ -19,7 +19,6 @@ import com.zxhl.cms.common.Config
import
com.zxhl.cms.common.Constant
import
com.zxhl.cms.common.Constant
import
com.zxhl.cms.net.SettingPreference
import
com.zxhl.cms.net.SettingPreference
import
com.zxhl.cms.utils.EventUtils.onEvent
import
com.zxhl.cms.utils.EventUtils.onEvent
import
com.zxhl.cms.utils.JumpUtils
import
com.zxhl.cms.utils.MiitHelper
import
com.zxhl.cms.utils.MiitHelper
import
com.zxhl.cms.utils.Utils
import
com.zxhl.cms.utils.Utils
import
java.util.*
import
java.util.*
...
...
app/src/main/java/com/
zxhl/shop
/activity/InitActivity.kt
→
app/src/main/java/com/
ym/ddxq
/activity/InitActivity.kt
View file @
c963e72d
package
com.
zxhl.shop
.activity
package
com.
ym.ddxq
.activity
import
android.content.Intent
import
android.content.Intent
import
android.text.TextUtils
import
android.text.TextUtils
...
@@ -9,8 +9,8 @@ import com.zxhl.cms.common.base.BaseActivity
...
@@ -9,8 +9,8 @@ import com.zxhl.cms.common.base.BaseActivity
import
com.zxhl.cms.net.SettingPreference
import
com.zxhl.cms.net.SettingPreference
import
com.zxhl.cms.utils.Utils
import
com.zxhl.cms.utils.Utils
import
com.zxhl.cms.widget.CenterDialog
import
com.zxhl.cms.widget.CenterDialog
import
com.
zxhl.shop
.Appli
import
com.
ym.ddxq
.Appli
import
com.
zxhl.shop
.R
import
com.
ym.ddxq
.R
/**
/**
* @author (wangXuewei)
* @author (wangXuewei)
...
...
app/src/main/java/com/
zxhl/shop
/activity/MainActivity.java
→
app/src/main/java/com/
ym/ddxq
/activity/MainActivity.java
View file @
c963e72d
package
com
.
zxhl
.
shop
.
activity
;
package
com
.
ym
.
ddxq
.
activity
;
import
android.annotation.SuppressLint
;
import
android.annotation.SuppressLint
;
import
android.content.Intent
;
import
android.content.Intent
;
...
@@ -19,7 +19,7 @@ import com.zxbw.modulemain.fragment.ShoppingMallFragment;
...
@@ -19,7 +19,7 @@ import com.zxbw.modulemain.fragment.ShoppingMallFragment;
import
com.zxbw.modulemain.fragment.UserCenterFragment
;
import
com.zxbw.modulemain.fragment.UserCenterFragment
;
import
com.zxbw.modulemain.view.NavigationBottomView
;
import
com.zxbw.modulemain.view.NavigationBottomView
;
import
com.zxhl.cms.utils.ClipboardManagerUtil
;
import
com.zxhl.cms.utils.ClipboardManagerUtil
;
import
com.
zxhl.shop
.R
;
import
com.
ym.ddxq
.R
;
import
com.zxhl.cms.AppContext
;
import
com.zxhl.cms.AppContext
;
import
com.zxhl.cms.common.Constant
;
import
com.zxhl.cms.common.Constant
;
import
com.zxhl.cms.common.base.BaseActivity
;
import
com.zxhl.cms.common.base.BaseActivity
;
...
...
app/src/main/res/values/strings.xml
View file @
c963e72d
<resources>
<resources>
<string
name=
"app_name"
>
小象省钱
</string>
<string
name=
"app_name"
>
多多星球
</string>
</resources>
</resources>
\ No newline at end of file
app/src/main/res/xml/file_paths.xml
View file @
c963e72d
...
@@ -2,11 +2,11 @@
...
@@ -2,11 +2,11 @@
<paths
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<paths
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<external-path
<external-path
name=
"cache"
name=
"cache"
path=
"Android/data/com.
zxhl.shop
/"
/>
path=
"Android/data/com.
ym.ddxq
/"
/>
<external-path
<external-path
name=
"downloadfile"
name=
"downloadfile"
path=
"com.
zxhl.shop
/"
/>
path=
"com.
ym.ddxq
/"
/>
<!--项目中用到的-->
<!--项目中用到的-->
<external-path
<external-path
name=
"beta_external_files_path"
name=
"beta_external_files_path"
...
...
app/version.properties
View file @
c963e72d
PACKAGE_NAME
=
com.zxhl.shop
PACKAGE_NAME
=
com.ym.ddxq
VERSION_CODE
=
25
VERSION_CODE
=
1
VERSION_NAME
=
1.2.4
VERSION_NAME
=
1.0.0
\ No newline at end of file
\ No newline at end of file
cms/src/main/AndroidManifest.xml
View file @
c963e72d
...
@@ -50,7 +50,7 @@
...
@@ -50,7 +50,7 @@
<!-- 友盟配置 -->
<!-- 友盟配置 -->
<meta-data
<meta-data
android:name=
"UMENG_APPKEY"
android:name=
"UMENG_APPKEY"
android:value=
"5
d0dd39b570df3d7c5000d1a
"
/>
android:value=
"5
e675d470cafb2bcc7000223
"
/>
<meta-data
<meta-data
android:name=
"UMENG_CHANNEL"
android:name=
"UMENG_CHANNEL"
android:value=
"${UMENG_CHANNEL_VALUE}"
/>
<!-- QQ配置 -->
android:value=
"${UMENG_CHANNEL_VALUE}"
/>
<!-- QQ配置 -->
...
...
cms/src/main/java/com/zxhl/cms/common/Constant.java
View file @
c963e72d
...
@@ -9,7 +9,7 @@ import android.Manifest;
...
@@ -9,7 +9,7 @@ import android.Manifest;
public
class
Constant
{
public
class
Constant
{
//公共参数
//公共参数
String
UMENG_APPKEY
=
"5
d0dd39b570df3d7c5000d1a
"
;
String
UMENG_APPKEY
=
"5
e675d470cafb2bcc7000223
"
;
String
s
=
"D0EV7FZL45A5DVKD"
;
String
s
=
"D0EV7FZL45A5DVKD"
;
...
@@ -261,9 +261,9 @@ public class Constant {
...
@@ -261,9 +261,9 @@ public class Constant {
public
static
class
Param
{
public
static
class
Param
{
public
static
final
String
mPacketName
=
"com.
zxhl.shop
"
;
public
static
final
String
mPacketName
=
"com.
ym.ddxq
"
;
public
static
boolean
isLocal
=
mPacketName
.
equals
(
"com.zx.localnews"
);
public
static
boolean
isLocal
=
mPacketName
.
equals
(
"com.zx.localnews"
);
public
static
String
APPLS
=
"
5f758837834488be
"
;
public
static
String
APPLS
=
"
f1bfc2b3a885dcea
"
;
public
static
String
androidId
=
""
;
public
static
String
androidId
=
""
;
public
static
String
carrier
=
""
;
public
static
String
carrier
=
""
;
public
static
String
h
=
""
;
public
static
String
h
=
""
;
...
...
cms/src/main/java/com/zxhl/cms/utils/WeChatPay.kt
View file @
c963e72d
...
@@ -105,7 +105,7 @@ object WeChatPay {
...
@@ -105,7 +105,7 @@ object WeChatPay {
api
=
getIWXAPI
()
api
=
getIWXAPI
()
}
}
Log
.
d
(
"PAY_GET"
,
"api sendReq"
)
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.
ym.ddxq
"
val
req
=
WXLaunchMiniProgram
.
Req
()
val
req
=
WXLaunchMiniProgram
.
Req
()
val
g
=
Gson
()
val
g
=
Gson
()
val
obj
:
JsonObject
=
g
.
fromJson
(
entity
?.
payload
,
JsonObject
::
class
.
java
)
val
obj
:
JsonObject
=
g
.
fromJson
(
entity
?.
payload
,
JsonObject
::
class
.
java
)
...
...
cms/src/main/res/values/strings.xml
View file @
c963e72d
<resources>
<resources>
<string
name=
"app_name"
>
小象省钱
</string>
<string
name=
"app_name"
>
多多星球
</string>
<string
name=
"login_faild"
>
登录失败
</string>
<string
name=
"login_faild"
>
登录失败
</string>
<string
name=
"login_success"
>
登录成功
</string>
<string
name=
"login_success"
>
登录成功
</string>
<string
name=
"reset_success"
>
修改成功
</string>
<string
name=
"reset_success"
>
修改成功
</string>
...
...
moduleMain/src/main/res/layout/activity_layout_skill_pay.xml
View file @
c963e72d
...
@@ -213,7 +213,7 @@
...
@@ -213,7 +213,7 @@
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:layout_weight=
"1"
android:text=
"成为
小象省钱
会员,立享当前优惠哦"
android:text=
"成为
多多星球
会员,立享当前优惠哦"
android:layout_marginLeft=
"4dp"
android:layout_marginLeft=
"4dp"
android:textColor=
"#F8E8CC"
android:textColor=
"#F8E8CC"
android:textSize=
"12sp"
/>
android:textSize=
"12sp"
/>
...
...
moduleMain/src/main/res/layout/activity_layout_splash_backound.xml
View file @
c963e72d
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
<TextView
<TextView
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"
小象省钱
黑钻卡"
android:text=
"
多多星球
黑钻卡"
android:textColor=
"#FFD9C5A7"
android:textColor=
"#FFD9C5A7"
android:layout_marginTop=
"15dp"
android:layout_marginTop=
"15dp"
android:textSize=
"23sp"
android:textSize=
"23sp"
...
...
moduleMain/src/main/res/layout/activity_login.xml
View file @
c963e72d
...
@@ -52,7 +52,7 @@
...
@@ -52,7 +52,7 @@
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"10dp"
android:layout_marginTop=
"10dp"
android:text=
"欢迎打开
小象省钱
"
android:text=
"欢迎打开
多多星球
"
android:textColor=
"#F4E9C9"
android:textColor=
"#F4E9C9"
android:textSize=
"16sp"
/>
android:textSize=
"16sp"
/>
</LinearLayout>
</LinearLayout>
...
@@ -399,7 +399,7 @@
...
@@ -399,7 +399,7 @@
android:id=
"@+id/id_tv_yonghu"
android:id=
"@+id/id_tv_yonghu"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"《
小象省钱
用户协议》"
android:text=
"《
多多星球
用户协议》"
android:textColor=
"#B28A17"
android:textColor=
"#B28A17"
android:textSize=
"11sp"
/>
android:textSize=
"11sp"
/>
...
@@ -414,7 +414,7 @@
...
@@ -414,7 +414,7 @@
android:id=
"@+id/id_tv_yinsi"
android:id=
"@+id/id_tv_yinsi"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"《
小象省钱
隐私政策》"
android:text=
"《
多多星球
隐私政策》"
android:textColor=
"#B28A17"
android:textColor=
"#B28A17"
android:textSize=
"11sp"
/>
android:textSize=
"11sp"
/>
</LinearLayout>
</LinearLayout>
...
...
moduleMain/src/main/res/layout/activity_splash.xml
View file @
c963e72d
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
<TextView
<TextView
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"
小象省钱
黑钻卡"
android:text=
"
多多星球
黑钻卡"
android:textColor=
"#FFD9C5A7"
android:textColor=
"#FFD9C5A7"
android:layout_marginTop=
"15dp"
android:layout_marginTop=
"15dp"
android:textSize=
"23sp"
android:textSize=
"23sp"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment