1

Assets/Base/UnityTool/Plugins/Android/UnityWxLoginUtil.java

 package com.ym.unityandroid;
 
 import android.app.Activity;
-import android.content.Intent;
-import android.util.Log;
 import android.widget.Toast;
 
 import com.tencent.mm.opensdk.modelmsg.SendAuth;
 import com.tencent.mm.opensdk.openapi.IWXAPI;
 import com.tencent.mm.opensdk.openapi.WXAPIFactory;
 import com.unity3d.player.UnityPlayer;
-import com.ym.unityandroid.webview.UnityWebActivity;
 
 public class UnityWxLoginUtil {
 
@@ -52,7 +49,6 @@ public class UnityWxLoginUtil {
             @Override
             public void run() {
                 if (api.isWXAppInstalled()){
-                    Log.d("wxw","wxwisWXAppInstalled1");
                     final SendAuth.Req req = new SendAuth.Req();
                     req.scope = "snsapi_userinfo";
                     req.state = "wechat_sdk";
@@ -68,12 +64,4 @@ public class UnityWxLoginUtil {
         });
     }
 
-    //打开H5页面
-    public void OpenH5Page(Activity activity,String url,String title){
-        Intent intent = new  Intent(activity, UnityWebActivity.class);
-        intent.putExtra("url",url);
-        activity.startActivity(intent);
-    }
-
-
 }

Assets/Base/UnityTool/Plugins/Android/WXEntryActivity.java

-package com.ym.cydyj.wxapi;
+package com.ym.pcdxg.wxapi;
 
 import android.app.Activity;
 import android.content.Intent;

Assets/Plugins/Android/AndroidManifest.xml

@@ -11,11 +11,7 @@
   <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
   <uses-permission android:name="android.permission.READ_LOGS" />
   <uses-permission android:name="android.permission.GET_TASKS"/>
-  <!--最好能提供的权限-->
-  <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 
-  <!-- 如果有视频相关的广告且使用textureView播放，请务必添加，否则黑屏 -->
-  <uses-permission android:name="android.permission.WAKE_LOCK" />
 
   <application
       android:icon="@drawable/app_icon"
@@ -41,20 +37,9 @@
    
       <!-- 微信配置 -->
         <activity
-            android:name="com.ym.cydyj.wxapi.WXEntryActivity"
+            android:name="com.ym.pcdxg.wxapi.WXEntryActivity"
             android:exported="true"
             android:launchMode="singleTop"/>
-      <!-- WebView -->
-      <activity
-        android:name="com.ym.unityandroid.webview.UnityWebActivity"
-        android:exported="true"
-        android:screenOrientation="fullSensor">
-        <intent-filter>
-          <action android:name="android.intent.action.VIEW" />
-          <category android:name="android.intent.category.DEFAULT" />
-        </intent-filter>
-      </activity>
-      <!-- WebView -->
-	  
+
   </application>
 </manifest>

Assets/Scripts/Controllers/GameController.cs

@@ -26,6 +26,7 @@ public class GameController : MonoBehaviour
     public float RedLinePosY => ColliderAdapter.Instance.RedLinePosY;
 
 
+<<<<<<< HEAD
 
     /// <summary>
     /// 获取接下来将要掉落的音符组及所属歌曲
@@ -43,28 +44,18 @@ public class GameController : MonoBehaviour
         }));
     }
 
-
-
-
-
-
+=======
     /// <summary>
-    /// 获取合成奖励
+    /// 获取提现列表
+    /// 类型（1 合成提现，3大额提现）
     /// </summary>
-    /// <param name="song_id"></param>
-    public void GetReward()
+    public void GetWithdrawList(int type)
     {
         Dictionary<string, object> paras = new Dictionary<string, object>();
-        paras.Add("type", 1);
-        HttpTool.Instance._Get("app/v1/watermelon/reward", paras, new Action<EmptyBean>((result) =>
+        paras.Add("type", type);
+        HttpTool.Instance._Get("app/v1/watermelon/list_wd", paras, new Action<WithDrawBean>((result) =>
         {
-
-        }), new Action<string, string>((code, msg) =>
-        {
-            Debug.unityLogger.Log("获取合成奖励 " + code + " msg " + msg);
-        }));
-    }
-
+>>>>>>> 71cb07ae8564a188b735be49fa9ff46c44542906
 
 
 }

Assets/Scripts/Main/HomeInfoControl.cs

@@ -25,11 +25,14 @@ public class HomeInfoControl : MonoBehaviour
 #if UNITY_EDITOR
         AppConfig.Instance.InitProgect(true);
 #endif
-
         EventCenter.Getinstance().EventTrigger("RegisterPanel");
 
+<<<<<<< HEAD
         //GameController.GetInstance().GetWithdrawList(1);
         GameController.GetInstance().GetReward();
+=======
+        GameController.GetInstance().GetWithdrawList(1);
+>>>>>>> 71cb07ae8564a188b735be49fa9ff46c44542906
 
 
     }