Головна сторінка Огляд Довідка
Реєстрація Увійти
xmy_android
/
small_sheep_android
Слідкувати 3
Зірка 0
Відгалуження 0
Файли Проблеми 0 Запити на злиття 0 Wiki
Переглянути джерело

bug 中的bug

xiongxiaohe 8 роки тому
батько
f786103778
коміт
dfaec4e157
7 змінених файлів з 87 додано та 63 видалено
Розділений вигляд Показати статистику Diff
  1. 40 20
      app/src/main/assets/poster.html
  2. 3 6
      app/src/main/java/com/sheep/jiuyan/samllsheep/Config.java
  3. 1 1
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/AskFriendActivity.java
  4. 7 7
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/MainActivity.java
  5. 28 22
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/ResetPWDActivity.java
  6. 6 6
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/WithdrawActivity.java
  7. 2 1
      app/src/main/java/com/sheep/jiuyan/samllsheep/page/fragment/FgtMainPageTask.java

+ 40 - 20
app/src/main/assets/poster.html
Переглянути файл 

@@ -9,22 +9,26 @@
 
             margin: 0;
 
             padding: 0;
 
         }
 
-        #imgInvitation{
 
+
 
+        #imgInvitation {
 
             position: relative;
 
             margin-top: 70%;
 
         }
 
-        #imgInvitation p{
 
+
 
+        #imgInvitation p {
 
             margin: 0;
 
             text-align: center;
 
             font-size: 1em;
 
             color: #ff6048;
 
         }
 
-        #imgInvitation #Invitation{
 
+
 
+        #imgInvitation #Invitation {
 
             width: 29vw;
 
             margin: auto;
 
             display: block;
 
         }
 
-        #imgInvitation #imgicon{
 
+
 
+        #imgInvitation #imgicon {
 
             width: 6vw;
 
             margin: auto;
 
             display: block;
 
@@ -34,26 +38,42 @@
 
     </style>
 
 </head>
 
 <body>
 
-    <div>
 
-        <img style="position: absolute;top: 0;z-index: -2" width="100%" src="https://qiniu.kuaifazs.com/fenxiang_bg.png"/>
 
-        <div id="imgInvitation">
 
-            <p><b>邀请码</b></p>
 
-            <p><b>728392</b></p>
 
-            <img id="Invitation" src="http://pan.baidu.com/share/qrcode?w=300&h=300&url=http://staticcdn.kuaifazs.com/upload/game/201802/02/c0/68/qrXn9G.html?inviteCode=728392" alt="">
 
-            <img id="imgicon" src="https://qiniu.kuaifazs.com/xiaominayangicon.png"/>
 
-        </div>
 
+<div>
 
+    <img style="position: absolute;top: 0;z-index: -2" width="100%" src="https://qiniu.kuaifazs.com/fenxiang_bg.png"/>
 
+    <div id="imgInvitation">
 
+        <p><b>邀请码</b></p>
 
+        <p><b id="InvitationCode">728392</b></p>
 
+        <img id="Invitation"
 
+             src=""
 
+             alt="">
 
     </div>
 
+</div>
 
 </body>
 
 <script src="https://qiniu.kuaifazs.com/jquery-2.1.1.min.js"></script>
 
 <script>
 
-    $(function () {
 
-      window.PublicJavaScript.getCode();
 
-     
-    })
 
