Skip to content

A
android_fiveworld
Commit 75b780c2 authored by mengcuiguang's avatar mengcuiguang
Browse files
Options

样式修改

parent 3efb04ff
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1425 additions and 126 deletions
animlibrary/build.gradle 0 → 100755
View file @ 75b780c2
apply plugin: 'com.android.library'
android {
compileSdkVersion 28
buildToolsVersion '28.0.3'
defaultConfig {
minSdkVersion 14
targetSdkVersion 28
}
}
dependencies {
implementation 'androidx.core:core:1.0.0'
}
animlibrary/gradle.properties 0 → 100755
View file @ 75b780c2
#
# Copyright (C) 2016 Jared Rummler
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
#
\ No newline at end of file
animlibrary/proguard-rules.pro 0 → 100755
View file @ 75b780c2
# Add project specific ProGuard rules here.
# By default, the flags in this file are appended to flags specified
# in C:\android-sdk/tools/proguard/proguard-android.txt
# You can edit the include path and order by changing the proguardFiles
# directive in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html
# Add any project specific keep options here:
# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}
animlibrary/src/main/AndroidManifest.xml 0 → 100755
View file @ 75b780c2
<manifest package="com.jaredrummler.android.animatedsvgview"/>
\ No newline at end of file
animlibrary/src/main/res/values/attrs.xml 0 → 100755
View file @ 75b780c2
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2016 Jared Rummler
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<resources>
<declare-styleable name="AnimatedSvgView">
<attr name="animatedSvgImageSizeX" format="integer"/>
<attr name="animatedSvgImageSizeY" format="integer"/>
<attr name="animatedSvgTraceTime" format="string"/>
<attr name="animatedSvgTraceTimePerGlyph" format="string"/>
<attr name="animatedSvgFillStart" format="string"/>
<attr name="animatedSvgFillTime" format="string"/>
<attr name="animatedSvgGlyphStrings" format="reference"/>
<attr name="animatedSvgTraceColors" format="reference"/>
<attr name="animatedSvgTraceResidueColors" format="reference"/>
<attr name="animatedSvgTraceMarkerLength" format="integer"/>
<attr name="animatedSvgFillColors" format="reference"/>
</declare-styleable>
</resources>
\ No newline at end of file
app/build.gradle
View file @ 75b780c2
......@@ -251,6 +251,8 @@ dependencies {
implementation(name: 'kssdk-ad-3.3.13', ext: 'aar')
// talkingdata已集成
implementation project(':animlibrary')
// 保活相关
implementation 'me.weishu:free_reflection:2.2.0'
implementation(name: 'alive-sdk-v3.1.5-release', ext: 'aar')
......
app/src/main/java/com/mints/fiveworld/InitAppService.kt
View file @ 75b780c2
......@@ -40,7 +40,7 @@ class InitAppService : JobIntentService() {
*/
private fun initApplication() {
// 极光推送
initJpush()
// initJpush()
// PR下载附件
initPRDownloader()
......
app/src/main/java/com/mints/fiveworld/MintsApplication.java
View file @ 75b780c2
......@@ -257,7 +257,6 @@ public class MintsApplication extends BaseApp {
AlarmManager.getInstance().isTimerTimeOut(Constant.CARRIER_CONNECT_WIFI);
LogUtil.d(TAG, "mints ------------> wifi onWifiDisabled <------------");
if (WifiDataManager.INSTANCE.getWifiOff()) {
// 关闭
OutAppRouter.INSTANCE.showTriggerActivity(TriggerActivity.TRIGGER_TYPE_WIFI_DISCONNECT_TEST);
......@@ -270,7 +269,6 @@ public class MintsApplication extends BaseApp {
AlarmManager.getInstance().isTimerTimeOut(Constant.CARRIER_DISCONNECT_WIFI);
LogUtil.d(TAG, "mints ------------> wifi onWifiEnabled <------------");
if (WifiDataManager.INSTANCE.getWifiOn()) {
// 连接
OutAppRouter.INSTANCE.showTriggerActivity(TriggerActivity.TRIGGER_TYPE_WIFI_BOOST);
......
app/src/main/java/com/mints/fiveworld/manager/JpushManager.java
View file @ 75b780c2
......@@ -96,7 +96,7 @@ public class JpushManager {
switch (msg.what) {
case MSG_SET_SERVICE:
TLog.d(TAG_LOG, "Set service in handler.");
userBindingJpush((String) msg.obj);
// userBindingJpush((String) msg.obj);
break;
case MSG_SET_ALIAS:
TLog.d(TAG_LOG, "Set alias in handler.");
......@@ -109,57 +109,6 @@ public class JpushManager {
}
};
/**
* 绑定用户
*
* @param jsondata
*/
public void userBindingJpush(String jsondata) {
MintsApplication loanApplication = (MintsApplication) this.c;
LoanService loanService = loanApplication.getLoanService();
HashMap<String, Object> vo = new HashMap<>();
vo.put("uploadData", jsondata);
loanService.registerDevice(vo)
.observeOn(AndroidSchedulers.mainThread())
.subscribeOn(loanApplication.defaultSubscribeScheduler())
.subscribe(new Subscriber<BaseResponse<JsonObject>>() {
@Override
public void onCompleted() {
}
@Override
public void onError(Throwable e) {
if (NetUtils.isNetworkConnected(c) && NetCommon.httpErrorCode(e) != 500) {
mHandler.sendMessageDelayed(mHandler.obtainMessage(MSG_SET_SERVICE, jsondata), 1000 * 60);
} else {
TLog.d(TAG_LOG, "No network");
}
}
@Override
public void onNext(BaseResponse<JsonObject> baseResponse) {
int code = baseResponse.getStatus();
switch (code) {
case 200:
case 401:
case 404:
break;
default:
if (NetUtils.isNetworkConnected(c)) {
mHandler.sendMessageDelayed(mHandler.obtainMessage(MSG_SET_SERVICE, jsondata), 1000 * 60);
} else {
TLog.d(TAG_LOG, "No network");
}
break;
}
}
});
}
private final TagAliasCallback mAliasCallback = new TagAliasCallback() {
......
app/src/main/java/com/mints/fiveworld/manager/TrackManager.java
View file @ 75b780c2
......@@ -86,12 +86,6 @@ public class TrackManager {
}
public void reportErrornterface(String url, String request) {
if (trackPresenter != null) {
trackPresenter.reportErrornterface(url, request);
}
}
public void setMinsActive() {
if (trackPresenter != null && !TextUtils.isEmpty(UserManager.getInstance().getUserID())) {
HashMap<String, Object> vo = new HashMap<>();
......
app/src/main/java/com/mints/fiveworld/manager/ad/TTGroMoreAdManagerHolder.java
View file @ 75b780c2
......@@ -24,7 +24,8 @@ import java.util.Map;
*/
public class TTGroMoreAdManagerHolder {
public static final String TT_AD_APPID = "5221954";
// public static final String TT_AD_APPID = "5224123";
public static final String TT_AD_APPID = "5123456";
public static final String TT_AD_NAME = Constant.MINTS_APP_NAME;
public static boolean sInit;
......
app/src/main/java/com/mints/fiveworld/mvp/presenters/MainPresenter.kt
View file @ 75b780c2
......@@ -6,7 +6,6 @@ import com.mints.fiveworld.common.Constant
import com.mints.fiveworld.common.DeviceInfo
import com.mints.fiveworld.manager.AppHttpManager
import com.mints.fiveworld.manager.AppPreferencesManager
import com.mints.fiveworld.manager.JpushManager
import com.mints.fiveworld.manager.UserManager
import com.mints.fiveworld.mvp.model.BaseResponse
import com.mints.fiveworld.mvp.model.UserBean
......@@ -88,7 +87,7 @@ class MainPresenter : BasePresenter<MainView>() {
if (isLinkView) return
when (baseResponse.status) {
200 -> {
JpushManager.getInstance().setJpushService(userId.toString())
// JpushManager.getInstance().setJpushService(userId.toString())
view.userLoginSuc()
}
}
......
app/src/main/java/com/mints/fiveworld/mvp/presenters/SplashPresenter.kt
View file @ 75b780c2
......@@ -4,7 +4,6 @@ import android.text.TextUtils
import com.mints.fiveworld.MintsApplication
import com.mints.fiveworld.common.DeviceInfo
import com.mints.fiveworld.manager.AppHttpManager
import com.mints.fiveworld.manager.JpushManager
import com.mints.fiveworld.manager.UserManager
import com.mints.fiveworld.mvp.model.BaseResponse
import com.mints.fiveworld.mvp.model.SplashAppBean
......@@ -120,7 +119,7 @@ class SplashPresenter : BasePresenter<SplashView>() {
if (isLinkView) return
when (baseResponse.status) {
200 -> {
JpushManager.getInstance().setJpushService(userId.toString())
// JpushManager.getInstance().setJpushService(userId.toString())
}
}
}
......
app/src/main/java/com/mints/fiveworld/mvp/presenters/TrackPresenter.java
View file @ 75b780c2
......@@ -215,28 +215,6 @@ public class TrackPresenter extends BaseTrackPresenter {
});
}
public void reportErrornterface(String url, String request) {
HashMap<String, Object> vo = new HashMap<>();
vo.put("url", url);
vo.put("request", request);
AppHttpManager.getInstance(loanApplication)
.call(loanService.reportErrornterface(vo),
new BaseSubscriber<BaseResponse<JsonObject>>() {
@Override
public void onCompleted() {
}
@Override
public void onError(Throwable e) {
}
@Override
public void onNext(BaseResponse<JsonObject> baseResponse) {
}
});
}
public void getOuterAdConfig() {
HashMap<String, Object> vo = new HashMap<>();
vo.put("uid", UserManager.getInstance().getUserID());
......
app/src/main/java/com/mints/fiveworld/net/LoanService.java
View file @ 75b780c2
......@@ -44,12 +44,6 @@ public interface LoanService {
@POST("api/visitorlogin")
Observable<BaseResponse<UserBean>> visitorlogin(@Body Map<String, Object> vo);
/**
* 注册极光设备
*/
@POST("api/registerDevice")
Observable<BaseResponse<JsonObject>> registerDevice(@Body Map<String, Object> vo);
/**
* 提交设备信息、后台激活
*/
......@@ -68,12 +62,6 @@ public interface LoanService {
@POST("api/getHallBaseMsg/v121")
Observable<BaseResponse<UserTaskMsgBean>> getHallBaseMsg121(@Body Map<String, Object> vo);
/**
* 临时使用-接口加密异常时调用
*/
@POST("common/reportErrornterface")
Observable<BaseResponse<JsonObject>> reportErrornterface(@Body Map<String, Object> vo);
/**
* groMore ECPM数据提交
*/
......
app/src/main/java/com/mints/fiveworld/net/OkHttpInterceptor.java
View file @ 75b780c2
......@@ -190,7 +190,6 @@ public class OkHttpInterceptor implements Interceptor {
}
} catch (Exception e) {
LogUtil.d("OkHttpInterceptor", "json解密失败。url：" + response.request().url().toString() + "\n\n 响应报文：" + buffer.clone().readString(charset));
TrackManager.getInstance().reportErrornterface(response.request().url().toString(), buffer.clone().readString(charset));
e.printStackTrace();
}
ResponseBody responseBody = ResponseBody.create(contentType, rspString);
......
app/src/main/java/com/mints/fiveworld/ui/activitys/IncreasespeedActivity.kt
View file @ 75b780c2
......@@ -192,19 +192,15 @@ class IncreasespeedActivity : BaseActivity(), View.OnClickListener {
private fun startTimer() {
var step = 0
containerAnim.setBackgroundColor(ContextCompat.getColor(this, R.color.color_main))
when (mIncreaseType) {
INCREASE_SAVE_ELECTRICITY -> {
containerAnim.setBackgroundColor(ContextCompat.getColor(this, R.color.color_main))
// iv_gif.layoutParams.width = BubbleUtils.dp2px(200)
GlideUtils.loadImageViewGif(this, R.drawable.battery_optimize, iv_gif)
}
INCREASE_CLEAN -> {
containerAnim.setBackgroundColor(Color.parseColor("#906cf4"))
GlideUtils.loadImageViewGif(this, R.drawable.rubbish_optimize, iv_gif)
}
else -> {
containerAnim.setBackgroundColor(Color.parseColor("#906cf4"))
GlideUtils.loadImageViewGif(this, R.drawable.rocket_optimize,iv_gif)
tv_progress.text = "正在检测后台常驻软件..."
}
......
app/src/main/java/com/mints/fiveworld/ui/activitys/OneCleanActivity.kt
View file @ 75b780c2
......@@ -441,7 +441,6 @@ class OneCleanActivity : BaseActivity(), View.OnClickListener {
}
private fun initView() {
headerContainer.setBackgroundColor(Color.parseColor("#8278DC"))
line.visibility = View.GONE
if (scanMax == 1) {
tv_title.text = "一键加速"
......
app/src/main/java/com/mints/fiveworld/ui/activitys/SafeTestingActivity.kt
View file @ 75b780c2
......@@ -146,7 +146,7 @@ class SafeTestingActivity : BaseActivity(), View.OnClickListener {
containerAnim.setBackgroundColor(ContextCompat.getColor(this, R.color.color_main))
GlideUtils.loadImageViewGif(this, R.drawable.wifi_speed, iv_gif)
} else {
containerAnim.setBackgroundColor(Color.parseColor("#8278DC"))
containerAnim.setBackgroundColor(ContextCompat.getColor(this, R.color.color_main))
GlideUtils.loadImageViewGif(this, R.drawable.safe_check_optimize, iv_gif)
NumAnimUtil.startAnim(tv_progress, 100f, (mTimerMax - 1) * STEP_Interval)
}
......
app/src/main/java/com/mints/fiveworld/ui/activitys/SettingsActivity.kt
View file @ 75b780c2
......@@ -61,7 +61,7 @@ class SettingsActivity : BaseActivity(), View.OnClickListener {
item_invitedCode.findViewById<TextView>(R.id.tv_right).visibility = View.VISIBLE
item_invitedCode.findViewById<ImageView>(R.id.iv_right).visibility = View.GONE
item_invitedCode.findViewById<TextView>(R.id.tv_right).text =
"CL-${UserManager.getInstance().codeID}"
"5G-${UserManager.getInstance().codeID}"
item_cleanCache.findViewById<TextView>(R.id.tv_title).text = "清理缓存"
val cleanCache = ContextCompat.getDrawable(this, R.mipmap.icon_settings_clean)
......
app/src/main/res/drawable/shape_bg_speed.xml
View file @ 75b780c2
......@@ -3,8 +3,8 @@
android:shape="rectangle">
<gradient
android:angle="90"
android:endColor="#8278DC"
android:startColor="#A29CDF"
android:endColor="@color/color_main"
android:startColor="@color/color_main_start"
android:type="linear"
android:useLevel="true" />
......
app/src/main/res/drawable/shape_btn_clean.xml
View file @ 75b780c2
......@@ -2,5 +2,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="5dip" />
<solid android:color="#25C7AD"/>
<solid android:color="@color/color_main"/>
</shape>
\ No newline at end of file
app/src/main/res/drawable/shape_tv_gold.xml
View file @ 75b780c2
......@@ -6,7 +6,7 @@
<!-- 渐变色 -->
<gradient
android:endColor="#9D97E0"
android:startColor="#B2ADE7" />
android:endColor="@color/color_main"
android:startColor="@color/color_main_start" />
</shape>
\ No newline at end of file
app/src/main/res/layout/activity_oneclean.xml
View file @ 75b780c2
......@@ -3,8 +3,9 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<include layout="@layout/header_layout" />
<include
android:visibility="gone"
layout="@layout/header_layout" />
<com.mints.fiveworld.ui.widgets.InterceptFrameLayout
android:id="@+id/container"
......@@ -17,7 +18,7 @@
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_gravity="center_horizontal"
android:layout_marginTop="10dp"
android:layout_marginTop="30dp"
android:src="@mipmap/ic_clean"
android:visibility="visible" />
......@@ -26,7 +27,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="120dp"
android:layout_marginTop="140dp"
android:gravity="center"
android:text="正在扫描您的手机..."
android:textColor="@color/white"
......
app/src/main/res/layout/activity_safe_testing.xml
View file @ 75b780c2
......@@ -7,7 +7,7 @@
<View
android:layout_width="match_parent"
android:layout_height="280dp"
android:background="#8275DF" />
android:background="@color/color_main" />
<LinearLayout
android:layout_width="match_parent"
......@@ -25,7 +25,7 @@
<ImageView
android:id="@+id/iv_gif"
android:layout_width="320dp"
android:layout_width="280dp"
android:layout_height="wrap_content"
android:layout_centerInParent="true" />
......
app/src/main/res/layout/activity_signal_strength.xml
View file @ 75b780c2
......@@ -2,7 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#8E85DD"
android:background="#4E95FA"
android:orientation="vertical">
<include layout="@layout/header_layout" />
......
app/src/main/res/layout/fragment_wifi.xml
View file @ 75b780c2
......@@ -104,7 +104,7 @@
android:layout_width="80dp"
android:layout_height="30dp"
android:layout_marginEnd="10dp"
android:background="@drawable/shape_main"
android:background="@drawable/shape_tv_gold"
android:text="信号增强"
android:textColor="@color/white"
app:layout_constraintBottom_toBottomOf="@+id/imageView2"
......
app/src/main/res/values/colors.xml
View file @ 75b780c2
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="color_main">#4089F2</color>
<color name="color_main">#468df8</color>
<color name="color_main_start">#38A8F5</color>
<color name="white">#FFFFFF</color>
<color name="black">#000000</color>
......
gradle.properties
View file @ 75b780c2
......@@ -20,11 +20,11 @@ RELEASE_KEY_ALIAS=mints_world
RELEASE_STORE_PASSWORD=mints.world
RELEASE_STORE_FILE=mints_fiveworld.jks
#友盟
RELEASE_UMENG_KEY=
RELEASE_UMENG_KEY=616539dd14e22b6a4f1dae08
#JPush
RELEASE_JPUSH_KEY=
#TalkingData
RELEASE_TALKING_DATA_KEY=
RELEASE_TALKING_DATA_KEY=E686A12C1CFE4B2AA9310D60366CB7AB
#Bugly
RELEASE_BUGLY_KEY=aa4f79a8f4
......
settings.gradle
View file @ 75b780c2
include ':app'
\ No newline at end of file
include ':app', ':animlibrary'
\ No newline at end of file
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