更新代码

app/src/main/java/com/smileflowpig/money/moneyplatfrom/activities/CaseurlActivity.java

@@ -152,7 +152,7 @@ public class CaseurlActivity extends PresenterActivity implements View.OnClickLi
         //资讯h5
         //https://m.henhaojie.com/xiaohuazhu/information.html?id=3&view_num=1&sessionid=fdhof410su74rraob9matto0r4
         //如果datta不为空，说明是华为推送过来的数据，从url里面获取数据
-        if(strurl.equals("")){
+        if(strurl==null||strurl.equals("")){
             if (data != null) {
                 String pushId = data.getQueryParameter("isPush");
                 isPush = pushId.equals("1") ? true : false;
@@ -165,7 +165,6 @@ public class CaseurlActivity extends PresenterActivity implements View.OnClickLi
                 } else {
                     strurl = ONLINE_URL + "id=" + urlid + "&view_num=" + urlname + "&sessionid=" + sessionid;
                 }
-
             }
             wv.loadUrl(strurl);
         }else {

app/src/main/java/com/smileflowpig/money/moneyplatfrom/activities/MySetActivity.java

@@ -384,9 +384,10 @@ public class MySetActivity extends PresenterActivity<ExistContract.Presenter>
     @Override
     public void ExistSuccess() {
 
-        SPUtil.clear(this);
-        com.smileflowpig.money.factory.util.SPUtil.clear(this);
-        com.smileflowpig.money.factory.util.SPUtil.putAndApply(this, Constant.UserInfo.ISEXITE, true);
+//        SPUtil.clear(this);
+//        com.smileflowpig.money.factory.util.SPUtil.clear(this);
+     SPUtil.putAndApply(this, Constant.UserInfo.ISEXITE, true);
+        SPUtil.putAndApply(this, Constant.UserInfo.SESSIONID, "");
         finish();
     }
 

app/src/main/java/com/smileflowpig/money/moneyplatfrom/activities/MySetTwoActivity.java

@@ -13,6 +13,7 @@ import android.os.Environment;
 import android.provider.MediaStore;
 import android.support.annotation.NonNull;
 import android.support.v4.content.FileProvider;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -132,11 +133,16 @@ public class MySetTwoActivity extends PresenterActivity implements View.OnClickL
         String loginsex = intent.getStringExtra("loginsex");
         String loginindent = intent.getStringExtra("loginindent");
 
-
-        Glide.with(MySetTwoActivity.this).load(loginicon).error(R.mipmap.loginicon).into(icon);
-
+        if(loginicon==null||loginicon.equals("")){
+            icon.setImageResource(R.mipmap.loginicon);
+        }else {
+            Glide.with(MySetTwoActivity.this).load(loginicon).error(R.mipmap.loginicon).into(icon);
+        }
+        if(!TextUtils.isEmpty(loginname))
         name.setText(loginname);
+        if(!TextUtils.isEmpty(loginsex))
         sex.setText(loginsex);
+        if(!TextUtils.isEmpty(loginindent))
         typetext.setText(loginindent);
 
     }

app/src/main/java/com/smileflowpig/money/moneyplatfrom/activities/SetActivity.java

@@ -73,9 +73,10 @@ public class SetActivity extends PresenterActivity<ExistContract.Presenter>
     @Override
     public void ExistSuccess() {
         EventBus.getDefault().post(new SecondEvent("登录/注册"));
-        SPUtil.clear(this);
-        com.smileflowpig.money.factory.util.SPUtil.clear(this);
-        com.smileflowpig.money.factory.util.SPUtil.putAndApply(this, Constant.UserInfo.ISEXITE, true);
+//        SPUtil.clear(this);
+//        com.smileflowpig.money.factory.util.SPUtil.clear(this);`
+       SPUtil.putAndApply(this, Constant.UserInfo.ISEXITE, true);
+      SPUtil.putAndApply(this, Constant.UserInfo.SESSIONID, "");
         finish();
 
     }

app/src/main/java/com/smileflowpig/money/moneyplatfrom/activities/TableActivity.java

@@ -13,6 +13,7 @@ import android.widget.LinearLayout;
 import android.widget.PopupWindow;
 import android.widget.TextView;
 
+import com.android.tu.loadingdialog.LoadingDialog;
 import com.asm.base.android.ui.launcher.BaseApplication;
 import com.scwang.smartrefresh.layout.SmartRefreshLayout;
 import com.scwang.smartrefresh.layout.api.RefreshLayout;
@@ -103,6 +104,7 @@ public class TableActivity extends PresenterActivity implements View.OnClickList
             //其他类型
             showOnlyDialogLoadding();
             getdatalist();
+
         }
 
     }

app/src/main/java/com/smileflowpig/money/moneyplatfrom/frags/account/RegisterFragment.java

