billyyoyo лет назад: 6
Родитель
Сommit
6d93807dd8

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/module/home/GoodsRecommendsBarHelper.java

@@ -116,7 +116,7 @@ public class GoodsRecommendsBarHelper {
             ButterKnife.bind(this, itemView);
             ButterKnife.bind(this, itemView);
             imageView.getLayoutParams().width = tileWidth;
             imageView.getLayoutParams().width = tileWidth;
             imageView.getLayoutParams().height = tileWidth;
             imageView.getLayoutParams().height = tileWidth;
-            itemView.setOnClickListener(v -> Jump2View.getInstance().gotoYYShopMerchandise(mContext, goods.getId() + ""));
+            itemView.setOnClickListener(v -> Jump2View.getInstance().gotoYYShopMerchandiseById(mContext, goods.getId() + ""));
         }
         }
 
 
         public void bind(ShopGoodsInfo info) {
         public void bind(ShopGoodsInfo info) {

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/module/qrcode/QRCodeCaptureHelper.java

@@ -30,7 +30,7 @@ public class QRCodeCaptureHelper {
             Jump2View.getInstance().goWeb(activity, text, "-");
             Jump2View.getInstance().goWeb(activity, text, "-");
             return;
             return;
         } else if (RegexUtils.isNumberString(text)) {
         } else if (RegexUtils.isNumberString(text)) {
-            Jump2View.getInstance().gotoYYShopMerchandise(activity, text);
+            Jump2View.getInstance().gotoYYShopMerchandiseBySku(activity, text);
             return;
             return;
         }
         }
         SheepApp.getInstance().getNetComponent().getApiService().getQRCodeInfo(SpUtils.getToken(activity), text)
         SheepApp.getInstance().getNetComponent().getApiService().getQRCodeInfo(SpUtils.getToken(activity), text)

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/module/search/GoodsHolder.java

@@ -30,7 +30,7 @@ public class GoodsHolder extends SearchResultHolder<ShopGoodsInfo> {
     public GoodsHolder(@NonNull View itemView) {
     public GoodsHolder(@NonNull View itemView) {
         super(itemView);
         super(itemView);
         itemView.setOnClickListener((v) -> {
         itemView.setOnClickListener((v) -> {
-            Jump2View.getInstance().gotoYYShopMerchandise(itemView.getContext(), item.getId() + "");
+            Jump2View.getInstance().gotoYYShopMerchandiseById(itemView.getContext(), item.getId() + "");
         });
         });
     }
     }
 
 

+ 1 - 0
app/src/main/java/com/sheep/gamegroup/module/user/activity/ActMyCart.java

@@ -65,6 +65,7 @@ public class ActMyCart extends BaseActivity {
     }
     }
 
 
     private Fragment getWebFragment(WebParams params) {
     private Fragment getWebFragment(WebParams params) {
+        params.setShowTitle(false);
         if (EmulatorDetectUtil.isEmulator()) {
         if (EmulatorDetectUtil.isEmulator()) {
             return FgtWeb.newInstance(params);
             return FgtWeb.newInstance(params);
         } else {
         } else {

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

@@ -41,7 +41,7 @@ public class PhonePresenter implements PhoneContract.Presenter {
             Map map = new HashMap();
             Map map = new HashMap();
             map.put("account", telphone);
             map.put("account", telphone);
             Log.e("hash-map", map.toString());
             Log.e("hash-map", map.toString());
-            com.alibaba.fastjson.JSONObject j = new com.alibaba.fastjson.JSONObject();
+            JSONObject j = new JSONObject();
             j.put("account", telphone);
             j.put("account", telphone);
 
 
             apiService.getCaptcha(j)
             apiService.getCaptcha(j)
@@ -76,7 +76,7 @@ public class PhonePresenter implements PhoneContract.Presenter {
     public boolean getCaptchaa(String telphone) {
     public boolean getCaptchaa(String telphone) {
 
 
         try {
         try {
-            com.alibaba.fastjson.JSONObject j = new com.alibaba.fastjson.JSONObject();
+            JSONObject j = new JSONObject();
             j.put("account", telphone);
             j.put("account", telphone);
 
 
             apiService.getCaptcha(j)
             apiService.getCaptcha(j)
@@ -107,7 +107,7 @@ public class PhonePresenter implements PhoneContract.Presenter {
 
 
     @Override
     @Override
     public void loginByCaptcha(String telphone, String code) {
     public void loginByCaptcha(String telphone, String code) {
-        com.alibaba.fastjson.JSONObject m = new com.alibaba.fastjson.JSONObject();
+        JSONObject m = new JSONObject();
         m.put("account", telphone);
         m.put("account", telphone);
         m.put("sec_code", code);
         m.put("sec_code", code);
         m.put("invitation_code", ChannelContent.getInstance().getChannel_name());
         m.put("invitation_code", ChannelContent.getInstance().getChannel_name());

+ 11 - 1
app/src/main/java/com/sheep/gamegroup/util/Jump2View.java

@@ -2908,7 +2908,7 @@ public class Jump2View {
         });
         });
     }
     }
 
 
-    public void gotoYYShopMerchandise(Context activity, String merId) {
+    public void gotoYYShopMerchandiseById(Context activity, String merId) {
         CommonUtil.getInstance().getConfigValue(Config.KEY_YY_SHOP_GOODS_URL, url -> {
         CommonUtil.getInstance().getConfigValue(Config.KEY_YY_SHOP_GOODS_URL, url -> {
             if (TextUtils.isEmpty(url)) {
             if (TextUtils.isEmpty(url)) {
                 url = "http://smallstation.9yan.io/yy_shop/#/pages/goods/goodsDetail";
                 url = "http://smallstation.9yan.io/yy_shop/#/pages/goods/goodsDetail";
@@ -2918,6 +2918,16 @@ public class Jump2View {
         });
         });
     }
     }
 
 
+    public void gotoYYShopMerchandiseBySku(Context activity, String sku) {
+        CommonUtil.getInstance().getConfigValue(Config.KEY_YY_SHOP_GOODS_URL, url -> {
+            if (TextUtils.isEmpty(url)) {
+                url = "http://smallstation.9yan.io/yy_shop/#/pages/index/scanTurn";
+            }
+            url += "?sku=" + sku;
+            goWeb(activity, new WebParams(url, Config.YY_SHOP_NAME));
+        });
+    }
+
     //点击一条消息
     //点击一条消息
     public void onClickSystemNotification(Activity activity, SystemNotification item) {
     public void onClickSystemNotification(Activity activity, SystemNotification item) {
         switch (item.getType()) {//消息类型 1:通知 2:活动 3:模块上线 4:任务上线 5:任务成功 6:任务失败
         switch (item.getType()) {//消息类型 1:通知 2:活动 3:模块上线 4:任务上线 5:任务成功 6:任务失败

+ 1 - 0
app/src/main/java/com/sheep/gamegroup/view/activity/ActMyFocus.java

@@ -67,6 +67,7 @@ public class ActMyFocus extends BaseActivity {
     }
     }
 
 
     private Fragment getWebFragment(WebParams params) {
     private Fragment getWebFragment(WebParams params) {
+        params.setShowTitle(false);
         if (EmulatorDetectUtil.isEmulator()) {
         if (EmulatorDetectUtil.isEmulator()) {
             return FgtWeb.newInstance(params);
             return FgtWeb.newInstance(params);
         } else {
         } else {

+ 5 - 0
app/src/main/java/com/sheep/gamegroup/view/activity/ChangeTelAct.java

@@ -93,6 +93,11 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View {
     private int where_from;
     private int where_from;
 
 
     @Override
     @Override
+    protected boolean showWhiteStatusBar() {
+        return true;
+    }
+
+    @Override
     protected int getLayoutId() {
     protected int getLayoutId() {
         return R.layout.change_tel_layout;
         return R.layout.change_tel_layout;
     }
     }

+ 5 - 0
app/src/main/java/com/sheep/gamegroup/view/activity/GameCertificationActivity.java

@@ -73,6 +73,11 @@ public class GameCertificationActivity extends BaseActivity {
     }
     }
 
 
     @Override
     @Override
+    protected boolean showWhiteStatusBar() {
+        return true;
+    }
+
+    @Override
     public void initView() {
     public void initView() {
         TitleBarUtils.getInstance()
         TitleBarUtils.getInstance()
                 .setTitle(this, "授权登录")
                 .setTitle(this, "授权登录")

+ 1 - 0
app/src/main/java/com/sheep/gamegroup/view/activity/GameTaskOrderListAct.java

@@ -96,6 +96,7 @@ public class GameTaskOrderListAct extends BaseActivity {
     }
     }
 
 
     private Fragment getWebFragment(WebParams params) {
     private Fragment getWebFragment(WebParams params) {
+        params.setShowTitle(false);
         if (EmulatorDetectUtil.isEmulator()) {
         if (EmulatorDetectUtil.isEmulator()) {
             return FgtWeb.newInstance(params);
             return FgtWeb.newInstance(params);
         } else {
         } else {