-	
-	
-	 function showCode(Link) {
 
-        alert(Link)
 
+  $(function () {
 
+    window.PublicJavaScript.getCode();
 
+    // showCode('http://staticcdn.kuaifazs.com/upload/game/201802/02/c0/68/qrXn9G.html?inviteCode=728392')
 
+  })
 
+
 
+  function showCode(Link) {
 
+    var s = GetRequest(Link)
 
+    $('#InvitationCode').html(s.inviteCode)
 
+    $('#Invitation').attr('src','http://pan.baidu.com/share/qrcode?w=300&h=300&url=' + Link);
 
+  }
 
+  function GetRequest(v) {
 
+    var r = v;
 
+    r = r.substring(r.indexOf("?"));
 
+    var url = r;
 
+    var theRequest = new Object();
 
+    if (url.indexOf("?") != -1) {
 
+      var str = url.substr(1);
 
+      strs = str.split("&");
 
+      for(var i = 0; i < strs.length; i ++) {
 
+        theRequest[strs[i].split("=")[0]]=unescape(strs[i].split("=")[1]);
 
       }
 
+    }
 
+    return theRequest;
 
+  }
 
 </script>
 
 </html>

+ 3 - 6
app/src/main/java/com/sheep/jiuyan/samllsheep/Config.java
Переглянути файл 

@@ -6,9 +6,7 @@ package com.sheep.jiuyan.samllsheep;
 
 
 public class Config {
 
     private  final static Config mConfig = new Config();
 
-
 
     private Config() {
 
-
 
     }
 
     public static Config instance() {
 
         return mConfig;
 
@@ -18,14 +16,13 @@ public class Config {
 
     //        public String mBaseUrl = "http://10.8.220.213:8088";
 
     //    public String mBaseUrl = "http://10.8.220.130:8088";
 
     //何威
 
-//    public String mBaseUrl = "http://10.8.220.6:8088";
 
+  public String mBaseUrl = "http://10.8.220.6:8088";
 
 //张伟
 
 // public String mBaseUrl = "http://10.8.220.132:8088";
 
-   public String mBaseUrl = "http://api.task.bandaimi.com";
 
+//   public String mBaseUrl = "http://api.task.bandaimi.com";
 
 //    public String mBaseUrl = "http://test.ss.shouyouquan.com";
 
     public final static String WX_APPID = "wx3c0376c4fcc8b723";
 
-    public final static String BUGLY_APPID = "0dd998212c";
 
-
 
+    public final static String BUGLY_APPID = "0dd9 98212c";
 
     public String[] mUrlList = new String[]{"http://10.8.220.213:8088", "http://10.8.220.132:8088", "http://test.ss.shouyouquan.com", "http://10.8.220.130:8088", "http://api.task.bandaimi.com"};
 
     public void setBaseUrl(String url) {
 
         this.mBaseUrl = url;

+ 1 - 1
app/src/main/java/com/sheep/jiuyan/samllsheep/page/AskFriendActivity.java
Переглянути файл 

@@ -142,7 +142,7 @@ public class AskFriendActivity extends BaseActivity implements View.OnClickListe
 
                 break;
 
             case R.id.rl_face:
 
                 Intent i=new  Intent(this,WebActivity.class);
 
-                i.putExtra(WebActivity.INTENT_URL,Url.FACE_2_FACE);
 
+                i.putExtra(WebActivity.INTENT_URL,"file:///android_asset/poster.html");
 
                 i.putExtra(WebActivity.INTENT_TITLE,"ditui");
 
                 startActivity(i);
 
                 break;

+ 7 - 7
app/src/main/java/com/sheep/jiuyan/samllsheep/page/MainActivity.java
Переглянути файл 

@@ -216,7 +216,6 @@ if (BuildConfig.DEBUG)
 
         findViewById(R.id.txt_get_cash).setOnClickListener(new View.OnClickListener() {
 
             @Override
 
             public void onClick(View view) {
 
-                if (SpUtils.isLogin(getApplicationContext())) {
 
 
                     HashMap<String, String> map = new HashMap<>();
 
                     map.put("wx_open_id", SpUtils.getOpenId(MainActivity.this));
 
@@ -224,23 +223,24 @@ if (BuildConfig.DEBUG)
 
                         @Override
 
                         public void success(User user) {
 
                             hideProgress();
 
-
 
                             if(!TextUtils.isEmpty(user.getBalance())){
 
-
 
                                 try {
 
                                     float money =Float.parseFloat(user.getBalance());
 
-                                    if(money>=5){
 
+                                    if(money>=30){
 
                                         Intent intent = new Intent(MainActivity.this, WithdrawActivity.class);
 
                                         intent.putExtra("money", user.getBalance());
 
                                         startActivity(intent);
 
+                                    }else{
 
+                                        Toast.makeText(MainActivity.this,"亲！最低提现金额是30元哟！",Toast.LENGTH_LONG).show();
 
                                     }
 
 
                                 }catch (Exception e){
 
-                                      Toast.makeText(MainActivity.this,"亲！最低体现金额是5元哟！",Toast.LENGTH_LONG).show();
 
+                                      Toast.makeText(MainActivity.this,"亲！最低提现金额是30元哟！",Toast.LENGTH_LONG).show();
 
                                 }
 
 
                             }else{
 
-                                Toast.makeText(MainActivity.this,"亲！最低体现金额是5元哟！",Toast.LENGTH_LONG).show();
 
+                                Toast.makeText(MainActivity.this,"亲！最低提现金额是30元哟！",Toast.LENGTH_LONG).show();
 
+
 
                             }
 
 
 
@@ -258,7 +258,7 @@ if (BuildConfig.DEBUG)
 
 
 
 
-                }
 
+
 
             }
 
         });
 
         findViewById(R.id.img_share).setOnClickListener(new View.OnClickListener() {

+ 28 - 22
app/src/main/java/com/sheep/jiuyan/samllsheep/page/ResetPWDActivity.java
Переглянути файл 

@@ -39,7 +39,6 @@ public class ResetPWDActivity extends BaseActivity  implements View.OnClickListe
 
     private TextView tv_submit;
 
     private int mTime = 0;
 
     private String mPhone;
 
-    private  boolean  isUse=false;
 
 
     private Handler handler = new Handler();
 
     Runnable runnable = new Runnable() {
 
@@ -102,9 +101,28 @@ public class ResetPWDActivity extends BaseActivity  implements View.OnClickListe
 
         }
 
     }
 
     private  void  hideSetPWD(){
 
-        rl_set_pwd.setVisibility(View.VISIBLE);
 
-        rl_rset_pwd.setVisibility(View.GONE);
 
-        isUse=true;
 
+        HashMap<String, String> map = new HashMap<>();
 
+        map.put("Account", mPhone);
 
+        map.put("Step", "2");
 
+        map.put("SmsSeccode", et_psw.getText().toString().trim());
 
+        showProgress();
 
+        NetManager.post(Url.GET_RESET_PWD_CODE, map, getApplicationContext(), new SheepCallback<String>(ResetPWDActivity.this) {
 
+            @Override
 
+            public void success(String o) {
 
+                hideProgress();
 
+                rl_set_pwd.setVisibility(View.VISIBLE);
 
+                rl_rset_pwd.setVisibility(View.GONE);
 
+
 
+            }
 
+
 
+            @Override
 
+            public void failure(IOException e) {
 
+                hideProgress();
 
+                Toast.makeText(ResetPWDActivity.this, e.getMessage(), Toast.LENGTH_SHORT).show();
 
+            }
 
+        });
 
+
 
+
 
     }
 
 
     private  void  sendCode(){
 
@@ -161,7 +179,7 @@ public class ResetPWDActivity extends BaseActivity  implements View.OnClickListe
 
 
         HashMap<String, String> map = new HashMap<>();
 
         map.put("Account", mPhone);
 
-        map.put("Step", "2");
 
+        map.put("Step", "3");
 
         map.put("SmsSeccode", et_psw.getText().toString().trim());
 
         map.put("NewPass", pw1);
 
         showProgress();
 
@@ -194,24 +212,7 @@ public class ResetPWDActivity extends BaseActivity  implements View.OnClickListe
 
 
     }
 
 
-    @Override
 
-    public void onBackPressed() {
 
-        if (isUse) {
 
-          onBackDown();
 
-            rl_set_pwd.setVisibility(View.VISIBLE);
 
-            rl_rset_pwd.setVisibility(View.GONE);
 
-            isUse=false;
 
-        } else {
 
-            super.onBackPressed();
 
-        }
 
-
 
-    }
 
-
 
 
-    public  void  onBackDown(){
 
-
 
-
 
-    }
 
 
 
 
@@ -241,10 +242,15 @@ public class ResetPWDActivity extends BaseActivity  implements View.OnClickListe
 
             return;
 
         }
 
         mPhone=et_account.getText().toString().trim();
 
+
 
+
 
         hideSetPWD();
 
 
 
 
+
 
+
 
+
 
     }

+ 6 - 6
app/src/main/java/com/sheep/jiuyan/samllsheep/page/WithdrawActivity.java
Переглянути файл 

@@ -20,6 +20,7 @@ import com.sheep.jiuyan.samllsheep.net.SheepCallback;
 
 import com.sheep.jiuyan.samllsheep.net.Url;
 
 import com.sheep.jiuyan.samllsheep.page.entry.User;
 
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 
+import com.sheep.jiuyan.samllsheep.utils.StringUtils;
 
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 
 import java.io.IOException;
 
@@ -32,14 +33,12 @@ import java.util.HashMap;
 
 public class WithdrawActivity extends BaseActivity implements View.OnClickListener {
 
     private TextView mMoney;
 
     private GridView mGvMoney;
 
-    int[] mMoneys = new int[]{5, 10, 20, 50, 100, 500};
 
+    int[] mMoneys = new int[]{30, 50, 100, 500};
 
     private TextView mTvWx;
 
     private GvAdapter mAdapter;
 
     private AlertDialog mDialog;
 
     private TextView mTvMsg;
 
     private  String  accountMoney;
 
-
 
-
 
     @Override
 
     public void onCreate(@Nullable Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
 
@@ -60,6 +59,7 @@ public class WithdrawActivity extends BaseActivity implements View.OnClickListen
 
        Intent i=getIntent();
 
         if(i.hasExtra("money")){
 
             accountMoney=i.getStringExtra("money");
 
+            mMoney.setText("账户金额："+ StringUtils.strToMoney(accountMoney));
 
         }
 
     }
 
 
@@ -73,6 +73,7 @@ public class WithdrawActivity extends BaseActivity implements View.OnClickListen
 
         TitleBarUtils.getInstance()
 
                 .setTitle(this, "提  现")
 
                 .setTitleFinish(this);
 
+
 
     }
 
 
     @Override
 
@@ -93,16 +94,15 @@ public class WithdrawActivity extends BaseActivity implements View.OnClickListen
 
         try {
 
             float money =Float.parseFloat(accountMoney);
 
             if(money<mMoneys[mAdapter.checked]){
 
-                Toast.makeText(this,"亲！余额不足哟",Toast.LENGTH_LONG).show();
 
+                Toast.makeText(this,"亲！金额不足哟",Toast.LENGTH_LONG).show();
 
                 return ;
 
             }
 
 
         }catch (Exception e){
 
 
-            Toast.makeText(this,"亲！余额不足哟",Toast.LENGTH_LONG).show();
 
+            Toast.makeText(this,"亲！金额不足哟",Toast.LENGTH_LONG).show();
 
             return ;
 
         }
 
-
 
             HashMap<String, String> map = new HashMap<>();
 
             map.put("money", mMoneys[mAdapter.checked] + "");
 
             map.put("wx_open_id", SpUtils.getOpenId(this));

+ 2 - 1
app/src/main/java/com/sheep/jiuyan/samllsheep/page/fragment/FgtMainPageTask.java
Переглянути файл 

@@ -37,6 +37,7 @@ import com.sheep.jiuyan.samllsheep.utils.G;
 
 import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
 
 import com.sheep.jiuyan.samllsheep.utils.RecyleViewLoadMoreUtils;
 
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 
+import com.sheep.jiuyan.samllsheep.utils.StringUtils;
 
 
 import java.io.File;
 
 import java.io.IOException;
 
@@ -298,7 +299,7 @@ public class FgtMainPageTask extends BaseFragment {
 
                     G.mUser = user;
 
                     ((BaseActivity) getActivity()).initData();//刷新数据
 
                     findViewById(R.id.txt_fgt_main_page_task_income, TextView.class)
 
-                            .setText(user.getToday() + "");
 
+                            .setText(StringUtils.strToMoney(user.getToday()));
 
                 }
 
             }
 
         });