From fa71d2a81d2103049cab5351d1381db0c54e3e32 Mon Sep 17 00:00:00 2001
From: duqingquan <duqingquan@dcloud.io>
Date: Tue, 8 Nov 2022 14:45:24 +0800
Subject: [PATCH] =?UTF-8?q?hx=203.8.9=E6=94=AF=E6=8C=81=E4=BA=86R=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E7=94=9F=E6=88=90=EF=BC=8C=E7=A7=BB=E9=99=A4=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E7=9A=84=E6=97=A0=E7=94=A8=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TencentLocation/TencentLocation.vue          |   7 +------
 pages/SDKIntegration/XToast/XToast.vue           |   9 ++-------
 .../uts-nativepage/utssdk/app-android/libs/R.jar | Bin 3547 -> 0 bytes
 .../uts-toast/utssdk/app-android/libs/R.jar      | Bin 1218 -> 0 bytes
 4 files changed, 3 insertions(+), 13 deletions(-)
 delete mode 100644 uni_modules/uts-nativepage/utssdk/app-android/libs/R.jar
 delete mode 100644 uni_modules/uts-toast/utssdk/app-android/libs/R.jar

diff --git a/pages/SDKIntegration/TencentLocation/TencentLocation.vue b/pages/SDKIntegration/TencentLocation/TencentLocation.vue
index 49cfdb4..67423e9 100644
--- a/pages/SDKIntegration/TencentLocation/TencentLocation.vue
+++ b/pages/SDKIntegration/TencentLocation/TencentLocation.vue
@@ -9,12 +9,7 @@
 			<view class="uni-hello-text">
 				2. 将key配置在uts插件uts-tencentgeolocation/utssdk/app-android/AndroidManifest.xml中。
 			</view>
-			<view class="uni-hello-text">	
-				3. 打包自定义基座，注意将uts-tencentgeolocation/utssdk/app-android/libs/androix-core-1.0.0.jar先移到其他目录。
-			</view>
-			<view class="uni-hello-text">	
-				4. 打包自定义基座后将androix-core-1.0.0.jar移回原位，然后真机运行自定义基座。这个临时的移出移入问题后续会升级解决，详见uts插件开发文档的临时注意。
-			</view>
+			
 		</view>
 		<view class="uni-btn-v uni-common-mt">
 			<button type="primary"  @tap="checkLocationPermission">请求定位权限</button>
diff --git a/pages/SDKIntegration/XToast/XToast.vue b/pages/SDKIntegration/XToast/XToast.vue
index 3a0627b..5cd4dd5 100644
--- a/pages/SDKIntegration/XToast/XToast.vue
+++ b/pages/SDKIntegration/XToast/XToast.vue
@@ -2,15 +2,10 @@
 	<page-head :title="title"></page-head>
 	<view class="uni-padding-wrap uni-common-mt">
 		<view class="uni-hello-text">
-			1.临时移除uts-toast插件下的 libs/R.jar文件
-		</view>
-		<view class="uni-hello-text">
-			2. 提交自定义基座打包
-		</view>
-		<view class="uni-hello-text">	
-			3. 将移除的libs/R.jar文件放回原处，运行自定义基座即可
+			1.需要自定义基座运行
 		</view>
 		
+		
 	</view>
 	<view class="uni-padding-wrap uni-common-mt">
 		<button @tap="testToastShow">调用XToast弹窗</button>
diff --git a/uni_modules/uts-nativepage/utssdk/app-android/libs/R.jar b/uni_modules/uts-nativepage/utssdk/app-android/libs/R.jar
deleted file mode 100644
index 7c025062fb6b353435bc7471612a26864b3fb5b7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3547
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
Yhq0#}8num|9W287*s;nQ^<`K78<@fmIRF3v

diff --git a/uni_modules/uts-toast/utssdk/app-android/libs/R.jar b/uni_modules/uts-toast/utssdk/app-android/libs/R.jar
deleted file mode 100644
index aa1f1c19c6efb09375c06d0f253a1dad14333deb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1218
zcmWIWW@Zs#;Nak35ZV<P%76qo8CV#6T|*poJ^kGD|D9rBU}gyLX6FE@V1g<Oz^PdT
zr~<Cp*U`_@%{4eg&)4m<@0rs+-nx1hdA)VD&Yd~GImqCO@q?#DdS1Rdp1v1LSFv!-
zcrE#2rbfmNwdW~fBFnWbmOT-lk}~aC)~BM6MT}r4SSl-)IRY(k0Ahp_Qg@=dUk@mo
znXjLcoReRgqF<Vq8K0Y<Qks)mtY2DE9AA>3SX`nXq>__ZnO|C>mz<MWT-+LP+Kbsx
z#P;PD<HsdiwqCpL<XCWVS3yDiU6CVAAuAqjTVm`Oe2Hb&kw>TUg~Xe<?GN+|<+~R?
zbYuE{r@F}E`^S$zzwtc~vF6m`PznjYB4A{){7++g*X!MHvW!G`CUaB=d6yp(DA~3B
zpfGdT3su2ann7!fN|v1Lijj;@i97xAj7S{k?8@}x=L%kLy14LB|FOy8wTh*QVvnm=
zu1sQX%epVpw6IWftHiIHE@$$8xCjb=FZz1fVy9W%yzb(iPYz%FSmY+e(^@KiY!}CD
z9`^ry2Pg1t5&OLF(KRk_zx%-tTdu9VU@D=g>k`>oWW|2ebk#SG%<L<DaR=vlCpITV
zOe#H+@z3kKci+FLi`<X)-x6WG=KWjD%qu6k+dwmV`^Mh8`k?rC*~5~i$jHDj6NqsK
zzB)014-IvHUvFkZf!ddO=DT8Zzdk$I{9s{~LB;hrE~kZID;{l4DQ{k~gfmCz;QXha
zA0F_3aPOS_mED5b`13vKXODkB|IB?rx6hkrLg5q9HVp~2=$~4x6Ti9IT#3HQ()P$L
zS~iX6=9fn^llvd~SYI?db~MaowYl|mx5axp4(2yaw(Br;wkuzoB%!}GboGwaq2E=q
zoqc}3NV>kldalF9eO}y>ZrV=|@Aaykmwd+HZ~5_^6Z7>hHC{awb@goTm$=GVKaW3_
znp5X}?8Hm!uHP+w)jT}<_6P1&?_3h`C8d)``4n@A#ezA))g7MemvlYmP~Q&<z>kVd
zwr_yJV+RgEMkWyk)cgm_T%i1i3g8(Elp6!QQMDpx3Q+Dt09zmvt`#XSBAWopJjgK%
u$~*{g0LUaQE1{c>>}gQiKmc2ye+ilmNhtx|tZX2SEI_CS481yL5Dx$#Tb=9x

-- 
GitLab