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

+ 4 - 8
app/src/main/AndroidManifest.xml

@@ -231,7 +231,7 @@
             android:configChanges="keyboardHidden|screenSize|orientation"
             android:configChanges="keyboardHidden|screenSize|orientation"
             android:exported="true"
             android:exported="true"
             android:hardwareAccelerated="true"
             android:hardwareAccelerated="true"
-            android:launchMode="singleTask"
+            android:launchMode="singleInstance"
             android:screenOrientation="portrait"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme"
             android:theme="@style/AppTheme"
             android:windowSoftInputMode="adjustPan|stateHidden">
             android:windowSoftInputMode="adjustPan|stateHidden">
@@ -319,8 +319,8 @@
             android:theme="@style/AppActionTheme" />
             android:theme="@style/AppActionTheme" />
         <activity
         <activity
             android:name="com.sheep.gamegroup.view.activity.ChangeTelAct"
             android:name="com.sheep.gamegroup.view.activity.ChangeTelAct"
-            android:launchMode="singleTask"
             android:exported="true"
             android:exported="true"
+            android:launchMode="singleInstance"
             android:screenOrientation="portrait"
             android:screenOrientation="portrait"
             android:theme="@style/AppActionTheme" />
             android:theme="@style/AppActionTheme" />
         <activity
         <activity
@@ -420,8 +420,8 @@
         <activity
         <activity
             android:name="com.sheep.gamegroup.view.activity.RealNameAuthenAct"
             android:name="com.sheep.gamegroup.view.activity.RealNameAuthenAct"
             android:screenOrientation="portrait"
             android:screenOrientation="portrait"
+            android:launchMode="singleInstance"
             android:exported="true"
             android:exported="true"
-            android:launchMode="singleTask"
             android:theme="@style/AppActionTheme" />
             android:theme="@style/AppActionTheme" />
         <activity
         <activity
             android:name="com.sheep.gamegroup.view.activity.ChangeWxOrTelAct"
             android:name="com.sheep.gamegroup.view.activity.ChangeWxOrTelAct"
@@ -503,12 +503,8 @@
             android:name="com.sheep.gamegroup.view.activity.ActWebX5Single"
             android:name="com.sheep.gamegroup.view.activity.ActWebX5Single"
             android:launchMode="singleInstance"
             android:launchMode="singleInstance"
             android:screenOrientation="portrait"
             android:screenOrientation="portrait"
+            android:exported="true"
             android:theme="@style/AppActionTheme">
             android:theme="@style/AppActionTheme">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
         </activity>
         </activity>
         <activity
         <activity
             android:name="com.sheep.gamegroup.view.activity.ActImg"
             android:name="com.sheep.gamegroup.view.activity.ActImg"

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

@@ -126,7 +126,9 @@ public class FgtSearch extends BaseFragment implements ISearch {
                             taskCount += base.getInt("task_count");
                             taskCount += base.getInt("task_count");
                             giftCount += base.getInt("gift_count");
                             giftCount += base.getInt("gift_count");
                             articleCount += base.getInt("article_count");
                             articleCount += base.getInt("article_count");
-                            goodsCount += base.getInt("goods_count");
+                            if (base.has("goods_count")) {
+                                goodsCount += base.getInt("goods_count");
+                            }
                             JSONArray array = base.getJSONArray("list");
                             JSONArray array = base.getJSONArray("list");
                             for (int i = 0; i < array.length(); i++) {
                             for (int i = 0; i < array.length(); i++) {
                                 JSONObject object = array.getJSONObject(i);
                                 JSONObject object = array.getJSONObject(i);

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

@@ -30,7 +30,9 @@ public class ActWebX5 extends BaseContainerActivity implements UMShareListener {
     private int orientPara;
     private int orientPara;
 
 
     @Override
     @Override
-    protected boolean showWhiteStatusBar(){return true;}
+    protected boolean showWhiteStatusBar() {
+        return true;
+    }
 
 
     @Override
     @Override
     protected Fragment initFragment() {
     protected Fragment initFragment() {
@@ -45,8 +47,13 @@ public class ActWebX5 extends BaseContainerActivity implements UMShareListener {
 
 
     public void initWebParams() {
     public void initWebParams() {
         Intent intent = getIntent();
         Intent intent = getIntent();
-        webParams = (WebParams) intent.getSerializableExtra(WebParams.class.getSimpleName());
-        orientPara = intent.getIntExtra("extra_orient", -1);
+        if (intent.hasExtra("exurl")) {
+            webParams = new WebParams(intent.getStringExtra("exurl"),
+                    intent.getStringExtra("extitle"));
+        } else {
+            webParams = (WebParams) intent.getSerializableExtra(WebParams.class.getSimpleName());
+            orientPara = intent.getIntExtra("extra_orient", -1);
+        }
         Log.e("WebRecharge", "orient: " + orientPara);
         Log.e("WebRecharge", "orient: " + orientPara);
     }
     }
 
 

+ 8 - 7
app/src/main/java/com/sheep/gamegroup/view/activity/MiddleSchemeAct.java

@@ -113,26 +113,27 @@ public class MiddleSchemeAct extends Activity {
                 CommonUtil.getInstance().goGameDetailByPackageId(json);
                 CommonUtil.getInstance().goGameDetailByPackageId(json);
                 break;
                 break;
             case "game_coupon":
             case "game_coupon":
-                Jump2View.getInstance().goWeb(
+                Jump2View.getInstance().goWebSingle(
                         context,
                         context,
                         new WebParams(
                         new WebParams(
                                 Config.getUrlByPath(Config.PATH_MY_GAME_COUPON, "authorization", json),
                                 Config.getUrlByPath(Config.PATH_MY_GAME_COUPON, "authorization", json),
                                 "代金券中心"),
                                 "代金券中心"),
-                        true);
+                        false, 1);
                 break;
                 break;
             case "game_role_mall":
             case "game_role_mall":
-                Jump2View.getInstance().goWeb(context,
-                        new WebParams(Config.getUrlByPath(Config.PATH_GAME_SHOP_HOME,"authorization"),
+                Jump2View.getInstance().goWebSingle(
+                        context,
+                        new WebParams(Config.getUrlByPath(Config.PATH_GAME_SHOP_HOME, "authorization", json),
                                 "游戏交易商城"),
                                 "游戏交易商城"),
-                        true);
+                        false, 1);
                 break;
                 break;
             case "yy_shop":
             case "yy_shop":
-                Jump2View.getInstance().goWeb(
+                Jump2View.getInstance().goWebSingle(
                         context,
                         context,
                         new WebParams(
                         new WebParams(
                                 Config.getUrlByPath(Config.PATH_YY_SHOP_INDEX, "authorization", json),
                                 Config.getUrlByPath(Config.PATH_YY_SHOP_INDEX, "authorization", json),
                                 "代金券中心"),
                                 "代金券中心"),
-                        true);
+                        false, 1);
                 break;
                 break;
             case "my_gift":
             case "my_gift":
                 Jump2View.getInstance().goMyWelfare(context, json, true);
                 Jump2View.getInstance().goMyWelfare(context, json, true);