bug fixed

app/src/developSheeptest/java/com/sheep/jiuyan/samllsheep/wxapi/WXEntryActivity.java

@@ -1,7 +1,24 @@
 package com.sheep.jiuyan.samllsheep.wxapi;
+
+import android.content.Intent;
+import android.os.Bundle;
+
+import com.sheep.jiuyan.samllsheep.wxutil.WXAPIUtil;
 import com.umeng.socialize.weixin.view.WXCallbackActivity;
 
 public class WXEntryActivity extends WXCallbackActivity {
 
+    @Override
+    public void onCreate(Bundle bundle) {
+        super.onCreate(bundle);
+        WXAPIUtil.handle(this, getIntent());
+        finish();
+    }
+
+    @Override
+    public void onNewIntent(Intent newIntent) {
+        WXAPIUtil.handle(this, newIntent);
+        finish();
+    }
 
 }

app/src/main/AndroidManifest.xml

@@ -133,10 +133,14 @@
             android:name="org.apache.http.legacy"
             android:required="false" />
 
-        <!--<activity-->
-            <!--android:name=".wxapi.WXEntryActivity"-->
-            <!--android:exported="true"-->
-            <!--android:launchMode="singleTop" />-->
+        <activity
+        android:name="com.sheep.jiuyan.samllsheep.wxutil.WXUmengEntryActivity"
+        android:exported="true"
+        android:launchMode="singleTop" />
+        <activity
+            android:name=".wxapi.WXEntryActivity"
+            android:exported="true"
+            android:launchMode="singleTop" />
         <activity
             android:name="com.ipaynow.plugin.inner_plugin.miniprogram.activity.MiniProgramPayActivity"
             android:configChanges="keyboardHidden|navigation|orientation|screenSize"
@@ -144,10 +148,10 @@
             android:screenOrientation="behind"
             android:theme="@android:style/Theme.Dialog" />
 
-        <activity-alias
-            android:name=".wxapi.WXEntryActivity"
-            android:exported="true"
-            android:targetActivity="com.ipaynow.plugin.inner_plugin.miniprogram.activity.MiniProgramPayActivity" />
+        <!--<activity-alias-->
+            <!--android:name=".wxapi.WXEntryActivity2"-->
+            <!--android:exported="true"-->
+            <!--android:targetActivity="com.ipaynow.plugin.inner_plugin.miniprogram.activity.MiniProgramPayActivity" />-->
         <activity
             android:name=".wxapi.WXPayEntryActivity"
             android:exported="true"

app/src/main/java/com/sheep/gamegroup/di/modules/NetModule.java

