Skip to content

X
xxsq
Commit a6cc88b2 authored by maxiaoliang's avatar maxiaoliang
Browse files
Options

同趣修改

parent 7441ecb7
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 36 deletions
app/src/main/AndroidManifest.xml
View file @ a6cc88b2
<?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.ym.ddxq">
package="com.zxhl.favorite">
<!-- 权限声明 -->
<!-- 允许程序打开网络套接字 -->
......@@ -35,10 +35,10 @@
<uses-permission android:name="android.permission.READ_PHONE_STATE" /> <!-- 用于写入缓存数据到扩展存储卡 -->
<!--必要权限，解决安全风险漏洞，发送和注册广播事件需要调用带有传递权限的接口-->
<permission
android:name="com.ym.ddxq.openadsdk.permission.TT_PANGOLIN"
android:name="com.zxhl.favorite.openadsdk.permission.TT_PANGOLIN"
android:protectionLevel="signature" />
<uses-permission android:name="com.ym.ddxq.openadsdk.permission.TT_PANGOLIN" />
<uses-permission android:name="com.zxhl.favorite.openadsdk.permission.TT_PANGOLIN" />
<uses-sdk tools:overrideLibrary="com.bun.miitmdid" />
......
app/src/main/java/com/ym/ddxq/Appli.kt → app/src/main/java/com/zxhl/favorite/Appli.kt
View file @ a6cc88b2
package com.ym.ddxq
package com.zxhl.favorite
import android.app.Activity
import android.app.ActivityManager
......
app/src/main/java/com/ym/ddxq/activity/InitActivity.kt → app/src/main/java/com/zxhl/favorite/activity/InitActivity.kt
View file @ a6cc88b2
package com.ym.ddxq.activity
package com.zxhl.favorite.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.ym.ddxq.Appli
import com.ym.ddxq.R
import com.zxhl.favorite.Appli
import com.zxhl.favorite.R
/**
* @author (wangXuewei)
......
app/src/main/java/com/ym/ddxq/activity/MainActivity.java → app/src/main/java/com/zxhl/favorite/activity/MainActivity.java
View file @ a6cc88b2
package com.ym.ddxq.activity;
package com.zxhl.favorite.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.ym.ddxq.R;
import com.zxhl.favorite.R;
import com.zxhl.cms.AppContext;
import com.zxhl.cms.common.Constant;
import com.zxhl.cms.common.base.BaseActivity;
......
app/src/main/res/values/strings.xml
View file @ a6cc88b2
<resources>
<string name="app_name">多多星球</string>
<string name="app_name">同趣</string>
</resources>
\ No newline at end of file
app/src/main/res/xml/file_paths.xml
View file @ a6cc88b2
......@@ -2,11 +2,11 @@
<paths xmlns:android="http://schemas.android.com/apk/res/android">
<external-path
name="cache"
path="Android/data/com.ym.ddxq/" />
path="Android/data/com.zxhl.favorite/" />
<external-path
name="downloadfile"
path="com.ym.ddxq/" />
path="com.zxhl.favorite/" />
<!--项目中用到的-->
<external-path
name="beta_external_files_path"
......
app/version.properties
View file @ a6cc88b2
PACKAGE_NAME=com.ym.ddxq
PACKAGE_NAME=com.zxhl.favorite
VERSION_CODE=1
VERSION_NAME=1.0.0
\ No newline at end of file
cms/src/main/AndroidManifest.xml
View file @ a6cc88b2
......@@ -50,7 +50,7 @@
<!-- 友盟配置 -->
<meta-data
android:name="UMENG_APPKEY"
android:value="5e675d470cafb2bcc7000223" />
android:value="5ee83f2c895ccad6a8000022" />
<meta-data
android:name="UMENG_CHANNEL"
android:value="${UMENG_CHANNEL_VALUE}" /> <!-- QQ配置 -->
......
cms/src/main/java/com/zxhl/cms/common/Constant.java
View file @ a6cc88b2
......@@ -9,7 +9,7 @@ import android.Manifest;
public class Constant {
//公共参数
String UMENG_APPKEY = "5e675d470cafb2bcc7000223";
String UMENG_APPKEY = "5ee83f2c895ccad6a8000022";
String s = "D0EV7FZL45A5DVKD";
......@@ -261,9 +261,9 @@ public class Constant {
public static class Param {
public static final String mPacketName = "com.ym.ddxq";
public static final String mPacketName = "com.zxhl.favorite";
public static boolean isLocal = mPacketName.equals("com.zx.localnews");
public static String APPLS = "f1bfc2b3a885dcea";
public static String APPLS = "9e99a5f05dd1a5ef";
public static String androidId = "";
public static String carrier = "";
public static String h = "";
......
cms/src/main/java/com/zxhl/cms/utils/WeChatPay.kt
View file @ a6cc88b2
......@@ -105,7 +105,7 @@ object WeChatPay {
api = getIWXAPI()
}
Log.d("PAY_GET", "api sendReq")
var path:String="/pages/pay/index?token=" + entity?.token + "&pkg_name=com.ym.ddxq"
var path:String="/pages/pay/index?token=" + entity?.token + "&pkg_name=com.zxhl.favorite"
val req = WXLaunchMiniProgram.Req()
val g = Gson()
val obj: JsonObject = g.fromJson(entity?.payload, JsonObject::class.java)
......
cms/src/main/res/values/strings.xml
View file @ a6cc88b2
<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>
......
moduleMain/src/main/res/layout/activity_layout_abuout_us.xml
View file @ a6cc88b2
......@@ -32,12 +32,12 @@
</RelativeLayout>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="50dp"
android:layout_height="50dp"
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"
......
moduleMain/src/main/res/layout/activity_layout_skill_pay.xml
View file @ a6cc88b2
......@@ -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" />
......
moduleMain/src/main/res/layout/activity_layout_splash_backound.xml
View file @ a6cc88b2
......@@ -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"
......
moduleMain/src/main/res/layout/activity_login.xml
View file @ a6cc88b2
......@@ -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>
......
moduleMain/src/main/res/layout/activity_splash.xml
View file @ a6cc88b2
......@@ -13,30 +13,31 @@
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="50dp"
android:layout_height="50dp"
android:src="@drawable/logo" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="多多星球黑钻卡"
android:textColor="#FFD9C5A7"
android:layout_marginTop="15dp"
android:text="同趣黑钻卡"
android:textColor="#FFD9C5A7"
android:textSize="23sp"
android:textStyle="bold"/>
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:text="一 张 巨 省 钱 的 黑 钻 卡"
android:textSize="10sp"
android:textColor="#FFD7CDC1"/>
android:textColor="#FFD7CDC1"
android:textSize="10sp" />
</LinearLayout>
<FrameLayout
android:id="@+id/id_splash_view"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
android:layout_height="match_parent" />
</RelativeLayout>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment