Commit 257465ea1c909ab7518027106b49bdf4839a5459
Exists in
yxb_dev
and in
2 other branches
no message
Showing
6 changed files
with
12 additions
and
8 deletions
Show diff stats
app/src/main/AndroidManifest.xml
| @@ -136,7 +136,7 @@ | @@ -136,7 +136,7 @@ | ||
| 136 | <activity | 136 | <activity |
| 137 | android:name=".ui.activity.consult.ConsultOneLevelActivity" | 137 | android:name=".ui.activity.consult.ConsultOneLevelActivity" |
| 138 | android:windowSoftInputMode="adjustPan|stateAlwaysHidden" /> | 138 | android:windowSoftInputMode="adjustPan|stateAlwaysHidden" /> |
| 139 | - <!-- <activity android:name=".ui.activity.LoginAndRegistActivity" /> --> | 139 | + |
| 140 | <activity | 140 | <activity |
| 141 | android:name=".ui.MainActivity" | 141 | android:name=".ui.MainActivity" |
| 142 | android:launchMode="singleInstance" | 142 | android:launchMode="singleInstance" |
app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java
| 1 | package com.shunzhi.parent.presenter.loginandregister; | 1 | package com.shunzhi.parent.presenter.loginandregister; |
| 2 | 2 | ||
| 3 | import android.text.TextUtils; | 3 | import android.text.TextUtils; |
| 4 | +import android.util.Log; | ||
| 4 | 5 | ||
| 5 | import com.google.gson.JsonObject; | 6 | import com.google.gson.JsonObject; |
| 6 | import com.share.mvpsdk.helper.RetrofitCreateHelper; | 7 | import com.share.mvpsdk.helper.RetrofitCreateHelper; |
| @@ -165,6 +166,7 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre | @@ -165,6 +166,7 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre | ||
| 165 | AppConfig.getAppConfig(AppContext.getContext()).set(AppConfig.USER_ID, currentBean.getUserid()); | 166 | AppConfig.getAppConfig(AppContext.getContext()).set(AppConfig.USER_ID, currentBean.getUserid()); |
| 166 | 167 | ||
| 167 | if (currentBean.getStudentClass() != null && currentBean.getStudentClass().size() > 0) { | 168 | if (currentBean.getStudentClass() != null && currentBean.getStudentClass().size() > 0) { |
| 169 | + Log.e("qqqq--==","qqqqq"); | ||
| 168 | AppConfig.ISBINDING = true; | 170 | AppConfig.ISBINDING = true; |
| 169 | } | 171 | } |
| 170 | 172 |
app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java
| @@ -98,18 +98,18 @@ public class WebViewActivity extends BaseCompatActivity { | @@ -98,18 +98,18 @@ public class WebViewActivity extends BaseCompatActivity { | ||
| 98 | String account = getIntent().getStringExtra("account"); | 98 | String account = getIntent().getStringExtra("account"); |
| 99 | String name = getIntent().getStringExtra("name"); | 99 | String name = getIntent().getStringExtra("name"); |
| 100 | String password = getIntent().getStringExtra("password"); | 100 | String password = getIntent().getStringExtra("password"); |
| 101 | - | ||
| 102 | tv_info.setText("生成孩子“" + name + "”账号为:" + account + "，初始密码为：" + password + "（与账号相同）。孩子可以下载“汇作业”app进行使用"); | 101 | tv_info.setText("生成孩子“" + name + "”账号为:" + account + "，初始密码为：" + password + "（与账号相同）。孩子可以下载“汇作业”app进行使用"); |
| 103 | 102 | ||
| 104 | } else if (type == AppConfig.ORDER_CENTER) { | 103 | } else if (type == AppConfig.ORDER_CENTER) { |
| 105 | binding_success.setVisibility(View.GONE); | 104 | binding_success.setVisibility(View.GONE); |
| 106 | binding_success2.setVisibility(View.GONE); | 105 | binding_success2.setVisibility(View.GONE); |
| 107 | title_web.setVisibility(View.VISIBLE); | 106 | title_web.setVisibility(View.VISIBLE); |
| 107 | + title_web.setText("订购中心"); | ||
| 108 | 108 | ||
| 109 | } else { | 109 | } else { |
| 110 | binding_success.setVisibility(View.GONE); | 110 | binding_success.setVisibility(View.GONE); |
| 111 | binding_success2.setVisibility(View.GONE); | 111 | binding_success2.setVisibility(View.GONE); |
| 112 | - title_web.setVisibility(View.GONE); | 112 | + title_web.setVisibility(View.VISIBLE); |
| 113 | LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams) nesteScrollWebView.getLayoutParams(); | 113 | LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams) nesteScrollWebView.getLayoutParams(); |
| 114 | lp.setMargins(0, 0, 0, 0); | 114 | lp.setMargins(0, 0, 0, 0); |
| 115 | nesteScrollWebView.setLayoutParams(lp); | 115 | nesteScrollWebView.setLayoutParams(lp); |
app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java
| @@ -73,13 +73,14 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract | @@ -73,13 +73,14 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract | ||
| 73 | tvExit.setOnClickListener(this); | 73 | tvExit.setOnClickListener(this); |
| 74 | binding_state = view.findViewById(R.id.binding_state); | 74 | binding_state = view.findViewById(R.id.binding_state); |
| 75 | layout_afterLogin.setVisibility(View.GONE); | 75 | layout_afterLogin.setVisibility(View.GONE); |
| 76 | - if (AppConfig.ISBINDING) { | ||
| 77 | - binding_state.setText(""); | ||
| 78 | - } | 76 | + |
| 79 | 77 | ||
| 80 | } | 78 | } |
| 81 | 79 | ||
| 82 | private void setPersonInfo() { | 80 | private void setPersonInfo() { |
| 81 | + if (AppConfig.ISBINDING) { | ||
| 82 | + binding_state.setText(""); | ||
| 83 | + } | ||
| 83 | if (AppConfig.ISLOGIN) { | 84 | if (AppConfig.ISLOGIN) { |
| 84 | String url = AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_IMAGE); | 85 | String url = AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_IMAGE); |
| 85 | if (!TextUtils.isEmpty(url)) { | 86 | if (!TextUtils.isEmpty(url)) { |
| @@ -106,6 +107,7 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract | @@ -106,6 +107,7 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract | ||
| 106 | } | 107 | } |
| 107 | 108 | ||
| 108 | 109 | ||
| 110 | + | ||
| 109 | @Override | 111 | @Override |
| 110 | public void onClick(View v) { | 112 | public void onClick(View v) { |
| 111 | switch (v.getId()) { | 113 | switch (v.getId()) { |
app/src/main/res/layout/activity_web_view.xml
| @@ -28,7 +28,7 @@ | @@ -28,7 +28,7 @@ | ||
| 28 | android:id="@+id/title_web" | 28 | android:id="@+id/title_web" |
| 29 | android:layout_width="wrap_content" | 29 | android:layout_width="wrap_content" |
| 30 | android:layout_height="wrap_content" | 30 | android:layout_height="wrap_content" |
| 31 | - android:text="订购中心" | 31 | + android:text="" |
| 32 | android:textSize="@dimen/txtsize_title" | 32 | android:textSize="@dimen/txtsize_title" |
| 33 | android:layout_centerInParent="true" | 33 | android:layout_centerInParent="true" |
| 34 | android:visibility="gone" | 34 | android:visibility="gone" |
app/src/main/res/layout/fragment_mine.xml
| @@ -184,7 +184,7 @@ | @@ -184,7 +184,7 @@ | ||
| 184 | android:layout_height="wrap_content" | 184 | android:layout_height="wrap_content" |
| 185 | android:layout_gravity="center_vertical" | 185 | android:layout_gravity="center_vertical" |
| 186 | android:layout_weight="1" | 186 | android:layout_weight="1" |
| 187 | - android:text="家校通订购" | 187 | + android:text="订购中心" |
| 188 | android:textSize="@dimen/txtsize_title" /> | 188 | android:textSize="@dimen/txtsize_title" /> |
| 189 | 189 | ||
| 190 | </LinearLayout> | 190 | </LinearLayout> |