@@ -49,9 +49,9 @@ public class NetModule {
     public Retrofit provideRetrofit(OkHttpClient okhttpClient) {
         Retrofit retrofit = new Retrofit.Builder()
                 .client(okhttpClient)
-//                .baseUrl(SheepApp.getInstance().getConnectAddress().getAppUrl()+"v1/")
+                .baseUrl(SheepApp.getInstance().getConnectAddress().getAppUrl()+"v1/")
 //                .baseUrl("http://10.8.240.155:8080/v1/")
-                .baseUrl("http://ss.17xmy.com/v1/")
+//                .baseUrl("http://ss.17xmy.com/v1/")
                 .addConverterFactory(StringConverterFactory.create())
                 .addConverterFactory(FastJsonConverterFactory.create())
 //                .addConverterFactory(GsonConverterFactory.create(EntityUtils.gson))//

app/src/main/java/com/sheep/gamegroup/module/game/fragment/FgtGameGift.java

@@ -69,7 +69,7 @@ public class FgtGameGift extends BaseRefreshLoadMoreFragment {
     //加载游戏数据
     private void loadGameData() {
         if (gameEntity.isGift()) {
-            gameInfoListArrayList.add(new GameInfoList("礼包推荐", new AdpGcGameAppGiftBag(SheepApp.getInstance(), gameEntity.getHas_gift_bag(), gameEntity)).setSort(SORT_GIFT));
+            gameInfoListArrayList.add(new GameInfoList("礼包推荐", new AdpGcGameAppGiftBag(getActivity(), gameEntity.getHas_gift_bag(), gameEntity)).setSort(SORT_GIFT));
         }
         ViewUtil.notifyDataSetChanged(recyclerView);
     }

app/src/main/java/com/sheep/gamegroup/view/activity/RechargeAct.java

@@ -77,7 +77,10 @@ public class RechargeAct extends BaseActivity {
     @Override
     protected void onCreate(Bundle b) {
         super.onCreate(b);
-        IpaynowPlugin.getInstance().init(this);
+        IpaynowPlugin.getInstance()
+                .init(this)
+                .setMiniProgramEnv(0)
+                .setCustomLoading(IpaynowPlugin.getInstance().getDefaultLoading());
     }
 
     @Override
@@ -237,8 +240,6 @@ public class RechargeAct extends BaseActivity {
         IpaynowPlugin.getInstance().getDefaultLoading().setLoadingMsg("正在生成订单");
         IpaynowPlugin.getInstance().getDefaultLoading().show();
         IpaynowPlugin.getInstance()
-                .setMiniProgramEnv(0)
-                .setCustomLoading(IpaynowPlugin.getInstance().getDefaultLoading())
                 .setCallResultReceiver(new ReceivePayResult() {
                     @Override
                     public void onIpaynowTransResult(ResponseParams resp) {

app/src/main/java/com/sheep/gamegroup/view/adapter/AdpGcGameAppGiftBag.java

@@ -55,7 +55,7 @@ public class AdpGcGameAppGiftBag extends RecyclerViewAdapter<GiftBagApp> {
                 @Override
                 public void onClick(View v) {
                     if(CommonUtil.getInstance().isInstallApp(gameEntity.getApp().getPackage_name(), gameEntity.getApp().getName())){
-                        CommonUtil.getInstance().receiveGiftById(v.getContext(), item, new Action1<Integer>() {
+                        CommonUtil.getInstance().receiveGiftById(mContext, item, new Action1<Integer>() {
                             @Override
                             public void call(Integer integer) {
                                 item.setReceived(true);

app/src/main/java/com/sheep/jiuyan/samllsheep/wxutil/WXAPIUtil.java

@@ -0,0 +1,18 @@
+package com.sheep.jiuyan.samllsheep.wxutil;
+
+import android.content.Context;
+import android.content.Intent;
+
+public class WXAPIUtil {
+
+    public static void handle(Context context, Intent newIntent) {
+        if (newIntent.hasExtra("_launch_wxminiprogram_ext_msg") && newIntent.getStringExtra("_launch_wxminiprogram_ext_msg").contains("payResult")) {
+            newIntent.setClassName(context, "com.ipaynow.plugin.inner_plugin.miniprogram.activity.MiniProgramPayActivity");
+            newIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+        } else {
+            newIntent.setClassName(context, "com.sheep.jiuyan.samllsheep.wxutil.WXUmengEntryActivity");
+        }
+        context.startActivity(newIntent);
+    }
+
+}

app/src/main/java/com/sheep/jiuyan/samllsheep/wxutil/WXUmengEntryActivity.java

@@ -0,0 +1,7 @@
+package com.sheep.jiuyan.samllsheep.wxutil;
+import com.umeng.socialize.weixin.view.WXCallbackActivity;
+
+public class WXUmengEntryActivity extends WXCallbackActivity {
+
+
+}

app/src/main/res/values-v19/style_theme.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="AppTheme" parent="Base.Theme.AppCompat.Light.DarkActionBar">
         <item name="android:windowContentOverlay">@null</item>
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
@@ -9,6 +9,8 @@
         <item name="colorAccent">@color/colorAccent</item>
         <item name="colorControlHighlight">@color/black</item>
 
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
         <item name="main_color">@color/theme_app_main</item>
         <item name="main_color_dark">@color/theme_app_dark</item>
         <item name="main_color_mid">@color/theme_app_mid</item>
@@ -31,7 +33,7 @@
         <item name="android:windowTranslucentStatus">true</item>
     </style>
 
-    <style name="AppActionTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="AppActionTheme" parent="Base.Theme.AppCompat.Light.DarkActionBar">
         <item name="android:windowContentOverlay">@null</item>
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>

app/src/main/res/values-v23/style_theme.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="AppTheme" parent="Base.Theme.AppCompat.Light.DarkActionBar">
         <item name="android:windowContentOverlay">@null</item>
         <item name="android:windowLightStatusBar">true</item>
         <item name="android:colorPrimary">@color/colorPrimary</item>
@@ -10,6 +10,8 @@
         <item name="android:textColorPrimary">@color/black_text_deep</item>
         <item name="colorControlHighlight">@color/black</item>
 
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
         <item name="main_color">@color/theme_app_main</item>
         <item name="main_color_dark">@color/theme_app_dark</item>
         <item name="main_color_mid">@color/theme_app_mid</item>
@@ -33,7 +35,7 @@
         <item name="android:statusBarColor">@android:color/transparent</item>
     </style>
 
-    <style name="AppActionTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="AppActionTheme" parent="Base.Theme.AppCompat.Light.DarkActionBar">
         <item name="android:windowContentOverlay">@null</item>
         <item name="android:windowLightStatusBar">true</item>
         <item name="android:colorPrimary">@color/colorAccent</item>

app/src/main/res/values/gamegroup_styles.xml

@@ -90,7 +90,7 @@
         <item name="android:layout_margin">@dimen/content_padding</item>
         <item name="android:background">@drawable/sp_bg_gradient_rectangle_blue</item>
     </style>
-    <style name="MyDialogActivityTheme" parent="@android:style/Theme.Dialog">
+    <style name="MyDialogActivityTheme" parent="Base.Theme.AppCompat.Light.Dialog">
         <item name="android:windowFrame">@android:color/transparent</item><!--边框-->
         <item name="android:windowIsFloating">true</item><!--是否浮现在activity之上-->
         <item name="android:windowIsTranslucent">false</item><!--半透明-->

app/src/main/res/values/style_theme.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="AppTheme" parent="Base.Theme.AppCompat.Light.DarkActionBar">
         <item name="android:windowContentOverlay">@null</item>
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
@@ -16,6 +16,8 @@
         <item name="main_color_light">@color/theme_app_highlight_more</item>
         <item name="star_unselect">@drawable/xina</item>
         <item name="star_select">@drawable/xinb</item>
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
         <!--下面的属性全是为了兼容安卓4.0！多了好多文件啊-->
         <item name="line_short">@drawable/sp_line_vertical</item>
         <item name="star_style">@style/ratingbar_main</item>

app/src/sheep/java/com/sheep/jiuyan/samllsheep/wxapi/WXEntryActivity.java

@@ -3,5 +3,17 @@ import com.umeng.socialize.weixin.view.WXCallbackActivity;
 
 public class WXEntryActivity extends WXCallbackActivity {
 
+    @Override
+    public void onCreate(Bundle bundle) {
+        super.onCreate(bundle);
+        WXAPIUtil.handle(this, getIntent());
+        finish();
+    }
+
+    @Override
+    public void onNewIntent(Intent newIntent) {
+        WXAPIUtil.handle(this, newIntent);
+        finish();
+    }
 
 }

app/src/sheeptestjiguang/java/com/sheep/jiuyan/samllsheep/test/wxapi/WXEntryActivity.java

@@ -3,5 +3,18 @@ import com.umeng.socialize.weixin.view.WXCallbackActivity;
 
 public class WXEntryActivity extends WXCallbackActivity {
 
+    @Override
+    public void onCreate(Bundle bundle) {
+        super.onCreate(bundle);
+        WXAPIUtil.handle(this, getIntent());
+        finish();
+    }
+
+    @Override
+    public void onNewIntent(Intent newIntent) {
+        WXAPIUtil.handle(this, newIntent);
+        finish();
+    }
+
 
 }

media/app/build.gradle

@@ -167,7 +167,7 @@ dependencies {
     api project(':share_library')
     implementation("com.android.support:recyclerview-v7:$supportLibVersion")
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
-    implementation 'com.github.ybq:Android-SpinKit:1.1.0'
+    implementation 'com.github.ybq:Android-SpinKit:1.2.0'
     //All arch: armeabi, armeabi-v7a, arm64-v8a, mips, x86
 //    implementation 'org.wysaid:gpuimage-plus:2.5.1'
     //Pure graphics lib without ffmpeg. (all arch for branch 'min')