Skip to content

A
android_xunmi
Commit 2c833e5a authored by mengcuiguang's avatar mengcuiguang
Browse files
Options

图片修改

parent d0a5723d
Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 49 deletions
position/app/build.gradle
View file @ 2c833e5a
......@@ -109,9 +109,7 @@ android {
}
productFlavors {
yingyongbao {}
xunmi_share_99 {}
xunmi {}
xunmipkg {}
}
......
position/app/src/main/AndroidManifest.xml
View file @ 2c833e5a
......@@ -136,7 +136,7 @@
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="tencent1110585920" />
<data android:scheme="tencent1110758340" />
</intent-filter>
</activity>
<activity
......@@ -183,7 +183,7 @@
<!-- WX_APPID必填项 -->
<meta-data
android:name="WX_APPID"
android:value="wx8f26539eabfb04f2" />
android:value="wx224d99a10aa00c00" />
<activity
android:name=".wxapi.WXPayEntryActivity"
android:exported="true"
......
position/app/src/main/assets/supplierconfig.json
View file @ 2c833e5a
......@@ -10,7 +10,7 @@
"appid":"101365295"
},
"yingyongbao":{
"appid":"1110585920"
"appid":"1110758340"
},
"baidu":{
"appid":"17859897"
......
position/app/src/main/java/com/mints/xunmi/MintsApplication.java
View file @ 2c833e5a
......@@ -144,7 +144,6 @@ public class MintsApplication extends MultiDexApplication {
// 判断应用是否在前台
ForegroundOrBackground.init(this);
// 初始化ShareSDK
MobSDK.init(this);
......
position/app/src/main/java/com/mints/xunmi/common/Constant.java
View file @ 2c833e5a
......@@ -91,4 +91,9 @@ public interface Constant {
String SHARE_TITLE = "寻蜜";
String SHARE_CONTENT = "实时查看位置，守护您和家人安全。";
String SHARE_URL = BuildConfig.MainIp + "share/shareFriend.html?channel=" + CommonUtils.getAppMetaData(MintsApplication.getContext(), "CHANNEL_NAME");
// 协议
String AGREEMENT_PRIVACY="http://xunmi.mints-id.com/privacy.html";//隐私协议
String AGREEMENT_REGISTER="http://xunmi.mints-id.com/register.html";//注册协议
String AGREEMENT_MEMBERS="http://xunmi.mints-id.com/members.html";//付费协议
}
\ No newline at end of file
position/app/src/main/java/com/mints/xunmi/manager/JpushLoginManager.java
View file @ 2c833e5a
......@@ -69,13 +69,15 @@ public class JpushLoginManager implements LoginView {
}
public void userLogin() {
if (MintsApplication.JpushLoginFlag) {
// 支持
jPushLogin();
} else {
// 不支持
readyGo(LoginActivity.class);
}
// if (MintsApplication.JpushLoginFlag) {
// // 支持
// jPushLogin();
// } else {
// // 不支持
// readyGo(LoginActivity.class);
// }
readyGo(LoginActivity.class);
}
private void jPushLogin() {
......
position/app/src/main/java/com/mints/xunmi/mvp/model/WxPayParamBean.java
View file @ 2c833e5a
......@@ -8,7 +8,7 @@ public class WxPayParamBean implements Serializable {
/**
* params : {"package":"Sign=WXPay","appid":"wx8f26539eabfb04f2","sign":"5012752C519C5EF177181F64514AF66C","partnerid":"1546641181","prepayid":"wx13145659084039f3fb9f073b1270898700","noncestr":"RAJD28WMYMT61N17FYOYGT73PNFC","timestamp":"1592031419"}
* params : {"package":"Sign=WXPay","appid":"wx224d99a10aa00c00","sign":"5012752C519C5EF177181F64514AF66C","partnerid":"1546641181","prepayid":"wx13145659084039f3fb9f073b1270898700","noncestr":"RAJD28WMYMT61N17FYOYGT73PNFC","timestamp":"1592031419"}
* tid : 2016514565805500001
*/
......@@ -34,7 +34,7 @@ public class WxPayParamBean implements Serializable {
public class ParamsBean implements Serializable{
/**
* package : Sign=WXPay
* appid : wx8f26539eabfb04f2
* appid : wx224d99a10aa00c00
* sign : 5012752C519C5EF177181F64514AF66C
* partnerid : 1546641181
* prepayid : wx13145659084039f3fb9f073b1270898700
......
position/app/src/main/java/com/mints/xunmi/ui/activitys/AboutusActivity.kt
View file @ 2c833e5a
......@@ -36,13 +36,13 @@ class AboutusActivity : BaseActivity()
R.id.tvAboutasService -> {
val bundle = Bundle()
bundle.putString(Constant.DAICHAO_TITLE, "服务协议")
bundle.putString(Constant.DAICHAO_URL, BuildConfig.MainIp + "register.html")
bundle.putString(Constant.DAICHAO_URL, Constant.AGREEMENT_REGISTER)
readyGo(WebActivity::class.java, bundle)
}
R.id.tvAboutasPolicy -> {
val bundle = Bundle()
bundle.putString(Constant.DAICHAO_TITLE, "隐私协议")
bundle.putString(Constant.DAICHAO_URL, BuildConfig.MainIp + "privacy.html")
bundle.putString(Constant.DAICHAO_URL, Constant.AGREEMENT_PRIVACY)
readyGo(WebActivity::class.java, bundle)
}
}
......
position/app/src/main/java/com/mints/xunmi/ui/activitys/GuideActivity.java
View file @ 2c833e5a
......@@ -37,7 +37,7 @@ public class GuideActivity extends BaseActivity {
private List<ImageView> mImageViews;
// 引导图片
private int[] guideImgs = new int[]{R.mipmap.bg_guild1, R.mipmap.bg_guild2, R.mipmap.bg_guild3, R.mipmap.bg_guild4};
private int[] guideImgs = new int[]{R.mipmap.bg_guild1, R.mipmap.bg_guild3, R.mipmap.bg_guild4};
@Override
protected int getContentViewLayoutID() {
......
position/app/src/main/java/com/mints/xunmi/ui/activitys/LoginActivity.kt
View file @ 2c833e5a
......@@ -119,19 +119,19 @@ class LoginActivity : BaseActivity()
R.id.tvLoginAgreement -> {
val bundle = Bundle()
bundle.putString(Constant.DAICHAO_TITLE, "用户注册协议")
bundle.putString(Constant.DAICHAO_URL, BuildConfig.MainIp + "register.html")
bundle.putString(Constant.DAICHAO_URL, Constant.AGREEMENT_REGISTER)
readyGo(WebActivity::class.java, bundle)
}
R.id.tvLoginPolicy -> {
val bundle = Bundle()
bundle.putString(Constant.DAICHAO_TITLE, "隐私协议")
bundle.putString(Constant.DAICHAO_URL, BuildConfig.MainIp + "privacy.html")
bundle.putString(Constant.DAICHAO_URL, Constant.AGREEMENT_PRIVACY)
readyGo(WebActivity::class.java, bundle)
}
R.id.tvLoginVip -> {
val bundle = Bundle()
bundle.putString(Constant.DAICHAO_TITLE, "付费协议")
bundle.putString(Constant.DAICHAO_URL, BuildConfig.MainIp + "members.html")
bundle.putString(Constant.DAICHAO_URL, Constant.AGREEMENT_MEMBERS)
readyGo(WebActivity::class.java, bundle)
}
}
......
position/app/src/main/java/com/mints/xunmi/ui/activitys/SettingActivity.kt
View file @ 2c833e5a
......@@ -111,19 +111,19 @@ class SettingActivity : BaseActivity()
R.id.rlSettingPolicy -> {
val bundle = Bundle()
bundle.putString(Constant.DAICHAO_TITLE, "隐私协议")
bundle.putString(Constant.DAICHAO_URL, BuildConfig.MainIp + "privacy.html")
bundle.putString(Constant.DAICHAO_URL, Constant.AGREEMENT_PRIVACY)
readyGo(WebActivity::class.java, bundle)
}
R.id.rlSettingAgreement -> {
val bundle = Bundle()
bundle.putString(Constant.DAICHAO_TITLE, "用户注册协议")
bundle.putString(Constant.DAICHAO_URL, BuildConfig.MainIp + "register.html")
bundle.putString(Constant.DAICHAO_URL, Constant.AGREEMENT_REGISTER)
readyGo(WebActivity::class.java, bundle)
}
R.id.rlSettingVip -> {
val bundle = Bundle()
bundle.putString(Constant.DAICHAO_TITLE, "付费协议")
bundle.putString(Constant.DAICHAO_URL, BuildConfig.MainIp + "members.html")
bundle.putString(Constant.DAICHAO_URL, Constant.AGREEMENT_MEMBERS)
readyGo(WebActivity::class.java, bundle)
}
R.id.rlSettingKill -> {
......
position/app/src/main/java/com/mints/xunmi/ui/activitys/Vip2Activity.kt
View file @ 2c833e5a
......@@ -163,7 +163,7 @@ class Vip2Activity : BaseActivity()
R.id.tvVip2Agreement -> {
val bundle = Bundle()
bundle.putString(Constant.DAICHAO_TITLE, "会员付费服务协议")
bundle.putString(Constant.DAICHAO_URL, BuildConfig.MainIp + "members.html")
bundle.putString(Constant.DAICHAO_URL, Constant.AGREEMENT_MEMBERS)
readyGo(WebActivity::class.java, bundle)
}
R.id.llVip2PayWx -> {
......
position/app/src/main/java/com/mints/xunmi/ui/activitys/Vip3Activity.kt
View file @ 2c833e5a
......@@ -154,7 +154,7 @@ class Vip3Activity : BaseActivity()
R.id.tvVipAgreement -> {
val bundle = Bundle()
bundle.putString(Constant.DAICHAO_TITLE, "会员付费服务协议")
bundle.putString(Constant.DAICHAO_URL, BuildConfig.MainIp + "members.html")
bundle.putString(Constant.DAICHAO_URL, Constant.AGREEMENT_MEMBERS)
readyGo(WebActivity::class.java, bundle)
}
}
......
position/app/src/main/java/com/mints/xunmi/ui/activitys/VipActivity.kt
View file @ 2c833e5a
......@@ -140,7 +140,7 @@ class VipActivity : BaseActivity()
R.id.tvVipAgreement -> {
val bundle = Bundle()
bundle.putString(Constant.DAICHAO_TITLE, "会员付费服务协议")
bundle.putString(Constant.DAICHAO_URL, BuildConfig.MainIp + "members.html")
bundle.putString(Constant.DAICHAO_URL, Constant.AGREEMENT_MEMBERS)
readyGo(WebActivity::class.java, bundle)
}
}
......
position/app/src/main/java/com/mints/xunmi/ui/fragment/MainFragment.kt
View file @ 2c833e5a
......@@ -71,12 +71,12 @@ class MainFragment : BaseFragment()
initLinstener()
//非首次打开弹出 五拆弹窗
if (spUtil != null && spUtil!!.getBoolean(Constant.FIRST_DEVICE_FLAG, false) &&
TextUtils.equals(spUtil!!.getString(Constant.PAY_PAGE_TYPE), "fourPrice")) {
if (!userManager?.vipFlag!!) {
discountDialog()
}
}
// if (spUtil != null && spUtil!!.getBoolean(Constant.FIRST_DEVICE_FLAG, false) &&
// TextUtils.equals(spUtil!!.getString(Constant.PAY_PAGE_TYPE), "fourPrice")) {
// if (!userManager?.vipFlag!!) {
// discountDialog()
// }
// }
}
override fun onHiddenChanged(hidden: Boolean) {
......@@ -105,7 +105,8 @@ class MainFragment : BaseFragment()
} else {
getCares(null)
}
ivMainCourse.visibility = View.VISIBLE
// ivMainCourse.visibility = View.VISIBLE
ivMainCourse.visibility = View.GONE
} else {
// 无会员
getCares(null)
......@@ -327,13 +328,13 @@ class MainFragment : BaseFragment()
R.id.tv_dialogper_agreement -> {
val bundle = Bundle()
bundle.putString(Constant.DAICHAO_TITLE, "用户协议")
bundle.putString(Constant.DAICHAO_URL, BuildConfig.MainIp + "register.html")
bundle.putString(Constant.DAICHAO_URL, Constant.AGREEMENT_REGISTER)
readyGo(WebActivity::class.java, bundle)
}
R.id.tv_dialogper_policy -> {
val bundle = Bundle()
bundle.putString(Constant.DAICHAO_TITLE, "隐私协议")
bundle.putString(Constant.DAICHAO_URL, BuildConfig.MainIp + "privacy.html")
bundle.putString(Constant.DAICHAO_URL, Constant.AGREEMENT_PRIVACY)
readyGo(WebActivity::class.java, bundle)
}
R.id.btn_dialogper_back -> {
......
position/app/src/main/java/com/mints/xunmi/ui/fragment/MyFragment.kt
View file @ 2c833e5a
......@@ -99,7 +99,8 @@ class MyFragment : BaseFragment()
tvMyLogin.text = mobile
if (BuildConfig.DEBUG) {
tvMyLoginText.text = "测试环境 唯一码:${idcode}"
// tvMyLoginText.text = "测试环境 唯一码:${idcode}"
tvMyLoginText.text = "唯一码:${idcode}"
} else {
tvMyLoginText.text = "唯一码:${idcode}"
}
......@@ -111,7 +112,8 @@ class MyFragment : BaseFragment()
tvMyLockText.text = "解锁使用更多功能"
if (BuildConfig.DEBUG) {
tvMyLoginText.text = "测试环境 唯一码:${idcode}"
// tvMyLoginText.text = "测试环境 唯一码:${idcode}"
tvMyLoginText.text = "唯一码:${idcode}"
} else {
tvMyLoginText.text = "唯一码:${idcode}"
}
......@@ -172,9 +174,9 @@ class MyFragment : BaseFragment()
override fun getSysBaseMsg(msgNum: Int, notifyNum: Int) {
if (activity != null && !activity!!.isFinishing()) {
if (msgNum >= 1) {
ivMyFragmentNofity.setImageResource(R.mipmap.ic_my_msg_hot)
ivMyFragmentNofity.setImageResource(R.mipmap.ic_main_msg_enable)
} else {
ivMyFragmentNofity.setImageResource(R.mipmap.ic_my_msg)
ivMyFragmentNofity.setImageResource(R.mipmap.ic_main_msg)
}
if (notifyNum >= 1) {
......
position/app/src/main/java/com/mints/xunmi/ui/widgets/BackPayDialog.java
View file @ 2c833e5a
......@@ -68,8 +68,8 @@ public class BackPayDialog extends Dialog {
tv_dialog_backpay_title.setText("终身会员名额仅剩1%");
tv_dialog_backpay_content.setText("离开后有可能会失去成为终身会员的机会\n\n现在支付可定位家人/朋友的实时位置\n\n做您的守护神");
} else {
tv_dialog_backpay_title.setText("季卡买一送一名额仅剩1%");
tv_dialog_backpay_content.setText("离开后可能失去季卡买一送一的机会\n\n现在支付可定位家人/朋友实时位置\n\n做你的守护神");
tv_dialog_backpay_title.setText("会员买一送一名额仅剩1%");
tv_dialog_backpay_content.setText("离开后可能失去会员买一送一的机会\n\n现在支付可定位家人/朋友实时位置\n\n做你的守护神");
}
}
}
position/app/src/main/java/com/mints/xunmi/utils/PreferencesService.java
View file @ 2c833e5a
......@@ -21,7 +21,7 @@ import java.util.Set;
public class PreferencesService {
private static SharedPreferences mPreferences;
private static Context mContext;
private static String mShareName = "gold_space";
private static String mShareName = "position_xunmi";
private PreferencesService() {
}
......
position/app/src/main/java/com/mints/xunmi/utils/SPUtil.java
View file @ 2c833e5a
......@@ -15,7 +15,7 @@ public class SPUtil {
private static SharedPreferences mPreferences;
private static Context mContext;
private static String mShareName = "cashpie_config";
private static String mShareName = "xunmi_config";
private SPUtil() {
}
......
position/app/src/main/res/layout/fragment_main_my.xml
View file @ 2c833e5a
......@@ -30,7 +30,7 @@
android:layout_height="50pt"
android:layout_marginLeft="30pt"
android:layout_marginRight="16pt"
android:src="@mipmap/ic_my_msg" />
android:src="@mipmap/ic_main_msg" />
<ImageView
android:id="@+id/ivMyFragmentSet"
......@@ -223,7 +223,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:drawableLeft="@mipmap/ic_my_about"
android:drawableLeft="@mipmap/ic_add_peoole"
android:drawablePadding="20pt"
android:gravity="center_vertical"
android:text="联系我们"
......@@ -252,6 +252,7 @@
android:layout_width="match_parent"
android:layout_height="96pt"
android:layout_marginTop="6pt"
android:visibility="gone"
android:paddingLeft="30pt"
android:paddingRight="30pt">
......@@ -277,6 +278,7 @@
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:visibility="gone"
android:layout_marginLeft="100pt"
android:background="#E1E1E1" />
......
position/app/src/main/res/mipmap-xxhdpi/bg_splash.png 100755 → 100644
View replaced file @ d0a5723d View file @ 2c833e5a
position/app/src/main/res/mipmap-xxhdpi/bg_splash.png

9.83 KB | W: | H:

position/app/src/main/res/mipmap-xxhdpi/bg_splash.png

62.5 KB | W: | H:

position/app/src/main/res/mipmap-xxhdpi/bg_splash.png
position/app/src/main/res/mipmap-xxhdpi/bg_splash.png
position/app/src/main/res/mipmap-xxhdpi/bg_splash.png
position/app/src/main/res/mipmap-xxhdpi/bg_splash.png
  • 2-up
  • Swipe
  • Onion skin
position/shareSdkLib/src/main/assets/ShareSDK.xml
View file @ 2c833e5a
......@@ -77,12 +77,12 @@
但是只能分享图片和文字，username和path是分享小程序用的的，userName是小程序的原始ID，path是小程序内的页面路径；
而且必须保证微信开放平台与微信公众/小程序绑定才可以分享；不需要的不用管
-->
<Wechat AppId="wx8f26539eabfb04f2" AppSecret="b3d5ae7bfc89dcdf0f3e1882d3de3991" BypassApproval="false"
<Wechat AppId="wx224d99a10aa00c00" AppSecret="fb129437927181d62a62e9f3d6acc9a3" BypassApproval="false"
Enable="true" Id="4"
MiniprogramType="0" Path="pages/index/index.html?id=1" SortId="4"
UserName="gh_afb25ac019c9" WithShareTicket="true" />
<WechatMoments AppId="wx8f26539eabfb04f2" AppSecret="b3d5ae7bfc89dcdf0f3e1882d3de3991" BypassApproval="false"
<WechatMoments AppId="wx224d99a10aa00c00" AppSecret="fb129437927181d62a62e9f3d6acc9a3" BypassApproval="false"
Enable="true" Id="5" SortId="5" />
<WechatFavorite AppId="wx4868b35061f87885" AppSecret="64020361b8ec4c99936c0e3999a9f249" Enable="true"
......@@ -90,7 +90,7 @@
<!-- ShareByAppClient标识是否使用微博客户端分享，默认是false -->
<QQ AppId="1110585920" AppKey="PtVSuvQW0Ds7kvYg" BypassApproval="false" Enable="true" Id="7"
<QQ AppId="1110758340" AppKey="PtVSuvQW0Ds7kvYg" BypassApproval="false" Enable="true" Id="7"
ShareByAppClient="true" SortId="7" />
......
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