Commit df8011cd802082e8e2e3d88e55d8144972d19c69
1 parent
b8df71fe
Exists in
yxb_dev
and in
2 other branches
no message
Showing
7 changed files
with
10 additions
and
15 deletions
Show diff stats
.idea/runConfigurations.xml
| @@ -1,12 +0,0 @@ | @@ -1,12 +0,0 @@ | ||
| 1 | -<?xml version="1.0" encoding="UTF-8"?> | ||
| 2 | -<project version="4"> | ||
| 3 | - <component name="RunConfigurationProducerService"> | ||
| 4 | - <option name="ignoredProducers"> | ||
| 5 | - <set> | ||
| 6 | - <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" /> | ||
| 7 | - <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" /> | ||
| 8 | - <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" /> | ||
| 9 | - </set> | ||
| 10 | - </option> | ||
| 11 | - </component> | ||
| 12 | -</project> | ||
| 13 | \ No newline at end of file | 0 | \ No newline at end of file |
app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java
| @@ -13,7 +13,6 @@ import com.shunzhi.parent.bean.CurrentBean; | @@ -13,7 +13,6 @@ import com.shunzhi.parent.bean.CurrentBean; | ||
| 13 | import com.shunzhi.parent.bean.NIMLoginResultBean; | 13 | import com.shunzhi.parent.bean.NIMLoginResultBean; |
| 14 | import com.shunzhi.parent.bean.UserInfo; | 14 | import com.shunzhi.parent.bean.UserInfo; |
| 15 | import com.shunzhi.parent.contract.loginandregister.LoginAndRegisterContract; | 15 | import com.shunzhi.parent.contract.loginandregister.LoginAndRegisterContract; |
| 16 | -import com.shunzhi.parent.manager.MessageManager; | ||
| 17 | import com.shunzhi.parent.model.loginandregister.LoginAndRegisterModel; | 16 | import com.shunzhi.parent.model.loginandregister.LoginAndRegisterModel; |
| 18 | import com.shunzhi.parent.ui.fragment.loginandregistfragment.LoginAndRegistFragment; | 17 | import com.shunzhi.parent.ui.fragment.loginandregistfragment.LoginAndRegistFragment; |
| 19 | import com.shunzhi.parent.util.Utils; | 18 | import com.shunzhi.parent.util.Utils; |
| @@ -89,7 +88,6 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre | @@ -89,7 +88,6 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre | ||
| 89 | @Override | 88 | @Override |
| 90 | public void accept(JsonObject jsonObject) throws Exception { | 89 | public void accept(JsonObject jsonObject) throws Exception { |
| 91 | //TODO 注册成功返回 | 90 | //TODO 注册成功返回 |
| 92 | - Log.e("1111", jsonObject.toString()); | ||
| 93 | AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_NAME, adminName); | 91 | AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_NAME, adminName); |
| 94 | // AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_PWD, password); | 92 | // AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_PWD, password); |
| 95 | mIView.getUserInfo(1); | 93 | mIView.getUserInfo(1); |
app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java
| @@ -4,6 +4,7 @@ import android.content.Context; | @@ -4,6 +4,7 @@ import android.content.Context; | ||
| 4 | import android.content.Intent; | 4 | import android.content.Intent; |
| 5 | import android.graphics.Bitmap; | 5 | import android.graphics.Bitmap; |
| 6 | import android.os.Bundle; | 6 | import android.os.Bundle; |
| 7 | +import android.util.Log; | ||
| 7 | import android.view.View; | 8 | import android.view.View; |
| 8 | import android.webkit.JavascriptInterface; | 9 | import android.webkit.JavascriptInterface; |
| 9 | import android.webkit.WebChromeClient; | 10 | import android.webkit.WebChromeClient; |
app/src/main/res/layout/activity_mychild.xml
| @@ -26,6 +26,7 @@ | @@ -26,6 +26,7 @@ | ||
| 26 | android:textSize="@dimen/txtsize_title" | 26 | android:textSize="@dimen/txtsize_title" |
| 27 | android:gravity="center" | 27 | android:gravity="center" |
| 28 | android:background="@drawable/rudiobtn" | 28 | android:background="@drawable/rudiobtn" |
| 29 | + android:layout_marginBottom="10dp" | ||
| 29 | /> | 30 | /> |
| 30 | 31 | ||
| 31 | 32 |
app/src/main/res/layout/activity_select_school.xml
| @@ -102,6 +102,7 @@ | @@ -102,6 +102,7 @@ | ||
| 102 | android:textSize="@dimen/txtsize_title" | 102 | android:textSize="@dimen/txtsize_title" |
| 103 | android:gravity="center" | 103 | android:gravity="center" |
| 104 | android:background="@drawable/rudiobtn" | 104 | android:background="@drawable/rudiobtn" |
| 105 | + android:layout_marginBottom="10dp" | ||
| 105 | /> | 106 | /> |
| 106 | 107 | ||
| 107 | 108 |
app/src/main/res/layout/activity_webview.xml
| @@ -10,7 +10,7 @@ | @@ -10,7 +10,7 @@ | ||
| 10 | android:layout_height="?android:actionBarSize" | 10 | android:layout_height="?android:actionBarSize" |
| 11 | android:orientation="horizontal" | 11 | android:orientation="horizontal" |
| 12 | > | 12 | > |
| 13 | - <TextView | 13 | + <ImageView |
| 14 | android:id="@+id/close_btn" | 14 | android:id="@+id/close_btn" |
| 15 | android:layout_width="30dp" | 15 | android:layout_width="30dp" |
| 16 | android:layout_height="30dp" | 16 | android:layout_height="30dp" |