.gradle/4.1/fileHashes/fileHashes.binBinary files differ
.gradle/4.1/fileHashes/fileHashes.lockBinary files differ
.gradle/4.1/javaCompile/classAnalysis.binBinary files differ
.gradle/4.1/javaCompile/javaCompile.lockBinary files differ
.gradle/4.1/javaCompile/taskHistory.binBinary files differ
.gradle/4.1/taskHistory/fileSnapshots.binBinary files differ
.gradle/4.1/taskHistory/taskHistory.binBinary files differ
.gradle/4.1/taskHistory/taskHistory.lockBinary files differ
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> 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) { 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(); }
@@ -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 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); 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 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(); } // } } }); } 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 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 {
@@ -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 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"/> <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>