@@ -17,6 +17,8 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.smileflowpig.money.factory.Constant;
+import com.smileflowpig.money.factory.util.SPUtil;
 import com.smileflowpig.money.moneyplatfrom.activities.Webview_protocol;
 
 import net.qiujuer.genius.ui.widget.Button;
@@ -26,6 +28,7 @@ import org.greenrobot.eventbus.EventBus;
 
 import butterknife.BindView;
 import butterknife.OnClick;
+
 import com.smileflowpig.money.BuildConfig;
 import com.smileflowpig.money.R;
 import com.smileflowpig.money.common.SecondEvent;
@@ -80,9 +83,9 @@ public class RegisterFragment extends PresenterFragment<RegisterContract.Present
     }
 
 
-
     @BindView(R.id.fragment_register_delete_pwdimg)
     ImageView register_check_imge;
+
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
@@ -96,8 +99,9 @@ public class RegisterFragment extends PresenterFragment<RegisterContract.Present
      * 显示隐藏密码
      */
     boolean isCheck;
+
     @OnClick(R.id.fragment_register_delete_pwdimg)
-    void onCheck(){
+    void onCheck() {
         if (!isCheck) {
             mPassword.setInputType(InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD);
             isCheck = true;
@@ -162,6 +166,8 @@ public class RegisterFragment extends PresenterFragment<RegisterContract.Present
 
 //        MainActivity.show(getActivity());
         EventBus.getDefault().post(new SecondEvent(user.phone));
+        //注册时候登录成功
+        SPUtil.putAndApply(getActivity(), Constant.UserInfo.ISEXITE, false);
         listener.onRegistSuccess(false);
     }
 

app/src/main/java/com/smileflowpig/money/moneyplatfrom/frags/main/state/NewMineFragment.java

@@ -58,6 +58,7 @@ import com.smileflowpig.money.moneyplatfrom.util.DialogPermission;
 import com.smileflowpig.money.moneyplatfrom.util.FileUtil;
 import com.smileflowpig.money.moneyplatfrom.util.PermissionUtil;
 import com.smileflowpig.money.moneyplatfrom.util.SharedPreferenceMark;
+import com.smileflowpig.money.moneyplatfrom.util.ToastUtil;
 import com.umeng.analytics.MobclickAgent;
 
 import java.io.File;
@@ -151,27 +152,34 @@ public class NewMineFragment extends PresenterFragment<StateContract.Presenter>
     @Override
     protected void initWidget(View root) {
         super.initWidget(root);
-        mPresenter.start();
+        if (LoginStatusUtil.isLogin()) {
+            //登录先显示缓存的
+            String nick = (String) SPUtil.get(getActivity(), com.smileflowpig.money.factory.Constant.UserInfo.NICK, "");
+            String icon_url = (String) SPUtil.get(getActivity(), com.smileflowpig.money.factory.Constant.UserInfo.ICONURL, "");
+            login.setText(nick);
+            Glide.with(getActivity()).load(icon_url).into(loginicon);
+            mPresenter.start();
+        }
+
     }
 
     @Override
     public void onStart() {
         super.onStart();
-        mPresenter.start();
+
 
     }
 
     @Override
     public void stateLogin(User user) {
-
 //
+        if (user == null) {
+            return;
+        }
+        SPUtil.putAndApply(getActivity(), com.smileflowpig.money.factory.Constant.UserInfo.NICK, user.nick);
+        SPUtil.putAndApply(getActivity(), com.smileflowpig.money.factory.Constant.UserInfo.ICONURL, user.avatar_url);
         login.setText(user.nick);
-        System.out.println(user.avatar_url + "图片地址");
-//        if (user.avatar_url.equals("")) {
-//            loginicon.setImageResource(R.mipmap.loginicon);
-//        } else {
-            Glide.with(getActivity()).load(user.avatar_url).into(loginicon);
-//        }
+        Glide.with(getActivity()).load(user.avatar_url).into(loginicon);
 
         sharedPreferences.edit().putString("myphonecode", user.phone).commit();
         myiconurl = user.avatar_url;
@@ -305,7 +313,7 @@ public class NewMineFragment extends PresenterFragment<StateContract.Presenter>
                 MobclickAgent.onEvent(getActivity(), "mineSetting");
                 break;
             case R.id.fragment_mine_message_img:
-                Intent intent3=new Intent(getActivity(), MessContextActivity.class);
+                Intent intent3 = new Intent(getActivity(), MessContextActivity.class);
                 startActivity(intent3);
                 message_img.setImageResource(R.mipmap.icon_message_mine);
                 MobclickAgent.onEvent(getActivity(), "mineNews");
@@ -354,7 +362,6 @@ public class NewMineFragment extends PresenterFragment<StateContract.Presenter>
     public void onResume() {
         super.onResume();
 
-        mPresenter.start();
 
     }
 

app/src/main/java/com/smileflowpig/money/moneyplatfrom/frags/main/state/PigHomeFragment.java

@@ -14,6 +14,7 @@ import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
 import android.view.MotionEvent;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
@@ -155,8 +156,10 @@ public class PigHomeFragment extends PresenterFragment implements View.OnClickLi
         }
 
         //vivo渠道控制信用卡开关
-        if (!TextUtils.isEmpty(BuildConfig.CHANNLE) && BuildConfig.CHANNLE.equals("1003"))
+        if (!TextUtils.isEmpty(BuildConfig.CHANNLE) && BuildConfig.CHANNLE.equals("1003")){
+            fourdata.setVisibility(View.GONE);
             cardvisible();
+        }
         //滚动文字
         getlapview();
 //        //banner

app/src/main/java/com/smileflowpig/money/moneyplatfrom/guoshen/activity/MineActivity.java

@@ -178,8 +178,9 @@ public class MineActivity extends PresenterActivity<MineConreact.Presenter> impl
     @Override
     public void ExistSuccess() {
         EventBus.getDefault().post(new SecondEvent("登录/注册"));
-        SPUtil.clear(this);
+//        SPUtil.clear(this);
         SPUtil.putAndApply(this, Constant.UserInfo.ISEXITE, true);
+        SPUtil.putAndApply(this, Constant.UserInfo.SESSIONID, "");
         finish();
     }
 

app/src/main/java/com/smileflowpig/money/moneyplatfrom/push/PhoneUtil.java

@@ -29,7 +29,7 @@ public class PhoneUtil {
      */
     public static int getPhoneModel(Context context) {
         String phoneMessage = getPhoneMessage();
-        if (phoneMessage.equals("HUAWEI")) {
+        if (phoneMessage.equals("HUAWEI")||phoneMessage.equals("HONOR")) {
             return HUAWEI;
         } else if (phoneMessage.equals("XIAOMI")) {
             return XIAOMI;

app/src/main/java/com/smileflowpig/money/moneyplatfrom/push/PushManager.java

@@ -156,7 +156,7 @@ public class PushManager {
      */
     public static void huaweiConnect(final Activity activity) {
         int phoneModel = PhoneUtil.getPhoneModel(activity);
-//        if (phoneModel == PhoneUtil.HUAWEI) {
+        if (phoneModel == PhoneUtil.HUAWEI) {
             HMSAgent.connect(activity, new ConnectHandler() {
                 @Override
                 public void onConnect(int rst) {
@@ -164,7 +164,7 @@ public class PushManager {
 getHuaweiToken(activity);
                 }
             });
-//        }
+        }
     }
 
     /**

app/src/main/res/layout/newmine_layout.xml

@@ -24,8 +24,8 @@
             />
         <ImageView
             android:id="@+id/fragment_mine_message_img"
-            android:layout_width="24px"
-            android:layout_height="24px"
+            android:layout_width="25px"
+            android:layout_height="25px"
             android:layout_marginTop="35px"
             android:layout_marginRight="24px"
             android:layout_alignParentRight="true"

app/src/main/res/layout/pighome_layout.xml

@@ -183,7 +183,7 @@
                         android:layout_weight="1"
                         android:gravity="center"
                         android:orientation="vertical"
-                        android:visibility="gone">
+                        android:visibility="visible">
 
                         <ImageView
                             android:layout_width="40dp"

common/src/main/java/com/smileflowpig/money/common/Common.java

@@ -43,7 +43,7 @@ public class Common {
         String API_URL = "https://xiaohuazhu.tthbw.com/user/";
         //测试接口
       //String API_URL = "http://bw.quyaqu.com/user/";
-     //String API_URL = "http://182.92.118.1:5220/user/";
+//     String API_URL = "http://182.92.118.1:5220/user/";
 
         // 最大的上传图片大小860kb
         long MAX_UPLOAD_IMAGE_LENGTH = 860 * 1024;

factory/src/main/java/com/smileflowpig/money/factory/Constant.java

@@ -15,6 +15,8 @@ public class Constant {
         public static final String PASSWORD = "password";
         public static final String CODETOKEN = "codetoken";
         public static final String ISEXITE = "isexite";
+        public static final String NICK = "nick";
+        public static final String ICONURL = "icon_url";
     }
     public static class Code {
         public static final int RESULT_LOGINSUC_CODE = 10000;

factory/src/main/java/com/smileflowpig/money/factory/data/helper/AccountHelper.java

@@ -330,12 +330,11 @@ public class AccountHelper {
             // 请求成功返回
             // 从返回中得到我们的全局Model，内部是使用的Gson进行解析
             RspModel<AccountRspModel> rspModel = response.body();
-            if (rspModel.success()) {
+            if (rspModel!=null&&rspModel.success()) {
                 // 拿到实体
                 AccountRspModel accountRspModel = rspModel.getRst();
                 User user = accountRspModel.getUser();
                 callback.onDataLoaded(user);
-
             } else {
                 // 错误解析
                 Factory.decodeRspCode(rspModel, callback);
@@ -351,7 +350,4 @@ public class AccountHelper {
     }
 
 
-
-
-
 }