Sfoglia il codice sorgente

删除 测试代码

liujiangyao 8 anni fa
parent
commit
37d3bbf69b

+ 0 - 3
app/src/main/java/com/sheep/gamegroup/presenter/PhonePresenter.java

@@ -42,9 +42,6 @@ public class PhonePresenter implements PhoneContract.Presenter {
     @Override
     public void getCaptcha(String telphone){
         try{
-            Map map = new HashMap();
-            map.put("account", telphone);
-            Log.e("hash-map", map.toString());
             com.alibaba.fastjson.JSONObject j = new com.alibaba.fastjson.JSONObject();
             j.put("account", telphone);
             String encry = XXTEA.bytes2HexStr(XXTEA.Encrypt(j.toString(), XXTEA.KEY).getBytes("utf-8"));

+ 6 - 2
app/src/main/java/com/sheep/gamegroup/util/MyDbManager.java

@@ -45,7 +45,11 @@ public class MyDbManager {
      * 查找表
      */
     public UserEntity dbFindUser() throws DbException{
-//        List<UserEntity> users = db.findAll(UserEntity.class);
-        return db.findFirst(UserEntity.class);
+        List<UserEntity> users = db.findAll(UserEntity.class);
+        UserEntity userEntity = null;
+        if(users != null && users.size()>0){
+            userEntity = users.get(0);
+        }
+        return userEntity;
     }
 }

+ 3 - 3
app/src/main/java/com/sheep/gamegroup/view/activity/LoginAct.java

@@ -92,7 +92,7 @@ public class LoginAct extends BaseUMActivity implements LoginContract.View {
     private void goTelLogin() {
         Intent intent = new Intent(this, PhoneAct.class);
         startActivity(intent);
-        finish();
+//        finish();
     }
 
     private void goWeixin() {
@@ -170,10 +170,10 @@ public class LoginAct extends BaseUMActivity implements LoginContract.View {
                 goTelLogin();
                 break;
             case R.id.iv_wx:
-//                goWeixin();
+                goWeixin();
                 break;
             case R.id.iv_qq:
-//                loginQQ();
+                loginQQ();
                 break;
         }
     }

+ 6 - 5
app/src/main/java/com/sheep/gamegroup/view/activity/PhoneAct.java

@@ -132,12 +132,12 @@ public class PhoneAct extends BaseActivity implements PhoneContract.View {
             case R.id.phone_sure_tv:
                 etPhone = phoneEtAccount.getText().toString().trim();
                 etCode = phoneEtCode.getText().toString().trim();
-//                loginByPhoneGaptcha();
+                loginByPhoneGaptcha();
                 // TODO: 2018/3/22  测试界面,过后删除
-                SpUtils.login(getApplicationContext(), "12@1c421522bb7e44d3cd6a8d59a54df182");
+//                SpUtils.login(getApplicationContext(), "12@1c421522bb7e44d3cd6a8d59a54df182");
 //        startActivity(new Intent(this, ActMain.class));
-                Jump2View.getInstance().goHomePageView(this, null);
-                finish();
+//                Jump2View.getInstance().goHomePageView(this, null);
+//                finish();
                 break;
         }
     }
@@ -222,7 +222,8 @@ public class PhoneAct extends BaseActivity implements PhoneContract.View {
             e.printStackTrace();
         }
 
-        Jump2View.getInstance().goPersonnalCenterView(activity, null);
+        Jump2View.getInstance().goHomePageView(activity, null);
+//        ActivityManager.getInstance().endActivity(null);
         finish();
         Log.e("---login_-", o.toString());
     }