From c40ab5711d9025a5e25a85b5b24be72cfa90e375 Mon Sep 17 00:00:00 2001
From: 陈奇 <1650699704@qq.com>
Date: Fri, 30 Nov 2018 11:34:33 +0800
Subject: [PATCH] [*]修改页面动画
---
app/src/main/java/com/moral/yunfushao/wxapi/WXEntryActivity.java | 1
.gradle/4.1/fileHashes/fileHashes.lock | 0
.gradle/4.1/taskHistory/taskHistory.bin | 0
app/src/main/java/com/moral/yunfushao/activity/SplashActivity.java | 4 --
.gradle/4.1/javaCompile/classAnalysis.bin | 0
app/src/main/AndroidManifest.xml | 5 ++
app/src/main/java/com/moral/yunfushao/activity/ChartActivity.java | 11 ++++-
app/src/main/java/com/moral/yunfushao/activity/LoginActivity.java | 4 --
app/src/main/res/layout/list_item_deviceble.xml | 16 +++++---
app/src/main/java/com/moral/yunfushao/fragment/FragmentShoppongMall.java | 16 ++++---
app/src/main/java/com/moral/yunfushao/fragment/FragmentSettings.java | 2
app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java | 2 -
.gradle/4.1/fileHashes/fileHashes.bin | 0
.gradle/4.1/taskHistory/fileSnapshots.bin | 0
.gradle/4.1/javaCompile/javaCompile.lock | 0
app/src/main/java/com/moral/yunfushao/wxapi/data/TokenEffectivenessBean.java | 1
.gradle/4.1/taskHistory/taskHistory.lock | 0
app/src/main/res/layout/ac_charts_layout.xml | 1
.gradle/4.1/javaCompile/taskHistory.bin | 0
19 files changed, 36 insertions(+), 27 deletions(-)
diff --git a/.gradle/4.1/fileHashes/fileHashes.bin b/.gradle/4.1/fileHashes/fileHashes.bin
index 4614d23..c627738 100644
--- a/.gradle/4.1/fileHashes/fileHashes.bin
+++ b/.gradle/4.1/fileHashes/fileHashes.bin
Binary files differ
diff --git a/.gradle/4.1/fileHashes/fileHashes.lock b/.gradle/4.1/fileHashes/fileHashes.lock
index 5e9d89e..be3f86a 100644
--- a/.gradle/4.1/fileHashes/fileHashes.lock
+++ b/.gradle/4.1/fileHashes/fileHashes.lock
Binary files differ
diff --git a/.gradle/4.1/javaCompile/classAnalysis.bin b/.gradle/4.1/javaCompile/classAnalysis.bin
index 0cb3ba8..36304f3 100644
--- a/.gradle/4.1/javaCompile/classAnalysis.bin
+++ b/.gradle/4.1/javaCompile/classAnalysis.bin
Binary files differ
diff --git a/.gradle/4.1/javaCompile/javaCompile.lock b/.gradle/4.1/javaCompile/javaCompile.lock
index 2e8aefb..a0db289 100644
--- a/.gradle/4.1/javaCompile/javaCompile.lock
+++ b/.gradle/4.1/javaCompile/javaCompile.lock
Binary files differ
diff --git a/.gradle/4.1/javaCompile/taskHistory.bin b/.gradle/4.1/javaCompile/taskHistory.bin
index 52e582c..fc64acb 100644
--- a/.gradle/4.1/javaCompile/taskHistory.bin
+++ b/.gradle/4.1/javaCompile/taskHistory.bin
Binary files differ
diff --git a/.gradle/4.1/taskHistory/fileSnapshots.bin b/.gradle/4.1/taskHistory/fileSnapshots.bin
index ae82f9f..df33856 100644
--- a/.gradle/4.1/taskHistory/fileSnapshots.bin
+++ b/.gradle/4.1/taskHistory/fileSnapshots.bin
Binary files differ
diff --git a/.gradle/4.1/taskHistory/taskHistory.bin b/.gradle/4.1/taskHistory/taskHistory.bin
index ac53b4c..8807666 100644
--- a/.gradle/4.1/taskHistory/taskHistory.bin
+++ b/.gradle/4.1/taskHistory/taskHistory.bin
Binary files differ
diff --git a/.gradle/4.1/taskHistory/taskHistory.lock b/.gradle/4.1/taskHistory/taskHistory.lock
index 9180612..164cd75 100644
--- a/.gradle/4.1/taskHistory/taskHistory.lock
+++ b/.gradle/4.1/taskHistory/taskHistory.lock
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9b4f0b2..631a044 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -120,6 +120,11 @@
android:resource="@xml/provider_paths"
tools:replace="name,resource" />
</provider>
+ <activity
+ android:name=".wxapi.WXEntryActivity"
+ android:exported="true"
+ android:launchMode="singleTop"
+ android:theme="@android:style/Theme.Translucent.NoTitleBar"></activity>
<!-- Bugly������SDK������������-->
</application>
</manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/moral/yunfushao/activity/ChartActivity.java b/app/src/main/java/com/moral/yunfushao/activity/ChartActivity.java
index 6a5e22a..3990582 100644
--- a/app/src/main/java/com/moral/yunfushao/activity/ChartActivity.java
+++ b/app/src/main/java/com/moral/yunfushao/activity/ChartActivity.java
@@ -308,7 +308,7 @@
private ArrayList<UserData> dataList = new ArrayList<>();
- private void getData(String startTime, String endTime) {
+ private void getData(final String startTime, String endTime) {
HashMap<String, String> params = new HashMap<>();
params.put("user_id", MainApp.userId);
params.put("start_time", startTime);
@@ -328,7 +328,11 @@
//������
reshowChart(dataList);
tv_value.setText(NumberUtils.getBigDecimalValue(jsonObject.optDouble("avg"), 3) + "uSv");
- tv_status.setText(jsonObject.optString("status"));
+ String status = jsonObject.optString("status");
+ if (status.equals("������������")) {
+ status = "������������";
+ }
+ tv_status.setText(status);
} catch (JSONException e) {
e.printStackTrace();
}
@@ -440,7 +444,8 @@
public void onSuccess(String res, String msg) {
if (TextUtils.isEmpty(res)) {
return;
- }try {
+ }
+ try {
JSONObject json = new JSONObject(res);
showAd(json.optString("content"), json.optString("logo"), json.optString("name"));
} catch (JSONException e) {
diff --git a/app/src/main/java/com/moral/yunfushao/activity/LoginActivity.java b/app/src/main/java/com/moral/yunfushao/activity/LoginActivity.java
index 8e1b0d4..bd3d80a 100644
--- a/app/src/main/java/com/moral/yunfushao/activity/LoginActivity.java
+++ b/app/src/main/java/com/moral/yunfushao/activity/LoginActivity.java
@@ -79,10 +79,6 @@
et_phone = findView(R.id.et_phone);
et_pwd = findView(R.id.et_pwd);
weixinlogin = findView(R.id.weixinlogin);
-
-
-// et_phone.setText("18362724160");
-// et_pwd.setText("123456");
initAnimator();
}
diff --git a/app/src/main/java/com/moral/yunfushao/activity/SplashActivity.java b/app/src/main/java/com/moral/yunfushao/activity/SplashActivity.java
index a51f9d5..eec648c 100644
--- a/app/src/main/java/com/moral/yunfushao/activity/SplashActivity.java
+++ b/app/src/main/java/com/moral/yunfushao/activity/SplashActivity.java
@@ -102,8 +102,6 @@
* ������������token������
*/
private void checkTokenEffective() {
- //https:api.weixin.qq.com/sns/auth?access_token=ACCESS_TOKEN&openid=OPENID
-
String url = "https:api.weixin.qq.com/sns/auth?access_token=" + bean.getAccess_token() + "&openid=" + WXConstants.APP_ID;
WXHttpUtil.doGet(url, CacheMode.DEFAULT, new HttpCallBack() {
@Override
@@ -132,7 +130,6 @@
* ������������������������
*/
private void checkWXLogin() {
- //
String url = "https://api.weixin.qq.com/sns/oauth2/access_token?appid= " +
WXConstants.APP_ID +
"&secret=" + "������������" + "&code="+
@@ -148,7 +145,6 @@
@Override
public void showLoadingDialog() {
- //
}
@Override
diff --git a/app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java b/app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java
index 3e0cf72..a2d2ef6 100644
--- a/app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java
+++ b/app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java
@@ -415,7 +415,6 @@
}
});
showStatus(-1);
-
}
@Override
@@ -631,7 +630,6 @@
tv_status.setTextColor(getResources().getColor(R.color.red_txt));
ll_status.setBackgroundResource(R.mipmap.bg_conner_red);
} else if (level == -1) {
-// iv_dianliang.setVisibility(View.GONE);
tv_tishi.setText("������������������");
tv_tishi.setBackgroundResource(R.mipmap.bt_offline);
iv_bottom_status.setImageResource(R.mipmap.icon_offline);
diff --git a/app/src/main/java/com/moral/yunfushao/fragment/FragmentSettings.java b/app/src/main/java/com/moral/yunfushao/fragment/FragmentSettings.java
index dd34366..2f6d26f 100644
--- a/app/src/main/java/com/moral/yunfushao/fragment/FragmentSettings.java
+++ b/app/src/main/java/com/moral/yunfushao/fragment/FragmentSettings.java
@@ -150,7 +150,7 @@
private void ejectTips(final int position) {
final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
builder.setTitle("���������������");
- builder.setIcon(R.mipmap.tips);
+
builder.setMessage("������������������������������������������������������������������������");
builder.setNegativeButton("������", new DialogInterface.OnClickListener() {
@Override
diff --git a/app/src/main/java/com/moral/yunfushao/fragment/FragmentShoppongMall.java b/app/src/main/java/com/moral/yunfushao/fragment/FragmentShoppongMall.java
index f1de8b8..8efbc7f 100644
--- a/app/src/main/java/com/moral/yunfushao/fragment/FragmentShoppongMall.java
+++ b/app/src/main/java/com/moral/yunfushao/fragment/FragmentShoppongMall.java
@@ -33,7 +33,12 @@
super.onResume();
String url = "https://qixingboshi.tmall.com/shop/view_shop.htm?spm=a220m.1000862.1000730.3.4e577fdaFH6RLh&user_number_id=4065460231&rn=e4ad4c4924aa673e9a82566d92483890";
mWebView.loadUrl(url);
-// mWebView.loadUrl("https://shop459070069.m.taobao.com/");
+ }
+
+ @Override
+ public void onPause() {
+ super.onPause();
+ progressDialog.dismiss();
}
@Override
@@ -42,10 +47,7 @@
}
@Override
- protected void initData() {
-// mWebView.loadUrl("http://www.7drlb.cn");
-
- }
+ protected void initData() {}
@Override
protected void processClick(View v) {
@@ -92,9 +94,9 @@
@Override
public void onProgressChanged(WebView view, int newProgress) {
super.onProgressChanged(view, newProgress);
- if (newProgress >= 64) {
+// if (newProgress >= 64) {
progressDialog.dismiss();
- }
+// }
}
});
}
diff --git a/app/src/main/java/com/moral/yunfushao/wxapi/WXEntryActivity.java b/app/src/main/java/com/moral/yunfushao/wxapi/WXEntryActivity.java
index 561afbd..f29b7c7 100644
--- a/app/src/main/java/com/moral/yunfushao/wxapi/WXEntryActivity.java
+++ b/app/src/main/java/com/moral/yunfushao/wxapi/WXEntryActivity.java
@@ -40,6 +40,7 @@
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
api = WXAPIFactory.createWXAPI(this, WXConstants.APP_ID, false);
+ api.registerApp(WXConstants.APP_ID);
}
@Override
diff --git a/app/src/main/java/com/moral/yunfushao/wxapi/data/TokenEffectivenessBean.java b/app/src/main/java/com/moral/yunfushao/wxapi/data/TokenEffectivenessBean.java
index aaca234..b5791e0 100644
--- a/app/src/main/java/com/moral/yunfushao/wxapi/data/TokenEffectivenessBean.java
+++ b/app/src/main/java/com/moral/yunfushao/wxapi/data/TokenEffectivenessBean.java
@@ -5,6 +5,7 @@
* @e_mail : 1650699704@163.com.
* @create_time : 2018/11/26.
* @Package_name: pregnancy_guard_android
+ * ������������������������
*/
public class TokenEffectivenessBean {
diff --git a/app/src/main/res/layout/ac_charts_layout.xml b/app/src/main/res/layout/ac_charts_layout.xml
index 55f3464..42a00bf 100644
--- a/app/src/main/res/layout/ac_charts_layout.xml
+++ b/app/src/main/res/layout/ac_charts_layout.xml
@@ -39,6 +39,7 @@
android:layout_width="@dimen/x160"
android:layout_height="wrap_content"
android:gravity="center"
+ android:textColor="@color/black_txt"
android:text="���" />
<TextView
diff --git a/app/src/main/res/layout/list_item_deviceble.xml b/app/src/main/res/layout/list_item_deviceble.xml
index 134e11f..c8d8bba 100644
--- a/app/src/main/res/layout/list_item_deviceble.xml
+++ b/app/src/main/res/layout/list_item_deviceble.xml
@@ -3,12 +3,14 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="@dimen/x12">
+
<ImageView
android:id="@+id/iv"
android:layout_width="@dimen/x10"
android:layout_height="@dimen/x10"
android:layout_centerVertical="true"
- android:src="@mipmap/icon_reddian"/>
+ android:src="@mipmap/icon_reddian" />
+
<TextView
android:id="@+id/tv_name"
android:layout_width="match_parent"
@@ -16,13 +18,15 @@
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/x8"
android:layout_toRightOf="@+id/iv"
- android:textSize="16sp"
- android:text="USR001"/>
+ android:text="USR001"
+ android:textColor="@color/black_txt"
+ android:textSize="16sp" />
+
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_centerVertical="true"
android:layout_alignParentRight="true"
- android:textColor="@color/red_txt"
- android:text="������ >"/>
+ android:layout_centerVertical="true"
+ android:text="������ >"
+ android:textColor="@color/red_txt" />
</RelativeLayout>
\ No newline at end of file
--
Gitblit v1.8.0