From df8011cd802082e8e2e3d88e55d8144972d19c69 Mon Sep 17 00:00:00 2001
From: 姚旭斌 <15805828761@163.com>
Date: Tue, 20 Mar 2018 10:50:28 +0800
Subject: [PATCH] no message

---
 .idea/inspectionProfiles/profiles_settings.xml                                                 |  6 ++++++
 .idea/runConfigurations.xml                                                                    | 12 ------------
 app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java |  2 --
 app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java                |  1 +
 app/src/main/res/layout/activity_mychild.xml                                                   |  1 +
 app/src/main/res/layout/activity_select_school.xml                                             |  1 +
 app/src/main/res/layout/activity_webview.xml                                                   |  2 +-
 7 files changed, 10 insertions(+), 15 deletions(-)
 create mode 100644 .idea/inspectionProfiles/profiles_settings.xml
 delete mode 100644 .idea/runConfigurations.xml

diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
new file mode 100644
index 0000000..cb2fdb3
--- /dev/null
+++ b/.idea/inspectionProfiles/profiles_settings.xml
@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <settings>
+    <option name="PROJECT_PROFILE" />
+    <version value="1.0" />
+  </settings>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 7f68460..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java b/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java
index 2adbfe2..4e8d6db 100644
--- a/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java
+++ b/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java
@@ -13,7 +13,6 @@ import com.shunzhi.parent.bean.CurrentBean;
 import com.shunzhi.parent.bean.NIMLoginResultBean;
 import com.shunzhi.parent.bean.UserInfo;
 import com.shunzhi.parent.contract.loginandregister.LoginAndRegisterContract;
-import com.shunzhi.parent.manager.MessageManager;
 import com.shunzhi.parent.model.loginandregister.LoginAndRegisterModel;
 import com.shunzhi.parent.ui.fragment.loginandregistfragment.LoginAndRegistFragment;
 import com.shunzhi.parent.util.Utils;
@@ -89,7 +88,6 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre
             @Override
             public void accept(JsonObject jsonObject) throws Exception {
                 //TODO 注册成功返回
-                Log.e("1111", jsonObject.toString());
                 AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_NAME, adminName);
 //                AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_PWD, password);
                 mIView.getUserInfo(1);
diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java
index 6adccbb..4f85fa4 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java
@@ -4,6 +4,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.View;
 import android.webkit.JavascriptInterface;
 import android.webkit.WebChromeClient;
diff --git a/app/src/main/res/layout/activity_mychild.xml b/app/src/main/res/layout/activity_mychild.xml
index 878e98c..8788a2a 100644
--- a/app/src/main/res/layout/activity_mychild.xml
+++ b/app/src/main/res/layout/activity_mychild.xml
@@ -26,6 +26,7 @@
         android:textSize="@dimen/txtsize_title"
         android:gravity="center"
         android:background="@drawable/rudiobtn"
+        android:layout_marginBottom="10dp"
         />
 
 
diff --git a/app/src/main/res/layout/activity_select_school.xml b/app/src/main/res/layout/activity_select_school.xml
index a0e57b4..462e7bf 100644
--- a/app/src/main/res/layout/activity_select_school.xml
+++ b/app/src/main/res/layout/activity_select_school.xml
@@ -102,6 +102,7 @@
         android:textSize="@dimen/txtsize_title"
         android:gravity="center"
         android:background="@drawable/rudiobtn"
+        android:layout_marginBottom="10dp"
         />
 
 
diff --git a/app/src/main/res/layout/activity_webview.xml b/app/src/main/res/layout/activity_webview.xml
index 7608474..108f072 100644
--- a/app/src/main/res/layout/activity_webview.xml
+++ b/app/src/main/res/layout/activity_webview.xml
@@ -10,7 +10,7 @@
         android:layout_height="?android:actionBarSize"
         android:orientation="horizontal"
         >
-        <TextView
+        <ImageView
             android:id="@+id/close_btn"
             android:layout_width="30dp"
             android:layout_height="30dp"
--
libgit2 0.21.0