陶汉栋 / ParentWork

Download as
Browse Code »

Commit 4378a6875ca380006d248bd761abcdfa58cf9f1a

Authored by 陶汉栋
2 parents 0d40485b df8011cd
Exists in yxb_dev and in 2 other branches developer, wwx

Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer

Showing 6 changed files with 9 additions and 15 deletions   Show diff stats
.idea/inspectionProfiles/profiles_settings.xml 0 → 100644
  Diff comments   View file @4378a68
@@ -0,0 +1,6 @@ @@ -0,0 +1,6 @@
  1 +<component name="InspectionProjectProfileManager">
  2 + <settings>
  3 + <option name="PROJECT_PROFILE" />
  4 + <version value="1.0" />
  5 + </settings>
  6 +</component>
0 \ No newline at end of file 7 \ No newline at end of file
.idea/runConfigurations.xml
View file @0d40485
@@ -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
  Diff comments   View file @4378a68
@@ -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/res/layout/activity_mychild.xml
  Diff comments   View file @4378a68
@@ -28,6 +28,7 @@ @@ -28,6 +28,7 @@
28 android:layout_marginBottom="@dimen/size_dp_10" 28 android:layout_marginBottom="@dimen/size_dp_10"
29 android:gravity="center" 29 android:gravity="center"
30 android:background="@drawable/rudiobtn" 30 android:background="@drawable/rudiobtn"
  31 + android:layout_marginBottom="10dp"
31 /> 32 />
32 33
33 34
app/src/main/res/layout/activity_select_school.xml
  Diff comments   View file @4378a68
@@ -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
  Diff comments   View file @4378a68
@@ -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"